diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/doclet/Doclet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/doclet/Doclet.java index 39a5f174ffb..757cf1b5336 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/doclet/Doclet.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/doclet/Doclet.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -33,7 +33,7 @@ import javax.lang.model.SourceVersion; /** * The user doclet must implement this interface, as described in the - * package description. + * package description. * Each implementation of a Doclet must provide a public no-argument constructor * to be used by tools to instantiate the doclet. The tool infrastructure will * interact with classes implementing this interface as follows: diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java index af1c0ccda77..39ee1c25e3d 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java @@ -719,7 +719,7 @@ public class HtmlDocletWriter { .resolve(DocPaths.SOURCE_OUTPUT) .resolve(docPaths.forClass(te)); Content content = links.createLink(href - .fragment(SourceToHTMLConverter.getAnchorName(utils, element)), label, ""); + .fragment(SourceToHTMLConverter.getAnchorName(utils, element).name()), label, ""); htmltree.add(content); } else { htmltree.add(label); diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlIds.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlIds.java index 41c61636b2a..36ea6469acf 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlIds.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlIds.java @@ -39,7 +39,6 @@ import javax.lang.model.type.TypeVariable; import javax.lang.model.util.SimpleTypeVisitor9; import jdk.javadoc.internal.doclets.formats.html.markup.HtmlId; -import jdk.javadoc.internal.doclets.toolkit.util.DeprecatedAPIListBuilder; import jdk.javadoc.internal.doclets.toolkit.util.SummaryAPIListBuilder; import jdk.javadoc.internal.doclets.toolkit.util.Utils; @@ -68,38 +67,38 @@ public class HtmlIds { static final HtmlId ALL_CLASSES_TABLE = HtmlId.of("all-classes-table"); static final HtmlId ALL_MODULES_TABLE = HtmlId.of("all-modules-table"); static final HtmlId ALL_PACKAGES_TABLE = HtmlId.of("all-packages-table"); - static final HtmlId ANNOTATION_TYPE_ELEMENT_DETAIL = HtmlId.of("annotation.interface.element.detail"); - static final HtmlId ANNOTATION_TYPE_OPTIONAL_ELEMENT_SUMMARY = HtmlId.of("annotation.interface.optional.element.summary"); - static final HtmlId ANNOTATION_TYPE_REQUIRED_ELEMENT_SUMMARY = HtmlId.of("annotation.interface.required.element.summary"); - static final HtmlId CONSTRUCTOR_DETAIL = HtmlId.of("constructor.detail"); - static final HtmlId CONSTRUCTOR_SUMMARY = HtmlId.of("constructor.summary"); - static final HtmlId ENUM_CONSTANT_DETAIL = HtmlId.of("enum.constant.detail"); - static final HtmlId ENUM_CONSTANT_SUMMARY = HtmlId.of("enum.constant.summary"); - static final HtmlId FIELD_DETAIL = HtmlId.of("field.detail"); - static final HtmlId FIELD_SUMMARY = HtmlId.of("field.summary"); - static final HtmlId FOR_REMOVAL = HtmlId.of("forRemoval"); - static final HtmlId METHOD_DETAIL = HtmlId.of("method.detail"); - static final HtmlId METHOD_SUMMARY = HtmlId.of("method.summary"); + static final HtmlId ANNOTATION_TYPE_ELEMENT_DETAIL = HtmlId.of("annotation-interface-element-detail"); + static final HtmlId ANNOTATION_TYPE_OPTIONAL_ELEMENT_SUMMARY = HtmlId.of("annotation-interface-optional-element-summary"); + static final HtmlId ANNOTATION_TYPE_REQUIRED_ELEMENT_SUMMARY = HtmlId.of("annotation-interface-required-element-summary"); + static final HtmlId CONSTRUCTOR_DETAIL = HtmlId.of("constructor-detail"); + static final HtmlId CONSTRUCTOR_SUMMARY = HtmlId.of("constructor-summary"); + static final HtmlId ENUM_CONSTANT_DETAIL = HtmlId.of("enum-constant-detail"); + static final HtmlId ENUM_CONSTANT_SUMMARY = HtmlId.of("enum-constant-summary"); + static final HtmlId FIELD_DETAIL = HtmlId.of("field-detail"); + static final HtmlId FIELD_SUMMARY = HtmlId.of("field-summary"); + static final HtmlId FOR_REMOVAL = HtmlId.of("for-removal"); + static final HtmlId METHOD_DETAIL = HtmlId.of("method-detail"); + static final HtmlId METHOD_SUMMARY = HtmlId.of("method-summary"); static final HtmlId METHOD_SUMMARY_TABLE = HtmlId.of("method-summary-table"); - static final HtmlId MODULES = HtmlId.of("modules.summary"); - static final HtmlId MODULE_DESCRIPTION = HtmlId.of("module.description"); - static final HtmlId NAVBAR_TOP = HtmlId.of("navbar.top"); - static final HtmlId NAVBAR_TOP_FIRSTROW = HtmlId.of("navbar.top.firstrow"); - static final HtmlId NESTED_CLASS_SUMMARY = HtmlId.of("nested.class.summary"); - static final HtmlId PACKAGES = HtmlId.of("packages.summary"); - static final HtmlId PACKAGE_DESCRIPTION = HtmlId.of("package.description"); + static final HtmlId MODULES = HtmlId.of("modules-summary"); + static final HtmlId MODULE_DESCRIPTION = HtmlId.of("module-description"); + static final HtmlId NAVBAR_TOP = HtmlId.of("navbar-top"); + static final HtmlId NAVBAR_TOP_FIRSTROW = HtmlId.of("navbar-top-firstrow"); + static final HtmlId NESTED_CLASS_SUMMARY = HtmlId.of("nested-class-summary"); + static final HtmlId PACKAGES = HtmlId.of("packages-summary"); + static final HtmlId PACKAGE_DESCRIPTION = HtmlId.of("package-description"); static final HtmlId PACKAGE_SUMMARY_TABLE = HtmlId.of("package-summary-table"); - static final HtmlId PROPERTY_DETAIL = HtmlId.of("property.detail"); - static final HtmlId PROPERTY_SUMMARY = HtmlId.of("property.summary"); - static final HtmlId SERVICES = HtmlId.of("services.summary"); - static final HtmlId SKIP_NAVBAR_TOP = HtmlId.of("skip.navbar.top"); - static final HtmlId UNNAMED_PACKAGE_ANCHOR = HtmlId.of("unnamed.package"); + static final HtmlId PROPERTY_DETAIL = HtmlId.of("property-detail"); + static final HtmlId PROPERTY_SUMMARY = HtmlId.of("property-summary"); + static final HtmlId SERVICES = HtmlId.of("services-summary"); + static final HtmlId SKIP_NAVBAR_TOP = HtmlId.of("skip-navbar-top"); + static final HtmlId UNNAMED_PACKAGE_ANCHOR = HtmlId.of("unnamed-package"); - private static final String ENUM_CONSTANTS_INHERITANCE = "enum.constants.inherited.from.class."; - private static final String FIELDS_INHERITANCE = "fields.inherited.from.class."; - private static final String METHODS_INHERITANCE = "methods.inherited.from.class."; - private static final String NESTED_CLASSES_INHERITANCE = "nested.classes.inherited.from.class."; - private static final String PROPERTIES_INHERITANCE = "properties.inherited.from.class."; + private static final String ENUM_CONSTANTS_INHERITANCE = "enum-constants-inherited-from-class-"; + private static final String FIELDS_INHERITANCE = "fields-inherited-from-class-"; + private static final String METHODS_INHERITANCE = "methods-inherited-from-class-"; + private static final String NESTED_CLASSES_INHERITANCE = "nested-classes-inherited-from-class-"; + private static final String PROPERTIES_INHERITANCE = "properties-inherited-from-class-"; /** * Creates a factory for element-specific ids. @@ -356,7 +355,7 @@ public class HtmlIds { * @return the id */ static HtmlId forLine(int lineNumber) { - return HtmlId.of("line." + lineNumber); + return HtmlId.of("line-" + lineNumber); } /** @@ -405,16 +404,16 @@ public class HtmlIds { case PACKAGE -> "package"; case INTERFACE -> "interface"; case CLASS -> "class"; - case ENUM -> "enum.class"; + case ENUM -> "enum-class"; case EXCEPTION -> "exception"; case ERROR -> "error"; - case ANNOTATION_TYPE -> "annotation.interface"; + case ANNOTATION_TYPE -> "annotation-interface"; case FIELD -> "field"; case METHOD -> "method"; case CONSTRUCTOR -> "constructor"; - case ENUM_CONSTANT -> "enum.constant"; - case ANNOTATION_TYPE_MEMBER -> "annotation.interface.member"; - case RECORD_CLASS -> "record.class"; + case ENUM_CONSTANT -> "enum-constant"; + case ANNOTATION_TYPE_MEMBER -> "annotation-interface-member"; + case RECORD_CLASS -> "record-class"; }); } diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SourceToHTMLConverter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SourceToHTMLConverter.java index d05c8d4c79e..806dafad9bf 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SourceToHTMLConverter.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SourceToHTMLConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -338,7 +338,7 @@ public class SourceToHTMLConverter { * @param e the element to check. * @return the name of the anchor. */ - public static String getAnchorName(Utils utils, Element e) { - return "line." + utils.getLineNumber(e); + public static HtmlId getAnchorName(Utils utils, Element e) { + return HtmlIds.forLine((int) utils.getLineNumber(e)); } } diff --git a/test/langtools/jdk/javadoc/doclet/AccessSkipNav/AccessSkipNav.java b/test/langtools/jdk/javadoc/doclet/AccessSkipNav/AccessSkipNav.java index 622ee4b21f8..6577029c9cc 100644 --- a/test/langtools/jdk/javadoc/doclet/AccessSkipNav/AccessSkipNav.java +++ b/test/langtools/jdk/javadoc/doclet/AccessSkipNav/AccessSkipNav.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -23,7 +23,7 @@ /* * @test - * @bug 4638136 7198273 8025633 8081854 8182765 8258659 + * @bug 4638136 7198273 8025633 8081854 8182765 8258659 8261976 * @summary Add ability to skip over nav bar for accessibility * @library ../../lib * @modules jdk.javadoc/jdk.javadoc.internal.tool @@ -51,9 +51,9 @@ public class AccessSkipNav extends JavadocTester { checkOutput("p1/C1.html", true, // Top navbar """ - Skip navigation links""", + Skip navigation links""", // Top navbar """ - """); + """); } } diff --git a/test/langtools/jdk/javadoc/doclet/DocRootSlash/DocRootSlash.java b/test/langtools/jdk/javadoc/doclet/DocRootSlash/DocRootSlash.java index 4ffd10e994a..52e547f7324 100644 --- a/test/langtools/jdk/javadoc/doclet/DocRootSlash/DocRootSlash.java +++ b/test/langtools/jdk/javadoc/doclet/DocRootSlash/DocRootSlash.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -23,7 +23,7 @@ /* * @test - * @bug 4524350 4662945 4633447 8196202 + * @bug 4524350 4662945 4633447 8196202 8261976 * @summary stddoclet: {@docRoot} inserts an extra trailing "/" * @library ../../lib * @modules jdk.javadoc/jdk.javadoc.internal.tool diff --git a/test/langtools/jdk/javadoc/doclet/DocRootSlash/overview.html b/test/langtools/jdk/javadoc/doclet/DocRootSlash/overview.html index 766bce489e1..28b32d24f4b 100644 --- a/test/langtools/jdk/javadoc/doclet/DocRootSlash/overview.html +++ b/test/langtools/jdk/javadoc/doclet/DocRootSlash/overview.html @@ -30,12 +30,13 @@ Sub-test 19 Actual: {@docRoot}/../ou Sub-test 19 Expect: ./../out/p2/C2.html

-Sub-test 20 Actual: {@docRoot}/p2/package-summary.html#package.description
-Sub-test 20 Expect: ./p2/package-summary.html#package.description +Sub-test 20 Actual: {@docRoot}/p2/package-summary.html#package-description
+Sub-test 20 Expect: ./p2/package-summary.html#package-description

-Sub-test 21 Actual: {@docRoot}/../out/p2/package-summary.html#package.description
-Sub-test 21 Expect: ./../out/p2/package-summary.html#package.description +Sub-test 21 Actual: {@docRoot}/../out/p2/package-summary.html#package-description
+Sub-test 21 Expect: ./../out/p2/package-summary.html#package-description diff --git a/test/langtools/jdk/javadoc/doclet/DocRootSlash/p1/C1.java b/test/langtools/jdk/javadoc/doclet/DocRootSlash/p1/C1.java index 51a345a0890..81d6c4552b6 100644 --- a/test/langtools/jdk/javadoc/doclet/DocRootSlash/p1/C1.java +++ b/test/langtools/jdk/javadoc/doclet/DocRootSlash/p1/C1.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -51,12 +51,12 @@ package p1; * Sub-test 5 Expect: ../../out/p2/C2.html *

* - * Sub-test 6 Actual: {@docRoot}/p2/package-summary.html#package.description
- * Sub-test 6 Expect: ../p2/package-summary.html#package.description + * Sub-test 6 Actual: {@docRoot}/p2/package-summary.html#package-description
+ * Sub-test 6 Expect: ../p2/package-summary.html#package-description *

* - * Sub-test 7 Actual: {@docRoot}/../out/p2/package-summary.html#package.description
- * Sub-test 7 Expect: ../../out/p2/package-summary.html#package.description + * Sub-test 7 Actual: {@docRoot}/../out/p2/package-summary.html#package-description
+ * Sub-test 7 Expect: ../../out/p2/package-summary.html#package-description * */ public class C1 { diff --git a/test/langtools/jdk/javadoc/doclet/DocRootSlash/p1/package.html b/test/langtools/jdk/javadoc/doclet/DocRootSlash/p1/package.html index 63ec94e1978..7a3201b6466 100644 --- a/test/langtools/jdk/javadoc/doclet/DocRootSlash/p1/package.html +++ b/test/langtools/jdk/javadoc/doclet/DocRootSlash/p1/package.html @@ -31,12 +31,12 @@ Sub-test 12 Actual: {@docRoot}/../ou Sub-test 12 Expect: ../../out/p2/C2.html

-Sub-test 13 Actual: {@docRoot}/p2/package-summary.html#package.description
-Sub-test 13 Expect: ../p2/package-summary.html#package.description +Sub-test 13 Actual: {@docRoot}/p2/package-summary.html#package-description
+Sub-test 13 Expect: ../p2/package-summary.html#package-description

-Sub-test 14 Actual: {@docRoot}/../out/p2/package-summary.html#package.description
-Sub-test 14 Expect: ../../out/p2/package-summary.html#package.description +Sub-test 14 Actual: {@docRoot}/../out/p2/package-summary.html#package-description
+Sub-test 14 Expect: ../../out/p2/package-summary.html#package-description diff --git a/test/langtools/jdk/javadoc/doclet/testAnchorNames/TestAnchorNames.java b/test/langtools/jdk/javadoc/doclet/testAnchorNames/TestAnchorNames.java index 7bcc787e641..3c8a0a83ced 100644 --- a/test/langtools/jdk/javadoc/doclet/testAnchorNames/TestAnchorNames.java +++ b/test/langtools/jdk/javadoc/doclet/testAnchorNames/TestAnchorNames.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -23,7 +23,7 @@ /* * @test - * @bug 8025633 8025524 8081854 8187521 8182765 + * @bug 8025633 8025524 8081854 8187521 8182765 8261976 * @summary Test for valid name attribute in HTML anchors. * @library /tools/lib ../../lib * @modules jdk.javadoc/jdk.javadoc.internal.tool @@ -62,25 +62,25 @@ public class TestAnchorNames extends JavadocTester { // Test some section markers and links to these markers checkOutput("pkg1/RegClass.html", true, """ - """, + """, """ - """, + """, """ -

+

Nested Class Summary

""", - "", + "", """ -
+

Method Summary

""", - "", + "", """ -
+

Field Details

""", - "", + "", """ -
+

Constructor Details

""", - ""); + ""); // Test some members and link to these members checkOutput("pkg1/RegClass.html", true, diff --git a/test/langtools/jdk/javadoc/doclet/testAnnotationOptional/TestAnnotationOptional.java b/test/langtools/jdk/javadoc/doclet/testAnnotationOptional/TestAnnotationOptional.java index 488cb9238c4..0971d7c616d 100644 --- a/test/langtools/jdk/javadoc/doclet/testAnnotationOptional/TestAnnotationOptional.java +++ b/test/langtools/jdk/javadoc/doclet/testAnnotationOptional/TestAnnotationOptional.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2021, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -23,7 +23,7 @@ /* * @test - * @bug 8025633 8081854 8182765 + * @bug 8025633 8081854 8182765 8261976 * @summary Make sure that annotations types with optional elements have * element headers * @library ../../lib @@ -50,6 +50,6 @@ public class TestAnnotationOptional extends JavadocTester { checkOutput("pkg/AnnotationOptional.html", true, """ -
"""); +
"""); } } diff --git a/test/langtools/jdk/javadoc/doclet/testAnnotationTypes/TestAnnotationTypes.java b/test/langtools/jdk/javadoc/doclet/testAnnotationTypes/TestAnnotationTypes.java index 313bfc650b8..8ad39de828c 100644 --- a/test/langtools/jdk/javadoc/doclet/testAnnotationTypes/TestAnnotationTypes.java +++ b/test/langtools/jdk/javadoc/doclet/testAnnotationTypes/TestAnnotationTypes.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2021, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -24,7 +24,7 @@ /* * @test * @bug 4973609 8015249 8025633 8026567 6469561 8071982 8162363 8182765 8223364 - 8242056 + 8242056 8261976 * @summary Make sure that annotation types with 0 members does not have * extra HR tags. * @library ../../lib @@ -53,10 +53,10 @@ public class TestAnnotationTypes extends JavadocTester { checkOutput("pkg/AnnotationTypeField.html", true, """
  • Summary: 
    • -
  • Field | 
    • """, +
  • Field | 
    • """, """
  • Detail: 
    • -
  • Field | 
    • """, +
  • Field | 
    • """, "", "

    Field Summary

    ", """ @@ -83,7 +83,7 @@ public class TestAnnotationTypes extends JavadocTester { "
      ", "
    • ", """ -
      """, +
      """, "

      Element Details

      ", "", "
        ", @@ -122,10 +122,10 @@ public class TestAnnotationTypes extends JavadocTester { checkOutput("pkg/AnnotationType.html", true, """ - public @interface AnnotationType"""); + public @interface AnnotationType"""); checkOutput("pkg/AnnotationTypeField.html", true, """ - public @interface AnnotationTypeField"""); + public @interface AnnotationTypeField"""); } } diff --git a/test/langtools/jdk/javadoc/doclet/testBackSlashInLink/TestBackSlashInLink.java b/test/langtools/jdk/javadoc/doclet/testBackSlashInLink/TestBackSlashInLink.java index 55378da0714..e5ef8841239 100644 --- a/test/langtools/jdk/javadoc/doclet/testBackSlashInLink/TestBackSlashInLink.java +++ b/test/langtools/jdk/javadoc/doclet/testBackSlashInLink/TestBackSlashInLink.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -23,7 +23,7 @@ /* * @test - * @bug 4511110 + * @bug 4511110 8261976 * @summary Test to make sure that the link to source documentation * has a forward slash. It would be wrong to use a back slash. * @library ../../lib @@ -50,6 +50,6 @@ public class TestBackSlashInLink extends JavadocTester { checkExit(Exit.OK); checkOutput("C.html", true, - "src-html/C.html#line.7"); + "src-html/C.html#line-7"); } } diff --git a/test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java b/test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java index 5fdfef942e3..08c19636357 100644 --- a/test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java +++ b/test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java @@ -24,7 +24,7 @@ /* * @test * @bug 4927552 8026567 8071982 8162674 8175200 8175218 8183511 8186332 - * 8169819 8074407 8191030 8182765 8184205 8243533 + * 8169819 8074407 8191030 8182765 8184205 8243533 8261976 * @summary test generated docs for deprecated items * @library ../../lib * @modules jdk.javadoc/jdk.javadoc.internal.tool @@ -267,26 +267,26 @@ public class TestDeprecatedDocs extends JavadocTester { checkOutput("deprecated-list.html", true, """ """, """ -
        +
        For Removal
        Element
        Description
        """, """ -
        +
        Enum Classes
        Enum Class
        diff --git a/test/langtools/jdk/javadoc/doclet/testHeadings/TestHeadings.java b/test/langtools/jdk/javadoc/doclet/testHeadings/TestHeadings.java index c062afa84c2..60242a2db1d 100644 --- a/test/langtools/jdk/javadoc/doclet/testHeadings/TestHeadings.java +++ b/test/langtools/jdk/javadoc/doclet/testHeadings/TestHeadings.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -23,7 +23,7 @@ /* * @test - * @bug 4905786 6259611 8162363 8196202 + * @bug 4905786 6259611 8162363 8196202 8261976 * @summary Make sure that headings use the TH tag instead of the TD tag. * @library ../../lib * @modules jdk.javadoc/jdk.javadoc.internal.tool @@ -64,7 +64,7 @@ public class TestHeadings extends JavadocTester {
        Field
        Description
        """, """ -

        Methods inherited from class java.lang.Object

        """); +

        Methods inherited from class java.lang.Object

        """); // Class use documentation checkOutput("pkg1/class-use/C1.html", true, diff --git a/test/langtools/jdk/javadoc/doclet/testHiddenTag/TestHiddenTag.java b/test/langtools/jdk/javadoc/doclet/testHiddenTag/TestHiddenTag.java index 4f6bbb12d81..a4d1f75ae40 100644 --- a/test/langtools/jdk/javadoc/doclet/testHiddenTag/TestHiddenTag.java +++ b/test/langtools/jdk/javadoc/doclet/testHiddenTag/TestHiddenTag.java @@ -23,7 +23,7 @@ /* * @test - * @bug 8073100 8182765 8196202 8261079 + * @bug 8073100 8182765 8196202 8261079 8261976 * @summary ensure the hidden tag works as intended * @library ../../lib * @modules jdk.javadoc/jdk.javadoc.internal.tool @@ -72,7 +72,7 @@ public class TestHiddenTag extends JavadocTester { """ visibleMethod""", """ -

        Nested classes/interfaces in\ +

        Nested classes/interfaces in\ herited from class pkg1.A

        A.VisibleInner, A.Visible\ diff --git a/test/langtools/jdk/javadoc/doclet/testHtmlTag/TestHtmlTag.java b/test/langtools/jdk/javadoc/doclet/testHtmlTag/TestHtmlTag.java index 66b75de1b1c..0aa51351f8d 100644 --- a/test/langtools/jdk/javadoc/doclet/testHtmlTag/TestHtmlTag.java +++ b/test/langtools/jdk/javadoc/doclet/testHtmlTag/TestHtmlTag.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2021, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -23,7 +23,7 @@ /* * @test - * @bug 6786682 4649116 8182765 + * @bug 6786682 4649116 8182765 8261976 * @summary This test verifies the use of lang attribute by . * @library ../../lib * @modules jdk.javadoc/jdk.javadoc.internal.tool @@ -109,7 +109,7 @@ public class TestHtmlTag extends JavadocTester { checkOutput("pkg3/package-summary.html", true, """ -
        +

        This is the first line. Note the newlines before the <p> is relevant.

        """); diff --git a/test/langtools/jdk/javadoc/doclet/testHtmlVersion/TestHtmlVersion.java b/test/langtools/jdk/javadoc/doclet/testHtmlVersion/TestHtmlVersion.java index 8383dbe8c78..19266f38cce 100644 --- a/test/langtools/jdk/javadoc/doclet/testHtmlVersion/TestHtmlVersion.java +++ b/test/langtools/jdk/javadoc/doclet/testHtmlVersion/TestHtmlVersion.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -24,7 +24,7 @@ /* * @test * @bug 8072945 8081854 8141492 8148985 8150188 4649116 8173707 8151743 8169819 8183037 8182765 8196202 - * 8202624 8210047 8184205 8221871 8223733 8223378 + * 8202624 8210047 8184205 8221871 8223733 8223378 8261976 * @summary Test the version of HTML generated by the javadoc tool. * @library ../../lib * @modules jdk.javadoc/jdk.javadoc.internal.tool @@ -74,7 +74,7 @@ public class TestHtmlVersion extends JavadocTester { "", " +