archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8221709: replace use of style blockListLast

Browse source 
Reviewed-by: jjg
This commit is contained in:
Hannes Wallnöfer 2019-06-05 16:26:13 +02:00
parent ab88704c67
commit 9f039257cb
29 changed files with 40 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -503,20 +503,6 @@ public abstract class AbstractMemberWriter implements MemberSummaryWriter {
return writer.getMemberTree(memberTree);
}
/**
* 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.
*/

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

@ -31,10 +31,8 @@ import javax.lang.model.element.TypeElement;
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 @@ public class AnnotationTypeFieldWriterImpl extends AbstractMemberWriter
/**
* {@inheritDoc}
*/
public Content getAnnotationDoc(Content annotationDocTree,
boolean isLastContent) {
return getMemberTree(annotationDocTree, isLastContent);
public Content getAnnotationDoc(Content annotationDocTree) {
return getMemberTree(annotationDocTree);
}
/**

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

@ -170,9 +170,8 @@ public class AnnotationTypeRequiredMemberWriterImpl extends AbstractMemberWriter
/**
* {@inheritDoc}
*/
public Content getAnnotationDoc(Content annotationDocTree,
boolean isLastContent) {
return getMemberTree(annotationDocTree, isLastContent);
public Content getAnnotationDoc(Content annotationDocTree) {
return getMemberTree(annotationDocTree);
}
/**

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

@ -194,9 +194,8 @@ public class ConstructorWriterImpl extends AbstractExecutableMemberWriter
* {@inheritDoc}
*/
@Override
public Content getConstructorDoc(Content constructorDocTree,
boolean isLastContent) {
return getMemberTree(constructorDocTree, isLastContent);
public Content getConstructorDoc(Content constructorDocTree) {
return getMemberTree(constructorDocTree);
}
/**

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

@ -160,9 +160,8 @@ public class EnumConstantWriterImpl extends AbstractMemberWriter
* {@inheritDoc}
*/
@Override
public Content getEnumConstants(Content enumConstantsTree,
boolean isLastContent) {
return getMemberTree(enumConstantsTree, isLastContent);
public Content getEnumConstants(Content enumConstantsTree) {
return getMemberTree(enumConstantsTree);
}
/**

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

@ -164,9 +164,8 @@ public class FieldWriterImpl extends AbstractMemberWriter
* {@inheritDoc}
*/
@Override
public Content getFieldDoc(Content fieldTree,
boolean isLastContent) {
return getMemberTree(fieldTree, isLastContent);
public Content getFieldDoc(Content fieldTree) {
return getMemberTree(fieldTree);
}
/**

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

@ -87,10 +87,7 @@ public class HtmlSerialFieldWriter extends FieldWriterImpl
*/
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;
}

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

@ -77,10 +77,7 @@ public class HtmlSerialMethodWriter extends MethodWriterImpl implements
*/
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;
}

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

@ -208,9 +208,8 @@ public class MethodWriterImpl extends AbstractExecutableMemberWriter
* {@inheritDoc}
*/
@Override
public Content getMethodDoc(Content methodDocTree,
boolean isLastContent) {
return getMemberTree(methodDocTree, isLastContent);
public Content getMethodDoc(Content methodDocTree) {
return getMemberTree(methodDocTree);
}
/**

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

@ -176,9 +176,8 @@ public class PropertyWriterImpl extends AbstractMemberWriter
* {@inheritDoc}
*/
@Override
public Content getPropertyDoc(Content propertyDocTree,
boolean isLastContent) {
return getMemberTree(propertyDocTree, isLastContent);
public Content getPropertyDoc(Content propertyDocTree) {
return getMemberTree(propertyDocTree);
}
/**

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

@ -46,7 +46,6 @@ public enum HtmlStyle {
bar,
block,
blockList,
blockListLast,
bottomNav,
circle,
classUseContainer,

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

@ -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 @@ public interface AnnotationTypeFieldWriter {
* 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.

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

@ -87,10 +87,9 @@ public interface AnnotationTypeRequiredMemberWriter {
* 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.

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

@ -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 @@ public interface ConstructorWriter {
* 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.

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

@ -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 @@ public interface EnumConstantWriter {
* 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.

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

@ -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 @@ public interface FieldWriter {
* 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.

5
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/MethodWriter.java
View file

@ -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 @@ public interface MethodWriter {
* 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.

5
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/PropertyWriter.java
View file

@ -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 @@ public interface PropertyWriter {
* 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.

4
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AnnotationTypeFieldBuilder.java
View file

@ -142,7 +142,6 @@ public class AnnotationTypeFieldBuilder extends AbstractMemberBuilder {
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 @@ public class AnnotationTypeFieldBuilder extends AbstractMemberBuilder {
buildMemberComments(annotationDocTree);
buildTagInfo(annotationDocTree);
detailsTree.add(writer.getAnnotationDoc(
annotationDocTree, currentMember == lastElement));
detailsTree.add(writer.getAnnotationDoc(annotationDocTree));
}
memberDetailsTree.add(writer.getAnnotationDetails(annotationDetailsTreeHeader, detailsTree));
}

5
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java
View file

@ -144,7 +144,7 @@ public class AnnotationTypeRequiredMemberBuilder extends AbstractMemberBuilder {
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 @@ public class AnnotationTypeRequiredMemberBuilder extends AbstractMemberBuilder {
buildAnnotationTypeMemberChildren(annotationDocTree);
detailsTree.add(writer.getAnnotationDoc(
annotationDocTree, currentMember == lastMember));
detailsTree.add(writer.getAnnotationDoc(annotationDocTree));
}
memberDetailsTree.add(writer.getAnnotationDetails(annotationDetailsTreeHeader, detailsTree));
}

4
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ConstructorBuilder.java
View file

@ -139,7 +139,6 @@ public class ConstructorBuilder extends AbstractMemberBuilder {
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 @@ public class ConstructorBuilder extends AbstractMemberBuilder {
buildConstructorComments(constructorDocTree);
buildTagInfo(constructorDocTree);
constructorDetailsTree.add(writer.getConstructorDoc(constructorDocTree,
currentConstructor == lastElement));
constructorDetailsTree.add(writer.getConstructorDoc(constructorDocTree));
}
memberDetailsTree.add(
writer.getConstructorDetails(constructorDetailsTreeHeader, constructorDetailsTree));

5
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/EnumConstantBuilder.java
View file

@ -126,7 +126,7 @@ public class EnumConstantBuilder extends AbstractMemberBuilder {
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 @@ public class EnumConstantBuilder extends AbstractMemberBuilder {
buildEnumConstantComments(enumConstantsTree);
buildTagInfo(enumConstantsTree);
enumConstantsDetailsTree.add(writer.getEnumConstants(
enumConstantsTree, currentElement == lastElement));
enumConstantsDetailsTree.add(writer.getEnumConstants(enumConstantsTree));
}
memberDetailsTree.add(
writer.getEnumConstantsDetails(enumConstantsDetailsTreeHeader, enumConstantsDetailsTree));

4
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/FieldBuilder.java
View file

@ -128,7 +128,6 @@ public class FieldBuilder extends AbstractMemberBuilder {
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 @@ public class FieldBuilder extends AbstractMemberBuilder {
buildFieldComments(fieldDocTree);
buildTagInfo(fieldDocTree);
fieldDetailsTree.add(writer.getFieldDoc(
fieldDocTree, currentElement == lastElement));
fieldDetailsTree.add(writer.getFieldDoc(fieldDocTree));
}
memberDetailsTree.add(
writer.getFieldDetails(fieldDetailsTreeHeader, fieldDetailsTree));

4
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MethodBuilder.java
View file

@ -130,7 +130,6 @@ public class MethodBuilder extends AbstractMemberBuilder {
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 @@ public class MethodBuilder extends AbstractMemberBuilder {
buildMethodComments(methodDocTree);
buildTagInfo(methodDocTree);
methodDetailsTree.add(writer.getMethodDoc(
methodDocTree, currentMethod == lastElement));
methodDetailsTree.add(writer.getMethodDoc(methodDocTree));
}
memberDetailsTree.add(writer.getMethodDetails(methodDetailsTreeHeader, methodDetailsTree));
}

5
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/PropertyBuilder.java
View file

@ -128,7 +128,7 @@ public class PropertyBuilder extends AbstractMemberBuilder {
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 @@ public class PropertyBuilder extends AbstractMemberBuilder {
buildPropertyComments(propertyDocTree);
buildTagInfo(propertyDocTree);
propertyDetailsTree.add(writer.getPropertyDoc(
propertyDocTree, currentProperty == lastElement));
propertyDetailsTree.add(writer.getPropertyDoc(propertyDocTree));
}
memberDetailsTree.add(
writer.getPropertyDetails(propertyDetailsTreeHeader, propertyDetailsTree));

4
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/stylesheet.css
View file

@ -371,11 +371,11 @@ div.inheritance {
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;