src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java Mon Mar 11 11:23:09 2019 -0700
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java Mon Mar 11 12:59:45 2019 -0700
@@ -218,7 +218,7 @@
* @param htmltree the content tree to which the name will be added.
*/
protected void addName(String name, Content htmltree) {
- htmltree.addContent(name);
+ htmltree.add(name);
}
/**
@@ -255,8 +255,8 @@
}
if (!set.isEmpty()) {
String mods = set.stream().map(Modifier::toString).collect(Collectors.joining(" "));
- htmltree.addContent(mods);
- htmltree.addContent(Contents.SPACE);
+ htmltree.add(mods);
+ htmltree.add(Contents.SPACE);
}
}
@@ -283,8 +283,8 @@
HtmlTree code = new HtmlTree(HtmlTag.CODE);
addModifier(member, code);
if (type == null) {
- code.addContent(utils.isClass(member) ? "class" : "interface");
- code.addContent(Contents.SPACE);
+ code.add(utils.isClass(member) ? "class" : "interface");
+ code.add(Contents.SPACE);
} else {
List<? extends TypeParameterElement> list = utils.isExecutableElement(member)
? ((ExecutableElement)member).getTypeParameters()
@@ -292,24 +292,24 @@
if (list != null && !list.isEmpty()) {
Content typeParameters = ((AbstractExecutableMemberWriter) this)
.getTypeParameters((ExecutableElement)member);
- code.addContent(typeParameters);
+ code.add(typeParameters);
//Code to avoid ugly wrapping in member summary table.
if (typeParameters.charCount() > 10) {
- code.addContent(new HtmlTree(HtmlTag.BR));
+ code.add(new HtmlTree(HtmlTag.BR));
} else {
- code.addContent(Contents.SPACE);
+ code.add(Contents.SPACE);
}
- code.addContent(
+ code.add(
writer.getLink(new LinkInfoImpl(configuration,
LinkInfoImpl.Kind.SUMMARY_RETURN_TYPE, type)));
} else {
- code.addContent(
+ code.add(
writer.getLink(new LinkInfoImpl(configuration,
LinkInfoImpl.Kind.SUMMARY_RETURN_TYPE, type)));
}
}
- tdSummaryType.addContent(code);
+ tdSummaryType.add(code);
}
/**
@@ -320,24 +320,24 @@
*/
private void addModifier(Element member, Content code) {
if (utils.isProtected(member)) {
- code.addContent("protected ");
+ code.add("protected ");
} else if (utils.isPrivate(member)) {
- code.addContent("private ");
+ code.add("private ");
} else if (!utils.isPublic(member)) { // Package private
- code.addContent(resources.getText("doclet.Package_private"));
- code.addContent(" ");
+ code.add(resources.getText("doclet.Package_private"));
+ code.add(" ");
}
boolean isAnnotatedTypeElement = utils.isAnnotationType(member.getEnclosingElement());
if (!isAnnotatedTypeElement && utils.isMethod(member)) {
if (!utils.isInterface(member.getEnclosingElement()) && utils.isAbstract(member)) {
- code.addContent("abstract ");
+ code.add("abstract ");
}
if (utils.isDefault(member)) {
- code.addContent("default ");
+ code.add("default ");
}
}
if (utils.isStatic(member)) {
- code.addContent("static ");
+ code.add("static ");
}
}
@@ -353,7 +353,7 @@
if (!output.isEmpty()) {
Content deprecatedContent = output;
Content div = HtmlTree.DIV(HtmlStyle.deprecationBlock, deprecatedContent);
- contentTree.addContent(div);
+ contentTree.add(div);
}
}
@@ -424,8 +424,8 @@
&& !utils.isAnnotationType(element)) {
HtmlTree name = new HtmlTree(HtmlTag.SPAN);
name.setStyle(HtmlStyle.typeNameLabel);
- name.addContent(name(te) + ".");
- typeContent.addContent(name);
+ name.add(name(te) + ".");
+ typeContent.add(name);
}
addSummaryLink(utils.isClass(element) || utils.isInterface(element)
? LinkInfoImpl.Kind.CLASS_USE
@@ -435,7 +435,7 @@
writer.addSummaryLinkComment(this, element, desc);
useTable.addRow(summaryType, typeContent, desc);
}
- contentTree.addContent(useTable.toContent());
+ contentTree.add(useTable.toContent());
}
}