diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriter.java index d934a9aab63..bef634b0ddb 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriter.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriter.java @@ -740,16 +740,14 @@ public class ClassWriter extends SubWriterHolderWriter { } // TODO: should we simply split this method up to avoid instanceof ? if (type instanceof TypeElement te) { - Content link = getLink( - new HtmlLinkInfo(configuration, context, te)); - content.add(HtmlTree.CODE(link)); + content.add(getLink( + new HtmlLinkInfo(configuration, context, te))); } else { - Content link = getLink( - new HtmlLinkInfo(configuration, context, ((TypeMirror)type))); - content.add(HtmlTree.CODE(link)); + content.add(getLink( + new HtmlLinkInfo(configuration, context, ((TypeMirror)type)))); } } - return content; + return HtmlTree.CODE(content); } /** diff --git a/test/langtools/jdk/javadoc/doclet/testClassLinks/TestClassLinks.java b/test/langtools/jdk/javadoc/doclet/testClassLinks/TestClassLinks.java index a2bffa15305..21bb4abb2e6 100644 --- a/test/langtools/jdk/javadoc/doclet/testClassLinks/TestClassLinks.java +++ b/test/langtools/jdk/javadoc/doclet/testClassLinks/TestClassLinks.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2024, 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 8163800 8175200 8186332 8182765 + * @bug 8163800 8175200 8186332 8182765 8345908 * @summary The fix for JDK-8072052 shows up other minor incorrect use of styles * @library ../../lib * @modules jdk.javadoc/jdk.javadoc.internal.tool @@ -66,10 +66,10 @@ public class TestClassLinks extends JavadocTester { checkOutput("p/C3.html", true, """ - I1, I12, I2, IT1<\ - /a><T>, IT2<\ + I1, I12, I2, IT1<\ + /a><T>, IT2<\ java.lang.String>""", """ C3()"""); @@ -90,7 +90,7 @@ public class TestClassLinks extends JavadocTester { """ C3""", """ - I1, I1, I2"""); checkOutput("p/IT1.html", true, diff --git a/test/langtools/jdk/javadoc/doclet/testHiddenTag/TestHiddenTag.java b/test/langtools/jdk/javadoc/doclet/testHiddenTag/TestHiddenTag.java index 0a92a489727..27e7d81398c 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, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2024, 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 @@ -59,8 +59,8 @@ public class TestHiddenTag extends JavadocTester { """
Direct Known Subclasses:
A.VisibleInner\ - , A.VisibleInnerExtendsInvisibleInner
"""); + , A.Vis\ + ibleInnerExtendsInvisibleInner"""); checkOutput("pkg1/A.html", false, "invisibleField", diff --git a/test/langtools/jdk/javadoc/doclet/testInterface/TestInterface.java b/test/langtools/jdk/javadoc/doclet/testInterface/TestInterface.java index 214f134f3ad..5fcf2c6cb58 100644 --- a/test/langtools/jdk/javadoc/doclet/testInterface/TestInterface.java +++ b/test/langtools/jdk/javadoc/doclet/testInterface/TestInterface.java @@ -76,8 +76,8 @@ public class TestInterface extends JavadocTester { """
All Known Implementing Classes:
-
Child, Parent
+
Child, Parent
"""); checkOutput("pkg/Child.html", true, diff --git a/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/TestNewLanguageFeatures.java b/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/TestNewLanguageFeatures.java index 531fed92bc2..af98f1fd07a 100644 --- a/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/TestNewLanguageFeatures.java +++ b/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/TestNewLanguageFeatures.java @@ -218,8 +218,8 @@ public class TestNewLanguageFeatures extends JavadocTester {
All Implemented Interfaces:
SubInterface&\ - lt;E>, Su\ - perInterface<E>
+ lt;E>, SuperInterface<\ + /a><E>
"""); checkOutput("pkg/SuperInterface.html", true, diff --git a/test/langtools/jdk/javadoc/doclet/testPrivateClasses/TestPrivateClasses.java b/test/langtools/jdk/javadoc/doclet/testPrivateClasses/TestPrivateClasses.java index bf715f895a3..5bf6a73a7cc 100644 --- a/test/langtools/jdk/javadoc/doclet/testPrivateClasses/TestPrivateClasses.java +++ b/test/langtools/jdk/javadoc/doclet/testPrivateClasses/TestPrivateClasses.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2024, 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 @@ -187,8 +187,8 @@ public class TestPrivateClasses extends JavadocTester {
All Implemented Interfaces:
PrivateInterf\ - ace, Pu\ - blicInterface
+ ace, PublicInterface\ +
""", """
public class
All Known Implementing Classes:
-
PrivateParent, PublicChild
+
PrivateParent, <\ + a href="PublicChild.html" title="class in pkg">PublicChild
"""); checkOutput("pkg/PrivateInterface.html", true,