jdk8-mips64-public/langtools: comparison src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java

-:7af0fa419a2b
+:6a5288a298fd
 */
 package com.sun.tools.doclets.formats.html;
 import com.sun.javadoc.*;
+import com.sun.tools.doclets.formats.html.markup.ContentBuilder;
 import com.sun.tools.doclets.formats.html.markup.HtmlAttr;
+import com.sun.tools.doclets.formats.html.markup.HtmlStyle;
 import com.sun.tools.doclets.formats.html.markup.HtmlTag;
 import com.sun.tools.doclets.formats.html.markup.HtmlTree;
+import com.sun.tools.doclets.formats.html.markup.RawHtml;
 import com.sun.tools.doclets.formats.html.markup.StringContent;
 import com.sun.tools.doclets.internal.toolkit.*;
 import com.sun.tools.doclets.internal.toolkit.builders.SerializedFormBuilder;
 import com.sun.tools.doclets.internal.toolkit.taglets.*;
 import com.sun.tools.doclets.internal.toolkit.util.*;
 /**
 * {@inheritDoc}
 */
 public TagletOutput getOutputInstance() {
-return new TagletOutputImpl("");
+return new TagletOutputImpl();
 }
 /**
 * {@inheritDoc}
 */
 protected TagletOutput codeTagOutput(Tag tag) {
 Content result = HtmlTree.CODE(new StringContent(tag.text()));
-return new TagletOutputImpl(result.toString());
+return new TagletOutputImpl(result);
 }
 /**
 * {@inheritDoc}
 */
 /**
 * {@inheritDoc}
 */
 public TagletOutput deprecatedTagOutput(Doc doc) {
-StringBuilder output = new StringBuilder();
+ContentBuilder result = new ContentBuilder();
 Tag[] deprs = doc.tags("deprecated");
 if (doc instanceof ClassDoc) {
 if (Util.isDeprecated((ProgramElementDoc) doc)) {
-output.append("<span class=\"strong\">" +
+result.addContent(HtmlTree.SPAN(HtmlStyle.strong,
-configuration.
+new StringContent(configuration.getText("doclet.Deprecated"))));
-getText("doclet.Deprecated") + "</span>&nbsp;");
+result.addContent(RawHtml.nbsp);
 if (deprs.length > 0) {
 Tag[] commentTags = deprs[0].inlineTags();
 if (commentTags.length > 0) {
+result.addContent(commentTagsToOutput(null, doc,
-output.append(commentTagsToOutput(null, doc,
 deprs[0].inlineTags(), false).toString()
 );
 }
 }
 }
 } else {
 MemberDoc member = (MemberDoc) doc;
 if (Util.isDeprecated((ProgramElementDoc) doc)) {
-output.append("<span class=\"strong\">" +
+result.addContent(HtmlTree.SPAN(HtmlStyle.strong,
-configuration.
+new StringContent(configuration.getText("doclet.Deprecated"))));
-getText("doclet.Deprecated") + "</span>&nbsp;");
+result.addContent(RawHtml.nbsp);
 if (deprs.length > 0) {
-output.append("<i>");
+TagletOutput body = commentTagsToOutput(null, doc,
-output.append(commentTagsToOutput(null, doc,
+deprs[0].inlineTags(), false);
-deprs[0].inlineTags(), false).toString());
+result.addContent(HtmlTree.I(new RawHtml(body.toString())));
-output.append("</i>");
 }
 } else {
 if (Util.isDeprecated(member.containingClass())) {
-output.append("<span class=\"strong\">" +
+result.addContent(HtmlTree.SPAN(HtmlStyle.strong,
-configuration.
+new StringContent(configuration.getText("doclet.Deprecated"))));
-getText("doclet.Deprecated") + "</span>&nbsp;");
+result.addContent(RawHtml.nbsp);
 }
 }
 }
-return new TagletOutputImpl(output.toString());
+return new TagletOutputImpl(result);
 }
 /**
 * {@inheritDoc}
 */
 protected TagletOutput expertTagOutput(Tag tag) {
 HtmlTree result = new HtmlTree(HtmlTag.SUB, new StringContent(tag.text()));
 result.addAttr(HtmlAttr.ID, "expert");
-return new TagletOutputImpl(result.toString());
+return new TagletOutputImpl(result);
 }
 /**
 * {@inheritDoc}
 */
 protected TagletOutput literalTagOutput(Tag tag) {
 Content result = new StringContent(tag.text());
-return new TagletOutputImpl(result.toString());
+return new TagletOutputImpl(result);
 }
 /**
 * {@inheritDoc}
 */
 /**
 * {@inheritDoc}
 */
 public TagletOutput getParamHeader(String header) {
-StringBuilder result = new StringBuilder();
+HtmlTree result = HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.strong,
-result.append("<dt>");
+new StringContent(header)));
-result.append("<span class=\"strong\">").append(header).append("</span></dt>");
+return new TagletOutputImpl(result);
-return new TagletOutputImpl(result.toString());
 }
 /**
 * {@inheritDoc}
 */
 public TagletOutput paramTagOutput(ParamTag paramTag, String paramName) {
-TagletOutput result = new TagletOutputImpl("<dd><code>" + paramName + "</code>"
+ContentBuilder body = new ContentBuilder();
-+ " - " + htmlWriter.commentTagsToString(paramTag, null, paramTag.inlineTags(), false) + "</dd>");
+body.addContent(HtmlTree.CODE(new RawHtml(paramName)));
-return result;
+body.addContent(" - ");
+body.addContent(new RawHtml(htmlWriter.commentTagsToString(paramTag, null, paramTag.inlineTags(), false)));
+HtmlTree result = HtmlTree.DD(body);
+return new TagletOutputImpl(result);
 }
 /**
 * {@inheritDoc}
 */
 public TagletOutput returnTagOutput(Tag returnTag) {
-TagletOutput result = new TagletOutputImpl(DocletConstants.NL + "<dt>" +
+ContentBuilder result = new ContentBuilder();
-"<span class=\"strong\">" + configuration.getText("doclet.Returns") +
+result.addContent(HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.strong,
-"</span>" + "</dt>" + "<dd>" +
+new StringContent(configuration.getText("doclet.Returns")))));
-htmlWriter.commentTagsToString(returnTag, null, returnTag.inlineTags(),
+result.addContent(HtmlTree.DD(new RawHtml(htmlWriter.commentTagsToString(
-false) + "</dd>");
+returnTag, null, returnTag.inlineTags(), false))));
-return result;
+return new TagletOutputImpl(result);
 }
 /**
 * {@inheritDoc}
 */
 public TagletOutput seeTagOutput(Doc holder, SeeTag[] seeTags) {
-String result = "";
+ContentBuilder body = new ContentBuilder();
 if (seeTags.length > 0) {
-result = addSeeHeader(result);
 for (int i = 0; i < seeTags.length; ++i) {
-if (i > 0) {
+appendSeparatorIfNotEmpty(body);
-result += ", " + DocletConstants.NL;
+body.addContent(new RawHtml(htmlWriter.seeTagToString(seeTags[i])));
-}
-result += htmlWriter.seeTagToString(seeTags[i]);
 }
 }
 if (holder.isField() && ((FieldDoc)holder).constantValue() != null &&
 htmlWriter instanceof ClassWriterImpl) {
 //Automatically add link to constant values page for constant fields.
-result = addSeeHeader(result);
+appendSeparatorIfNotEmpty(body);
 DocPath constantsPath =
 htmlWriter.pathToRoot.resolve(DocPaths.CONSTANT_VALUES);
 String whichConstant =
 ((ClassWriterImpl) htmlWriter).getClassDoc().qualifiedName() + "." + ((FieldDoc) holder).name();
 DocLink link = constantsPath.fragment(whichConstant);
-result += htmlWriter.getHyperLinkString(link,
+body.addContent(htmlWriter.getHyperLink(link,
-configuration.getText("doclet.Constants_Summary"));
+new StringContent(configuration.getText("doclet.Constants_Summary"))));
 }
 if (holder.isClass() && ((ClassDoc)holder).isSerializable()) {
 //Automatically add link to serialized form page for serializable classes.
 if ((SerializedFormBuilder.serialInclude(holder) &&
 SerializedFormBuilder.serialInclude(((ClassDoc)holder).containingPackage()))) {
-result = addSeeHeader(result);
+appendSeparatorIfNotEmpty(body);
 DocPath serialPath = htmlWriter.pathToRoot.resolve(DocPaths.SERIALIZED_FORM);
 DocLink link = serialPath.fragment(((ClassDoc)holder).qualifiedName());
-result += htmlWriter.getHyperLinkString(link,
+body.addContent(htmlWriter.getHyperLink(link,
-configuration.getText("doclet.Serialized_Form"));
+new StringContent(configuration.getText("doclet.Serialized_Form"))));
 }
 }
-return result.equals("") ? null : new TagletOutputImpl(result + "</dd>");
+if (body.isEmpty())
-}
+return new TagletOutputImpl(body);
-private String addSeeHeader(String result) {
+ContentBuilder result = new ContentBuilder();
-if (result != null && result.length() > 0) {
+result.addContent(HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.strong,
-return result + ", " + DocletConstants.NL;
+new StringContent(configuration.getText("doclet.See_Also")))));
-} else {
+result.addContent(HtmlTree.DD(body));
-return "<dt><span class=\"strong\">" +
+return new TagletOutputImpl(result);
-configuration.getText("doclet.See_Also") + "</span></dt><dd>";
 }
-}
+private void appendSeparatorIfNotEmpty(ContentBuilder body) {
+if (!body.isEmpty()) {
+body.addContent(", ");
+body.addContent(DocletConstants.NL);
+}
+}
 /**
 * {@inheritDoc}
 */
 public TagletOutput simpleTagOutput(Tag[] simpleTags, String header) {
-String result = "<dt><span class=\"strong\">" + header + "</span></dt>" + DocletConstants.NL +
+ContentBuilder result = new ContentBuilder();
-"  <dd>";
+result.addContent(HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.strong, new RawHtml(header))));
+ContentBuilder body = new ContentBuilder();
 for (int i = 0; i < simpleTags.length; i++) {
 if (i > 0) {
-result += ", ";
+body.addContent(", ");
 }
-result += htmlWriter.commentTagsToString(simpleTags[i], null, simpleTags[i].inlineTags(), false);
+body.addContent(new RawHtml(htmlWriter.commentTagsToString(
-}
+simpleTags[i], null, simpleTags[i].inlineTags(), false)));
-result += "</dd>" + DocletConstants.NL;
+}
+result.addContent(HtmlTree.DD(body));
 return new TagletOutputImpl(result);
 }
 /**
 * {@inheritDoc}
 */
 public TagletOutput simpleTagOutput(Tag simpleTag, String header) {
-return new TagletOutputImpl("<dt><span class=\"strong\">" + header + "</span></dt>" + "  <dd>"
+ContentBuilder result = new ContentBuilder();
-+ htmlWriter.commentTagsToString(simpleTag, null, simpleTag.inlineTags(), false)
+result.addContent(HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.strong, new RawHtml(header))));
-+ "</dd>" + DocletConstants.NL);
+Content body = new RawHtml(htmlWriter.commentTagsToString(
+simpleTag, null, simpleTag.inlineTags(), false));
+result.addContent(HtmlTree.DD(body));
+return new TagletOutputImpl(result);
 }
 /**
 * {@inheritDoc}
 */
 public TagletOutput getThrowsHeader() {
-return new TagletOutputImpl(DocletConstants.NL + "<dt>" + "<span class=\"strong\">" +
+HtmlTree result = HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.strong,
-configuration.getText("doclet.Throws") + "</span></dt>");
+new StringContent(configuration.getText("doclet.Throws"))));
+return new TagletOutputImpl(result);
 }
 /**
 * {@inheritDoc}
 */
 public TagletOutput throwsTagOutput(ThrowsTag throwsTag) {
-String result = DocletConstants.NL + "<dd>";
+ContentBuilder body = new ContentBuilder();
-result += throwsTag.exceptionType() == null ?
+Content excName = (throwsTag.exceptionType() == null) ?
-htmlWriter.codeText(throwsTag.exceptionName()) :
+new RawHtml(throwsTag.exceptionName()) :
-htmlWriter.codeText(
 htmlWriter.getLink(new LinkInfoImpl(configuration, LinkInfoImpl.Kind.MEMBER,
-throwsTag.exceptionType())).toString());
+throwsTag.exceptionType()));
-TagletOutput text = new TagletOutputImpl(
+body.addContent(HtmlTree.CODE(excName));
-htmlWriter.commentTagsToString(throwsTag, null,
+String desc = htmlWriter.commentTagsToString(throwsTag, null,
-throwsTag.inlineTags(), false));
+throwsTag.inlineTags(), false);
-if (text != null && text.toString().length() > 0) {
+if (desc != null && !desc.isEmpty()) {
-result += " - " + text;
+body.addContent(" - ");
-}
+body.addContent(new RawHtml(desc));
-result += "</dd>";
+}
-return new TagletOutputImpl(result);
+HtmlTree res2 = HtmlTree.DD(body);
+return new TagletOutputImpl(res2);
 }
 /**
 * {@inheritDoc}
 */
 public TagletOutput throwsTagOutput(Type throwsType) {
-return new TagletOutputImpl(DocletConstants.NL + "<dd>" +
+HtmlTree result = HtmlTree.DD(HtmlTree.CODE(htmlWriter.getLink(
-htmlWriter.codeText(htmlWriter.getLink(
+new LinkInfoImpl(configuration, LinkInfoImpl.Kind.MEMBER, throwsType))));
-new LinkInfoImpl(configuration, LinkInfoImpl.Kind.MEMBER, throwsType)).toString()) + "</dd>");
+return new TagletOutputImpl(result);
 }
 /**
 * {@inheritDoc}
 */
 public TagletOutput valueTagOutput(FieldDoc field, String constantVal,
 boolean includeLink) {
 return new TagletOutputImpl(includeLink ?
 htmlWriter.getDocLink(LinkInfoImpl.Kind.VALUE_TAG, field,
-constantVal, false).toString() : constantVal);
+constantVal, false) : new RawHtml(constantVal));
 }
 /**
 * {@inheritDoc}
 */
 /**
 * {@inheritDoc}
 */
 public TagletOutput commentTagsToOutput(Tag holderTag,
 Doc holderDoc, Tag[] tags, boolean isFirstSentence) {
-return new TagletOutputImpl(htmlWriter.commentTagsToString(
+return new TagletOutputImpl(new RawHtml(htmlWriter.commentTagsToString(
-holderTag, holderDoc, tags, isFirstSentence));
+holderTag, holderDoc, tags, isFirstSentence)));
 }
 /**
 * {@inheritDoc}
 */
 public Configuration configuration() {
 return configuration;
 }
-/**
-* Return an instance of a TagletWriter that knows how to write HTML.
-*
-* @return an instance of a TagletWriter that knows how to write HTML.
-*/
-public TagletOutput getTagletOutputInstance() {
-return new TagletOutputImpl("");
-}
 }

Mercurial > jdk8-mips64-public > langtools / file comparison

comparison: src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java

src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java