diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java index 0cecb03c3b9..05e8972eb27 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java @@ -243,6 +243,9 @@ public abstract class AbstractMemberWriter implements MemberSummaryWriter, Membe if (utils.isStatic(member)) { code.add("static "); } + if (!utils.isEnum(member) && utils.isFinal(member)) { + code.add("final "); + } } /** diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/FieldWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/FieldWriter.java index 0364d97a6e3..d171283e8f3 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/FieldWriter.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/FieldWriter.java @@ -75,7 +75,7 @@ public interface FieldWriter extends MemberWriter { * Adds the preview output for the given member. * * @param member the member being documented - * @param annotationDocTree content tree to which the preview information will be added + * @param contentTree content tree to which the preview information will be added */ void addPreview(VariableElement member, Content contentTree); diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java index bd51aaceb08..83212281bf2 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java @@ -402,6 +402,10 @@ public class Utils { return e.getModifiers().contains(Modifier.DEFAULT); } + public boolean isFinal(Element e) { + return e.getModifiers().contains(Modifier.FINAL); + } + public boolean isPackagePrivate(Element e) { return !(isPublic(e) || isPrivate(e) || isProtected(e)); } diff --git a/test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java b/test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java index 8f94a2d47ee..99f6788d1c3 100644 --- a/test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java +++ b/test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java @@ -78,7 +78,7 @@ public class TestJavaFX extends JavadocTester {
Property description:
""", """ -
final C.DoubleProperty
rate
@@ -181,10 +181,10 @@ public class TestJavaFX extends JavadocTester {
Properties
""", """ -
C.BooleanProperty
+
final C.BooleanProperty
""", """ -
C.DoubleProperty
+
final C.DoubleProperty
"""); checkOutput("pkg1/C.html", false, @@ -335,16 +335,16 @@ public class TestJavaFX extends JavadocTester {
 
java.util.List<java.util.Set<? super \ - java.lang.Object>>
+ ab2 method-summary-table-tab4">final java.util.List<java.util.Set<? \ + super java.lang.Object>>
deltaProperty()
 
java.util.List<java.lang.String>
+ b2 method-summary-table-tab4">final java.util.List<java.lang.String>\ +
gammaProperty()
diff --git a/test/langtools/jdk/javadoc/doclet/testMemberSummary/TestMemberSummary.java b/test/langtools/jdk/javadoc/doclet/testMemberSummary/TestMemberSummary.java index 6b2848442d5..19851317c14 100644 --- a/test/langtools/jdk/javadoc/doclet/testMemberSummary/TestMemberSummary.java +++ b/test/langtools/jdk/javadoc/doclet/testMemberSummary/TestMemberSummary.java @@ -24,6 +24,7 @@ /* * @test * @bug 4951228 6290760 8025633 8026567 8081854 8162363 8175200 8177417 8186332 8182765 + * 8258602 * @summary Test the case where the overridden method returns a different * type than the method in the child class. Make sure the * documentation is inherited but the return type isn't. @@ -80,4 +81,101 @@ public class TestMemberSummary extends JavadocTester {

f

"""); } + + @Test + public void testSummaries() { + javadoc("-d", "out-summaries", + "-private", + "-sourcepath", testSrc, + "pkg3"); + checkExit(Exit.OK); + checkOutput("pkg3/Members.html", true, + """ +
Nested Classes
+
+
Modifier and Type
+
Class
+
Description
+
private static interface 
+
Members.A
+
 
+
private static final class 
+
Members.C
+
 
+
private static class 
+
Members.E
+
 
+
private static interface 
+
Members.I
+
 
+
private static final class 
+
Members.R
+
 
+
""", + """ +
Fields
+
+
Modifier and Type
+
Field
+
Description
+
private static final int
+
F
+
 
+
""", + """ +
Constructors
+
+
Modifier
+
Constructor
+
Description
+
private
+
Members()
+
 
+
+ """); + checkOutput("pkg3/Members.A.html", true, + """ +
Required Elements
+
+
Modifier and Type
+
Required Element
+
Description
+
int
+
v
+
 
+
""", + """ +
Optional Elements
+
+
Modifier and Type
+
Optional Element
+
Description
+
String
+
s
+
 
+
+ """); + checkOutput("pkg3/Members.E.html", true, + """ +

Enum Constant Summary

+
Enum Constants
+
+
Enum Constant
+
Description
+
C
+
 
+
"""); + checkOutput("pkg3/Members.R.html", true, + """ +
Fields
+
+
Modifier and Type
+
Field
+
Description
+
private final int
+
i
+
+
The field for the i record component.
+
"""); + } } diff --git a/test/langtools/jdk/javadoc/doclet/testMemberSummary/pkg3/Members.java b/test/langtools/jdk/javadoc/doclet/testMemberSummary/pkg3/Members.java new file mode 100644 index 00000000000..9b69512bc0a --- /dev/null +++ b/test/langtools/jdk/javadoc/doclet/testMemberSummary/pkg3/Members.java @@ -0,0 +1,54 @@ +/* + * Copyright (c) 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package pkg3; + +/** + * Test class for member and nested class summaries + */ +public class Members { + + private Members() {} + + private static final int F = 3; + + private static final class C {} + + private static final void M() {} + + private enum E { + C; + } + + private interface I { + default void i() {} + } + + private @interface A { + int v(); + String s() default ""; + } + + private record R(int i) {} + +} diff --git a/test/langtools/jdk/javadoc/doclet/testOverriddenMethods/TestOverrideMethods.java b/test/langtools/jdk/javadoc/doclet/testOverriddenMethods/TestOverrideMethods.java index 7b85fe7c900..d0be8b1c547 100644 --- a/test/langtools/jdk/javadoc/doclet/testOverriddenMethods/TestOverrideMethods.java +++ b/test/langtools/jdk/javadoc/doclet/testOverriddenMethods/TestOverrideMethods.java @@ -347,7 +347,7 @@ public class TestOverrideMethods extends JavadocTester {
This is Base::m5.
java.lang.Object
+ b2 method-summary-table-tab4">final java.lang.Object
m6\ ()
diff --git a/test/langtools/jdk/javadoc/doclet/testProperty/TestProperty.java b/test/langtools/jdk/javadoc/doclet/testProperty/TestProperty.java index 4963ca58a72..170d6b4add0 100644 --- a/test/langtools/jdk/javadoc/doclet/testProperty/TestProperty.java +++ b/test/langtools/jdk/javadoc/doclet/testProperty/TestProperty.java @@ -77,9 +77,9 @@ public class TestProperty extends JavadocTester { // no tab classes should be used in the property table """ -
ObjectProperty<MyObj<\ - /a>[]>
+
final ObjectProperty<MyObj[]>
bad
""", @@ -87,9 +87,9 @@ public class TestProperty extends JavadocTester { // tab classes should be used in the method table """
ObjectProperty<MyObj[]&g\ - t;
+ ab2 method-summary-table-tab4">final ObjectProperty<My\ + Obj[]>
badProperty()
"""