jdk-sandbox: comparison src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java

equal deleted inserted replaced

-:1bc8513104f2
+:53a95878619f
 *
 * @param name the member name to be added to the content tree.
 * @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);
 }
 /**
 * Add the modifier for the member. The modifiers are ordered as specified
 * by <em>The Java Language Specification</em>.
 set.remove(PUBLIC);
 }
 }
 if (!set.isEmpty()) {
 String mods = set.stream().map(Modifier::toString).collect(Collectors.joining(" "));
-htmltree.addContent(mods);
+htmltree.add(mods);
-htmltree.addContent(Contents.SPACE);
+htmltree.add(Contents.SPACE);
 }
 }
 protected CharSequence makeSpace(int len) {
 if (len <= 0) {
 protected void addModifierAndType(Element member, TypeMirror type,
 Content tdSummaryType) {
 HtmlTree code = new HtmlTree(HtmlTag.CODE);
 addModifier(member, code);
 if (type == null) {
-code.addContent(utils.isClass(member) ? "class" : "interface");
+code.add(utils.isClass(member) ? "class" : "interface");
-code.addContent(Contents.SPACE);
+code.add(Contents.SPACE);
 } else {
 List<? extends TypeParameterElement> list = utils.isExecutableElement(member)
 ? ((ExecutableElement)member).getTypeParameters()
 : null;
 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);
 }
 /**
 * Add the modifier for the member.
 *
 * @param member the member to add the type for
 * @param code the content tree to which the modified will be added
 */
 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.add(resources.getText("doclet.Package_private"));
-code.addContent(" ");
+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 ");
 }
 }
 /**
 * Add the deprecated information for the given member.
 Content output = (new DeprecatedTaglet()).getTagletOutput(member,
 writer.getTagletWriterInstance(false));
 if (!output.isEmpty()) {
 Content deprecatedContent = output;
 Content div = HtmlTree.DIV(HtmlStyle.deprecationBlock, deprecatedContent);
-contentTree.addContent(div);
+contentTree.add(div);
 }
 }
 /**
 * Add the comment for the given member.
 && !utils.isClass(element)
 && !utils.isInterface(element)
 && !utils.isAnnotationType(element)) {
 HtmlTree name = new HtmlTree(HtmlTag.SPAN);
 name.setStyle(HtmlStyle.typeNameLabel);
-name.addContent(name(te) + ".");
+name.add(name(te) + ".");
-typeContent.addContent(name);
+typeContent.add(name);
 }
 addSummaryLink(utils.isClass(element) || utils.isInterface(element)
 ? LinkInfoImpl.Kind.CLASS_USE
 : LinkInfoImpl.Kind.MEMBER,
 te, element, typeContent);
 Content desc = new ContentBuilder();
 writer.addSummaryLinkComment(this, element, desc);
 useTable.addRow(summaryType, typeContent, desc);
 }
-contentTree.addContent(useTable.toContent());
+contentTree.add(useTable.toContent());
 }
 }
 protected void serialWarning(Element e, String key, String a1, String a2) {
 if (configuration.serialwarn) {

changeset 54060	53a95878619f
parent 53991	786825220790
child 54596	86c1da00dd6a