1.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java Tue May 14 10:14:56 2013 -0700
1.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java Tue May 14 10:14:57 2013 -0700
1.3 @@ -246,11 +246,11 @@
1.4 if (doc instanceof MethodDoc) {
1.5 addMethodInfo((MethodDoc) doc, dl);
1.6 }
1.7 - TagletOutputImpl output = new TagletOutputImpl();
1.8 + Content output = new ContentBuilder();
1.9 TagletWriter.genTagOuput(configuration.tagletManager, doc,
1.10 configuration.tagletManager.getCustomTaglets(doc),
1.11 getTagletWriterInstance(false), output);
1.12 - dl.addContent(output.getContent());
1.13 + dl.addContent(output);
1.14 htmltree.addContent(dl);
1.15 }
1.16
1.17 @@ -262,11 +262,11 @@
1.18 * @return true if there are tags to be printed else return false.
1.19 */
1.20 protected boolean hasSerializationOverviewTags(FieldDoc field) {
1.21 - TagletOutputImpl output = new TagletOutputImpl();
1.22 + Content output = new ContentBuilder();
1.23 TagletWriter.genTagOuput(configuration.tagletManager, field,
1.24 configuration.tagletManager.getCustomTaglets(field),
1.25 getTagletWriterInstance(false), output);
1.26 - return !output.getContent().isEmpty();
1.27 + return !output.isEmpty();
1.28 }
1.29
1.30 /**
1.31 @@ -1583,11 +1583,11 @@
1.32 result.addContent(seeTagToContent((SeeTag) tagelem));
1.33 } else if (! tagName.equals("Text")) {
1.34 boolean wasEmpty = result.isEmpty();
1.35 - TagletOutput output = TagletWriter.getInlineTagOuput(
1.36 + Content output = TagletWriter.getInlineTagOuput(
1.37 configuration.tagletManager, holderTag,
1.38 tagelem, getTagletWriterInstance(isFirstSentence));
1.39 if (output != null)
1.40 - result.addContent(((TagletOutputImpl) output).getContent());
1.41 + result.addContent(output);
1.42 if (wasEmpty && isFirstSentence && tagelem.name().equals("@inheritDoc") && !result.isEmpty()) {
1.43 break;
1.44 } else if (configuration.docrootparent.length() > 0 &&
1.45 @@ -1726,7 +1726,7 @@
1.46 return text;
1.47 }
1.48
1.49 - static Set<String> blockTags = new HashSet<>();
1.50 + static Set<String> blockTags = new HashSet<String>();
1.51 static {
1.52 for (HtmlTag t: HtmlTag.values()) {
1.53 if (t.blockType == HtmlTag.BlockType.BLOCK)
