8261976: Normalize id's used by the standard doclet

Reviewed-by: hannesw

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
- * <a href="package-summary.html#package.description">package description</a>.
+ * <a href="package-summary.html#package-description">package description</a>.
  * 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:

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);

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";
         });
     }
 

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));
     }
 }

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 <a href>
                 """
-                    <a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a>""",
+                    <a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a>""",
                 // Top navbar <span id>
                 """
-                    <span class="skip-nav" id="skip.navbar.top"></span>""");
+                    <span class="skip-nav" id="skip-navbar-top"></span>""");
     }
 }

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

test/langtools/jdk/javadoc/doclet/DocRootSlash/overview.html

@@ -30,12 +30,13 @@ Sub-test 19 Actual: <A HREF="{@docRoot}/../out/p2/C2.html">{&#064;docRoot}/../ou
 Sub-test 19 Expect: <A HREF="./../out/p2/C2.html">./../out/p2/C2.html</A>
 <p>
 
-Sub-test 20 Actual: <A HREF="{@docRoot}/p2/package-summary.html#package.description">{&#064;docRoot}/p2/package-summary.html#package.description</A>  <br>
-Sub-test 20 Expect: <A HREF="./p2/package-summary.html#package.description">./p2/package-summary.html#package.description</A>
+Sub-test 20 Actual: <A
+        HREF="{@docRoot}/p2/package-summary.html#package-description">{&#064;docRoot}/p2/package-summary.html#package-description</A>  <br>
+Sub-test 20 Expect: <A HREF="./p2/package-summary.html#package-description">./p2/package-summary.html#package-description</A>
 <p>
 
-Sub-test 21 Actual: <A HREF="{@docRoot}/../out/p2/package-summary.html#package.description">{&#064;docRoot}/../out/p2/package-summary.html#package.description</A> <br>
-Sub-test 21 Expect: <A HREF="./../out/p2/package-summary.html#package.description">./../out/p2/package-summary.html#package.description</A>
+Sub-test 21 Actual: <A HREF="{@docRoot}/../out/p2/package-summary.html#package-description">{&#064;docRoot}/../out/p2/package-summary.html#package-description</A> <br>
+Sub-test 21 Expect: <A HREF="./../out/p2/package-summary.html#package-description">./../out/p2/package-summary.html#package-description</A>
 
 </BODY>
 </HTML>

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: <A HREF="../../out/p2/C2.html">../../out/p2/C2.html</A>
  * <p>
  *
- * Sub-test 6 Actual: <A HREF="{@docRoot}/p2/package-summary.html#package.description">{&#064;docRoot}/p2/package-summary.html#package.description</A> <br>
- * Sub-test 6 Expect: <A HREF="../p2/package-summary.html#package.description">../p2/package-summary.html#package.description</A>
+ * Sub-test 6 Actual: <A HREF="{@docRoot}/p2/package-summary.html#package-description">{&#064;docRoot}/p2/package-summary.html#package-description</A> <br>
+ * Sub-test 6 Expect: <A HREF="../p2/package-summary.html#package-description">../p2/package-summary.html#package-description</A>
  * <p>
  *
- * Sub-test 7 Actual: <A HREF="{@docRoot}/../out/p2/package-summary.html#package.description">{&#064;docRoot}/../out/p2/package-summary.html#package.description</A> <br>
- * Sub-test 7 Expect: <A HREF="../../out/p2/package-summary.html#package.description">../../out/p2/package-summary.html#package.description</A>
+ * Sub-test 7 Actual: <A HREF="{@docRoot}/../out/p2/package-summary.html#package-description">{&#064;docRoot}/../out/p2/package-summary.html#package-description</A> <br>
+ * Sub-test 7 Expect: <A HREF="../../out/p2/package-summary.html#package-description">../../out/p2/package-summary.html#package-description</A>
  *
  */
 public class C1 {

test/langtools/jdk/javadoc/doclet/DocRootSlash/p1/package.html

@@ -31,12 +31,12 @@ Sub-test 12 Actual: <A HREF="{@docRoot}/../out/p2/C2.html">{&#064;docRoot}/../ou
 Sub-test 12 Expect: <A HREF="../../out/p2/C2.html">../../out/p2/C2.html</A>
 <p>
 
-Sub-test 13 Actual: <A HREF="{@docRoot}/p2/package-summary.html#package.description">{&#064;docRoot}/p2/package-summary.html#package.description</A> <br>
-Sub-test 13 Expect: <A HREF="../p2/package-summary.html#package.description">../p2/package-summary.html#package.description</A>
+Sub-test 13 Actual: <A HREF="{@docRoot}/p2/package-summary.html#package-description">{&#064;docRoot}/p2/package-summary.html#package-description</A> <br>
+Sub-test 13 Expect: <A HREF="../p2/package-summary.html#package-description">../p2/package-summary.html#package-description</A>
 <p>
 
-Sub-test 14 Actual: <A HREF="{@docRoot}/../out/p2/package-summary.html#package.description">{&#064;docRoot}/../out/p2/package-summary.html#package.description</A> <br>
-Sub-test 14 Expect: <A HREF="../../out/p2/package-summary.html#package.description">../../out/p2/package-summary.html#package.description</A>
+Sub-test 14 Actual: <A HREF="{@docRoot}/../out/p2/package-summary.html#package-description">{&#064;docRoot}/../out/p2/package-summary.html#package-description</A> <br>
+Sub-test 14 Expect: <A HREF="../../out/p2/package-summary.html#package-description">../../out/p2/package-summary.html#package-description</A>
 
 </BODY>
 </HTML>

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,
                 """
-                    <span class="skip-nav" id="skip.navbar.top">""",
+                    <span class="skip-nav" id="skip-navbar-top">""",
                 """
-                    <a href="#skip.navbar.top" title="Skip navigation links">""",
+                    <a href="#skip-navbar-top" title="Skip navigation links">""",
                 """
-                    <section class="nested-class-summary" id="nested.class.summary">
+                    <section class="nested-class-summary" id="nested-class-summary">
                     <h2>Nested Class Summary</h2>""",
-                "<a href=\"#nested.class.summary\">",
+                "<a href=\"#nested-class-summary\">",
                 """
-                    <section class="method-summary" id="method.summary">
+                    <section class="method-summary" id="method-summary">
                     <h2>Method Summary</h2>""",
-                "<a href=\"#method.summary\">",
+                "<a href=\"#method-summary\">",
                 """
-                    <section class="field-details" id="field.detail">
+                    <section class="field-details" id="field-detail">
                     <h2>Field Details</h2>""",
-                "<a href=\"#field.detail\">",
+                "<a href=\"#field-detail\">",
                 """
-                    <section class="constructor-details" id="constructor.detail">
+                    <section class="constructor-details" id="constructor-detail">
                     <h2>Constructor Details</h2>""",
-                "<a href=\"#constructor.detail\">");
+                "<a href=\"#constructor-detail\">");
 
         // Test some members and link to these members
         checkOutput("pkg1/RegClass.html", true,

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,
             """
-                <section class="details" id="annotation.interface.element.detail">""");
+                <section class="details" id="annotation-interface-element-detail">""");
     }
 }

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,
                 """
                     <li>Summary:&nbsp;</li>
-                    <li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>""",
+                    <li><a href="#field-summary">Field</a>&nbsp;|&nbsp;</li>""",
                 """
                     <li>Detail:&nbsp;</li>
-                    <li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>""",
+                    <li><a href="#field-detail">Field</a>&nbsp;|&nbsp;</li>""",
                 "<!-- =========== FIELD SUMMARY =========== -->",
                 "<h2>Field Summary</h2>",
                 """
@@ -83,7 +83,7 @@ public class TestAnnotationTypes extends JavadocTester {
                     "<ul class=\"member-list\">",
                     "<li>",
                     """
-                        <section class="details" id="annotation.interface.element.detail">""",
+                        <section class="details" id="annotation-interface-element-detail">""",
                     "<h2>Element Details</h2>",
                     "</a>",
                     "<ul class=\"member-list\">",
@@ -122,10 +122,10 @@ public class TestAnnotationTypes extends JavadocTester {
 
         checkOutput("pkg/AnnotationType.html", true,
                 """
-                    <span class="modifiers">public @interface </span><span class="element-name"><a href="../src-html/pkg/AnnotationType.html#line.31">AnnotationType</a></span></div>""");
+                    <span class="modifiers">public @interface </span><span class="element-name"><a href="../src-html/pkg/AnnotationType.html#line-31">AnnotationType</a></span></div>""");
 
         checkOutput("pkg/AnnotationTypeField.html", true,
                 """
-                    <span class="modifiers">public @interface </span><span class="element-name"><a href="../src-html/pkg/AnnotationTypeField.html#line.31">AnnotationTypeField</a></span></div>""");
+                    <span class="modifiers">public @interface </span><span class="element-name"><a href="../src-html/pkg/AnnotationTypeField.html#line-31">AnnotationTypeField</a></span></div>""");
     }
 }

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");
     }
 }

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,
                 """
                     <ul>
-                    <li><a href="#forRemoval">For Removal</a></li>
+                    <li><a href="#for-removal">For Removal</a></li>
                     <li><a href="#class">Classes</a></li>
-                    <li><a href="#enum.class">Enum Classes</a></li>
+                    <li><a href="#enum-class">Enum Classes</a></li>
                     <li><a href="#exception">Exceptions</a></li>
                     <li><a href="#error">Errors</a></li>
-                    <li><a href="#annotation.interface">Annotation Interfaces</a></li>
+                    <li><a href="#annotation-interface">Annotation Interfaces</a></li>
                     <li><a href="#field">Fields</a></li>
                     <li><a href="#method">Methods</a></li>
                     <li><a href="#constructor">Constructors</a></li>
-                    <li><a href="#enum.constant">Enum Constants</a></li>
-                    <li><a href="#annotation.interface.member">Annotation Interface Elements</a></li>
+                    <li><a href="#enum-constant">Enum Constants</a></li>
+                    <li><a href="#annotation-interface-member">Annotation Interface Elements</a></li>
                     </ul>""",
                 """
-                    <div id="forRemoval">
+                    <div id="for-removal">
                     <div class="caption"><span>For Removal</span></div>
                     <div class="summary-table two-column-summary">
                     <div class="table-header col-first">Element</div>
                     <div class="table-header col-last">Description</div>""",
                 """
-                    <div id="enum.class">
+                    <div id="enum-class">
                     <div class="caption"><span>Enum Classes</span></div>
                     <div class="summary-table two-column-summary">
                     <div class="table-header col-first">Enum Class</div>

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 {
                     <div class="table-header col-second">Field</div>
                     <div class="table-header col-last">Description</div>""",
                 """
-                    <h3 id="methods.inherited.from.class.java.lang.Object">Methods inherited from class&nbsp;java.lang.Object</h3>""");
+                    <h3 id="methods-inherited-from-class-java.lang.Object">Methods inherited from class&nbsp;java.lang.Object</h3>""");
 
         // Class use documentation
         checkOutput("pkg1/class-use/C1.html", true,

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 {
                 """
                     <code><a href="A.html#visibleMethod()">visibleMethod</a></code>""",
                 """
-                    <h2 id="nested.classes.inherited.from.class.pkg1.A">Nested classes/interfaces in\
+                    <h2 id="nested-classes-inherited-from-class-pkg1.A">Nested classes/interfaces in\
                     herited from class&nbsp;pkg1.<a href="A.html" title="class in pkg1">A</a></h2>
                     <code><a href="A.VisibleInner.html" title="class in pkg1">A.VisibleInner</a>, <a\
                      href="A.VisibleInnerExtendsInvisibleInner.html" title="class in pkg1">A.Visible\

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 <HTML>.
  * @library ../../lib
  * @modules jdk.javadoc/jdk.javadoc.internal.tool
@@ -109,7 +109,7 @@ public class TestHtmlTag extends JavadocTester {
 
         checkOutput("pkg3/package-summary.html", true,
                 """
-                    <section class="package-description" id="package.description">
+                    <section class="package-description" id="package-description">
                     <div class="block"><p>This is the first line. Note the newlines before the &lt;p&gt; is relevant.</div>
                     </section>""");
 

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 {
                 "<!DOCTYPE HTML>",
                 "<meta name=\"dc.created\"",
                 """
-                    <ul id="navbar.top.firstrow" class="nav-list" title="Navigation">
+                    <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
                     """,
                 """
                     <div id="all-packages-table">
@@ -94,7 +94,7 @@ public class TestHtmlVersion extends JavadocTester {
                 "<!DOCTYPE HTML>",
                 "<meta name=\"dc.created\"",
                 """
-                    <ul id="navbar.top.firstrow" class="nav-list" title="Navigation">
+                    <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
                     """,
                 """
                     <div class="summary-table two-column-summary">""",
@@ -106,7 +106,7 @@ public class TestHtmlVersion extends JavadocTester {
                     <main role="main">
                     <div class="header">""",
                 """
-                    <section class="package-description" id="package.description">
+                    <section class="package-description" id="package-description">
                     <div class="block">Test package.</div>""",
                 """
                     <footer role="contentinfo">""",
@@ -126,7 +126,7 @@ public class TestHtmlVersion extends JavadocTester {
                 "<!DOCTYPE HTML>",
                 "<meta name=\"dc.created\"",
                 """
-                    <ul id="navbar.top.firstrow" class="nav-list" title="Navigation">
+                    <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
                     """,
                 "<li class=\"circle\">",
                 """
@@ -158,7 +158,7 @@ public class TestHtmlVersion extends JavadocTester {
                 "<!DOCTYPE HTML>",
                 "<meta name=\"dc.created\"",
                 """
-                    <ul id="navbar.top.firstrow" class="nav-list" title="Navigation">
+                    <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
                     """,
                 """
                     <div class="summary-table two-column-summary">""",
@@ -179,7 +179,7 @@ public class TestHtmlVersion extends JavadocTester {
                 "<!DOCTYPE HTML>",
                 "<meta name=\"dc.created\"",
                 """
-                    <ul id="navbar.top.firstrow" class="nav-list" title="Navigation">
+                    <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
                     """,
                 """
                     <div class="summary-table three-column-summary">""",
@@ -208,7 +208,7 @@ public class TestHtmlVersion extends JavadocTester {
                 "<!DOCTYPE HTML>",
                 "<meta name=\"dc.created\"",
                 """
-                    <ul id="navbar.top.firstrow" class="nav-list" title="Navigation">
+                    <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
                     """,
                 """
                     <div class="summary-table two-column-summary">""",
@@ -229,7 +229,7 @@ public class TestHtmlVersion extends JavadocTester {
                 "<!DOCTYPE HTML>",
                 "<meta name=\"dc.created\"",
                 """
-                    <ul id="navbar.top.firstrow" class="nav-list" title="Navigation">
+                    <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
                     """,
                 """
                     <header role="banner" class="flex-header">
@@ -252,7 +252,7 @@ public class TestHtmlVersion extends JavadocTester {
                 "<!DOCTYPE HTML>",
                 "<meta name=\"dc.created\"",
                 """
-                    <ul id="navbar.top.firstrow" class="nav-list" title="Navigation">
+                    <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
                     """,
                 "<li class=\"circle\">",
                 """
@@ -288,7 +288,7 @@ public class TestHtmlVersion extends JavadocTester {
                 "<!DOCTYPE HTML>",
                 "<meta name=\"dc.created\"",
                 """
-                    <ul id="navbar.top.firstrow" class="nav-list" title="Navigation">
+                    <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
                     """,
                 """
                     <header role="banner" class="flex-header">
@@ -315,7 +315,7 @@ public class TestHtmlVersion extends JavadocTester {
                 "<!DOCTYPE HTML>",
                 "<meta name=\"dc.created\"",
                 """
-                    <ul id="navbar.top.firstrow" class="nav-list" title="Navigation">
+                    <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
                     """,
                 """
                     <header role="banner" class="flex-header">
@@ -346,7 +346,7 @@ public class TestHtmlVersion extends JavadocTester {
                 "<!DOCTYPE HTML>",
                 "<meta name=\"dc.created\"",
                 """
-                    <ul id="navbar.top.firstrow" class="nav-list" title="Navigation">
+                    <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
                     """,
                 """
                     <header role="banner" class="flex-header">
@@ -357,33 +357,33 @@ public class TestHtmlVersion extends JavadocTester {
                     <!-- ======== START OF CLASS DATA ======== -->
                     <div class="header">""",
                 """
-                    <section class="nested-class-summary" id="nested.class.summary">
+                    <section class="nested-class-summary" id="nested-class-summary">
                     <h2>Nested Class Summary</h2>
                     <div class="caption"><span>Nested Classes</span></div>
                     <div class="summary-table three-column-summary">""",
                 """
-                    <section class="field-summary" id="field.summary">
+                    <section class="field-summary" id="field-summary">
                     <h2>Field Summary</h2>
                     <div class="caption"><span>Fields</span></div>
                     <div class="summary-table three-column-summary">""",
                 """
-                    <section class="constructor-summary" id="constructor.summary">
+                    <section class="constructor-summary" id="constructor-summary">
                     <h2>Constructor Summary</h2>
                     <div class="caption"><span>Constructors</span></div>
                     <div class="summary-table two-column-summary">""",
                 """
-                    <section class="method-summary" id="method.summary">
+                    <section class="method-summary" id="method-summary">
                     <h2>Method Summary</h2>""",
                 """
-                    <section class="field-details" id="field.detail">
+                    <section class="field-details" id="field-detail">
                     <h2>Field Details</h2>
                     """,
                 """
-                    <section class="constructor-details" id="constructor.detail">
+                    <section class="constructor-details" id="constructor-detail">
                     <h2>Constructor Details</h2>
                     """,
                 """
-                    <section class="method-details" id="method.detail">
+                    <section class="method-details" id="method-detail">
                     <h2>Method Details</h2>
                     """,
                 """
@@ -396,7 +396,7 @@ public class TestHtmlVersion extends JavadocTester {
                 "<!DOCTYPE HTML>",
                 "<meta name=\"dc.created\"",
                 """
-                    <ul id="navbar.top.firstrow" class="nav-list" title="Navigation">
+                    <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
                     """,
                 """
                     <header role="banner" class="flex-header">
@@ -407,7 +407,7 @@ public class TestHtmlVersion extends JavadocTester {
                     <!-- ======== START OF CLASS DATA ======== -->
                     <div class="header">""",
                 """
-                    <section class="constants-summary" id="enum.constant.summary">
+                    <section class="constants-summary" id="enum-constant-summary">
                     <h2>Enum Constant Summary</h2>
                     <div class="caption"><span>Enum Constants</span></div>
                     """,
@@ -415,16 +415,16 @@ public class TestHtmlVersion extends JavadocTester {
                     <div class="summary-table three-column-summary" aria-labelledby="method-summary-table-tab0">
                     """,
                 """
-                    <section class="method-summary" id="method.summary">
+                    <section class="method-summary" id="method-summary">
                     <h2>Method Summary</h2>
                     <div id="method-summary-table">
                     """,
                 """
-                    <section class="constant-details" id="enum.constant.detail">
+                    <section class="constant-details" id="enum-constant-detail">
                     <h2>Enum Constant Details</h2>
                     """,
                 """
-                    <section class="method-details" id="method.detail">
+                    <section class="method-details" id="method-detail">
                     <h2>Method Details</h2>
                     """,
                 """
@@ -437,7 +437,7 @@ public class TestHtmlVersion extends JavadocTester {
                 "<!DOCTYPE HTML>",
                 "<meta name=\"dc.created\"",
                 """
-                    <ul id="navbar.top.firstrow" class="nav-list" title="Navigation">
+                    <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
                     """,
                 """
                     <header role="banner" class="flex-header">
@@ -448,7 +448,7 @@ public class TestHtmlVersion extends JavadocTester {
                     <!-- ======== START OF CLASS DATA ======== -->
                     <div class="header">""",
                 """
-                    <section class="method-summary" id="method.summary">
+                    <section class="method-summary" id="method-summary">
                     <h2>Method Summary</h2>
                     <div id="method-summary-table">
                     """,
@@ -456,7 +456,7 @@ public class TestHtmlVersion extends JavadocTester {
                     <div class="summary-table three-column-summary" aria-labelledby="method-summary-table-tab0">
                     """,
                 """
-                    <section class="method-details" id="method.detail">
+                    <section class="method-details" id="method-detail">
                     <h2>Method Details</h2>
                     """,
                 """
@@ -469,7 +469,7 @@ public class TestHtmlVersion extends JavadocTester {
                 "<!DOCTYPE HTML>",
                 "<meta name=\"dc.created\"",
                 """
-                    <ul id="navbar.top.firstrow" class="nav-list" title="Navigation">
+                    <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
                     """,
                 """
                     <header role="banner" class="flex-header">
@@ -480,10 +480,10 @@ public class TestHtmlVersion extends JavadocTester {
                     <!-- ======== START OF CLASS DATA ======== -->
                     <div class="header">""",
                 """
-                    <section class="constructor-summary" id="constructor.summary">
+                    <section class="constructor-summary" id="constructor-summary">
                     <h2>Constructor Summary</h2>""",
                 """
-                    <section class="constructor-details" id="constructor.detail">
+                    <section class="constructor-details" id="constructor-detail">
                     <h2>Constructor Details</h2>
                     """,
                 """
@@ -496,7 +496,7 @@ public class TestHtmlVersion extends JavadocTester {
                 "<!DOCTYPE HTML>",
                 "<meta name=\"dc.created\"",
                 """
-                    <ul id="navbar.top.firstrow" class="nav-list" title="Navigation">
+                    <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
                     """,
                 """
                     <header role="banner" class="flex-header">
@@ -507,10 +507,10 @@ public class TestHtmlVersion extends JavadocTester {
                     <!-- ======== START OF CLASS DATA ======== -->
                     <div class="header">""",
                 """
-                    <section class="constructor-summary" id="constructor.summary">
+                    <section class="constructor-summary" id="constructor-summary">
                     <h2>Constructor Summary</h2>""",
                 """
-                    <section class="constructor-details" id="constructor.detail">
+                    <section class="constructor-details" id="constructor-detail">
                     <h2>Constructor Details</h2>
                     """,
                 """
@@ -523,7 +523,7 @@ public class TestHtmlVersion extends JavadocTester {
                 "<!DOCTYPE HTML>",
                 "<meta name=\"dc.created\"",
                 """
-                    <ul id="navbar.top.firstrow" class="nav-list" title="Navigation">
+                    <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
                     """,
                 """
                     <header role="banner" class="flex-header">
@@ -534,17 +534,17 @@ public class TestHtmlVersion extends JavadocTester {
                     <!-- ======== START OF CLASS DATA ======== -->
                     <div class="header">""",
                 """
-                    <section class="member-summary" id="annotation.interface.required.element.summary">
+                    <section class="member-summary" id="annotation-interface-required-element-summary">
                     <h2>Required Element Summary</h2>
                     <div class="caption"><span>Required Elements</span></div>
                     <div class="summary-table three-column-summary">""",
                 """
-                    <section class="member-summary" id="annotation.interface.optional.element.summary">
+                    <section class="member-summary" id="annotation-interface-optional-element-summary">
                     <h2>Optional Element Summary</h2>
                     <div class="caption"><span>Optional Elements</span></div>
                     <div class="summary-table three-column-summary">""",
                 """
-                    <section class="details" id="annotation.interface.element.detail">
+                    <section class="details" id="annotation-interface-element-detail">
                     <ul class="details-list">
                     <!-- ============ ANNOTATION INTERFACE MEMBER DETAIL =========== -->
                     <li>
@@ -561,7 +561,7 @@ public class TestHtmlVersion extends JavadocTester {
                 "<!DOCTYPE HTML>",
                 "<meta name=\"dc.created\"",
                 """
-                    <ul id="navbar.top.firstrow" class="nav-list" title="Navigation">
+                    <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
                     """,
                 """
                     <header role="banner" class="flex-header">
@@ -593,7 +593,7 @@ public class TestHtmlVersion extends JavadocTester {
                     <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">""",
                 "<meta name=\"date\"",
                 """
-                    <a name="navbar.top.firstrow">
+                    <a name="navbar-top-firstrow">
                     <!--   -->
                     </a>""",
                 """
@@ -609,12 +609,12 @@ public class TestHtmlVersion extends JavadocTester {
                     <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">""",
                 "<meta name=\"date\"",
                 """
-                    <a name="navbar.top.firstrow">
+                    <a name="navbar-top-firstrow">
                     <!--   -->
                     </a>""",
                 """
                     <section>
-                    <h2 title="PackagAnotherClass.ModalExclusionType.htmle pkg Description">Package pkg Description</h2>
+                    <h2 title="PackageAnotherClass.ModalExclusionType.html pkg Description">Package pkg Description</h2>
                     """,
                 """
                     <div class="type-summary">
@@ -641,7 +641,7 @@ public class TestHtmlVersion extends JavadocTester {
                     <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">""",
                 "<meta name=\"date\"",
                 """
-                    <a name="navbar.top.firstrow">
+                    <a name="navbar-top-firstrow">
                     <!--   -->
                     </a>""");
 
@@ -651,7 +651,7 @@ public class TestHtmlVersion extends JavadocTester {
                     <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">""",
                 "<meta name=\"date\"",
                 """
-                    <a name="navbar.top.firstrow">
+                    <a name="navbar-top-firstrow">
                     <!--   -->
                     </a>""",
                 """
@@ -664,7 +664,7 @@ public class TestHtmlVersion extends JavadocTester {
                     <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">""",
                 "<meta name=\"date\"",
                 """
-                    <a name="navbar.top.firstrow">
+                    <a name="navbar-top-firstrow">
                     <!--   -->
                     </a>""",
                 """
@@ -681,7 +681,7 @@ public class TestHtmlVersion extends JavadocTester {
                     <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">""",
                 "<meta name=\"date\"",
                 """
-                    <a name="navbar.top.firstrow">
+                    <a name="navbar-top-firstrow">
                     <!--   -->
                     </a>""",
                 """
@@ -727,7 +727,7 @@ public class TestHtmlVersion extends JavadocTester {
                     <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">""",
                 "<meta name=\"date\"",
                 """
-                    <a name="navbar.top.firstrow">
+                    <a name="navbar-top-firstrow">
                     <!--   -->
                     </a>""",
                 """
@@ -744,7 +744,7 @@ public class TestHtmlVersion extends JavadocTester {
                     <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">""",
                 "<meta name=\"date\"",
                 """
-                    <a name="navbar.top.firstrow">
+                    <a name="navbar-top-firstrow">
                     <!--   -->
                     </a>""",
                 """
@@ -767,7 +767,7 @@ public class TestHtmlVersion extends JavadocTester {
                     <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">""",
                 "<meta name=\"date\"",
                 """
-                    <a name="navbar.top.firstrow">
+                    <a name="navbar-top-firstrow">
                     <!--   -->
                     </a>""",
                 """
@@ -789,7 +789,7 @@ public class TestHtmlVersion extends JavadocTester {
                     <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">""",
                 "<meta name=\"date\"",
                 """
-                    <a name="navbar.top.firstrow">
+                    <a name="navbar-top-firstrow">
                     <!--   -->
                     </a>""",
                 """
@@ -811,7 +811,7 @@ public class TestHtmlVersion extends JavadocTester {
                     <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">""",
                 "<meta name=\"date\"",
                 """
-                    <a name="navbar.top.firstrow">
+                    <a name="navbar-top-firstrow">
                     <!--   -->
                     </a>""",
                 """
@@ -878,7 +878,7 @@ public class TestHtmlVersion extends JavadocTester {
                     <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">""",
                 "<meta name=\"date\"",
                 """
-                    <a name="navbar.top.firstrow">
+                    <a name="navbar-top-firstrow">
                     <!--   -->
                     </a>""",
                 """
@@ -920,7 +920,7 @@ public class TestHtmlVersion extends JavadocTester {
                     <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">""",
                 "<meta name=\"date\"",
                 """
-                    <a name="navbar.top.firstrow">
+                    <a name="navbar-top-firstrow">
                     <!--   -->
                     </a>""",
                 """
@@ -946,7 +946,7 @@ public class TestHtmlVersion extends JavadocTester {
                     <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">""",
                 "<meta name=\"date\"",
                 """
-                    <a name="navbar.top.firstrow">
+                    <a name="navbar-top-firstrow">
                     <!--   -->
                     </a>""",
                 """
@@ -970,7 +970,7 @@ public class TestHtmlVersion extends JavadocTester {
                     <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">""",
                 "<meta name=\"date\"",
                 """
-                    <a name="navbar.top.firstrow">
+                    <a name="navbar-top-firstrow">
                     <!--   -->
                     </a>""",
                 """
@@ -994,7 +994,7 @@ public class TestHtmlVersion extends JavadocTester {
                     <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">""",
                 "<meta name=\"date\"",
                 """
-                    <a name="navbar.top.firstrow">
+                    <a name="navbar-top-firstrow">
                     <!--   -->
                     </a>""",
                 """
@@ -1029,7 +1029,7 @@ public class TestHtmlVersion extends JavadocTester {
                     <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">""",
                 "<meta name=\"date\"",
                 """
-                    <a name="navbar.top.firstrow">
+                    <a name="navbar-top-firstrow">
                     <!--   -->
                     </a>""",
                 """

test/langtools/jdk/javadoc/doclet/testInterface/TestInterface.java

@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug      4682448 4947464 5029946 8025633 8026567 8035473 8139101 8175200
-             8186332 8186703 8182765 8187288
+             8186332 8186703 8182765 8187288 8261976
  * @summary  Verify that the public modifier does not show up in the
  *           documentation for public methods, as recommended by the JLS.
  *           If A implements I and B extends A, B should be in the list of
@@ -191,7 +191,7 @@ public class TestInterface extends JavadocTester {
         checkOutput("pkg2/Spliterator.OfDouble.html", true,
             // Ensure the correct type parameters are displayed correctly
             """
-                <h2 id="nested.classes.inherited.from.class.pkg2.Spliterator">Nested classes/int\
+                <h2 id="nested-classes-inherited-from-class-pkg2.Spliterator">Nested classes/int\
                 erfaces inherited from interface&nbsp;pkg2.<a href="Spliterator.html" title="int\
                 erface in pkg2">Spliterator</a></h2>
                 <code><a href="Spliterator.OfDouble.html" title="interface in pkg2">Spliterator.\

test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java

@@ -25,7 +25,7 @@
  * @test
  * @bug 7112427 8012295 8025633 8026567 8061305 8081854 8150130 8162363
  *      8167967 8172528 8175200 8178830 8182257 8186332 8182765 8025091
- *      8203791 8184205 8249633
+ *      8203791 8184205 8249633 8261976
  * @summary Test of the JavaFX doclet features.
  * @library ../../lib
  * @modules jdk.javadoc/jdk.javadoc.internal.tool
@@ -176,7 +176,7 @@ public class TestJavaFX extends JavadocTester {
                     <dt>Since:</dt>
                     <dd>JavaFX 8.0</dd>""",
                 """
-                    <section class="property-summary" id="property.summary">
+                    <section class="property-summary" id="property-summary">
                     <h2>Property Summary</h2>
                     <div class="caption"><span>Properties</span></div>
                     <div class="summary-table three-column-summary">""",
@@ -223,7 +223,7 @@ public class TestJavaFX extends JavadocTester {
 
         checkOutput("pkg1/D.html", true,
                 """
-                    <h3 id="properties.inherited.from.class.pkg1.C">Properties inherited from class&\
+                    <h3 id="properties-inherited-from-class-pkg1.C">Properties inherited from class&\
                     nbsp;pkg1.<a href="C.html" title="class in pkg1">C</a></h3>
                     <code><a href="C.html#pausedProperty">paused</a>, <a href="C.html#rateProperty">rate</a></code></div>""");
 
@@ -246,7 +246,7 @@ public class TestJavaFX extends JavadocTester {
         checkExit(Exit.OK);
         checkOutput("pkg2/Test.html", true,
                 """
-                    <section class="property-details" id="property.detail">
+                    <section class="property-details" id="property-detail">
                     <h2>Property Details</h2>
                     <ul class="member-list">
                     <li>
@@ -276,7 +276,7 @@ public class TestJavaFX extends JavadocTester {
                     </ul>
                     </section>""",
                 """
-                    <section class="property-summary" id="property.summary">
+                    <section class="property-summary" id="property-summary">
                     <h2>Property Summary</h2>
                     <div class="caption"><span>Properties</span></div>
                     <div class="summary-table three-column-summary">""");

test/langtools/jdk/javadoc/doclet/testLists/TestLists.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 8241625 8241895 8242326
+ * @bug 8241625 8241895 8242326 8261976
  * @summary test the lists generated by the doclet
  * @library  /tools/lib ../../lib
  * @modules  jdk.javadoc/jdk.javadoc.internal.tool
@@ -88,7 +88,7 @@ public class TestLists extends JavadocTester {
                     <section class="detail" id="&lt;init&gt;()">
                     <h3>C</h3>""",
                 """
-                    <section class="method-details" id="method.detail">
+                    <section class="method-details" id="method-detail">
                     <h2>Method Details</h2>
                     <ul class="member-list">
                     <li>
@@ -145,7 +145,7 @@ public class TestLists extends JavadocTester {
                     <ul class="details-list">
                     <!-- ============ FIELD DETAIL =========== -->
                     <li>
-                    <section class="field-details" id="field.detail">
+                    <section class="field-details" id="field-detail">
                     <h2>Field Details</h2>
                     <ul class="member-list">""",
                 """
@@ -154,7 +154,7 @@ public class TestLists extends JavadocTester {
                     </li>
                     <!-- ========= CONSTRUCTOR DETAIL ======== -->
                     <li>
-                    <section class="constructor-details" id="constructor.detail">
+                    <section class="constructor-details" id="constructor-detail">
                     <h2>Constructor Details</h2>
                     <ul class="member-list">""");
 
@@ -164,7 +164,7 @@ public class TestLists extends JavadocTester {
                     <ul class="details-list">
                     <!-- ============ ENUM CONSTANT DETAIL =========== -->
                     <li>
-                    <section class="constant-details" id="enum.constant.detail">
+                    <section class="constant-details" id="enum-constant-detail">
                     <h2>Enum Constant Details</h2>
                     <ul class="member-list">""");
 
@@ -211,7 +211,7 @@ public class TestLists extends JavadocTester {
                     <ul class="summary-list">
                     <!-- =========== FIELD SUMMARY =========== -->
                     <li>
-                    <section class="field-summary" id="field.summary">
+                    <section class="field-summary" id="field-summary">
                     <h2>Field Summary</h2>
                     <div class="caption"><span>Fields</span></div>
                     <div class="summary-table three-column-summary">""",
@@ -220,7 +220,7 @@ public class TestLists extends JavadocTester {
                     </li>
                     <!-- ======== CONSTRUCTOR SUMMARY ======== -->
                     <li>
-                    <section class="constructor-summary" id="constructor.summary">
+                    <section class="constructor-summary" id="constructor-summary">
                     <h2>Constructor Summary</h2>
                     <div class="caption"><span>Constructors</span></div>
                     <div class="summary-table two-column-summary">""");
@@ -231,7 +231,7 @@ public class TestLists extends JavadocTester {
                     </li>
                     <!-- =========== ENUM CONSTANT SUMMARY =========== -->
                     <li>
-                    <section class="constants-summary" id="enum.constant.summary">
+                    <section class="constants-summary" id="enum-constant-summary">
                     <h2>Enum Constant Summary</h2>
                     <div class="caption"><span>Enum Constants</span></div>
                     <div class="summary-table two-column-summary">""");
@@ -242,7 +242,7 @@ public class TestLists extends JavadocTester {
                     <ul class="summary-list">
                     <!-- =========== ANNOTATION INTERFACE REQUIRED MEMBER SUMMARY =========== -->
                     <li>
-                    <section class="member-summary" id="annotation.interface.required.element.summary">
+                    <section class="member-summary" id="annotation-interface-required-element-summary">
                     <h2>Required Element Summary</h2>
                     <div class="caption"><span>Required Elements</span></div>
                     <div class="summary-table three-column-summary">""");

test/langtools/jdk/javadoc/doclet/testModules/TestModuleServicesLink.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 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 8185151 8196200
+ * @bug 8185151 8196200 8261976
  * @summary test that navigation summary links are not linked when there are no dependencies
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.main
@@ -72,10 +72,10 @@ public class TestModuleServicesLink extends JavadocTester {
 
         checkOutput("m/module-summary.html", true,
                 """
-                    <li><a href="#module.description">Description</a>&nbsp;|&nbsp;</li>
+                    <li><a href="#module-description">Description</a>&nbsp;|&nbsp;</li>
                     <li>Modules&nbsp;|&nbsp;</li>
-                    <li><a href="#packages.summary">Packages</a>&nbsp;|&nbsp;</li>
-                    <li><a href="#services.summary">Services</a></li>""");
+                    <li><a href="#packages-summary">Packages</a>&nbsp;|&nbsp;</li>
+                    <li><a href="#services-summary">Services</a></li>""");
 
     }
 
@@ -97,10 +97,10 @@ public class TestModuleServicesLink extends JavadocTester {
 
         checkOutput("m/module-summary.html", true,
                 """
-                    <li><a href="#module.description">Description</a>&nbsp;|&nbsp;</li>
+                    <li><a href="#module-description">Description</a>&nbsp;|&nbsp;</li>
                     <li>Modules&nbsp;|&nbsp;</li>
-                    <li><a href="#packages.summary">Packages</a>&nbsp;|&nbsp;</li>
-                    <li><a href="#services.summary">Services</a></li>""");
+                    <li><a href="#packages-summary">Packages</a>&nbsp;|&nbsp;</li>
+                    <li><a href="#services-summary">Services</a></li>""");
 
     }
 
@@ -122,7 +122,7 @@ public class TestModuleServicesLink extends JavadocTester {
                 """
                     <li>Description&nbsp;|&nbsp;</li>
                     <li>Modules&nbsp;|&nbsp;</li>
-                    <li><a href="#packages.summary">Packages</a>&nbsp;|&nbsp;</li>
+                    <li><a href="#packages-summary">Packages</a>&nbsp;|&nbsp;</li>
                     <li>Services</li>""");
     }
 

test/langtools/jdk/javadoc/doclet/testModules/TestModules.java

@@ -27,7 +27,7 @@
  *      8168766 8168688 8162674 8160196 8175799 8174974 8176778 8177562 8175218
  *      8175823 8166306 8178043 8181622 8183511 8169819 8074407 8183037 8191464
  *      8164407 8192007 8182765 8196200 8196201 8196202 8196202 8205593 8202462
- *      8184205 8219060 8223378 8234746 8239804 8239816 8253117 8245058
+ *      8184205 8219060 8223378 8234746 8239804 8239816 8253117 8245058 8261976
  * @summary Test modules support in javadoc.
  * @library ../../lib
  * @modules jdk.javadoc/jdk.javadoc.internal.tool
@@ -464,7 +464,7 @@ public class TestModules extends JavadocTester {
         checkOutput("moduleA/module-summary.html", found,
                 """
                     <!-- ============ MODULE DESCRIPTION =========== -->
-                    <a name="module.description">
+                    <a name="module-description">
                     <!--   -->
                     </a>
                     <div class="block">This is a test description for the moduleA module with a Sear\
@@ -473,7 +473,7 @@ public class TestModules extends JavadocTester {
         checkOutput("moduleB/module-summary.html", found,
                 """
                     <!-- ============ MODULE DESCRIPTION =========== -->
-                    <a name="module.description">
+                    <a name="module-description">
                     <!--   -->
                     </a>
                     <div class="block">This is a test description for the moduleB module. Search wor\
@@ -501,7 +501,7 @@ public class TestModules extends JavadocTester {
     void checkHtml5Description(boolean found) {
         checkOutput("moduleA/module-summary.html", found,
                 """
-                    <section class="module-description" id="module.description">
+                    <section class="module-description" id="module-description">
                     <div class="deprecation-block"><span class="deprecated-label">Deprecated, for re\
                     moval: This API element is subject to removal in a future version.</span>
                     <div class="deprecation-comment">This module is deprecated.</div>
@@ -512,7 +512,7 @@ public class TestModules extends JavadocTester {
                     .</div>""");
         checkOutput("moduleB/module-summary.html", found,
                 """
-                    <section class="module-description" id="module.description">
+                    <section class="module-description" id="module-description">
                     <!-- ============ MODULE DESCRIPTION =========== -->
                     <div class="block">This is a test description for the moduleB module. Search wor\
                     d <span id="search_word" class="search-tag-result">search_word</span> with no de\
@@ -551,7 +551,7 @@ public class TestModules extends JavadocTester {
                     <section class="summary">
                     <ul class="summary-list">
                     <li>
-                    <section class="packages-summary" id="packages.summary">
+                    <section class="packages-summary" id="packages-summary">
                     <!-- ============ PACKAGES SUMMARY =========== -->""");
         checkOutput("moduleB/module-summary.html", found,
                 """
@@ -567,7 +567,7 @@ public class TestModules extends JavadocTester {
                     <section class="summary">
                     <ul class="summary-list">
                     <li>
-                    <section class="packages-summary" id="packages.summary">
+                    <section class="packages-summary" id="packages-summary">
                     <!-- ============ PACKAGES SUMMARY =========== -->""");
     }
 
@@ -715,20 +715,20 @@ public class TestModules extends JavadocTester {
                 """
                     <ul class="sub-nav-list">
                     <li>Module:&nbsp;</li>
-                    <li><a href="#module.description">Description</a>&nbsp;|&nbsp;</li>
-                    <li><a href="#modules.summary">Modules</a>&nbsp;|&nbsp;</li>
-                    <li><a href="#packages.summary">Packages</a>&nbsp;|&nbsp;</li>
+                    <li><a href="#module-description">Description</a>&nbsp;|&nbsp;</li>
+                    <li><a href="#modules-summary">Modules</a>&nbsp;|&nbsp;</li>
+                    <li><a href="#packages-summary">Packages</a>&nbsp;|&nbsp;</li>
                     <li>Services</li>
                     </ul>""",
                 """
-                    <section class="modules-summary" id="modules.summary">
+                    <section class="modules-summary" id="modules-summary">
                     <!-- ============ MODULES SUMMARY =========== -->
                     <h2>Modules</h2>""",
                 """
                     <div class="col-first even-row-color package-summary-table package-summary-table-tab1"><a href="testpkgmdlA/package-summary.html">testpkgmdlA</a></div>
                     <div class="col-last even-row-color package-summary-table package-summary-table-tab1">&nbsp;</div>""",
                 """
-                    <section class="packages-summary" id="packages.summary">
+                    <section class="packages-summary" id="packages-summary">
                     <!-- ============ PACKAGES SUMMARY =========== -->
                     <h2>Packages</h2>""",
                 """
@@ -740,10 +740,10 @@ public class TestModules extends JavadocTester {
                     """);
         checkOutput("moduleB/module-summary.html", true,
                 """
-                    <li><a href="#module.description">Description</a>&nbsp;|&nbsp;</li>
+                    <li><a href="#module-description">Description</a>&nbsp;|&nbsp;</li>
                     <li>Modules&nbsp;|&nbsp;</li>
-                    <li><a href="#packages.summary">Packages</a>&nbsp;|&nbsp;</li>
-                    <li><a href="#services.summary">Services</a></li>""",
+                    <li><a href="#packages-summary">Packages</a>&nbsp;|&nbsp;</li>
+                    <li><a href="#services-summary">Services</a></li>""",
                 """
                     <!-- ============ PACKAGES SUMMARY =========== -->
                     <h2>Packages</h2>""",
@@ -885,9 +885,9 @@ public class TestModules extends JavadocTester {
                     </div>""");
         checkOutput("moduleA/module-summary.html", true,
                 """
-                    <li><a href="#module.description">Description</a>&nbsp;|&nbsp;</li>
-                    <li><a href="#modules.summary">Modules</a>&nbsp;|&nbsp;</li>
-                    <li><a href="#packages.summary">Packages</a>&nbsp;|&nbsp;</li>
+                    <li><a href="#module-description">Description</a>&nbsp;|&nbsp;</li>
+                    <li><a href="#modules-summary">Modules</a>&nbsp;|&nbsp;</li>
+                    <li><a href="#packages-summary">Packages</a>&nbsp;|&nbsp;</li>
                     <li>Services</li>""",
                 """
                     <div class="col-first even-row-color"><a href="../moduleB/module-summary.html">moduleB</a></div>
@@ -898,9 +898,9 @@ public class TestModules extends JavadocTester {
                     <div class="col-first even-row-color package-summary-table package-summary-table-tab1"><a href="testpkgmdltags/package-summary.html">testpkgmdltags</a></div>
                     <div class="col-last even-row-color package-summary-table package-summary-table-tab1">&nbsp;</div>""",
                 """
-                    <li><a href="#module.description">Description</a>&nbsp;|&nbsp;</li>
-                    <li><a href="#modules.summary">Modules</a>&nbsp;|&nbsp;</li>
-                    <li><a href="#packages.summary">Packages</a>&nbsp;|&nbsp;</li>
+                    <li><a href="#module-description">Description</a>&nbsp;|&nbsp;</li>
+                    <li><a href="#modules-summary">Modules</a>&nbsp;|&nbsp;</li>
+                    <li><a href="#packages-summary">Packages</a>&nbsp;|&nbsp;</li>
                     <li>Services</li>""",
                 """
                     <div class="caption"><span>Indirect Requires</span></div>
@@ -944,10 +944,10 @@ public class TestModules extends JavadocTester {
                     <div class="col-last even-row-color package-summary-table package-summary-table-tab1">&nbsp;</div>""");
         checkOutput("moduleB/module-summary.html", found,
                 """
-                    <li><a href="#module.description">Description</a>&nbsp;|&nbsp;</li>
+                    <li><a href="#module-description">Description</a>&nbsp;|&nbsp;</li>
                     <li>Modules&nbsp;|&nbsp;</li>
-                    <li><a href="#packages.summary">Packages</a>&nbsp;|&nbsp;</li>
-                    <li><a href="#services.summary">Services</a></li>""",
+                    <li><a href="#packages-summary">Packages</a>&nbsp;|&nbsp;</li>
+                    <li><a href="#services-summary">Services</a></li>""",
                 """
                     <div class="col-first even-row-color package-summary-table package-summary-table-tab2"><a href="testpkgmdlB/package-summary.html">testpkgmdlB</a></div>
                     <div class="col-last even-row-color package-summary-table package-summary-table-tab2">&nbsp;</div>""",
@@ -1014,10 +1014,10 @@ public class TestModules extends JavadocTester {
                     <div class="col-last even-row-color package-summary-table package-summary-table-tab3">&nbsp;</div>""");
         checkOutput("moduleB/module-summary.html", found,
                 """
-                    <li><a href="#module.description">Description</a>&nbsp;|&nbsp;</li>
-                    <li><a href="#modules.summary">Modules</a>&nbsp;|&nbsp;</li>
-                    <li><a href="#packages.summary">Packages</a>&nbsp;|&nbsp;</li>
-                    <li><a href="#services.summary">Services</a></li>""",
+                    <li><a href="#module-description">Description</a>&nbsp;|&nbsp;</li>
+                    <li><a href="#modules-summary">Modules</a>&nbsp;|&nbsp;</li>
+                    <li><a href="#packages-summary">Packages</a>&nbsp;|&nbsp;</li>
+                    <li><a href="#services-summary">Services</a></li>""",
                 """
                     <div class="col-first even-row-color package-summary-table package-summary-table-tab2"><a href="testpkgmdlB/package-summary.html">testpkgmdlB</a></div>
                     <div class="col-second even-row-color package-summary-table package-summary-table-tab2">None</div>
@@ -1088,7 +1088,7 @@ public class TestModules extends JavadocTester {
         checkOutput("deprecated-list.html", found,
                 """
                     <ul>
-                    <li><a href="#forRemoval">For Removal</a></li>
+                    <li><a href="#for-removal">For Removal</a></li>
                     <li><a href="#module">Modules</a></li>
                     </ul>""",
                 """
@@ -1343,29 +1343,29 @@ public class TestModules extends JavadocTester {
                     <hr>
                     <div class="type-signature"><span class="modifiers">public class </span><span cl\
                     ass="element-name"><a href="../../src-html/moduleA/testpkgmdlA/TestClassInModule\
-                    A.html#line.25">TestClassInModuleA</a></span>
+                    A.html#line-25">TestClassInModuleA</a></span>
                     <span class="extends-implements">extends java.lang.Object</span></div>
                     </section>""");
         checkOutput("src-html/moduleA/testpkgmdlA/TestClassInModuleA.html", true,
                 """
-                    <span class="source-line-no">019</span><span id="line.19"> * Please contact Orac\
+                    <span class="source-line-no">019</span><span id="line-19"> * Please contact Orac\
                     le, 500 Oracle Parkway, Redwood Shores, CA 94065 USA</span>
-                    <span class="source-line-no">020</span><span id="line.20"> * or visit www.oracle\
+                    <span class="source-line-no">020</span><span id="line-20"> * or visit www.oracle\
                     .com if you need additional information or have any</span>
-                    <span class="source-line-no">021</span><span id="line.21"> * questions.</span>
-                    <span class="source-line-no">022</span><span id="line.22"> */</span>
-                    <span class="source-line-no">023</span><span id="line.23">package testpkgmdlA;</span>
-                    <span class="source-line-no">024</span><span id="line.24"></span>
-                    <span class="source-line-no">025</span><span id="line.25">public class TestClassInModuleA {</span>
-                    <span class="source-line-no">026</span><span id="line.26">}</span>""");
+                    <span class="source-line-no">021</span><span id="line-21"> * questions.</span>
+                    <span class="source-line-no">022</span><span id="line-22"> */</span>
+                    <span class="source-line-no">023</span><span id="line-23">package testpkgmdlA;</span>
+                    <span class="source-line-no">024</span><span id="line-24"></span>
+                    <span class="source-line-no">025</span><span id="line-25">public class TestClassInModuleA {</span>
+                    <span class="source-line-no">026</span><span id="line-26">}</span>""");
         if (includePrivate) {
             checkOutput("src-html/moduleA/concealedpkgmdlA/ConcealedClassInModuleA.html", true,
                     """
-                        <span class="source-line-no">024</span><span id="line.24">package concealedpkgmdlA;</span>
-                        <span class="source-line-no">025</span><span id="line.25"></span>
-                        <span class="source-line-no">026</span><span id="line.26">public class ConcealedClassInModuleA {</span>
-                        <span class="source-line-no">027</span><span id="line.27">    public void testMethodConcealedClass() { }</span>
-                        <span class="source-line-no">028</span><span id="line.28">}</span>""");
+                        <span class="source-line-no">024</span><span id="line-24">package concealedpkgmdlA;</span>
+                        <span class="source-line-no">025</span><span id="line-25"></span>
+                        <span class="source-line-no">026</span><span id="line-26">public class ConcealedClassInModuleA {</span>
+                        <span class="source-line-no">027</span><span id="line-27">    public void testMethodConcealedClass() { }</span>
+                        <span class="source-line-no">028</span><span id="line-28">}</span>""");
         }
     }
 

test/langtools/jdk/javadoc/doclet/testNavigation/TestNavigation.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
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug      4131628 4664607 7025314 8023700 7198273 8025633 8026567 8081854 8150188 8151743 8196027 8182765
- *           8196200 8196202 8223378 8258659
+ *           8196200 8196202 8223378 8258659 8261976
  * @summary  Make sure the Next/Prev Class links iterate through all types.
  *           Make sure the navagation is 2 columns, not 3.
  * @library  /tools/lib ../../lib
@@ -63,24 +63,24 @@ public class TestNavigation extends JavadocTester {
 
         checkOutput("pkg/A.html", true,
                 """
-                    <ul id="navbar.top.firstrow" class="nav-list" title="Navigation">
+                    <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
                     <li><a href="../index.html">Overview</a></li>""");
 
         checkOutput("pkg/C.html", true,
                 """
-                    <ul id="navbar.top.firstrow" class="nav-list" title="Navigation">
+                    <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
                     <li><a href="../index.html">Overview</a></li>""");
 
         checkOutput("pkg/E.html", true,
                 """
-                    <ul id="navbar.top.firstrow" class="nav-list" title="Navigation">
+                    <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
                     <li><a href="../index.html">Overview</a></li>""");
 
         checkOutput("pkg/I.html", true,
                 // Test for 4664607
                 """
-                    <div class="skip-nav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-                    <ul id="navbar.top.firstrow" class="nav-list" title="Navigation">
+                    <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
+                    <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
                     """,
                 """
                     <li><a href="../index.html">Overview</a></li>""");
@@ -89,7 +89,7 @@ public class TestNavigation extends JavadocTester {
         checkOutput("pkg/A.html", true,
                 """
                     <!-- ========= END OF TOP NAVBAR ========= -->
-                    <span class="skip-nav" id="skip.navbar.top"></span></nav>
+                    <span class="skip-nav" id="skip-navbar-top"></span></nav>
                     </header>
                     <div class="flex-content">
                     <main role="main">
@@ -98,7 +98,7 @@ public class TestNavigation extends JavadocTester {
         checkOutput("pkg/package-summary.html", true,
                 """
                     <!-- ========= END OF TOP NAVBAR ========= -->
-                    <span class="skip-nav" id="skip.navbar.top"></span></nav>
+                    <span class="skip-nav" id="skip-navbar-top"></span></nav>
                     </header>
                     <div class="flex-content">
                     <main role="main">
@@ -118,7 +118,7 @@ public class TestNavigation extends JavadocTester {
         checkOutput("pkg/A.html", true,
                 """
                     <!-- ========= END OF TOP NAVBAR ========= -->
-                    <span class="skip-nav" id="skip.navbar.top"></span></nav>
+                    <span class="skip-nav" id="skip-navbar-top"></span></nav>
                     </header>
                     <div class="flex-content">
                     <main role="main">
@@ -127,7 +127,7 @@ public class TestNavigation extends JavadocTester {
         checkOutput("pkg/package-summary.html", true,
                 """
                     <!-- ========= END OF TOP NAVBAR ========= -->
-                    <span class="skip-nav" id="skip.navbar.top"></span></nav>
+                    <span class="skip-nav" id="skip-navbar-top"></span></nav>
                     """);
     }
 
@@ -145,7 +145,7 @@ public class TestNavigation extends JavadocTester {
                 """
                     <!-- ========= END OF TOP NAVBAR ========= -->
                     </div>
-                    <div class="skip-nav"><a id="skip.navbar.top"></a></div>
+                    <div class="skip-nav"><a id="skip-navbar-top"></a></div>
                     </nav>
                     </header>
                     <!-- ======== START OF CLASS DATA ======== -->""");
@@ -154,7 +154,7 @@ public class TestNavigation extends JavadocTester {
                 """
                     <!-- ========= END OF TOP NAVBAR ========= -->
                     </div>
-                    <div class="skip-nav"><a id="skip.navbar.top"></a></div>
+                    <div class="skip-nav"><a id="skip-navbar-top"></a></div>
                     </nav>""");
     }
 
@@ -212,42 +212,42 @@ public class TestNavigation extends JavadocTester {
         checkOrder("pkg1/A.X.html",
                 "Summary",
                 """
-                    <li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>""",
+                    <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>""",
                 """
-                    <li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>""",
+                    <li><a href="#field-summary">Field</a>&nbsp;|&nbsp;</li>""",
                 """
-                    <li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>""",
+                    <li><a href="#constructor-summary">Constr</a>&nbsp;|&nbsp;</li>""",
                 """
-                    <li><a href="#method.summary">Method</a></li>""");
+                    <li><a href="#method-summary">Method</a></li>""");
 
         checkOrder("pkg1/A.Y.html",
                 "Summary",
                 """
-                    <li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>""",
+                    <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>""",
                 """
-                    <li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>""",
+                    <li><a href="#field-summary">Field</a>&nbsp;|&nbsp;</li>""",
                 """
-                    <li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>""",
+                    <li><a href="#constructor-summary">Constr</a>&nbsp;|&nbsp;</li>""",
                 """
-                    <li><a href="#method.summary">Method</a></li>""");
+                    <li><a href="#method-summary">Method</a></li>""");
 
         checkOrder("pkg1/A.X.IC.html",
                 "Summary",
                 "<li>Nested&nbsp;|&nbsp;</li>",
                 "<li>Field&nbsp;|&nbsp;</li>",
                 """
-                    <li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>""",
+                    <li><a href="#constructor-summary">Constr</a>&nbsp;|&nbsp;</li>""",
                 """
-                    <li><a href="#method.summary">Method</a></li>""");
+                    <li><a href="#method-summary">Method</a></li>""");
 
         checkOrder("pkg1/C.html",
                 "Summary",
                 "<li>Nested&nbsp;|&nbsp;</li>",
                 "<li>Field&nbsp;|&nbsp;</li>",
                 """
-                    <li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>""",
+                    <li><a href="#constructor-summary">Constr</a>&nbsp;|&nbsp;</li>""",
                 """
-                    <li><a href="#method.summary">Method</a></li>""");
+                    <li><a href="#method-summary">Method</a></li>""");
 
         checkOrder("pkg1/InterfaceWithNoMembers.html",
                 "Summary",

test/langtools/jdk/javadoc/doclet/testOptions/TestOptions.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      4749567 8071982 8175200 8186332 8185371 8182765 8217034
+ * @bug      4749567 8071982 8175200 8186332 8185371 8182765 8217034 8261976 8261976
  * @summary  Test the output for -header, -footer, -nooverview, -nodeprecatedlist, -nonavbar, -notree,
  *           -stylesheetfile, --main-stylesheet, --add-stylesheet options.
  * @library  ../../lib
@@ -194,88 +194,88 @@ public class TestOptions extends JavadocTester {
                 """
                     <div class="type-signature"><span class="annotations">@Documented
                     </span><span class="modifiers">public @interface </span><span class="element-name"><a hr\
-                    ef="../src-html/linksource/AnnotationTypeField.html#line.31">AnnotationTypeField\
+                    ef="../src-html/linksource/AnnotationTypeField.html#line-31">AnnotationTypeField\
                     </a></span></div>""",
                 """
                     <section class="detail" id="DEFAULT_NAME">
                     <h3>DEFAULT_NAME</h3>
                     <div class="member-signature"><span class="modifiers">static final</span>&nbsp;<\
                     span class="return-type">java.lang.String</span>&nbsp;<span class="element-name"><a href\
-                    ="../src-html/linksource/AnnotationTypeField.html#line.32">DEFAULT_NAME</a></spa\
+                    ="../src-html/linksource/AnnotationTypeField.html#line-32">DEFAULT_NAME</a></spa\
                     n></div>""",
                 """
                     <section class="detail" id="name()">
                     <h3>name</h3>
                     <div class="member-signature"><span class="return-type">java.lang.String</span>&\
                     nbsp;<span class="element-name"><a href="../src-html/linksource/AnnotationTypeField.html\
-                    #line.34">name</a></span></div>""");
+                    #line-34">name</a></span></div>""");
 
         checkOutput("src-html/linksource/AnnotationTypeField.html", true,
                 "<title>Source code</title>",
                 """
-                    <span class="source-line-no">031</span><span id="line.31">@Documented public @interface AnnotationTypeField {</span>""");
+                    <span class="source-line-no">031</span><span id="line-31">@Documented public @interface AnnotationTypeField {</span>""");
 
         checkOutput("linksource/Properties.html", true,
                 """
                     <div class="type-signature"><span class="modifiers">public class </span><span cl\
-                    ass="element-name"><a href="../src-html/linksource/Properties.html#line.29">Properties</a>""",
+                    ass="element-name"><a href="../src-html/linksource/Properties.html#line-29">Properties</a>""",
                 """
                     <div class="member-signature"><span class="modifiers">public</span>&nbsp;<span c\
                     lass="return-type">java.lang.Object</span>&nbsp;<span class="element-name"><a href="../s\
-                    rc-html/linksource/Properties.html#line.31">someProperty</a></span></div>""");
+                    rc-html/linksource/Properties.html#line-31">someProperty</a></span></div>""");
 
         checkOutput("src-html/linksource/Properties.html", true,
                 "<title>Source code</title>",
                 """
-                    <span class="source-line-no">031</span><span id="line.31">    public Object someProperty() {</span>""");
+                    <span class="source-line-no">031</span><span id="line-31">    public Object someProperty() {</span>""");
 
         checkOutput("linksource/SomeClass.html", true,
                 """
                     <div class="type-signature"><span class="modifiers">public class </span><span cl\
-                    ass="element-name"><a href="../src-html/linksource/SomeClass.html#line.29">SomeC\
+                    ass="element-name"><a href="../src-html/linksource/SomeClass.html#line-29">SomeC\
                     lass</a></span>
                     <span class="extends-implements">extends java.lang.Object</span></div>""",
                 """
                     <div class="member-signature"><span class="modifiers">public</span>&nbsp;<span c\
                     lass="return-type">int</span>&nbsp;<span class="element-name"><a href="../src-html/links\
-                    ource/SomeClass.html#line.31">field</a></span></div>""",
+                    ource/SomeClass.html#line-31">field</a></span></div>""",
                 """
                     <div class="member-signature"><span class="modifiers">public</span>&nbsp;<span c\
-                    lass="element-name"><a href="../src-html/linksource/SomeClass.html#line.33">Some\
+                    lass="element-name"><a href="../src-html/linksource/SomeClass.html#line-33">Some\
                     Class</a></span>()</div>""",
                 """
                     <div class="member-signature"><span class="modifiers">public</span>&nbsp;<span c\
                     lass="return-type">int</span>&nbsp;<span class="element-name"><a href="../src-html/links\
-                    ource/SomeClass.html#line.36">method</a></span>()</div>""");
+                    ource/SomeClass.html#line-36">method</a></span>()</div>""");
 
         checkOutput("src-html/linksource/SomeClass.html", true,
                 "<title>Source code</title>",
                 """
-                    <span class="source-line-no">029</span><span id="line.29">public class SomeClass {</span>""",
+                    <span class="source-line-no">029</span><span id="line-29">public class SomeClass {</span>""",
                 """
-                    <span class="source-line-no">031</span><span id="line.31">    public int field;</span>""",
+                    <span class="source-line-no">031</span><span id="line-31">    public int field;</span>""",
                 """
-                    <span class="source-line-no">033</span><span id="line.33">    public SomeClass() {</span>""",
+                    <span class="source-line-no">033</span><span id="line-33">    public SomeClass() {</span>""",
                 """
-                    <span class="source-line-no">036</span><span id="line.36">    public int method() {</span>""");
+                    <span class="source-line-no">036</span><span id="line-36">    public int method() {</span>""");
 
         checkOutput("linksource/SomeEnum.html", true,
                 """
                     <div class="member-signature"><span class="modifiers">public static final</span>\
                     &nbsp;<span class="return-type"><a href="SomeEnum.html" title="enum class in linksourc\
                     e">SomeEnum</a></span>&nbsp;<span class="element-name"><a href="../src-html/linksource/S\
-                    omeEnum.html#line.29">VALUE1</a></span></div>""",
+                    omeEnum.html#line-29">VALUE1</a></span></div>""",
                 """
                     <div class="member-signature"><span class="modifiers">public static final</span>\
                     &nbsp;<span class="return-type"><a href="SomeEnum.html" title="enum class in linksourc\
                     e">SomeEnum</a></span>&nbsp;<span class="element-name"><a href="../src-html/linksource/S\
-                    omeEnum.html#line.30">VALUE2</a></span></div>""");
+                    omeEnum.html#line-30">VALUE2</a></span></div>""");
 
         checkOutput("src-html/linksource/SomeEnum.html", true,
                 """
-                    <span class="source-line-no">029</span><span id="line.29">    VALUE1,</span>""",
+                    <span class="source-line-no">029</span><span id="line-29">    VALUE1,</span>""",
                 """
-                    <span class="source-line-no">030</span><span id="line.30">    VALUE2</span>""");
+                    <span class="source-line-no">030</span><span id="line-30">    VALUE2</span>""");
     }
 
     @Test

test/langtools/jdk/javadoc/doclet/testOverriddenMethods/TestOverrideMethods.java

@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8157000 8192850 8182765 8223607
+ * @bug 8157000 8192850 8182765 8223607 8261976
  * @summary  test the behavior of --override-methods option
  * @library  ../../lib
  * @modules jdk.javadoc/jdk.javadoc.internal.tool
@@ -376,7 +376,7 @@ public class TestOverrideMethods  extends JavadocTester {
                     """,
                 """
                     <div class="inherited-list">
-                    <h3 id="methods.inherited.from.class.pkg6.Base">Methods declared in class&nbsp;p\
+                    <h3 id="methods-inherited-from-class-pkg6.Base">Methods declared in class&nbsp;p\
                     kg6.<a href="Base.html" title="class in pkg6">Base</a></h3>
                     <code><a href="Base.html#m1()">m1</a>, <a href="Base.html#m3()">m3</a>, <a href="Base.html#m9()">m9</a></code></div>
                     """);
@@ -398,7 +398,7 @@ public class TestOverrideMethods  extends JavadocTester {
         checkOutput("pkg7/AnnotatedSub1.html", true,
                 """
                     <div class="inherited-list">
-                    <h3 id="methods.inherited.from.class.pkg7.AnnotatedBase">Methods declared in int\
+                    <h3 id="methods-inherited-from-class-pkg7.AnnotatedBase">Methods declared in int\
                     erface&nbsp;pkg7.<a href="AnnotatedBase.html" title="interface in pkg7">Annotate\
                     dBase</a></h3>
                     <code><a href="AnnotatedBase.html#m1(java.lang.Class,int%5B%5D)">m1</a></code></div>""");

test/langtools/jdk/javadoc/doclet/testPackageDeprecation/TestPackageDeprecation.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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      6492694 8026567 8048351 8162363 8183511 8169819 8074407 8196202 8202626
+ * @bug      6492694 8026567 8048351 8162363 8183511 8169819 8074407 8196202 8202626 8261976
  * @summary  Test package deprecation.
  * @library  ../../lib/
  * @modules jdk.javadoc/jdk.javadoc.internal.tool
@@ -73,7 +73,7 @@ public class TestPackageDeprecation extends JavadocTester {
                 "pkg1");
         checkOutput("class-use/C2.ModalExclusionType.html", true,
                 """
-                    <div class="col-first even-row-color"><a href="#unnamed.package">Unnamed Package</a></div>""");
+                    <div class="col-first even-row-color"><a href="#unnamed-package">Unnamed Package</a></div>""");
 
         checkFiles(false,
                 "pkg1/package-summary.html",

test/langtools/jdk/javadoc/doclet/testPackageDescription/TestPackageDescription.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 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      8185194 8182765
+ * @bug      8185194 8182765 8261976
  * @summary  Test anchor for package description in package summary page
   * @library  ../../lib/
  * @modules jdk.javadoc/jdk.javadoc.internal.tool
@@ -49,7 +49,7 @@ public class TestPackageDescription extends JavadocTester {
 
         checkOutput("pkg/package-summary.html", true,
                 """
-                    <section class="package-description" id="package.description">
+                    <section class="package-description" id="package-description">
                     <div class="block">package description</div>
                     """);
     }

test/langtools/jdk/javadoc/doclet/testPreview/TestPreview.java

@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug      8250768
+ * @bug      8250768 8261976
  * @summary  test generated docs for items declared using preview
  * @library  ../../lib
  * @modules jdk.javadoc/jdk.javadoc.internal.tool
@@ -99,7 +99,7 @@ public class TestPreview extends JavadocTester {
 
         checkOutput("preview-list.html", true,
                     """
-                    <div id="record.class">
+                    <div id="record-class">
                     <div class="caption"><span>Record Classes</span></div>
                     <div class="summary-table two-column-summary">
                     <div class="table-header col-first">Record Class</div>

test/langtools/jdk/javadoc/doclet/testRecordTypes/TestRecordTypes.java

@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug      8225055 8239804 8246774 8258338
+ * @bug      8225055 8239804 8246774 8258338 8261976
  * @summary  Record types
  * @library  /tools/lib ../../lib
  * @modules jdk.javadoc/jdk.javadoc.internal.tool
@@ -206,11 +206,11 @@ public class TestRecordTypes extends JavadocTester {
         // the documentation for the generated members.
         checkOrder("p/R.html",
                 """
-                    <section class="constructor-summary" id="constructor.summary">""",
+                    <section class="constructor-summary" id="constructor-summary">""",
                 "<a href=\"#%3Cinit%3E(int)\" class=\"member-name-link\">R</a>",
                 "Creates an instance of a <code>R</code> record class.",
                 """
-                    <section class="method-summary" id="method.summary">""",
+                    <section class="method-summary" id="method-summary">""",
                 """
                     <a href="#equals(java.lang.Object)" class="member-name-link">equals</a>""",
                 """
@@ -269,11 +269,11 @@ public class TestRecordTypes extends JavadocTester {
         // the documentation for the generated members.
         checkOrder("p/R.html",
                 """
-                    <section class="constructor-summary" id="constructor.summary">""",
+                    <section class="constructor-summary" id="constructor-summary">""",
                 "<a href=\"#%3Cinit%3E(int)\" class=\"member-name-link\">R</a>",
                 "Creates an instance of a <code>R</code> record class.",
                 """
-                    <section class="method-summary" id="method.summary">""",
+                    <section class="method-summary" id="method-summary">""",
                 """
                     <a href="#equals(java.lang.Object)" class="member-name-link">equals</a>""",
                 """
@@ -371,11 +371,11 @@ public class TestRecordTypes extends JavadocTester {
 
         checkOrder("p/R.html",
                 """
-                    <section class="constructor-summary" id="constructor.summary">""",
+                    <section class="constructor-summary" id="constructor-summary">""",
                 "<a href=\"#%3Cinit%3E(int)\" class=\"member-name-link\">R</a>",
                 "User constructor.",
                 """
-                    <section class="method-summary" id="method.summary">""",
+                    <section class="method-summary" id="method-summary">""",
                 """
                     <a href="#equals(java.lang.Object)" class="member-name-link">equals</a>""",
                 "User equals.",
@@ -516,10 +516,10 @@ public class TestRecordTypes extends JavadocTester {
                 """
                     <h2 title="Contents">Contents</h2>
                     <ul>
-                    <li><a href="#record.class">Record Classes</a></li>
+                    <li><a href="#record-class">Record Classes</a></li>
                     </ul>""",
                 """
-                    <div id="record.class">
+                    <div id="record-class">
                     <div class="caption"><span>Record Classes</span></div>
                     <div class="summary-table two-column-summary">
                     <div class="table-header col-first">Record Class</div>

test/langtools/jdk/javadoc/doclet/testTypeParams/TestTypeParameters.java

@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug      4927167 4974929 7010344 8025633 8081854 8182765 8187288
+ * @bug      4927167 4974929 7010344 8025633 8081854 8182765 8187288 8261976
  * @summary  When the type parameters are more than 10 characters in length,
  *           make sure there is a line break between type params and return type
  *           in member summary. Also, test for type parameter links in package-summary and
@@ -90,7 +90,7 @@ public class TestTypeParameters extends JavadocTester {
         checkOutput("pkg/ClassUseTest3.html", true,
                 """
                     public class </span><span class="element-name"><a href="../src-html/pkg/ClassUse\
-                    Test3.html#line.28">ClassUseTest3</a>&lt;T extends <a href="ParamTest2.html" tit\
+                    Test3.html#line-28">ClassUseTest3</a>&lt;T extends <a href="ParamTest2.html" tit\
                     le="class in pkg">ParamTest2</a>&lt;java.util.List&lt;? extends <a href="Foo4.ht\
                     ml" title="class in pkg">Foo4</a>&gt;&gt;&gt;""");
     }

test/langtools/jdk/javadoc/doclet/testUseOption/TestUseOption.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
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug 4496290 4985072 7006178 7068595 8016328 8050031 8048351 8081854 8071982 8162363 8175200 8186332
- *      8182765 8196202 8202626
+ *      8182765 8196202 8202626 8261976
  * @summary A simple test to ensure class-use files are correct.
  * @library ../../lib
  * @modules jdk.javadoc/jdk.javadoc.internal.tool
@@ -162,14 +162,14 @@ public class TestUseOption extends JavadocTester {
         checkOutput("class-use/UsedInC.html", true,
                 """
                     <li>
-                    <section class="detail" id="unnamed.package">
+                    <section class="detail" id="unnamed-package">
                     """
         );
         checkOutput("package-use.html", true,
                 """
-                    <div class="col-first even-row-color"><a href="class-use/UsedInC.html#unnamed.package">UsedInC</a></div>""",
+                    <div class="col-first even-row-color"><a href="class-use/UsedInC.html#unnamed-package">UsedInC</a></div>""",
                 """
-                    <div class="col-first even-row-color"><a href="#unnamed.package">Unnamed Package</a></div>
+                    <div class="col-first even-row-color"><a href="#unnamed-package">Unnamed Package</a></div>
                     <div class="col-last even-row-color">&nbsp;</div>"""
         );
     }

test/langtools/jdk/javadoc/doclet/testValueTag/TestValueTagInModule.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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 8210244
+ * @bug 8210244 8261976
  * @summary {@value} should be permitted in module documentation
  * @library /tools/lib ../../lib
  * @modules jdk.javadoc/jdk.javadoc.internal.tool
@@ -69,7 +69,7 @@ public class TestValueTagInModule extends JavadocTester {
 
         checkOutput("m1/module-summary.html", true,
                 """
-                    <section class="module-description" id="module.description">
+                    <section class="module-description" id="module-description">
                     <!-- ============ MODULE DESCRIPTION =========== -->
                     <div class="block">value of field CONS : <a href="pkg/A.html#CONS">100</a></div>""");
     }