--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriterImpl.java Mon Mar 11 11:23:09 2019 -0700
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriterImpl.java Mon Mar 11 12:59:45 2019 -0700
@@ -113,29 +113,29 @@
navBar.setNavLinkModule(linkContent);
navBar.setMemberSummaryBuilder(configuration.getBuilderFactory().getMemberSummaryBuilder(this));
navBar.setUserHeader(getUserHeaderFooter(true));
- htmlTree.addContent(navBar.getContent(true));
- bodyTree.addContent(htmlTree);
- bodyTree.addContent(MarkerComments.START_OF_CLASS_DATA);
+ htmlTree.add(navBar.getContent(true));
+ bodyTree.add(htmlTree);
+ bodyTree.add(MarkerComments.START_OF_CLASS_DATA);
HtmlTree div = new HtmlTree(HtmlTag.DIV);
div.setStyle(HtmlStyle.header);
if (configuration.showModules) {
ModuleElement mdle = configuration.docEnv.getElementUtils().getModuleOf(typeElement);
Content classModuleLabel = HtmlTree.SPAN(HtmlStyle.moduleLabelInType, contents.moduleLabel);
Content moduleNameDiv = HtmlTree.DIV(HtmlStyle.subTitle, classModuleLabel);
- moduleNameDiv.addContent(Contents.SPACE);
- moduleNameDiv.addContent(getModuleLink(mdle,
+ moduleNameDiv.add(Contents.SPACE);
+ moduleNameDiv.add(getModuleLink(mdle,
new StringContent(mdle.getQualifiedName())));
- div.addContent(moduleNameDiv);
+ div.add(moduleNameDiv);
}
PackageElement pkg = utils.containingPackage(typeElement);
if (!pkg.isUnnamed()) {
Content classPackageLabel = HtmlTree.SPAN(HtmlStyle.packageLabelInType, contents.packageLabel);
Content pkgNameDiv = HtmlTree.DIV(HtmlStyle.subTitle, classPackageLabel);
- pkgNameDiv.addContent(Contents.SPACE);
+ pkgNameDiv.add(Contents.SPACE);
Content pkgNameContent = getPackageLink(pkg,
new StringContent(utils.getPackageName(pkg)));
- pkgNameDiv.addContent(pkgNameContent);
- div.addContent(pkgNameDiv);
+ pkgNameDiv.add(pkgNameContent);
+ div.add(pkgNameDiv);
}
LinkInfoImpl linkInfo = new LinkInfoImpl(configuration,
LinkInfoImpl.Kind.CLASS_HEADER, typeElement);
@@ -144,9 +144,9 @@
Content headerContent = new StringContent(header);
Content heading = HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING, true,
HtmlStyle.title, headerContent);
- heading.addContent(getTypeParameterLinks(linkInfo));
- div.addContent(heading);
- mainTree.addContent(div);
+ heading.add(getTypeParameterLinks(linkInfo));
+ div.add(heading);
+ mainTree.add(div);
return bodyTree;
}
@@ -163,12 +163,12 @@
*/
@Override
public void addFooter(Content contentTree) {
- contentTree.addContent(MarkerComments.END_OF_CLASS_DATA);
+ contentTree.add(MarkerComments.END_OF_CLASS_DATA);
Content htmlTree = HtmlTree.FOOTER();
navBar.setUserFooter(getUserHeaderFooter(false));
- htmlTree.addContent(navBar.getContent(false));
+ htmlTree.add(navBar.getContent(false));
addBottom(htmlTree);
- contentTree.addContent(htmlTree);
+ contentTree.add(htmlTree);
}
/**
@@ -205,10 +205,10 @@
@Override
public void addClassSignature(String modifiers, Content classInfoTree) {
Content hr = new HtmlTree(HtmlTag.HR);
- classInfoTree.addContent(hr);
+ classInfoTree.add(hr);
Content pre = new HtmlTree(HtmlTag.PRE);
addAnnotationInfo(typeElement, pre);
- pre.addContent(modifiers);
+ pre.add(modifiers);
LinkInfoImpl linkInfo = new LinkInfoImpl(configuration,
LinkInfoImpl.Kind.CLASS_SIGNATURE, typeElement);
//Let's not link to ourselves in the signature.
@@ -217,21 +217,21 @@
Content parameterLinks = getTypeParameterLinks(linkInfo);
if (configuration.linksource) {
addSrcLink(typeElement, className, pre);
- pre.addContent(parameterLinks);
+ pre.add(parameterLinks);
} else {
Content span = HtmlTree.SPAN(HtmlStyle.typeNameLabel, className);
- span.addContent(parameterLinks);
- pre.addContent(span);
+ span.add(parameterLinks);
+ pre.add(span);
}
if (!utils.isInterface(typeElement)) {
TypeMirror superclass = utils.getFirstVisibleSuperClass(typeElement);
if (superclass != null) {
- pre.addContent(DocletConstants.NL);
- pre.addContent("extends ");
+ pre.add(DocletConstants.NL);
+ pre.add("extends ");
Content link = getLink(new LinkInfoImpl(configuration,
LinkInfoImpl.Kind.CLASS_SIGNATURE_PARENT_NAME,
superclass));
- pre.addContent(link);
+ pre.add(link);
}
}
List<? extends TypeMirror> interfaces = typeElement.getInterfaces();
@@ -243,19 +243,19 @@
continue;
}
if (isFirst) {
- pre.addContent(DocletConstants.NL);
- pre.addContent(utils.isInterface(typeElement) ? "extends " : "implements ");
+ pre.add(DocletConstants.NL);
+ pre.add(utils.isInterface(typeElement) ? "extends " : "implements ");
isFirst = false;
} else {
- pre.addContent(", ");
+ pre.add(", ");
}
Content link = getLink(new LinkInfoImpl(configuration,
LinkInfoImpl.Kind.CLASS_SIGNATURE_PARENT_NAME,
type));
- pre.addContent(link);
+ pre.add(link);
}
}
- classInfoTree.addContent(pre);
+ classInfoTree.add(pre);
}
/**
@@ -298,17 +298,17 @@
if (sup != null) {
HtmlTree ul = new HtmlTree(HtmlTag.UL);
ul.setStyle(HtmlStyle.inheritance);
- ul.addContent(getTreeForClassHelper(type));
+ ul.add(getTreeForClassHelper(type));
if (liTree != null)
- ul.addContent(liTree);
+ ul.add(liTree);
Content li = HtmlTree.LI(ul);
liTree = li;
type = sup;
} else
- classTreeUl.addContent(getTreeForClassHelper(type));
+ classTreeUl.add(getTreeForClassHelper(type));
} while (sup != null);
if (liTree != null)
- classTreeUl.addContent(liTree);
+ classTreeUl.add(liTree);
return classTreeUl;
}
@@ -325,17 +325,17 @@
new LinkInfoImpl(configuration, LinkInfoImpl.Kind.TREE,
typeElement));
if (configuration.shouldExcludeQualifier(utils.containingPackage(typeElement).toString())) {
- li.addContent(utils.asTypeElement(type).getSimpleName());
- li.addContent(typeParameters);
+ li.add(utils.asTypeElement(type).getSimpleName());
+ li.add(typeParameters);
} else {
- li.addContent(utils.asTypeElement(type).getQualifiedName());
- li.addContent(typeParameters);
+ li.add(utils.asTypeElement(type).getQualifiedName());
+ li.add(typeParameters);
}
} else {
Content link = getLink(new LinkInfoImpl(configuration,
LinkInfoImpl.Kind.CLASS_TREE_PARENT, type)
.label(configuration.getClassName(utils.asTypeElement(type))));
- li.addContent(link);
+ li.add(link);
}
return li;
}
@@ -348,7 +348,7 @@
if (!utils.isClass(typeElement)) {
return;
}
- classContentTree.addContent(getClassInheritenceTree(typeElement.asType()));
+ classContentTree.add(getClassInheritenceTree(typeElement.asType()));
}
/**
@@ -360,7 +360,7 @@
Content typeParam = (new ParamTaglet()).getTagletOutput(typeElement,
getTagletWriterInstance(false));
Content dl = HtmlTree.DL(typeParam);
- classInfoTree.addContent(dl);
+ classInfoTree.add(dl);
}
}
@@ -380,9 +380,9 @@
Content label = contents.subclassesLabel;
Content dt = HtmlTree.DT(label);
Content dl = HtmlTree.DL(dt);
- dl.addContent(getClassLinks(LinkInfoImpl.Kind.SUBCLASSES,
+ dl.add(getClassLinks(LinkInfoImpl.Kind.SUBCLASSES,
subclasses));
- classInfoTree.addContent(dl);
+ classInfoTree.add(dl);
}
}
}
@@ -398,9 +398,9 @@
Content label = contents.subinterfacesLabel;
Content dt = HtmlTree.DT(label);
Content dl = HtmlTree.DL(dt);
- dl.addContent(getClassLinks(LinkInfoImpl.Kind.SUBINTERFACES,
+ dl.add(getClassLinks(LinkInfoImpl.Kind.SUBINTERFACES,
subInterfaces));
- classInfoTree.addContent(dl);
+ classInfoTree.add(dl);
}
}
}
@@ -423,9 +423,9 @@
Content label = contents.implementingClassesLabel;
Content dt = HtmlTree.DT(label);
Content dl = HtmlTree.DL(dt);
- dl.addContent(getClassLinks(LinkInfoImpl.Kind.IMPLEMENTED_CLASSES,
+ dl.add(getClassLinks(LinkInfoImpl.Kind.IMPLEMENTED_CLASSES,
implcl));
- classInfoTree.addContent(dl);
+ classInfoTree.add(dl);
}
}
@@ -440,8 +440,8 @@
Content label = contents.allImplementedInterfacesLabel;
Content dt = HtmlTree.DT(label);
Content dl = HtmlTree.DL(dt);
- dl.addContent(getClassLinks(LinkInfoImpl.Kind.IMPLEMENTED_INTERFACES, interfaces));
- classInfoTree.addContent(dl);
+ dl.add(getClassLinks(LinkInfoImpl.Kind.IMPLEMENTED_INTERFACES, interfaces));
+ classInfoTree.add(dl);
}
}
@@ -458,8 +458,8 @@
Content label = contents.allSuperinterfacesLabel;
Content dt = HtmlTree.DT(label);
Content dl = HtmlTree.DL(dt);
- dl.addContent(getClassLinks(LinkInfoImpl.Kind.SUPER_INTERFACES, interfaces));
- classInfoTree.addContent(dl);
+ dl.add(getClassLinks(LinkInfoImpl.Kind.SUPER_INTERFACES, interfaces));
+ classInfoTree.add(dl);
}
}
@@ -480,10 +480,10 @@
Content dt = HtmlTree.DT(label);
Content dl = HtmlTree.DL(dt);
Content dd = new HtmlTree(HtmlTag.DD);
- dd.addContent(getLink(new LinkInfoImpl(configuration,
+ dd.add(getLink(new LinkInfoImpl(configuration,
LinkInfoImpl.Kind.CLASS, e)));
- dl.addContent(dd);
- classInfoTree.addContent(dl);
+ dl.add(dd);
+ classInfoTree.add(dl);
return null;
}
}.visit(outerClass);
@@ -498,9 +498,9 @@
Content dt = HtmlTree.DT(contents.functionalInterface);
Content dl = HtmlTree.DL(dt);
Content dd = new HtmlTree(HtmlTag.DD);
- dd.addContent(contents.functionalInterfaceMessage);
- dl.addContent(dd);
- classInfoTree.addContent(dl);
+ dd.add(contents.functionalInterfaceMessage);
+ dl.add(dd);
+ classInfoTree.add(dl);
}
}
@@ -532,7 +532,7 @@
addInlineDeprecatedComment(typeElement, deprs.get(0), div);
}
}
- classInfoTree.addContent(div);
+ classInfoTree.add(div);
}
}
@@ -549,7 +549,7 @@
for (Object type : list) {
if (!isFirst) {
Content separator = new StringContent(", ");
- dd.addContent(separator);
+ dd.add(separator);
} else {
isFirst = false;
}
@@ -557,11 +557,11 @@
if (type instanceof TypeElement) {
Content link = getLink(
new LinkInfoImpl(configuration, context, (TypeElement)(type)));
- dd.addContent(HtmlTree.CODE(link));
+ dd.add(HtmlTree.CODE(link));
} else {
Content link = getLink(
new LinkInfoImpl(configuration, context, ((TypeMirror)type)));
- dd.addContent(HtmlTree.CODE(link));
+ dd.add(HtmlTree.CODE(link));
}
}
return dd;