stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8319988: Wrong heading for inherited nested classes

Browse Source 
Reviewed-by: jjg
This commit is contained in:
Hannes Wallnöfer 2023-11-20 18:26:21 +00:00
parent 32098ce33c
commit cee54de41b
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NestedClassWriter.java
View File

@ -114,7 +114,7 @@ public class NestedClassWriter extends AbstractMemberWriter {
? resources.getText("doclet.Nested_Classes_Interfaces_Inherited_From_Interface") ? resources.getText("doclet.Nested_Classes_Interfaces_Inherited_From_Interface")
: resources.getText("doclet.Nested_Classes_Interfaces_Inherited_From_Class")); : resources.getText("doclet.Nested_Classes_Interfaces_Inherited_From_Class"));
} }
var labelHeading = HtmlTree.HEADING(Headings.TypeDeclaration.SUMMARY_HEADING, label); var labelHeading = HtmlTree.HEADING(Headings.TypeDeclaration.INHERITED_SUMMARY_HEADING, label);
labelHeading.setId(htmlIds.forInheritedClasses(typeElement)); labelHeading.setId(htmlIds.forInheritedClasses(typeElement));
labelHeading.add(Entity.NO_BREAK_SPACE); labelHeading.add(Entity.NO_BREAK_SPACE);
labelHeading.add(classLink); labelHeading.add(classLink);

6
test/langtools/jdk/javadoc/doclet/testHiddenTag/TestHiddenTag.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -72,8 +72,8 @@ public class TestHiddenTag extends JavadocTester {
""" """
<code><a href="A.html#visibleMethod()">visibleMethod</a></code>""", <code><a href="A.html#visibleMethod()">visibleMethod</a></code>""",
""" """
<h2 id="nested-classes-inherited-from-class-pkg1.A">Nested classes/interfaces in\ <h3 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> herited from class&nbsp;pkg1.<a href="A.html" title="class in pkg1">A</a></h3>
<code><a href="A.VisibleInner.html" title="class in pkg1">A.VisibleInner</a>, <a\ <code><a href="A.VisibleInner.html" title="class in pkg1">A.VisibleInner</a>, <a\
href="A.VisibleInnerExtendsInvisibleInner.html" title="class in pkg1">A.Visible\ href="A.VisibleInnerExtendsInvisibleInner.html" title="class in pkg1">A.Visible\
InnerExtendsInvisibleInner</a></code></div> InnerExtendsInvisibleInner</a></code></div>

6
test/langtools/jdk/javadoc/doclet/testInterface/TestInterface.java
View File

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