1.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java Tue May 14 10:14:54 2013 -0700
1.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java Tue May 14 10:14:55 2013 -0700
1.3 @@ -171,7 +171,7 @@
1.4 ContentBuilder body = new ContentBuilder();
1.5 body.addContent(HtmlTree.CODE(new RawHtml(paramName)));
1.6 body.addContent(" - ");
1.7 - body.addContent(new RawHtml(htmlWriter.commentTagsToString(paramTag, null, paramTag.inlineTags(), false)));
1.8 + body.addContent(htmlWriter.commentTagsToContent(paramTag, null, paramTag.inlineTags(), false));
1.9 HtmlTree result = HtmlTree.DD(body);
1.10 return new TagletOutputImpl(result);
1.11 }
1.12 @@ -183,8 +183,8 @@
1.13 ContentBuilder result = new ContentBuilder();
1.14 result.addContent(HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.strong,
1.15 new StringContent(configuration.getText("doclet.Returns")))));
1.16 - result.addContent(HtmlTree.DD(new RawHtml(htmlWriter.commentTagsToString(
1.17 - returnTag, null, returnTag.inlineTags(), false))));
1.18 + result.addContent(HtmlTree.DD(htmlWriter.commentTagsToContent(
1.19 + returnTag, null, returnTag.inlineTags(), false)));
1.20 return new TagletOutputImpl(result);
1.21 }
1.22
1.23 @@ -196,7 +196,7 @@
1.24 if (seeTags.length > 0) {
1.25 for (int i = 0; i < seeTags.length; ++i) {
1.26 appendSeparatorIfNotEmpty(body);
1.27 - body.addContent(new RawHtml(htmlWriter.seeTagToString(seeTags[i])));
1.28 + body.addContent(htmlWriter.seeTagToContent(seeTags[i]));
1.29 }
1.30 }
1.31 if (holder.isField() && ((FieldDoc)holder).constantValue() != null &&
1.32 @@ -251,8 +251,8 @@
1.33 if (i > 0) {
1.34 body.addContent(", ");
1.35 }
1.36 - body.addContent(new RawHtml(htmlWriter.commentTagsToString(
1.37 - simpleTags[i], null, simpleTags[i].inlineTags(), false)));
1.38 + body.addContent(htmlWriter.commentTagsToContent(
1.39 + simpleTags[i], null, simpleTags[i].inlineTags(), false));
1.40 }
1.41 result.addContent(HtmlTree.DD(body));
1.42 return new TagletOutputImpl(result);
1.43 @@ -264,8 +264,8 @@
1.44 public TagletOutput simpleTagOutput(Tag simpleTag, String header) {
1.45 ContentBuilder result = new ContentBuilder();
1.46 result.addContent(HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.strong, new RawHtml(header))));
1.47 - Content body = new RawHtml(htmlWriter.commentTagsToString(
1.48 - simpleTag, null, simpleTag.inlineTags(), false));
1.49 + Content body = htmlWriter.commentTagsToContent(
1.50 + simpleTag, null, simpleTag.inlineTags(), false);
1.51 result.addContent(HtmlTree.DD(body));
1.52 return new TagletOutputImpl(result);
1.53 }
1.54 @@ -289,11 +289,11 @@
1.55 htmlWriter.getLink(new LinkInfoImpl(configuration, LinkInfoImpl.Kind.MEMBER,
1.56 throwsTag.exceptionType()));
1.57 body.addContent(HtmlTree.CODE(excName));
1.58 - String desc = htmlWriter.commentTagsToString(throwsTag, null,
1.59 + Content desc = htmlWriter.commentTagsToContent(throwsTag, null,
1.60 throwsTag.inlineTags(), false);
1.61 if (desc != null && !desc.isEmpty()) {
1.62 body.addContent(" - ");
1.63 - body.addContent(new RawHtml(desc));
1.64 + body.addContent(desc);
1.65 }
1.66 HtmlTree res2 = HtmlTree.DD(body);
1.67 return new TagletOutputImpl(res2);
1.68 @@ -337,8 +337,8 @@
1.69 */
1.70 public TagletOutputImpl commentTagsToOutput(Tag holderTag,
1.71 Doc holderDoc, Tag[] tags, boolean isFirstSentence) {
1.72 - return new TagletOutputImpl(new RawHtml(htmlWriter.commentTagsToString(
1.73 - holderTag, holderDoc, tags, isFirstSentence)));
1.74 + return new TagletOutputImpl(htmlWriter.commentTagsToContent(
1.75 + holderTag, holderDoc, tags, isFirstSentence));
1.76 }
1.77
1.78 /**
