Mercurial > hg > openjdk > jdk8 > langtools
changeset 1934:8c55df2442c1
7198274: RFE : Javadoc Accessibility : Use CSS styles rather than <strong> or <i> tags
Reviewed-by: jjg
line wrap: on
line diff
--- a/src/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java Wed Aug 07 11:04:07 2013 +0100 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java Wed Aug 07 15:00:24 2013 -0700 @@ -101,7 +101,7 @@ Content tdSummary) { ExecutableMemberDoc emd = (ExecutableMemberDoc)member; String name = emd.name(); - Content strong = HtmlTree.STRONG( + Content strong = HtmlTree.SPAN(HtmlStyle.strong, writer.getDocLink(context, cd, (MemberDoc) emd, name, false)); Content code = HtmlTree.CODE(strong);
--- a/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java Wed Aug 07 11:04:07 2013 +0100 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java Wed Aug 07 15:00:24 2013 -0700 @@ -225,7 +225,7 @@ */ protected void addSummaryLink(LinkInfoImpl.Kind context, ClassDoc cd, ProgramElementDoc member, Content tdSummary) { - Content strong = HtmlTree.STRONG( + Content strong = HtmlTree.SPAN(HtmlStyle.strong, writer.getDocLink(context, (MemberDoc) member, member.name(), false)); Content code = HtmlTree.CODE(strong); tdSummary.addContent(code);
--- a/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java Wed Aug 07 11:04:07 2013 +0100 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java Wed Aug 07 15:00:24 2013 -0700 @@ -262,7 +262,7 @@ annotationInfoTree.addContent(hr); Tag[] deprs = annotationType.tags("deprecated"); if (Util.isDeprecated(annotationType)) { - Content strong = HtmlTree.STRONG(deprecatedPhrase); + Content strong = HtmlTree.SPAN(HtmlStyle.strong, deprecatedPhrase); Content div = HtmlTree.DIV(HtmlStyle.block, strong); if (deprs.length > 0) { Tag[] commentTags = deprs[0].inlineTags();
--- a/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java Wed Aug 07 11:04:07 2013 +0100 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java Wed Aug 07 15:00:24 2013 -0700 @@ -547,7 +547,7 @@ classInfoTree.addContent(hr); Tag[] deprs = classDoc.tags("deprecated"); if (Util.isDeprecated(classDoc)) { - Content strong = HtmlTree.STRONG(deprecatedPhrase); + Content strong = HtmlTree.SPAN(HtmlStyle.strong, deprecatedPhrase); Content div = HtmlTree.DIV(HtmlStyle.block, strong); if (deprs.length > 0) { Tag[] commentTags = deprs[0].inlineTags();
--- a/src/share/classes/com/sun/tools/doclets/formats/html/EnumConstantWriterImpl.java Wed Aug 07 11:04:07 2013 +0100 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/EnumConstantWriterImpl.java Wed Aug 07 15:00:24 2013 -0700 @@ -222,7 +222,7 @@ */ protected void addSummaryLink(LinkInfoImpl.Kind context, ClassDoc cd, ProgramElementDoc member, Content tdSummary) { - Content strong = HtmlTree.STRONG( + Content strong = HtmlTree.SPAN(HtmlStyle.strong, writer.getDocLink(context, (MemberDoc) member, member.name(), false)); Content code = HtmlTree.CODE(strong); tdSummary.addContent(code);
--- a/src/share/classes/com/sun/tools/doclets/formats/html/FieldWriterImpl.java Wed Aug 07 11:04:07 2013 +0100 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/FieldWriterImpl.java Wed Aug 07 15:00:24 2013 -0700 @@ -139,7 +139,7 @@ holder.typeName() : holder.qualifiedTypeName(), false); Content codeLink = HtmlTree.CODE(link); - Content strong = HtmlTree.STRONG(holder.isClass()? + Content strong = HtmlTree.SPAN(HtmlStyle.strong, holder.isClass()? writer.descfrmClassLabel : writer.descfrmInterfaceLabel); strong.addContent(writer.getSpace()); strong.addContent(codeLink); @@ -256,7 +256,7 @@ */ protected void addSummaryLink(LinkInfoImpl.Kind context, ClassDoc cd, ProgramElementDoc member, Content tdSummary) { - Content strong = HtmlTree.STRONG( + Content strong = HtmlTree.SPAN(HtmlStyle.strong, writer.getDocLink(context, cd , (MemberDoc) member, member.name(), false)); Content code = HtmlTree.CODE(strong); tdSummary.addContent(code);
--- a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java Wed Aug 07 11:04:07 2013 +0100 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java Wed Aug 07 15:00:24 2013 -0700 @@ -1029,7 +1029,7 @@ public Content italicsClassName(ClassDoc cd, boolean qual) { Content name = new StringContent((qual)? cd.qualifiedName(): cd.name()); - return (cd.isInterface())? HtmlTree.I(name): name; + return (cd.isInterface())? HtmlTree.SPAN(HtmlStyle.italic, name): name; } /** @@ -1545,7 +1545,7 @@ Content div; Content result = commentTagsToContent(null, doc, tags, first); if (depr) { - Content italic = HtmlTree.I(result); + Content italic = HtmlTree.SPAN(HtmlStyle.italic, result); div = HtmlTree.DIV(HtmlStyle.block, italic); htmltree.addContent(div); }
--- a/src/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java Wed Aug 07 11:04:07 2013 +0100 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java Wed Aug 07 15:00:24 2013 -0700 @@ -159,7 +159,7 @@ holder.typeName() : holder.qualifiedTypeName(), false); Content codelLink = HtmlTree.CODE(link); - Content strong = HtmlTree.STRONG(holder.asClassDoc().isClass()? + Content strong = HtmlTree.SPAN(HtmlStyle.strong, holder.asClassDoc().isClass()? writer.descfrmClassLabel : writer.descfrmInterfaceLabel); strong.addContent(writer.getSpace()); strong.addContent(codelLink); @@ -309,7 +309,7 @@ label = writer.specifiedByLabel; context = LinkInfoImpl.Kind.METHOD_SPECIFIED_BY; } - Content dt = HtmlTree.DT(HtmlTree.STRONG(label)); + Content dt = HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.strong, label)); dl.addContent(dt); Content overriddenTypeLink = writer.getLink(new LinkInfoImpl(writer.configuration, context, overriddenType)); @@ -364,7 +364,7 @@ Content intfaclink = writer.getLink(new LinkInfoImpl( writer.configuration, LinkInfoImpl.Kind.METHOD_SPECIFIED_BY, intfac)); Content codeIntfacLink = HtmlTree.CODE(intfaclink); - Content dt = HtmlTree.DT(HtmlTree.STRONG(writer.specifiedByLabel)); + Content dt = HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.strong, writer.specifiedByLabel)); dl.addContent(dt); Content methlink = writer.getDocLink( LinkInfoImpl.Kind.MEMBER, implementedMeth,
--- a/src/share/classes/com/sun/tools/doclets/formats/html/NestedClassWriterImpl.java Wed Aug 07 11:04:07 2013 +0100 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/NestedClassWriterImpl.java Wed Aug 07 15:00:24 2013 -0700 @@ -164,7 +164,7 @@ */ protected void addSummaryLink(LinkInfoImpl.Kind context, ClassDoc cd, ProgramElementDoc member, Content tdSummary) { - Content strong = HtmlTree.STRONG( + Content strong = HtmlTree.SPAN(HtmlStyle.strong, writer.getLink(new LinkInfoImpl(configuration, context, (ClassDoc)member))); Content code = HtmlTree.CODE(strong); tdSummary.addContent(code);
--- a/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java Wed Aug 07 11:04:07 2013 +0100 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java Wed Aug 07 15:00:24 2013 -0700 @@ -183,7 +183,7 @@ printedHeader = true; } Content arr_i_name = new StringContent(arr[i].name()); - if (arr[i].isInterface()) arr_i_name = HtmlTree.I(arr_i_name); + if (arr[i].isInterface()) arr_i_name = HtmlTree.SPAN(HtmlStyle.italic, arr_i_name); Content link = getLink(new LinkInfoImpl(configuration, LinkInfoImpl.Kind.PACKAGE_FRAME, arr[i]).label(arr_i_name).target("classFrame")); Content li = HtmlTree.LI(link);
--- a/src/share/classes/com/sun/tools/doclets/formats/html/ProfilePackageFrameWriter.java Wed Aug 07 11:04:07 2013 +0100 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/ProfilePackageFrameWriter.java Wed Aug 07 15:00:24 2013 -0700 @@ -174,7 +174,7 @@ printedHeader = true; } Content arr_i_name = new StringContent(arr[i].name()); - if (arr[i].isInterface()) arr_i_name = HtmlTree.I(arr_i_name); + if (arr[i].isInterface()) arr_i_name = HtmlTree.SPAN(HtmlStyle.italic, arr_i_name); Content link = getLink(new LinkInfoImpl(configuration, LinkInfoImpl.Kind.PACKAGE_FRAME, arr[i]).label(arr_i_name).target("classFrame")); Content li = HtmlTree.LI(link);
--- a/src/share/classes/com/sun/tools/doclets/formats/html/PropertyWriterImpl.java Wed Aug 07 11:04:07 2013 +0100 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/PropertyWriterImpl.java Wed Aug 07 15:00:24 2013 -0700 @@ -135,7 +135,7 @@ holder.typeName() : holder.qualifiedTypeName(), false); Content codeLink = HtmlTree.CODE(link); - Content strong = HtmlTree.STRONG(holder.isClass()? + Content strong = HtmlTree.SPAN(HtmlStyle.strong, holder.isClass()? writer.descfrmClassLabel : writer.descfrmInterfaceLabel); strong.addContent(writer.getSpace()); strong.addContent(codeLink); @@ -252,13 +252,12 @@ */ protected void addSummaryLink(LinkInfoImpl.Kind context, ClassDoc cd, ProgramElementDoc member, Content tdSummary) { - Content strong = HtmlTree.STRONG( - writer.getDocLink(context, - cd, - (MemberDoc) member, - member.name().substring(0, member.name().lastIndexOf("Property")), - false, - true)); + Content strong = HtmlTree.SPAN(HtmlStyle.strong, + writer.getDocLink(context, cd, + (MemberDoc) member, + member.name().substring(0, member.name().lastIndexOf("Property")), + false, + true)); Content code = HtmlTree.CODE(strong); tdSummary.addContent(code);
--- a/src/share/classes/com/sun/tools/doclets/formats/html/SubWriterHolderWriter.java Wed Aug 07 11:04:07 2013 +0100 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/SubWriterHolderWriter.java Wed Aug 07 15:00:24 2013 -0700 @@ -175,7 +175,7 @@ Tag[] deprs = member.tags("deprecated"); Content div; if (Util.isDeprecated((ProgramElementDoc) member)) { - Content strong = HtmlTree.STRONG(deprecatedPhrase); + Content strong = HtmlTree.SPAN(HtmlStyle.strong, deprecatedPhrase); div = HtmlTree.DIV(HtmlStyle.block, strong); div.addContent(getSpace()); if (deprs.length > 0) { @@ -186,7 +186,7 @@ } else { ClassDoc cd = ((ProgramElementDoc)member).containingClass(); if (cd != null && Util.isDeprecated(cd)) { - Content strong = HtmlTree.STRONG(deprecatedPhrase); + Content strong = HtmlTree.SPAN(HtmlStyle.strong, deprecatedPhrase); div = HtmlTree.DIV(HtmlStyle.block, strong); div.addContent(getSpace()); tdSummary.addContent(div);
--- a/src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java Wed Aug 07 11:04:07 2013 +0100 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java Wed Aug 07 15:00:24 2013 -0700 @@ -118,7 +118,7 @@ if (deprs.length > 0) { Content body = commentTagsToOutput(null, doc, deprs[0].inlineTags(), false); - result.addContent(HtmlTree.I(body)); + result.addContent(HtmlTree.SPAN(HtmlStyle.italic, body)); } } else { if (Util.isDeprecated(member.containingClass())) {
--- a/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlStyle.java Wed Aug 07 11:04:07 2013 +0100 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlStyle.java Wed Aug 07 15:00:24 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -59,6 +59,7 @@ indexContainer, indexHeader, inheritance, + italic, legalCopy, nameValue, navBarCell1Rev,
--- a/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java Wed Aug 07 11:04:07 2013 +0100 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java Wed Aug 07 15:00:24 2013 -0700 @@ -416,17 +416,6 @@ } /** - * Generates a I tag with some content. - * - * @param body content for the tag - * @return an HtmlTree object for the I tag - */ - public static HtmlTree I(Content body) { - HtmlTree htmltree = new HtmlTree(HtmlTag.I, nullCheck(body)); - return htmltree; - } - - /** * Generates a LI tag with some content. * * @param body content for the tag @@ -559,17 +548,6 @@ } /** - * Generates a STRONG tag with some content. - * - * @param body content for the tag - * @return an HtmlTree object for the STRONG tag - */ - public static HtmlTree STRONG(Content body) { - HtmlTree htmltree = new HtmlTree(HtmlTag.STRONG, nullCheck(body)); - return htmltree; - } - - /** * Generates a SPAN tag with some content. * * @param body content for the tag
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css Wed Aug 07 11:04:07 2013 +0100 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css Wed Aug 07 15:00:24 2013 -0700 @@ -519,3 +519,6 @@ .strong { font-weight:bold; } +.italic { + font-style:italic; +}
--- a/test/com/sun/javadoc/testClassCrossReferences/TestClassCrossReferences.java Wed Aug 07 11:04:07 2013 +0100 +++ b/test/com/sun/javadoc/testClassCrossReferences/TestClassCrossReferences.java Wed Aug 07 15:00:24 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -48,7 +48,7 @@ "<a href=\"http://java.sun.com/j2se/1.4/docs/api/java/math/BigInteger.html?is-external=true#gcd(java.math.BigInteger)\" " + "title=\"class or interface in java.math\"><code>Link to external member gcd</code></a>"}, {BUG_ID + FS + "C.html", - "<dl>" + NL + "<dt><strong>Overrides:</strong></dt>" + NL + + "<dl>" + NL + "<dt><span class=\"strong\">Overrides:</span></dt>" + NL + "<dd><code>toString</code> in class <code>java.lang.Object</code></dd>" + NL + "</dl>"} };
--- a/test/com/sun/javadoc/testExternalOverridenMethod/TestExternalOverridenMethod.java Wed Aug 07 11:04:07 2013 +0100 +++ b/test/com/sun/javadoc/testExternalOverridenMethod/TestExternalOverridenMethod.java Wed Aug 07 15:00:24 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -39,13 +39,13 @@ private static final String BUG_ID = "4857717"; private static final String[][] TEST = { {BUG_ID + FS + "pkg" + FS + "XReader.html", - "<dt><strong>Overrides:</strong></dt>" + NL + + "<dt><span class=\"strong\">Overrides:</span></dt>" + NL + "<dd><code><a href=\"http://java.sun.com/j2se/1.4.1/docs/api/java/io/FilterReader.html?is-external=true#read()\" " + "title=\"class or interface in java.io\">read</a></code> in class <code>" + "<a href=\"http://java.sun.com/j2se/1.4.1/docs/api/java/io/FilterReader.html?is-external=true\" " + "title=\"class or interface in java.io\">FilterReader</a></code></dd>"}, {BUG_ID + FS + "pkg" + FS + "XReader.html", - "<dt><strong>Specified by:</strong></dt>" + NL + + "<dt><span class=\"strong\">Specified by:</span></dt>" + NL + "<dd><code><a href=\"http://java.sun.com/j2se/1.4.1/docs/api/java/io/DataInput.html?is-external=true#readInt()\" " + "title=\"class or interface in java.io\">readInt</a></code> in interface <code>" + "<a href=\"http://java.sun.com/j2se/1.4.1/docs/api/java/io/DataInput.html?is-external=true\" " +
--- a/test/com/sun/javadoc/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java Wed Aug 07 11:04:07 2013 +0100 +++ b/test/com/sun/javadoc/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java Wed Aug 07 15:00:24 2013 -0700 @@ -94,18 +94,18 @@ "</dt>" + NL + "<dd><a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + "<code>C1.setUndecorated(boolean)</code></a></dd>" + NL + "</dl>"}, {BUG_ID + FS + "serialized-form.html", "<span class=\"strong\">Deprecated.</span>" + - " <i>As of JDK version 1.5, replaced by" + NL + + " <span class=\"italic\">As of JDK version 1.5, replaced by" + NL + " <a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + - "<code>setUndecorated(boolean)</code></a>.</i></div>" + NL + + "<code>setUndecorated(boolean)</code></a>.</span></div>" + NL + "<div class=\"block\">This field indicates whether the C1 is " + "undecorated.</div>" + NL + " " + NL + "<dl>" + NL + "<dt><span class=\"strong\">Since:</span></dt>" + NL + "<dd>1.4</dd>" + NL + "<dt><span class=\"strong\">See Also:</span>" + "</dt>" + NL + "<dd><a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + "<code>C1.setUndecorated(boolean)</code></a></dd>" + NL + "</dl>"}, {BUG_ID + FS + "serialized-form.html", "<span class=\"strong\">Deprecated.</span>" + - " <i>As of JDK version 1.5, replaced by" + NL + + " <span class=\"italic\">As of JDK version 1.5, replaced by" + NL + " <a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + - "<code>setUndecorated(boolean)</code></a>.</i></div>" + NL + + "<code>setUndecorated(boolean)</code></a>.</span></div>" + NL + "<div class=\"block\">Reads the object stream.</div>" + NL + "<dl>" + NL + "<dt><span class=\"strong\">Throws:" + "</span></dt>" + NL + "<dd><code><code>" + @@ -153,18 +153,18 @@ "</dt>" + NL + "<dd><a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + "<code>C1.setUndecorated(boolean)</code></a></dd>" + NL + "</dl>"}, {BUG_ID + FS + "serialized-form.html", "<span class=\"strong\">Deprecated.</span>" + - " <i>As of JDK version 1.5, replaced by" + NL + + " <span class=\"italic\">As of JDK version 1.5, replaced by" + NL + " <a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + - "<code>setUndecorated(boolean)</code></a>.</i></div>" + NL + + "<code>setUndecorated(boolean)</code></a>.</span></div>" + NL + "<div class=\"block\">This field indicates whether the C1 is " + "undecorated.</div>" + NL + " " + NL + "<dl>" + NL + "<dt><span class=\"strong\">Since:</span></dt>" + NL + "<dd>1.4</dd>" + NL + "<dt><span class=\"strong\">See Also:</span>" + "</dt>" + NL + "<dd><a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + "<code>C1.setUndecorated(boolean)</code></a></dd>" + NL + "</dl>"}, {BUG_ID + FS + "serialized-form.html", "<span class=\"strong\">Deprecated.</span>" + - " <i>As of JDK version 1.5, replaced by" + NL + + " <span class=\"italic\">As of JDK version 1.5, replaced by" + NL + " <a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + - "<code>setUndecorated(boolean)</code></a>.</i></div>" + NL + + "<code>setUndecorated(boolean)</code></a>.</span></div>" + NL + "<div class=\"block\">Reads the object stream.</div>" + NL + "<dl>" + NL + "<dt><span class=\"strong\">Throws:" + "</span></dt>" + NL + "<dd><code><code>" + @@ -187,14 +187,14 @@ "APPLICATION_EXCLUDE</pre>" + NL + "</li>"}, {BUG_ID + FS + "serialized-form.html", "<pre>boolean " + "undecorated</pre>" + NL + "<div class=\"block\"><span class=\"strong\">" + - "Deprecated.</span> <i>As of JDK version 1.5, replaced by" + NL + + "Deprecated.</span> <span class=\"italic\">As of JDK version 1.5, replaced by" + NL + " <a href=\"pkg1/C1.html#setUndecorated(boolean)\"><code>" + - "setUndecorated(boolean)</code></a>.</i></div>" + NL + "</li>"}, + "setUndecorated(boolean)</code></a>.</span></div>" + NL + "</li>"}, {BUG_ID + FS + "serialized-form.html", "<span class=\"strong\">" + - "Deprecated.</span> <i>As of JDK version" + + "Deprecated.</span> <span class=\"italic\">As of JDK version" + " 1.5, replaced by" + NL + " <a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + - "<code>setUndecorated(boolean)</code></a>.</i></div>" + NL + "</li>"}}; + "<code>setUndecorated(boolean)</code></a>.</span></div>" + NL + "</li>"}}; // Test for valid HTML generation which should not comprise of empty // definition list tags.
--- a/test/com/sun/javadoc/testInterface/TestInterface.java Wed Aug 07 11:04:07 2013 +0100 +++ b/test/com/sun/javadoc/testInterface/TestInterface.java Wed Aug 07 15:00:24 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -83,7 +83,7 @@ }, //Make sure "Specified By" has substituted type parameters. {BUG_ID + FS + "pkg" + FS + "Child.html", - "<dt><strong>Specified by:</strong></dt>" + NL + + "<dt><span class=\"strong\">Specified by:</span></dt>" + NL + "<dd><code><a href=\"../pkg/Interface.html#method()\">method</a>" + "</code> in interface <code>" + "<a href=\"../pkg/Interface.html\" title=\"interface in pkg\">" + @@ -92,7 +92,7 @@ }, //Make sure "Overrides" has substituted type parameters. {BUG_ID + FS + "pkg" + FS + "Child.html", - "<dt><strong>Overrides:</strong></dt>" + NL + + "<dt><span class=\"strong\">Overrides:</span></dt>" + NL + "<dd><code><a href=\"../pkg/Parent.html#method()\">method</a>" + "</code> in class <code><a href=\"../pkg/Parent.html\" " + "title=\"class in pkg\">Parent</a><<a href=\"../pkg/Child.html\" " +
--- a/test/com/sun/javadoc/testJavaFX/TestJavaFX.java Wed Aug 07 11:04:07 2013 +0100 +++ b/test/com/sun/javadoc/testJavaFX/TestJavaFX.java Wed Aug 07 15:00:24 2013 -0700 @@ -49,7 +49,7 @@ "<div class=\"block\">Gets the value of the property rate.</div>" + NL + "<dl>" + NL + "<dt><span class=\"strong\">Property description:</span></dt>" }, {"./" + BUG_ID + "/C.html", - "<td class=\"colLast\"><code><strong><a href=\"C.html#rateProperty\">rate</a></strong></code>" + NL + + "<td class=\"colLast\"><code><span class=\"strong\"><a href=\"C.html#rateProperty\">rate</a></span></code>" + NL + "<div class=\"block\">Defines the direction/speed at which the <code>Timeline</code> is expected to"}, {"./" + BUG_ID + "/C.html", @@ -63,7 +63,7 @@ {"./" + BUG_ID + "/C.html", "<span class=\"strong\">Property description:</span>"}, {"./" + BUG_ID + "/C.html", - "<td class=\"colLast\"><code><strong><a href=\"C.html#setTestMethodProperty()\">setTestMethodProperty</a></strong>()</code> </td>" }, + "<td class=\"colLast\"><code><span class=\"strong\"><a href=\"C.html#setTestMethodProperty()\">setTestMethodProperty</a></span>()</code> </td>" }, {"./" + BUG_ID + "/C.html", "<h4>isPaused</h4>" + NL + "<pre>public final double isPaused()</pre>" + NL +
--- a/test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java Wed Aug 07 11:04:07 2013 +0100 +++ b/test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java Wed Aug 07 15:00:24 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -72,7 +72,7 @@ // Test overriding/implementing methods with generic parameters. {BUG_ID + FS + "pkg" + FS + "BaseClass.html", - "<dl>" + NL + "<dt><strong>Specified by:</strong></dt>" + NL + + "<dl>" + NL + "<dt><span class=\"strong\">Specified by:</span></dt>" + NL + "<dd><code><a href=\"../pkg/BaseInterface.html#getAnnotation(java.lang.Class)\">" + "getAnnotation</a></code> in interface <code>" + "<a href=\"../pkg/BaseInterface.html\" title=\"interface in pkg\">" +
--- a/test/com/sun/javadoc/testMemberSummary/TestMemberSummary.java Wed Aug 07 11:04:07 2013 +0100 +++ b/test/com/sun/javadoc/testMemberSummary/TestMemberSummary.java Wed Aug 07 15:00:24 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -49,8 +49,8 @@ // Check return type in member summary. {BUG_ID + FS + "pkg" + FS + "PublicChild.html", "<code><a href=\"../pkg/PublicChild.html\" title=\"class in pkg\">PublicChild</a></code></td>" + NL + - "<td class=\"colLast\"><code><strong><a href=\"../pkg/PublicChild.html#returnTypeTest()\">" + - "returnTypeTest</a></strong>()</code>" + "<td class=\"colLast\"><code><span class=\"strong\"><a href=\"../pkg/PublicChild.html#returnTypeTest()\">" + + "returnTypeTest</a></span>()</code>" }, // Check return type in member detail. {BUG_ID + FS + "pkg" + FS + "PublicChild.html",
--- a/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java Wed Aug 07 11:04:07 2013 +0100 +++ b/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java Wed Aug 07 15:00:24 2013 -0700 @@ -62,7 +62,7 @@ "</span><span class=\"tabEnd\"> </span></caption>"}, //Detail for enum constant {BUG_ID + FS + "pkg" + FS + "Coin.html", - "<strong><a href=\"../pkg/Coin.html#Dime\">Dime</a></strong>"}, + "<span class=\"strong\"><a href=\"../pkg/Coin.html#Dime\">Dime</a></span>"}, //Automatically insert documentation for values() and valueOf(). {BUG_ID + FS + "pkg" + FS + "Coin.html", "Returns an array containing the constants of this enum type,"}, @@ -320,11 +320,11 @@ "Foo</a></span><span class=\"tabEnd\"> </span></caption>" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html", - "<td class=\"colLast\"><code><strong><a href=\"../../pkg2/ClassUseTest1.html\" " + + "<td class=\"colLast\"><code><span class=\"strong\"><a href=\"../../pkg2/ClassUseTest1.html\" " + "title=\"class in pkg2\">ClassUseTest1</a><T extends " + "<a href=\"../../pkg2/Foo.html\" title=\"class in pkg2\">Foo" + "</a> & <a href=\"../../pkg2/Foo2.html\" title=\"interface in pkg2\">" + - "Foo2</a>></strong></code> </td>" + "Foo2</a>></span></code> </td>" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html", "<caption><span>Methods in <a href=\"../../pkg2/" + @@ -334,8 +334,8 @@ }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html", "<td class=\"colLast\"><span class=\"strong\">ClassUseTest1." + - "</span><code><strong><a href=\"../../pkg2/" + - "ClassUseTest1.html#method(T)\">method</a></strong>" + + "</span><code><span class=\"strong\"><a href=\"../../pkg2/" + + "ClassUseTest1.html#method(T)\">method</a></span>" + "(T t)</code> </td>" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html", @@ -372,11 +372,11 @@ "</span></caption>" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo2.html", - "<td class=\"colLast\"><code><strong><a href=\"../../pkg2/ClassUseTest1.html\" " + + "<td class=\"colLast\"><code><span class=\"strong\"><a href=\"../../pkg2/ClassUseTest1.html\" " + "title=\"class in pkg2\">ClassUseTest1</a><T extends " + "<a href=\"../../pkg2/Foo.html\" title=\"class in pkg2\">Foo" + "</a> & <a href=\"../../pkg2/Foo2.html\" title=\"interface in pkg2\">" + - "Foo2</a>></strong></code> </td>" + "Foo2</a>></span></code> </td>" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo2.html", "<caption><span>Methods in <a href=\"../../pkg2/" + @@ -387,8 +387,8 @@ }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo2.html", "<td class=\"colLast\"><span class=\"strong\">" + - "ClassUseTest1.</span><code><strong><a href=\"../../" + - "pkg2/ClassUseTest1.html#method(T)\">method</a></strong>" + + "ClassUseTest1.</span><code><span class=\"strong\"><a href=\"../../" + + "pkg2/ClassUseTest1.html#method(T)\">method</a></span>" + "(T t)</code> </td>" }, @@ -401,11 +401,11 @@ " </span></caption>" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html", - "<td class=\"colLast\"><code><strong><a href=\"../../pkg2/ClassUseTest2.html\" " + + "<td class=\"colLast\"><code><span class=\"strong\"><a href=\"../../pkg2/ClassUseTest2.html\" " + "title=\"class in pkg2\">ClassUseTest2</a><T extends " + "<a href=\"../../pkg2/ParamTest.html\" title=\"class in pkg2\">" + "ParamTest</a><<a href=\"../../pkg2/Foo3.html\" title=\"class in pkg2\">" + - "Foo3</a>>></strong></code> </td>" + "Foo3</a>>></span></code> </td>" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html", "<caption><span>Methods in <a href=\"../../pkg2/" + @@ -416,8 +416,8 @@ }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html", "<td class=\"colLast\"><span class=\"strong\">ClassUseTest2." + - "</span><code><strong><a href=\"../../pkg2/" + - "ClassUseTest2.html#method(T)\">method</a></strong>" + + "</span><code><span class=\"strong\"><a href=\"../../pkg2/" + + "ClassUseTest2.html#method(T)\">method</a></span>" + "(T t)</code> </td>" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html", @@ -456,11 +456,11 @@ "Foo3</a></span><span class=\"tabEnd\"> </span></caption>" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html", - "<td class=\"colLast\"><code><strong><a href=\"../../pkg2/ClassUseTest2.html\" " + + "<td class=\"colLast\"><code><span class=\"strong\"><a href=\"../../pkg2/ClassUseTest2.html\" " + "title=\"class in pkg2\">ClassUseTest2</a><T extends " + "<a href=\"../../pkg2/ParamTest.html\" title=\"class in pkg2\">" + "ParamTest</a><<a href=\"../../pkg2/Foo3.html\" title=\"class in pkg2\">" + - "Foo3</a>>></strong></code> </td>" + "Foo3</a>>></span></code> </td>" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html", "<caption><span>Methods in <a href=\"../../pkg2/" + @@ -471,8 +471,8 @@ }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html", "<td class=\"colLast\"><span class=\"strong\">ClassUseTest2." + - "</span><code><strong><a href=\"../../pkg2/" + - "ClassUseTest2.html#method(T)\">method</a></strong>" + + "</span><code><span class=\"strong\"><a href=\"../../pkg2/" + + "ClassUseTest2.html#method(T)\">method</a></span>" + "(T t)</code> </td>" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html", @@ -500,12 +500,12 @@ " </span></caption>" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html", - "<td class=\"colLast\"><code><strong><a href=\"../../pkg2/ClassUseTest3.html\" " + + "<td class=\"colLast\"><code><span class=\"strong\"><a href=\"../../pkg2/ClassUseTest3.html\" " + "title=\"class in pkg2\">ClassUseTest3</a><T extends " + "<a href=\"../../pkg2/ParamTest2.html\" title=\"class in pkg2\">" + "ParamTest2</a><java.util.List<? extends " + "<a href=\"../../pkg2/Foo4.html\" title=\"class in pkg2\">" + - "Foo4</a>>>></strong></code> </td>" + "Foo4</a>>>></span></code> </td>" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html", "<caption><span>Methods in <a href=\"../../pkg2/" + @@ -516,8 +516,8 @@ }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html", "<td class=\"colLast\"><span class=\"strong\">ClassUseTest3" + - ".</span><code><strong><a href=\"../../pkg2/ClassUseTest3." + - "html#method(T)\">method</a></strong>(T t)</code> </td>" + ".</span><code><span class=\"strong\"><a href=\"../../pkg2/ClassUseTest3." + + "html#method(T)\">method</a></span>(T t)</code> </td>" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html", "<td class=\"colFirst\"><code><T extends <a href=\"../" + @@ -538,12 +538,12 @@ "</span></caption>" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html", - "<td class=\"colLast\"><code><strong><a href=\"../../pkg2/ClassUseTest3.html\" " + + "<td class=\"colLast\"><code><span class=\"strong\"><a href=\"../../pkg2/ClassUseTest3.html\" " + "title=\"class in pkg2\">ClassUseTest3</a><T extends " + "<a href=\"../../pkg2/ParamTest2.html\" title=\"class in pkg2\">" + "ParamTest2</a><java.util.List<? extends " + "<a href=\"../../pkg2/Foo4.html\" title=\"class in pkg2\">" + - "Foo4</a>>>></strong></code> </td>" + "Foo4</a>>>></span></code> </td>" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html", "<caption><span>Methods in <a href=\"../../pkg2/" + @@ -553,8 +553,8 @@ }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html", "<td class=\"colLast\"><span class=\"strong\">ClassUseTest3." + - "</span><code><strong><a href=\"../../pkg2/ClassUseTest3." + - "html#method(T)\">method</a></strong>(T t)</code>" + + "</span><code><span class=\"strong\"><a href=\"../../pkg2/ClassUseTest3." + + "html#method(T)\">method</a></span>(T t)</code>" + " </td>" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html", @@ -587,8 +587,8 @@ "</tr>" + NL + "<tbody>" + NL + "<tr class=\"altColor\">" + NL + "<td class=\"colFirst\"><code>void</code></td>" + NL + "<td class=\"colLast\"><span class=\"strong\">ClassUseTest3." + - "</span><code><strong><a href=\"../../pkg2/ClassUseTest3." + - "html#method(java.util.Set)\">method</a></strong>(java." + + "</span><code><span class=\"strong\"><a href=\"../../pkg2/ClassUseTest3." + + "html#method(java.util.Set)\">method</a></span>(java." + "util.Set<<a href=\"../../pkg2/Foo4.html\" title=\"" + "class in pkg2\">Foo4</a>> p)</code> </td>" + NL + "</tr>" + NL + "</tbody>" @@ -698,25 +698,25 @@ {BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html", "<a href=\"../pkg/AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</a>(<a href=\"../pkg/AnnotationType.html#optional\">optional</a>=\"Class Annotation\"," + NL + " <a href=\"../pkg/AnnotationType.html#required\">required</a>=1994)" + NL + - "public class <strong>AnnotationTypeUsage</strong></dt><dt>extends java.lang.Object</dt>"}, + "public class <span class=\"strong\">AnnotationTypeUsage</span></dt><dt>extends java.lang.Object</dt>"}, //FIELD {BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html", "<a href=\"../pkg/AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</a>(<a href=\"../pkg/AnnotationType.html#optional\">optional</a>=\"Field Annotation\"," + NL + " <a href=\"../pkg/AnnotationType.html#required\">required</a>=1994)" + NL + - "public int <strong>field</strong>"}, + "public int <span class=\"strong\">field</span>"}, //CONSTRUCTOR {BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html", "<a href=\"../pkg/AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</a>(<a href=\"../pkg/AnnotationType.html#optional\">optional</a>=\"Constructor Annotation\"," + NL + " <a href=\"../pkg/AnnotationType.html#required\">required</a>=1994)" + NL + - "public <strong>AnnotationTypeUsage</strong>()"}, + "public <span class=\"strong\">AnnotationTypeUsage</span>()"}, //METHOD {BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html", "<a href=\"../pkg/AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</a>(<a href=\"../pkg/AnnotationType.html#optional\">optional</a>=\"Method Annotation\"," + NL + " <a href=\"../pkg/AnnotationType.html#required\">required</a>=1994)" + NL + - "public void <strong>method</strong>()"}, + "public void <span class=\"strong\">method</span>()"}, //================================= // Make sure annotation types do not
--- a/test/com/sun/javadoc/testOverridenMethods/TestOverridenMethodDocCopy.java Wed Aug 07 11:04:07 2013 +0100 +++ b/test/com/sun/javadoc/testOverridenMethods/TestOverridenMethodDocCopy.java Wed Aug 07 15:00:24 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -46,9 +46,9 @@ //Input for string search tests. private static final String[][] TEST = { {BUG_ID + FS + "pkg1" + FS + "SubClass.html", - "<strong>Description copied from class: <code>" + + "<span class=\"strong\">Description copied from class: <code>" + "<a href=\"../pkg1/BaseClass.html#overridenMethodWithDocsToCopy()\">" + - "BaseClass</a></code></strong>" + "BaseClass</a></code></span>" } }; private static final String[][] NEGATED_TEST = NO_TEST;
--- a/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethods.java Wed Aug 07 11:04:07 2013 +0100 +++ b/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethods.java Wed Aug 07 15:00:24 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -40,12 +40,12 @@ private static final String[][] TEST = { //The public method should be overriden {BUG_ID + FS + "pkg1" + FS + "SubClass.html", - "<dt><strong>Overrides:</strong></dt>" + NL + + "<dt><span class=\"strong\">Overrides:</span></dt>" + NL + "<dd><code><a href=\"../pkg1/BaseClass.html#publicMethod"}, //The public method in different package should be overriden {BUG_ID + FS + "pkg2" + FS + "SubClass.html", - "<dt><strong>Overrides:</strong></dt>" + NL + + "<dt><span class=\"strong\">Overrides:</span></dt>" + NL + "<dd><code><a href=\"../pkg1/BaseClass.html#publicMethod"} }; @@ -54,23 +54,23 @@ //The package private method should be overriden since the base and sub class are in the same //package. However, the link should not show up because the package private methods are not documented. {BUG_ID + FS + "pkg1" + FS + "SubClass.html", - "<dt><strong>Overrides:</strong></dt>" + NL + + "<dt><span class=\"strong\">Overrides:</span></dt>" + NL + "<dd><code><a href=\"../pkg1/BaseClass.html#packagePrivateMethod"}, //The private method in should not be overriden {BUG_ID + FS + "pkg1" + FS + "SubClass.html", - "<dt><strong>Overrides:</strong></dt>" + NL + + "<dt><span class=\"strong\">Overrides:</span></dt>" + NL + "<dd><code><a href=\"../pkg1/BaseClass.html#privateMethod"}, //The private method in different package should not be overriden {BUG_ID + FS + "pkg2" + FS + "SubClass.html", - "<dt><strong>Overrides:</strong></dt>" + NL + + "<dt><span class=\"strong\">Overrides:</span></dt>" + NL + "<dd><code><a href=\"../pkg1/BaseClass.html#privateMethod"}, //The package private method should not be overriden since the base and sub class are in //different packages. {BUG_ID + FS + "pkg2" + FS + "SubClass.html", - "Overrides:</strong></dt><dd><code><a href=\"../pkg1/BaseClass.html#packagePrivateMethod"} + "Overrides:</span></dt><dd><code><a href=\"../pkg1/BaseClass.html#packagePrivateMethod"} }; private static final String[] ARGS =
--- a/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPackageFlag.java Wed Aug 07 11:04:07 2013 +0100 +++ b/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPackageFlag.java Wed Aug 07 15:00:24 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -40,14 +40,14 @@ private static final String[][] TEST = { //The public method should be overriden {BUG_ID + FS + "pkg1" + FS + "SubClass.html", - "<dt><strong>Overrides:</strong></dt>" + NL + + "<dt><span class=\"strong\">Overrides:</span></dt>" + NL + "<dd><code><a href=\"../pkg1/BaseClass.html#publicMethod()\">" + "publicMethod</a></code> in class <code>" + "<a href=\"../pkg1/BaseClass.html\" title=\"class in pkg1\">BaseClass</a></code></dd>"}, //The public method in different package should be overriden {BUG_ID + FS + "pkg2" + FS + "SubClass.html", - "<dt><strong>Overrides:</strong></dt>" + NL + + "<dt><span class=\"strong\">Overrides:</span></dt>" + NL + "<dd><code><a href=\"../pkg1/BaseClass.html#publicMethod()\">" + "publicMethod</a></code> in class <code>" + "<a href=\"../pkg1/BaseClass.html\" title=\"class in pkg1\">BaseClass</a></code></dd>"}, @@ -55,7 +55,7 @@ //The package private method should be overriden since the base and sub class are in the same //package. {BUG_ID + FS + "pkg1" + FS + "SubClass.html", - "<dt><strong>Overrides:</strong></dt>" + NL + + "<dt><span class=\"strong\">Overrides:</span></dt>" + NL + "<dd><code><a href=\"../pkg1/BaseClass.html#packagePrivateMethod()\">" + "packagePrivateMethod</a></code> in class <code>" + "<a href=\"../pkg1/BaseClass.html\" title=\"class in pkg1\">BaseClass</a></code></dd>"} @@ -65,18 +65,18 @@ //The private method in should not be overriden {BUG_ID + FS + "pkg1" + FS + "SubClass.html", - "<dt><strong>Overrides:</strong></dt>" + NL + + "<dt><span class=\"strong\">Overrides:</span></dt>" + NL + "<dd><code><a href=\"../pkg1/BaseClass.html#privateMethod()\">"}, //The private method in different package should not be overriden {BUG_ID + FS + "pkg2" + FS + "SubClass.html", - "<dt><strong>Overrides:</strong></dt>" + NL + + "<dt><span class=\"strong\">Overrides:</span></dt>" + NL + "<dd><code><a href=\"../pkg1/BaseClass.html#privateMethod()\">"}, //The package private method should not be overriden since the base and sub class are in //different packages. {BUG_ID + FS + "pkg2" + FS + "SubClass.html", - "<dt><strong>Overrides:</strong></dt>" + NL + + "<dt><span class=\"strong\">Overrides:</span></dt>" + NL + "<dd><code><a href=\"../pkg1/BaseClass.html#packagePrivateMethod()\">"}, };
--- a/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPrivateFlag.java Wed Aug 07 11:04:07 2013 +0100 +++ b/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPrivateFlag.java Wed Aug 07 15:00:24 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -40,18 +40,18 @@ private static final String[][] TEST = { //The public method should be overriden {BUG_ID + FS + "pkg1" + FS + "SubClass.html", - "<dt><strong>Overrides:</strong></dt>" + NL + + "<dt><span class=\"strong\">Overrides:</span></dt>" + NL + "<dd><code><a href=\"../pkg1/BaseClass.html#publicMethod"}, //The package private method should be overriden since the base and sub class are in the same //package. {BUG_ID + FS + "pkg1" + FS + "SubClass.html", - "<dt><strong>Overrides:</strong></dt>" + NL + + "<dt><span class=\"strong\">Overrides:</span></dt>" + NL + "<dd><code><a href=\"../pkg1/BaseClass.html#packagePrivateMethod"}, //The public method in different package should be overriden {BUG_ID + FS + "pkg2" + FS + "SubClass.html", - "<dt><strong>Overrides:</strong></dt>" + NL + + "<dt><span class=\"strong\">Overrides:</span></dt>" + NL + "<dd><code><a href=\"../pkg1/BaseClass.html#publicMethod"}, }; @@ -59,18 +59,18 @@ //The private method in should not be overriden {BUG_ID + FS + "pkg1" + FS + "SubClass.html", - "<dt><strong>Overrides:</strong></dt>" + NL + + "<dt><span class=\"strong\">Overrides:</span></dt>" + NL + "<dd><code><a href=\"../pkg1/BaseClass.html#privateMethod"}, //The private method in different package should not be overriden {BUG_ID + FS + "pkg2" + FS + "SubClass.html", - "<dt><strong>Overrides:</strong></dt>" + NL + + "<dt><span class=\"strong\">Overrides:</span></dt>" + NL + "<dd><code><a href=\"../pkg1/BaseClass.html#privateMethod"}, //The package private method should not be overriden since the base and sub class are in //different packages. {BUG_ID + FS + "pkg2" + FS + "SubClass.html", - "<dt><strong>Overrides:</strong></dt>" + NL + + "<dt><span class=\"strong\">Overrides:</span></dt>" + NL + "<dd><code><a href=\"../pkg1/BaseClass.html#packagePrivateMethod"}
--- a/test/com/sun/javadoc/testPackageDeprecation/TestPackageDeprecation.java Wed Aug 07 11:04:07 2013 +0100 +++ b/test/com/sun/javadoc/testPackageDeprecation/TestPackageDeprecation.java Wed Aug 07 15:00:24 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -50,7 +50,8 @@ private static final String[][] TEST1 = { {BUG_ID + "-1" + FS + "pkg1" + FS + "package-summary.html", "<div class=\"deprecatedContent\"><span class=\"strong\">Deprecated.</span>" + NL + - "<div class=\"block\"><i>This package is Deprecated.</i></div>" + "<div class=\"block\"><span class=\"italic\">This package is Deprecated." + + "</span></div>" }, {BUG_ID + "-1" + FS + "deprecated-list.html", "<li><a href=\"#package\">Deprecated Packages</a></li>"
--- a/test/com/sun/javadoc/testPrivateClasses/TestPrivateClasses.java Wed Aug 07 11:04:07 2013 +0100 +++ b/test/com/sun/javadoc/testPrivateClasses/TestPrivateClasses.java Wed Aug 07 15:00:24 2013 -0700 @@ -112,12 +112,12 @@ private static final String[][] NEGATED_TEST1 = { // Should not document that a method overrides method from private class. {BUG_ID + "-1" + FS + "pkg" + FS + "PublicChild.html", - "<strong>Overrides:</strong>"}, + "<span class=\"strong\">Overrides:</span>"}, // Should not document that a method specified by private interface. {BUG_ID + "-1" + FS + "pkg" + FS + "PublicChild.html", - "<strong>Specified by:</strong>"}, + "<span class=\"strong\">Specified by:</span>"}, {BUG_ID + "-1" + FS + "pkg" + FS + "PublicInterface.html", - "<strong>Specified by:</strong>"}, + "<span class=\"strong\">Specified by:</span>"}, // Should not mention that any documentation was copied. {BUG_ID + "-1" + FS + "pkg" + FS + "PublicChild.html", "Description copied from"}, @@ -139,7 +139,7 @@ //Do not inherit private interface method with generic parameters. //This method has been implemented. {BUG_ID + "-1" + FS + "pkg2" + FS + "C.html", - "<strong><a href=\"../pkg2/I.html#hello(T)\">hello</a></strong>"}, + "<span class=\"strong\"><a href=\"../pkg2/I.html#hello(T)\">hello</a></span>"}, }; // Test output when -private flag is used. @@ -176,14 +176,14 @@ }, // Should document that a method overrides method from private class. {BUG_ID + "-2" + FS + "pkg" + FS + "PublicChild.html", - "<dt><strong>Overrides:</strong></dt>" + NL + + "<dt><span class=\"strong\">Overrides:</span></dt>" + NL + "<dd><code><a href=\"../pkg/PrivateParent.html#methodOverridenFromParent(char[], int, T, V, java.util.List)\">" + "methodOverridenFromParent</a></code> in class <code>" + "<a href=\"../pkg/PrivateParent.html\" title=\"class in pkg\">" + "PrivateParent</a></code></dd>"}, // Should document that a method is specified by private interface. {BUG_ID + "-2" + FS + "pkg" + FS + "PublicChild.html", - "<dt><strong>Specified by:</strong></dt>" + NL + + "<dt><span class=\"strong\">Specified by:</span></dt>" + NL + "<dd><code><a href=\"../pkg/PrivateInterface.html#methodInterface(int)\">" + "methodInterface</a></code> in interface <code>" + "<a href=\"../pkg/PrivateInterface.html\" title=\"interface in pkg\">" + @@ -227,11 +227,11 @@ //Since private flag is used, we can document that private interface method //with generic parameters has been implemented. {BUG_ID + "-2" + FS + "pkg2" + FS + "C.html", - "<strong>Description copied from interface: <code>" + - "<a href=\"../pkg2/I.html#hello(T)\">I</a></code></strong>"}, + "<span class=\"strong\">Description copied from interface: <code>" + + "<a href=\"../pkg2/I.html#hello(T)\">I</a></code></span>"}, {BUG_ID + "-2" + FS + "pkg2" + FS + "C.html", - "<dt><strong>Specified by:</strong></dt>" + NL + + "<dt><span class=\"strong\">Specified by:</span></dt>" + NL + "<dd><code><a href=\"../pkg2/I.html#hello(T)\">hello</a></code>" + " in interface <code>" + "<a href=\"../pkg2/I.html\" title=\"interface in pkg2\">I</a>" +
--- a/test/com/sun/javadoc/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java Wed Aug 07 11:04:07 2013 +0100 +++ b/test/com/sun/javadoc/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java Wed Aug 07 15:00:24 2013 -0700 @@ -47,9 +47,9 @@ "</dt>" + NL + "<dd><a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + "<code>C1.setUndecorated(boolean)</code></a></dd>" + NL + "</dl>"}, {BUG_ID + FS + "serialized-form.html", "<span class=\"strong\">Deprecated.</span>" + - " <i>As of JDK version 1.5, replaced by" + NL + + " <span class=\"italic\">As of JDK version 1.5, replaced by" + NL + " <a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + - "<code>setUndecorated(boolean)</code></a>.</i></div>" + NL + + "<code>setUndecorated(boolean)</code></a>.</span></div>" + NL + "<div class=\"block\">This field indicates whether the C1 " + "is undecorated.</div>" + NL + " " + NL + "<dl>" + NL + "<dt><span class=\"strong\">Since:</span></dt>" + NL + @@ -57,9 +57,9 @@ "</dt>" + NL + "<dd><a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + "<code>C1.setUndecorated(boolean)</code></a></dd>" + NL + "</dl>"}, {BUG_ID + FS + "serialized-form.html", "<span class=\"strong\">Deprecated.</span>" + - " <i>As of JDK version 1.5, replaced by" + NL + + " <span class=\"italic\">As of JDK version 1.5, replaced by" + NL + " <a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + - "<code>setUndecorated(boolean)</code></a>.</i></div>" + NL + + "<code>setUndecorated(boolean)</code></a>.</span></div>" + NL + "<div class=\"block\">Reads the object stream.</div>" + NL + "<dl>" + NL + "<dt><span class=\"strong\">Throws:</span></dt>" + NL + "<dd><code><code>" + "IOException</code></code></dd>" + NL + @@ -73,15 +73,15 @@ // information if any. private static final String[][] TEST_NOCMNT = { {BUG_ID + FS + "serialized-form.html", "<pre>boolean undecorated</pre>" + NL + - "<div class=\"block\"><span class=\"strong\">Deprecated.</span> <i>" + + "<div class=\"block\"><span class=\"strong\">Deprecated.</span> <span class=\"italic\">" + "As of JDK version 1.5, replaced by" + NL + " <a href=\"pkg1/C1.html#setUndecorated(boolean)\"><code>" + - "setUndecorated(boolean)</code></a>.</i></div>" + NL + "</li>"}, + "setUndecorated(boolean)</code></a>.</span></div>" + NL + "</li>"}, {BUG_ID + FS + "serialized-form.html", "<span class=\"strong\">" + - "Deprecated.</span> <i>As of JDK version" + + "Deprecated.</span> <span class=\"italic\">As of JDK version" + " 1.5, replaced by" + NL + " <a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + - "<code>setUndecorated(boolean)</code></a>.</i></div>" + NL + "</li>"}}; + "<code>setUndecorated(boolean)</code></a>.</span></div>" + NL + "</li>"}}; // Test with -nodeprecated option. The serialized-form.html should // ignore the -nodeprecated tag and display the deprecation info. This