--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java Mon Mar 11 11:23:09 2019 -0700
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java Mon Mar 11 12:59:45 2019 -0700
@@ -203,22 +203,22 @@
|| display(indirectOpenPackages));
navBar.setDisplaySummaryServicesLink(displayServices(uses, usesTrees) || displayServices(provides.keySet(), providesTrees));
navBar.setUserHeader(getUserHeaderFooter(true));
- htmlTree.addContent(navBar.getContent(true));
- bodyTree.addContent(htmlTree);
+ htmlTree.add(navBar.getContent(true));
+ bodyTree.add(htmlTree);
HtmlTree div = new HtmlTree(HtmlTag.DIV);
div.setStyle(HtmlStyle.header);
Content annotationContent = new HtmlTree(HtmlTag.P);
addAnnotationInfo(mdle, annotationContent);
- div.addContent(annotationContent);
+ div.add(annotationContent);
Content label = mdle.isOpen() && (configuration.docEnv.getModuleMode() == ModuleMode.ALL)
? contents.openModuleLabel : contents.moduleLabel;
Content tHeading = HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING, true,
HtmlStyle.title, label);
- tHeading.addContent(Contents.SPACE);
+ tHeading.add(Contents.SPACE);
Content moduleHead = new RawHtml(heading);
- tHeading.addContent(moduleHead);
- div.addContent(tHeading);
- mainTree.addContent(div);
+ tHeading.add(moduleHead);
+ div.add(tHeading);
+ mainTree.add(div);
return bodyTree;
}
@@ -458,9 +458,9 @@
*/
public void addSummaryHeader(Content startMarker, SectionName markerAnchor, Content heading,
Content htmltree) {
- htmltree.addContent(startMarker);
- htmltree.addContent(links.createAnchor(markerAnchor));
- htmltree.addContent(HtmlTree.HEADING(Headings.ModuleDeclaration.SUMMARY_HEADING, heading));
+ htmltree.add(startMarker);
+ htmltree.add(links.createAnchor(markerAnchor));
+ htmltree.add(HtmlTree.HEADING(Headings.ModuleDeclaration.SUMMARY_HEADING, heading));
}
/**
@@ -519,7 +519,7 @@
Table table = getTable3(caption, tableSummary, HtmlStyle.requiresSummary,
requiresTableHeader);
addModulesList(requires, table);
- li.addContent(table.toContent());
+ li.add(table.toContent());
}
// Display indirect modules table in both "api" and "all" mode.
if (display(indirectModules)) {
@@ -531,10 +531,10 @@
Table amrTable = getTable3(amrCaption, amrTableSummary, HtmlStyle.requiresSummary,
requiresTableHeader);
addModulesList(indirectModules, amrTable);
- li.addContent(amrTable.toContent());
+ li.add(amrTable.toContent());
}
HtmlTree ul = HtmlTree.UL(HtmlStyle.blockList, li);
- summaryContentTree.addContent(ul);
+ summaryContentTree.add(ul);
}
}
@@ -572,17 +572,17 @@
Table aepTable = getTable2(new StringContent(aepText),
HtmlStyle.packagesSummary, indirectPackagesHeader);
addIndirectPackages(aepTable, indirectPackages);
- li.addContent(aepTable.toContent());
+ li.add(aepTable.toContent());
}
if (display(indirectOpenPackages)) {
String aopText = resources.getText("doclet.Indirect_Opens_Summary");
Table aopTable = getTable2(new StringContent(aopText), HtmlStyle.packagesSummary,
indirectPackagesHeader);
addIndirectPackages(aopTable, indirectOpenPackages);
- li.addContent(aopTable.toContent());
+ li.add(aopTable.toContent());
}
HtmlTree ul = HtmlTree.UL(HtmlStyle.blockList, li);
- summaryContentTree.addContent(ul);
+ summaryContentTree.add(ul);
}
}
@@ -667,7 +667,7 @@
table.addRow(pkg, row);
}
- li.addContent(table.toContent());
+ li.add(table.toContent());
if (table.needsScript()) {
mainBodyScript.append(table.getScript());
}
@@ -697,9 +697,9 @@
Content list = new ContentBuilder();
for (ModuleElement m : modules) {
if (!list.isEmpty()) {
- list.addContent(new StringContent(", "));
+ list.add(new StringContent(", "));
}
- list.addContent(getModuleLink(m, new StringContent(m.getQualifiedName())));
+ list.add(getModuleLink(m, new StringContent(m.getQualifiedName())));
}
return list;
}
@@ -719,8 +719,8 @@
Content list = new ContentBuilder();
String sep = "";
for (PackageElement pkg : pkgList) {
- list.addContent(sep);
- list.addContent(getPackageLink(pkg, new StringContent(utils.getPackageName(pkg))));
+ list.add(sep);
+ list.add(getPackageLink(pkg, new StringContent(utils.getPackageName(pkg))));
sep = " ";
}
table.addRow(moduleLinkContent, list);
@@ -749,7 +749,7 @@
usesProvidesTableHeader);
addProvidesList(table);
if (!table.isEmpty()) {
- li.addContent(table.toContent());
+ li.add(table.toContent());
}
}
if (haveUses){
@@ -758,11 +758,11 @@
usesProvidesTableHeader);
addUsesList(table);
if (!table.isEmpty()) {
- li.addContent(table.toContent());
+ li.add(table.toContent());
}
}
HtmlTree ul = HtmlTree.UL(HtmlStyle.blockList, li);
- summaryContentTree.addContent(ul);
+ summaryContentTree.add(ul);
}
}
@@ -783,12 +783,12 @@
if (display(usesTrees)) {
description = usesTrees.get(t);
if (description != null && !description.isEmpty()) {
- summary.addContent(HtmlTree.DIV(HtmlStyle.block, description));
+ summary.add(HtmlTree.DIV(HtmlStyle.block, description));
} else {
addSummaryComment(t, summary);
}
} else {
- summary.addContent(Contents.SPACE);
+ summary.add(Contents.SPACE);
}
table.addRow(typeLinkContent, summary);
}
@@ -812,26 +812,26 @@
Content desc = new ContentBuilder();
if (display(providesTrees)) {
description = providesTrees.get(srv);
- desc.addContent((description != null && !description.isEmpty())
+ desc.add((description != null && !description.isEmpty())
? HtmlTree.DIV(HtmlStyle.block, description)
: Contents.SPACE);
} else {
- desc.addContent(Contents.SPACE);
+ desc.add(Contents.SPACE);
}
// Only display the implementation details in the "all" mode.
if (moduleMode == ModuleMode.ALL && !implSet.isEmpty()) {
- desc.addContent(new HtmlTree(HtmlTag.BR));
- desc.addContent("(");
+ desc.add(new HtmlTree(HtmlTag.BR));
+ desc.add("(");
HtmlTree implSpan = HtmlTree.SPAN(HtmlStyle.implementationLabel, contents.implementation);
- desc.addContent(implSpan);
- desc.addContent(Contents.SPACE);
+ desc.add(implSpan);
+ desc.add(Contents.SPACE);
String sep = "";
for (TypeElement impl : implSet) {
- desc.addContent(sep);
- desc.addContent(getLink(new LinkInfoImpl(configuration, LinkInfoImpl.Kind.PACKAGE, impl)));
+ desc.add(sep);
+ desc.add(getLink(new LinkInfoImpl(configuration, LinkInfoImpl.Kind.PACKAGE, impl)));
sep = ", ";
}
- desc.addContent(")");
+ desc.add(")");
}
table.addRow(srvLinkContent, desc);
}
@@ -849,14 +849,14 @@
HtmlTree deprDiv = new HtmlTree(HtmlTag.DIV);
deprDiv.setStyle(HtmlStyle.deprecationBlock);
Content deprPhrase = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, getDeprecatedPhrase(mdle));
- deprDiv.addContent(deprPhrase);
+ deprDiv.add(deprPhrase);
if (!deprs.isEmpty()) {
List<? extends DocTree> commentTags = ch.getDescription(configuration, deprs.get(0));
if (!commentTags.isEmpty()) {
addInlineDeprecatedComment(mdle, deprs.get(0), deprDiv);
}
}
- div.addContent(deprDiv);
+ div.add(deprDiv);
}
}
@@ -868,10 +868,10 @@
if (!utils.getFullBody(mdle).isEmpty()) {
Content tree = HtmlTree.SECTION();
addDeprecationInfo(tree);
- tree.addContent(MarkerComments.START_OF_MODULE_DESCRIPTION);
- tree.addContent(links.createAnchor(SectionName.MODULE_DESCRIPTION));
+ tree.add(MarkerComments.START_OF_MODULE_DESCRIPTION);
+ tree.add(links.createAnchor(SectionName.MODULE_DESCRIPTION));
addInlineComment(mdle, tree);
- moduleContentTree.addContent(tree);
+ moduleContentTree.add(tree);
}
}
@@ -882,7 +882,7 @@
public void addModuleTags(Content moduleContentTree) {
Content tree = HtmlTree.SECTION();
addTagsInfo(mdle, tree);
- moduleContentTree.addContent(tree);
+ moduleContentTree.add(tree);
}
/**
@@ -890,8 +890,8 @@
*/
@Override
public void addModuleContent(Content contentTree, Content moduleContentTree) {
- mainTree.addContent(moduleContentTree);
- contentTree.addContent(mainTree);
+ mainTree.add(moduleContentTree);
+ contentTree.add(mainTree);
}
/**
@@ -901,9 +901,9 @@
public void addModuleFooter(Content contentTree) {
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);
}
/**
@@ -931,7 +931,7 @@
HtmlTree deprDiv = new HtmlTree(HtmlTag.DIV);
deprDiv.setStyle(HtmlStyle.deprecationBlock);
Content deprPhrase = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, getDeprecatedPhrase(pkg));
- deprDiv.addContent(deprPhrase);
+ deprDiv.add(deprPhrase);
if (!deprs.isEmpty()) {
CommentHelper ch = utils.getCommentHelper(pkg);
List<? extends DocTree> commentTags = ch.getDescription(configuration, deprs.get(0));
@@ -939,7 +939,7 @@
addInlineDeprecatedComment(pkg, deprs.get(0), deprDiv);
}
}
- li.addContent(deprDiv);
+ li.add(deprDiv);
}
}
}