--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Navigation.java Mon Mar 11 11:23:09 2019 -0700
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Navigation.java Mon Mar 11 12:59:45 2019 -0700
@@ -429,8 +429,8 @@
}
if (!listContents.isEmpty()) {
Content li = HtmlTree.LI(contents.summaryLabel);
- li.addContent(Contents.SPACE);
- tree.addContent(li);
+ li.add(Contents.SPACE);
+ tree.add(li);
addListToNav(listContents, tree);
}
break;
@@ -461,8 +461,8 @@
}
if (!listContents.isEmpty()) {
Content li = HtmlTree.LI(contents.moduleSubNavLabel);
- li.addContent(Contents.SPACE);
- tree.addContent(li);
+ li.add(Contents.SPACE);
+ tree.add(li);
addListToNav(listContents, tree);
}
break;
@@ -665,8 +665,8 @@
}
if (!listContents.isEmpty()) {
Content li = HtmlTree.LI(contents.detailLabel);
- li.addContent(Contents.SPACE);
- tree.addContent(li);
+ li.add(Contents.SPACE);
+ tree.add(li);
addListToNav(listContents, tree);
}
break;
@@ -794,37 +794,37 @@
}
private void addContentToTree(Content tree, Content content) {
- tree.addContent(HtmlTree.LI(content));
+ tree.add(HtmlTree.LI(content));
}
private void addListToNav(List<Content> listContents, Content tree) {
int count = 0;
for (Content liContent : listContents) {
if (count < listContents.size() - 1) {
- liContent.addContent(Contents.SPACE);
- liContent.addContent("|");
- liContent.addContent(Contents.SPACE);
+ liContent.add(Contents.SPACE);
+ liContent.add("|");
+ liContent.add(Contents.SPACE);
}
- tree.addContent(liContent);
+ tree.add(liContent);
count++;
}
}
private void addActivePageLink(Content tree, Content label, boolean display) {
if (display) {
- tree.addContent(HtmlTree.LI(HtmlStyle.navBarCell1Rev, label));
+ tree.add(HtmlTree.LI(HtmlStyle.navBarCell1Rev, label));
}
}
private void addPageLabel(Content tree, Content label, boolean display) {
if (display) {
- tree.addContent(HtmlTree.LI(label));
+ tree.add(HtmlTree.LI(label));
}
}
private void addOverviewLink(Content tree) {
if (configuration.createoverview) {
- tree.addContent(HtmlTree.LI(links.createLink(pathToRoot.resolve(DocPaths.overviewSummary(configuration.frames)),
+ tree.add(HtmlTree.LI(links.createLink(pathToRoot.resolve(DocPaths.overviewSummary(configuration.frames)),
contents.overviewLabel, "", "")));
}
}
@@ -834,7 +834,7 @@
if (configuration.modules.size() == 1) {
ModuleElement mdle = configuration.modules.first();
boolean included = configuration.utils.isIncluded(mdle);
- tree.addContent(HtmlTree.LI((included)
+ tree.add(HtmlTree.LI((included)
? links.createLink(pathToRoot.resolve(configuration.docPaths.moduleSummary(mdle)), contents.moduleLabel, "", "")
: contents.moduleLabel));
} else if (!configuration.modules.isEmpty()) {
@@ -845,7 +845,7 @@
private void addModuleOfElementLink(Content tree) {
if (configuration.showModules) {
- tree.addContent(HtmlTree.LI(navLinkModule));
+ tree.add(HtmlTree.LI(navLinkModule));
}
}
@@ -862,16 +862,16 @@
}
}
if (included || packageElement == null) {
- tree.addContent(HtmlTree.LI(links.createLink(
+ tree.add(HtmlTree.LI(links.createLink(
pathToRoot.resolve(configuration.docPaths.forPackage(packageElement).resolve(DocPaths.PACKAGE_SUMMARY)),
contents.packageLabel)));
} else {
DocLink crossPkgLink = configuration.extern.getExternalLink(
packageElement, pathToRoot, DocPaths.PACKAGE_SUMMARY.getPath());
if (crossPkgLink != null) {
- tree.addContent(HtmlTree.LI(links.createLink(crossPkgLink, contents.packageLabel)));
+ tree.add(HtmlTree.LI(links.createLink(crossPkgLink, contents.packageLabel)));
} else {
- tree.addContent(HtmlTree.LI(contents.packageLabel));
+ tree.add(HtmlTree.LI(contents.packageLabel));
}
}
} else if (!configuration.packages.isEmpty()) {
@@ -880,12 +880,12 @@
}
private void addPackageOfElementLink(Content tree) {
- tree.addContent(HtmlTree.LI(links.createLink(DocPath.parent.resolve(DocPaths.PACKAGE_SUMMARY),
+ tree.add(HtmlTree.LI(links.createLink(DocPath.parent.resolve(DocPaths.PACKAGE_SUMMARY),
contents.packageLabel)));
}
private void addPackageSummaryLink(Content tree) {
- tree.addContent(HtmlTree.LI(links.createLink(DocPaths.PACKAGE_SUMMARY, contents.packageLabel)));
+ tree.add(HtmlTree.LI(links.createLink(DocPaths.PACKAGE_SUMMARY, contents.packageLabel)));
}
private void addTreeLink(Content tree) {
@@ -894,20 +894,20 @@
DocPath docPath = packages.size() == 1 && configuration.getSpecifiedTypeElements().isEmpty()
? pathToRoot.resolve(configuration.docPaths.forPackage(packages.get(0)).resolve(DocPaths.PACKAGE_TREE))
: pathToRoot.resolve(DocPaths.OVERVIEW_TREE);
- tree.addContent(HtmlTree.LI(links.createLink(docPath, contents.treeLabel, "", "")));
+ tree.add(HtmlTree.LI(links.createLink(docPath, contents.treeLabel, "", "")));
}
}
private void addDeprecatedLink(Content tree) {
if (!(configuration.nodeprecated || configuration.nodeprecatedlist)) {
- tree.addContent(HtmlTree.LI(links.createLink(pathToRoot.resolve(DocPaths.DEPRECATED_LIST),
+ tree.add(HtmlTree.LI(links.createLink(pathToRoot.resolve(DocPaths.DEPRECATED_LIST),
contents.deprecatedLabel, "", "")));
}
}
private void addIndexLink(Content tree) {
if (configuration.createindex) {
- tree.addContent(HtmlTree.LI(links.createLink(pathToRoot.resolve(
+ tree.add(HtmlTree.LI(links.createLink(pathToRoot.resolve(
(configuration.splitindex
? DocPaths.INDEX_FILES.resolve(DocPaths.indexN(1))
: DocPaths.INDEX_ALL)),
@@ -925,7 +925,7 @@
DocFile file = DocFile.createFileForInput(configuration, helpfile);
helpfilenm = DocPath.create(file.getName());
}
- tree.addContent(HtmlTree.LI(links.createLink(pathToRoot.resolve(helpfilenm),
+ tree.add(HtmlTree.LI(links.createLink(pathToRoot.resolve(helpfilenm),
contents.helpLabel, "", "")));
}
}
@@ -938,7 +938,7 @@
private void addNavShowLists(Content tree) {
DocLink dl = new DocLink(pathToRoot.resolve(DocPaths.INDEX), path.getPath(), null);
Content framesContent = links.createLink(dl, contents.framesLabel, "", "_top");
- tree.addContent(HtmlTree.LI(framesContent));
+ tree.add(HtmlTree.LI(framesContent));
}
/**
@@ -948,7 +948,7 @@
*/
private void addNavHideLists(Content tree) {
Content noFramesContent = links.createLink(path.basename(), contents.noFramesLabel, "", "_top");
- tree.addContent(HtmlTree.LI(noFramesContent));
+ tree.add(HtmlTree.LI(noFramesContent));
}
private void addSearch(Content tree) {
@@ -957,14 +957,14 @@
HtmlTree inputText = HtmlTree.INPUT("text", searchValueId, searchValueId);
HtmlTree inputReset = HtmlTree.INPUT(reset, reset, reset);
HtmlTree liInput = HtmlTree.LI(HtmlTree.LABEL(searchValueId, searchLabel));
- liInput.addContent(inputText);
- liInput.addContent(inputReset);
+ liInput.add(inputText);
+ liInput.add(inputReset);
HtmlTree ulSearch = HtmlTree.UL(HtmlStyle.navListSearch, liInput);
- tree.addContent(ulSearch);
+ tree.add(ulSearch);
}
private void addFixedNavScript(Content tree) {
- tree.addContent(FIXED_NAV_SCRIPT.asContent());
+ tree.add(FIXED_NAV_SCRIPT.asContent());
}
/**
@@ -981,29 +981,29 @@
HtmlTree navDiv = new HtmlTree(HtmlTag.DIV);
if (top) {
queue = topBottomNavContents.get(Position.TOP);
- fixedNavDiv.addContent(Position.TOP.startOfNav());
+ fixedNavDiv.add(Position.TOP.startOfNav());
navDiv.setStyle(HtmlStyle.topNav);
} else {
queue = topBottomNavContents.get(Position.BOTTOM);
- tree.addContent(Position.BOTTOM.startOfNav());
+ tree.add(Position.BOTTOM.startOfNav());
navDiv.setStyle(HtmlStyle.bottomNav);
}
- navDiv.addContent(queue.poll());
+ navDiv.add(queue.poll());
HtmlTree skipLinkDiv = HtmlTree.DIV(HtmlStyle.skipNav, queue.poll());
- navDiv.addContent(skipLinkDiv);
- navDiv.addContent(queue.poll());
+ navDiv.add(skipLinkDiv);
+ navDiv.add(queue.poll());
HtmlTree navList = new HtmlTree(HtmlTag.UL);
navList.setStyle(HtmlStyle.navList);
- navList.addAttr(HtmlAttr.TITLE, rowListTitle);
+ navList.put(HtmlAttr.TITLE, rowListTitle);
fixedNavDiv.setStyle(HtmlStyle.fixedNav);
addMainNavLinks(navList);
- navDiv.addContent(navList);
+ navDiv.add(navList);
Content aboutDiv = HtmlTree.DIV(HtmlStyle.aboutLanguage, top ? userHeader : userFooter);
- navDiv.addContent(aboutDiv);
+ navDiv.add(aboutDiv);
if (top) {
- fixedNavDiv.addContent(navDiv);
+ fixedNavDiv.add(navDiv);
} else {
- tree.addContent(navDiv);
+ tree.add(navDiv);
}
HtmlTree subDiv = new HtmlTree(HtmlTag.DIV);
subDiv.setStyle(HtmlStyle.subNav);
@@ -1012,12 +1012,12 @@
HtmlTree ulNavSummary = new HtmlTree(HtmlTag.UL);
ulNavSummary.setStyle(HtmlStyle.subNavList);
addSummaryLinks(ulNavSummary);
- div.addContent(ulNavSummary);
+ div.add(ulNavSummary);
// Add the detail links if present.
HtmlTree ulNavDetail = new HtmlTree(HtmlTag.UL);
ulNavDetail.setStyle(HtmlStyle.subNavList);
addDetailLinks(ulNavDetail);
- div.addContent(ulNavDetail);
+ div.add(ulNavDetail);
HtmlTree ulFrames = new HtmlTree(HtmlTag.UL);
ulFrames.setStyle(HtmlStyle.navList);
if (!configuration.nonavbar) {
@@ -1026,23 +1026,23 @@
addNavHideLists(ulFrames);
}
}
- div.addContent(ulFrames);
- subDiv.addContent(div);
+ div.add(ulFrames);
+ subDiv.add(div);
if (top && configuration.createindex) {
addSearch(subDiv);
}
if (top) {
- fixedNavDiv.addContent(subDiv);
- fixedNavDiv.addContent(queue.poll());
- fixedNavDiv.addContent(Position.TOP.endOfNav());
- tree.addContent(fixedNavDiv);
+ fixedNavDiv.add(subDiv);
+ fixedNavDiv.add(queue.poll());
+ fixedNavDiv.add(Position.TOP.endOfNav());
+ tree.add(fixedNavDiv);
HtmlTree paddingDiv = HtmlTree.DIV(HtmlStyle.navPadding, Contents.SPACE);
- tree.addContent(paddingDiv);
+ tree.add(paddingDiv);
addFixedNavScript(tree);
} else {
- tree.addContent(subDiv);
- tree.addContent(queue.poll());
- tree.addContent(Position.BOTTOM.endOfNav());
+ tree.add(subDiv);
+ tree.add(queue.poll());
+ tree.add(Position.BOTTOM.endOfNav());
}
return tree;
}