From cee54de41bc9593dee72a5ae58404808edf417c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= Date: Mon, 20 Nov 2023 18:26:21 +0000 Subject: [PATCH] 8319988: Wrong heading for inherited nested classes Reviewed-by: jjg --- .../internal/doclets/formats/html/NestedClassWriter.java | 2 +- .../jdk/javadoc/doclet/testHiddenTag/TestHiddenTag.java | 6 +++--- .../jdk/javadoc/doclet/testInterface/TestInterface.java | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NestedClassWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NestedClassWriter.java index 7f67e37840d..4534f707c38 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NestedClassWriter.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NestedClassWriter.java @@ -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_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.add(Entity.NO_BREAK_SPACE); labelHeading.add(classLink); diff --git a/test/langtools/jdk/javadoc/doclet/testHiddenTag/TestHiddenTag.java b/test/langtools/jdk/javadoc/doclet/testHiddenTag/TestHiddenTag.java index 1cad5678258..0a92a489727 100644 --- a/test/langtools/jdk/javadoc/doclet/testHiddenTag/TestHiddenTag.java +++ b/test/langtools/jdk/javadoc/doclet/testHiddenTag/TestHiddenTag.java @@ -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. * * This code is free software; you can redistribute it and/or modify it @@ -72,8 +72,8 @@ public class TestHiddenTag extends JavadocTester { """ visibleMethod""", """ -

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

+

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

A.VisibleInner, A.Visible\ InnerExtendsInvisibleInner diff --git a/test/langtools/jdk/javadoc/doclet/testInterface/TestInterface.java b/test/langtools/jdk/javadoc/doclet/testInterface/TestInterface.java index fd68246969b..cdba068ea4d 100644 --- a/test/langtools/jdk/javadoc/doclet/testInterface/TestInterface.java +++ b/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 8261976 8303349 + 8186332 8186703 8182765 8187288 8261976 8303349 8319988 * @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 @@ -204,9 +204,9 @@ public class TestInterface extends JavadocTester { checkOutput("pkg2/Spliterator.OfDouble.html", true, // Ensure the correct type parameters are displayed correctly """ -

Nested classes/int\ +

Nested classes/int\ erfaces inherited from interface pkg2.Spliterator

+ erface in pkg2">Spliterator Spliterator.\ OfDouble, Spliter\ ator.OfInt<