Mercurial > hg > openjdk > lambda > langtools
changeset 2562:130b8c0e570e
8026567: Use meaningful style names for strong and italic styles.
Reviewed-by: jjg
line wrap: on
line diff
--- a/src/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java Fri Oct 18 15:03:34 2013 -0700 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java Fri Oct 18 16:34:42 2013 -0700 @@ -101,10 +101,10 @@ Content tdSummary) { ExecutableMemberDoc emd = (ExecutableMemberDoc)member; String name = emd.name(); - Content strong = HtmlTree.SPAN(HtmlStyle.strong, + Content memberLink = HtmlTree.SPAN(HtmlStyle.memberNameLink, writer.getDocLink(context, cd, (MemberDoc) emd, name, false)); - Content code = HtmlTree.CODE(strong); + Content code = HtmlTree.CODE(memberLink); addParameters(emd, false, code, name.length() - 1); tdSummary.addContent(code); }
--- a/src/share/classes/com/sun/tools/doclets/formats/html/AbstractIndexWriter.java Fri Oct 18 15:03:34 2013 -0700 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AbstractIndexWriter.java Fri Oct 18 16:34:42 2013 -0700 @@ -176,7 +176,7 @@ String name = (member instanceof ExecutableMemberDoc)? member.name() + ((ExecutableMemberDoc)member).flatSignature() : member.name(); - Content span = HtmlTree.SPAN(HtmlStyle.strong, + Content span = HtmlTree.SPAN(HtmlStyle.memberNameLink, getDocLink(LinkInfoImpl.Kind.INDEX, member, name)); Content dt = HtmlTree.DT(span); dt.addContent(" - "); @@ -198,7 +198,7 @@ */ protected void addComment(ProgramElementDoc element, Content contentTree) { Tag[] tags; - Content span = HtmlTree.SPAN(HtmlStyle.strong, deprecatedPhrase); + Content span = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, deprecatedPhrase); HtmlTree div = new HtmlTree(HtmlTag.DIV); div.addStyle(HtmlStyle.block); if (Util.isDeprecated(element)) {
--- a/src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java Fri Oct 18 15:03:34 2013 -0700 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java Fri Oct 18 16:34:42 2013 -0700 @@ -480,7 +480,7 @@ if (cd != null && !(pgmdoc instanceof ConstructorDoc) && !(pgmdoc instanceof ClassDoc)) { HtmlTree name = new HtmlTree(HtmlTag.SPAN); - name.addStyle(HtmlStyle.strong); + name.addStyle(HtmlStyle.typeNameLabel); name.addContent(cd.name() + "."); tdLast.addContent(name); }
--- a/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeFieldWriterImpl.java Fri Oct 18 15:03:34 2013 -0700 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeFieldWriterImpl.java Fri Oct 18 16:34:42 2013 -0700 @@ -237,9 +237,9 @@ */ protected void addSummaryLink(LinkInfoImpl.Kind context, ClassDoc cd, ProgramElementDoc member, Content tdSummary) { - Content strong = HtmlTree.SPAN(HtmlStyle.strong, + Content memberLink = HtmlTree.SPAN(HtmlStyle.memberNameLink, writer.getDocLink(context, (MemberDoc) member, member.name(), false)); - Content code = HtmlTree.CODE(strong); + Content code = HtmlTree.CODE(memberLink); tdSummary.addContent(code); }
--- a/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java Fri Oct 18 15:03:34 2013 -0700 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java Fri Oct 18 16:34:42 2013 -0700 @@ -239,9 +239,9 @@ */ protected void addSummaryLink(LinkInfoImpl.Kind context, ClassDoc cd, ProgramElementDoc member, Content tdSummary) { - Content strong = HtmlTree.SPAN(HtmlStyle.strong, + Content memberLink = HtmlTree.SPAN(HtmlStyle.memberNameLink, writer.getDocLink(context, (MemberDoc) member, member.name(), false)); - Content code = HtmlTree.CODE(strong); + Content code = HtmlTree.CODE(memberLink); tdSummary.addContent(code); }
--- a/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java Fri Oct 18 15:03:34 2013 -0700 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java Fri Oct 18 16:34:42 2013 -0700 @@ -227,7 +227,7 @@ addSrcLink(annotationType, annotationName, pre); pre.addContent(parameterLinks); } else { - Content span = HtmlTree.SPAN(HtmlStyle.strong, annotationName); + Content span = HtmlTree.SPAN(HtmlStyle.memberNameLabel, annotationName); span.addContent(parameterLinks); pre.addContent(span); } @@ -262,8 +262,8 @@ annotationInfoTree.addContent(hr); Tag[] deprs = annotationType.tags("deprecated"); if (Util.isDeprecated(annotationType)) { - Content strong = HtmlTree.SPAN(HtmlStyle.strong, deprecatedPhrase); - Content div = HtmlTree.DIV(HtmlStyle.block, strong); + Content deprLabel = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, deprecatedPhrase); + Content div = HtmlTree.DIV(HtmlStyle.block, deprLabel); if (deprs.length > 0) { Tag[] commentTags = deprs[0].inlineTags(); if (commentTags.length > 0) {
--- a/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java Fri Oct 18 15:03:34 2013 -0700 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java Fri Oct 18 16:34:42 2013 -0700 @@ -254,7 +254,7 @@ addSrcLink(classDoc, className, pre); pre.addContent(parameterLinks); } else { - Content span = HtmlTree.SPAN(HtmlStyle.strong, className); + Content span = HtmlTree.SPAN(HtmlStyle.typeNameLabel, className); span.addContent(parameterLinks); pre.addContent(span); } @@ -547,8 +547,8 @@ classInfoTree.addContent(hr); Tag[] deprs = classDoc.tags("deprecated"); if (Util.isDeprecated(classDoc)) { - Content strong = HtmlTree.SPAN(HtmlStyle.strong, deprecatedPhrase); - Content div = HtmlTree.DIV(HtmlStyle.block, strong); + Content deprLabel = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, deprecatedPhrase); + Content div = HtmlTree.DIV(HtmlStyle.block, deprLabel); if (deprs.length > 0) { Tag[] commentTags = deprs[0].inlineTags(); if (commentTags.length > 0) {
--- a/src/share/classes/com/sun/tools/doclets/formats/html/EnumConstantWriterImpl.java Fri Oct 18 15:03:34 2013 -0700 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/EnumConstantWriterImpl.java Fri Oct 18 16:34:42 2013 -0700 @@ -224,9 +224,9 @@ */ protected void addSummaryLink(LinkInfoImpl.Kind context, ClassDoc cd, ProgramElementDoc member, Content tdSummary) { - Content strong = HtmlTree.SPAN(HtmlStyle.strong, + Content memberLink = HtmlTree.SPAN(HtmlStyle.memberNameLink, writer.getDocLink(context, (MemberDoc) member, member.name(), false)); - Content code = HtmlTree.CODE(strong); + Content code = HtmlTree.CODE(memberLink); tdSummary.addContent(code); }
--- a/src/share/classes/com/sun/tools/doclets/formats/html/FieldWriterImpl.java Fri Oct 18 15:03:34 2013 -0700 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/FieldWriterImpl.java Fri Oct 18 16:34:42 2013 -0700 @@ -140,11 +140,11 @@ holder.typeName() : holder.qualifiedTypeName(), false); Content codeLink = HtmlTree.CODE(link); - Content strong = HtmlTree.SPAN(HtmlStyle.strong, holder.isClass()? + Content descfrmLabel = HtmlTree.SPAN(HtmlStyle.descfrmTypeLabel, holder.isClass()? writer.descfrmClassLabel : writer.descfrmInterfaceLabel); - strong.addContent(writer.getSpace()); - strong.addContent(codeLink); - fieldDocTree.addContent(HtmlTree.DIV(HtmlStyle.block, strong)); + descfrmLabel.addContent(writer.getSpace()); + descfrmLabel.addContent(codeLink); + fieldDocTree.addContent(HtmlTree.DIV(HtmlStyle.block, descfrmLabel)); writer.addInlineComment(field, fieldDocTree); } } @@ -258,9 +258,9 @@ */ protected void addSummaryLink(LinkInfoImpl.Kind context, ClassDoc cd, ProgramElementDoc member, Content tdSummary) { - Content strong = HtmlTree.SPAN(HtmlStyle.strong, + Content memberLink = HtmlTree.SPAN(HtmlStyle.memberNameLink, writer.getDocLink(context, cd , (MemberDoc) member, member.name(), false)); - Content code = HtmlTree.CODE(strong); + Content code = HtmlTree.CODE(memberLink); tdSummary.addContent(code); }
--- a/src/share/classes/com/sun/tools/doclets/formats/html/HelpWriter.java Fri Oct 18 15:03:34 2013 -0700 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/HelpWriter.java Fri Oct 18 16:34:42 2013 -0700 @@ -316,7 +316,7 @@ liConst.addContent(constPara); ul.addContent(liConst); Content divContent = HtmlTree.DIV(HtmlStyle.contentContainer, ul); - Content line30 = HtmlTree.SPAN(HtmlStyle.italic, getResource("doclet.Help_line_30")); + Content line30 = HtmlTree.SPAN(HtmlStyle.emphasizedPhrase, getResource("doclet.Help_line_30")); divContent.addContent(line30); contentTree.addContent(divContent); }
--- a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java Fri Oct 18 15:03:34 2013 -0700 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java Fri Oct 18 16:34:42 2013 -0700 @@ -1051,7 +1051,7 @@ public Content italicsClassName(ClassDoc cd, boolean qual) { Content name = new StringContent((qual)? cd.qualifiedName(): cd.name()); - return (cd.isInterface())? HtmlTree.SPAN(HtmlStyle.italic, name): name; + return (cd.isInterface())? HtmlTree.SPAN(HtmlStyle.interfaceName, name): name; } /** @@ -1567,7 +1567,7 @@ Content div; Content result = commentTagsToContent(null, doc, tags, first); if (depr) { - Content italic = HtmlTree.SPAN(HtmlStyle.italic, result); + Content italic = HtmlTree.SPAN(HtmlStyle.deprecationComment, result); div = HtmlTree.DIV(HtmlStyle.block, italic); htmltree.addContent(div); }
--- a/src/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java Fri Oct 18 15:03:34 2013 -0700 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java Fri Oct 18 16:34:42 2013 -0700 @@ -160,11 +160,11 @@ holder.typeName() : holder.qualifiedTypeName(), false); Content codelLink = HtmlTree.CODE(link); - Content strong = HtmlTree.SPAN(HtmlStyle.strong, holder.asClassDoc().isClass()? + Content descfrmLabel = HtmlTree.SPAN(HtmlStyle.descfrmTypeLabel, holder.asClassDoc().isClass()? writer.descfrmClassLabel : writer.descfrmInterfaceLabel); - strong.addContent(writer.getSpace()); - strong.addContent(codelLink); - methodDocTree.addContent(HtmlTree.DIV(HtmlStyle.block, strong)); + descfrmLabel.addContent(writer.getSpace()); + descfrmLabel.addContent(codelLink); + methodDocTree.addContent(HtmlTree.DIV(HtmlStyle.block, descfrmLabel)); writer.addInlineComment(method, methodDocTree); } } @@ -310,7 +310,7 @@ label = writer.specifiedByLabel; context = LinkInfoImpl.Kind.METHOD_SPECIFIED_BY; } - Content dt = HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.strong, label)); + Content dt = HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.overrideSpecifyLabel, label)); dl.addContent(dt); Content overriddenTypeLink = writer.getLink(new LinkInfoImpl(writer.configuration, context, overriddenType)); @@ -365,7 +365,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.SPAN(HtmlStyle.strong, writer.specifiedByLabel)); + Content dt = HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.overrideSpecifyLabel, 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 Fri Oct 18 15:03:34 2013 -0700 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/NestedClassWriterImpl.java Fri Oct 18 16:34:42 2013 -0700 @@ -166,9 +166,9 @@ */ protected void addSummaryLink(LinkInfoImpl.Kind context, ClassDoc cd, ProgramElementDoc member, Content tdSummary) { - Content strong = HtmlTree.SPAN(HtmlStyle.strong, + Content memberLink = HtmlTree.SPAN(HtmlStyle.memberNameLink, writer.getLink(new LinkInfoImpl(configuration, context, (ClassDoc)member))); - Content code = HtmlTree.CODE(strong); + Content code = HtmlTree.CODE(memberLink); tdSummary.addContent(code); }
--- a/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java Fri Oct 18 15:03:34 2013 -0700 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java Fri Oct 18 16:34:42 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.SPAN(HtmlStyle.italic, arr_i_name); + if (arr[i].isInterface()) arr_i_name = HtmlTree.SPAN(HtmlStyle.interfaceName, 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/PackageTreeWriter.java Fri Oct 18 15:03:34 2013 -0700 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/PackageTreeWriter.java Fri Oct 18 16:34:42 2013 -0700 @@ -155,7 +155,7 @@ * @param div the content tree to which the link will be added */ protected void addLinkToMainTree(Content div) { - Content span = HtmlTree.SPAN(HtmlStyle.strong, + Content span = HtmlTree.SPAN(HtmlStyle.packageHierarchyLabel, getResource("doclet.Package_Hierarchies")); div.addContent(span); HtmlTree ul = new HtmlTree (HtmlTag.UL);
--- a/src/share/classes/com/sun/tools/doclets/formats/html/PackageWriterImpl.java Fri Oct 18 15:03:34 2013 -0700 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/PackageWriterImpl.java Fri Oct 18 16:34:42 2013 -0700 @@ -141,7 +141,7 @@ if (Util.isDeprecated(packageDoc)) { HtmlTree deprDiv = new HtmlTree(HtmlTag.DIV); deprDiv.addStyle(HtmlStyle.deprecatedContent); - Content deprPhrase = HtmlTree.SPAN(HtmlStyle.strong, deprecatedPhrase); + Content deprPhrase = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, deprecatedPhrase); deprDiv.addContent(deprPhrase); if (deprs.length > 0) { Tag[] commentTags = deprs[0].inlineTags();
--- a/src/share/classes/com/sun/tools/doclets/formats/html/ProfilePackageFrameWriter.java Fri Oct 18 15:03:34 2013 -0700 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/ProfilePackageFrameWriter.java Fri Oct 18 16:34:42 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.SPAN(HtmlStyle.italic, arr_i_name); + if (arr[i].isInterface()) arr_i_name = HtmlTree.SPAN(HtmlStyle.interfaceName, 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/ProfilePackageWriterImpl.java Fri Oct 18 15:03:34 2013 -0700 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/ProfilePackageWriterImpl.java Fri Oct 18 16:34:42 2013 -0700 @@ -158,7 +158,7 @@ if (Util.isDeprecated(packageDoc)) { HtmlTree deprDiv = new HtmlTree(HtmlTag.DIV); deprDiv.addStyle(HtmlStyle.deprecatedContent); - Content deprPhrase = HtmlTree.SPAN(HtmlStyle.strong, deprecatedPhrase); + Content deprPhrase = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, deprecatedPhrase); deprDiv.addContent(deprPhrase); if (deprs.length > 0) { Tag[] commentTags = deprs[0].inlineTags();
--- a/src/share/classes/com/sun/tools/doclets/formats/html/ProfileWriterImpl.java Fri Oct 18 15:03:34 2013 -0700 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/ProfileWriterImpl.java Fri Oct 18 16:34:42 2013 -0700 @@ -187,7 +187,7 @@ deprs = pkg.tags("deprecated"); HtmlTree deprDiv = new HtmlTree(HtmlTag.DIV); deprDiv.addStyle(HtmlStyle.deprecatedContent); - Content deprPhrase = HtmlTree.SPAN(HtmlStyle.strong, deprecatedPhrase); + Content deprPhrase = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, deprecatedPhrase); deprDiv.addContent(deprPhrase); if (deprs.length > 0) { Tag[] commentTags = deprs[0].inlineTags();
--- a/src/share/classes/com/sun/tools/doclets/formats/html/PropertyWriterImpl.java Fri Oct 18 15:03:34 2013 -0700 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/PropertyWriterImpl.java Fri Oct 18 16:34:42 2013 -0700 @@ -136,11 +136,11 @@ holder.typeName() : holder.qualifiedTypeName(), false); Content codeLink = HtmlTree.CODE(link); - Content strong = HtmlTree.SPAN(HtmlStyle.strong, holder.isClass()? + Content descfrmLabel = HtmlTree.SPAN(HtmlStyle.descfrmTypeLabel, holder.isClass()? writer.descfrmClassLabel : writer.descfrmInterfaceLabel); - strong.addContent(writer.getSpace()); - strong.addContent(codeLink); - propertyDocTree.addContent(HtmlTree.DIV(HtmlStyle.block, strong)); + descfrmLabel.addContent(writer.getSpace()); + descfrmLabel.addContent(codeLink); + propertyDocTree.addContent(HtmlTree.DIV(HtmlStyle.block, descfrmLabel)); writer.addInlineComment(property, propertyDocTree); } } @@ -255,14 +255,14 @@ */ protected void addSummaryLink(LinkInfoImpl.Kind context, ClassDoc cd, ProgramElementDoc member, Content tdSummary) { - Content strong = HtmlTree.SPAN(HtmlStyle.strong, + Content memberLink = HtmlTree.SPAN(HtmlStyle.memberNameLink, writer.getDocLink(context, cd, (MemberDoc) member, member.name().substring(0, member.name().lastIndexOf("Property")), false, true)); - Content code = HtmlTree.CODE(strong); + Content code = HtmlTree.CODE(memberLink); tdSummary.addContent(code); }
--- a/src/share/classes/com/sun/tools/doclets/formats/html/SubWriterHolderWriter.java Fri Oct 18 15:03:34 2013 -0700 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/SubWriterHolderWriter.java Fri Oct 18 16:34:42 2013 -0700 @@ -175,8 +175,8 @@ Tag[] deprs = member.tags("deprecated"); Content div; if (Util.isDeprecated((ProgramElementDoc) member)) { - Content strong = HtmlTree.SPAN(HtmlStyle.strong, deprecatedPhrase); - div = HtmlTree.DIV(HtmlStyle.block, strong); + Content deprLabel = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, deprecatedPhrase); + div = HtmlTree.DIV(HtmlStyle.block, deprLabel); div.addContent(getSpace()); if (deprs.length > 0) { addInlineDeprecatedComment(member, deprs[0], div); @@ -186,8 +186,8 @@ } else { ClassDoc cd = ((ProgramElementDoc)member).containingClass(); if (cd != null && Util.isDeprecated(cd)) { - Content strong = HtmlTree.SPAN(HtmlStyle.strong, deprecatedPhrase); - div = HtmlTree.DIV(HtmlStyle.block, strong); + Content deprLabel = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, deprecatedPhrase); + div = HtmlTree.DIV(HtmlStyle.block, deprLabel); div.addContent(getSpace()); tdSummary.addContent(div); }
--- a/src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java Fri Oct 18 15:03:34 2013 -0700 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java Fri Oct 18 16:34:42 2013 -0700 @@ -97,7 +97,7 @@ Tag[] deprs = doc.tags("deprecated"); if (doc instanceof ClassDoc) { if (Util.isDeprecated((ProgramElementDoc) doc)) { - result.addContent(HtmlTree.SPAN(HtmlStyle.strong, + result.addContent(HtmlTree.SPAN(HtmlStyle.deprecatedLabel, new StringContent(configuration.getText("doclet.Deprecated")))); result.addContent(RawHtml.nbsp); if (deprs.length > 0) { @@ -112,18 +112,18 @@ } else { MemberDoc member = (MemberDoc) doc; if (Util.isDeprecated((ProgramElementDoc) doc)) { - result.addContent(HtmlTree.SPAN(HtmlStyle.strong, + result.addContent(HtmlTree.SPAN(HtmlStyle.deprecatedLabel, new StringContent(configuration.getText("doclet.Deprecated")))); result.addContent(RawHtml.nbsp); if (deprs.length > 0) { Content body = commentTagsToOutput(null, doc, deprs[0].inlineTags(), false); if (!body.isEmpty()) - result.addContent(HtmlTree.SPAN(HtmlStyle.italic, body)); + result.addContent(HtmlTree.SPAN(HtmlStyle.deprecationComment, body)); } } else { if (Util.isDeprecated(member.containingClass())) { - result.addContent(HtmlTree.SPAN(HtmlStyle.strong, + result.addContent(HtmlTree.SPAN(HtmlStyle.deprecatedLabel, new StringContent(configuration.getText("doclet.Deprecated")))); result.addContent(RawHtml.nbsp); } @@ -151,7 +151,7 @@ * {@inheritDoc} */ public Content getParamHeader(String header) { - HtmlTree result = HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.strong, + HtmlTree result = HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.paramLabel, new StringContent(header))); return result; } @@ -186,7 +186,7 @@ */ public Content returnTagOutput(Tag returnTag) { ContentBuilder result = new ContentBuilder(); - result.addContent(HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.strong, + result.addContent(HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.returnLabel, new StringContent(configuration.getText("doclet.Returns"))))); result.addContent(HtmlTree.DD(htmlWriter.commentTagsToContent( returnTag, null, returnTag.inlineTags(), false))); @@ -231,7 +231,7 @@ return body; ContentBuilder result = new ContentBuilder(); - result.addContent(HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.strong, + result.addContent(HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.seeLabel, new StringContent(configuration.getText("doclet.See_Also"))))); result.addContent(HtmlTree.DD(body)); return result; @@ -250,7 +250,7 @@ */ public Content simpleTagOutput(Tag[] simpleTags, String header) { ContentBuilder result = new ContentBuilder(); - result.addContent(HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.strong, new RawHtml(header)))); + result.addContent(HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.simpleTagLabel, new RawHtml(header)))); ContentBuilder body = new ContentBuilder(); for (int i = 0; i < simpleTags.length; i++) { if (i > 0) { @@ -268,7 +268,7 @@ */ public Content simpleTagOutput(Tag simpleTag, String header) { ContentBuilder result = new ContentBuilder(); - result.addContent(HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.strong, new RawHtml(header)))); + result.addContent(HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.simpleTagLabel, new RawHtml(header)))); Content body = htmlWriter.commentTagsToContent( simpleTag, null, simpleTag.inlineTags(), false); result.addContent(HtmlTree.DD(body)); @@ -279,7 +279,7 @@ * {@inheritDoc} */ public Content getThrowsHeader() { - HtmlTree result = HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.strong, + HtmlTree result = HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.throwsLabel, new StringContent(configuration.getText("doclet.Throws")))); return result; }
--- a/src/share/classes/com/sun/tools/doclets/formats/html/TreeWriter.java Fri Oct 18 15:03:34 2013 -0700 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/TreeWriter.java Fri Oct 18 16:34:42 2013 -0700 @@ -131,7 +131,7 @@ return; } if (!classesonly) { - Content span = HtmlTree.SPAN(HtmlStyle.strong, + Content span = HtmlTree.SPAN(HtmlStyle.packageHierarchyLabel, getResource("doclet.Package_Hierarchies")); contentTree.addContent(span); HtmlTree ul = new HtmlTree(HtmlTag.UL);
--- a/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java Fri Oct 18 15:03:34 2013 -0700 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java Fri Oct 18 16:34:42 2013 -0700 @@ -236,7 +236,7 @@ String stylename, String title, String target) { Content body = label; if (strong) { - body = HtmlTree.SPAN(HtmlStyle.strong, body); + body = HtmlTree.SPAN(HtmlStyle.typeNameLink, body); } if (stylename != null && stylename.length() != 0) { HtmlTree t = new HtmlTree(HtmlTag.FONT, body);
--- a/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlStyle.java Fri Oct 18 15:03:34 2013 -0700 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlStyle.java Fri Oct 18 16:34:42 2013 -0700 @@ -52,37 +52,51 @@ constantValuesContainer, contentContainer, deprecatedContent, + deprecatedLabel, deprecatedSummary, + deprecationComment, description, + descfrmTypeLabel, details, docSummary, + emphasizedPhrase, header, horizontal, footer, indexContainer, indexHeader, inheritance, - italic, + interfaceName, legalCopy, + memberNameLabel, + memberNameLink, memberSummary, nameValue, navBarCell1Rev, navList, + overrideSpecifyLabel, overviewSummary, + packageHierarchyLabel, + paramLabel, + returnLabel, rowColor, + seeLabel, serializedFormContainer, + simpleTagLabel, skipNav, sourceContainer, sourceLineNo, - strong, subNav, subNavList, subTitle, summary, tabEnd, tableTab, + throwsLabel, title, topNav, + typeNameLabel, + typeNameLink, typeSummary, useSummary; }
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css Fri Oct 18 15:03:34 2013 -0700 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css Fri Oct 18 16:34:42 2013 -0700 @@ -514,9 +514,11 @@ display:block; margin:3px 0 0 0; } -.strong { +.deprecatedLabel, .descfrmTypeLabel, .memberNameLabel, .memberNameLink, +.overrideSpecifyLabel, .packageHierarchyLabel, .paramLabel, .returnLabel, +.seeLabel, .simpleTagLabel, .throwsLabel, .typeNameLabel, .typeNameLink { font-weight:bold; } -.italic { +.deprecationComment, .emphasizedPhrase, .interfaceName { font-style:italic; }
--- a/test/com/sun/javadoc/AuthorDD/AuthorDD.java Fri Oct 18 15:03:34 2013 -0700 +++ b/test/com/sun/javadoc/AuthorDD/AuthorDD.java Fri Oct 18 16:34:42 2013 -0700 @@ -23,7 +23,7 @@ /* * @test - * @bug 4651598 + * @bug 4651598 8026567 * @summary Javadoc wrongly inserts </DD> tags when using multiple @author tags * @author dkramer * @run main AuthorDD @@ -86,12 +86,12 @@ // Test single @since tag: - { "<dt><span class=\"strong\">Since:</span></dt>"+NL+"<dd>JDK 1.0</dd>", + { "<dt><span class=\"simpleTagLabel\">Since:</span></dt>"+NL+"<dd>JDK 1.0</dd>", BUGID + FS + "p1" + FS + "C1.html" }, // Test multiple @author tags: - { "<dt><span class=\"strong\">Author:</span></dt>"+NL+"<dd>Doug Kramer, Jamie, Neal</dd>", + { "<dt><span class=\"simpleTagLabel\">Author:</span></dt>"+NL+"<dd>Doug Kramer, Jamie, Neal</dd>", BUGID + FS + "p1" + FS + "C1.html" }, };
--- a/test/com/sun/javadoc/testAnnotationTypes/TestAnnotationTypes.java Fri Oct 18 15:03:34 2013 -0700 +++ b/test/com/sun/javadoc/testAnnotationTypes/TestAnnotationTypes.java Fri Oct 18 16:34:42 2013 -0700 @@ -23,7 +23,7 @@ /* * @test - * @bug 4973609 8015249 8025633 + * @bug 4973609 8015249 8025633 8026567 * @summary Make sure that annotation types with 0 members does not have * extra HR tags. * @author jamieh @@ -55,7 +55,7 @@ {BUG_ID + FS + "pkg" + FS + "AnnotationTypeField.html", "<h3>Field Summary</h3>"}, {BUG_ID + FS + "pkg" + FS + "AnnotationTypeField.html", - "<td class=\"colLast\"><code><span class=\"strong\"><a href=\"../" + + "<td class=\"colLast\"><code><span class=\"memberNameLink\"><a href=\"../" + "pkg/AnnotationTypeField.html#DEFAULT_NAME\">DEFAULT_NAME</a></span>" + "</code> </td>"}, {BUG_ID + FS + "pkg" + FS + "AnnotationTypeField.html",
--- a/test/com/sun/javadoc/testClassCrossReferences/TestClassCrossReferences.java Fri Oct 18 15:03:34 2013 -0700 +++ b/test/com/sun/javadoc/testClassCrossReferences/TestClassCrossReferences.java Fri Oct 18 16:34:42 2013 -0700 @@ -23,7 +23,7 @@ /* * @test - * @bug 4652655 4857717 8025633 + * @bug 4652655 4857717 8025633 8026567 * @summary This test verifies that class cross references work properly. * @author jamieh * @library ../lib/ @@ -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><span class=\"strong\">Overrides:</span></dt>" + NL + + "<dl>" + NL + "<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>" + NL + "<dd><code>toString</code> in class <code>java.lang.Object</code></dd>" + NL + "</dl>"} };
--- a/test/com/sun/javadoc/testClassTree/TestClassTree.java Fri Oct 18 15:03:34 2013 -0700 +++ b/test/com/sun/javadoc/testClassTree/TestClassTree.java Fri Oct 18 16:34:42 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 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 @@ -23,7 +23,7 @@ /* * @test - * @bug 4632553 4973607 + * @bug 4632553 4973607 8026567 * @summary No need to include type name (class, interface, etc.) before * every single type in class tree. * Make sure class tree includes heirarchy for enums and annotation @@ -49,12 +49,12 @@ private static final String[][] TEST = { {BUG_ID + FS + "pkg" + FS + "package-tree.html", "<ul>" + NL + "<li type=\"circle\">pkg.<a href=\"../pkg/ParentClass.html\" " + - "title=\"class in pkg\"><span class=\"strong\">ParentClass</span></a>"}, + "title=\"class in pkg\"><span class=\"typeNameLink\">ParentClass</span></a>"}, {BUG_ID + FS + "pkg" + FS + "package-tree.html", "<h2 title=\"Annotation Type Hierarchy\">Annotation Type Hierarchy</h2>" + NL + "<ul>" + NL + "<li type=\"circle\">pkg.<a href=\"../pkg/AnnotationType.html\" " + - "title=\"annotation in pkg\"><span class=\"strong\">AnnotationType</span></a> " + + "title=\"annotation in pkg\"><span class=\"typeNameLink\">AnnotationType</span></a> " + "(implements java.lang.annotation.Annotation)</li>" + NL + "</ul>"}, {BUG_ID + FS + "pkg" + FS + "package-tree.html", @@ -63,14 +63,14 @@ "<li type=\"circle\">java.lang.Enum<E> (implements java.lang." + "Comparable<T>, java.io.Serializable)" + NL + "<ul>" + NL + "<li type=\"circle\">pkg.<a href=\"../pkg/Coin.html\" " + - "title=\"enum in pkg\"><span class=\"strong\">Coin</span></a></li>" + NL + + "title=\"enum in pkg\"><span class=\"typeNameLink\">Coin</span></a></li>" + NL + "</ul>" + NL + "</li>" + NL + "</ul>" + NL + "</li>" + NL + "</ul>" }, }; private static final String[][] NEGATED_TEST = { {BUG_ID + FS + "pkg" + FS + "package-tree.html", "<li type=\"circle\">class pkg.<a href=\"../pkg/ParentClass.html\" " + - "title=\"class in pkg\"><span class=\"strong\">ParentClass</span></a></li>"} + "title=\"class in pkg\"><span class=\"typeNameLink\">ParentClass</span></a></li>"} }; /**
--- a/test/com/sun/javadoc/testConstructorIndent/TestConstructorIndent.java Fri Oct 18 15:03:34 2013 -0700 +++ b/test/com/sun/javadoc/testConstructorIndent/TestConstructorIndent.java Fri Oct 18 16:34:42 2013 -0700 @@ -23,7 +23,7 @@ /* * @test - * @bug 4904037 + * @bug 4904037 8026567 * @summary The constructor comments should be surrounded by * <dl></dl>. Check for this in the output. * @author jamieh @@ -47,7 +47,7 @@ private static final String[][] TEST = { {BUG_ID + FS + "C.html", "<div class=\"block\">" + "This is just a simple constructor.</div>" + NL + - "<dl>" + NL + "<dt><span class=\"strong\">Parameters:</span></dt>" + NL + + "<dl>" + NL + "<dt><span class=\"paramLabel\">Parameters:</span></dt>" + NL + "<dd><code>i</code> - a param.</dd>" + NL +"</dl>" } };
--- a/test/com/sun/javadoc/testDeprecatedDocs/TestDeprecatedDocs.java Fri Oct 18 15:03:34 2013 -0700 +++ b/test/com/sun/javadoc/testDeprecatedDocs/TestDeprecatedDocs.java Fri Oct 18 16:34:42 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2011, 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 @@ -23,7 +23,7 @@ /* * @test - * @bug 4927552 + * @bug 4927552 8026567 * @summary <DESC> * @author jamieh * @library ../lib/ @@ -76,20 +76,20 @@ {TARGET_FILE, "pkg.DeprecatedClassByAnnotation.field"}, {TARGET_FILE2, "<pre>@Deprecated" + NL + - "public class <span class=\"strong\">DeprecatedClassByAnnotation</span>" + NL + + "public class <span class=\"typeNameLabel\">DeprecatedClassByAnnotation</span>" + NL + "extends java.lang.Object</pre>"}, {TARGET_FILE2, "<pre>@Deprecated" + NL + "public int field</pre>" + NL + - "<div class=\"block\"><span class=\"strong\">Deprecated.</span> </div>"}, + "<div class=\"block\"><span class=\"deprecatedLabel\">Deprecated.</span> </div>"}, {TARGET_FILE2, "<pre>@Deprecated" + NL + "public DeprecatedClassByAnnotation()</pre>" + NL + - "<div class=\"block\"><span class=\"strong\">Deprecated.</span> </div>"}, + "<div class=\"block\"><span class=\"deprecatedLabel\">Deprecated.</span> </div>"}, {TARGET_FILE2, "<pre>@Deprecated" + NL + "public void method()</pre>" + NL + - "<div class=\"block\"><span class=\"strong\">Deprecated.</span> </div>"}, + "<div class=\"block\"><span class=\"deprecatedLabel\">Deprecated.</span> </div>"}, }; private static final String[][] NEGATED_TEST = NO_TEST;
--- a/test/com/sun/javadoc/testExternalOverridenMethod/TestExternalOverridenMethod.java Fri Oct 18 15:03:34 2013 -0700 +++ b/test/com/sun/javadoc/testExternalOverridenMethod/TestExternalOverridenMethod.java Fri Oct 18 16:34:42 2013 -0700 @@ -23,7 +23,7 @@ /* * @test - * @bug 4857717 8025633 + * @bug 4857717 8025633 8026567 * @summary Test to make sure that externally overriden and implemented methods * are documented properly. The method should still include "implements" or * "overrides" documentation even though the method is external. @@ -38,13 +38,13 @@ private static final String BUG_ID = "4857717"; private static final String[][] TEST = { {BUG_ID + FS + "pkg" + FS + "XReader.html", - "<dt><span class=\"strong\">Overrides:</span></dt>" + NL + + "<dt><span class=\"overrideSpecifyLabel\">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><span class=\"strong\">Specified by:</span></dt>" + NL + + "<dt><span class=\"overrideSpecifyLabel\">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/testHref/TestHref.java Fri Oct 18 15:03:34 2013 -0700 +++ b/test/com/sun/javadoc/testHref/TestHref.java Fri Oct 18 16:34:42 2013 -0700 @@ -23,7 +23,7 @@ /* * @test - * @bug 4663254 8016328 8025633 + * @bug 4663254 8016328 8025633 8026567 * @summary Verify that spaces do not appear in hrefs and anchors. * @author jamieh * @library ../lib/ @@ -80,7 +80,7 @@ //Signature does not link to the page itself. {BUG_ID + FS + "pkg" + FS + "C4.html", - "public abstract class <span class=\"strong\">C4<E extends C4<E>></span>" + "public abstract class <span class=\"typeNameLabel\">C4<E extends C4<E>></span>" }, }; private static final String[][] NEGATED_TEST =
--- a/test/com/sun/javadoc/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java Fri Oct 18 15:03:34 2013 -0700 +++ b/test/com/sun/javadoc/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java Fri Oct 18 16:34:42 2013 -0700 @@ -25,7 +25,7 @@ /* * @test - * @bug 6786690 6820360 8025633 + * @bug 6786690 6820360 8025633 8026567 * @summary This test verifies the nesting of definition list tags. * @author Bhavesh Patel * @library ../lib/ @@ -43,7 +43,7 @@ // for default value. private static final String[][] TEST_ALL = { {BUG_ID + FS + "pkg1" + FS + "C1.html", "<pre>public class " + - "<span class=\"strong\">C1</span>" + NL + + "<span class=\"typeNameLabel\">C1</span>" + NL + "extends java.lang.Object" + NL + "implements java.io.Serializable</pre>"}, {BUG_ID + FS + "pkg1" + FS + "C4.html", "<dl>" + NL + "<dt>Default:</dt>" + NL + "<dd>true</dd>" + NL + @@ -54,64 +54,64 @@ // enclosing comments, tags and deprecated information. private static final String[][] TEST_CMNT_DEPR = { {BUG_ID + FS + "pkg1" + FS + "package-summary.html", "<dl>" + NL + - "<dt><span class=\"strong\">Since:</span></dt>" + NL + + "<dt><span class=\"simpleTagLabel\">Since:</span></dt>" + NL + "<dd>JDK1.0</dd>" + NL + "</dl>"}, - {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>" + NL + "<dt><span class=\"strong\">Since:</span></dt>" + NL + - "<dd>JDK1.0</dd>" + NL + "<dt><span class=\"strong\">See Also:</span></dt>" + NL + + {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>" + NL + "<dt><span class=\"simpleTagLabel\">Since:</span></dt>" + NL + + "<dd>JDK1.0</dd>" + NL + "<dt><span class=\"seeLabel\">See Also:</span></dt>" + NL + "<dd><a href=\"../pkg1/C2.html\" title=\"class in pkg1\"><code>" + "C2</code></a>, " + NL + "<a href=\"../serialized-form.html#pkg1.C1\">" + "Serialized Form</a></dd>" + NL + "</dl>"}, - {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>" + NL + "<dt><span class=\"strong\">Since:</span></dt>" + NL + + {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>" + NL + "<dt><span class=\"simpleTagLabel\">Since:</span></dt>" + NL + "<dd>1.4</dd>" + NL + - "<dt><span class=\"strong\">See Also:</span></dt>" + NL + "<dd>" + + "<dt><span class=\"seeLabel\">See Also:</span></dt>" + NL + "<dd>" + "<a href=\"../pkg1/C1.html#setUndecorated-boolean-\">" + "<code>setUndecorated(boolean)</code></a></dd>" + NL + "</dl>"}, - {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>"+ NL + "<dt><span class=\"strong\">Parameters:</span></dt>" + NL + "<dd><code>title" + + {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>"+ NL + "<dt><span class=\"paramLabel\">Parameters:</span></dt>" + NL + "<dd><code>title" + "</code> - the title</dd>" + NL + "<dd><code>test</code> - boolean value" + - "</dd>" + NL + "<dt><span class=\"strong\">Throws:</span></dt>" + NL + + "</dd>" + NL + "<dt><span class=\"throwsLabel\">Throws:</span></dt>" + NL + "<dd><code>java.lang.IllegalArgumentException</code> - if the " + "<code>owner</code>'s" + NL + " <code>GraphicsConfiguration</code> is not from a screen " + "device</dd>" + NL + "<dd><code>HeadlessException</code></dd>" + NL + "</dl>"}, - {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>" + NL + "<dt><span class=\"strong\">Parameters:</span></dt>" + NL + "<dd><code>undecorated" + + {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>" + NL + "<dt><span class=\"paramLabel\">Parameters:</span></dt>" + NL + "<dd><code>undecorated" + "</code> - <code>true</code> if no decorations are" + NL + " to be enabled;" + NL + " <code>false</code> " + - "if decorations are to be enabled.</dd>" + NL + "<dt><span class=\"strong\">Since:" + + "if decorations are to be enabled.</dd>" + NL + "<dt><span class=\"simpleTagLabel\">Since:" + "</span></dt>" + NL + "<dd>1.4</dd>" + NL + - "<dt><span class=\"strong\">See Also:</span></dt>" + NL + "<dd>" + + "<dt><span class=\"seeLabel\">See Also:</span></dt>" + NL + "<dd>" + "<a href=\"../pkg1/C1.html#readObject--\"><code>readObject()" + "</code></a></dd>" + NL + "</dl>"}, - {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>" + NL + "<dt><span class=\"strong\">Throws:</span></dt>" + NL + - "<dd><code>java.io.IOException</code></dd>" + NL + "<dt><span class=\"strong\">See Also:" + + {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>" + NL + "<dt><span class=\"throwsLabel\">Throws:</span></dt>" + NL + + "<dd><code>java.io.IOException</code></dd>" + NL + "<dt><span class=\"seeLabel\">See Also:" + "</span></dt>" + NL + "<dd><a href=\"../pkg1/C1.html#setUndecorated-boolean-\">" + "<code>setUndecorated(boolean)</code></a></dd>" + NL + "</dl>"}, - {BUG_ID + FS + "pkg1" + FS + "C2.html", "<dl>" + NL + "<dt><span class=\"strong\">Parameters:" + - "</span></dt>" + NL + "<dd><code>set</code> - boolean</dd>" + NL + "<dt><span class=\"strong\">" + + {BUG_ID + FS + "pkg1" + FS + "C2.html", "<dl>" + NL + "<dt><span class=\"paramLabel\">Parameters:" + + "</span></dt>" + NL + "<dd><code>set</code> - boolean</dd>" + NL + "<dt><span class=\"simpleTagLabel\">" + "Since:</span></dt>" + NL + "<dd>1.4</dd>" + NL + "</dl>"}, - {BUG_ID + FS + "serialized-form.html", "<dl>" + NL + "<dt><span class=\"strong\">Throws:</span>" + + {BUG_ID + FS + "serialized-form.html", "<dl>" + NL + "<dt><span class=\"throwsLabel\">Throws:</span>" + "</dt>" + NL + "<dd><code>" + - "java.io.IOException</code></dd>" + NL + "<dt><span class=\"strong\">See Also:</span>" + + "java.io.IOException</code></dd>" + NL + "<dt><span class=\"seeLabel\">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>" + - " <span class=\"italic\">As of JDK version 1.5, replaced by" + NL + + {BUG_ID + FS + "serialized-form.html", "<span class=\"deprecatedLabel\">Deprecated.</span>" + + " <span class=\"deprecationComment\">As of JDK version 1.5, replaced by" + NL + " <a href=\"pkg1/C1.html#setUndecorated-boolean-\">" + "<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>" + + "undecorated.</div>" + NL + " " + NL + "<dl>" + NL + "<dt><span class=\"simpleTagLabel\">Since:</span></dt>" + NL + + "<dd>1.4</dd>" + NL + "<dt><span class=\"seeLabel\">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>" + - " <span class=\"italic\">As of JDK version 1.5, replaced by" + NL + + {BUG_ID + FS + "serialized-form.html", "<span class=\"deprecatedLabel\">Deprecated.</span>" + + " <span class=\"deprecationComment\">As of JDK version 1.5, replaced by" + NL + " <a href=\"pkg1/C1.html#setUndecorated-boolean-\">" + "<code>setUndecorated(boolean)</code></a>.</span></div>" + NL + "<div class=\"block\">Reads the object stream.</div>" + NL + - "<dl>" + NL + "<dt><span class=\"strong\">Throws:" + + "<dl>" + NL + "<dt><span class=\"throwsLabel\">Throws:" + "</span></dt>" + NL + "<dd><code><code>" + "IOException</code></code></dd>" + NL + "<dd><code>java.io.IOException</code></dd>" + NL + "</dl>"}, - {BUG_ID + FS + "serialized-form.html", "<span class=\"strong\">Deprecated.</span>" + + {BUG_ID + FS + "serialized-form.html", "<span class=\"deprecatedLabel\">Deprecated.</span>" + " </div>" + NL + "<div class=\"block\">The name for this class.</div>"}}; @@ -122,55 +122,55 @@ // and deprecated information. private static final String[][] TEST_NODEPR = { {BUG_ID + FS + "pkg1" + FS + "package-summary.html", "<dl>" + NL + - "<dt><span class=\"strong\">Since:</span></dt>" + NL + + "<dt><span class=\"simpleTagLabel\">Since:</span></dt>" + NL + "<dd>JDK1.0</dd>" + NL + "</dl>"}, - {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>" + NL + "<dt><span class=\"strong\">Since:</span>" + - "</dt>" + NL + "<dd>JDK1.0</dd>" + NL + "<dt><span class=\"strong\">See Also:" + + {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>" + NL + "<dt><span class=\"simpleTagLabel\">Since:</span>" + + "</dt>" + NL + "<dd>JDK1.0</dd>" + NL + "<dt><span class=\"seeLabel\">See Also:" + "</span></dt>" + NL + "<dd><a href=\"../pkg1/C2.html\" title=\"class in pkg1\">" + "<code>C2</code></a>, " + NL + "<a href=\"../serialized-form.html#pkg1.C1\">" + "Serialized Form</a></dd>" + NL + "</dl>"}, - {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>" + NL + "<dt><span class=\"strong\">Parameters:" + + {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>" + NL + "<dt><span class=\"paramLabel\">Parameters:" + "</span></dt>" + NL + "<dd><code>title</code> - the title</dd>" + NL + "<dd><code>" + - "test</code> - boolean value</dd>" + NL + "<dt><span class=\"strong\">Throws:" + + "test</code> - boolean value</dd>" + NL + "<dt><span class=\"throwsLabel\">Throws:" + "</span></dt>" + NL + "<dd><code>java.lang.IllegalArgumentException" + "</code> - if the <code>owner</code>'s" + NL + " <code>GraphicsConfiguration" + "</code> is not from a screen device</dd>" + NL + "<dd><code>" + "HeadlessException</code></dd>" + NL + "</dl>"}, - {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>" + NL + "<dt><span class=\"strong\">Parameters:" + + {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>" + NL + "<dt><span class=\"paramLabel\">Parameters:" + "</span></dt>" + NL + "<dd><code>undecorated</code> - <code>true</code>" + " if no decorations are" + NL + " to be enabled;" + NL + " <code>false</code> if decorations are to be enabled." + - "</dd>" + 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#readObject--\">" + + "</dd>" + NL + "<dt><span class=\"simpleTagLabel\">Since:</span></dt>" + NL + "<dd>1.4</dd>" + NL + + "<dt><span class=\"seeLabel\">See Also:</span></dt>" + NL + "<dd><a href=\"../pkg1/C1.html#readObject--\">" + "<code>readObject()</code></a></dd>" + NL + "</dl>"}, - {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>" + NL + "<dt><span class=\"strong\">Throws:</span>" + + {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>" + NL + "<dt><span class=\"throwsLabel\">Throws:</span>" + "</dt>" + NL + "<dd><code>java.io.IOException</code></dd>" + NL + "<dt>" + - "<span class=\"strong\">See Also:</span></dt>" + NL + "<dd><a href=\"../pkg1/C1.html#setUndecorated-boolean-\">" + + "<span class=\"seeLabel\">See Also:</span></dt>" + NL + "<dd><a href=\"../pkg1/C1.html#setUndecorated-boolean-\">" + "<code>setUndecorated(boolean)</code></a></dd>" + NL + "</dl>"}, - {BUG_ID + FS + "serialized-form.html", "<dl>" + NL + "<dt><span class=\"strong\">Throws:</span>" + + {BUG_ID + FS + "serialized-form.html", "<dl>" + NL + "<dt><span class=\"throwsLabel\">Throws:</span>" + "</dt>" + NL + "<dd><code>" + - "java.io.IOException</code></dd>" + NL + "<dt><span class=\"strong\">See Also:</span>" + + "java.io.IOException</code></dd>" + NL + "<dt><span class=\"seeLabel\">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>" + - " <span class=\"italic\">As of JDK version 1.5, replaced by" + NL + + {BUG_ID + FS + "serialized-form.html", "<span class=\"deprecatedLabel\">Deprecated.</span>" + + " <span class=\"deprecationComment\">As of JDK version 1.5, replaced by" + NL + " <a href=\"pkg1/C1.html#setUndecorated-boolean-\">" + "<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>" + + "undecorated.</div>" + NL + " " + NL + "<dl>" + NL + "<dt><span class=\"simpleTagLabel\">Since:</span></dt>" + NL + + "<dd>1.4</dd>" + NL + "<dt><span class=\"seeLabel\">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>" + - " <span class=\"italic\">As of JDK version 1.5, replaced by" + NL + + {BUG_ID + FS + "serialized-form.html", "<span class=\"deprecatedLabel\">Deprecated.</span>" + + " <span class=\"deprecationComment\">As of JDK version 1.5, replaced by" + NL + " <a href=\"pkg1/C1.html#setUndecorated-boolean-\">" + "<code>setUndecorated(boolean)</code></a>.</span></div>" + NL + "<div class=\"block\">Reads the object stream.</div>" + NL + - "<dl>" + NL + "<dt><span class=\"strong\">Throws:" + + "<dl>" + NL + "<dt><span class=\"throwsLabel\">Throws:" + "</span></dt>" + NL + "<dd><code><code>" + "IOException</code></code></dd>" + NL + "<dd><code>java.io.IOException</code></dd>" + NL + "</dl>"}, - {BUG_ID + FS + "serialized-form.html", "<span class=\"strong\">Deprecated.</span>" + + {BUG_ID + FS + "serialized-form.html", "<span class=\"deprecatedLabel\">Deprecated.</span>" + " </div>" + NL + "<div class=\"block\">" + "The name for this class.</div>"}}; @@ -186,12 +186,12 @@ "title=\"enum in pkg1\">C1.ModalExclusionType</a> " + "APPLICATION_EXCLUDE</pre>" + NL + "</li>"}, {BUG_ID + FS + "serialized-form.html", "<pre>boolean " + - "undecorated</pre>" + NL + "<div class=\"block\"><span class=\"strong\">" + - "Deprecated.</span> <span class=\"italic\">As of JDK version 1.5, replaced by" + NL + + "undecorated</pre>" + NL + "<div class=\"block\"><span class=\"deprecatedLabel\">" + + "Deprecated.</span> <span class=\"deprecationComment\">As of JDK version 1.5, replaced by" + NL + " <a href=\"pkg1/C1.html#setUndecorated-boolean-\"><code>" + "setUndecorated(boolean)</code></a>.</span></div>" + NL + "</li>"}, - {BUG_ID + FS + "serialized-form.html", "<span class=\"strong\">" + - "Deprecated.</span> <span class=\"italic\">As of JDK version" + + {BUG_ID + FS + "serialized-form.html", "<span class=\"deprecatedLabel\">" + + "Deprecated.</span> <span class=\"deprecationComment\">As of JDK version" + " 1.5, replaced by" + NL + " <a href=\"pkg1/C1.html#setUndecorated-boolean-\">" + "<code>setUndecorated(boolean)</code></a>.</span></div>" + NL + "</li>"}};
--- a/test/com/sun/javadoc/testHtmlStrongTag/TestHtmlStrongTag.java Fri Oct 18 15:03:34 2013 -0700 +++ b/test/com/sun/javadoc/testHtmlStrongTag/TestHtmlStrongTag.java Fri Oct 18 16:34:42 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 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 @@ -25,7 +25,7 @@ /* * @test - * @bug 6786028 + * @bug 6786028 8026567 * @summary This test verifys the use of <strong> HTML tag instead of <B> by Javadoc std doclet. * @author Bhavesh Patel * @library ../lib/ @@ -38,7 +38,7 @@ private static final String BUG_ID = "6786028"; private static final String[][] TEST1 = { - {BUG_ID + FS + "pkg1" + FS + "C1.html", "<span class=\"strong\">See Also:</span>"}}; + {BUG_ID + FS + "pkg1" + FS + "C1.html", "<span class=\"seeLabel\">See Also:</span>"}}; private static final String[][] NEGATED_TEST1 = { {BUG_ID + FS + "pkg1" + FS + "C1.html", "<STRONG>Method Summary</STRONG>"}, {BUG_ID + FS + "pkg1" + FS + "C1.html", "<B>"},
--- a/test/com/sun/javadoc/testIndex/TestIndex.java Fri Oct 18 15:03:34 2013 -0700 +++ b/test/com/sun/javadoc/testIndex/TestIndex.java Fri Oct 18 16:34:42 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2012, 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 @@ -23,7 +23,7 @@ /* * @test - * @bug 4852280 4517115 4973608 4994589 + * @bug 4852280 4517115 4973608 4994589 8026567 * @summary Perform tests on index.html file. * Also test that index-all.html has the appropriate output. * Test for unnamed package in index. @@ -53,27 +53,27 @@ //Test index-all.html {BUG_ID + FS + "index-all.html", - "<a href=\"pkg/C.html\" title=\"class in pkg\"><span class=\"strong\">C</span></a>" + + "<a href=\"pkg/C.html\" title=\"class in pkg\"><span class=\"typeNameLink\">C</span></a>" + " - Class in <a href=\"pkg/package-summary.html\">pkg</a>"}, {BUG_ID + FS + "index-all.html", "<a href=\"pkg/Interface.html\" title=\"interface in pkg\">" + - "<span class=\"strong\">Interface</span></a> - Interface in " + + "<span class=\"typeNameLink\">Interface</span></a> - Interface in " + "<a href=\"pkg/package-summary.html\">pkg</a>"}, {BUG_ID + FS + "index-all.html", "<a href=\"pkg/AnnotationType.html\" title=\"annotation in pkg\">" + - "<span class=\"strong\">AnnotationType</span></a> - Annotation Type in " + + "<span class=\"typeNameLink\">AnnotationType</span></a> - Annotation Type in " + "<a href=\"pkg/package-summary.html\">pkg</a>"}, {BUG_ID + FS + "index-all.html", "<a href=\"pkg/Coin.html\" title=\"enum in pkg\">" + - "<span class=\"strong\">Coin</span></a> - Enum in " + + "<span class=\"typeNameLink\">Coin</span></a> - Enum in " + "<a href=\"pkg/package-summary.html\">pkg</a>"}, {BUG_ID + FS + "index-all.html", "Class in <a href=\"package-summary.html\"><Unnamed></a>"}, {BUG_ID + FS + "index-all.html", - "<dl>" + NL + "<dt><span class=\"strong\"><a href=\"pkg/C.html#Java\">" + + "<dl>" + NL + "<dt><span class=\"memberNameLink\"><a href=\"pkg/C.html#Java\">" + "Java</a></span> - Static variable in class pkg.<a href=\"pkg/C.html\" " + "title=\"class in pkg\">C</a></dt>" + NL + "<dd> </dd>" + NL + - "<dt><span class=\"strong\"><a href=\"pkg/C.html#JDK\">JDK</a></span> " + + "<dt><span class=\"memberNameLink\"><a href=\"pkg/C.html#JDK\">JDK</a></span> " + "- Static variable in class pkg.<a href=\"pkg/C.html\" title=\"class in pkg\">" + "C</a></dt>" + NL + "<dd> </dd>" + NL + "</dl>"}, };
--- a/test/com/sun/javadoc/testInterface/TestInterface.java Fri Oct 18 15:03:34 2013 -0700 +++ b/test/com/sun/javadoc/testInterface/TestInterface.java Fri Oct 18 16:34:42 2013 -0700 @@ -23,7 +23,7 @@ /* * @test - * @bug 4682448 4947464 5029946 8025633 + * @bug 4682448 4947464 5029946 8025633 8026567 * @summary Verify that the public modifier does not show up in the * documentation for public methods, as recommended by the JLS. * If A implements I and B extends A, B should be in the list of @@ -83,7 +83,7 @@ }, //Make sure "Specified By" has substituted type parameters. {BUG_ID + FS + "pkg" + FS + "Child.html", - "<dt><span class=\"strong\">Specified by:</span></dt>" + NL + + "<dt><span class=\"overrideSpecifyLabel\">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><span class=\"strong\">Overrides:</span></dt>" + NL + + "<dt><span class=\"overrideSpecifyLabel\">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 Fri Oct 18 15:03:34 2013 -0700 +++ b/test/com/sun/javadoc/testJavaFX/TestJavaFX.java Fri Oct 18 16:34:42 2013 -0700 @@ -23,7 +23,7 @@ /* * @test - * @bug 7112427 8012295 8025633 + * @bug 7112427 8012295 8025633 8026567 * @summary Test of the JavaFX doclet features. * @author jvalenta * @library ../lib/ @@ -38,32 +38,32 @@ private static final String[][] TEST = new String[][] { {"./" + BUG_ID + "/C.html", - "<dt><span class=\"strong\">See Also:</span></dt>" + NL + "<dd><a href=\"C.html#getRate--\"><code>getRate()</code></a>, " + NL + + "<dt><span class=\"seeLabel\">See Also:</span></dt>" + NL + "<dd><a href=\"C.html#getRate--\"><code>getRate()</code></a>, " + NL + "<a href=\"C.html#setRate-double-\"><code>setRate(double)</code></a></dd>"}, {"./" + BUG_ID + "/C.html", "<pre>public final void setRate(double value)</pre>" + NL + "<div class=\"block\">Sets the value of the property rate.</div>" + NL + - "<dl>" + NL + "<dt><span class=\"strong\">Property description:</span></dt>" }, + "<dl>" + NL + "<dt><span class=\"simpleTagLabel\">Property description:</span></dt>" }, {"./" + BUG_ID + "/C.html", "<pre>public final double getRate()</pre>" + NL + "<div class=\"block\">Gets the value of the property rate.</div>" + NL + - "<dl>" + NL + "<dt><span class=\"strong\">Property description:</span></dt>" }, + "<dl>" + NL + "<dt><span class=\"simpleTagLabel\">Property description:</span></dt>" }, {"./" + BUG_ID + "/C.html", - "<td class=\"colLast\"><code><span class=\"strong\"><a href=\"C.html#rateProperty\">rate</a></span></code>" + NL + + "<td class=\"colLast\"><code><span class=\"memberNameLink\"><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", - "<span class=\"strong\">Default value:</span>"}, + "<span class=\"simpleTagLabel\">Default value:</span>"}, {"./" + BUG_ID + "/C.html", - "<span class=\"strong\">Since:</span></dt>" + NL + "<dd>JavaFX 8.0</dd>" }, + "<span class=\"simpleTagLabel\">Since:</span></dt>" + NL + "<dd>JavaFX 8.0</dd>" }, {"./" + BUG_ID + "/C.html", "<p>Sets the value of the property <code>Property</code>"}, {"./" + BUG_ID + "/C.html", "<p>Gets the value of the property <code>Property</code>"}, {"./" + BUG_ID + "/C.html", - "<span class=\"strong\">Property description:</span>"}, + "<span class=\"simpleTagLabel\">Property description:</span>"}, {"./" + BUG_ID + "/C.html", - "<td class=\"colLast\"><code><span class=\"strong\"><a href=\"C.html#setTestMethodProperty--\">setTestMethodProperty</a></span>()</code> </td>" }, + "<td class=\"colLast\"><code><span class=\"memberNameLink\"><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/testLegacyTaglet/Check.java Fri Oct 18 15:03:34 2013 -0700 +++ b/test/com/sun/javadoc/testLegacyTaglet/Check.java Fri Oct 18 16:34:42 2013 -0700 @@ -126,7 +126,7 @@ * @param tag the tag representation of this custom tag. */ public String toString(Tag tag) { - return "<dt><span class=\"strong\">" + TAG_HEADER + ":</span></dt><dd>" + tag.text() + + return "<dt><span class=\"simpleTagLabel\">" + TAG_HEADER + ":</span></dt><dd>" + tag.text() + "</dd>\n"; }
--- a/test/com/sun/javadoc/testLinkOption/TestLinkOption.java Fri Oct 18 15:03:34 2013 -0700 +++ b/test/com/sun/javadoc/testLinkOption/TestLinkOption.java Fri Oct 18 16:34:42 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2011, 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 @@ -23,7 +23,7 @@ /* * @test - * @bug 4720957 5020118 + * @bug 4720957 5020118 8026567 * @summary Test to make sure that -link and -linkoffline link to * right files. * @author jamieh @@ -61,7 +61,7 @@ "Object</a> p3)" }, {BUG_ID + "-1" + FS + "java" + FS + "lang" + FS + "StringBuilderChild.html", - "<pre>public abstract class <span class=\"strong\">StringBuilderChild</span>" + NL + + "<pre>public abstract class <span class=\"typeNameLabel\">StringBuilderChild</span>" + NL + "extends <a href=\"http://java.sun.com/j2se/1.4/docs/api/java/lang/Object.html?is-external=true\" " + "title=\"class or interface in java.lang\">Object</a></pre>" },
--- a/test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java Fri Oct 18 15:03:34 2013 -0700 +++ b/test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java Fri Oct 18 16:34:42 2013 -0700 @@ -23,7 +23,7 @@ /* * @test - * @bug 4638588 4635809 6256068 6270645 8025633 + * @bug 4638588 4635809 6256068 6270645 8025633 8026567 * @summary Test to make sure that members are inherited properly in the Javadoc. * Verify that inheritence labels are correct. * @author jamieh @@ -72,7 +72,7 @@ // Test overriding/implementing methods with generic parameters. {BUG_ID + FS + "pkg" + FS + "BaseClass.html", - "<dl>" + NL + "<dt><span class=\"strong\">Specified by:</span></dt>" + NL + + "<dl>" + NL + "<dt><span class=\"overrideSpecifyLabel\">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 Fri Oct 18 15:03:34 2013 -0700 +++ b/test/com/sun/javadoc/testMemberSummary/TestMemberSummary.java Fri Oct 18 16:34:42 2013 -0700 @@ -23,7 +23,7 @@ /* * @test - * @bug 4951228 6290760 8025633 + * @bug 4951228 6290760 8025633 8026567 * @summary Test the case where the overriden method returns a different * type than the method in the child class. Make sure the * documentation is inherited but the return type isn't. @@ -49,7 +49,7 @@ // 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><span class=\"strong\"><a href=\"../pkg/PublicChild.html#returnTypeTest--\">" + + "<td class=\"colLast\"><code><span class=\"memberNameLink\"><a href=\"../pkg/PublicChild.html#returnTypeTest--\">" + "returnTypeTest</a></span>()</code>" }, // Check return type in member detail.
--- a/test/com/sun/javadoc/testNavigation/TestNavigation.java Fri Oct 18 15:03:34 2013 -0700 +++ b/test/com/sun/javadoc/testNavigation/TestNavigation.java Fri Oct 18 16:34:42 2013 -0700 @@ -23,7 +23,7 @@ /* * @test - * @bug 4131628 4664607 7025314 8023700 7198273 8025633 + * @bug 4131628 4664607 7025314 8023700 7198273 8025633 8026567 * @summary Make sure the Next/Prev Class links iterate through all types. * Make sure the navagation is 2 columns, not 3. * @author jamieh @@ -46,17 +46,17 @@ private static final String[][] TEST = { {BUG_ID + FS + "pkg" + FS + "A.html", "<li>Prev Class</li>"}, {BUG_ID + FS + "pkg" + FS + "A.html", - "<a href=\"../pkg/C.html\" title=\"class in pkg\"><span class=\"strong\">Next Class</span></a>"}, + "<a href=\"../pkg/C.html\" title=\"class in pkg\"><span class=\"typeNameLink\">Next Class</span></a>"}, {BUG_ID + FS + "pkg" + FS + "C.html", - "<a href=\"../pkg/A.html\" title=\"annotation in pkg\"><span class=\"strong\">Prev Class</span></a>"}, + "<a href=\"../pkg/A.html\" title=\"annotation in pkg\"><span class=\"typeNameLink\">Prev Class</span></a>"}, {BUG_ID + FS + "pkg" + FS + "C.html", - "<a href=\"../pkg/E.html\" title=\"enum in pkg\"><span class=\"strong\">Next Class</span></a>"}, + "<a href=\"../pkg/E.html\" title=\"enum in pkg\"><span class=\"typeNameLink\">Next Class</span></a>"}, {BUG_ID + FS + "pkg" + FS + "E.html", - "<a href=\"../pkg/C.html\" title=\"class in pkg\"><span class=\"strong\">Prev Class</span></a>"}, + "<a href=\"../pkg/C.html\" title=\"class in pkg\"><span class=\"typeNameLink\">Prev Class</span></a>"}, {BUG_ID + FS + "pkg" + FS + "E.html", - "<a href=\"../pkg/I.html\" title=\"interface in pkg\"><span class=\"strong\">Next Class</span></a>"}, + "<a href=\"../pkg/I.html\" title=\"interface in pkg\"><span class=\"typeNameLink\">Next Class</span></a>"}, {BUG_ID + FS + "pkg" + FS + "I.html", - "<a href=\"../pkg/E.html\" title=\"enum in pkg\"><span class=\"strong\">Prev Class</span></a>"}, + "<a href=\"../pkg/E.html\" title=\"enum in pkg\"><span class=\"typeNameLink\">Prev Class</span></a>"}, {BUG_ID + FS + "pkg" + FS + "I.html", "<li>Next Class</li>"}, // Test for 4664607 {BUG_ID + FS + "pkg" + FS + "I.html",
--- a/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java Fri Oct 18 15:03:34 2013 -0700 +++ b/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java Fri Oct 18 16:34:42 2013 -0700 @@ -23,7 +23,7 @@ /* * @test - * @bug 4789689 4905985 4927164 4827184 4993906 5004549 7025314 7010344 8025633 + * @bug 4789689 4905985 4927164 4827184 4993906 5004549 7025314 7010344 8025633 8026567 * @summary Run Javadoc on a set of source files that demonstrate new * language features. Check the output to ensure that the new * language features are properly documented. @@ -53,7 +53,7 @@ {BUG_ID + FS + "pkg" + FS + "Coin.html", "Enum Coin</h2>"}, //Make sure enum signature is correct. {BUG_ID + FS + "pkg" + FS + "Coin.html", "<pre>public enum " + - "<span class=\"strong\">Coin</span>" + NL + + "<span class=\"typeNameLabel\">Coin</span>" + NL + "extends java.lang.Enum<<a href=\"../pkg/Coin.html\" " + "title=\"enum in pkg\">Coin</a>></pre>" }, @@ -62,7 +62,7 @@ "</span><span class=\"tabEnd\"> </span></caption>"}, //Detail for enum constant {BUG_ID + FS + "pkg" + FS + "Coin.html", - "<span class=\"strong\"><a href=\"../pkg/Coin.html#Dime\">Dime</a></span>"}, + "<span class=\"memberNameLink\"><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,"}, @@ -80,11 +80,11 @@ "Class TypeParameters<E></h2>"}, //Check class type parameters section. {BUG_ID + FS + "pkg" + FS + "TypeParameters.html", - "<dt><span class=\"strong\">Type Parameters:</span></dt>" + NL + "<dd><code>E</code> - " + + "<dt><span class=\"paramLabel\">Type Parameters:</span></dt>" + NL + "<dd><code>E</code> - " + "the type parameter for this class."}, //Type parameters in @see/@link {BUG_ID + FS + "pkg" + FS + "TypeParameters.html", - "<dl>" + NL + "<dt><span class=\"strong\">See Also:</span></dt>" + NL + "<dd>" + + "<dl>" + NL + "<dt><span class=\"seeLabel\">See Also:</span></dt>" + NL + "<dd>" + "<a href=\"../pkg/TypeParameters.html\" title=\"class in pkg\">" + "<code>TypeParameters</code></a></dd>" + NL + "</dl>"}, //Method that uses class type parameter. @@ -93,7 +93,7 @@ "parameter in TypeParameters\">E</a> param)"}, //Method type parameter section. {BUG_ID + FS + "pkg" + FS + "TypeParameters.html", - "<span class=\"strong\">Type Parameters:</span></dt>" + NL + "<dd><code>T</code> - This is the first " + + "<span class=\"paramLabel\">Type Parameters:</span></dt>" + NL + "<dd><code>T</code> - This is the first " + "type parameter.</dd>" + NL + "<dd><code>V</code> - This is the second type " + "parameter."}, //Signature of method with type parameters @@ -118,7 +118,7 @@ //Signature of subclass that has type parameters. {BUG_ID + FS + "pkg" + FS + "TypeParameterSubClass.html", - "<pre>public class <span class=\"strong\">TypeParameterSubClass<T extends " + + "<pre>public class <span class=\"typeNameLabel\">TypeParameterSubClass<T extends " + "java.lang.String></span>" + NL + "extends " + "<a href=\"../pkg/TypeParameterSuperClass.html\" title=\"class in pkg\">" + "TypeParameterSuperClass</a><T></pre>"}, @@ -168,7 +168,7 @@ "Annotation Type AnnotationType</h2>"}, //Make sure the signature is correct. {BUG_ID + FS + "pkg" + FS + "AnnotationType.html", - "public @interface <span class=\"strong\">AnnotationType</span>"}, + "public @interface <span class=\"memberNameLabel\">AnnotationType</span>"}, //Make sure member summary headings are correct. {BUG_ID + FS + "pkg" + FS + "AnnotationType.html", "<h3>Required Element Summary</h3>"}, @@ -198,7 +198,7 @@ "<a href=\"../pkg/AnnotationType.html#optional--\">optional</a>" + "=\"Class Annotation\"," + NL + " <a href=\"../pkg/AnnotationType.html#required--\">" + - "required</a>=1994)" + NL + "public class <span class=\"strong\">" + + "required</a>=1994)" + NL + "public class <span class=\"typeNameLabel\">" + "AnnotationTypeUsage</span>" + NL + "extends java.lang.Object</pre>"}, //FIELD @@ -299,7 +299,7 @@ {BUG_ID + FS + "pkg1" + FS + "B.html", "<pre><a href=\"../pkg1/A.html\" title=\"annotation in pkg1\">@A</a>"}, {BUG_ID + FS + "pkg1" + FS + "B.html", - "public interface <span class=\"strong\">B</span></pre>"}, + "public interface <span class=\"typeNameLabel\">B</span></pre>"}, //============================================================== @@ -320,7 +320,7 @@ "Foo</a></span><span class=\"tabEnd\"> </span></caption>" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html", - "<td class=\"colLast\"><code><span class=\"strong\"><a href=\"../../pkg2/ClassUseTest1.html\" " + + "<td class=\"colLast\"><code><span class=\"memberNameLink\"><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\">" + @@ -333,8 +333,8 @@ "pkg2\">Foo</a></span><span class=\"tabEnd\"> </span></caption>" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html", - "<td class=\"colLast\"><span class=\"strong\">ClassUseTest1." + - "</span><code><span class=\"strong\"><a href=\"../../pkg2/" + + "<td class=\"colLast\"><span class=\"typeNameLabel\">ClassUseTest1." + + "</span><code><span class=\"memberNameLink\"><a href=\"../../pkg2/" + "ClassUseTest1.html#method-T-\">method</a></span>" + "(T t)</code> </td>" }, @@ -372,7 +372,7 @@ "</span></caption>" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo2.html", - "<td class=\"colLast\"><code><span class=\"strong\"><a href=\"../../pkg2/ClassUseTest1.html\" " + + "<td class=\"colLast\"><code><span class=\"memberNameLink\"><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\">" + @@ -386,8 +386,8 @@ "</span></caption>" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo2.html", - "<td class=\"colLast\"><span class=\"strong\">" + - "ClassUseTest1.</span><code><span class=\"strong\"><a href=\"../../" + + "<td class=\"colLast\"><span class=\"typeNameLabel\">" + + "ClassUseTest1.</span><code><span class=\"memberNameLink\"><a href=\"../../" + "pkg2/ClassUseTest1.html#method-T-\">method</a></span>" + "(T t)</code> </td>" }, @@ -401,7 +401,7 @@ " </span></caption>" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html", - "<td class=\"colLast\"><code><span class=\"strong\"><a href=\"../../pkg2/ClassUseTest2.html\" " + + "<td class=\"colLast\"><code><span class=\"memberNameLink\"><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\">" + @@ -415,8 +415,8 @@ " </span></caption>" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html", - "<td class=\"colLast\"><span class=\"strong\">ClassUseTest2." + - "</span><code><span class=\"strong\"><a href=\"../../pkg2/" + + "<td class=\"colLast\"><span class=\"typeNameLabel\">ClassUseTest2." + + "</span><code><span class=\"memberNameLink\"><a href=\"../../pkg2/" + "ClassUseTest2.html#method-T-\">method</a></span>" + "(T t)</code> </td>" }, @@ -456,7 +456,7 @@ "Foo3</a></span><span class=\"tabEnd\"> </span></caption>" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html", - "<td class=\"colLast\"><code><span class=\"strong\"><a href=\"../../pkg2/ClassUseTest2.html\" " + + "<td class=\"colLast\"><code><span class=\"memberNameLink\"><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\">" + @@ -470,8 +470,8 @@ "</span></caption>" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html", - "<td class=\"colLast\"><span class=\"strong\">ClassUseTest2." + - "</span><code><span class=\"strong\"><a href=\"../../pkg2/" + + "<td class=\"colLast\"><span class=\"typeNameLabel\">ClassUseTest2." + + "</span><code><span class=\"memberNameLink\"><a href=\"../../pkg2/" + "ClassUseTest2.html#method-T-\">method</a></span>" + "(T t)</code> </td>" }, @@ -500,7 +500,7 @@ " </span></caption>" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html", - "<td class=\"colLast\"><code><span class=\"strong\"><a href=\"../../pkg2/ClassUseTest3.html\" " + + "<td class=\"colLast\"><code><span class=\"memberNameLink\"><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 " + @@ -515,8 +515,8 @@ " </span></caption>" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html", - "<td class=\"colLast\"><span class=\"strong\">ClassUseTest3" + - ".</span><code><span class=\"strong\"><a href=\"../../pkg2/ClassUseTest3." + + "<td class=\"colLast\"><span class=\"typeNameLabel\">ClassUseTest3" + + ".</span><code><span class=\"memberNameLink\"><a href=\"../../pkg2/ClassUseTest3." + "html#method-T-\">method</a></span>(T t)</code> </td>" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html", @@ -538,7 +538,7 @@ "</span></caption>" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html", - "<td class=\"colLast\"><code><span class=\"strong\"><a href=\"../../pkg2/ClassUseTest3.html\" " + + "<td class=\"colLast\"><code><span class=\"memberNameLink\"><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 " + @@ -552,8 +552,8 @@ "pkg2\">Foo4</a></span><span class=\"tabEnd\"> </span></caption>" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html", - "<td class=\"colLast\"><span class=\"strong\">ClassUseTest3." + - "</span><code><span class=\"strong\"><a href=\"../../pkg2/ClassUseTest3." + + "<td class=\"colLast\"><span class=\"typeNameLabel\">ClassUseTest3." + + "</span><code><span class=\"memberNameLink\"><a href=\"../../pkg2/ClassUseTest3." + "html#method-T-\">method</a></span>(T t)</code>" + " </td>" }, @@ -586,8 +586,8 @@ "<th class=\"colLast\" scope=\"col\">Method and Description</th>" + NL + "</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><span class=\"strong\"><a href=\"../../pkg2/ClassUseTest3." + + "<td class=\"colLast\"><span class=\"typeNameLabel\">ClassUseTest3." + + "</span><code><span class=\"memberNameLink\"><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 + @@ -663,14 +663,14 @@ // TYPE PARAMETER IN INDEX //================================= {BUG_ID + FS + "index-all.html", - "<span class=\"strong\"><a href=\"pkg2/Foo.html#method-java.util.Vector-\">" + + "<span class=\"memberNameLink\"><a href=\"pkg2/Foo.html#method-java.util.Vector-\">" + "method(Vector<Object>)</a></span>" }, //================================= // TYPE PARAMETER IN INDEX //================================= {BUG_ID + FS + "index-all.html", - "<span class=\"strong\"><a href=\"pkg2/Foo.html#method-java.util.Vector-\">" + + "<span class=\"memberNameLink\"><a href=\"pkg2/Foo.html#method-java.util.Vector-\">" + "method(Vector<Object>)</a></span>" }, }; @@ -679,7 +679,7 @@ // ENUM TESTING //================================= //NO constructor section - {BUG_ID + FS + "pkg" + FS + "Coin.html", "<span class=\"strong\">Constructor Summary</span>"}, + {BUG_ID + FS + "pkg" + FS + "Coin.html", "<h3>Constructor Summary</h3>"}, //================================= // TYPE PARAMETER TESTING //================================= @@ -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 <span class=\"strong\">AnnotationTypeUsage</span></dt><dt>extends java.lang.Object</dt>"}, + "public class <span class=\"typeNameLabel\">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 <span class=\"strong\">field</span>"}, + "public int <span class=\"memberNameLabel\">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 <span class=\"strong\">AnnotationTypeUsage</span>()"}, + "public <span class=\"typeNameLabel\">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 <span class=\"strong\">method</span>()"}, + "public void <span class=\"memberNameLabel\">method</span>()"}, //================================= // Make sure annotation types do not
--- a/test/com/sun/javadoc/testOverridenMethods/TestOverridenMethodDocCopy.java Fri Oct 18 15:03:34 2013 -0700 +++ b/test/com/sun/javadoc/testOverridenMethods/TestOverridenMethodDocCopy.java Fri Oct 18 16:34:42 2013 -0700 @@ -23,7 +23,7 @@ /* * @test - * @bug 4368820 8025633 + * @bug 4368820 8025633 8026567 * @summary Inherited comment should link directly to member, not just * class * @author jamieh @@ -46,7 +46,7 @@ //Input for string search tests. private static final String[][] TEST = { {BUG_ID + FS + "pkg1" + FS + "SubClass.html", - "<span class=\"strong\">Description copied from class: <code>" + + "<span class=\"descfrmTypeLabel\">Description copied from class: <code>" + "<a href=\"../pkg1/BaseClass.html#overridenMethodWithDocsToCopy--\">" + "BaseClass</a></code></span>" }
--- a/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethods.java Fri Oct 18 15:03:34 2013 -0700 +++ b/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethods.java Fri Oct 18 16:34:42 2013 -0700 @@ -23,7 +23,7 @@ /* * @test - * @bug 4634891 + * @bug 4634891 8026567 * @summary Determine if overriden methods are properly documented when * -protected (default) visibility flag is used. * @author jamieh @@ -40,12 +40,12 @@ private static final String[][] TEST = { //The public method should be overriden {BUG_ID + FS + "pkg1" + FS + "SubClass.html", - "<dt><span class=\"strong\">Overrides:</span></dt>" + NL + + "<dt><span class=\"overrideSpecifyLabel\">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><span class=\"strong\">Overrides:</span></dt>" + NL + + "<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>" + NL + "<dd><code><a href=\"../pkg1/BaseClass.html#publicMethod"} }; @@ -54,17 +54,17 @@ //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><span class=\"strong\">Overrides:</span></dt>" + NL + + "<dt><span class=\"overrideSpecifyLabel\">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><span class=\"strong\">Overrides:</span></dt>" + NL + + "<dt><span class=\"overrideSpecifyLabel\">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><span class=\"strong\">Overrides:</span></dt>" + NL + + "<dt><span class=\"overrideSpecifyLabel\">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
--- a/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPackageFlag.java Fri Oct 18 15:03:34 2013 -0700 +++ b/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPackageFlag.java Fri Oct 18 16:34:42 2013 -0700 @@ -23,7 +23,7 @@ /* * @test - * @bug 4634891 8025633 + * @bug 4634891 8025633 8026567 * @summary Determine if overriden methods are properly documented when * -protected (default) visibility flag is used. * @author jamieh @@ -40,14 +40,14 @@ private static final String[][] TEST = { //The public method should be overriden {BUG_ID + FS + "pkg1" + FS + "SubClass.html", - "<dt><span class=\"strong\">Overrides:</span></dt>" + NL + + "<dt><span class=\"overrideSpecifyLabel\">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><span class=\"strong\">Overrides:</span></dt>" + NL + + "<dt><span class=\"overrideSpecifyLabel\">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><span class=\"strong\">Overrides:</span></dt>" + NL + + "<dt><span class=\"overrideSpecifyLabel\">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><span class=\"strong\">Overrides:</span></dt>" + NL + + "<dt><span class=\"overrideSpecifyLabel\">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><span class=\"strong\">Overrides:</span></dt>" + NL + + "<dt><span class=\"overrideSpecifyLabel\">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><span class=\"strong\">Overrides:</span></dt>" + NL + + "<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>" + NL + "<dd><code><a href=\"../pkg1/BaseClass.html#packagePrivateMethod()\">"}, };
--- a/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPrivateFlag.java Fri Oct 18 15:03:34 2013 -0700 +++ b/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPrivateFlag.java Fri Oct 18 16:34:42 2013 -0700 @@ -23,7 +23,7 @@ /* * @test - * @bug 4634891 + * @bug 4634891 8026567 * @summary Determine if overriden methods are properly documented when * -protected (default) visibility flag is used. * @author jamieh @@ -40,18 +40,18 @@ private static final String[][] TEST = { //The public method should be overriden {BUG_ID + FS + "pkg1" + FS + "SubClass.html", - "<dt><span class=\"strong\">Overrides:</span></dt>" + NL + + "<dt><span class=\"overrideSpecifyLabel\">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><span class=\"strong\">Overrides:</span></dt>" + NL + + "<dt><span class=\"overrideSpecifyLabel\">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><span class=\"strong\">Overrides:</span></dt>" + NL + + "<dt><span class=\"overrideSpecifyLabel\">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><span class=\"strong\">Overrides:</span></dt>" + NL + + "<dt><span class=\"overrideSpecifyLabel\">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><span class=\"strong\">Overrides:</span></dt>" + NL + + "<dt><span class=\"overrideSpecifyLabel\">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><span class=\"strong\">Overrides:</span></dt>" + NL + + "<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>" + NL + "<dd><code><a href=\"../pkg1/BaseClass.html#packagePrivateMethod"}
--- a/test/com/sun/javadoc/testPackageDeprecation/TestPackageDeprecation.java Fri Oct 18 15:03:34 2013 -0700 +++ b/test/com/sun/javadoc/testPackageDeprecation/TestPackageDeprecation.java Fri Oct 18 16:34:42 2013 -0700 @@ -23,7 +23,7 @@ /* * @test - * @bug 6492694 + * @bug 6492694 8026567 * @summary Test package deprecation. * @author bpatel * @library ../lib/ @@ -49,8 +49,8 @@ //Input for string search tests. 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\"><span class=\"italic\">This package is Deprecated." + + "<div class=\"deprecatedContent\"><span class=\"deprecatedLabel\">Deprecated.</span>" + NL + + "<div class=\"block\"><span class=\"deprecationComment\">This package is Deprecated." + "</span></div>" }, {BUG_ID + "-1" + FS + "deprecated-list.html",
--- a/test/com/sun/javadoc/testParamTaglet/TestParamTaglet.java Fri Oct 18 15:03:34 2013 -0700 +++ b/test/com/sun/javadoc/testParamTaglet/TestParamTaglet.java Fri Oct 18 16:34:42 2013 -0700 @@ -23,7 +23,7 @@ /* * @test - * @bug 4802275 4967243 + * @bug 4802275 4967243 8026567 * @summary Make sure param tags are still printed even though they do not * match up with a real parameters. * Make sure inheritDoc cannot be used in an invalid param tag. @@ -48,12 +48,12 @@ private static final String[][] TEST = { //Regular param tags. {BUG_ID + FS + "pkg" + FS + "C.html", - "<span class=\"strong\">Parameters:</span></dt>" + NL + "<dd><code>param1</code> - testing 1 2 3.</dd>" + + "<span class=\"paramLabel\">Parameters:</span></dt>" + NL + "<dd><code>param1</code> - testing 1 2 3.</dd>" + NL + "<dd><code>param2</code> - testing 1 2 3." }, //Param tags that don't match with any real parameters. {BUG_ID + FS + "pkg" + FS + "C.html", - "<span class=\"strong\">Parameters:</span></dt>" + NL + "<dd><code><I>p1</I></code> - testing 1 2 3.</dd>" + + "<span class=\"paramLabel\">Parameters:</span></dt>" + NL + "<dd><code><I>p1</I></code> - testing 1 2 3.</dd>" + NL + "<dd><code><I>p2</I></code> - testing 1 2 3." }, //{@inherit} doc misuse does not cause doclet to throw exception.
--- a/test/com/sun/javadoc/testPrivateClasses/TestPrivateClasses.java Fri Oct 18 15:03:34 2013 -0700 +++ b/test/com/sun/javadoc/testPrivateClasses/TestPrivateClasses.java Fri Oct 18 16:34:42 2013 -0700 @@ -23,7 +23,7 @@ /* * @test - * @bug 4780441 4874845 4978816 8014017 8016328 8025633 + * @bug 4780441 4874845 4978816 8014017 8016328 8025633 8026567 * @summary Make sure that when the -private flag is not used, members * inherited from package private class are documented in the child. * @@ -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", - "<span class=\"strong\">Overrides:</span>"}, + "<span class=\"overrideSpecifyLabel\">Overrides:</span>"}, // Should not document that a method specified by private interface. {BUG_ID + "-1" + FS + "pkg" + FS + "PublicChild.html", - "<span class=\"strong\">Specified by:</span>"}, + "<span class=\"overrideSpecifyLabel\">Specified by:</span>"}, {BUG_ID + "-1" + FS + "pkg" + FS + "PublicInterface.html", - "<span class=\"strong\">Specified by:</span>"}, + "<span class=\"overrideSpecifyLabel\">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", - "<span class=\"strong\"><a href=\"../pkg2/I.html#hello-T-\">hello</a></span>"}, + "<span class=\"memberNameLink\"><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><span class=\"strong\">Overrides:</span></dt>" + NL + + "<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>" + NL + "<dd><code><a href=\"../pkg/PrivateParent.html#methodOverridenFromParent-char:A-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><span class=\"strong\">Specified by:</span></dt>" + NL + + "<dt><span class=\"overrideSpecifyLabel\">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", - "<span class=\"strong\">Description copied from interface: <code>" + + "<span class=\"descfrmTypeLabel\">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><span class=\"strong\">Specified by:</span></dt>" + NL + + "<dt><span class=\"overrideSpecifyLabel\">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>" + @@ -240,14 +240,14 @@ //Make sure when no modifier appear in the class signature, the //signature is displayed correctly without extra space at the beginning. {BUG_ID + "-2" + FS + "pkg" + FS + "PrivateParent.html", - "<pre>class <span class=\"strong\">PrivateParent</span>"}, + "<pre>class <span class=\"typeNameLabel\">PrivateParent</span>"}, {BUG_ID + "-2" + FS + "pkg" + FS + "PublicChild.html", - "<pre>public class <span class=\"strong\">PublicChild</span>"}, + "<pre>public class <span class=\"typeNameLabel\">PublicChild</span>"}, }; private static final String[][] NEGATED_TEST2 = { {BUG_ID + "-2" + FS + "pkg" + FS + "PrivateParent.html", - "<pre> class <span class=\"strong\">PrivateParent</span>"}, + "<pre> class <span class=\"typeNameLabel\">PrivateParent</span>"}, }; /**
--- a/test/com/sun/javadoc/testProfiles/TestProfiles.java Fri Oct 18 15:03:34 2013 -0700 +++ b/test/com/sun/javadoc/testProfiles/TestProfiles.java Fri Oct 18 16:34:42 2013 -0700 @@ -23,7 +23,7 @@ /* * @test - * @bug 8006124 8009684 8016921 8023700 8024096 8008164 + * @bug 8006124 8009684 8016921 8023700 8024096 8008164 8026567 * @summary Test javadoc support for profiles. * @author Bhavesh Patel, Evgeniya Stepanova * @library ../lib/ @@ -122,17 +122,17 @@ }, {PROFILE_BUG_ID + FS + "deprecated-list.html","<td class=\"colOne\">" + "<a href=\"pkg2/Class1Pkg2.html\" title=\"class in pkg2\">pkg2.Class1Pkg2</a>" - + NL +"<div class=\"block\"><span class=\"italic\">Class1Pkg2. This class is deprecated</span></div>" + + NL +"<div class=\"block\"><span class=\"deprecationComment\">Class1Pkg2. This class is deprecated</span></div>" }, //Test deprecated package in profile {PROFILE_BUG_ID + FS + "deprecated-list.html","<td class=\"colOne\">" + "<a href=\"pkgDeprecated/package-summary.html\">pkgDeprecated</a>" - + NL +"<div class=\"block\"><span class=\"italic\">This package is <b>Deprecated</b>." + + NL +"<div class=\"block\"><span class=\"deprecationComment\">This package is <b>Deprecated</b>." + " Use pkg1.</span></div>" }, {PROFILE_BUG_ID + FS + "pkgDeprecated" + FS + "package-summary.html", - "<div class=\"deprecatedContent\"><span class=\"strong\">Deprecated.</span>" - + NL + "<div class=\"block\"><span class=\"italic\">This package is <b>Deprecated</b>." + "<div class=\"deprecatedContent\"><span class=\"deprecatedLabel\">Deprecated.</span>" + + NL + "<div class=\"block\"><span class=\"deprecationComment\">This package is <b>Deprecated</b>." + " Use pkg1.</span></div>" }, // need to add teststring when JDK-8015496 will be fixed
--- a/test/com/sun/javadoc/testProfiles/TestProfilesConfiguration.java Fri Oct 18 15:03:34 2013 -0700 +++ b/test/com/sun/javadoc/testProfiles/TestProfilesConfiguration.java Fri Oct 18 16:34:42 2013 -0700 @@ -23,7 +23,7 @@ /* * @test - * @bug 8006124 8009684 8015663 8015496 + * @bug 8006124 8009684 8015663 8015496 8026567 * @summary Test javadoc options support for profiles. * @author Evgeniya Stepanova * @library ../lib/ @@ -87,7 +87,7 @@ {PROFILE_CONFIGURATION_BUG_ID + FS + "compact1-summary.html", "<h3><a href=\"pkgDeprecated/compact1-package-summary.html\" target=\"" + "classFrame\">pkgDeprecated</a></h3>" + NL + "<div class=\"deprecatedContent\">" + - "<span class=\"strong\">Deprecated.</span></div>" + "<span class=\"deprecatedLabel\">Deprecated.</span></div>" } }; private static final String[][] PROFILES_CONFIGURATION_NEGATED_TEST = {
--- a/test/com/sun/javadoc/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java Fri Oct 18 15:03:34 2013 -0700 +++ b/test/com/sun/javadoc/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java Fri Oct 18 16:34:42 2013 -0700 @@ -25,7 +25,7 @@ /* * @test - * @bug 6802694 8025633 + * @bug 6802694 8025633 8026567 * @summary This test verifies deprecation info in serialized-form.html. * @author Bhavesh Patel * @library ../lib/ @@ -42,29 +42,29 @@ // display the inline comments, tags and deprecation information if any. private static final String[][] TEST_CMNT_DEPR = { {BUG_ID + FS + "serialized-form.html", "<dl>" + NL + - "<dt><span class=\"strong\">Throws:</span></dt>" + NL + "<dd><code>" + - "java.io.IOException</code></dd>"+ NL + "<dt><span class=\"strong\">See Also:</span>" + + "<dt><span class=\"throwsLabel\">Throws:</span></dt>" + NL + "<dd><code>" + + "java.io.IOException</code></dd>"+ NL + "<dt><span class=\"seeLabel\">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>" + - " <span class=\"italic\">As of JDK version 1.5, replaced by" + NL + + {BUG_ID + FS + "serialized-form.html", "<span class=\"deprecatedLabel\">Deprecated.</span>" + + " <span class=\"deprecationComment\">As of JDK version 1.5, replaced by" + NL + " <a href=\"pkg1/C1.html#setUndecorated-boolean-\">" + "<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>" + + "<dl>" + NL + "<dt><span class=\"simpleTagLabel\">Since:</span></dt>" + NL + + "<dd>1.4</dd>" + NL + "<dt><span class=\"seeLabel\">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>" + - " <span class=\"italic\">As of JDK version 1.5, replaced by" + NL + + {BUG_ID + FS + "serialized-form.html", "<span class=\"deprecatedLabel\">Deprecated.</span>" + + " <span class=\"deprecationComment\">As of JDK version 1.5, replaced by" + NL + " <a href=\"pkg1/C1.html#setUndecorated-boolean-\">" + "<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>" + + "<dl>" + NL + "<dt><span class=\"throwsLabel\">Throws:</span></dt>" + NL + "<dd><code><code>" + "IOException</code></code></dd>" + NL + "<dd><code>java.io.IOException</code></dd>" + NL + "</dl>"}, - {BUG_ID + FS + "serialized-form.html", "<span class=\"strong\">Deprecated.</span>" + + {BUG_ID + FS + "serialized-form.html", "<span class=\"deprecatedLabel\">Deprecated.</span>" + " </div>" + NL + "<div class=\"block\">" + "The name for this class.</div>"}}; @@ -73,12 +73,12 @@ // 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> <span class=\"italic\">" + + "<div class=\"block\"><span class=\"deprecatedLabel\">Deprecated.</span> <span class=\"deprecationComment\">" + "As of JDK version 1.5, replaced by" + NL + " <a href=\"pkg1/C1.html#setUndecorated-boolean-\"><code>" + "setUndecorated(boolean)</code></a>.</span></div>" + NL + "</li>"}, - {BUG_ID + FS + "serialized-form.html", "<span class=\"strong\">" + - "Deprecated.</span> <span class=\"italic\">As of JDK version" + + {BUG_ID + FS + "serialized-form.html", "<span class=\"deprecatedLabel\">" + + "Deprecated.</span> <span class=\"deprecationComment\">As of JDK version" + " 1.5, replaced by" + NL + " <a href=\"pkg1/C1.html#setUndecorated-boolean-\">" + "<code>setUndecorated(boolean)</code></a>.</span></div>" + NL + "</li>"}};
--- a/test/com/sun/javadoc/testSimpleTag/TestSimpleTag.java Fri Oct 18 15:03:34 2013 -0700 +++ b/test/com/sun/javadoc/testSimpleTag/TestSimpleTag.java Fri Oct 18 16:34:42 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 @@ -23,7 +23,7 @@ /* * @test - * @bug 4695326 4750173 4920381 + * @bug 4695326 4750173 4920381 8026567 * @summary Test the declarartion of simple tags using -tag. Verify that * "-tag name" is a shortcut for "-tag name:a:Name:". Also verity that * you can escape the ":" character with a back slash so that it is not @@ -42,13 +42,13 @@ private static final String[][] TEST = new String[][] { {"./" + BUG_ID + "/C.html", - "<span class=\"strong\">Todo:</span>"}, + "<span class=\"simpleTagLabel\">Todo:</span>"}, {"./" + BUG_ID + "/C.html", - "<span class=\"strong\">EJB Beans:</span>"}, + "<span class=\"simpleTagLabel\">EJB Beans:</span>"}, {"./" + BUG_ID + "/C.html", - "<span class=\"strong\">Regular Tag:</span>"}, + "<span class=\"simpleTagLabel\">Regular Tag:</span>"}, {"./" + BUG_ID + "/C.html", - "<span class=\"strong\">Back-Slash-Tag:</span>"}, + "<span class=\"simpleTagLabel\">Back-Slash-Tag:</span>"}, }; private static final String[] ARGS = new String[] {
--- a/test/com/sun/javadoc/testSimpleTagInherit/TestSimpleTagInherit.java Fri Oct 18 15:03:34 2013 -0700 +++ b/test/com/sun/javadoc/testSimpleTagInherit/TestSimpleTagInherit.java Fri Oct 18 16:34:42 2013 -0700 @@ -23,7 +23,7 @@ /* * @test - * @bug 8008768 + * @bug 8008768 8026567 * @summary Using {@inheritDoc} in simple tag defined via -tag fails * @library ../lib/ * @build JavadocTester TestSimpleTagInherit @@ -46,10 +46,10 @@ //Input for string search tests. private static final String[][] TEST = { { BUG_ID + FS + "p" + FS + "TestClass.html", - "<dt><span class=\"strong\"><em>Custom:</em></span></dt>" + NL + + "<dt><span class=\"simpleTagLabel\"><em>Custom:</em></span></dt>" + NL + "<dd>doc for BaseClass class</dd>" }, { BUG_ID + FS + "p" + FS + "TestClass.html", - "<dt><span class=\"strong\"><em>Custom:</em></span></dt>" + NL + + "<dt><span class=\"simpleTagLabel\"><em>Custom:</em></span></dt>" + NL + "<dd>doc for BaseClass method</dd>" } }; private static final String[][] NEGATED_TEST = NO_TEST;
--- a/test/com/sun/javadoc/testSinceTag/TestSinceTag.java Fri Oct 18 15:03:34 2013 -0700 +++ b/test/com/sun/javadoc/testSinceTag/TestSinceTag.java Fri Oct 18 16:34:42 2013 -0700 @@ -23,7 +23,7 @@ /* * @test - * @bug 7180906 + * @bug 7180906 8026567 * @summary Test to make sure that the since tag works correctly * @author Bhavesh Patel * @library ../lib/ @@ -48,11 +48,11 @@ //Input for string search tests. private static final String[][] TEST = { {BUG_ID + FS + "pkg1" + FS + "C1.html", - "<dl>" + NL + "<dt><span class=\"strong\">Since:</span></dt>" + NL + + "<dl>" + NL + "<dt><span class=\"simpleTagLabel\">Since:</span></dt>" + NL + "<dd>JDK1.0</dd>" }, {BUG_ID + FS + "serialized-form.html", - "<dl>" + NL + "<dt><span class=\"strong\">Since:</span></dt>" + NL + + "<dl>" + NL + "<dt><span class=\"simpleTagLabel\">Since:</span></dt>" + NL + "<dd>1.4</dd>" } };
--- a/test/com/sun/javadoc/testTagOutput/TestTagOutput.java Fri Oct 18 15:03:34 2013 -0700 +++ b/test/com/sun/javadoc/testTagOutput/TestTagOutput.java Fri Oct 18 16:34:42 2013 -0700 @@ -25,7 +25,7 @@ /* * @test - * @bug 8026370 + * @bug 8026370 8026567 * @summary This test checks the generated tag output. * @author Bhavesh Patel * @library ../lib/ @@ -38,15 +38,15 @@ private static final String BUG_ID = "8026370"; private static final String[][] TEST = { {BUG_ID + FS + "pkg1" + FS + "DeprecatedTag.html", - "<div class=\"block\"><span class=\"strong\">Deprecated.</span> </div>"}, + "<div class=\"block\"><span class=\"deprecatedLabel\">Deprecated.</span> </div>"}, {BUG_ID + FS + "pkg1" + FS + "DeprecatedTag.html", - "<div class=\"block\"><span class=\"strong\">Deprecated.</span> " + - "<span class=\"italic\">Do not use this.</span></div>"}}; + "<div class=\"block\"><span class=\"deprecatedLabel\">Deprecated.</span> " + + "<span class=\"deprecationComment\">Do not use this.</span></div>"}}; private static final String[][] NEGATED_TEST = { {BUG_ID + FS + "pkg1" + FS + "DeprecatedTag.html", - "<div class=\"block\"><span class=\"strong\">Deprecated." + - "</span> <span class=\"italic\"></span></div>"}}; + "<div class=\"block\"><span class=\"deprecatedLabel\">Deprecated." + + "</span> <span class=\"deprecationComment\"></span></div>"}}; private static final String[] ARGS = new String[] {
--- a/test/com/sun/javadoc/testTaglets/TestTaglets.java Fri Oct 18 15:03:34 2013 -0700 +++ b/test/com/sun/javadoc/testTaglets/TestTaglets.java Fri Oct 18 16:34:42 2013 -0700 @@ -55,7 +55,7 @@ //Input for string search tests. private static final String[][] TEST_4654308 = new String[][] { - {"4654308" + FS + "C.html", "<span class=\"strong\">Foo:</span></dt>" + + {"4654308" + FS + "C.html", "<span class=\"simpleTagLabel\">Foo:</span></dt>" + "<dd>my only method is <a href=\"C.html#method--\"><code>here" + "</code></a></dd></dl>"} };
--- a/test/com/sun/javadoc/testTaglets/taglets/Foo.java Fri Oct 18 15:03:34 2013 -0700 +++ b/test/com/sun/javadoc/testTaglets/taglets/Foo.java Fri Oct 18 16:34:42 2013 -0700 @@ -50,7 +50,7 @@ */ public Content getTagletOutput(Tag tag, TagletWriter writer) { ArrayList inlineTags = new ArrayList(); - inlineTags.add(new TextTag(tag.holder(), "<dt><span class=\"strong\">Foo:</span></dt><dd>")); + inlineTags.add(new TextTag(tag.holder(), "<dt><span class=\"simpleTagLabel\">Foo:</span></dt><dd>")); inlineTags.addAll(Arrays.asList(tag.inlineTags())); inlineTags.add(new TextTag(tag.holder(), "</dd>")); return writer.commentTagsToOutput(tag,
--- a/test/com/sun/javadoc/testThrowsHead/TestThrowsHead.java Fri Oct 18 15:03:34 2013 -0700 +++ b/test/com/sun/javadoc/testThrowsHead/TestThrowsHead.java Fri Oct 18 16:34:42 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 @@ -23,7 +23,7 @@ /** * @test - * @bug 4530727 + * @bug 4530727 8026567 * @summary When an exception is declared in the method signature but * not documented with a throws tag, we generate a link to it in the * throws section. Make sure that the link is below a Throws heading. @@ -38,7 +38,7 @@ private static final String BUG_ID = "4530727"; private static final String[][] TEST = { - {BUG_ID + FS + "C.html", "<dt><span class=\"strong\">Throws:</span>"} + {BUG_ID + FS + "C.html", "<dt><span class=\"throwsLabel\">Throws:</span>"} }; private static final String[][] NEGATED_TEST = NO_TEST; private static final String[] ARGS = new String[] {
--- a/test/com/sun/javadoc/testTypeAnnotations/TestTypeAnnotations.java Fri Oct 18 15:03:34 2013 -0700 +++ b/test/com/sun/javadoc/testTypeAnnotations/TestTypeAnnotations.java Fri Oct 18 16:34:42 2013 -0700 @@ -23,7 +23,7 @@ /* * @test - * @bug 8005091 8009686 8025633 + * @bug 8005091 8009686 8025633 8026567 * @summary Make sure that type annotations are displayed correctly * @author Bhavesh Patel * @library ../lib/ @@ -74,12 +74,12 @@ // Test for type annotations on Class Parameters (ClassParameters.java). {BUG_ID + FS + "typeannos" + FS + "ExtendsBound.html", - "class <span class=\"strong\">ExtendsBound<K extends <a " + + "class <span class=\"typeNameLabel\">ExtendsBound<K extends <a " + "href=\"../typeannos/ClassParamA.html\" title=\"annotation in " + "typeannos\">@ClassParamA</a> java.lang.String></span>" }, {BUG_ID + FS + "typeannos" + FS + "ExtendsGeneric.html", - "<pre>class <span class=\"strong\">ExtendsGeneric<K extends " + + "<pre>class <span class=\"typeNameLabel\">ExtendsGeneric<K extends " + "<a href=\"../typeannos/ClassParamA.html\" title=\"annotation in " + "typeannos\">@ClassParamA</a> <a href=\"../typeannos/Unannotated.html\" " + "title=\"class in typeannos\">Unannotated</a><<a href=\"" + @@ -87,24 +87,24 @@ "@ClassParamB</a> java.lang.String>></span>" }, {BUG_ID + FS + "typeannos" + FS + "TwoBounds.html", - "<pre>class <span class=\"strong\">TwoBounds<K extends <a href=\"" + + "<pre>class <span class=\"typeNameLabel\">TwoBounds<K extends <a href=\"" + "../typeannos/ClassParamA.html\" title=\"annotation in typeannos\">" + "@ClassParamA</a> java.lang.String,V extends <a href=\"../typeannos/" + "ClassParamB.html\" title=\"annotation in typeannos\">@ClassParamB" + "</a> java.lang.String></span>" }, {BUG_ID + FS + "typeannos" + FS + "Complex1.html", - "class <span class=\"strong\">Complex1<K extends <a href=\"../" + + "class <span class=\"typeNameLabel\">Complex1<K extends <a href=\"../" + "typeannos/ClassParamA.html\" title=\"annotation in typeannos\">" + "@ClassParamA</a> java.lang.String & java.lang.Runnable></span>" }, {BUG_ID + FS + "typeannos" + FS + "Complex2.html", - "class <span class=\"strong\">Complex2<K extends java.lang." + + "class <span class=\"typeNameLabel\">Complex2<K extends java.lang." + "String & <a href=\"../typeannos/ClassParamB.html\" title=\"" + "annotation in typeannos\">@ClassParamB</a> java.lang.Runnable></span>" }, {BUG_ID + FS + "typeannos" + FS + "ComplexBoth.html", - "class <span class=\"strong\">ComplexBoth<K extends <a href=\"" + + "class <span class=\"typeNameLabel\">ComplexBoth<K extends <a href=\"" + "../typeannos/ClassParamA.html\" title=\"annotation in typeannos\"" + ">@ClassParamA</a> java.lang.String & <a href=\"../typeannos/" + "ClassParamA.html\" title=\"annotation in typeannos\">@ClassParamA" +
--- a/test/com/sun/javadoc/testValueTag/TestValueTag.java Fri Oct 18 15:03:34 2013 -0700 +++ b/test/com/sun/javadoc/testValueTag/TestValueTag.java Fri Oct 18 16:34:42 2013 -0700 @@ -23,7 +23,7 @@ /* * @test - * @bug 4764045 8004825 + * @bug 4764045 8004825 8026567 * @summary This test ensures that the value tag works in all * use cases. The explainations for each test case are written below. * @author jamieh @@ -94,7 +94,7 @@ "Result: <a href=\"../pkg2/Class3.html#TEST_17_PASSES\">\"Test 17 passes\"</a>"}, //Test @value tag used with custom tag. {BUG_ID + FS + "pkg1" + FS + "CustomTagUsage.html", - "<dt><span class=\"strong\">Todo:</span></dt>" + NL + + "<dt><span class=\"simpleTagLabel\">Todo:</span></dt>" + NL + "<dd>the value of this constant is 55.</dd>"}, //Test @value errors printed dues to invalid use or when used with //non-constant or with bad references.