diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DeprecatedListWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DeprecatedListWriter.java index d558d28bf0d26..8edf166fa7af5 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DeprecatedListWriter.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DeprecatedListWriter.java @@ -121,7 +121,7 @@ protected void addExtraIndexLink(DeprecatedAPIListBuilder list, Content target) protected void addComments(Element e, Content desc) { List tags = utils.getDeprecatedTrees(e); if (!tags.isEmpty()) { - addInlineDeprecatedComment(e, tags.get(0), desc); + addInlineComment(e, tags.get(0), desc); } else { desc.add(Text.EMPTY); } diff --git a/test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java b/test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java index 2703c87a06925..533d70f652f37 100644 --- a/test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java +++ b/test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2022, 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 4927552 8026567 8071982 8162674 8175200 8175218 8183511 8186332 - * 8169819 8074407 8191030 8182765 8184205 8243533 8261976 + * 8169819 8074407 8191030 8182765 8184205 8243533 8261976 8273860 * @summary test generated docs for deprecated items * @library ../../lib * @modules jdk.javadoc/jdk.javadoc.internal.tool @@ -292,7 +292,7 @@ public void test() {
Description
pkg.TestEnum
-
enum_test1 passes.
+
enum_test1 passes.
""", """
@@ -302,11 +302,11 @@ public void test() {
Description
pkg.TestError
-
error_test1 passes.
+
error_test1 passes.
pkg.TestException
-
exception_test1 passes.
+
exception_test1 passes.
""", """
@@ -318,23 +318,23 @@ public void test() {
pkg.TestAnnotationType.field
-
annotation_test4 passes.
+
annotation_test4 passes.
pkg.TestClass.field
-
class_test2 passes. This is the second sentence of deprecated description for a field.
+
class_test2 passes. This is the second sentence of deprecated description for a field.
pkg.TestError.field
-
error_test2 passes.
+
error_test2 passes.
pkg.TestException.field
-
exception_test2 passes.
+
exception_test2 passes.
pkg.TestInterface.field
-
interface_test2 passes.
+
interface_test2 passes.
""", @@ -348,23 +348,23 @@ public void test() {
pkg.TestAnnotationType.optional()
-
annotation_test2 passes.
+
annotation_test2 passes.
pkg.TestAnnotationType.required()
-
annotation_test3 passes.
+
annotation_test3 passes.
pkg.TestClass.method()
-
class_test5 passes. This is the second sentence of deprecated description for a method.
+
class_test5 passes. This is the second sentence of deprecated description for a method.
pkg.TestClass.overloadedMethod(int)
-
class_test7 passes. Overloaded method 2.
+
class_test7 passes. Overloaded method 2.
pkg.TestClass.overloadedMethod(String)
-
class_test6 passes. Overloaded method 1.
+
class_test6 passes. Overloaded method 1.
""", """
@@ -376,11 +376,11 @@ public void test() {
pkg.TestClass()
-
class_test3 passes. This is the second sentence of deprecated description for a constructor.
+
class_test3 passes. This is the second sentence of deprecated description for a constructor.
pkg.TestClass(String)
-
class_test4 passes. Overloaded constructor.
+
class_test4 passes. Overloaded constructor.
"""); } } diff --git a/test/langtools/jdk/javadoc/doclet/testHtmlTableTags/TestHtmlTableTags.java b/test/langtools/jdk/javadoc/doclet/testHtmlTableTags/TestHtmlTableTags.java index 87f1c5cebc2d1..4afd8d91cecdc 100644 --- a/test/langtools/jdk/javadoc/doclet/testHtmlTableTags/TestHtmlTableTags.java +++ b/test/langtools/jdk/javadoc/doclet/testHtmlTableTags/TestHtmlTableTags.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2022, 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 @@ -704,13 +704,13 @@ void checkHtmlTableContents() { """
pkg2.C2.dep_field
-
don't use this field anymore.
+
don't use this field anymore.
""", """
pkg1.C1.deprecatedMethod()
-
don't use this anymore.
+
don't use this anymore.
"""); // Constant values diff --git a/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java b/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java index 77fb00214a705..b9deb636cf210 100644 --- a/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java +++ b/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java @@ -1117,7 +1117,7 @@ void checkModuleDeprecation(boolean found) { """
moduleA
-
This module is deprecated.
"""); +
This module is deprecated.
"""); checkOutput("moduleB/module-summary.html", !found, """
Deprecated. diff --git a/test/langtools/jdk/javadoc/doclet/testRecordTypes/TestRecordTypes.java b/test/langtools/jdk/javadoc/doclet/testRecordTypes/TestRecordTypes.java index 0016656f8d72e..4bc8d2ce9e8c1 100644 --- a/test/langtools/jdk/javadoc/doclet/testRecordTypes/TestRecordTypes.java +++ b/test/langtools/jdk/javadoc/doclet/testRecordTypes/TestRecordTypes.java @@ -524,7 +524,7 @@ public record R(int r1) { }""");
Description
p.R
-
Do not use.
+
Do not use.
"""); }