diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java index 0468a8e9134..9c20777e137 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java @@ -101,7 +101,7 @@ public abstract class AbstractExecutableMemberWriter extends AbstractMemberWrite 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); diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java index 6583b891809..a2fa33b68a5 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java @@ -225,7 +225,7 @@ public class AnnotationTypeRequiredMemberWriterImpl extends AbstractMemberWriter */ 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); diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java index df4b5ea1ef8..88e1441b7ed 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java @@ -262,7 +262,7 @@ public class AnnotationTypeWriterImpl extends SubWriterHolderWriter 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(); diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java index 47e9346a072..b98739c9390 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java @@ -547,7 +547,7 @@ public class ClassWriterImpl extends SubWriterHolderWriter 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(); diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/EnumConstantWriterImpl.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/EnumConstantWriterImpl.java index 9643e878117..382f16f1f00 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/EnumConstantWriterImpl.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/EnumConstantWriterImpl.java @@ -222,7 +222,7 @@ public class EnumConstantWriterImpl extends AbstractMemberWriter */ 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); diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/FieldWriterImpl.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/FieldWriterImpl.java index 4f1dbbd9bff..f599ac2ff6b 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/FieldWriterImpl.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/FieldWriterImpl.java @@ -139,7 +139,7 @@ public class FieldWriterImpl extends AbstractMemberWriter 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 @@ public class FieldWriterImpl extends AbstractMemberWriter */ 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); diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java index cde30f30d32..bfd7955ebbb 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java @@ -1029,7 +1029,7 @@ public class HtmlDocletWriter extends HtmlDocWriter { 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 @@ public class HtmlDocletWriter extends HtmlDocWriter { 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); } diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java index 235c913b913..bb67b99c200 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java @@ -159,7 +159,7 @@ public class MethodWriterImpl extends AbstractExecutableMemberWriter 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 @@ public class MethodWriterImpl extends AbstractExecutableMemberWriter 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 @@ public class MethodWriterImpl extends AbstractExecutableMemberWriter 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, diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/NestedClassWriterImpl.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/NestedClassWriterImpl.java index 487d9ff101a..d44dd25feb0 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/NestedClassWriterImpl.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/NestedClassWriterImpl.java @@ -164,7 +164,7 @@ public class NestedClassWriterImpl extends AbstractMemberWriter */ 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); diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java index cdd88372250..26d3a8f0b4c 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java @@ -183,7 +183,7 @@ public class PackageFrameWriter extends HtmlDocletWriter { 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); diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ProfilePackageFrameWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ProfilePackageFrameWriter.java index ef8c0fbbc5f..38b7b1cee32 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ProfilePackageFrameWriter.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ProfilePackageFrameWriter.java @@ -174,7 +174,7 @@ public class ProfilePackageFrameWriter extends HtmlDocletWriter { 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); diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PropertyWriterImpl.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PropertyWriterImpl.java index 9018b77ece6..838732b5212 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PropertyWriterImpl.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PropertyWriterImpl.java @@ -135,7 +135,7 @@ public class PropertyWriterImpl extends AbstractMemberWriter 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 @@ public class PropertyWriterImpl extends AbstractMemberWriter */ 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); diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SubWriterHolderWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SubWriterHolderWriter.java index 94bde2e35ec..ce6a0fd053d 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SubWriterHolderWriter.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SubWriterHolderWriter.java @@ -175,7 +175,7 @@ public abstract class SubWriterHolderWriter extends HtmlDocletWriter { 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 @@ public abstract class SubWriterHolderWriter extends HtmlDocletWriter { } 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); diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java index fc63f4f8654..95e9a74ed78 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java @@ -118,7 +118,7 @@ public class TagletWriterImpl extends TagletWriter { 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())) { diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlStyle.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlStyle.java index a1719bbe8cf..c20ac4c5d5f 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlStyle.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlStyle.java @@ -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 @@ public enum HtmlStyle { indexContainer, indexHeader, inheritance, + italic, legalCopy, nameValue, navBarCell1Rev, diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java index e6c101a5d4b..ab4fdd8e474 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java @@ -415,17 +415,6 @@ public class HtmlTree extends Content { return htmltree; } - /** - * 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. * @@ -558,17 +547,6 @@ public class HtmlTree extends Content { return htmltree; } - /** - * 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. * diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css index 6634d8aedfe..18e062a8b27 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css @@ -519,3 +519,6 @@ h1.hidden { .strong { font-weight:bold; } +.italic { + font-style:italic; +} diff --git a/langtools/test/com/sun/javadoc/testClassCrossReferences/TestClassCrossReferences.java b/langtools/test/com/sun/javadoc/testClassCrossReferences/TestClassCrossReferences.java index d3f9bf3f954..048f2186df5 100644 --- a/langtools/test/com/sun/javadoc/testClassCrossReferences/TestClassCrossReferences.java +++ b/langtools/test/com/sun/javadoc/testClassCrossReferences/TestClassCrossReferences.java @@ -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 @@ public class TestClassCrossReferences extends JavadocTester { "Link to external member gcd"}, {BUG_ID + FS + "C.html", - "
" + NL + "
Overrides:
" + NL + + "
" + NL + "
Overrides:
" + NL + "
toString in class java.lang.Object
" + NL + "
"} }; diff --git a/langtools/test/com/sun/javadoc/testExternalOverridenMethod/TestExternalOverridenMethod.java b/langtools/test/com/sun/javadoc/testExternalOverridenMethod/TestExternalOverridenMethod.java index c3fe082ddad..78921d49d27 100644 --- a/langtools/test/com/sun/javadoc/testExternalOverridenMethod/TestExternalOverridenMethod.java +++ b/langtools/test/com/sun/javadoc/testExternalOverridenMethod/TestExternalOverridenMethod.java @@ -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 @@ public class TestExternalOverridenMethod extends JavadocTester { private static final String BUG_ID = "4857717"; private static final String[][] TEST = { {BUG_ID + FS + "pkg" + FS + "XReader.html", - "
Overrides:
" + NL + + "
Overrides:
" + NL + "
read in class " + "FilterReader
"}, {BUG_ID + FS + "pkg" + FS + "XReader.html", - "
Specified by:
" + NL + + "
Specified by:
" + NL + "
readInt in interface " + "" + NL + "
" + "C1.setUndecorated(boolean)
" + NL + "
"}, {BUG_ID + FS + "serialized-form.html", "Deprecated." + - " As of JDK version 1.5, replaced by" + NL + + " As of JDK version 1.5, replaced by" + NL + " " + - "setUndecorated(boolean)." + NL + + "setUndecorated(boolean)." + NL + "
This field indicates whether the C1 is " + "undecorated.
" + NL + " " + NL + "
" + NL + "
Since:
" + NL + "
1.4
" + NL + "
See Also:" + "
" + NL + "
" + "C1.setUndecorated(boolean)
" + NL + "
"}, {BUG_ID + FS + "serialized-form.html", "Deprecated." + - " As of JDK version 1.5, replaced by" + NL + + " As of JDK version 1.5, replaced by" + NL + " " + - "setUndecorated(boolean)." + NL + + "setUndecorated(boolean)." + NL + "
Reads the object stream.
" + NL + "
" + NL + "
Throws:" + "
" + NL + "
" + @@ -153,18 +153,18 @@ public class TestHtmlDefinitionListTag extends JavadocTester { "" + NL + "
" + "C1.setUndecorated(boolean)
" + NL + "
"}, {BUG_ID + FS + "serialized-form.html", "Deprecated." + - " As of JDK version 1.5, replaced by" + NL + + " As of JDK version 1.5, replaced by" + NL + " " + - "setUndecorated(boolean)." + NL + + "setUndecorated(boolean)." + NL + "
This field indicates whether the C1 is " + "undecorated.
" + NL + " " + NL + "
" + NL + "
Since:
" + NL + "
1.4
" + NL + "
See Also:" + "
" + NL + "
" + "C1.setUndecorated(boolean)
" + NL + "
"}, {BUG_ID + FS + "serialized-form.html", "Deprecated." + - " As of JDK version 1.5, replaced by" + NL + + " As of JDK version 1.5, replaced by" + NL + " " + - "setUndecorated(boolean)." + NL + + "setUndecorated(boolean)." + NL + "
Reads the object stream.
" + NL + "
" + NL + "
Throws:" + "
" + NL + "
" + @@ -187,14 +187,14 @@ public class TestHtmlDefinitionListTag extends JavadocTester { "APPLICATION_EXCLUDE" + NL + ""}, {BUG_ID + FS + "serialized-form.html", "
boolean " +
                  "undecorated
" + NL + "
" + - "Deprecated. As of JDK version 1.5, replaced by" + NL + + "Deprecated. As of JDK version 1.5, replaced by" + NL + " " + - "setUndecorated(boolean).
" + NL + ""}, + "setUndecorated(boolean)." + NL + ""}, {BUG_ID + FS + "serialized-form.html", "" + - "Deprecated. As of JDK version" + + "Deprecated. As of JDK version" + " 1.5, replaced by" + NL + " " + - "setUndecorated(boolean)." + NL + ""}}; + "setUndecorated(boolean)." + NL + ""}}; // Test for valid HTML generation which should not comprise of empty // definition list tags. diff --git a/langtools/test/com/sun/javadoc/testInterface/TestInterface.java b/langtools/test/com/sun/javadoc/testInterface/TestInterface.java index d0f1afc2bf3..cfaff523fde 100644 --- a/langtools/test/com/sun/javadoc/testInterface/TestInterface.java +++ b/langtools/test/com/sun/javadoc/testInterface/TestInterface.java @@ -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 @@ public class TestInterface extends JavadocTester { }, //Make sure "Specified By" has substituted type parameters. {BUG_ID + FS + "pkg" + FS + "Child.html", - "
Specified by:
" + NL + + "
Specified by:
" + NL + "
method" + " in interface " + "" + @@ -92,7 +92,7 @@ public class TestInterface extends JavadocTester { }, //Make sure "Overrides" has substituted type parameters. {BUG_ID + FS + "pkg" + FS + "Child.html", - "
Overrides:
" + NL + + "
Overrides:
" + NL + "
method" + " in class Parent<Gets the value of the property rate." + NL + "
" + NL + "
Property description:
" }, {"./" + BUG_ID + "/C.html", - "rate" + NL + + "rate" + NL + "
Defines the direction/speed at which the Timeline is expected to"}, {"./" + BUG_ID + "/C.html", @@ -63,7 +63,7 @@ public class TestJavaFX extends JavadocTester { {"./" + BUG_ID + "/C.html", "Property description:"}, {"./" + BUG_ID + "/C.html", - "setTestMethodProperty() " }, + "setTestMethodProperty() " }, {"./" + BUG_ID + "/C.html", "

isPaused

" + NL + "
public final double isPaused()
" + NL + diff --git a/langtools/test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java b/langtools/test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java index 47873bc3433..4d90d8791fb 100644 --- a/langtools/test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java +++ b/langtools/test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java @@ -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 @@ public class TestMemberInheritence extends JavadocTester { // Test overriding/implementing methods with generic parameters. {BUG_ID + FS + "pkg" + FS + "BaseClass.html", - "
" + NL + "
Specified by:
" + NL + + "
" + NL + "
Specified by:
" + NL + "
" + "getAnnotation in interface " + "" + diff --git a/langtools/test/com/sun/javadoc/testMemberSummary/TestMemberSummary.java b/langtools/test/com/sun/javadoc/testMemberSummary/TestMemberSummary.java index e30f579d4fe..fdbb664deff 100644 --- a/langtools/test/com/sun/javadoc/testMemberSummary/TestMemberSummary.java +++ b/langtools/test/com/sun/javadoc/testMemberSummary/TestMemberSummary.java @@ -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 @@ public class TestMemberSummary extends JavadocTester { // Check return type in member summary. {BUG_ID + FS + "pkg" + FS + "PublicChild.html", "PublicChild" + NL + - "" + - "returnTypeTest()" + "" + + "returnTypeTest()" }, // Check return type in member detail. {BUG_ID + FS + "pkg" + FS + "PublicChild.html", diff --git a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java b/langtools/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java index db5c2f24e0f..e16fd5450f2 100644 --- a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java +++ b/langtools/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java @@ -62,7 +62,7 @@ public class TestNewLanguageFeatures extends JavadocTester { " "}, //Detail for enum constant {BUG_ID + FS + "pkg" + FS + "Coin.html", - "Dime"}, + "Dime"}, //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 @@ public class TestNewLanguageFeatures extends JavadocTester { "Foo " }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html", - "ClassUseTest1<T extends " + "Foo" + " & " + - "Foo2> " + "Foo2> " }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html", "Methods in ClassUseTest1." + - "method" + + "method" + "(T t) " }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html", @@ -372,11 +372,11 @@ public class TestNewLanguageFeatures extends JavadocTester { "" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo2.html", - "ClassUseTest1<T extends " + "Foo" + " & " + - "Foo2> " + "Foo2> " }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo2.html", "Methods in " + - "ClassUseTest1.method" + + "ClassUseTest1.method" + "(T t) " }, @@ -401,11 +401,11 @@ public class TestNewLanguageFeatures extends JavadocTester { " " }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html", - "ClassUseTest2<T extends " + "" + "ParamTest<" + - "Foo3>> " + "Foo3>> " }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html", "Methods in ClassUseTest2." + - "method" + + "method" + "(T t) " }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html", @@ -456,11 +456,11 @@ public class TestNewLanguageFeatures extends JavadocTester { "Foo3 " }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html", - "ClassUseTest2<T extends " + "" + "ParamTest<" + - "Foo3>> " + "Foo3>> " }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html", "Methods in ClassUseTest2." + - "method" + + "method" + "(T t) " }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html", @@ -500,12 +500,12 @@ public class TestNewLanguageFeatures extends JavadocTester { " " }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html", - "ClassUseTest3<T extends " + "" + "ParamTest2<java.util.List<? extends " + "" + - "Foo4>>> " + "Foo4>>> " }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html", "Methods in ClassUseTest3" + - ".method(T t) " + ".method(T t) " }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html", "<T extends " }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html", - "ClassUseTest3<T extends " + "" + "ParamTest2<java.util.List<? extends " + "" + - "Foo4>>> " + "Foo4>>> " }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html", "Methods in ClassUseTest3." + - "method(T t)" + + "method(T t)" + " " }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html", @@ -587,8 +587,8 @@ public class TestNewLanguageFeatures extends JavadocTester { "" + NL + "" + NL + "" + NL + "void" + NL + "ClassUseTest3." + - "method(java." + + "method(java." + "util.Set<Foo4> p) " + NL + "" + NL + "" @@ -698,25 +698,25 @@ public class TestNewLanguageFeatures extends JavadocTester { {BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html", "@AnnotationTypeUndocumented(optional=\"Class Annotation\"," + NL + " required=1994)" + NL + - "public class AnnotationTypeUsage
extends java.lang.Object
"}, + "public class AnnotationTypeUsage
extends java.lang.Object
"}, //FIELD {BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html", "@AnnotationTypeUndocumented(optional=\"Field Annotation\"," + NL + " required=1994)" + NL + - "public int field"}, + "public int field"}, //CONSTRUCTOR {BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html", "@AnnotationTypeUndocumented(optional=\"Constructor Annotation\"," + NL + " required=1994)" + NL + - "public AnnotationTypeUsage()"}, + "public AnnotationTypeUsage()"}, //METHOD {BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html", "@AnnotationTypeUndocumented(optional=\"Method Annotation\"," + NL + " required=1994)" + NL + - "public void method()"}, + "public void method()"}, //================================= // Make sure annotation types do not diff --git a/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenMethodDocCopy.java b/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenMethodDocCopy.java index 7568b0a2516..68999480d44 100644 --- a/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenMethodDocCopy.java +++ b/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenMethodDocCopy.java @@ -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 @@ public class TestOverridenMethodDocCopy extends JavadocTester { //Input for string search tests. private static final String[][] TEST = { {BUG_ID + FS + "pkg1" + FS + "SubClass.html", - "Description copied from class: " + + "Description copied from class: " + "" + - "BaseClass" + "BaseClass" } }; private static final String[][] NEGATED_TEST = NO_TEST; diff --git a/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethods.java b/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethods.java index aa136d8be91..21a6760d308 100644 --- a/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethods.java +++ b/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethods.java @@ -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 @@ public class TestOverridenPrivateMethods extends JavadocTester { private static final String[][] TEST = { //The public method should be overriden {BUG_ID + FS + "pkg1" + FS + "SubClass.html", - "
Overrides:
" + NL + + "
Overrides:
" + NL + "
Overrides:" + NL + + "
Overrides:
" + NL + "
Overrides:" + NL + + "
Overrides:
" + NL + "
Overrides:" + NL + + "
Overrides:
" + NL + "
Overrides:" + NL + + "
Overrides:
" + NL + "
Overrides:" + NL + + "
Overrides:
" + NL + "
" + "publicMethod in class " + "BaseClass
"}, //The public method in different package should be overriden {BUG_ID + FS + "pkg2" + FS + "SubClass.html", - "
Overrides:
" + NL + + "
Overrides:
" + NL + "
" + "publicMethod in class " + "BaseClass
"}, @@ -55,7 +55,7 @@ public class TestOverridenPrivateMethodsWithPackageFlag extends JavadocTester { //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", - "
Overrides:
" + NL + + "
Overrides:
" + NL + "
" + "packagePrivateMethod in class " + "BaseClass
"} @@ -65,18 +65,18 @@ public class TestOverridenPrivateMethodsWithPackageFlag extends JavadocTester { //The private method in should not be overriden {BUG_ID + FS + "pkg1" + FS + "SubClass.html", - "
Overrides:
" + NL + + "
Overrides:
" + NL + "
"}, //The private method in different package should not be overriden {BUG_ID + FS + "pkg2" + FS + "SubClass.html", - "
Overrides:
" + NL + + "
Overrides:
" + NL + "
"}, //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:
" + NL + + "
Overrides:
" + NL + "
"}, }; diff --git a/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPrivateFlag.java b/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPrivateFlag.java index b8b5e7329c4..fbcd30e8b37 100644 --- a/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPrivateFlag.java +++ b/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPrivateFlag.java @@ -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 @@ public class TestOverridenPrivateMethodsWithPrivateFlag extends JavadocTester { private static final String[][] TEST = { //The public method should be overriden {BUG_ID + FS + "pkg1" + FS + "SubClass.html", - "
Overrides:
" + NL + + "
Overrides:
" + NL + "
Overrides:" + NL + + "
Overrides:
" + NL + "
Overrides:" + NL + + "
Overrides:
" + NL + "
Overrides:" + NL + + "
Overrides:
" + NL + "
Overrides:" + NL + + "
Overrides:
" + NL + "
Overrides:" + NL + + "
Overrides:
" + NL + "
Deprecated." + NL + - "
This package is Deprecated.
" + "
This package is Deprecated." + + "
" }, {BUG_ID + "-1" + FS + "deprecated-list.html", "
  • Deprecated Packages
    • " diff --git a/langtools/test/com/sun/javadoc/testPrivateClasses/TestPrivateClasses.java b/langtools/test/com/sun/javadoc/testPrivateClasses/TestPrivateClasses.java index 9ff91c2d5c9..b6ae263d8a4 100644 --- a/langtools/test/com/sun/javadoc/testPrivateClasses/TestPrivateClasses.java +++ b/langtools/test/com/sun/javadoc/testPrivateClasses/TestPrivateClasses.java @@ -112,12 +112,12 @@ public class TestPrivateClasses extends JavadocTester { 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", - "Overrides:"}, + "Overrides:"}, // Should not document that a method specified by private interface. {BUG_ID + "-1" + FS + "pkg" + FS + "PublicChild.html", - "Specified by:"}, + "Specified by:"}, {BUG_ID + "-1" + FS + "pkg" + FS + "PublicInterface.html", - "Specified by:"}, + "Specified by:"}, // Should not mention that any documentation was copied. {BUG_ID + "-1" + FS + "pkg" + FS + "PublicChild.html", "Description copied from"}, @@ -139,7 +139,7 @@ public class TestPrivateClasses extends JavadocTester { //Do not inherit private interface method with generic parameters. //This method has been implemented. {BUG_ID + "-1" + FS + "pkg2" + FS + "C.html", - "hello"}, + "hello"}, }; // Test output when -private flag is used. @@ -176,14 +176,14 @@ public class TestPrivateClasses extends JavadocTester { }, // Should document that a method overrides method from private class. {BUG_ID + "-2" + FS + "pkg" + FS + "PublicChild.html", - "
    Overrides:
    " + NL + + "
    Overrides:
    " + NL + "
    " + "methodOverridenFromParent in class " + "" + "PrivateParent
    "}, // Should document that a method is specified by private interface. {BUG_ID + "-2" + FS + "pkg" + FS + "PublicChild.html", - "
    Specified by:
    " + NL + + "
    Specified by:
    " + NL + "
    " + "methodInterface in interface " + "" + @@ -227,11 +227,11 @@ public class TestPrivateClasses extends JavadocTester { //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", - "Description copied from interface: " + - "I"}, + "Description copied from interface: " + + "I"}, {BUG_ID + "-2" + FS + "pkg2" + FS + "C.html", - "
    Specified by:
    " + NL + + "
    Specified by:
    " + NL + "
    hello" + " in interface " + "I" + diff --git a/langtools/test/com/sun/javadoc/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java b/langtools/test/com/sun/javadoc/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java index fd026b9ad49..760d24af458 100644 --- a/langtools/test/com/sun/javadoc/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java +++ b/langtools/test/com/sun/javadoc/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java @@ -47,9 +47,9 @@ public class TestSerializedFormDeprecationInfo extends JavadocTester { "" + NL + "
    " + "C1.setUndecorated(boolean)
    " + NL + "
    "}, {BUG_ID + FS + "serialized-form.html", "Deprecated." + - " As of JDK version 1.5, replaced by" + NL + + " As of JDK version 1.5, replaced by" + NL + " " + - "setUndecorated(boolean).
    " + NL + + "setUndecorated(boolean)." + NL + "
    This field indicates whether the C1 " + "is undecorated.
    " + NL + " " + NL + "
    " + NL + "
    Since:
    " + NL + @@ -57,9 +57,9 @@ public class TestSerializedFormDeprecationInfo extends JavadocTester { "" + NL + "
    " + "C1.setUndecorated(boolean)
    " + NL + "
    "}, {BUG_ID + FS + "serialized-form.html", "Deprecated." + - " As of JDK version 1.5, replaced by" + NL + + " As of JDK version 1.5, replaced by" + NL + " " + - "setUndecorated(boolean)." + NL + + "setUndecorated(boolean)." + NL + "
    Reads the object stream.
    " + NL + "
    " + NL + "
    Throws:
    " + NL + "
    " + "IOException
    " + NL + @@ -73,15 +73,15 @@ public class TestSerializedFormDeprecationInfo extends JavadocTester { // information if any. private static final String[][] TEST_NOCMNT = { {BUG_ID + FS + "serialized-form.html", "
    boolean undecorated
    " + NL + - "
    Deprecated. " + + "
    Deprecated. " + "As of JDK version 1.5, replaced by" + NL + " " + - "setUndecorated(boolean).
    " + NL + ""}, + "setUndecorated(boolean)    .
    " + NL + ""}, {BUG_ID + FS + "serialized-form.html", "" + - "Deprecated. As of JDK version" + + "Deprecated. As of JDK version" + " 1.5, replaced by" + NL + " " + - "setUndecorated(boolean)." + NL + ""}}; + "setUndecorated(boolean)." + NL + ""}}; // Test with -nodeprecated option. The serialized-form.html should // ignore the -nodeprecated tag and display the deprecation info. This