changeset 56614:9b392b044f64

8221709: replace use of style blockListLast Reviewed-by: jjg
author hannesw
date Wed, 05 Jun 2019 16:26:13 +0200
parents 02db50f278f9
children 6c2d69a41ff9
files src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeFieldWriterImpl.java src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstructorWriterImpl.java src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/EnumConstantWriterImpl.java src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FieldWriterImpl.java src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlSerialFieldWriter.java src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlSerialMethodWriter.java src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MethodWriterImpl.java src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PropertyWriterImpl.java src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlStyle.java src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/AnnotationTypeFieldWriter.java src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/AnnotationTypeRequiredMemberWriter.java src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/ConstructorWriter.java src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/EnumConstantWriter.java src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/FieldWriter.java src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/MethodWriter.java src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/PropertyWriter.java src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AnnotationTypeFieldBuilder.java src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ConstructorBuilder.java src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/EnumConstantBuilder.java src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/FieldBuilder.java src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MethodBuilder.java src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/PropertyBuilder.java src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/stylesheet.css test/langtools/jdk/javadoc/doclet/testAnnotationTypes/TestAnnotationTypes.java test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java test/langtools/jdk/javadoc/doclet/testSerializedForm/TestSerializedForm.java
diffstat 29 files changed, 40 insertions(+), 100 deletions(-) [+]
line wrap: on
line diff
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java	Wed Jun 05 10:21:02 2019 -0400
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java	Wed Jun 05 16:26:13 2019 +0200
@@ -504,20 +504,6 @@
     }
 
     /**
-     * Get the member tree to be documented.
-     *
-     * @param memberTree the content tree of member to be documented
-     * @param isLastContent true if the content to be added is the last content
-     * @return a content tree that will be added to the class documentation
-     */
-    public Content getMemberTree(Content memberTree, boolean isLastContent) {
-        if (isLastContent)
-            return HtmlTree.LI(HtmlStyle.blockListLast, memberTree);
-        else
-            return HtmlTree.LI(HtmlStyle.blockList, memberTree);
-    }
-
-    /**
      * A content builder for member signatures.
      */
     class MemberSignature {
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeFieldWriterImpl.java	Wed Jun 05 10:21:02 2019 -0400
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeFieldWriterImpl.java	Wed Jun 05 16:26:13 2019 +0200
@@ -31,10 +31,8 @@
 import javax.lang.model.type.TypeMirror;
 
 import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
-import jdk.javadoc.internal.doclets.formats.html.markup.Entity;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
 import jdk.javadoc.internal.doclets.formats.html.markup.Table;
 import jdk.javadoc.internal.doclets.formats.html.markup.TableHeader;
 import jdk.javadoc.internal.doclets.toolkit.AnnotationTypeFieldWriter;
@@ -170,9 +168,8 @@
     /**
      * {@inheritDoc}
      */
-    public Content getAnnotationDoc(Content annotationDocTree,
-            boolean isLastContent) {
-        return getMemberTree(annotationDocTree, isLastContent);
+    public Content getAnnotationDoc(Content annotationDocTree) {
+        return getMemberTree(annotationDocTree);
     }
 
     /**
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java	Wed Jun 05 10:21:02 2019 -0400
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java	Wed Jun 05 16:26:13 2019 +0200
@@ -170,9 +170,8 @@
     /**
      * {@inheritDoc}
      */
-    public Content getAnnotationDoc(Content annotationDocTree,
-            boolean isLastContent) {
-        return getMemberTree(annotationDocTree, isLastContent);
+    public Content getAnnotationDoc(Content annotationDocTree) {
+        return getMemberTree(annotationDocTree);
     }
 
     /**
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstructorWriterImpl.java	Wed Jun 05 10:21:02 2019 -0400
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstructorWriterImpl.java	Wed Jun 05 16:26:13 2019 +0200
@@ -194,9 +194,8 @@
      * {@inheritDoc}
      */
     @Override
-    public Content getConstructorDoc(Content constructorDocTree,
-            boolean isLastContent) {
-        return getMemberTree(constructorDocTree, isLastContent);
+    public Content getConstructorDoc(Content constructorDocTree) {
+        return getMemberTree(constructorDocTree);
     }
 
     /**
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/EnumConstantWriterImpl.java	Wed Jun 05 10:21:02 2019 -0400
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/EnumConstantWriterImpl.java	Wed Jun 05 16:26:13 2019 +0200
@@ -160,9 +160,8 @@
      * {@inheritDoc}
      */
     @Override
-    public Content getEnumConstants(Content enumConstantsTree,
-            boolean isLastContent) {
-        return getMemberTree(enumConstantsTree, isLastContent);
+    public Content getEnumConstants(Content enumConstantsTree) {
+        return getMemberTree(enumConstantsTree);
     }
 
     /**
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FieldWriterImpl.java	Wed Jun 05 10:21:02 2019 -0400
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FieldWriterImpl.java	Wed Jun 05 16:26:13 2019 +0200
@@ -164,9 +164,8 @@
      * {@inheritDoc}
      */
     @Override
-    public Content getFieldDoc(Content fieldTree,
-            boolean isLastContent) {
-        return getMemberTree(fieldTree, isLastContent);
+    public Content getFieldDoc(Content fieldTree) {
+        return getMemberTree(fieldTree);
     }
 
     /**
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlSerialFieldWriter.java	Wed Jun 05 10:21:02 2019 -0400
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlSerialFieldWriter.java	Wed Jun 05 16:26:13 2019 +0200
@@ -87,10 +87,7 @@
      */
     public Content getFieldsContentHeader(boolean isLastContent) {
         HtmlTree li = new HtmlTree(HtmlTag.LI);
-        if (isLastContent)
-            li.setStyle(HtmlStyle.blockListLast);
-        else
-            li.setStyle(HtmlStyle.blockList);
+        li.setStyle(HtmlStyle.blockList);
         return li;
     }
 
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlSerialMethodWriter.java	Wed Jun 05 10:21:02 2019 -0400
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlSerialMethodWriter.java	Wed Jun 05 16:26:13 2019 +0200
@@ -77,10 +77,7 @@
      */
     public Content getMethodsContentHeader(boolean isLastContent) {
         HtmlTree li = new HtmlTree(HtmlTag.LI);
-        if (isLastContent)
-            li.setStyle(HtmlStyle.blockListLast);
-        else
-            li.setStyle(HtmlStyle.blockList);
+        li.setStyle(HtmlStyle.blockList);
         return li;
     }
 
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MethodWriterImpl.java	Wed Jun 05 10:21:02 2019 -0400
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MethodWriterImpl.java	Wed Jun 05 16:26:13 2019 +0200
@@ -208,9 +208,8 @@
      * {@inheritDoc}
      */
     @Override
-    public Content getMethodDoc(Content methodDocTree,
-            boolean isLastContent) {
-        return getMemberTree(methodDocTree, isLastContent);
+    public Content getMethodDoc(Content methodDocTree) {
+        return getMemberTree(methodDocTree);
     }
 
     /**
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PropertyWriterImpl.java	Wed Jun 05 10:21:02 2019 -0400
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PropertyWriterImpl.java	Wed Jun 05 16:26:13 2019 +0200
@@ -176,9 +176,8 @@
      * {@inheritDoc}
      */
     @Override
-    public Content getPropertyDoc(Content propertyDocTree,
-            boolean isLastContent) {
-        return getMemberTree(propertyDocTree, isLastContent);
+    public Content getPropertyDoc(Content propertyDocTree) {
+        return getMemberTree(propertyDocTree);
     }
 
     /**
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlStyle.java	Wed Jun 05 10:21:02 2019 -0400
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlStyle.java	Wed Jun 05 16:26:13 2019 +0200
@@ -46,7 +46,6 @@
     bar,
     block,
     blockList,
-    blockListLast,
     bottomNav,
     circle,
     classUseContainer,
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/AnnotationTypeFieldWriter.java	Wed Jun 05 10:21:02 2019 -0400
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/AnnotationTypeFieldWriter.java	Wed Jun 05 16:26:13 2019 +0200
@@ -25,8 +25,6 @@
 
 package jdk.javadoc.internal.doclets.toolkit;
 
-import java.io.*;
-
 import javax.lang.model.element.Element;
 import javax.lang.model.element.TypeElement;
 
@@ -87,10 +85,9 @@
      * Get the annotation type documentation.
      *
      * @param annotationDocTree the content tree representing annotation type documentation
-     * @param isLastContent true if the content to be added is the last content
      * @return content tree for the annotation type documentation
      */
-    public Content getAnnotationDoc(Content annotationDocTree, boolean isLastContent);
+    public Content getAnnotationDoc(Content annotationDocTree);
 
     /**
      * Get the signature for the given member.
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/AnnotationTypeRequiredMemberWriter.java	Wed Jun 05 10:21:02 2019 -0400
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/AnnotationTypeRequiredMemberWriter.java	Wed Jun 05 16:26:13 2019 +0200
@@ -87,10 +87,9 @@
      * Get the annotation type documentation.
      *
      * @param annotationDocTree the content tree representing annotation type documentation
-     * @param isLastContent true if the content to be added is the last content
      * @return content tree for the annotation type documentation
      */
-    public Content getAnnotationDoc(Content annotationDocTree, boolean isLastContent);
+    public Content getAnnotationDoc(Content annotationDocTree);
 
     /**
      * Get the signature for the given member.
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/ConstructorWriter.java	Wed Jun 05 10:21:02 2019 -0400
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/ConstructorWriter.java	Wed Jun 05 16:26:13 2019 +0200
@@ -25,8 +25,6 @@
 
 package jdk.javadoc.internal.doclets.toolkit;
 
-import java.io.*;
-
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.TypeElement;
 
@@ -109,10 +107,9 @@
      * Get the constructor documentation.
      *
      * @param constructorDocTree the content tree representing constructor documentation
-     * @param isLastContent true if the content to be added is the last content
      * @return content tree for the constructor documentation
      */
-    public Content getConstructorDoc(Content constructorDocTree, boolean isLastContent);
+    public Content getConstructorDoc(Content constructorDocTree);
 
     /**
      * Let the writer know whether a non public constructor was found.
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/EnumConstantWriter.java	Wed Jun 05 10:21:02 2019 -0400
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/EnumConstantWriter.java	Wed Jun 05 16:26:13 2019 +0200
@@ -25,8 +25,6 @@
 
 package jdk.javadoc.internal.doclets.toolkit;
 
-import java.io.*;
-
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.element.VariableElement;
 
@@ -108,10 +106,9 @@
      * Get the enum constants documentation.
      *
      * @param enumConstantsTree the content tree representing enum constants documentation
-     * @param isLastContent true if the content to be added is the last content
      * @return content tree for the enum constants documentation
      */
-    public Content getEnumConstants(Content enumConstantsTree, boolean isLastContent);
+    public Content getEnumConstants(Content enumConstantsTree);
 
     /**
      * Gets the member header tree.
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/FieldWriter.java	Wed Jun 05 10:21:02 2019 -0400
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/FieldWriter.java	Wed Jun 05 16:26:13 2019 +0200
@@ -25,8 +25,6 @@
 
 package jdk.javadoc.internal.doclets.toolkit;
 
-import java.io.*;
-
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.element.VariableElement;
 
@@ -110,10 +108,9 @@
      * Get the field documentation.
      *
      * @param fieldDocTree the content tree representing field documentation
-     * @param isLastContent true if the content to be added is the last content
      * @return content tree for the field documentation
      */
-    public Content getFieldDoc(Content fieldDocTree, boolean isLastContent);
+    public Content getFieldDoc(Content fieldDocTree);
 
     /**
      * Gets the member header tree.
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/MethodWriter.java	Wed Jun 05 10:21:02 2019 -0400
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/MethodWriter.java	Wed Jun 05 16:26:13 2019 +0200
@@ -25,8 +25,6 @@
 
 package jdk.javadoc.internal.doclets.toolkit;
 
-import java.io.*;
-
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.type.TypeMirror;
@@ -111,10 +109,9 @@
      * Get the method documentation.
      *
      * @param methodDocTree the content tree representing method documentation
-     * @param isLastContent true if the content to be added is the last content
      * @return content tree for the method documentation
      */
-    public Content getMethodDoc(Content methodDocTree, boolean isLastContent);
+    public Content getMethodDoc(Content methodDocTree);
 
     /**
      * Gets the member header tree.
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/PropertyWriter.java	Wed Jun 05 10:21:02 2019 -0400
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/PropertyWriter.java	Wed Jun 05 16:26:13 2019 +0200
@@ -25,8 +25,6 @@
 
 package jdk.javadoc.internal.doclets.toolkit;
 
-import java.io.*;
-
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.TypeElement;
 
@@ -109,10 +107,9 @@
      * Get the property documentation.
      *
      * @param propertyDocTree the content tree representing property documentation
-     * @param isLastContent true if the content to be added is the last content
      * @return content tree for the property documentation
      */
-    public Content getPropertyDoc(Content propertyDocTree, boolean isLastContent);
+    public Content getPropertyDoc(Content propertyDocTree);
 
     /**
      * Gets the member header tree.
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AnnotationTypeFieldBuilder.java	Wed Jun 05 10:21:02 2019 -0400
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AnnotationTypeFieldBuilder.java	Wed Jun 05 16:26:13 2019 +0200
@@ -142,7 +142,6 @@
             Content annotationDetailsTreeHeader = writer.getAnnotationDetailsTreeHeader(typeElement);
             Content detailsTree = writer.getMemberTreeHeader();
 
-            Element lastElement = members.get(members.size() - 1);
             for (Element member : members) {
                 currentMember = member;
                 Content annotationDocTree = writer.getAnnotationDocTreeHeader(currentMember,
@@ -153,8 +152,7 @@
                 buildMemberComments(annotationDocTree);
                 buildTagInfo(annotationDocTree);
 
-                detailsTree.add(writer.getAnnotationDoc(
-                        annotationDocTree, currentMember == lastElement));
+                detailsTree.add(writer.getAnnotationDoc(annotationDocTree));
             }
             memberDetailsTree.add(writer.getAnnotationDetails(annotationDetailsTreeHeader, detailsTree));
         }
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java	Wed Jun 05 10:21:02 2019 -0400
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java	Wed Jun 05 16:26:13 2019 +0200
@@ -144,7 +144,7 @@
             writer.addAnnotationDetailsMarker(memberDetailsTree);
             Content annotationDetailsTreeHeader = writer.getAnnotationDetailsTreeHeader(typeElement);
             Content detailsTree = writer.getMemberTreeHeader();
-            Element lastMember = members.get((members.size() - 1));
+
             for (Element member : members) {
                 currentMember = member;
                 Content annotationDocTree = writer.getAnnotationDocTreeHeader(
@@ -152,8 +152,7 @@
 
                 buildAnnotationTypeMemberChildren(annotationDocTree);
 
-                detailsTree.add(writer.getAnnotationDoc(
-                        annotationDocTree, currentMember == lastMember));
+                detailsTree.add(writer.getAnnotationDoc(annotationDocTree));
             }
             memberDetailsTree.add(writer.getAnnotationDetails(annotationDetailsTreeHeader, detailsTree));
         }
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ConstructorBuilder.java	Wed Jun 05 10:21:02 2019 -0400
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ConstructorBuilder.java	Wed Jun 05 16:26:13 2019 +0200
@@ -139,7 +139,6 @@
                     memberDetailsTree);
             Content constructorDetailsTree = writer.getMemberTreeHeader();
 
-            Element lastElement = constructors.get(constructors.size() - 1);
             for (Element contructor : constructors) {
                 currentConstructor = (ExecutableElement)contructor;
                 Content constructorDocTree = writer.getConstructorDocTreeHeader(currentConstructor, constructorDetailsTree);
@@ -149,8 +148,7 @@
                 buildConstructorComments(constructorDocTree);
                 buildTagInfo(constructorDocTree);
 
-                constructorDetailsTree.add(writer.getConstructorDoc(constructorDocTree,
-                        currentConstructor == lastElement));
+                constructorDetailsTree.add(writer.getConstructorDoc(constructorDocTree));
             }
             memberDetailsTree.add(
                     writer.getConstructorDetails(constructorDetailsTreeHeader, constructorDetailsTree));
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/EnumConstantBuilder.java	Wed Jun 05 10:21:02 2019 -0400
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/EnumConstantBuilder.java	Wed Jun 05 16:26:13 2019 +0200
@@ -126,7 +126,7 @@
             Content enumConstantsDetailsTreeHeader = writer.getEnumConstantsDetailsTreeHeader(typeElement,
                     memberDetailsTree);
             Content enumConstantsDetailsTree = writer.getMemberTreeHeader();
-            Element lastElement = enumConstants.get(enumConstants.size() - 1);
+
             for (Element enumConstant : enumConstants) {
                 currentElement = (VariableElement)enumConstant;
                 Content enumConstantsTree = writer.getEnumConstantsTreeHeader(currentElement,
@@ -137,8 +137,7 @@
                 buildEnumConstantComments(enumConstantsTree);
                 buildTagInfo(enumConstantsTree);
 
-                enumConstantsDetailsTree.add(writer.getEnumConstants(
-                        enumConstantsTree, currentElement == lastElement));
+                enumConstantsDetailsTree.add(writer.getEnumConstants(enumConstantsTree));
             }
             memberDetailsTree.add(
                     writer.getEnumConstantsDetails(enumConstantsDetailsTreeHeader, enumConstantsDetailsTree));
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/FieldBuilder.java	Wed Jun 05 10:21:02 2019 -0400
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/FieldBuilder.java	Wed Jun 05 16:26:13 2019 +0200
@@ -128,7 +128,6 @@
             Content fieldDetailsTreeHeader = writer.getFieldDetailsTreeHeader(typeElement, memberDetailsTree);
             Content fieldDetailsTree = writer.getMemberTreeHeader();
 
-            Element lastElement = fields.get(fields.size() - 1);
             for (Element element : fields) {
                 currentElement = (VariableElement)element;
                 Content fieldDocTree = writer.getFieldDocTreeHeader(currentElement, fieldDetailsTree);
@@ -138,8 +137,7 @@
                 buildFieldComments(fieldDocTree);
                 buildTagInfo(fieldDocTree);
 
-                fieldDetailsTree.add(writer.getFieldDoc(
-                        fieldDocTree, currentElement == lastElement));
+                fieldDetailsTree.add(writer.getFieldDoc(fieldDocTree));
             }
             memberDetailsTree.add(
                     writer.getFieldDetails(fieldDetailsTreeHeader, fieldDetailsTree));
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MethodBuilder.java	Wed Jun 05 10:21:02 2019 -0400
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MethodBuilder.java	Wed Jun 05 16:26:13 2019 +0200
@@ -130,7 +130,6 @@
                     memberDetailsTree);
             Content methodDetailsTree = writer.getMemberTreeHeader();
 
-            Element lastElement = methods.get(methods.size() - 1);
             for (Element method : methods) {
                 currentMethod = (ExecutableElement)method;
                 Content methodDocTree = writer.getMethodDocTreeHeader(currentMethod, methodDetailsTree);
@@ -140,8 +139,7 @@
                 buildMethodComments(methodDocTree);
                 buildTagInfo(methodDocTree);
 
-                methodDetailsTree.add(writer.getMethodDoc(
-                        methodDocTree, currentMethod == lastElement));
+                methodDetailsTree.add(writer.getMethodDoc(methodDocTree));
             }
             memberDetailsTree.add(writer.getMethodDetails(methodDetailsTreeHeader, methodDetailsTree));
         }
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/PropertyBuilder.java	Wed Jun 05 10:21:02 2019 -0400
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/PropertyBuilder.java	Wed Jun 05 16:26:13 2019 +0200
@@ -128,7 +128,7 @@
             Content propertyDetailsTreeHeader = writer.getPropertyDetailsTreeHeader(typeElement,
                     memberDetailsTree);
             Content propertyDetailsTree = writer.getMemberTreeHeader();
-            Element lastElement = properties.get(properties.size() - 1);
+
             for (Element property : properties) {
                 currentProperty = (ExecutableElement)property;
                 Content propertyDocTree = writer.getPropertyDocTreeHeader(currentProperty,
@@ -138,8 +138,7 @@
                 buildPropertyComments(propertyDocTree);
                 buildTagInfo(propertyDocTree);
 
-                propertyDetailsTree.add(writer.getPropertyDoc(
-                        propertyDocTree, currentProperty == lastElement));
+                propertyDetailsTree.add(writer.getPropertyDoc(propertyDocTree));
             }
             memberDetailsTree.add(
                     writer.getPropertyDetails(propertyDetailsTreeHeader, propertyDetailsTree));
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/stylesheet.css	Wed Jun 05 10:21:02 2019 -0400
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/stylesheet.css	Wed Jun 05 16:26:13 2019 +0200
@@ -371,11 +371,11 @@
 div.inheritance div.inheritance {
     margin-left:2em;
 }
-ul.blockList, ul.blockListLast {
+ul.blockList {
     margin:10px 0 10px 0;
     padding:0;
 }
-ul.blockList li.blockList, ul.blockList li.blockListLast {
+ul.blockList li.blockList {
     list-style:none;
     margin-bottom:15px;
     line-height:1.4;
--- a/test/langtools/jdk/javadoc/doclet/testAnnotationTypes/TestAnnotationTypes.java	Wed Jun 05 10:21:02 2019 -0400
+++ b/test/langtools/jdk/javadoc/doclet/testAnnotationTypes/TestAnnotationTypes.java	Wed Jun 05 16:26:13 2019 +0200
@@ -85,7 +85,7 @@
                     "<!--   -->",
                     "</a>",
                     "<ul class=\"blockList\">",
-                    "<li class=\"blockListLast\">",
+                    "<li class=\"blockList\">",
                     "<section class=\"detail\">",
                     "<h3>value</h3>",
                     "<a id=\"value()\">",
--- a/test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java	Wed Jun 05 10:21:02 2019 -0400
+++ b/test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java	Wed Jun 05 16:26:13 2019 +0200
@@ -252,7 +252,7 @@
                 + "&nbsp;<span class=\"memberName\">gammaProperty</span></div>\n"
                 + "</section>\n"
                 + "</li>\n"
-                + "<li class=\"blockListLast\">\n"
+                + "<li class=\"blockList\">\n"
                 + "<section class=\"detail\">\n"
                 + "<h3>delta</h3>\n"
                 + "<a id=\"deltaProperty\">\n"
--- a/test/langtools/jdk/javadoc/doclet/testSerializedForm/TestSerializedForm.java	Wed Jun 05 10:21:02 2019 -0400
+++ b/test/langtools/jdk/javadoc/doclet/testSerializedForm/TestSerializedForm.java	Wed Jun 05 16:26:13 2019 +0200
@@ -65,7 +65,7 @@
                 "protected&nbsp;java.lang.Object&nbsp;writeReplace()",
                 "protected&nbsp;java.lang.Object&nbsp;readObjectNoData()",
                 "<h3>Serialization Overview</h3>\n<ul class=\"blockList\">\n"
-                + "<li class=\"blockListLast\">\n<div class=\"block\">"
+                + "<li class=\"blockList\">\n<div class=\"block\">"
                 + "<span class=\"deprecatedLabel\">Deprecated.</span>&nbsp;</div>\n"
                 + "<dl>\n<dt><span class=\"seeLabel\">See Also:</span></dt>\n"
                 + "<dd><code>TestSerializedForm</code></dd>\n</dl>",
@@ -95,7 +95,7 @@
                 "<pre>Long[] longs</pre>\n" +
                 "<div class=\"block\">the longs</div>\n" +
                 "</li>\n" +
-                "<li class=\"blockListLast\">\n" +
+                "<li class=\"blockList\">\n" +
                 "<h4>name</h4>\n" +
                 "<pre>java.lang.String name</pre>\n" +
                 "<div class=\"block\">a test</div>");
@@ -139,7 +139,7 @@
                 "<pre>Long[] longs</pre>\n" +
                 "<div class=\"block\">the longs</div>\n" +
                 "</li>\n" +
-                "<li class=\"blockListLast\">\n" +
+                "<li class=\"blockList\">\n" +
                 "<h5>name</h5>\n" +
                 "<pre>java.lang.String name</pre>\n" +
                 "<div class=\"block\">a test</div>");