Mercurial > jdk8-mips64-public > langtools / changeset
changeset
8012176: reduce use of TagletOutputImpl.toString
Tue, 14 May 2013 10:14:54 -0700
- author
- jjg
- date
- Tue, 14 May 2013 10:14:54 -0700
- changeset 1744
- 76a691e3e961
- parent 1743
- 6a5288a298fd
- child 1745
- 937aa020c667
8012176: reduce use of TagletOutputImpl.toString
Reviewed-by: darcy
1.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java Tue May 14 10:14:54 2013 -0700 1.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java Tue May 14 10:14:54 2013 -0700 1.3 @@ -348,10 +348,11 @@ 1.4 * @param contentTree the content tree to which the deprecated information will be added. 1.5 */ 1.6 protected void addDeprecatedInfo(ProgramElementDoc member, Content contentTree) { 1.7 - String output = (new DeprecatedTaglet()).getTagletOutput(member, 1.8 - writer.getTagletWriterInstance(false)).toString().trim(); 1.9 - if (!output.isEmpty()) { 1.10 - Content deprecatedContent = new RawHtml(output); 1.11 + TagletOutput output = (new DeprecatedTaglet()).getTagletOutput(member, 1.12 + writer.getTagletWriterInstance(false)); 1.13 + Content body = ((TagletOutputImpl) output).getContent(); 1.14 + if (!body.isEmpty()) { 1.15 + Content deprecatedContent = body; 1.16 Content div = HtmlTree.DIV(HtmlStyle.block, deprecatedContent); 1.17 contentTree.addContent(div); 1.18 }
2.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java Tue May 14 10:14:54 2013 -0700 2.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java Tue May 14 10:14:54 2013 -0700 2.3 @@ -397,7 +397,7 @@ 2.4 if (classDoc.typeParamTags().length > 0) { 2.5 TagletOutput output = (new ParamTaglet()).getTagletOutput(classDoc, 2.6 getTagletWriterInstance(false)); 2.7 - Content typeParam = new RawHtml(output.toString()); 2.8 + Content typeParam = ((TagletOutputImpl) output).getContent(); 2.9 Content dl = HtmlTree.DL(typeParam); 2.10 classInfoTree.addContent(dl); 2.11 }
3.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java Tue May 14 10:14:54 2013 -0700 3.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java Tue May 14 10:14:54 2013 -0700 3.3 @@ -246,15 +246,11 @@ 3.4 if (doc instanceof MethodDoc) { 3.5 addMethodInfo((MethodDoc) doc, dl); 3.6 } 3.7 - TagletOutput output = new TagletOutputImpl(); 3.8 + TagletOutputImpl output = new TagletOutputImpl(); 3.9 TagletWriter.genTagOuput(configuration.tagletManager, doc, 3.10 configuration.tagletManager.getCustomTags(doc), 3.11 getTagletWriterInstance(false), output); 3.12 - String outputString = output.toString().trim(); 3.13 - if (!outputString.isEmpty()) { 3.14 - Content resultString = new RawHtml(outputString); 3.15 - dl.addContent(resultString); 3.16 - } 3.17 + dl.addContent(output.getContent()); 3.18 htmltree.addContent(dl); 3.19 } 3.20 3.21 @@ -266,11 +262,11 @@ 3.22 * @return true if there are tags to be printed else return false. 3.23 */ 3.24 protected boolean hasSerializationOverviewTags(FieldDoc field) { 3.25 - TagletOutput output = new TagletOutputImpl(); 3.26 + TagletOutputImpl output = new TagletOutputImpl(); 3.27 TagletWriter.genTagOuput(configuration.tagletManager, field, 3.28 configuration.tagletManager.getCustomTags(field), 3.29 getTagletWriterInstance(false), output); 3.30 - return (!output.toString().trim().isEmpty()); 3.31 + return !output.getContent().isEmpty(); 3.32 } 3.33 3.34 /**
4.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialFieldWriter.java Tue May 14 10:14:54 2013 -0700 4.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialFieldWriter.java Tue May 14 10:14:54 2013 -0700 4.3 @@ -186,17 +186,14 @@ 4.4 * @param contentTree the tree to which the member tags info will be added 4.5 */ 4.6 public void addMemberTags(FieldDoc field, Content contentTree) { 4.7 - TagletOutput output = new TagletOutputImpl(); 4.8 + TagletOutputImpl output = new TagletOutputImpl(); 4.9 TagletWriter.genTagOuput(configuration.tagletManager, field, 4.10 configuration.tagletManager.getCustomTags(field), 4.11 writer.getTagletWriterInstance(false), output); 4.12 - String outputString = output.toString().trim(); 4.13 + Content tagContent = output.getContent(); 4.14 Content dlTags = new HtmlTree(HtmlTag.DL); 4.15 - if (!outputString.isEmpty()) { 4.16 - Content tagContent = new RawHtml(outputString); 4.17 - dlTags.addContent(tagContent); 4.18 - } 4.19 - contentTree.addContent(dlTags); 4.20 + dlTags.addContent(tagContent); 4.21 + contentTree.addContent(dlTags); // TODO: what if empty? 4.22 } 4.23 4.24 /**
5.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialMethodWriter.java Tue May 14 10:14:54 2013 -0700 5.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialMethodWriter.java Tue May 14 10:14:54 2013 -0700 5.3 @@ -146,19 +146,16 @@ 5.4 * @param methodsContentTree the tree to which the member tags info will be added 5.5 */ 5.6 public void addMemberTags(MethodDoc member, Content methodsContentTree) { 5.7 - TagletOutput output = new TagletOutputImpl(); 5.8 + TagletOutputImpl output = new TagletOutputImpl(); 5.9 TagletManager tagletManager = 5.10 configuration.tagletManager; 5.11 TagletWriter.genTagOuput(tagletManager, member, 5.12 tagletManager.getSerializedFormTags(), 5.13 writer.getTagletWriterInstance(false), output); 5.14 - String outputString = output.toString().trim(); 5.15 + Content tagContent = output.getContent(); 5.16 Content dlTags = new HtmlTree(HtmlTag.DL); 5.17 - if (!outputString.isEmpty()) { 5.18 - Content tagContent = new RawHtml(outputString); 5.19 - dlTags.addContent(tagContent); 5.20 - } 5.21 - methodsContentTree.addContent(dlTags); 5.22 + dlTags.addContent(tagContent); 5.23 + methodsContentTree.addContent(dlTags); // TODO: what if empty? 5.24 MethodDoc method = member; 5.25 if (method.name().compareTo("writeExternal") == 0 5.26 && method.tags("serialData").length == 0) {
6.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/TagletOutputImpl.java Tue May 14 10:14:54 2013 -0700 6.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/TagletOutputImpl.java Tue May 14 10:14:54 2013 -0700 6.3 @@ -59,6 +59,10 @@ 6.4 setOutput(c); 6.5 } 6.6 6.7 + Content getContent() { 6.8 + return content; 6.9 + } 6.10 + 6.11 /** 6.12 * {@inheritDoc} 6.13 */
7.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java Tue May 14 10:14:54 2013 -0700 7.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java Tue May 14 10:14:54 2013 -0700 7.3 @@ -104,7 +104,7 @@ 7.4 Tag[] commentTags = deprs[0].inlineTags(); 7.5 if (commentTags.length > 0) { 7.6 result.addContent(commentTagsToOutput(null, doc, 7.7 - deprs[0].inlineTags(), false).toString() 7.8 + deprs[0].inlineTags(), false).getContent() 7.9 ); 7.10 } 7.11 } 7.12 @@ -116,9 +116,9 @@ 7.13 new StringContent(configuration.getText("doclet.Deprecated")))); 7.14 result.addContent(RawHtml.nbsp); 7.15 if (deprs.length > 0) { 7.16 - TagletOutput body = commentTagsToOutput(null, doc, 7.17 + TagletOutputImpl body = commentTagsToOutput(null, doc, 7.18 deprs[0].inlineTags(), false); 7.19 - result.addContent(HtmlTree.I(new RawHtml(body.toString()))); 7.20 + result.addContent(HtmlTree.I(body.getContent())); 7.21 } 7.22 } else { 7.23 if (Util.isDeprecated(member.containingClass())) { 7.24 @@ -321,21 +321,21 @@ 7.25 /** 7.26 * {@inheritDoc} 7.27 */ 7.28 - public TagletOutput commentTagsToOutput(Tag holderTag, Tag[] tags) { 7.29 + public TagletOutputImpl commentTagsToOutput(Tag holderTag, Tag[] tags) { 7.30 return commentTagsToOutput(holderTag, null, tags, false); 7.31 } 7.32 7.33 /** 7.34 * {@inheritDoc} 7.35 */ 7.36 - public TagletOutput commentTagsToOutput(Doc holderDoc, Tag[] tags) { 7.37 + public TagletOutputImpl commentTagsToOutput(Doc holderDoc, Tag[] tags) { 7.38 return commentTagsToOutput(null, holderDoc, tags, false); 7.39 } 7.40 7.41 /** 7.42 * {@inheritDoc} 7.43 */ 7.44 - public TagletOutput commentTagsToOutput(Tag holderTag, 7.45 + public TagletOutputImpl commentTagsToOutput(Tag holderTag, 7.46 Doc holderDoc, Tag[] tags, boolean isFirstSentence) { 7.47 return new TagletOutputImpl(new RawHtml(htmlWriter.commentTagsToString( 7.48 holderTag, holderDoc, tags, isFirstSentence)));
8.1 --- a/test/com/sun/javadoc/testConstructorIndent/TestConstructorIndent.java Tue May 14 10:14:54 2013 -0700 8.2 +++ b/test/com/sun/javadoc/testConstructorIndent/TestConstructorIndent.java Tue May 14 10:14:54 2013 -0700 8.3 @@ -47,8 +47,8 @@ 8.4 private static final String[][] TEST = { 8.5 {BUG_ID + FS + "C.html", "<div class=\"block\">" + 8.6 "This is just a simple constructor.</div>" + NL + 8.7 - "<dl><dt><span class=\"strong\">Parameters:</span></dt>" + NL + 8.8 - "<dd><code>i</code> - a param.</dd></dl>" 8.9 + "<dl>" + NL + "<dt><span class=\"strong\">Parameters:</span></dt>" + NL + 8.10 + "<dd><code>i</code> - a param.</dd>" + NL +"</dl>" 8.11 } 8.12 }; 8.13 private static final String[][] NEGATED_TEST = NO_TEST;
9.1 --- a/test/com/sun/javadoc/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java Tue May 14 10:14:54 2013 -0700 9.2 +++ b/test/com/sun/javadoc/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java Tue May 14 10:14:54 2013 -0700 9.3 @@ -53,64 +53,64 @@ 9.4 // serialized form should have properly nested definition list tags 9.5 // enclosing comments, tags and deprecated information. 9.6 private static final String[][] TEST_CMNT_DEPR = { 9.7 - {BUG_ID + FS + "pkg1" + FS + "package-summary.html", "<dl>" + 9.8 + {BUG_ID + FS + "pkg1" + FS + "package-summary.html", "<dl>" + NL + 9.9 "<dt><span class=\"strong\">Since:</span></dt>" + NL + 9.10 - "<dd>JDK1.0</dd></dl>"}, 9.11 - {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl><dt><span class=\"strong\">Since:</span></dt>" + NL + 9.12 + "<dd>JDK1.0</dd>" + NL + "</dl>"}, 9.13 + {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>" + NL + "<dt><span class=\"strong\">Since:</span></dt>" + NL + 9.14 "<dd>JDK1.0</dd>" + NL + "<dt><span class=\"strong\">See Also:</span></dt>" + NL + 9.15 "<dd><a href=\"../pkg1/C2.html\" title=\"class in pkg1\"><code>" + 9.16 "C2</code></a>, " + NL + "<a href=\"../serialized-form.html#pkg1.C1\">" + 9.17 - "Serialized Form</a></dd></dl>"}, 9.18 - {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl><dt><span class=\"strong\">Since:</span></dt>" + NL + 9.19 + "Serialized Form</a></dd>" + NL + "</dl>"}, 9.20 + {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>" + NL + "<dt><span class=\"strong\">Since:</span></dt>" + NL + 9.21 "<dd>1.4</dd>" + NL + 9.22 "<dt><span class=\"strong\">See Also:</span></dt>" + NL + "<dd>" + 9.23 "<a href=\"../pkg1/C1.html#setUndecorated(boolean)\">" + 9.24 - "<code>setUndecorated(boolean)</code></a></dd></dl>"}, 9.25 - {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl><dt><span class=\"strong\">Parameters:</span></dt>" + NL + "<dd><code>title" + 9.26 + "<code>setUndecorated(boolean)</code></a></dd>" + NL + "</dl>"}, 9.27 + {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>"+ NL + "<dt><span class=\"strong\">Parameters:</span></dt>" + NL + "<dd><code>title" + 9.28 "</code> - the title</dd>" + NL + "<dd><code>test</code> - boolean value" + 9.29 "</dd>" + NL + "<dt><span class=\"strong\">Throws:</span></dt>" + NL + 9.30 "<dd><code>java.lang.IllegalArgumentException</code> - if the " + 9.31 "<code>owner</code>'s" + NL + 9.32 " <code>GraphicsConfiguration</code> is not from a screen " + 9.33 - "device</dd>" + NL + "<dd><code>HeadlessException</code></dd></dl>"}, 9.34 - {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl><dt><span class=\"strong\">Parameters:</span></dt>" + NL + "<dd><code>undecorated" + 9.35 + "device</dd>" + NL + "<dd><code>HeadlessException</code></dd>" + NL + "</dl>"}, 9.36 + {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>" + NL + "<dt><span class=\"strong\">Parameters:</span></dt>" + NL + "<dd><code>undecorated" + 9.37 "</code> - <code>true</code> if no decorations are" + NL + 9.38 " to be enabled;" + NL + " <code>false</code> " + 9.39 "if decorations are to be enabled.</dd>" + NL + "<dt><span class=\"strong\">Since:" + 9.40 "</span></dt>" + NL + "<dd>1.4</dd>" + NL + 9.41 "<dt><span class=\"strong\">See Also:</span></dt>" + NL + "<dd>" + 9.42 "<a href=\"../pkg1/C1.html#readObject()\"><code>readObject()" + 9.43 - "</code></a></dd></dl>"}, 9.44 - {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl><dt><span class=\"strong\">Throws:</span></dt>" + NL + 9.45 + "</code></a></dd>" + NL + "</dl>"}, 9.46 + {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>" + NL + "<dt><span class=\"strong\">Throws:</span></dt>" + NL + 9.47 "<dd><code>java.io.IOException</code></dd>" + NL + "<dt><span class=\"strong\">See Also:" + 9.48 "</span></dt>" + NL + "<dd><a href=\"../pkg1/C1.html#setUndecorated(boolean)\">" + 9.49 - "<code>setUndecorated(boolean)</code></a></dd></dl>"}, 9.50 - {BUG_ID + FS + "pkg1" + FS + "C2.html", "<dl><dt><span class=\"strong\">Parameters:" + 9.51 + "<code>setUndecorated(boolean)</code></a></dd>" + NL + "</dl>"}, 9.52 + {BUG_ID + FS + "pkg1" + FS + "C2.html", "<dl>" + NL + "<dt><span class=\"strong\">Parameters:" + 9.53 "</span></dt>" + NL + "<dd><code>set</code> - boolean</dd>" + NL + "<dt><span class=\"strong\">" + 9.54 - "Since:</span></dt>" + NL + "<dd>1.4</dd></dl>"}, 9.55 - {BUG_ID + FS + "serialized-form.html", "<dl><dt><span class=\"strong\">Throws:</span>" + 9.56 + "Since:</span></dt>" + NL + "<dd>1.4</dd>" + NL + "</dl>"}, 9.57 + {BUG_ID + FS + "serialized-form.html", "<dl>" + NL + "<dt><span class=\"strong\">Throws:</span>" + 9.58 "</dt>" + NL + "<dd><code>" + 9.59 "java.io.IOException</code></dd>" + NL + "<dt><span class=\"strong\">See Also:</span>" + 9.60 "</dt>" + NL + "<dd><a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + 9.61 - "<code>C1.setUndecorated(boolean)</code></a></dd></dl>"}, 9.62 + "<code>C1.setUndecorated(boolean)</code></a></dd>" + NL + "</dl>"}, 9.63 {BUG_ID + FS + "serialized-form.html", "<span class=\"strong\">Deprecated.</span>" + 9.64 " <i>As of JDK version 1.5, replaced by" + NL + 9.65 " <a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + 9.66 "<code>setUndecorated(boolean)</code></a>.</i></div>" + NL + 9.67 "<div class=\"block\">This field indicates whether the C1 is " + 9.68 - "undecorated.</div>" + NL + " " + NL + "<dl><dt><span class=\"strong\">Since:</span></dt>" + NL + 9.69 + "undecorated.</div>" + NL + " " + NL + "<dl>" + NL + "<dt><span class=\"strong\">Since:</span></dt>" + NL + 9.70 "<dd>1.4</dd>" + NL + "<dt><span class=\"strong\">See Also:</span>" + 9.71 "</dt>" + NL + "<dd><a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + 9.72 - "<code>C1.setUndecorated(boolean)</code></a></dd></dl>"}, 9.73 + "<code>C1.setUndecorated(boolean)</code></a></dd>" + NL + "</dl>"}, 9.74 {BUG_ID + FS + "serialized-form.html", "<span class=\"strong\">Deprecated.</span>" + 9.75 " <i>As of JDK version 1.5, replaced by" + NL + 9.76 " <a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + 9.77 "<code>setUndecorated(boolean)</code></a>.</i></div>" + NL + 9.78 "<div class=\"block\">Reads the object stream.</div>" + NL + 9.79 - "<dl><dt><span class=\"strong\">Throws:" + 9.80 + "<dl>" + NL + "<dt><span class=\"strong\">Throws:" + 9.81 "</span></dt>" + NL + "<dd><code><code>" + 9.82 "IOException</code></code></dd>" + NL + 9.83 - "<dd><code>java.io.IOException</code></dd></dl>"}, 9.84 + "<dd><code>java.io.IOException</code></dd>" + NL + "</dl>"}, 9.85 {BUG_ID + FS + "serialized-form.html", "<span class=\"strong\">Deprecated.</span>" + 9.86 " </div>" + NL + 9.87 "<div class=\"block\">The name for this class.</div>"}}; 9.88 @@ -121,55 +121,55 @@ 9.89 // should display properly nested definition list tags for comments, tags 9.90 // and deprecated information. 9.91 private static final String[][] TEST_NODEPR = { 9.92 - {BUG_ID + FS + "pkg1" + FS + "package-summary.html", "<dl>" + 9.93 + {BUG_ID + FS + "pkg1" + FS + "package-summary.html", "<dl>" + NL + 9.94 "<dt><span class=\"strong\">Since:</span></dt>" + NL + 9.95 - "<dd>JDK1.0</dd></dl>"}, 9.96 - {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl><dt><span class=\"strong\">Since:</span>" + 9.97 + "<dd>JDK1.0</dd>" + NL + "</dl>"}, 9.98 + {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>" + NL + "<dt><span class=\"strong\">Since:</span>" + 9.99 "</dt>" + NL + "<dd>JDK1.0</dd>" + NL + "<dt><span class=\"strong\">See Also:" + 9.100 "</span></dt>" + NL + "<dd><a href=\"../pkg1/C2.html\" title=\"class in pkg1\">" + 9.101 "<code>C2</code></a>, " + NL + "<a href=\"../serialized-form.html#pkg1.C1\">" + 9.102 - "Serialized Form</a></dd></dl>"}, 9.103 - {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl><dt><span class=\"strong\">Parameters:" + 9.104 + "Serialized Form</a></dd>" + NL + "</dl>"}, 9.105 + {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>" + NL + "<dt><span class=\"strong\">Parameters:" + 9.106 "</span></dt>" + NL + "<dd><code>title</code> - the title</dd>" + NL + "<dd><code>" + 9.107 "test</code> - boolean value</dd>" + NL + "<dt><span class=\"strong\">Throws:" + 9.108 "</span></dt>" + NL + "<dd><code>java.lang.IllegalArgumentException" + 9.109 "</code> - if the <code>owner</code>'s" + NL + " <code>GraphicsConfiguration" + 9.110 "</code> is not from a screen device</dd>" + NL + "<dd><code>" + 9.111 - "HeadlessException</code></dd></dl>"}, 9.112 - {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl><dt><span class=\"strong\">Parameters:" + 9.113 + "HeadlessException</code></dd>" + NL + "</dl>"}, 9.114 + {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>" + NL + "<dt><span class=\"strong\">Parameters:" + 9.115 "</span></dt>" + NL + "<dd><code>undecorated</code> - <code>true</code>" + 9.116 " if no decorations are" + NL + " to be enabled;" + NL + 9.117 " <code>false</code> if decorations are to be enabled." + 9.118 "</dd>" + NL + "<dt><span class=\"strong\">Since:</span></dt>" + NL + "<dd>1.4</dd>" + NL + 9.119 "<dt><span class=\"strong\">See Also:</span></dt>" + NL + "<dd><a href=\"../pkg1/C1.html#readObject()\">" + 9.120 - "<code>readObject()</code></a></dd></dl>"}, 9.121 - {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl><dt><span class=\"strong\">Throws:</span>" + 9.122 + "<code>readObject()</code></a></dd>" + NL + "</dl>"}, 9.123 + {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>" + NL + "<dt><span class=\"strong\">Throws:</span>" + 9.124 "</dt>" + NL + "<dd><code>java.io.IOException</code></dd>" + NL + "<dt>" + 9.125 "<span class=\"strong\">See Also:</span></dt>" + NL + "<dd><a href=\"../pkg1/C1.html#setUndecorated(boolean)\">" + 9.126 - "<code>setUndecorated(boolean)</code></a></dd></dl>"}, 9.127 - {BUG_ID + FS + "serialized-form.html", "<dl><dt><span class=\"strong\">Throws:</span>" + 9.128 + "<code>setUndecorated(boolean)</code></a></dd>" + NL + "</dl>"}, 9.129 + {BUG_ID + FS + "serialized-form.html", "<dl>" + NL + "<dt><span class=\"strong\">Throws:</span>" + 9.130 "</dt>" + NL + "<dd><code>" + 9.131 "java.io.IOException</code></dd>" + NL + "<dt><span class=\"strong\">See Also:</span>" + 9.132 "</dt>" + NL + "<dd><a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + 9.133 - "<code>C1.setUndecorated(boolean)</code></a></dd></dl>"}, 9.134 + "<code>C1.setUndecorated(boolean)</code></a></dd>" + NL + "</dl>"}, 9.135 {BUG_ID + FS + "serialized-form.html", "<span class=\"strong\">Deprecated.</span>" + 9.136 " <i>As of JDK version 1.5, replaced by" + NL + 9.137 " <a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + 9.138 "<code>setUndecorated(boolean)</code></a>.</i></div>" + NL + 9.139 "<div class=\"block\">This field indicates whether the C1 is " + 9.140 - "undecorated.</div>" + NL + " " + NL + "<dl><dt><span class=\"strong\">Since:</span></dt>" + NL + 9.141 + "undecorated.</div>" + NL + " " + NL + "<dl>" + NL + "<dt><span class=\"strong\">Since:</span></dt>" + NL + 9.142 "<dd>1.4</dd>" + NL + "<dt><span class=\"strong\">See Also:</span>" + 9.143 "</dt>" + NL + "<dd><a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + 9.144 - "<code>C1.setUndecorated(boolean)</code></a></dd></dl>"}, 9.145 + "<code>C1.setUndecorated(boolean)</code></a></dd>" + NL + "</dl>"}, 9.146 {BUG_ID + FS + "serialized-form.html", "<span class=\"strong\">Deprecated.</span>" + 9.147 " <i>As of JDK version 1.5, replaced by" + NL + 9.148 " <a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + 9.149 "<code>setUndecorated(boolean)</code></a>.</i></div>" + NL + 9.150 "<div class=\"block\">Reads the object stream.</div>" + NL + 9.151 - "<dl><dt><span class=\"strong\">Throws:" + 9.152 + "<dl>" + NL + "<dt><span class=\"strong\">Throws:" + 9.153 "</span></dt>" + NL + "<dd><code><code>" + 9.154 "IOException</code></code></dd>" + NL + 9.155 - "<dd><code>java.io.IOException</code></dd></dl>"}, 9.156 + "<dd><code>java.io.IOException</code></dd>" + NL + "</dl>"}, 9.157 {BUG_ID + FS + "serialized-form.html", "<span class=\"strong\">Deprecated.</span>" + 9.158 " </div>" + NL + "<div class=\"block\">" + 9.159 "The name for this class.</div>"}};
10.1 --- a/test/com/sun/javadoc/testJavaFX/TestJavaFX.java Tue May 14 10:14:54 2013 -0700 10.2 +++ b/test/com/sun/javadoc/testJavaFX/TestJavaFX.java Tue May 14 10:14:54 2013 -0700 10.3 @@ -43,11 +43,11 @@ 10.4 {"./" + BUG_ID + "/C.html", 10.5 "<pre>public final void setRate(double value)</pre>" + NL + 10.6 "<div class=\"block\">Sets the value of the property rate.</div>" + NL + 10.7 - "<dl><dt><span class=\"strong\">Property description:</span></dt>" }, 10.8 + "<dl>" + NL + "<dt><span class=\"strong\">Property description:</span></dt>" }, 10.9 {"./" + BUG_ID + "/C.html", 10.10 "<pre>public final double getRate()</pre>" + NL + 10.11 "<div class=\"block\">Gets the value of the property rate.</div>" + NL + 10.12 - "<dl><dt><span class=\"strong\">Property description:</span></dt>" }, 10.13 + "<dl>" + NL + "<dt><span class=\"strong\">Property description:</span></dt>" }, 10.14 {"./" + BUG_ID + "/C.html", 10.15 "<td class=\"colLast\"><code><strong><a href=\"C.html#rateProperty\">rate</a></strong></code>" + NL + 10.16 "<div class=\"block\">Defines the direction/speed at which the <code>Timeline</code> is expected to"},
11.1 --- a/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java Tue May 14 10:14:54 2013 -0700 11.2 +++ b/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java Tue May 14 10:14:54 2013 -0700 11.3 @@ -84,9 +84,9 @@ 11.4 "the type parameter for this class."}, 11.5 //Type parameters in @see/@link 11.6 {BUG_ID + FS + "pkg" + FS + "TypeParameters.html", 11.7 - "<dl><dt><span class=\"strong\">See Also:</span></dt>" + NL + "<dd>" + 11.8 + "<dl>" + NL + "<dt><span class=\"strong\">See Also:</span></dt>" + NL + "<dd>" + 11.9 "<a href=\"../pkg/TypeParameters.html\" title=\"class in pkg\">" + 11.10 - "<code>TypeParameters</code></a></dd></dl>"}, 11.11 + "<code>TypeParameters</code></a></dd>" + NL + "</dl>"}, 11.12 //Method that uses class type parameter. 11.13 {BUG_ID + FS + "pkg" + FS + "TypeParameters.html", 11.14 "(<a href=\"../pkg/TypeParameters.html\" title=\"type " +
12.1 --- a/test/com/sun/javadoc/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java Tue May 14 10:14:54 2013 -0700 12.2 +++ b/test/com/sun/javadoc/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java Tue May 14 10:14:54 2013 -0700 12.3 @@ -41,29 +41,29 @@ 12.4 // Test for normal run of javadoc. The serialized-form.html should 12.5 // display the inline comments, tags and deprecation information if any. 12.6 private static final String[][] TEST_CMNT_DEPR = { 12.7 - {BUG_ID + FS + "serialized-form.html", "<dl>" + 12.8 + {BUG_ID + FS + "serialized-form.html", "<dl>" + NL + 12.9 "<dt><span class=\"strong\">Throws:</span></dt>" + NL + "<dd><code>" + 12.10 "java.io.IOException</code></dd>"+ NL + "<dt><span class=\"strong\">See Also:</span>" + 12.11 "</dt>" + NL + "<dd><a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + 12.12 - "<code>C1.setUndecorated(boolean)</code></a></dd></dl>"}, 12.13 + "<code>C1.setUndecorated(boolean)</code></a></dd>" + NL + "</dl>"}, 12.14 {BUG_ID + FS + "serialized-form.html", "<span class=\"strong\">Deprecated.</span>" + 12.15 " <i>As of JDK version 1.5, replaced by" + NL + 12.16 " <a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + 12.17 "<code>setUndecorated(boolean)</code></a>.</i></div>" + NL + 12.18 "<div class=\"block\">This field indicates whether the C1 " + 12.19 "is undecorated.</div>" + NL + " " + NL + 12.20 - "<dl><dt><span class=\"strong\">Since:</span></dt>" + NL + 12.21 + "<dl>" + NL + "<dt><span class=\"strong\">Since:</span></dt>" + NL + 12.22 "<dd>1.4</dd>" + NL + "<dt><span class=\"strong\">See Also:</span>" + 12.23 "</dt>" + NL + "<dd><a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + 12.24 - "<code>C1.setUndecorated(boolean)</code></a></dd></dl>"}, 12.25 + "<code>C1.setUndecorated(boolean)</code></a></dd>" + NL + "</dl>"}, 12.26 {BUG_ID + FS + "serialized-form.html", "<span class=\"strong\">Deprecated.</span>" + 12.27 " <i>As of JDK version 1.5, replaced by" + NL + 12.28 " <a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + 12.29 "<code>setUndecorated(boolean)</code></a>.</i></div>" + NL + 12.30 "<div class=\"block\">Reads the object stream.</div>" + NL + 12.31 - "<dl><dt><span class=\"strong\">Throws:</span></dt>" + NL + "<dd><code><code>" + 12.32 + "<dl>" + NL + "<dt><span class=\"strong\">Throws:</span></dt>" + NL + "<dd><code><code>" + 12.33 "IOException</code></code></dd>" + NL + 12.34 - "<dd><code>java.io.IOException</code></dd></dl>"}, 12.35 + "<dd><code>java.io.IOException</code></dd>" + NL + "</dl>"}, 12.36 {BUG_ID + FS + "serialized-form.html", "<span class=\"strong\">Deprecated.</span>" + 12.37 " </div>" + NL + "<div class=\"block\">" + 12.38 "The name for this class.</div>"}};
13.1 --- a/test/com/sun/javadoc/testSinceTag/TestSinceTag.java Tue May 14 10:14:54 2013 -0700 13.2 +++ b/test/com/sun/javadoc/testSinceTag/TestSinceTag.java Tue May 14 10:14:54 2013 -0700 13.3 @@ -48,11 +48,11 @@ 13.4 //Input for string search tests. 13.5 private static final String[][] TEST = { 13.6 {BUG_ID + FS + "pkg1" + FS + "C1.html", 13.7 - "<dl><dt><span class=\"strong\">Since:</span></dt>" + NL + 13.8 + "<dl>" + NL + "<dt><span class=\"strong\">Since:</span></dt>" + NL + 13.9 "<dd>JDK1.0</dd>" 13.10 }, 13.11 {BUG_ID + FS + "serialized-form.html", 13.12 - "<dl><dt><span class=\"strong\">Since:</span></dt>" + NL + 13.13 + "<dl>" + NL + "<dt><span class=\"strong\">Since:</span></dt>" + NL + 13.14 "<dd>1.4</dd>" 13.15 } 13.16 };
