8241625: use new "member-list" CSS class instead of general "block-li…

…st" for list of members

Reviewed-by: hannesw

src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java

@@ -51,6 +51,7 @@
 import jdk.javadoc.internal.doclets.formats.html.markup.TableHeader;
 import jdk.javadoc.internal.doclets.toolkit.Content;
 import jdk.javadoc.internal.doclets.toolkit.MemberSummaryWriter;
+import jdk.javadoc.internal.doclets.toolkit.MemberWriter;
 import jdk.javadoc.internal.doclets.toolkit.Resources;
 import jdk.javadoc.internal.doclets.toolkit.taglets.DeprecatedTaglet;
 import jdk.javadoc.internal.doclets.toolkit.util.DocletConstants;
@@ -70,7 +71,7 @@
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
-public abstract class AbstractMemberWriter implements MemberSummaryWriter {
+public abstract class AbstractMemberWriter implements MemberSummaryWriter, MemberWriter {
 
     protected final HtmlConfiguration configuration;
     protected final HtmlOptions options;
@@ -467,6 +468,16 @@ public Content getMemberTree(Content memberTree) {
         return writer.getMemberTree(memberTree);
     }
 
+    @Override
+    public Content getMemberList() {
+        return writer.getMemberList();
+    }
+
+    @Override
+    public Content getMemberListItem(Content memberTree) {
+        return writer.getMemberListItem(memberTree);
+    }
+
     /**
      * A content builder for member signatures.
      */

src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeFieldWriterImpl.java

@@ -140,11 +140,6 @@ public Content getAnnotationDetails(Content annotationDetailsTreeHeader, Content
                 .setId(SectionName.ANNOTATION_TYPE_FIELD_DETAIL.getName()));
     }
 
-    @Override
-    public Content getAnnotationDoc(Content annotationDocTree) {
-        return getMemberTree(annotationDocTree);
-    }
-
     @Override
     public void addSummaryLabel(Content memberTree) {
         HtmlTree label = HtmlTree.HEADING(Headings.TypeDeclaration.SUMMARY_HEADING,

src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java

@@ -140,11 +140,6 @@ public Content getAnnotationDetails(Content annotationDetailsTreeHeader, Content
         return getMemberTree(HtmlTree.SECTION(HtmlStyle.memberDetails, annotationDetails));
     }
 
-    @Override
-    public Content getAnnotationDoc(Content annotationDocTree) {
-        return getMemberTree(annotationDocTree);
-    }
-
     @Override
     public void addSummaryLabel(Content memberTree) {
         HtmlTree label = HtmlTree.HEADING(Headings.TypeDeclaration.SUMMARY_HEADING,

src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassUseWriter.java

@@ -316,7 +316,7 @@ protected void addClassList(Content contentTree) {
             Content heading = HtmlTree.HEADING(Headings.TypeUse.SUMMARY_HEADING, link);
             htmlTree.add(heading);
             addClassUse(pkg, htmlTree);
-            ul.add(HtmlTree.LI(HtmlStyle.blockList, htmlTree));
+            ul.add(HtmlTree.LI(htmlTree));
         }
         Content li = HtmlTree.SECTION(HtmlStyle.classUses, ul);
         contentTree.add(li);

src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstantsSummaryWriterImpl.java

@@ -214,8 +214,7 @@ public void addConstantMembers(TypeElement typeElement, Collection<VariableEleme
         for (VariableElement field : fields) {
             table.addRow(getTypeColumn(field), getNameColumn(field), getValue(field));
         }
-        Content li = HtmlTree.LI(HtmlStyle.blockList, table);
-        classConstantTree.add(li);
+        classConstantTree.add(HtmlTree.LI(table));
     }
 
     /**

src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstructorWriterImpl.java

@@ -158,11 +158,6 @@ public Content getConstructorDetails(Content constructorDetailsTreeHeader, Conte
                 .setId(SectionName.CONSTRUCTOR_DETAIL.getName()));
     }
 
-    @Override
-    public Content getConstructorDoc(Content constructorDocTree) {
-        return getMemberTree(constructorDocTree);
-    }
-
     /**
      * Let the writer know whether a non public constructor was found.
      *

src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DeprecatedListWriter.java

@@ -401,9 +401,8 @@ protected void addDeprecatedAPI(SortedSet<Element> deprList, String id, String h
                 }
                 table.addRow(link, desc);
             }
-            Content li = HtmlTree.LI(HtmlStyle.blockList, table);
-            Content ul = HtmlTree.UL(HtmlStyle.blockList, li);
-            contentTree.add(ul);
+            // note: singleton list
+            contentTree.add(HtmlTree.UL(HtmlStyle.blockList, HtmlTree.LI(table)));
         }
     }
 

src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/EnumConstantWriterImpl.java

@@ -127,11 +127,6 @@ public Content getEnumConstantsDetails(Content enumConstantsDetailsTreeHeader,
                 .setId(SectionName.ENUM_CONSTANT_DETAIL.getName()));
     }
 
-    @Override
-    public Content getEnumConstants(Content enumConstantsTree) {
-        return getMemberTree(enumConstantsTree);
-    }
-
     @Override
     public void addSummaryLabel(Content memberTree) {
         Content label = HtmlTree.HEADING(Headings.TypeDeclaration.SUMMARY_HEADING,

src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FieldWriterImpl.java

@@ -127,11 +127,6 @@ public Content getFieldDetails(Content fieldDetailsTreeHeader, Content fieldDeta
                 .setId(SectionName.FIELD_DETAIL.getName()));
     }
 
-    @Override
-    public Content getFieldDoc(Content fieldTree) {
-        return getMemberTree(fieldTree);
-    }
-
     @Override
     public void addSummaryLabel(Content memberTree) {
         Content label = HtmlTree.HEADING(Headings.TypeDeclaration.SUMMARY_HEADING,

src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlSerialFieldWriter.java

@@ -107,7 +107,7 @@ public Content getSerializableFields(String heading, Content serializableFieldsT
             section.add(serialHeading);
             section.add(serializableFieldsTree);
         }
-        return HtmlTree.LI(HtmlStyle.blockList, section);
+        return HtmlTree.LI(section);
     }
 
     @Override

src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlSerialMethodWriter.java

@@ -94,7 +94,7 @@ public Content getSerializableMethods(String heading, Content serializableMethod
         Content serialHeading = HtmlTree.HEADING(Headings.SerializedForm.CLASS_SUBHEADING, headingContent);
         Content section = HtmlTree.SECTION(HtmlStyle.detail, serialHeading);
         section.add(serializableMethodContent);
-        return HtmlTree.LI(HtmlStyle.blockList, section);
+        return HtmlTree.LI(section);
     }
 
     /**

src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MethodWriterImpl.java

@@ -176,11 +176,6 @@ public Content getMethodDetails(Content methodDetailsTreeHeader, Content methodD
                 .setId(SectionName.METHOD_DETAIL.getName()));
     }
 
-    @Override
-    public Content getMethodDoc(Content methodDocTree) {
-        return getMemberTree(methodDocTree);
-    }
-
     @Override
     public void addSummaryLabel(Content memberTree) {
         Content label = HtmlTree.HEADING(Headings.TypeDeclaration.SUMMARY_HEADING,

src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java

@@ -514,7 +514,7 @@ public void addModulesSummary(Content summaryContentTree) {
                 addModulesList(indirectModules, amrTable);
                 section.add(amrTable);
             }
-            summaryContentTree.add(HtmlTree.LI(HtmlStyle.blockList, section));
+            summaryContentTree.add(HtmlTree.LI(section));
         }
     }
 
@@ -560,7 +560,7 @@ public void addPackagesSummary(Content summaryContentTree) {
                 addIndirectPackages(aopTable, indirectOpenPackages);
                 section.add(aopTable);
             }
-            summaryContentTree.add(HtmlTree.LI(HtmlStyle.blockList, section));
+            summaryContentTree.add(HtmlTree.LI(section));
         }
     }
 
@@ -735,7 +735,7 @@ public void addServicesSummary(Content summaryContentTree) {
                     section.add(table);
                 }
             }
-            summaryContentTree.add(HtmlTree.LI(HtmlStyle.blockList, section));
+            summaryContentTree.add(HtmlTree.LI(section));
         }
     }
 

src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageUseWriter.java

@@ -220,7 +220,7 @@ protected void addClassList(Content contentTree) {
                 table.addRow(typeContent, summary);
             }
             section.add(table);
-            ul.add(HtmlTree.LI(HtmlStyle.blockList, section));
+            ul.add(HtmlTree.LI(section));
         }
         Content li = HtmlTree.SECTION(HtmlStyle.packageUses, ul);
         contentTree.add(li);

src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriterImpl.java

@@ -234,8 +234,7 @@ public void addClassesSummary(SortedSet<TypeElement> classes, String label,
                 }
                 table.addRow(classLink, description);
             }
-            Content li = HtmlTree.LI(HtmlStyle.blockList, table);
-            summaryContentTree.add(li);
+            summaryContentTree.add(HtmlTree.LI(table));
         }
     }
 

src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PropertyWriterImpl.java

@@ -139,11 +139,6 @@ public Content getPropertyDetails(Content propertyDetailsTreeHeader, Content pro
                 .setId(SectionName.PROPERTY_DETAIL.getName()));
     }
 
-    @Override
-    public Content getPropertyDoc(Content propertyDocTree) {
-        return getMemberTree(propertyDocTree);
-    }
-
     @Override
     public void addSummaryLabel(Content memberTree) {
         Content label = HtmlTree.HEADING(Headings.TypeDeclaration.SUMMARY_HEADING,

src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SerializedFormWriterImpl.java

@@ -231,7 +231,7 @@ public void addSerializedContent(Content serializedTreeContent) {
     public void addPackageSerializedTree(Content serializedSummariesTree,
                                          Content packageSerializedTree)
     {
-        serializedSummariesTree.add(HtmlTree.LI(HtmlStyle.blockList, packageSerializedTree));
+        serializedSummariesTree.add(HtmlTree.LI(packageSerializedTree));
     }
 
     /**

src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SubWriterHolderWriter.java

@@ -212,6 +212,25 @@ public Content getMemberTreeHeader() {
         return ul;
     }
 
+    /**
+     * Returns a list to be used for the list of members of a given kind.
+     *
+     * @return a list to be used for the list of members of a given kind
+     */
+    public Content getMemberList() {
+        return new HtmlTree(TagName.UL).setStyle(HtmlStyle.memberList);
+    }
+
+    /**
+     * Returns an item for the list of elements of a given kind
+     *
+     * @param contentTree the tree used to generate the complete member tree
+     * @return an item for the list of elements of a given kind
+     */
+    public Content getMemberListItem(Content contentTree) {
+        return HtmlTree.LI(contentTree);
+    }
+
     public Content getMemberInheritedTree() {
         HtmlTree div = new HtmlTree(TagName.DIV);
         div.setStyle(HtmlStyle.inheritedList);
@@ -238,7 +257,7 @@ public void addMemberTree(HtmlStyle style, SectionName sectionName, Content memb
      * @return a content tree for the member
      */
     public Content getMemberTree(Content contentTree) {
-        return HtmlTree.LI(HtmlStyle.blockList, contentTree);
+        return HtmlTree.LI(contentTree);
     }
 
     /**

src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlStyle.java

@@ -85,6 +85,7 @@
     interfaceName,
     legalCopy,
     memberDetails,
+    memberList,
     memberNameLabel,
     memberNameLink,
     memberSummary,

src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/AnnotationTypeFieldWriter.java

@@ -37,7 +37,7 @@
  *  deletion without notice.</b>
  */
 
-public interface AnnotationTypeFieldWriter {
+public interface AnnotationTypeFieldWriter extends MemberWriter {
 
     /**
      * Add the annotation type member tree header.
@@ -77,14 +77,6 @@
      */
     Content getAnnotationDetails(Content annotationDetailsTreeHeader, Content annotationDetailsTree);
 
-    /**
-     * Get the annotation type documentation.
-     *
-     * @param annotationDocTree the content tree representing annotation type documentation
-     * @return content tree for the annotation type documentation
-     */
-    Content getAnnotationDoc(Content annotationDocTree);
-
     /**
      * Get the signature for the given member.
      *

src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/AnnotationTypeRequiredMemberWriter.java

@@ -37,7 +37,7 @@
  *  deletion without notice.</b>
  */
 
-public interface AnnotationTypeRequiredMemberWriter {
+public interface AnnotationTypeRequiredMemberWriter extends MemberWriter {
 
     /**
      * Add the annotation type member tree header.
@@ -77,14 +77,6 @@
      */
     Content getAnnotationDetails(Content annotationDetailsTreeHeader, Content annotationDetailsTree);
 
-    /**
-     * Get the annotation type documentation.
-     *
-     * @param annotationDocTree the content tree representing annotation type documentation
-     * @return content tree for the annotation type documentation
-     */
-    Content getAnnotationDoc(Content annotationDocTree);
-
     /**
      * Get the signature for the given member.
      *

src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/ConstructorWriter.java

@@ -37,7 +37,7 @@
  *  deletion without notice.</b>
  */
 
-public interface ConstructorWriter {
+public interface ConstructorWriter extends MemberWriter {
 
     /**
      * Get the constructor details tree header.
@@ -96,14 +96,6 @@
      */
     Content getConstructorDetails(Content memberDetailsTreeHeader, Content memberDetailsTree);
 
-    /**
-     * Get the constructor documentation.
-     *
-     * @param constructorDocTree the content tree representing constructor documentation
-     * @return content tree for the constructor documentation
-     */
-    Content getConstructorDoc(Content constructorDocTree);
-
     /**
      * Let the writer know whether a non public constructor was found.
      *

src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/EnumConstantWriter.java

@@ -37,7 +37,7 @@
  *  deletion without notice.</b>
  */
 
-public interface EnumConstantWriter {
+public interface EnumConstantWriter extends MemberWriter {
 
     /**
      * Get the enum constants details tree header.
@@ -99,14 +99,6 @@ Content getEnumConstantsTreeHeader(VariableElement enumConstant,
      */
     Content getEnumConstantsDetails(Content memberDetailsTreeHeader, Content memberDetailsTree);
 
-    /**
-     * Get the enum constants documentation.
-     *
-     * @param enumConstantsTree the content tree representing enum constants documentation
-     * @return content tree for the enum constants documentation
-     */
-    Content getEnumConstants(Content enumConstantsTree);
-
     /**
      * Gets the member header tree.
      *

src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/FieldWriter.java

@@ -38,7 +38,7 @@
  *  deletion without notice.</b>
  */
 
-public interface FieldWriter {
+public interface FieldWriter extends MemberWriter {
 
     /**
      * Get the field details tree header.
@@ -97,14 +97,6 @@
      */
     Content getFieldDetails(Content memberDetailsTreeHeader, Content memberDetailsTree);
 
-    /**
-     * Get the field documentation.
-     *
-     * @param fieldDocTree the content tree representing field documentation
-     * @return content tree for the field documentation
-     */
-    Content getFieldDoc(Content fieldDocTree);
-
     /**
      * Gets the member header tree.
      *