Mercurial > jdk8-mips64-public > langtools / changeset
changeset
8026567: Use meaningful style names for strong and italic styles.
Fri, 18 Oct 2013 16:34:42 -0700
- author
- bpatel
- date
- Fri, 18 Oct 2013 16:34:42 -0700
- changeset 2147
- 130b8c0e570e
- parent 2146
- 7de97abc4a5c
- child 2148
- c4292590fc70
8026567: Use meaningful style names for strong and italic styles.
Reviewed-by: jjg
1.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java Fri Oct 18 15:03:34 2013 -0700 1.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java Fri Oct 18 16:34:42 2013 -0700 1.3 @@ -101,10 +101,10 @@ 1.4 Content tdSummary) { 1.5 ExecutableMemberDoc emd = (ExecutableMemberDoc)member; 1.6 String name = emd.name(); 1.7 - Content strong = HtmlTree.SPAN(HtmlStyle.strong, 1.8 + Content memberLink = HtmlTree.SPAN(HtmlStyle.memberNameLink, 1.9 writer.getDocLink(context, cd, (MemberDoc) emd, 1.10 name, false)); 1.11 - Content code = HtmlTree.CODE(strong); 1.12 + Content code = HtmlTree.CODE(memberLink); 1.13 addParameters(emd, false, code, name.length() - 1); 1.14 tdSummary.addContent(code); 1.15 }
2.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/AbstractIndexWriter.java Fri Oct 18 15:03:34 2013 -0700 2.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AbstractIndexWriter.java Fri Oct 18 16:34:42 2013 -0700 2.3 @@ -176,7 +176,7 @@ 2.4 String name = (member instanceof ExecutableMemberDoc)? 2.5 member.name() + ((ExecutableMemberDoc)member).flatSignature() : 2.6 member.name(); 2.7 - Content span = HtmlTree.SPAN(HtmlStyle.strong, 2.8 + Content span = HtmlTree.SPAN(HtmlStyle.memberNameLink, 2.9 getDocLink(LinkInfoImpl.Kind.INDEX, member, name)); 2.10 Content dt = HtmlTree.DT(span); 2.11 dt.addContent(" - "); 2.12 @@ -198,7 +198,7 @@ 2.13 */ 2.14 protected void addComment(ProgramElementDoc element, Content contentTree) { 2.15 Tag[] tags; 2.16 - Content span = HtmlTree.SPAN(HtmlStyle.strong, deprecatedPhrase); 2.17 + Content span = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, deprecatedPhrase); 2.18 HtmlTree div = new HtmlTree(HtmlTag.DIV); 2.19 div.addStyle(HtmlStyle.block); 2.20 if (Util.isDeprecated(element)) {
3.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java Fri Oct 18 15:03:34 2013 -0700 3.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java Fri Oct 18 16:34:42 2013 -0700 3.3 @@ -480,7 +480,7 @@ 3.4 if (cd != null && !(pgmdoc instanceof ConstructorDoc) 3.5 && !(pgmdoc instanceof ClassDoc)) { 3.6 HtmlTree name = new HtmlTree(HtmlTag.SPAN); 3.7 - name.addStyle(HtmlStyle.strong); 3.8 + name.addStyle(HtmlStyle.typeNameLabel); 3.9 name.addContent(cd.name() + "."); 3.10 tdLast.addContent(name); 3.11 }
4.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeFieldWriterImpl.java Fri Oct 18 15:03:34 2013 -0700 4.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeFieldWriterImpl.java Fri Oct 18 16:34:42 2013 -0700 4.3 @@ -237,9 +237,9 @@ 4.4 */ 4.5 protected void addSummaryLink(LinkInfoImpl.Kind context, ClassDoc cd, ProgramElementDoc member, 4.6 Content tdSummary) { 4.7 - Content strong = HtmlTree.SPAN(HtmlStyle.strong, 4.8 + Content memberLink = HtmlTree.SPAN(HtmlStyle.memberNameLink, 4.9 writer.getDocLink(context, (MemberDoc) member, member.name(), false)); 4.10 - Content code = HtmlTree.CODE(strong); 4.11 + Content code = HtmlTree.CODE(memberLink); 4.12 tdSummary.addContent(code); 4.13 } 4.14
5.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java Fri Oct 18 15:03:34 2013 -0700 5.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java Fri Oct 18 16:34:42 2013 -0700 5.3 @@ -239,9 +239,9 @@ 5.4 */ 5.5 protected void addSummaryLink(LinkInfoImpl.Kind context, ClassDoc cd, ProgramElementDoc member, 5.6 Content tdSummary) { 5.7 - Content strong = HtmlTree.SPAN(HtmlStyle.strong, 5.8 + Content memberLink = HtmlTree.SPAN(HtmlStyle.memberNameLink, 5.9 writer.getDocLink(context, (MemberDoc) member, member.name(), false)); 5.10 - Content code = HtmlTree.CODE(strong); 5.11 + Content code = HtmlTree.CODE(memberLink); 5.12 tdSummary.addContent(code); 5.13 } 5.14
6.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java Fri Oct 18 15:03:34 2013 -0700 6.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java Fri Oct 18 16:34:42 2013 -0700 6.3 @@ -227,7 +227,7 @@ 6.4 addSrcLink(annotationType, annotationName, pre); 6.5 pre.addContent(parameterLinks); 6.6 } else { 6.7 - Content span = HtmlTree.SPAN(HtmlStyle.strong, annotationName); 6.8 + Content span = HtmlTree.SPAN(HtmlStyle.memberNameLabel, annotationName); 6.9 span.addContent(parameterLinks); 6.10 pre.addContent(span); 6.11 } 6.12 @@ -262,8 +262,8 @@ 6.13 annotationInfoTree.addContent(hr); 6.14 Tag[] deprs = annotationType.tags("deprecated"); 6.15 if (Util.isDeprecated(annotationType)) { 6.16 - Content strong = HtmlTree.SPAN(HtmlStyle.strong, deprecatedPhrase); 6.17 - Content div = HtmlTree.DIV(HtmlStyle.block, strong); 6.18 + Content deprLabel = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, deprecatedPhrase); 6.19 + Content div = HtmlTree.DIV(HtmlStyle.block, deprLabel); 6.20 if (deprs.length > 0) { 6.21 Tag[] commentTags = deprs[0].inlineTags(); 6.22 if (commentTags.length > 0) {
7.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java Fri Oct 18 15:03:34 2013 -0700 7.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java Fri Oct 18 16:34:42 2013 -0700 7.3 @@ -254,7 +254,7 @@ 7.4 addSrcLink(classDoc, className, pre); 7.5 pre.addContent(parameterLinks); 7.6 } else { 7.7 - Content span = HtmlTree.SPAN(HtmlStyle.strong, className); 7.8 + Content span = HtmlTree.SPAN(HtmlStyle.typeNameLabel, className); 7.9 span.addContent(parameterLinks); 7.10 pre.addContent(span); 7.11 } 7.12 @@ -547,8 +547,8 @@ 7.13 classInfoTree.addContent(hr); 7.14 Tag[] deprs = classDoc.tags("deprecated"); 7.15 if (Util.isDeprecated(classDoc)) { 7.16 - Content strong = HtmlTree.SPAN(HtmlStyle.strong, deprecatedPhrase); 7.17 - Content div = HtmlTree.DIV(HtmlStyle.block, strong); 7.18 + Content deprLabel = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, deprecatedPhrase); 7.19 + Content div = HtmlTree.DIV(HtmlStyle.block, deprLabel); 7.20 if (deprs.length > 0) { 7.21 Tag[] commentTags = deprs[0].inlineTags(); 7.22 if (commentTags.length > 0) {
8.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/EnumConstantWriterImpl.java Fri Oct 18 15:03:34 2013 -0700 8.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/EnumConstantWriterImpl.java Fri Oct 18 16:34:42 2013 -0700 8.3 @@ -224,9 +224,9 @@ 8.4 */ 8.5 protected void addSummaryLink(LinkInfoImpl.Kind context, ClassDoc cd, ProgramElementDoc member, 8.6 Content tdSummary) { 8.7 - Content strong = HtmlTree.SPAN(HtmlStyle.strong, 8.8 + Content memberLink = HtmlTree.SPAN(HtmlStyle.memberNameLink, 8.9 writer.getDocLink(context, (MemberDoc) member, member.name(), false)); 8.10 - Content code = HtmlTree.CODE(strong); 8.11 + Content code = HtmlTree.CODE(memberLink); 8.12 tdSummary.addContent(code); 8.13 } 8.14
9.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/FieldWriterImpl.java Fri Oct 18 15:03:34 2013 -0700 9.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/FieldWriterImpl.java Fri Oct 18 16:34:42 2013 -0700 9.3 @@ -140,11 +140,11 @@ 9.4 holder.typeName() : holder.qualifiedTypeName(), 9.5 false); 9.6 Content codeLink = HtmlTree.CODE(link); 9.7 - Content strong = HtmlTree.SPAN(HtmlStyle.strong, holder.isClass()? 9.8 + Content descfrmLabel = HtmlTree.SPAN(HtmlStyle.descfrmTypeLabel, holder.isClass()? 9.9 writer.descfrmClassLabel : writer.descfrmInterfaceLabel); 9.10 - strong.addContent(writer.getSpace()); 9.11 - strong.addContent(codeLink); 9.12 - fieldDocTree.addContent(HtmlTree.DIV(HtmlStyle.block, strong)); 9.13 + descfrmLabel.addContent(writer.getSpace()); 9.14 + descfrmLabel.addContent(codeLink); 9.15 + fieldDocTree.addContent(HtmlTree.DIV(HtmlStyle.block, descfrmLabel)); 9.16 writer.addInlineComment(field, fieldDocTree); 9.17 } 9.18 } 9.19 @@ -258,9 +258,9 @@ 9.20 */ 9.21 protected void addSummaryLink(LinkInfoImpl.Kind context, ClassDoc cd, ProgramElementDoc member, 9.22 Content tdSummary) { 9.23 - Content strong = HtmlTree.SPAN(HtmlStyle.strong, 9.24 + Content memberLink = HtmlTree.SPAN(HtmlStyle.memberNameLink, 9.25 writer.getDocLink(context, cd , (MemberDoc) member, member.name(), false)); 9.26 - Content code = HtmlTree.CODE(strong); 9.27 + Content code = HtmlTree.CODE(memberLink); 9.28 tdSummary.addContent(code); 9.29 } 9.30
10.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/HelpWriter.java Fri Oct 18 15:03:34 2013 -0700 10.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/HelpWriter.java Fri Oct 18 16:34:42 2013 -0700 10.3 @@ -316,7 +316,7 @@ 10.4 liConst.addContent(constPara); 10.5 ul.addContent(liConst); 10.6 Content divContent = HtmlTree.DIV(HtmlStyle.contentContainer, ul); 10.7 - Content line30 = HtmlTree.SPAN(HtmlStyle.italic, getResource("doclet.Help_line_30")); 10.8 + Content line30 = HtmlTree.SPAN(HtmlStyle.emphasizedPhrase, getResource("doclet.Help_line_30")); 10.9 divContent.addContent(line30); 10.10 contentTree.addContent(divContent); 10.11 }
11.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java Fri Oct 18 15:03:34 2013 -0700 11.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java Fri Oct 18 16:34:42 2013 -0700 11.3 @@ -1051,7 +1051,7 @@ 11.4 11.5 public Content italicsClassName(ClassDoc cd, boolean qual) { 11.6 Content name = new StringContent((qual)? cd.qualifiedName(): cd.name()); 11.7 - return (cd.isInterface())? HtmlTree.SPAN(HtmlStyle.italic, name): name; 11.8 + return (cd.isInterface())? HtmlTree.SPAN(HtmlStyle.interfaceName, name): name; 11.9 } 11.10 11.11 /** 11.12 @@ -1567,7 +1567,7 @@ 11.13 Content div; 11.14 Content result = commentTagsToContent(null, doc, tags, first); 11.15 if (depr) { 11.16 - Content italic = HtmlTree.SPAN(HtmlStyle.italic, result); 11.17 + Content italic = HtmlTree.SPAN(HtmlStyle.deprecationComment, result); 11.18 div = HtmlTree.DIV(HtmlStyle.block, italic); 11.19 htmltree.addContent(div); 11.20 }
12.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java Fri Oct 18 15:03:34 2013 -0700 12.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java Fri Oct 18 16:34:42 2013 -0700 12.3 @@ -160,11 +160,11 @@ 12.4 holder.typeName() : holder.qualifiedTypeName(), 12.5 false); 12.6 Content codelLink = HtmlTree.CODE(link); 12.7 - Content strong = HtmlTree.SPAN(HtmlStyle.strong, holder.asClassDoc().isClass()? 12.8 + Content descfrmLabel = HtmlTree.SPAN(HtmlStyle.descfrmTypeLabel, holder.asClassDoc().isClass()? 12.9 writer.descfrmClassLabel : writer.descfrmInterfaceLabel); 12.10 - strong.addContent(writer.getSpace()); 12.11 - strong.addContent(codelLink); 12.12 - methodDocTree.addContent(HtmlTree.DIV(HtmlStyle.block, strong)); 12.13 + descfrmLabel.addContent(writer.getSpace()); 12.14 + descfrmLabel.addContent(codelLink); 12.15 + methodDocTree.addContent(HtmlTree.DIV(HtmlStyle.block, descfrmLabel)); 12.16 writer.addInlineComment(method, methodDocTree); 12.17 } 12.18 } 12.19 @@ -310,7 +310,7 @@ 12.20 label = writer.specifiedByLabel; 12.21 context = LinkInfoImpl.Kind.METHOD_SPECIFIED_BY; 12.22 } 12.23 - Content dt = HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.strong, label)); 12.24 + Content dt = HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.overrideSpecifyLabel, label)); 12.25 dl.addContent(dt); 12.26 Content overriddenTypeLink = 12.27 writer.getLink(new LinkInfoImpl(writer.configuration, context, overriddenType)); 12.28 @@ -365,7 +365,7 @@ 12.29 Content intfaclink = writer.getLink(new LinkInfoImpl( 12.30 writer.configuration, LinkInfoImpl.Kind.METHOD_SPECIFIED_BY, intfac)); 12.31 Content codeIntfacLink = HtmlTree.CODE(intfaclink); 12.32 - Content dt = HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.strong, writer.specifiedByLabel)); 12.33 + Content dt = HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.overrideSpecifyLabel, writer.specifiedByLabel)); 12.34 dl.addContent(dt); 12.35 Content methlink = writer.getDocLink( 12.36 LinkInfoImpl.Kind.MEMBER, implementedMeth,
13.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/NestedClassWriterImpl.java Fri Oct 18 15:03:34 2013 -0700 13.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/NestedClassWriterImpl.java Fri Oct 18 16:34:42 2013 -0700 13.3 @@ -166,9 +166,9 @@ 13.4 */ 13.5 protected void addSummaryLink(LinkInfoImpl.Kind context, ClassDoc cd, ProgramElementDoc member, 13.6 Content tdSummary) { 13.7 - Content strong = HtmlTree.SPAN(HtmlStyle.strong, 13.8 + Content memberLink = HtmlTree.SPAN(HtmlStyle.memberNameLink, 13.9 writer.getLink(new LinkInfoImpl(configuration, context, (ClassDoc)member))); 13.10 - Content code = HtmlTree.CODE(strong); 13.11 + Content code = HtmlTree.CODE(memberLink); 13.12 tdSummary.addContent(code); 13.13 } 13.14
14.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java Fri Oct 18 15:03:34 2013 -0700 14.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java Fri Oct 18 16:34:42 2013 -0700 14.3 @@ -183,7 +183,7 @@ 14.4 printedHeader = true; 14.5 } 14.6 Content arr_i_name = new StringContent(arr[i].name()); 14.7 - if (arr[i].isInterface()) arr_i_name = HtmlTree.SPAN(HtmlStyle.italic, arr_i_name); 14.8 + if (arr[i].isInterface()) arr_i_name = HtmlTree.SPAN(HtmlStyle.interfaceName, arr_i_name); 14.9 Content link = getLink(new LinkInfoImpl(configuration, 14.10 LinkInfoImpl.Kind.PACKAGE_FRAME, arr[i]).label(arr_i_name).target("classFrame")); 14.11 Content li = HtmlTree.LI(link);
15.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/PackageTreeWriter.java Fri Oct 18 15:03:34 2013 -0700 15.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/PackageTreeWriter.java Fri Oct 18 16:34:42 2013 -0700 15.3 @@ -155,7 +155,7 @@ 15.4 * @param div the content tree to which the link will be added 15.5 */ 15.6 protected void addLinkToMainTree(Content div) { 15.7 - Content span = HtmlTree.SPAN(HtmlStyle.strong, 15.8 + Content span = HtmlTree.SPAN(HtmlStyle.packageHierarchyLabel, 15.9 getResource("doclet.Package_Hierarchies")); 15.10 div.addContent(span); 15.11 HtmlTree ul = new HtmlTree (HtmlTag.UL);
16.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/PackageWriterImpl.java Fri Oct 18 15:03:34 2013 -0700 16.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/PackageWriterImpl.java Fri Oct 18 16:34:42 2013 -0700 16.3 @@ -141,7 +141,7 @@ 16.4 if (Util.isDeprecated(packageDoc)) { 16.5 HtmlTree deprDiv = new HtmlTree(HtmlTag.DIV); 16.6 deprDiv.addStyle(HtmlStyle.deprecatedContent); 16.7 - Content deprPhrase = HtmlTree.SPAN(HtmlStyle.strong, deprecatedPhrase); 16.8 + Content deprPhrase = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, deprecatedPhrase); 16.9 deprDiv.addContent(deprPhrase); 16.10 if (deprs.length > 0) { 16.11 Tag[] commentTags = deprs[0].inlineTags();
17.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/ProfilePackageFrameWriter.java Fri Oct 18 15:03:34 2013 -0700 17.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/ProfilePackageFrameWriter.java Fri Oct 18 16:34:42 2013 -0700 17.3 @@ -174,7 +174,7 @@ 17.4 printedHeader = true; 17.5 } 17.6 Content arr_i_name = new StringContent(arr[i].name()); 17.7 - if (arr[i].isInterface()) arr_i_name = HtmlTree.SPAN(HtmlStyle.italic, arr_i_name); 17.8 + if (arr[i].isInterface()) arr_i_name = HtmlTree.SPAN(HtmlStyle.interfaceName, arr_i_name); 17.9 Content link = getLink(new LinkInfoImpl(configuration, 17.10 LinkInfoImpl.Kind.PACKAGE_FRAME, arr[i]).label(arr_i_name).target("classFrame")); 17.11 Content li = HtmlTree.LI(link);
18.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/ProfilePackageWriterImpl.java Fri Oct 18 15:03:34 2013 -0700 18.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/ProfilePackageWriterImpl.java Fri Oct 18 16:34:42 2013 -0700 18.3 @@ -158,7 +158,7 @@ 18.4 if (Util.isDeprecated(packageDoc)) { 18.5 HtmlTree deprDiv = new HtmlTree(HtmlTag.DIV); 18.6 deprDiv.addStyle(HtmlStyle.deprecatedContent); 18.7 - Content deprPhrase = HtmlTree.SPAN(HtmlStyle.strong, deprecatedPhrase); 18.8 + Content deprPhrase = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, deprecatedPhrase); 18.9 deprDiv.addContent(deprPhrase); 18.10 if (deprs.length > 0) { 18.11 Tag[] commentTags = deprs[0].inlineTags();
19.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/ProfileWriterImpl.java Fri Oct 18 15:03:34 2013 -0700 19.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/ProfileWriterImpl.java Fri Oct 18 16:34:42 2013 -0700 19.3 @@ -187,7 +187,7 @@ 19.4 deprs = pkg.tags("deprecated"); 19.5 HtmlTree deprDiv = new HtmlTree(HtmlTag.DIV); 19.6 deprDiv.addStyle(HtmlStyle.deprecatedContent); 19.7 - Content deprPhrase = HtmlTree.SPAN(HtmlStyle.strong, deprecatedPhrase); 19.8 + Content deprPhrase = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, deprecatedPhrase); 19.9 deprDiv.addContent(deprPhrase); 19.10 if (deprs.length > 0) { 19.11 Tag[] commentTags = deprs[0].inlineTags();
20.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/PropertyWriterImpl.java Fri Oct 18 15:03:34 2013 -0700 20.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/PropertyWriterImpl.java Fri Oct 18 16:34:42 2013 -0700 20.3 @@ -136,11 +136,11 @@ 20.4 holder.typeName() : holder.qualifiedTypeName(), 20.5 false); 20.6 Content codeLink = HtmlTree.CODE(link); 20.7 - Content strong = HtmlTree.SPAN(HtmlStyle.strong, holder.isClass()? 20.8 + Content descfrmLabel = HtmlTree.SPAN(HtmlStyle.descfrmTypeLabel, holder.isClass()? 20.9 writer.descfrmClassLabel : writer.descfrmInterfaceLabel); 20.10 - strong.addContent(writer.getSpace()); 20.11 - strong.addContent(codeLink); 20.12 - propertyDocTree.addContent(HtmlTree.DIV(HtmlStyle.block, strong)); 20.13 + descfrmLabel.addContent(writer.getSpace()); 20.14 + descfrmLabel.addContent(codeLink); 20.15 + propertyDocTree.addContent(HtmlTree.DIV(HtmlStyle.block, descfrmLabel)); 20.16 writer.addInlineComment(property, propertyDocTree); 20.17 } 20.18 } 20.19 @@ -255,14 +255,14 @@ 20.20 */ 20.21 protected void addSummaryLink(LinkInfoImpl.Kind context, ClassDoc cd, ProgramElementDoc member, 20.22 Content tdSummary) { 20.23 - Content strong = HtmlTree.SPAN(HtmlStyle.strong, 20.24 + Content memberLink = HtmlTree.SPAN(HtmlStyle.memberNameLink, 20.25 writer.getDocLink(context, cd, 20.26 (MemberDoc) member, 20.27 member.name().substring(0, member.name().lastIndexOf("Property")), 20.28 false, 20.29 true)); 20.30 20.31 - Content code = HtmlTree.CODE(strong); 20.32 + Content code = HtmlTree.CODE(memberLink); 20.33 tdSummary.addContent(code); 20.34 } 20.35
21.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/SubWriterHolderWriter.java Fri Oct 18 15:03:34 2013 -0700 21.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/SubWriterHolderWriter.java Fri Oct 18 16:34:42 2013 -0700 21.3 @@ -175,8 +175,8 @@ 21.4 Tag[] deprs = member.tags("deprecated"); 21.5 Content div; 21.6 if (Util.isDeprecated((ProgramElementDoc) member)) { 21.7 - Content strong = HtmlTree.SPAN(HtmlStyle.strong, deprecatedPhrase); 21.8 - div = HtmlTree.DIV(HtmlStyle.block, strong); 21.9 + Content deprLabel = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, deprecatedPhrase); 21.10 + div = HtmlTree.DIV(HtmlStyle.block, deprLabel); 21.11 div.addContent(getSpace()); 21.12 if (deprs.length > 0) { 21.13 addInlineDeprecatedComment(member, deprs[0], div); 21.14 @@ -186,8 +186,8 @@ 21.15 } else { 21.16 ClassDoc cd = ((ProgramElementDoc)member).containingClass(); 21.17 if (cd != null && Util.isDeprecated(cd)) { 21.18 - Content strong = HtmlTree.SPAN(HtmlStyle.strong, deprecatedPhrase); 21.19 - div = HtmlTree.DIV(HtmlStyle.block, strong); 21.20 + Content deprLabel = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, deprecatedPhrase); 21.21 + div = HtmlTree.DIV(HtmlStyle.block, deprLabel); 21.22 div.addContent(getSpace()); 21.23 tdSummary.addContent(div); 21.24 }
22.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java Fri Oct 18 15:03:34 2013 -0700 22.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java Fri Oct 18 16:34:42 2013 -0700 22.3 @@ -97,7 +97,7 @@ 22.4 Tag[] deprs = doc.tags("deprecated"); 22.5 if (doc instanceof ClassDoc) { 22.6 if (Util.isDeprecated((ProgramElementDoc) doc)) { 22.7 - result.addContent(HtmlTree.SPAN(HtmlStyle.strong, 22.8 + result.addContent(HtmlTree.SPAN(HtmlStyle.deprecatedLabel, 22.9 new StringContent(configuration.getText("doclet.Deprecated")))); 22.10 result.addContent(RawHtml.nbsp); 22.11 if (deprs.length > 0) { 22.12 @@ -112,18 +112,18 @@ 22.13 } else { 22.14 MemberDoc member = (MemberDoc) doc; 22.15 if (Util.isDeprecated((ProgramElementDoc) doc)) { 22.16 - result.addContent(HtmlTree.SPAN(HtmlStyle.strong, 22.17 + result.addContent(HtmlTree.SPAN(HtmlStyle.deprecatedLabel, 22.18 new StringContent(configuration.getText("doclet.Deprecated")))); 22.19 result.addContent(RawHtml.nbsp); 22.20 if (deprs.length > 0) { 22.21 Content body = commentTagsToOutput(null, doc, 22.22 deprs[0].inlineTags(), false); 22.23 if (!body.isEmpty()) 22.24 - result.addContent(HtmlTree.SPAN(HtmlStyle.italic, body)); 22.25 + result.addContent(HtmlTree.SPAN(HtmlStyle.deprecationComment, body)); 22.26 } 22.27 } else { 22.28 if (Util.isDeprecated(member.containingClass())) { 22.29 - result.addContent(HtmlTree.SPAN(HtmlStyle.strong, 22.30 + result.addContent(HtmlTree.SPAN(HtmlStyle.deprecatedLabel, 22.31 new StringContent(configuration.getText("doclet.Deprecated")))); 22.32 result.addContent(RawHtml.nbsp); 22.33 } 22.34 @@ -151,7 +151,7 @@ 22.35 * {@inheritDoc} 22.36 */ 22.37 public Content getParamHeader(String header) { 22.38 - HtmlTree result = HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.strong, 22.39 + HtmlTree result = HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.paramLabel, 22.40 new StringContent(header))); 22.41 return result; 22.42 } 22.43 @@ -186,7 +186,7 @@ 22.44 */ 22.45 public Content returnTagOutput(Tag returnTag) { 22.46 ContentBuilder result = new ContentBuilder(); 22.47 - result.addContent(HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.strong, 22.48 + result.addContent(HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.returnLabel, 22.49 new StringContent(configuration.getText("doclet.Returns"))))); 22.50 result.addContent(HtmlTree.DD(htmlWriter.commentTagsToContent( 22.51 returnTag, null, returnTag.inlineTags(), false))); 22.52 @@ -231,7 +231,7 @@ 22.53 return body; 22.54 22.55 ContentBuilder result = new ContentBuilder(); 22.56 - result.addContent(HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.strong, 22.57 + result.addContent(HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.seeLabel, 22.58 new StringContent(configuration.getText("doclet.See_Also"))))); 22.59 result.addContent(HtmlTree.DD(body)); 22.60 return result; 22.61 @@ -250,7 +250,7 @@ 22.62 */ 22.63 public Content simpleTagOutput(Tag[] simpleTags, String header) { 22.64 ContentBuilder result = new ContentBuilder(); 22.65 - result.addContent(HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.strong, new RawHtml(header)))); 22.66 + result.addContent(HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.simpleTagLabel, new RawHtml(header)))); 22.67 ContentBuilder body = new ContentBuilder(); 22.68 for (int i = 0; i < simpleTags.length; i++) { 22.69 if (i > 0) { 22.70 @@ -268,7 +268,7 @@ 22.71 */ 22.72 public Content simpleTagOutput(Tag simpleTag, String header) { 22.73 ContentBuilder result = new ContentBuilder(); 22.74 - result.addContent(HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.strong, new RawHtml(header)))); 22.75 + result.addContent(HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.simpleTagLabel, new RawHtml(header)))); 22.76 Content body = htmlWriter.commentTagsToContent( 22.77 simpleTag, null, simpleTag.inlineTags(), false); 22.78 result.addContent(HtmlTree.DD(body)); 22.79 @@ -279,7 +279,7 @@ 22.80 * {@inheritDoc} 22.81 */ 22.82 public Content getThrowsHeader() { 22.83 - HtmlTree result = HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.strong, 22.84 + HtmlTree result = HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.throwsLabel, 22.85 new StringContent(configuration.getText("doclet.Throws")))); 22.86 return result; 22.87 }
23.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/TreeWriter.java Fri Oct 18 15:03:34 2013 -0700 23.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/TreeWriter.java Fri Oct 18 16:34:42 2013 -0700 23.3 @@ -131,7 +131,7 @@ 23.4 return; 23.5 } 23.6 if (!classesonly) { 23.7 - Content span = HtmlTree.SPAN(HtmlStyle.strong, 23.8 + Content span = HtmlTree.SPAN(HtmlStyle.packageHierarchyLabel, 23.9 getResource("doclet.Package_Hierarchies")); 23.10 contentTree.addContent(span); 23.11 HtmlTree ul = new HtmlTree(HtmlTag.UL);
24.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java Fri Oct 18 15:03:34 2013 -0700 24.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java Fri Oct 18 16:34:42 2013 -0700 24.3 @@ -236,7 +236,7 @@ 24.4 String stylename, String title, String target) { 24.5 Content body = label; 24.6 if (strong) { 24.7 - body = HtmlTree.SPAN(HtmlStyle.strong, body); 24.8 + body = HtmlTree.SPAN(HtmlStyle.typeNameLink, body); 24.9 } 24.10 if (stylename != null && stylename.length() != 0) { 24.11 HtmlTree t = new HtmlTree(HtmlTag.FONT, body);
25.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlStyle.java Fri Oct 18 15:03:34 2013 -0700 25.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlStyle.java Fri Oct 18 16:34:42 2013 -0700 25.3 @@ -52,37 +52,51 @@ 25.4 constantValuesContainer, 25.5 contentContainer, 25.6 deprecatedContent, 25.7 + deprecatedLabel, 25.8 deprecatedSummary, 25.9 + deprecationComment, 25.10 description, 25.11 + descfrmTypeLabel, 25.12 details, 25.13 docSummary, 25.14 + emphasizedPhrase, 25.15 header, 25.16 horizontal, 25.17 footer, 25.18 indexContainer, 25.19 indexHeader, 25.20 inheritance, 25.21 - italic, 25.22 + interfaceName, 25.23 legalCopy, 25.24 + memberNameLabel, 25.25 + memberNameLink, 25.26 memberSummary, 25.27 nameValue, 25.28 navBarCell1Rev, 25.29 navList, 25.30 + overrideSpecifyLabel, 25.31 overviewSummary, 25.32 + packageHierarchyLabel, 25.33 + paramLabel, 25.34 + returnLabel, 25.35 rowColor, 25.36 + seeLabel, 25.37 serializedFormContainer, 25.38 + simpleTagLabel, 25.39 skipNav, 25.40 sourceContainer, 25.41 sourceLineNo, 25.42 - strong, 25.43 subNav, 25.44 subNavList, 25.45 subTitle, 25.46 summary, 25.47 tabEnd, 25.48 tableTab, 25.49 + throwsLabel, 25.50 title, 25.51 topNav, 25.52 + typeNameLabel, 25.53 + typeNameLink, 25.54 typeSummary, 25.55 useSummary; 25.56 }
26.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css Fri Oct 18 15:03:34 2013 -0700 26.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css Fri Oct 18 16:34:42 2013 -0700 26.3 @@ -514,9 +514,11 @@ 26.4 display:block; 26.5 margin:3px 0 0 0; 26.6 } 26.7 -.strong { 26.8 +.deprecatedLabel, .descfrmTypeLabel, .memberNameLabel, .memberNameLink, 26.9 +.overrideSpecifyLabel, .packageHierarchyLabel, .paramLabel, .returnLabel, 26.10 +.seeLabel, .simpleTagLabel, .throwsLabel, .typeNameLabel, .typeNameLink { 26.11 font-weight:bold; 26.12 } 26.13 -.italic { 26.14 +.deprecationComment, .emphasizedPhrase, .interfaceName { 26.15 font-style:italic; 26.16 }
27.1 --- a/test/com/sun/javadoc/AuthorDD/AuthorDD.java Fri Oct 18 15:03:34 2013 -0700 27.2 +++ b/test/com/sun/javadoc/AuthorDD/AuthorDD.java Fri Oct 18 16:34:42 2013 -0700 27.3 @@ -23,7 +23,7 @@ 27.4 27.5 /* 27.6 * @test 27.7 - * @bug 4651598 27.8 + * @bug 4651598 8026567 27.9 * @summary Javadoc wrongly inserts </DD> tags when using multiple @author tags 27.10 * @author dkramer 27.11 * @run main AuthorDD 27.12 @@ -86,12 +86,12 @@ 27.13 27.14 // Test single @since tag: 27.15 27.16 - { "<dt><span class=\"strong\">Since:</span></dt>"+NL+"<dd>JDK 1.0</dd>", 27.17 + { "<dt><span class=\"simpleTagLabel\">Since:</span></dt>"+NL+"<dd>JDK 1.0</dd>", 27.18 BUGID + FS + "p1" + FS + "C1.html" }, 27.19 27.20 // Test multiple @author tags: 27.21 27.22 - { "<dt><span class=\"strong\">Author:</span></dt>"+NL+"<dd>Doug Kramer, Jamie, Neal</dd>", 27.23 + { "<dt><span class=\"simpleTagLabel\">Author:</span></dt>"+NL+"<dd>Doug Kramer, Jamie, Neal</dd>", 27.24 BUGID + FS + "p1" + FS + "C1.html" }, 27.25 27.26 };
28.1 --- a/test/com/sun/javadoc/testAnnotationTypes/TestAnnotationTypes.java Fri Oct 18 15:03:34 2013 -0700 28.2 +++ b/test/com/sun/javadoc/testAnnotationTypes/TestAnnotationTypes.java Fri Oct 18 16:34:42 2013 -0700 28.3 @@ -23,7 +23,7 @@ 28.4 28.5 /* 28.6 * @test 28.7 - * @bug 4973609 8015249 8025633 28.8 + * @bug 4973609 8015249 8025633 8026567 28.9 * @summary Make sure that annotation types with 0 members does not have 28.10 * extra HR tags. 28.11 * @author jamieh 28.12 @@ -55,7 +55,7 @@ 28.13 {BUG_ID + FS + "pkg" + FS + "AnnotationTypeField.html", 28.14 "<h3>Field Summary</h3>"}, 28.15 {BUG_ID + FS + "pkg" + FS + "AnnotationTypeField.html", 28.16 - "<td class=\"colLast\"><code><span class=\"strong\"><a href=\"../" + 28.17 + "<td class=\"colLast\"><code><span class=\"memberNameLink\"><a href=\"../" + 28.18 "pkg/AnnotationTypeField.html#DEFAULT_NAME\">DEFAULT_NAME</a></span>" + 28.19 "</code> </td>"}, 28.20 {BUG_ID + FS + "pkg" + FS + "AnnotationTypeField.html",
29.1 --- a/test/com/sun/javadoc/testClassCrossReferences/TestClassCrossReferences.java Fri Oct 18 15:03:34 2013 -0700 29.2 +++ b/test/com/sun/javadoc/testClassCrossReferences/TestClassCrossReferences.java Fri Oct 18 16:34:42 2013 -0700 29.3 @@ -23,7 +23,7 @@ 29.4 29.5 /* 29.6 * @test 29.7 - * @bug 4652655 4857717 8025633 29.8 + * @bug 4652655 4857717 8025633 8026567 29.9 * @summary This test verifies that class cross references work properly. 29.10 * @author jamieh 29.11 * @library ../lib/ 29.12 @@ -48,7 +48,7 @@ 29.13 "<a href=\"http://java.sun.com/j2se/1.4/docs/api/java/math/BigInteger.html?is-external=true#gcd-java.math.BigInteger-\" " + 29.14 "title=\"class or interface in java.math\"><code>Link to external member gcd</code></a>"}, 29.15 {BUG_ID + FS + "C.html", 29.16 - "<dl>" + NL + "<dt><span class=\"strong\">Overrides:</span></dt>" + NL + 29.17 + "<dl>" + NL + "<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>" + NL + 29.18 "<dd><code>toString</code> in class <code>java.lang.Object</code></dd>" + NL + 29.19 "</dl>"} 29.20 };
30.1 --- a/test/com/sun/javadoc/testClassTree/TestClassTree.java Fri Oct 18 15:03:34 2013 -0700 30.2 +++ b/test/com/sun/javadoc/testClassTree/TestClassTree.java Fri Oct 18 16:34:42 2013 -0700 30.3 @@ -1,5 +1,5 @@ 30.4 /* 30.5 - * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. 30.6 + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. 30.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 30.8 * 30.9 * This code is free software; you can redistribute it and/or modify it 30.10 @@ -23,7 +23,7 @@ 30.11 30.12 /* 30.13 * @test 30.14 - * @bug 4632553 4973607 30.15 + * @bug 4632553 4973607 8026567 30.16 * @summary No need to include type name (class, interface, etc.) before 30.17 * every single type in class tree. 30.18 * Make sure class tree includes heirarchy for enums and annotation 30.19 @@ -49,12 +49,12 @@ 30.20 private static final String[][] TEST = { 30.21 {BUG_ID + FS + "pkg" + FS + "package-tree.html", 30.22 "<ul>" + NL + "<li type=\"circle\">pkg.<a href=\"../pkg/ParentClass.html\" " + 30.23 - "title=\"class in pkg\"><span class=\"strong\">ParentClass</span></a>"}, 30.24 + "title=\"class in pkg\"><span class=\"typeNameLink\">ParentClass</span></a>"}, 30.25 30.26 {BUG_ID + FS + "pkg" + FS + "package-tree.html", 30.27 "<h2 title=\"Annotation Type Hierarchy\">Annotation Type Hierarchy</h2>" + NL + 30.28 "<ul>" + NL + "<li type=\"circle\">pkg.<a href=\"../pkg/AnnotationType.html\" " + 30.29 - "title=\"annotation in pkg\"><span class=\"strong\">AnnotationType</span></a> " + 30.30 + "title=\"annotation in pkg\"><span class=\"typeNameLink\">AnnotationType</span></a> " + 30.31 "(implements java.lang.annotation.Annotation)</li>" + NL + "</ul>"}, 30.32 30.33 {BUG_ID + FS + "pkg" + FS + "package-tree.html", 30.34 @@ -63,14 +63,14 @@ 30.35 "<li type=\"circle\">java.lang.Enum<E> (implements java.lang." + 30.36 "Comparable<T>, java.io.Serializable)" + NL + "<ul>" + NL + 30.37 "<li type=\"circle\">pkg.<a href=\"../pkg/Coin.html\" " + 30.38 - "title=\"enum in pkg\"><span class=\"strong\">Coin</span></a></li>" + NL + 30.39 + "title=\"enum in pkg\"><span class=\"typeNameLink\">Coin</span></a></li>" + NL + 30.40 "</ul>" + NL + "</li>" + NL + "</ul>" + NL + "</li>" + NL + "</ul>" 30.41 }, 30.42 }; 30.43 private static final String[][] NEGATED_TEST = { 30.44 {BUG_ID + FS + "pkg" + FS + "package-tree.html", 30.45 "<li type=\"circle\">class pkg.<a href=\"../pkg/ParentClass.html\" " + 30.46 - "title=\"class in pkg\"><span class=\"strong\">ParentClass</span></a></li>"} 30.47 + "title=\"class in pkg\"><span class=\"typeNameLink\">ParentClass</span></a></li>"} 30.48 }; 30.49 30.50 /**
31.1 --- a/test/com/sun/javadoc/testConstructorIndent/TestConstructorIndent.java Fri Oct 18 15:03:34 2013 -0700 31.2 +++ b/test/com/sun/javadoc/testConstructorIndent/TestConstructorIndent.java Fri Oct 18 16:34:42 2013 -0700 31.3 @@ -23,7 +23,7 @@ 31.4 31.5 /* 31.6 * @test 31.7 - * @bug 4904037 31.8 + * @bug 4904037 8026567 31.9 * @summary The constructor comments should be surrounded by 31.10 * <dl></dl>. Check for this in the output. 31.11 * @author jamieh 31.12 @@ -47,7 +47,7 @@ 31.13 private static final String[][] TEST = { 31.14 {BUG_ID + FS + "C.html", "<div class=\"block\">" + 31.15 "This is just a simple constructor.</div>" + NL + 31.16 - "<dl>" + NL + "<dt><span class=\"strong\">Parameters:</span></dt>" + NL + 31.17 + "<dl>" + NL + "<dt><span class=\"paramLabel\">Parameters:</span></dt>" + NL + 31.18 "<dd><code>i</code> - a param.</dd>" + NL +"</dl>" 31.19 } 31.20 };
32.1 --- a/test/com/sun/javadoc/testDeprecatedDocs/TestDeprecatedDocs.java Fri Oct 18 15:03:34 2013 -0700 32.2 +++ b/test/com/sun/javadoc/testDeprecatedDocs/TestDeprecatedDocs.java Fri Oct 18 16:34:42 2013 -0700 32.3 @@ -1,5 +1,5 @@ 32.4 /* 32.5 - * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. 32.6 + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. 32.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 32.8 * 32.9 * This code is free software; you can redistribute it and/or modify it 32.10 @@ -23,7 +23,7 @@ 32.11 32.12 /* 32.13 * @test 32.14 - * @bug 4927552 32.15 + * @bug 4927552 8026567 32.16 * @summary <DESC> 32.17 * @author jamieh 32.18 * @library ../lib/ 32.19 @@ -76,20 +76,20 @@ 32.20 {TARGET_FILE, "pkg.DeprecatedClassByAnnotation.field"}, 32.21 32.22 {TARGET_FILE2, "<pre>@Deprecated" + NL + 32.23 - "public class <span class=\"strong\">DeprecatedClassByAnnotation</span>" + NL + 32.24 + "public class <span class=\"typeNameLabel\">DeprecatedClassByAnnotation</span>" + NL + 32.25 "extends java.lang.Object</pre>"}, 32.26 32.27 {TARGET_FILE2, "<pre>@Deprecated" + NL + 32.28 "public int field</pre>" + NL + 32.29 - "<div class=\"block\"><span class=\"strong\">Deprecated.</span> </div>"}, 32.30 + "<div class=\"block\"><span class=\"deprecatedLabel\">Deprecated.</span> </div>"}, 32.31 32.32 {TARGET_FILE2, "<pre>@Deprecated" + NL + 32.33 "public DeprecatedClassByAnnotation()</pre>" + NL + 32.34 - "<div class=\"block\"><span class=\"strong\">Deprecated.</span> </div>"}, 32.35 + "<div class=\"block\"><span class=\"deprecatedLabel\">Deprecated.</span> </div>"}, 32.36 32.37 {TARGET_FILE2, "<pre>@Deprecated" + NL + 32.38 "public void method()</pre>" + NL + 32.39 - "<div class=\"block\"><span class=\"strong\">Deprecated.</span> </div>"}, 32.40 + "<div class=\"block\"><span class=\"deprecatedLabel\">Deprecated.</span> </div>"}, 32.41 }; 32.42 32.43 private static final String[][] NEGATED_TEST = NO_TEST;
33.1 --- a/test/com/sun/javadoc/testExternalOverridenMethod/TestExternalOverridenMethod.java Fri Oct 18 15:03:34 2013 -0700 33.2 +++ b/test/com/sun/javadoc/testExternalOverridenMethod/TestExternalOverridenMethod.java Fri Oct 18 16:34:42 2013 -0700 33.3 @@ -23,7 +23,7 @@ 33.4 33.5 /* 33.6 * @test 33.7 - * @bug 4857717 8025633 33.8 + * @bug 4857717 8025633 8026567 33.9 * @summary Test to make sure that externally overriden and implemented methods 33.10 * are documented properly. The method should still include "implements" or 33.11 * "overrides" documentation even though the method is external. 33.12 @@ -38,13 +38,13 @@ 33.13 private static final String BUG_ID = "4857717"; 33.14 private static final String[][] TEST = { 33.15 {BUG_ID + FS + "pkg" + FS + "XReader.html", 33.16 - "<dt><span class=\"strong\">Overrides:</span></dt>" + NL + 33.17 + "<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>" + NL + 33.18 "<dd><code><a href=\"http://java.sun.com/j2se/1.4.1/docs/api/java/io/FilterReader.html?is-external=true#read--\" " + 33.19 "title=\"class or interface in java.io\">read</a></code> in class <code>" + 33.20 "<a href=\"http://java.sun.com/j2se/1.4.1/docs/api/java/io/FilterReader.html?is-external=true\" " + 33.21 "title=\"class or interface in java.io\">FilterReader</a></code></dd>"}, 33.22 {BUG_ID + FS + "pkg" + FS + "XReader.html", 33.23 - "<dt><span class=\"strong\">Specified by:</span></dt>" + NL + 33.24 + "<dt><span class=\"overrideSpecifyLabel\">Specified by:</span></dt>" + NL + 33.25 "<dd><code><a href=\"http://java.sun.com/j2se/1.4.1/docs/api/java/io/DataInput.html?is-external=true#readInt--\" " + 33.26 "title=\"class or interface in java.io\">readInt</a></code> in interface <code>" + 33.27 "<a href=\"http://java.sun.com/j2se/1.4.1/docs/api/java/io/DataInput.html?is-external=true\" " +
34.1 --- a/test/com/sun/javadoc/testHref/TestHref.java Fri Oct 18 15:03:34 2013 -0700 34.2 +++ b/test/com/sun/javadoc/testHref/TestHref.java Fri Oct 18 16:34:42 2013 -0700 34.3 @@ -23,7 +23,7 @@ 34.4 34.5 /* 34.6 * @test 34.7 - * @bug 4663254 8016328 8025633 34.8 + * @bug 4663254 8016328 8025633 8026567 34.9 * @summary Verify that spaces do not appear in hrefs and anchors. 34.10 * @author jamieh 34.11 * @library ../lib/ 34.12 @@ -80,7 +80,7 @@ 34.13 34.14 //Signature does not link to the page itself. 34.15 {BUG_ID + FS + "pkg" + FS + "C4.html", 34.16 - "public abstract class <span class=\"strong\">C4<E extends C4<E>></span>" 34.17 + "public abstract class <span class=\"typeNameLabel\">C4<E extends C4<E>></span>" 34.18 }, 34.19 }; 34.20 private static final String[][] NEGATED_TEST =
35.1 --- a/test/com/sun/javadoc/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java Fri Oct 18 15:03:34 2013 -0700 35.2 +++ b/test/com/sun/javadoc/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java Fri Oct 18 16:34:42 2013 -0700 35.3 @@ -25,7 +25,7 @@ 35.4 35.5 /* 35.6 * @test 35.7 - * @bug 6786690 6820360 8025633 35.8 + * @bug 6786690 6820360 8025633 8026567 35.9 * @summary This test verifies the nesting of definition list tags. 35.10 * @author Bhavesh Patel 35.11 * @library ../lib/ 35.12 @@ -43,7 +43,7 @@ 35.13 // for default value. 35.14 private static final String[][] TEST_ALL = { 35.15 {BUG_ID + FS + "pkg1" + FS + "C1.html", "<pre>public class " + 35.16 - "<span class=\"strong\">C1</span>" + NL + 35.17 + "<span class=\"typeNameLabel\">C1</span>" + NL + 35.18 "extends java.lang.Object" + NL + "implements java.io.Serializable</pre>"}, 35.19 {BUG_ID + FS + "pkg1" + FS + "C4.html", "<dl>" + NL + 35.20 "<dt>Default:</dt>" + NL + "<dd>true</dd>" + NL + 35.21 @@ -54,64 +54,64 @@ 35.22 // enclosing comments, tags and deprecated information. 35.23 private static final String[][] TEST_CMNT_DEPR = { 35.24 {BUG_ID + FS + "pkg1" + FS + "package-summary.html", "<dl>" + NL + 35.25 - "<dt><span class=\"strong\">Since:</span></dt>" + NL + 35.26 + "<dt><span class=\"simpleTagLabel\">Since:</span></dt>" + NL + 35.27 "<dd>JDK1.0</dd>" + NL + "</dl>"}, 35.28 - {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>" + NL + "<dt><span class=\"strong\">Since:</span></dt>" + NL + 35.29 - "<dd>JDK1.0</dd>" + NL + "<dt><span class=\"strong\">See Also:</span></dt>" + NL + 35.30 + {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>" + NL + "<dt><span class=\"simpleTagLabel\">Since:</span></dt>" + NL + 35.31 + "<dd>JDK1.0</dd>" + NL + "<dt><span class=\"seeLabel\">See Also:</span></dt>" + NL + 35.32 "<dd><a href=\"../pkg1/C2.html\" title=\"class in pkg1\"><code>" + 35.33 "C2</code></a>, " + NL + "<a href=\"../serialized-form.html#pkg1.C1\">" + 35.34 "Serialized Form</a></dd>" + NL + "</dl>"}, 35.35 - {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>" + NL + "<dt><span class=\"strong\">Since:</span></dt>" + NL + 35.36 + {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>" + NL + "<dt><span class=\"simpleTagLabel\">Since:</span></dt>" + NL + 35.37 "<dd>1.4</dd>" + NL + 35.38 - "<dt><span class=\"strong\">See Also:</span></dt>" + NL + "<dd>" + 35.39 + "<dt><span class=\"seeLabel\">See Also:</span></dt>" + NL + "<dd>" + 35.40 "<a href=\"../pkg1/C1.html#setUndecorated-boolean-\">" + 35.41 "<code>setUndecorated(boolean)</code></a></dd>" + NL + "</dl>"}, 35.42 - {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>"+ NL + "<dt><span class=\"strong\">Parameters:</span></dt>" + NL + "<dd><code>title" + 35.43 + {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>"+ NL + "<dt><span class=\"paramLabel\">Parameters:</span></dt>" + NL + "<dd><code>title" + 35.44 "</code> - the title</dd>" + NL + "<dd><code>test</code> - boolean value" + 35.45 - "</dd>" + NL + "<dt><span class=\"strong\">Throws:</span></dt>" + NL + 35.46 + "</dd>" + NL + "<dt><span class=\"throwsLabel\">Throws:</span></dt>" + NL + 35.47 "<dd><code>java.lang.IllegalArgumentException</code> - if the " + 35.48 "<code>owner</code>'s" + NL + 35.49 " <code>GraphicsConfiguration</code> is not from a screen " + 35.50 "device</dd>" + NL + "<dd><code>HeadlessException</code></dd>" + NL + "</dl>"}, 35.51 - {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>" + NL + "<dt><span class=\"strong\">Parameters:</span></dt>" + NL + "<dd><code>undecorated" + 35.52 + {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>" + NL + "<dt><span class=\"paramLabel\">Parameters:</span></dt>" + NL + "<dd><code>undecorated" + 35.53 "</code> - <code>true</code> if no decorations are" + NL + 35.54 " to be enabled;" + NL + " <code>false</code> " + 35.55 - "if decorations are to be enabled.</dd>" + NL + "<dt><span class=\"strong\">Since:" + 35.56 + "if decorations are to be enabled.</dd>" + NL + "<dt><span class=\"simpleTagLabel\">Since:" + 35.57 "</span></dt>" + NL + "<dd>1.4</dd>" + NL + 35.58 - "<dt><span class=\"strong\">See Also:</span></dt>" + NL + "<dd>" + 35.59 + "<dt><span class=\"seeLabel\">See Also:</span></dt>" + NL + "<dd>" + 35.60 "<a href=\"../pkg1/C1.html#readObject--\"><code>readObject()" + 35.61 "</code></a></dd>" + NL + "</dl>"}, 35.62 - {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>" + NL + "<dt><span class=\"strong\">Throws:</span></dt>" + NL + 35.63 - "<dd><code>java.io.IOException</code></dd>" + NL + "<dt><span class=\"strong\">See Also:" + 35.64 + {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>" + NL + "<dt><span class=\"throwsLabel\">Throws:</span></dt>" + NL + 35.65 + "<dd><code>java.io.IOException</code></dd>" + NL + "<dt><span class=\"seeLabel\">See Also:" + 35.66 "</span></dt>" + NL + "<dd><a href=\"../pkg1/C1.html#setUndecorated-boolean-\">" + 35.67 "<code>setUndecorated(boolean)</code></a></dd>" + NL + "</dl>"}, 35.68 - {BUG_ID + FS + "pkg1" + FS + "C2.html", "<dl>" + NL + "<dt><span class=\"strong\">Parameters:" + 35.69 - "</span></dt>" + NL + "<dd><code>set</code> - boolean</dd>" + NL + "<dt><span class=\"strong\">" + 35.70 + {BUG_ID + FS + "pkg1" + FS + "C2.html", "<dl>" + NL + "<dt><span class=\"paramLabel\">Parameters:" + 35.71 + "</span></dt>" + NL + "<dd><code>set</code> - boolean</dd>" + NL + "<dt><span class=\"simpleTagLabel\">" + 35.72 "Since:</span></dt>" + NL + "<dd>1.4</dd>" + NL + "</dl>"}, 35.73 - {BUG_ID + FS + "serialized-form.html", "<dl>" + NL + "<dt><span class=\"strong\">Throws:</span>" + 35.74 + {BUG_ID + FS + "serialized-form.html", "<dl>" + NL + "<dt><span class=\"throwsLabel\">Throws:</span>" + 35.75 "</dt>" + NL + "<dd><code>" + 35.76 - "java.io.IOException</code></dd>" + NL + "<dt><span class=\"strong\">See Also:</span>" + 35.77 + "java.io.IOException</code></dd>" + NL + "<dt><span class=\"seeLabel\">See Also:</span>" + 35.78 "</dt>" + NL + "<dd><a href=\"pkg1/C1.html#setUndecorated-boolean-\">" + 35.79 "<code>C1.setUndecorated(boolean)</code></a></dd>" + NL + "</dl>"}, 35.80 - {BUG_ID + FS + "serialized-form.html", "<span class=\"strong\">Deprecated.</span>" + 35.81 - " <span class=\"italic\">As of JDK version 1.5, replaced by" + NL + 35.82 + {BUG_ID + FS + "serialized-form.html", "<span class=\"deprecatedLabel\">Deprecated.</span>" + 35.83 + " <span class=\"deprecationComment\">As of JDK version 1.5, replaced by" + NL + 35.84 " <a href=\"pkg1/C1.html#setUndecorated-boolean-\">" + 35.85 "<code>setUndecorated(boolean)</code></a>.</span></div>" + NL + 35.86 "<div class=\"block\">This field indicates whether the C1 is " + 35.87 - "undecorated.</div>" + NL + " " + NL + "<dl>" + NL + "<dt><span class=\"strong\">Since:</span></dt>" + NL + 35.88 - "<dd>1.4</dd>" + NL + "<dt><span class=\"strong\">See Also:</span>" + 35.89 + "undecorated.</div>" + NL + " " + NL + "<dl>" + NL + "<dt><span class=\"simpleTagLabel\">Since:</span></dt>" + NL + 35.90 + "<dd>1.4</dd>" + NL + "<dt><span class=\"seeLabel\">See Also:</span>" + 35.91 "</dt>" + NL + "<dd><a href=\"pkg1/C1.html#setUndecorated-boolean-\">" + 35.92 "<code>C1.setUndecorated(boolean)</code></a></dd>" + NL + "</dl>"}, 35.93 - {BUG_ID + FS + "serialized-form.html", "<span class=\"strong\">Deprecated.</span>" + 35.94 - " <span class=\"italic\">As of JDK version 1.5, replaced by" + NL + 35.95 + {BUG_ID + FS + "serialized-form.html", "<span class=\"deprecatedLabel\">Deprecated.</span>" + 35.96 + " <span class=\"deprecationComment\">As of JDK version 1.5, replaced by" + NL + 35.97 " <a href=\"pkg1/C1.html#setUndecorated-boolean-\">" + 35.98 "<code>setUndecorated(boolean)</code></a>.</span></div>" + NL + 35.99 "<div class=\"block\">Reads the object stream.</div>" + NL + 35.100 - "<dl>" + NL + "<dt><span class=\"strong\">Throws:" + 35.101 + "<dl>" + NL + "<dt><span class=\"throwsLabel\">Throws:" + 35.102 "</span></dt>" + NL + "<dd><code><code>" + 35.103 "IOException</code></code></dd>" + NL + 35.104 "<dd><code>java.io.IOException</code></dd>" + NL + "</dl>"}, 35.105 - {BUG_ID + FS + "serialized-form.html", "<span class=\"strong\">Deprecated.</span>" + 35.106 + {BUG_ID + FS + "serialized-form.html", "<span class=\"deprecatedLabel\">Deprecated.</span>" + 35.107 " </div>" + NL + 35.108 "<div class=\"block\">The name for this class.</div>"}}; 35.109 35.110 @@ -122,55 +122,55 @@ 35.111 // and deprecated information. 35.112 private static final String[][] TEST_NODEPR = { 35.113 {BUG_ID + FS + "pkg1" + FS + "package-summary.html", "<dl>" + NL + 35.114 - "<dt><span class=\"strong\">Since:</span></dt>" + NL + 35.115 + "<dt><span class=\"simpleTagLabel\">Since:</span></dt>" + NL + 35.116 "<dd>JDK1.0</dd>" + NL + "</dl>"}, 35.117 - {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>" + NL + "<dt><span class=\"strong\">Since:</span>" + 35.118 - "</dt>" + NL + "<dd>JDK1.0</dd>" + NL + "<dt><span class=\"strong\">See Also:" + 35.119 + {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>" + NL + "<dt><span class=\"simpleTagLabel\">Since:</span>" + 35.120 + "</dt>" + NL + "<dd>JDK1.0</dd>" + NL + "<dt><span class=\"seeLabel\">See Also:" + 35.121 "</span></dt>" + NL + "<dd><a href=\"../pkg1/C2.html\" title=\"class in pkg1\">" + 35.122 "<code>C2</code></a>, " + NL + "<a href=\"../serialized-form.html#pkg1.C1\">" + 35.123 "Serialized Form</a></dd>" + NL + "</dl>"}, 35.124 - {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>" + NL + "<dt><span class=\"strong\">Parameters:" + 35.125 + {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>" + NL + "<dt><span class=\"paramLabel\">Parameters:" + 35.126 "</span></dt>" + NL + "<dd><code>title</code> - the title</dd>" + NL + "<dd><code>" + 35.127 - "test</code> - boolean value</dd>" + NL + "<dt><span class=\"strong\">Throws:" + 35.128 + "test</code> - boolean value</dd>" + NL + "<dt><span class=\"throwsLabel\">Throws:" + 35.129 "</span></dt>" + NL + "<dd><code>java.lang.IllegalArgumentException" + 35.130 "</code> - if the <code>owner</code>'s" + NL + " <code>GraphicsConfiguration" + 35.131 "</code> is not from a screen device</dd>" + NL + "<dd><code>" + 35.132 "HeadlessException</code></dd>" + NL + "</dl>"}, 35.133 - {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>" + NL + "<dt><span class=\"strong\">Parameters:" + 35.134 + {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>" + NL + "<dt><span class=\"paramLabel\">Parameters:" + 35.135 "</span></dt>" + NL + "<dd><code>undecorated</code> - <code>true</code>" + 35.136 " if no decorations are" + NL + " to be enabled;" + NL + 35.137 " <code>false</code> if decorations are to be enabled." + 35.138 - "</dd>" + NL + "<dt><span class=\"strong\">Since:</span></dt>" + NL + "<dd>1.4</dd>" + NL + 35.139 - "<dt><span class=\"strong\">See Also:</span></dt>" + NL + "<dd><a href=\"../pkg1/C1.html#readObject--\">" + 35.140 + "</dd>" + NL + "<dt><span class=\"simpleTagLabel\">Since:</span></dt>" + NL + "<dd>1.4</dd>" + NL + 35.141 + "<dt><span class=\"seeLabel\">See Also:</span></dt>" + NL + "<dd><a href=\"../pkg1/C1.html#readObject--\">" + 35.142 "<code>readObject()</code></a></dd>" + NL + "</dl>"}, 35.143 - {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>" + NL + "<dt><span class=\"strong\">Throws:</span>" + 35.144 + {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>" + NL + "<dt><span class=\"throwsLabel\">Throws:</span>" + 35.145 "</dt>" + NL + "<dd><code>java.io.IOException</code></dd>" + NL + "<dt>" + 35.146 - "<span class=\"strong\">See Also:</span></dt>" + NL + "<dd><a href=\"../pkg1/C1.html#setUndecorated-boolean-\">" + 35.147 + "<span class=\"seeLabel\">See Also:</span></dt>" + NL + "<dd><a href=\"../pkg1/C1.html#setUndecorated-boolean-\">" + 35.148 "<code>setUndecorated(boolean)</code></a></dd>" + NL + "</dl>"}, 35.149 - {BUG_ID + FS + "serialized-form.html", "<dl>" + NL + "<dt><span class=\"strong\">Throws:</span>" + 35.150 + {BUG_ID + FS + "serialized-form.html", "<dl>" + NL + "<dt><span class=\"throwsLabel\">Throws:</span>" + 35.151 "</dt>" + NL + "<dd><code>" + 35.152 - "java.io.IOException</code></dd>" + NL + "<dt><span class=\"strong\">See Also:</span>" + 35.153 + "java.io.IOException</code></dd>" + NL + "<dt><span class=\"seeLabel\">See Also:</span>" + 35.154 "</dt>" + NL + "<dd><a href=\"pkg1/C1.html#setUndecorated-boolean-\">" + 35.155 "<code>C1.setUndecorated(boolean)</code></a></dd>" + NL + "</dl>"}, 35.156 - {BUG_ID + FS + "serialized-form.html", "<span class=\"strong\">Deprecated.</span>" + 35.157 - " <span class=\"italic\">As of JDK version 1.5, replaced by" + NL + 35.158 + {BUG_ID + FS + "serialized-form.html", "<span class=\"deprecatedLabel\">Deprecated.</span>" + 35.159 + " <span class=\"deprecationComment\">As of JDK version 1.5, replaced by" + NL + 35.160 " <a href=\"pkg1/C1.html#setUndecorated-boolean-\">" + 35.161 "<code>setUndecorated(boolean)</code></a>.</span></div>" + NL + 35.162 "<div class=\"block\">This field indicates whether the C1 is " + 35.163 - "undecorated.</div>" + NL + " " + NL + "<dl>" + NL + "<dt><span class=\"strong\">Since:</span></dt>" + NL + 35.164 - "<dd>1.4</dd>" + NL + "<dt><span class=\"strong\">See Also:</span>" + 35.165 + "undecorated.</div>" + NL + " " + NL + "<dl>" + NL + "<dt><span class=\"simpleTagLabel\">Since:</span></dt>" + NL + 35.166 + "<dd>1.4</dd>" + NL + "<dt><span class=\"seeLabel\">See Also:</span>" + 35.167 "</dt>" + NL + "<dd><a href=\"pkg1/C1.html#setUndecorated-boolean-\">" + 35.168 "<code>C1.setUndecorated(boolean)</code></a></dd>" + NL + "</dl>"}, 35.169 - {BUG_ID + FS + "serialized-form.html", "<span class=\"strong\">Deprecated.</span>" + 35.170 - " <span class=\"italic\">As of JDK version 1.5, replaced by" + NL + 35.171 + {BUG_ID + FS + "serialized-form.html", "<span class=\"deprecatedLabel\">Deprecated.</span>" + 35.172 + " <span class=\"deprecationComment\">As of JDK version 1.5, replaced by" + NL + 35.173 " <a href=\"pkg1/C1.html#setUndecorated-boolean-\">" + 35.174 "<code>setUndecorated(boolean)</code></a>.</span></div>" + NL + 35.175 "<div class=\"block\">Reads the object stream.</div>" + NL + 35.176 - "<dl>" + NL + "<dt><span class=\"strong\">Throws:" + 35.177 + "<dl>" + NL + "<dt><span class=\"throwsLabel\">Throws:" + 35.178 "</span></dt>" + NL + "<dd><code><code>" + 35.179 "IOException</code></code></dd>" + NL + 35.180 "<dd><code>java.io.IOException</code></dd>" + NL + "</dl>"}, 35.181 - {BUG_ID + FS + "serialized-form.html", "<span class=\"strong\">Deprecated.</span>" + 35.182 + {BUG_ID + FS + "serialized-form.html", "<span class=\"deprecatedLabel\">Deprecated.</span>" + 35.183 " </div>" + NL + "<div class=\"block\">" + 35.184 "The name for this class.</div>"}}; 35.185 35.186 @@ -186,12 +186,12 @@ 35.187 "title=\"enum in pkg1\">C1.ModalExclusionType</a> " + 35.188 "APPLICATION_EXCLUDE</pre>" + NL + "</li>"}, 35.189 {BUG_ID + FS + "serialized-form.html", "<pre>boolean " + 35.190 - "undecorated</pre>" + NL + "<div class=\"block\"><span class=\"strong\">" + 35.191 - "Deprecated.</span> <span class=\"italic\">As of JDK version 1.5, replaced by" + NL + 35.192 + "undecorated</pre>" + NL + "<div class=\"block\"><span class=\"deprecatedLabel\">" + 35.193 + "Deprecated.</span> <span class=\"deprecationComment\">As of JDK version 1.5, replaced by" + NL + 35.194 " <a href=\"pkg1/C1.html#setUndecorated-boolean-\"><code>" + 35.195 "setUndecorated(boolean)</code></a>.</span></div>" + NL + "</li>"}, 35.196 - {BUG_ID + FS + "serialized-form.html", "<span class=\"strong\">" + 35.197 - "Deprecated.</span> <span class=\"italic\">As of JDK version" + 35.198 + {BUG_ID + FS + "serialized-form.html", "<span class=\"deprecatedLabel\">" + 35.199 + "Deprecated.</span> <span class=\"deprecationComment\">As of JDK version" + 35.200 " 1.5, replaced by" + NL + 35.201 " <a href=\"pkg1/C1.html#setUndecorated-boolean-\">" + 35.202 "<code>setUndecorated(boolean)</code></a>.</span></div>" + NL + "</li>"}};
36.1 --- a/test/com/sun/javadoc/testHtmlStrongTag/TestHtmlStrongTag.java Fri Oct 18 15:03:34 2013 -0700 36.2 +++ b/test/com/sun/javadoc/testHtmlStrongTag/TestHtmlStrongTag.java Fri Oct 18 16:34:42 2013 -0700 36.3 @@ -1,5 +1,5 @@ 36.4 /* 36.5 - * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. 36.6 + * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved. 36.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 36.8 * 36.9 * This code is free software; you can redistribute it and/or modify it 36.10 @@ -25,7 +25,7 @@ 36.11 36.12 /* 36.13 * @test 36.14 - * @bug 6786028 36.15 + * @bug 6786028 8026567 36.16 * @summary This test verifys the use of <strong> HTML tag instead of <B> by Javadoc std doclet. 36.17 * @author Bhavesh Patel 36.18 * @library ../lib/ 36.19 @@ -38,7 +38,7 @@ 36.20 36.21 private static final String BUG_ID = "6786028"; 36.22 private static final String[][] TEST1 = { 36.23 - {BUG_ID + FS + "pkg1" + FS + "C1.html", "<span class=\"strong\">See Also:</span>"}}; 36.24 + {BUG_ID + FS + "pkg1" + FS + "C1.html", "<span class=\"seeLabel\">See Also:</span>"}}; 36.25 private static final String[][] NEGATED_TEST1 = { 36.26 {BUG_ID + FS + "pkg1" + FS + "C1.html", "<STRONG>Method Summary</STRONG>"}, 36.27 {BUG_ID + FS + "pkg1" + FS + "C1.html", "<B>"},
37.1 --- a/test/com/sun/javadoc/testIndex/TestIndex.java Fri Oct 18 15:03:34 2013 -0700 37.2 +++ b/test/com/sun/javadoc/testIndex/TestIndex.java Fri Oct 18 16:34:42 2013 -0700 37.3 @@ -1,5 +1,5 @@ 37.4 /* 37.5 - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. 37.6 + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. 37.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 37.8 * 37.9 * This code is free software; you can redistribute it and/or modify it 37.10 @@ -23,7 +23,7 @@ 37.11 37.12 /* 37.13 * @test 37.14 - * @bug 4852280 4517115 4973608 4994589 37.15 + * @bug 4852280 4517115 4973608 4994589 8026567 37.16 * @summary Perform tests on index.html file. 37.17 * Also test that index-all.html has the appropriate output. 37.18 * Test for unnamed package in index. 37.19 @@ -53,27 +53,27 @@ 37.20 37.21 //Test index-all.html 37.22 {BUG_ID + FS + "index-all.html", 37.23 - "<a href=\"pkg/C.html\" title=\"class in pkg\"><span class=\"strong\">C</span></a>" + 37.24 + "<a href=\"pkg/C.html\" title=\"class in pkg\"><span class=\"typeNameLink\">C</span></a>" + 37.25 " - Class in <a href=\"pkg/package-summary.html\">pkg</a>"}, 37.26 {BUG_ID + FS + "index-all.html", 37.27 "<a href=\"pkg/Interface.html\" title=\"interface in pkg\">" + 37.28 - "<span class=\"strong\">Interface</span></a> - Interface in " + 37.29 + "<span class=\"typeNameLink\">Interface</span></a> - Interface in " + 37.30 "<a href=\"pkg/package-summary.html\">pkg</a>"}, 37.31 {BUG_ID + FS + "index-all.html", 37.32 "<a href=\"pkg/AnnotationType.html\" title=\"annotation in pkg\">" + 37.33 - "<span class=\"strong\">AnnotationType</span></a> - Annotation Type in " + 37.34 + "<span class=\"typeNameLink\">AnnotationType</span></a> - Annotation Type in " + 37.35 "<a href=\"pkg/package-summary.html\">pkg</a>"}, 37.36 {BUG_ID + FS + "index-all.html", 37.37 "<a href=\"pkg/Coin.html\" title=\"enum in pkg\">" + 37.38 - "<span class=\"strong\">Coin</span></a> - Enum in " + 37.39 + "<span class=\"typeNameLink\">Coin</span></a> - Enum in " + 37.40 "<a href=\"pkg/package-summary.html\">pkg</a>"}, 37.41 {BUG_ID + FS + "index-all.html", 37.42 "Class in <a href=\"package-summary.html\"><Unnamed></a>"}, 37.43 {BUG_ID + FS + "index-all.html", 37.44 - "<dl>" + NL + "<dt><span class=\"strong\"><a href=\"pkg/C.html#Java\">" + 37.45 + "<dl>" + NL + "<dt><span class=\"memberNameLink\"><a href=\"pkg/C.html#Java\">" + 37.46 "Java</a></span> - Static variable in class pkg.<a href=\"pkg/C.html\" " + 37.47 "title=\"class in pkg\">C</a></dt>" + NL + "<dd> </dd>" + NL + 37.48 - "<dt><span class=\"strong\"><a href=\"pkg/C.html#JDK\">JDK</a></span> " + 37.49 + "<dt><span class=\"memberNameLink\"><a href=\"pkg/C.html#JDK\">JDK</a></span> " + 37.50 "- Static variable in class pkg.<a href=\"pkg/C.html\" title=\"class in pkg\">" + 37.51 "C</a></dt>" + NL + "<dd> </dd>" + NL + "</dl>"}, 37.52 };
38.1 --- a/test/com/sun/javadoc/testInterface/TestInterface.java Fri Oct 18 15:03:34 2013 -0700 38.2 +++ b/test/com/sun/javadoc/testInterface/TestInterface.java Fri Oct 18 16:34:42 2013 -0700 38.3 @@ -23,7 +23,7 @@ 38.4 38.5 /* 38.6 * @test 38.7 - * @bug 4682448 4947464 5029946 8025633 38.8 + * @bug 4682448 4947464 5029946 8025633 8026567 38.9 * @summary Verify that the public modifier does not show up in the 38.10 * documentation for public methods, as recommended by the JLS. 38.11 * If A implements I and B extends A, B should be in the list of 38.12 @@ -83,7 +83,7 @@ 38.13 }, 38.14 //Make sure "Specified By" has substituted type parameters. 38.15 {BUG_ID + FS + "pkg" + FS + "Child.html", 38.16 - "<dt><span class=\"strong\">Specified by:</span></dt>" + NL + 38.17 + "<dt><span class=\"overrideSpecifyLabel\">Specified by:</span></dt>" + NL + 38.18 "<dd><code><a href=\"../pkg/Interface.html#method--\">method</a>" + 38.19 "</code> in interface <code>" + 38.20 "<a href=\"../pkg/Interface.html\" title=\"interface in pkg\">" + 38.21 @@ -92,7 +92,7 @@ 38.22 }, 38.23 //Make sure "Overrides" has substituted type parameters. 38.24 {BUG_ID + FS + "pkg" + FS + "Child.html", 38.25 - "<dt><span class=\"strong\">Overrides:</span></dt>" + NL + 38.26 + "<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>" + NL + 38.27 "<dd><code><a href=\"../pkg/Parent.html#method--\">method</a>" + 38.28 "</code> in class <code><a href=\"../pkg/Parent.html\" " + 38.29 "title=\"class in pkg\">Parent</a><<a href=\"../pkg/Child.html\" " +
39.1 --- a/test/com/sun/javadoc/testJavaFX/TestJavaFX.java Fri Oct 18 15:03:34 2013 -0700 39.2 +++ b/test/com/sun/javadoc/testJavaFX/TestJavaFX.java Fri Oct 18 16:34:42 2013 -0700 39.3 @@ -23,7 +23,7 @@ 39.4 39.5 /* 39.6 * @test 39.7 - * @bug 7112427 8012295 8025633 39.8 + * @bug 7112427 8012295 8025633 8026567 39.9 * @summary Test of the JavaFX doclet features. 39.10 * @author jvalenta 39.11 * @library ../lib/ 39.12 @@ -38,32 +38,32 @@ 39.13 private static final String[][] TEST = 39.14 new String[][] { 39.15 {"./" + BUG_ID + "/C.html", 39.16 - "<dt><span class=\"strong\">See Also:</span></dt>" + NL + "<dd><a href=\"C.html#getRate--\"><code>getRate()</code></a>, " + NL + 39.17 + "<dt><span class=\"seeLabel\">See Also:</span></dt>" + NL + "<dd><a href=\"C.html#getRate--\"><code>getRate()</code></a>, " + NL + 39.18 "<a href=\"C.html#setRate-double-\"><code>setRate(double)</code></a></dd>"}, 39.19 {"./" + BUG_ID + "/C.html", 39.20 "<pre>public final void setRate(double value)</pre>" + NL + 39.21 "<div class=\"block\">Sets the value of the property rate.</div>" + NL + 39.22 - "<dl>" + NL + "<dt><span class=\"strong\">Property description:</span></dt>" }, 39.23 + "<dl>" + NL + "<dt><span class=\"simpleTagLabel\">Property description:</span></dt>" }, 39.24 {"./" + BUG_ID + "/C.html", 39.25 "<pre>public final double getRate()</pre>" + NL + 39.26 "<div class=\"block\">Gets the value of the property rate.</div>" + NL + 39.27 - "<dl>" + NL + "<dt><span class=\"strong\">Property description:</span></dt>" }, 39.28 + "<dl>" + NL + "<dt><span class=\"simpleTagLabel\">Property description:</span></dt>" }, 39.29 {"./" + BUG_ID + "/C.html", 39.30 - "<td class=\"colLast\"><code><span class=\"strong\"><a href=\"C.html#rateProperty\">rate</a></span></code>" + NL + 39.31 + "<td class=\"colLast\"><code><span class=\"memberNameLink\"><a href=\"C.html#rateProperty\">rate</a></span></code>" + NL + 39.32 "<div class=\"block\">Defines the direction/speed at which the <code>Timeline</code> is expected to"}, 39.33 39.34 {"./" + BUG_ID + "/C.html", 39.35 - "<span class=\"strong\">Default value:</span>"}, 39.36 + "<span class=\"simpleTagLabel\">Default value:</span>"}, 39.37 {"./" + BUG_ID + "/C.html", 39.38 - "<span class=\"strong\">Since:</span></dt>" + NL + "<dd>JavaFX 8.0</dd>" }, 39.39 + "<span class=\"simpleTagLabel\">Since:</span></dt>" + NL + "<dd>JavaFX 8.0</dd>" }, 39.40 {"./" + BUG_ID + "/C.html", 39.41 "<p>Sets the value of the property <code>Property</code>"}, 39.42 {"./" + BUG_ID + "/C.html", 39.43 "<p>Gets the value of the property <code>Property</code>"}, 39.44 {"./" + BUG_ID + "/C.html", 39.45 - "<span class=\"strong\">Property description:</span>"}, 39.46 + "<span class=\"simpleTagLabel\">Property description:</span>"}, 39.47 {"./" + BUG_ID + "/C.html", 39.48 - "<td class=\"colLast\"><code><span class=\"strong\"><a href=\"C.html#setTestMethodProperty--\">setTestMethodProperty</a></span>()</code> </td>" }, 39.49 + "<td class=\"colLast\"><code><span class=\"memberNameLink\"><a href=\"C.html#setTestMethodProperty--\">setTestMethodProperty</a></span>()</code> </td>" }, 39.50 {"./" + BUG_ID + "/C.html", 39.51 "<h4>isPaused</h4>" + NL + 39.52 "<pre>public final double isPaused()</pre>" + NL +
40.1 --- a/test/com/sun/javadoc/testLegacyTaglet/Check.java Fri Oct 18 15:03:34 2013 -0700 40.2 +++ b/test/com/sun/javadoc/testLegacyTaglet/Check.java Fri Oct 18 16:34:42 2013 -0700 40.3 @@ -126,7 +126,7 @@ 40.4 * @param tag the tag representation of this custom tag. 40.5 */ 40.6 public String toString(Tag tag) { 40.7 - return "<dt><span class=\"strong\">" + TAG_HEADER + ":</span></dt><dd>" + tag.text() + 40.8 + return "<dt><span class=\"simpleTagLabel\">" + TAG_HEADER + ":</span></dt><dd>" + tag.text() + 40.9 "</dd>\n"; 40.10 } 40.11
41.1 --- a/test/com/sun/javadoc/testLinkOption/TestLinkOption.java Fri Oct 18 15:03:34 2013 -0700 41.2 +++ b/test/com/sun/javadoc/testLinkOption/TestLinkOption.java Fri Oct 18 16:34:42 2013 -0700 41.3 @@ -1,5 +1,5 @@ 41.4 /* 41.5 - * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. 41.6 + * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. 41.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 41.8 * 41.9 * This code is free software; you can redistribute it and/or modify it 41.10 @@ -23,7 +23,7 @@ 41.11 41.12 /* 41.13 * @test 41.14 - * @bug 4720957 5020118 41.15 + * @bug 4720957 5020118 8026567 41.16 * @summary Test to make sure that -link and -linkoffline link to 41.17 * right files. 41.18 * @author jamieh 41.19 @@ -61,7 +61,7 @@ 41.20 "Object</a> p3)" 41.21 }, 41.22 {BUG_ID + "-1" + FS + "java" + FS + "lang" + FS + "StringBuilderChild.html", 41.23 - "<pre>public abstract class <span class=\"strong\">StringBuilderChild</span>" + NL + 41.24 + "<pre>public abstract class <span class=\"typeNameLabel\">StringBuilderChild</span>" + NL + 41.25 "extends <a href=\"http://java.sun.com/j2se/1.4/docs/api/java/lang/Object.html?is-external=true\" " + 41.26 "title=\"class or interface in java.lang\">Object</a></pre>" 41.27 },
42.1 --- a/test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java Fri Oct 18 15:03:34 2013 -0700 42.2 +++ b/test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java Fri Oct 18 16:34:42 2013 -0700 42.3 @@ -23,7 +23,7 @@ 42.4 42.5 /* 42.6 * @test 42.7 - * @bug 4638588 4635809 6256068 6270645 8025633 42.8 + * @bug 4638588 4635809 6256068 6270645 8025633 8026567 42.9 * @summary Test to make sure that members are inherited properly in the Javadoc. 42.10 * Verify that inheritence labels are correct. 42.11 * @author jamieh 42.12 @@ -72,7 +72,7 @@ 42.13 42.14 // Test overriding/implementing methods with generic parameters. 42.15 {BUG_ID + FS + "pkg" + FS + "BaseClass.html", 42.16 - "<dl>" + NL + "<dt><span class=\"strong\">Specified by:</span></dt>" + NL + 42.17 + "<dl>" + NL + "<dt><span class=\"overrideSpecifyLabel\">Specified by:</span></dt>" + NL + 42.18 "<dd><code><a href=\"../pkg/BaseInterface.html#getAnnotation-java.lang.Class-\">" + 42.19 "getAnnotation</a></code> in interface <code>" + 42.20 "<a href=\"../pkg/BaseInterface.html\" title=\"interface in pkg\">" +
43.1 --- a/test/com/sun/javadoc/testMemberSummary/TestMemberSummary.java Fri Oct 18 15:03:34 2013 -0700 43.2 +++ b/test/com/sun/javadoc/testMemberSummary/TestMemberSummary.java Fri Oct 18 16:34:42 2013 -0700 43.3 @@ -23,7 +23,7 @@ 43.4 43.5 /* 43.6 * @test 43.7 - * @bug 4951228 6290760 8025633 43.8 + * @bug 4951228 6290760 8025633 8026567 43.9 * @summary Test the case where the overriden method returns a different 43.10 * type than the method in the child class. Make sure the 43.11 * documentation is inherited but the return type isn't. 43.12 @@ -49,7 +49,7 @@ 43.13 // Check return type in member summary. 43.14 {BUG_ID + FS + "pkg" + FS + "PublicChild.html", 43.15 "<code><a href=\"../pkg/PublicChild.html\" title=\"class in pkg\">PublicChild</a></code></td>" + NL + 43.16 - "<td class=\"colLast\"><code><span class=\"strong\"><a href=\"../pkg/PublicChild.html#returnTypeTest--\">" + 43.17 + "<td class=\"colLast\"><code><span class=\"memberNameLink\"><a href=\"../pkg/PublicChild.html#returnTypeTest--\">" + 43.18 "returnTypeTest</a></span>()</code>" 43.19 }, 43.20 // Check return type in member detail.
44.1 --- a/test/com/sun/javadoc/testNavigation/TestNavigation.java Fri Oct 18 15:03:34 2013 -0700 44.2 +++ b/test/com/sun/javadoc/testNavigation/TestNavigation.java Fri Oct 18 16:34:42 2013 -0700 44.3 @@ -23,7 +23,7 @@ 44.4 44.5 /* 44.6 * @test 44.7 - * @bug 4131628 4664607 7025314 8023700 7198273 8025633 44.8 + * @bug 4131628 4664607 7025314 8023700 7198273 8025633 8026567 44.9 * @summary Make sure the Next/Prev Class links iterate through all types. 44.10 * Make sure the navagation is 2 columns, not 3. 44.11 * @author jamieh 44.12 @@ -46,17 +46,17 @@ 44.13 private static final String[][] TEST = { 44.14 {BUG_ID + FS + "pkg" + FS + "A.html", "<li>Prev Class</li>"}, 44.15 {BUG_ID + FS + "pkg" + FS + "A.html", 44.16 - "<a href=\"../pkg/C.html\" title=\"class in pkg\"><span class=\"strong\">Next Class</span></a>"}, 44.17 + "<a href=\"../pkg/C.html\" title=\"class in pkg\"><span class=\"typeNameLink\">Next Class</span></a>"}, 44.18 {BUG_ID + FS + "pkg" + FS + "C.html", 44.19 - "<a href=\"../pkg/A.html\" title=\"annotation in pkg\"><span class=\"strong\">Prev Class</span></a>"}, 44.20 + "<a href=\"../pkg/A.html\" title=\"annotation in pkg\"><span class=\"typeNameLink\">Prev Class</span></a>"}, 44.21 {BUG_ID + FS + "pkg" + FS + "C.html", 44.22 - "<a href=\"../pkg/E.html\" title=\"enum in pkg\"><span class=\"strong\">Next Class</span></a>"}, 44.23 + "<a href=\"../pkg/E.html\" title=\"enum in pkg\"><span class=\"typeNameLink\">Next Class</span></a>"}, 44.24 {BUG_ID + FS + "pkg" + FS + "E.html", 44.25 - "<a href=\"../pkg/C.html\" title=\"class in pkg\"><span class=\"strong\">Prev Class</span></a>"}, 44.26 + "<a href=\"../pkg/C.html\" title=\"class in pkg\"><span class=\"typeNameLink\">Prev Class</span></a>"}, 44.27 {BUG_ID + FS + "pkg" + FS + "E.html", 44.28 - "<a href=\"../pkg/I.html\" title=\"interface in pkg\"><span class=\"strong\">Next Class</span></a>"}, 44.29 + "<a href=\"../pkg/I.html\" title=\"interface in pkg\"><span class=\"typeNameLink\">Next Class</span></a>"}, 44.30 {BUG_ID + FS + "pkg" + FS + "I.html", 44.31 - "<a href=\"../pkg/E.html\" title=\"enum in pkg\"><span class=\"strong\">Prev Class</span></a>"}, 44.32 + "<a href=\"../pkg/E.html\" title=\"enum in pkg\"><span class=\"typeNameLink\">Prev Class</span></a>"}, 44.33 {BUG_ID + FS + "pkg" + FS + "I.html", "<li>Next Class</li>"}, 44.34 // Test for 4664607 44.35 {BUG_ID + FS + "pkg" + FS + "I.html",
45.1 --- a/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java Fri Oct 18 15:03:34 2013 -0700 45.2 +++ b/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java Fri Oct 18 16:34:42 2013 -0700 45.3 @@ -23,7 +23,7 @@ 45.4 45.5 /* 45.6 * @test 45.7 - * @bug 4789689 4905985 4927164 4827184 4993906 5004549 7025314 7010344 8025633 45.8 + * @bug 4789689 4905985 4927164 4827184 4993906 5004549 7025314 7010344 8025633 8026567 45.9 * @summary Run Javadoc on a set of source files that demonstrate new 45.10 * language features. Check the output to ensure that the new 45.11 * language features are properly documented. 45.12 @@ -53,7 +53,7 @@ 45.13 {BUG_ID + FS + "pkg" + FS + "Coin.html", "Enum Coin</h2>"}, 45.14 //Make sure enum signature is correct. 45.15 {BUG_ID + FS + "pkg" + FS + "Coin.html", "<pre>public enum " + 45.16 - "<span class=\"strong\">Coin</span>" + NL + 45.17 + "<span class=\"typeNameLabel\">Coin</span>" + NL + 45.18 "extends java.lang.Enum<<a href=\"../pkg/Coin.html\" " + 45.19 "title=\"enum in pkg\">Coin</a>></pre>" 45.20 }, 45.21 @@ -62,7 +62,7 @@ 45.22 "</span><span class=\"tabEnd\"> </span></caption>"}, 45.23 //Detail for enum constant 45.24 {BUG_ID + FS + "pkg" + FS + "Coin.html", 45.25 - "<span class=\"strong\"><a href=\"../pkg/Coin.html#Dime\">Dime</a></span>"}, 45.26 + "<span class=\"memberNameLink\"><a href=\"../pkg/Coin.html#Dime\">Dime</a></span>"}, 45.27 //Automatically insert documentation for values() and valueOf(). 45.28 {BUG_ID + FS + "pkg" + FS + "Coin.html", 45.29 "Returns an array containing the constants of this enum type,"}, 45.30 @@ -80,11 +80,11 @@ 45.31 "Class TypeParameters<E></h2>"}, 45.32 //Check class type parameters section. 45.33 {BUG_ID + FS + "pkg" + FS + "TypeParameters.html", 45.34 - "<dt><span class=\"strong\">Type Parameters:</span></dt>" + NL + "<dd><code>E</code> - " + 45.35 + "<dt><span class=\"paramLabel\">Type Parameters:</span></dt>" + NL + "<dd><code>E</code> - " + 45.36 "the type parameter for this class."}, 45.37 //Type parameters in @see/@link 45.38 {BUG_ID + FS + "pkg" + FS + "TypeParameters.html", 45.39 - "<dl>" + NL + "<dt><span class=\"strong\">See Also:</span></dt>" + NL + "<dd>" + 45.40 + "<dl>" + NL + "<dt><span class=\"seeLabel\">See Also:</span></dt>" + NL + "<dd>" + 45.41 "<a href=\"../pkg/TypeParameters.html\" title=\"class in pkg\">" + 45.42 "<code>TypeParameters</code></a></dd>" + NL + "</dl>"}, 45.43 //Method that uses class type parameter. 45.44 @@ -93,7 +93,7 @@ 45.45 "parameter in TypeParameters\">E</a> param)"}, 45.46 //Method type parameter section. 45.47 {BUG_ID + FS + "pkg" + FS + "TypeParameters.html", 45.48 - "<span class=\"strong\">Type Parameters:</span></dt>" + NL + "<dd><code>T</code> - This is the first " + 45.49 + "<span class=\"paramLabel\">Type Parameters:</span></dt>" + NL + "<dd><code>T</code> - This is the first " + 45.50 "type parameter.</dd>" + NL + "<dd><code>V</code> - This is the second type " + 45.51 "parameter."}, 45.52 //Signature of method with type parameters 45.53 @@ -118,7 +118,7 @@ 45.54 45.55 //Signature of subclass that has type parameters. 45.56 {BUG_ID + FS + "pkg" + FS + "TypeParameterSubClass.html", 45.57 - "<pre>public class <span class=\"strong\">TypeParameterSubClass<T extends " + 45.58 + "<pre>public class <span class=\"typeNameLabel\">TypeParameterSubClass<T extends " + 45.59 "java.lang.String></span>" + NL + "extends " + 45.60 "<a href=\"../pkg/TypeParameterSuperClass.html\" title=\"class in pkg\">" + 45.61 "TypeParameterSuperClass</a><T></pre>"}, 45.62 @@ -168,7 +168,7 @@ 45.63 "Annotation Type AnnotationType</h2>"}, 45.64 //Make sure the signature is correct. 45.65 {BUG_ID + FS + "pkg" + FS + "AnnotationType.html", 45.66 - "public @interface <span class=\"strong\">AnnotationType</span>"}, 45.67 + "public @interface <span class=\"memberNameLabel\">AnnotationType</span>"}, 45.68 //Make sure member summary headings are correct. 45.69 {BUG_ID + FS + "pkg" + FS + "AnnotationType.html", 45.70 "<h3>Required Element Summary</h3>"}, 45.71 @@ -198,7 +198,7 @@ 45.72 "<a href=\"../pkg/AnnotationType.html#optional--\">optional</a>" + 45.73 "=\"Class Annotation\"," + NL + 45.74 " <a href=\"../pkg/AnnotationType.html#required--\">" + 45.75 - "required</a>=1994)" + NL + "public class <span class=\"strong\">" + 45.76 + "required</a>=1994)" + NL + "public class <span class=\"typeNameLabel\">" + 45.77 "AnnotationTypeUsage</span>" + NL + "extends java.lang.Object</pre>"}, 45.78 45.79 //FIELD 45.80 @@ -299,7 +299,7 @@ 45.81 {BUG_ID + FS + "pkg1" + FS + "B.html", 45.82 "<pre><a href=\"../pkg1/A.html\" title=\"annotation in pkg1\">@A</a>"}, 45.83 {BUG_ID + FS + "pkg1" + FS + "B.html", 45.84 - "public interface <span class=\"strong\">B</span></pre>"}, 45.85 + "public interface <span class=\"typeNameLabel\">B</span></pre>"}, 45.86 45.87 45.88 //============================================================== 45.89 @@ -320,7 +320,7 @@ 45.90 "Foo</a></span><span class=\"tabEnd\"> </span></caption>" 45.91 }, 45.92 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html", 45.93 - "<td class=\"colLast\"><code><span class=\"strong\"><a href=\"../../pkg2/ClassUseTest1.html\" " + 45.94 + "<td class=\"colLast\"><code><span class=\"memberNameLink\"><a href=\"../../pkg2/ClassUseTest1.html\" " + 45.95 "title=\"class in pkg2\">ClassUseTest1</a><T extends " + 45.96 "<a href=\"../../pkg2/Foo.html\" title=\"class in pkg2\">Foo" + 45.97 "</a> & <a href=\"../../pkg2/Foo2.html\" title=\"interface in pkg2\">" + 45.98 @@ -333,8 +333,8 @@ 45.99 "pkg2\">Foo</a></span><span class=\"tabEnd\"> </span></caption>" 45.100 }, 45.101 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html", 45.102 - "<td class=\"colLast\"><span class=\"strong\">ClassUseTest1." + 45.103 - "</span><code><span class=\"strong\"><a href=\"../../pkg2/" + 45.104 + "<td class=\"colLast\"><span class=\"typeNameLabel\">ClassUseTest1." + 45.105 + "</span><code><span class=\"memberNameLink\"><a href=\"../../pkg2/" + 45.106 "ClassUseTest1.html#method-T-\">method</a></span>" + 45.107 "(T t)</code> </td>" 45.108 }, 45.109 @@ -372,7 +372,7 @@ 45.110 "</span></caption>" 45.111 }, 45.112 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo2.html", 45.113 - "<td class=\"colLast\"><code><span class=\"strong\"><a href=\"../../pkg2/ClassUseTest1.html\" " + 45.114 + "<td class=\"colLast\"><code><span class=\"memberNameLink\"><a href=\"../../pkg2/ClassUseTest1.html\" " + 45.115 "title=\"class in pkg2\">ClassUseTest1</a><T extends " + 45.116 "<a href=\"../../pkg2/Foo.html\" title=\"class in pkg2\">Foo" + 45.117 "</a> & <a href=\"../../pkg2/Foo2.html\" title=\"interface in pkg2\">" + 45.118 @@ -386,8 +386,8 @@ 45.119 "</span></caption>" 45.120 }, 45.121 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo2.html", 45.122 - "<td class=\"colLast\"><span class=\"strong\">" + 45.123 - "ClassUseTest1.</span><code><span class=\"strong\"><a href=\"../../" + 45.124 + "<td class=\"colLast\"><span class=\"typeNameLabel\">" + 45.125 + "ClassUseTest1.</span><code><span class=\"memberNameLink\"><a href=\"../../" + 45.126 "pkg2/ClassUseTest1.html#method-T-\">method</a></span>" + 45.127 "(T t)</code> </td>" 45.128 }, 45.129 @@ -401,7 +401,7 @@ 45.130 " </span></caption>" 45.131 }, 45.132 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html", 45.133 - "<td class=\"colLast\"><code><span class=\"strong\"><a href=\"../../pkg2/ClassUseTest2.html\" " + 45.134 + "<td class=\"colLast\"><code><span class=\"memberNameLink\"><a href=\"../../pkg2/ClassUseTest2.html\" " + 45.135 "title=\"class in pkg2\">ClassUseTest2</a><T extends " + 45.136 "<a href=\"../../pkg2/ParamTest.html\" title=\"class in pkg2\">" + 45.137 "ParamTest</a><<a href=\"../../pkg2/Foo3.html\" title=\"class in pkg2\">" + 45.138 @@ -415,8 +415,8 @@ 45.139 " </span></caption>" 45.140 }, 45.141 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html", 45.142 - "<td class=\"colLast\"><span class=\"strong\">ClassUseTest2." + 45.143 - "</span><code><span class=\"strong\"><a href=\"../../pkg2/" + 45.144 + "<td class=\"colLast\"><span class=\"typeNameLabel\">ClassUseTest2." + 45.145 + "</span><code><span class=\"memberNameLink\"><a href=\"../../pkg2/" + 45.146 "ClassUseTest2.html#method-T-\">method</a></span>" + 45.147 "(T t)</code> </td>" 45.148 }, 45.149 @@ -456,7 +456,7 @@ 45.150 "Foo3</a></span><span class=\"tabEnd\"> </span></caption>" 45.151 }, 45.152 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html", 45.153 - "<td class=\"colLast\"><code><span class=\"strong\"><a href=\"../../pkg2/ClassUseTest2.html\" " + 45.154 + "<td class=\"colLast\"><code><span class=\"memberNameLink\"><a href=\"../../pkg2/ClassUseTest2.html\" " + 45.155 "title=\"class in pkg2\">ClassUseTest2</a><T extends " + 45.156 "<a href=\"../../pkg2/ParamTest.html\" title=\"class in pkg2\">" + 45.157 "ParamTest</a><<a href=\"../../pkg2/Foo3.html\" title=\"class in pkg2\">" + 45.158 @@ -470,8 +470,8 @@ 45.159 "</span></caption>" 45.160 }, 45.161 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html", 45.162 - "<td class=\"colLast\"><span class=\"strong\">ClassUseTest2." + 45.163 - "</span><code><span class=\"strong\"><a href=\"../../pkg2/" + 45.164 + "<td class=\"colLast\"><span class=\"typeNameLabel\">ClassUseTest2." + 45.165 + "</span><code><span class=\"memberNameLink\"><a href=\"../../pkg2/" + 45.166 "ClassUseTest2.html#method-T-\">method</a></span>" + 45.167 "(T t)</code> </td>" 45.168 }, 45.169 @@ -500,7 +500,7 @@ 45.170 " </span></caption>" 45.171 }, 45.172 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html", 45.173 - "<td class=\"colLast\"><code><span class=\"strong\"><a href=\"../../pkg2/ClassUseTest3.html\" " + 45.174 + "<td class=\"colLast\"><code><span class=\"memberNameLink\"><a href=\"../../pkg2/ClassUseTest3.html\" " + 45.175 "title=\"class in pkg2\">ClassUseTest3</a><T extends " + 45.176 "<a href=\"../../pkg2/ParamTest2.html\" title=\"class in pkg2\">" + 45.177 "ParamTest2</a><java.util.List<? extends " + 45.178 @@ -515,8 +515,8 @@ 45.179 " </span></caption>" 45.180 }, 45.181 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html", 45.182 - "<td class=\"colLast\"><span class=\"strong\">ClassUseTest3" + 45.183 - ".</span><code><span class=\"strong\"><a href=\"../../pkg2/ClassUseTest3." + 45.184 + "<td class=\"colLast\"><span class=\"typeNameLabel\">ClassUseTest3" + 45.185 + ".</span><code><span class=\"memberNameLink\"><a href=\"../../pkg2/ClassUseTest3." + 45.186 "html#method-T-\">method</a></span>(T t)</code> </td>" 45.187 }, 45.188 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html", 45.189 @@ -538,7 +538,7 @@ 45.190 "</span></caption>" 45.191 }, 45.192 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html", 45.193 - "<td class=\"colLast\"><code><span class=\"strong\"><a href=\"../../pkg2/ClassUseTest3.html\" " + 45.194 + "<td class=\"colLast\"><code><span class=\"memberNameLink\"><a href=\"../../pkg2/ClassUseTest3.html\" " + 45.195 "title=\"class in pkg2\">ClassUseTest3</a><T extends " + 45.196 "<a href=\"../../pkg2/ParamTest2.html\" title=\"class in pkg2\">" + 45.197 "ParamTest2</a><java.util.List<? extends " + 45.198 @@ -552,8 +552,8 @@ 45.199 "pkg2\">Foo4</a></span><span class=\"tabEnd\"> </span></caption>" 45.200 }, 45.201 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html", 45.202 - "<td class=\"colLast\"><span class=\"strong\">ClassUseTest3." + 45.203 - "</span><code><span class=\"strong\"><a href=\"../../pkg2/ClassUseTest3." + 45.204 + "<td class=\"colLast\"><span class=\"typeNameLabel\">ClassUseTest3." + 45.205 + "</span><code><span class=\"memberNameLink\"><a href=\"../../pkg2/ClassUseTest3." + 45.206 "html#method-T-\">method</a></span>(T t)</code>" + 45.207 " </td>" 45.208 }, 45.209 @@ -586,8 +586,8 @@ 45.210 "<th class=\"colLast\" scope=\"col\">Method and Description</th>" + NL + 45.211 "</tr>" + NL + "<tbody>" + NL + "<tr class=\"altColor\">" + NL + 45.212 "<td class=\"colFirst\"><code>void</code></td>" + NL + 45.213 - "<td class=\"colLast\"><span class=\"strong\">ClassUseTest3." + 45.214 - "</span><code><span class=\"strong\"><a href=\"../../pkg2/ClassUseTest3." + 45.215 + "<td class=\"colLast\"><span class=\"typeNameLabel\">ClassUseTest3." + 45.216 + "</span><code><span class=\"memberNameLink\"><a href=\"../../pkg2/ClassUseTest3." + 45.217 "html#method-java.util.Set-\">method</a></span>(java." + 45.218 "util.Set<<a href=\"../../pkg2/Foo4.html\" title=\"" + 45.219 "class in pkg2\">Foo4</a>> p)</code> </td>" + NL + 45.220 @@ -663,14 +663,14 @@ 45.221 // TYPE PARAMETER IN INDEX 45.222 //================================= 45.223 {BUG_ID + FS + "index-all.html", 45.224 - "<span class=\"strong\"><a href=\"pkg2/Foo.html#method-java.util.Vector-\">" + 45.225 + "<span class=\"memberNameLink\"><a href=\"pkg2/Foo.html#method-java.util.Vector-\">" + 45.226 "method(Vector<Object>)</a></span>" 45.227 }, 45.228 //================================= 45.229 // TYPE PARAMETER IN INDEX 45.230 //================================= 45.231 {BUG_ID + FS + "index-all.html", 45.232 - "<span class=\"strong\"><a href=\"pkg2/Foo.html#method-java.util.Vector-\">" + 45.233 + "<span class=\"memberNameLink\"><a href=\"pkg2/Foo.html#method-java.util.Vector-\">" + 45.234 "method(Vector<Object>)</a></span>" 45.235 }, 45.236 }; 45.237 @@ -679,7 +679,7 @@ 45.238 // ENUM TESTING 45.239 //================================= 45.240 //NO constructor section 45.241 - {BUG_ID + FS + "pkg" + FS + "Coin.html", "<span class=\"strong\">Constructor Summary</span>"}, 45.242 + {BUG_ID + FS + "pkg" + FS + "Coin.html", "<h3>Constructor Summary</h3>"}, 45.243 //================================= 45.244 // TYPE PARAMETER TESTING 45.245 //================================= 45.246 @@ -698,25 +698,25 @@ 45.247 {BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html", 45.248 "<a href=\"../pkg/AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</a>(<a href=\"../pkg/AnnotationType.html#optional\">optional</a>=\"Class Annotation\"," + NL + 45.249 " <a href=\"../pkg/AnnotationType.html#required\">required</a>=1994)" + NL + 45.250 - "public class <span class=\"strong\">AnnotationTypeUsage</span></dt><dt>extends java.lang.Object</dt>"}, 45.251 + "public class <span class=\"typeNameLabel\">AnnotationTypeUsage</span></dt><dt>extends java.lang.Object</dt>"}, 45.252 45.253 //FIELD 45.254 {BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html", 45.255 "<a href=\"../pkg/AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</a>(<a href=\"../pkg/AnnotationType.html#optional\">optional</a>=\"Field Annotation\"," + NL + 45.256 " <a href=\"../pkg/AnnotationType.html#required\">required</a>=1994)" + NL + 45.257 - "public int <span class=\"strong\">field</span>"}, 45.258 + "public int <span class=\"memberNameLabel\">field</span>"}, 45.259 45.260 //CONSTRUCTOR 45.261 {BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html", 45.262 "<a href=\"../pkg/AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</a>(<a href=\"../pkg/AnnotationType.html#optional\">optional</a>=\"Constructor Annotation\"," + NL + 45.263 " <a href=\"../pkg/AnnotationType.html#required\">required</a>=1994)" + NL + 45.264 - "public <span class=\"strong\">AnnotationTypeUsage</span>()"}, 45.265 + "public <span class=\"typeNameLabel\">AnnotationTypeUsage</span>()"}, 45.266 45.267 //METHOD 45.268 {BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html", 45.269 "<a href=\"../pkg/AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</a>(<a href=\"../pkg/AnnotationType.html#optional\">optional</a>=\"Method Annotation\"," + NL + 45.270 " <a href=\"../pkg/AnnotationType.html#required\">required</a>=1994)" + NL + 45.271 - "public void <span class=\"strong\">method</span>()"}, 45.272 + "public void <span class=\"memberNameLabel\">method</span>()"}, 45.273 45.274 //================================= 45.275 // Make sure annotation types do not
46.1 --- a/test/com/sun/javadoc/testOverridenMethods/TestOverridenMethodDocCopy.java Fri Oct 18 15:03:34 2013 -0700 46.2 +++ b/test/com/sun/javadoc/testOverridenMethods/TestOverridenMethodDocCopy.java Fri Oct 18 16:34:42 2013 -0700 46.3 @@ -23,7 +23,7 @@ 46.4 46.5 /* 46.6 * @test 46.7 - * @bug 4368820 8025633 46.8 + * @bug 4368820 8025633 8026567 46.9 * @summary Inherited comment should link directly to member, not just 46.10 * class 46.11 * @author jamieh 46.12 @@ -46,7 +46,7 @@ 46.13 //Input for string search tests. 46.14 private static final String[][] TEST = { 46.15 {BUG_ID + FS + "pkg1" + FS + "SubClass.html", 46.16 - "<span class=\"strong\">Description copied from class: <code>" + 46.17 + "<span class=\"descfrmTypeLabel\">Description copied from class: <code>" + 46.18 "<a href=\"../pkg1/BaseClass.html#overridenMethodWithDocsToCopy--\">" + 46.19 "BaseClass</a></code></span>" 46.20 }
47.1 --- a/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethods.java Fri Oct 18 15:03:34 2013 -0700 47.2 +++ b/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethods.java Fri Oct 18 16:34:42 2013 -0700 47.3 @@ -23,7 +23,7 @@ 47.4 47.5 /* 47.6 * @test 47.7 - * @bug 4634891 47.8 + * @bug 4634891 8026567 47.9 * @summary Determine if overriden methods are properly documented when 47.10 * -protected (default) visibility flag is used. 47.11 * @author jamieh 47.12 @@ -40,12 +40,12 @@ 47.13 private static final String[][] TEST = { 47.14 //The public method should be overriden 47.15 {BUG_ID + FS + "pkg1" + FS + "SubClass.html", 47.16 - "<dt><span class=\"strong\">Overrides:</span></dt>" + NL + 47.17 + "<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>" + NL + 47.18 "<dd><code><a href=\"../pkg1/BaseClass.html#publicMethod"}, 47.19 47.20 //The public method in different package should be overriden 47.21 {BUG_ID + FS + "pkg2" + FS + "SubClass.html", 47.22 - "<dt><span class=\"strong\">Overrides:</span></dt>" + NL + 47.23 + "<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>" + NL + 47.24 "<dd><code><a href=\"../pkg1/BaseClass.html#publicMethod"} 47.25 }; 47.26 47.27 @@ -54,17 +54,17 @@ 47.28 //The package private method should be overriden since the base and sub class are in the same 47.29 //package. However, the link should not show up because the package private methods are not documented. 47.30 {BUG_ID + FS + "pkg1" + FS + "SubClass.html", 47.31 - "<dt><span class=\"strong\">Overrides:</span></dt>" + NL + 47.32 + "<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>" + NL + 47.33 "<dd><code><a href=\"../pkg1/BaseClass.html#packagePrivateMethod"}, 47.34 47.35 //The private method in should not be overriden 47.36 {BUG_ID + FS + "pkg1" + FS + "SubClass.html", 47.37 - "<dt><span class=\"strong\">Overrides:</span></dt>" + NL + 47.38 + "<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>" + NL + 47.39 "<dd><code><a href=\"../pkg1/BaseClass.html#privateMethod"}, 47.40 47.41 //The private method in different package should not be overriden 47.42 {BUG_ID + FS + "pkg2" + FS + "SubClass.html", 47.43 - "<dt><span class=\"strong\">Overrides:</span></dt>" + NL + 47.44 + "<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>" + NL + 47.45 "<dd><code><a href=\"../pkg1/BaseClass.html#privateMethod"}, 47.46 47.47 //The package private method should not be overriden since the base and sub class are in
48.1 --- a/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPackageFlag.java Fri Oct 18 15:03:34 2013 -0700 48.2 +++ b/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPackageFlag.java Fri Oct 18 16:34:42 2013 -0700 48.3 @@ -23,7 +23,7 @@ 48.4 48.5 /* 48.6 * @test 48.7 - * @bug 4634891 8025633 48.8 + * @bug 4634891 8025633 8026567 48.9 * @summary Determine if overriden methods are properly documented when 48.10 * -protected (default) visibility flag is used. 48.11 * @author jamieh 48.12 @@ -40,14 +40,14 @@ 48.13 private static final String[][] TEST = { 48.14 //The public method should be overriden 48.15 {BUG_ID + FS + "pkg1" + FS + "SubClass.html", 48.16 - "<dt><span class=\"strong\">Overrides:</span></dt>" + NL + 48.17 + "<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>" + NL + 48.18 "<dd><code><a href=\"../pkg1/BaseClass.html#publicMethod--\">" + 48.19 "publicMethod</a></code> in class <code>" + 48.20 "<a href=\"../pkg1/BaseClass.html\" title=\"class in pkg1\">BaseClass</a></code></dd>"}, 48.21 48.22 //The public method in different package should be overriden 48.23 {BUG_ID + FS + "pkg2" + FS + "SubClass.html", 48.24 - "<dt><span class=\"strong\">Overrides:</span></dt>" + NL + 48.25 + "<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>" + NL + 48.26 "<dd><code><a href=\"../pkg1/BaseClass.html#publicMethod--\">" + 48.27 "publicMethod</a></code> in class <code>" + 48.28 "<a href=\"../pkg1/BaseClass.html\" title=\"class in pkg1\">BaseClass</a></code></dd>"}, 48.29 @@ -55,7 +55,7 @@ 48.30 //The package private method should be overriden since the base and sub class are in the same 48.31 //package. 48.32 {BUG_ID + FS + "pkg1" + FS + "SubClass.html", 48.33 - "<dt><span class=\"strong\">Overrides:</span></dt>" + NL + 48.34 + "<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>" + NL + 48.35 "<dd><code><a href=\"../pkg1/BaseClass.html#packagePrivateMethod--\">" + 48.36 "packagePrivateMethod</a></code> in class <code>" + 48.37 "<a href=\"../pkg1/BaseClass.html\" title=\"class in pkg1\">BaseClass</a></code></dd>"} 48.38 @@ -65,18 +65,18 @@ 48.39 48.40 //The private method in should not be overriden 48.41 {BUG_ID + FS + "pkg1" + FS + "SubClass.html", 48.42 - "<dt><span class=\"strong\">Overrides:</span></dt>" + NL + 48.43 + "<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>" + NL + 48.44 "<dd><code><a href=\"../pkg1/BaseClass.html#privateMethod()\">"}, 48.45 48.46 //The private method in different package should not be overriden 48.47 {BUG_ID + FS + "pkg2" + FS + "SubClass.html", 48.48 - "<dt><span class=\"strong\">Overrides:</span></dt>" + NL + 48.49 + "<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>" + NL + 48.50 "<dd><code><a href=\"../pkg1/BaseClass.html#privateMethod()\">"}, 48.51 48.52 //The package private method should not be overriden since the base and sub class are in 48.53 //different packages. 48.54 {BUG_ID + FS + "pkg2" + FS + "SubClass.html", 48.55 - "<dt><span class=\"strong\">Overrides:</span></dt>" + NL + 48.56 + "<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>" + NL + 48.57 "<dd><code><a href=\"../pkg1/BaseClass.html#packagePrivateMethod()\">"}, 48.58 }; 48.59
49.1 --- a/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPrivateFlag.java Fri Oct 18 15:03:34 2013 -0700 49.2 +++ b/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPrivateFlag.java Fri Oct 18 16:34:42 2013 -0700 49.3 @@ -23,7 +23,7 @@ 49.4 49.5 /* 49.6 * @test 49.7 - * @bug 4634891 49.8 + * @bug 4634891 8026567 49.9 * @summary Determine if overriden methods are properly documented when 49.10 * -protected (default) visibility flag is used. 49.11 * @author jamieh 49.12 @@ -40,18 +40,18 @@ 49.13 private static final String[][] TEST = { 49.14 //The public method should be overriden 49.15 {BUG_ID + FS + "pkg1" + FS + "SubClass.html", 49.16 - "<dt><span class=\"strong\">Overrides:</span></dt>" + NL + 49.17 + "<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>" + NL + 49.18 "<dd><code><a href=\"../pkg1/BaseClass.html#publicMethod"}, 49.19 49.20 //The package private method should be overriden since the base and sub class are in the same 49.21 //package. 49.22 {BUG_ID + FS + "pkg1" + FS + "SubClass.html", 49.23 - "<dt><span class=\"strong\">Overrides:</span></dt>" + NL + 49.24 + "<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>" + NL + 49.25 "<dd><code><a href=\"../pkg1/BaseClass.html#packagePrivateMethod"}, 49.26 49.27 //The public method in different package should be overriden 49.28 {BUG_ID + FS + "pkg2" + FS + "SubClass.html", 49.29 - "<dt><span class=\"strong\">Overrides:</span></dt>" + NL + 49.30 + "<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>" + NL + 49.31 "<dd><code><a href=\"../pkg1/BaseClass.html#publicMethod"}, 49.32 }; 49.33 49.34 @@ -59,18 +59,18 @@ 49.35 49.36 //The private method in should not be overriden 49.37 {BUG_ID + FS + "pkg1" + FS + "SubClass.html", 49.38 - "<dt><span class=\"strong\">Overrides:</span></dt>" + NL + 49.39 + "<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>" + NL + 49.40 "<dd><code><a href=\"../pkg1/BaseClass.html#privateMethod"}, 49.41 49.42 //The private method in different package should not be overriden 49.43 {BUG_ID + FS + "pkg2" + FS + "SubClass.html", 49.44 - "<dt><span class=\"strong\">Overrides:</span></dt>" + NL + 49.45 + "<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>" + NL + 49.46 "<dd><code><a href=\"../pkg1/BaseClass.html#privateMethod"}, 49.47 49.48 //The package private method should not be overriden since the base and sub class are in 49.49 //different packages. 49.50 {BUG_ID + FS + "pkg2" + FS + "SubClass.html", 49.51 - "<dt><span class=\"strong\">Overrides:</span></dt>" + NL + 49.52 + "<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>" + NL + 49.53 "<dd><code><a href=\"../pkg1/BaseClass.html#packagePrivateMethod"} 49.54 49.55
50.1 --- a/test/com/sun/javadoc/testPackageDeprecation/TestPackageDeprecation.java Fri Oct 18 15:03:34 2013 -0700 50.2 +++ b/test/com/sun/javadoc/testPackageDeprecation/TestPackageDeprecation.java Fri Oct 18 16:34:42 2013 -0700 50.3 @@ -23,7 +23,7 @@ 50.4 50.5 /* 50.6 * @test 50.7 - * @bug 6492694 50.8 + * @bug 6492694 8026567 50.9 * @summary Test package deprecation. 50.10 * @author bpatel 50.11 * @library ../lib/ 50.12 @@ -49,8 +49,8 @@ 50.13 //Input for string search tests. 50.14 private static final String[][] TEST1 = { 50.15 {BUG_ID + "-1" + FS + "pkg1" + FS + "package-summary.html", 50.16 - "<div class=\"deprecatedContent\"><span class=\"strong\">Deprecated.</span>" + NL + 50.17 - "<div class=\"block\"><span class=\"italic\">This package is Deprecated." + 50.18 + "<div class=\"deprecatedContent\"><span class=\"deprecatedLabel\">Deprecated.</span>" + NL + 50.19 + "<div class=\"block\"><span class=\"deprecationComment\">This package is Deprecated." + 50.20 "</span></div>" 50.21 }, 50.22 {BUG_ID + "-1" + FS + "deprecated-list.html",
51.1 --- a/test/com/sun/javadoc/testParamTaglet/TestParamTaglet.java Fri Oct 18 15:03:34 2013 -0700 51.2 +++ b/test/com/sun/javadoc/testParamTaglet/TestParamTaglet.java Fri Oct 18 16:34:42 2013 -0700 51.3 @@ -23,7 +23,7 @@ 51.4 51.5 /* 51.6 * @test 51.7 - * @bug 4802275 4967243 51.8 + * @bug 4802275 4967243 8026567 51.9 * @summary Make sure param tags are still printed even though they do not 51.10 * match up with a real parameters. 51.11 * Make sure inheritDoc cannot be used in an invalid param tag. 51.12 @@ -48,12 +48,12 @@ 51.13 private static final String[][] TEST = { 51.14 //Regular param tags. 51.15 {BUG_ID + FS + "pkg" + FS + "C.html", 51.16 - "<span class=\"strong\">Parameters:</span></dt>" + NL + "<dd><code>param1</code> - testing 1 2 3.</dd>" + 51.17 + "<span class=\"paramLabel\">Parameters:</span></dt>" + NL + "<dd><code>param1</code> - testing 1 2 3.</dd>" + 51.18 NL + "<dd><code>param2</code> - testing 1 2 3." 51.19 }, 51.20 //Param tags that don't match with any real parameters. 51.21 {BUG_ID + FS + "pkg" + FS + "C.html", 51.22 - "<span class=\"strong\">Parameters:</span></dt>" + NL + "<dd><code><I>p1</I></code> - testing 1 2 3.</dd>" + 51.23 + "<span class=\"paramLabel\">Parameters:</span></dt>" + NL + "<dd><code><I>p1</I></code> - testing 1 2 3.</dd>" + 51.24 NL + "<dd><code><I>p2</I></code> - testing 1 2 3." 51.25 }, 51.26 //{@inherit} doc misuse does not cause doclet to throw exception.
52.1 --- a/test/com/sun/javadoc/testPrivateClasses/TestPrivateClasses.java Fri Oct 18 15:03:34 2013 -0700 52.2 +++ b/test/com/sun/javadoc/testPrivateClasses/TestPrivateClasses.java Fri Oct 18 16:34:42 2013 -0700 52.3 @@ -23,7 +23,7 @@ 52.4 52.5 /* 52.6 * @test 52.7 - * @bug 4780441 4874845 4978816 8014017 8016328 8025633 52.8 + * @bug 4780441 4874845 4978816 8014017 8016328 8025633 8026567 52.9 * @summary Make sure that when the -private flag is not used, members 52.10 * inherited from package private class are documented in the child. 52.11 * 52.12 @@ -112,12 +112,12 @@ 52.13 private static final String[][] NEGATED_TEST1 = { 52.14 // Should not document that a method overrides method from private class. 52.15 {BUG_ID + "-1" + FS + "pkg" + FS + "PublicChild.html", 52.16 - "<span class=\"strong\">Overrides:</span>"}, 52.17 + "<span class=\"overrideSpecifyLabel\">Overrides:</span>"}, 52.18 // Should not document that a method specified by private interface. 52.19 {BUG_ID + "-1" + FS + "pkg" + FS + "PublicChild.html", 52.20 - "<span class=\"strong\">Specified by:</span>"}, 52.21 + "<span class=\"overrideSpecifyLabel\">Specified by:</span>"}, 52.22 {BUG_ID + "-1" + FS + "pkg" + FS + "PublicInterface.html", 52.23 - "<span class=\"strong\">Specified by:</span>"}, 52.24 + "<span class=\"overrideSpecifyLabel\">Specified by:</span>"}, 52.25 // Should not mention that any documentation was copied. 52.26 {BUG_ID + "-1" + FS + "pkg" + FS + "PublicChild.html", 52.27 "Description copied from"}, 52.28 @@ -139,7 +139,7 @@ 52.29 //Do not inherit private interface method with generic parameters. 52.30 //This method has been implemented. 52.31 {BUG_ID + "-1" + FS + "pkg2" + FS + "C.html", 52.32 - "<span class=\"strong\"><a href=\"../pkg2/I.html#hello-T-\">hello</a></span>"}, 52.33 + "<span class=\"memberNameLink\"><a href=\"../pkg2/I.html#hello-T-\">hello</a></span>"}, 52.34 }; 52.35 52.36 // Test output when -private flag is used. 52.37 @@ -176,14 +176,14 @@ 52.38 }, 52.39 // Should document that a method overrides method from private class. 52.40 {BUG_ID + "-2" + FS + "pkg" + FS + "PublicChild.html", 52.41 - "<dt><span class=\"strong\">Overrides:</span></dt>" + NL + 52.42 + "<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>" + NL + 52.43 "<dd><code><a href=\"../pkg/PrivateParent.html#methodOverridenFromParent-char:A-int-T-V-java.util.List-\">" + 52.44 "methodOverridenFromParent</a></code> in class <code>" + 52.45 "<a href=\"../pkg/PrivateParent.html\" title=\"class in pkg\">" + 52.46 "PrivateParent</a></code></dd>"}, 52.47 // Should document that a method is specified by private interface. 52.48 {BUG_ID + "-2" + FS + "pkg" + FS + "PublicChild.html", 52.49 - "<dt><span class=\"strong\">Specified by:</span></dt>" + NL + 52.50 + "<dt><span class=\"overrideSpecifyLabel\">Specified by:</span></dt>" + NL + 52.51 "<dd><code><a href=\"../pkg/PrivateInterface.html#methodInterface-int-\">" + 52.52 "methodInterface</a></code> in interface <code>" + 52.53 "<a href=\"../pkg/PrivateInterface.html\" title=\"interface in pkg\">" + 52.54 @@ -227,11 +227,11 @@ 52.55 //Since private flag is used, we can document that private interface method 52.56 //with generic parameters has been implemented. 52.57 {BUG_ID + "-2" + FS + "pkg2" + FS + "C.html", 52.58 - "<span class=\"strong\">Description copied from interface: <code>" + 52.59 + "<span class=\"descfrmTypeLabel\">Description copied from interface: <code>" + 52.60 "<a href=\"../pkg2/I.html#hello-T-\">I</a></code></span>"}, 52.61 52.62 {BUG_ID + "-2" + FS + "pkg2" + FS + "C.html", 52.63 - "<dt><span class=\"strong\">Specified by:</span></dt>" + NL + 52.64 + "<dt><span class=\"overrideSpecifyLabel\">Specified by:</span></dt>" + NL + 52.65 "<dd><code><a href=\"../pkg2/I.html#hello-T-\">hello</a></code>" + 52.66 " in interface <code>" + 52.67 "<a href=\"../pkg2/I.html\" title=\"interface in pkg2\">I</a>" + 52.68 @@ -240,14 +240,14 @@ 52.69 //Make sure when no modifier appear in the class signature, the 52.70 //signature is displayed correctly without extra space at the beginning. 52.71 {BUG_ID + "-2" + FS + "pkg" + FS + "PrivateParent.html", 52.72 - "<pre>class <span class=\"strong\">PrivateParent</span>"}, 52.73 + "<pre>class <span class=\"typeNameLabel\">PrivateParent</span>"}, 52.74 52.75 {BUG_ID + "-2" + FS + "pkg" + FS + "PublicChild.html", 52.76 - "<pre>public class <span class=\"strong\">PublicChild</span>"}, 52.77 + "<pre>public class <span class=\"typeNameLabel\">PublicChild</span>"}, 52.78 }; 52.79 private static final String[][] NEGATED_TEST2 = { 52.80 {BUG_ID + "-2" + FS + "pkg" + FS + "PrivateParent.html", 52.81 - "<pre> class <span class=\"strong\">PrivateParent</span>"}, 52.82 + "<pre> class <span class=\"typeNameLabel\">PrivateParent</span>"}, 52.83 }; 52.84 52.85 /**
53.1 --- a/test/com/sun/javadoc/testProfiles/TestProfiles.java Fri Oct 18 15:03:34 2013 -0700 53.2 +++ b/test/com/sun/javadoc/testProfiles/TestProfiles.java Fri Oct 18 16:34:42 2013 -0700 53.3 @@ -23,7 +23,7 @@ 53.4 53.5 /* 53.6 * @test 53.7 - * @bug 8006124 8009684 8016921 8023700 8024096 8008164 53.8 + * @bug 8006124 8009684 8016921 8023700 8024096 8008164 8026567 53.9 * @summary Test javadoc support for profiles. 53.10 * @author Bhavesh Patel, Evgeniya Stepanova 53.11 * @library ../lib/ 53.12 @@ -122,17 +122,17 @@ 53.13 }, 53.14 {PROFILE_BUG_ID + FS + "deprecated-list.html","<td class=\"colOne\">" 53.15 + "<a href=\"pkg2/Class1Pkg2.html\" title=\"class in pkg2\">pkg2.Class1Pkg2</a>" 53.16 - + NL +"<div class=\"block\"><span class=\"italic\">Class1Pkg2. This class is deprecated</span></div>" 53.17 + + NL +"<div class=\"block\"><span class=\"deprecationComment\">Class1Pkg2. This class is deprecated</span></div>" 53.18 }, 53.19 //Test deprecated package in profile 53.20 {PROFILE_BUG_ID + FS + "deprecated-list.html","<td class=\"colOne\">" 53.21 + "<a href=\"pkgDeprecated/package-summary.html\">pkgDeprecated</a>" 53.22 - + NL +"<div class=\"block\"><span class=\"italic\">This package is <b>Deprecated</b>." 53.23 + + NL +"<div class=\"block\"><span class=\"deprecationComment\">This package is <b>Deprecated</b>." 53.24 + " Use pkg1.</span></div>" 53.25 }, 53.26 {PROFILE_BUG_ID + FS + "pkgDeprecated" + FS + "package-summary.html", 53.27 - "<div class=\"deprecatedContent\"><span class=\"strong\">Deprecated.</span>" 53.28 - + NL + "<div class=\"block\"><span class=\"italic\">This package is <b>Deprecated</b>." 53.29 + "<div class=\"deprecatedContent\"><span class=\"deprecatedLabel\">Deprecated.</span>" 53.30 + + NL + "<div class=\"block\"><span class=\"deprecationComment\">This package is <b>Deprecated</b>." 53.31 + " Use pkg1.</span></div>" 53.32 }, 53.33 // need to add teststring when JDK-8015496 will be fixed
54.1 --- a/test/com/sun/javadoc/testProfiles/TestProfilesConfiguration.java Fri Oct 18 15:03:34 2013 -0700 54.2 +++ b/test/com/sun/javadoc/testProfiles/TestProfilesConfiguration.java Fri Oct 18 16:34:42 2013 -0700 54.3 @@ -23,7 +23,7 @@ 54.4 54.5 /* 54.6 * @test 54.7 - * @bug 8006124 8009684 8015663 8015496 54.8 + * @bug 8006124 8009684 8015663 8015496 8026567 54.9 * @summary Test javadoc options support for profiles. 54.10 * @author Evgeniya Stepanova 54.11 * @library ../lib/ 54.12 @@ -87,7 +87,7 @@ 54.13 {PROFILE_CONFIGURATION_BUG_ID + FS + "compact1-summary.html", 54.14 "<h3><a href=\"pkgDeprecated/compact1-package-summary.html\" target=\"" + 54.15 "classFrame\">pkgDeprecated</a></h3>" + NL + "<div class=\"deprecatedContent\">" + 54.16 - "<span class=\"strong\">Deprecated.</span></div>" 54.17 + "<span class=\"deprecatedLabel\">Deprecated.</span></div>" 54.18 } 54.19 }; 54.20 private static final String[][] PROFILES_CONFIGURATION_NEGATED_TEST = {
55.1 --- a/test/com/sun/javadoc/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java Fri Oct 18 15:03:34 2013 -0700 55.2 +++ b/test/com/sun/javadoc/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java Fri Oct 18 16:34:42 2013 -0700 55.3 @@ -25,7 +25,7 @@ 55.4 55.5 /* 55.6 * @test 55.7 - * @bug 6802694 8025633 55.8 + * @bug 6802694 8025633 8026567 55.9 * @summary This test verifies deprecation info in serialized-form.html. 55.10 * @author Bhavesh Patel 55.11 * @library ../lib/ 55.12 @@ -42,29 +42,29 @@ 55.13 // display the inline comments, tags and deprecation information if any. 55.14 private static final String[][] TEST_CMNT_DEPR = { 55.15 {BUG_ID + FS + "serialized-form.html", "<dl>" + NL + 55.16 - "<dt><span class=\"strong\">Throws:</span></dt>" + NL + "<dd><code>" + 55.17 - "java.io.IOException</code></dd>"+ NL + "<dt><span class=\"strong\">See Also:</span>" + 55.18 + "<dt><span class=\"throwsLabel\">Throws:</span></dt>" + NL + "<dd><code>" + 55.19 + "java.io.IOException</code></dd>"+ NL + "<dt><span class=\"seeLabel\">See Also:</span>" + 55.20 "</dt>" + NL + "<dd><a href=\"pkg1/C1.html#setUndecorated-boolean-\">" + 55.21 "<code>C1.setUndecorated(boolean)</code></a></dd>" + NL + "</dl>"}, 55.22 - {BUG_ID + FS + "serialized-form.html", "<span class=\"strong\">Deprecated.</span>" + 55.23 - " <span class=\"italic\">As of JDK version 1.5, replaced by" + NL + 55.24 + {BUG_ID + FS + "serialized-form.html", "<span class=\"deprecatedLabel\">Deprecated.</span>" + 55.25 + " <span class=\"deprecationComment\">As of JDK version 1.5, replaced by" + NL + 55.26 " <a href=\"pkg1/C1.html#setUndecorated-boolean-\">" + 55.27 "<code>setUndecorated(boolean)</code></a>.</span></div>" + NL + 55.28 "<div class=\"block\">This field indicates whether the C1 " + 55.29 "is undecorated.</div>" + NL + " " + NL + 55.30 - "<dl>" + NL + "<dt><span class=\"strong\">Since:</span></dt>" + NL + 55.31 - "<dd>1.4</dd>" + NL + "<dt><span class=\"strong\">See Also:</span>" + 55.32 + "<dl>" + NL + "<dt><span class=\"simpleTagLabel\">Since:</span></dt>" + NL + 55.33 + "<dd>1.4</dd>" + NL + "<dt><span class=\"seeLabel\">See Also:</span>" + 55.34 "</dt>" + NL + "<dd><a href=\"pkg1/C1.html#setUndecorated-boolean-\">" + 55.35 "<code>C1.setUndecorated(boolean)</code></a></dd>" + NL + "</dl>"}, 55.36 - {BUG_ID + FS + "serialized-form.html", "<span class=\"strong\">Deprecated.</span>" + 55.37 - " <span class=\"italic\">As of JDK version 1.5, replaced by" + NL + 55.38 + {BUG_ID + FS + "serialized-form.html", "<span class=\"deprecatedLabel\">Deprecated.</span>" + 55.39 + " <span class=\"deprecationComment\">As of JDK version 1.5, replaced by" + NL + 55.40 " <a href=\"pkg1/C1.html#setUndecorated-boolean-\">" + 55.41 "<code>setUndecorated(boolean)</code></a>.</span></div>" + NL + 55.42 "<div class=\"block\">Reads the object stream.</div>" + NL + 55.43 - "<dl>" + NL + "<dt><span class=\"strong\">Throws:</span></dt>" + NL + "<dd><code><code>" + 55.44 + "<dl>" + NL + "<dt><span class=\"throwsLabel\">Throws:</span></dt>" + NL + "<dd><code><code>" + 55.45 "IOException</code></code></dd>" + NL + 55.46 "<dd><code>java.io.IOException</code></dd>" + NL + "</dl>"}, 55.47 - {BUG_ID + FS + "serialized-form.html", "<span class=\"strong\">Deprecated.</span>" + 55.48 + {BUG_ID + FS + "serialized-form.html", "<span class=\"deprecatedLabel\">Deprecated.</span>" + 55.49 " </div>" + NL + "<div class=\"block\">" + 55.50 "The name for this class.</div>"}}; 55.51 55.52 @@ -73,12 +73,12 @@ 55.53 // information if any. 55.54 private static final String[][] TEST_NOCMNT = { 55.55 {BUG_ID + FS + "serialized-form.html", "<pre>boolean undecorated</pre>" + NL + 55.56 - "<div class=\"block\"><span class=\"strong\">Deprecated.</span> <span class=\"italic\">" + 55.57 + "<div class=\"block\"><span class=\"deprecatedLabel\">Deprecated.</span> <span class=\"deprecationComment\">" + 55.58 "As of JDK version 1.5, replaced by" + NL + 55.59 " <a href=\"pkg1/C1.html#setUndecorated-boolean-\"><code>" + 55.60 "setUndecorated(boolean)</code></a>.</span></div>" + NL + "</li>"}, 55.61 - {BUG_ID + FS + "serialized-form.html", "<span class=\"strong\">" + 55.62 - "Deprecated.</span> <span class=\"italic\">As of JDK version" + 55.63 + {BUG_ID + FS + "serialized-form.html", "<span class=\"deprecatedLabel\">" + 55.64 + "Deprecated.</span> <span class=\"deprecationComment\">As of JDK version" + 55.65 " 1.5, replaced by" + NL + 55.66 " <a href=\"pkg1/C1.html#setUndecorated-boolean-\">" + 55.67 "<code>setUndecorated(boolean)</code></a>.</span></div>" + NL + "</li>"}};
56.1 --- a/test/com/sun/javadoc/testSimpleTag/TestSimpleTag.java Fri Oct 18 15:03:34 2013 -0700 56.2 +++ b/test/com/sun/javadoc/testSimpleTag/TestSimpleTag.java Fri Oct 18 16:34:42 2013 -0700 56.3 @@ -1,5 +1,5 @@ 56.4 /* 56.5 - * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. 56.6 + * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. 56.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 56.8 * 56.9 * This code is free software; you can redistribute it and/or modify it 56.10 @@ -23,7 +23,7 @@ 56.11 56.12 /* 56.13 * @test 56.14 - * @bug 4695326 4750173 4920381 56.15 + * @bug 4695326 4750173 4920381 8026567 56.16 * @summary Test the declarartion of simple tags using -tag. Verify that 56.17 * "-tag name" is a shortcut for "-tag name:a:Name:". Also verity that 56.18 * you can escape the ":" character with a back slash so that it is not 56.19 @@ -42,13 +42,13 @@ 56.20 private static final String[][] TEST = 56.21 new String[][] { 56.22 {"./" + BUG_ID + "/C.html", 56.23 - "<span class=\"strong\">Todo:</span>"}, 56.24 + "<span class=\"simpleTagLabel\">Todo:</span>"}, 56.25 {"./" + BUG_ID + "/C.html", 56.26 - "<span class=\"strong\">EJB Beans:</span>"}, 56.27 + "<span class=\"simpleTagLabel\">EJB Beans:</span>"}, 56.28 {"./" + BUG_ID + "/C.html", 56.29 - "<span class=\"strong\">Regular Tag:</span>"}, 56.30 + "<span class=\"simpleTagLabel\">Regular Tag:</span>"}, 56.31 {"./" + BUG_ID + "/C.html", 56.32 - "<span class=\"strong\">Back-Slash-Tag:</span>"}, 56.33 + "<span class=\"simpleTagLabel\">Back-Slash-Tag:</span>"}, 56.34 }; 56.35 56.36 private static final String[] ARGS = new String[] {
57.1 --- a/test/com/sun/javadoc/testSimpleTagInherit/TestSimpleTagInherit.java Fri Oct 18 15:03:34 2013 -0700 57.2 +++ b/test/com/sun/javadoc/testSimpleTagInherit/TestSimpleTagInherit.java Fri Oct 18 16:34:42 2013 -0700 57.3 @@ -23,7 +23,7 @@ 57.4 57.5 /* 57.6 * @test 57.7 - * @bug 8008768 57.8 + * @bug 8008768 8026567 57.9 * @summary Using {@inheritDoc} in simple tag defined via -tag fails 57.10 * @library ../lib/ 57.11 * @build JavadocTester TestSimpleTagInherit 57.12 @@ -46,10 +46,10 @@ 57.13 //Input for string search tests. 57.14 private static final String[][] TEST = { 57.15 { BUG_ID + FS + "p" + FS + "TestClass.html", 57.16 - "<dt><span class=\"strong\"><em>Custom:</em></span></dt>" + NL + 57.17 + "<dt><span class=\"simpleTagLabel\"><em>Custom:</em></span></dt>" + NL + 57.18 "<dd>doc for BaseClass class</dd>" }, 57.19 { BUG_ID + FS + "p" + FS + "TestClass.html", 57.20 - "<dt><span class=\"strong\"><em>Custom:</em></span></dt>" + NL + 57.21 + "<dt><span class=\"simpleTagLabel\"><em>Custom:</em></span></dt>" + NL + 57.22 "<dd>doc for BaseClass method</dd>" } 57.23 }; 57.24 private static final String[][] NEGATED_TEST = NO_TEST;
58.1 --- a/test/com/sun/javadoc/testSinceTag/TestSinceTag.java Fri Oct 18 15:03:34 2013 -0700 58.2 +++ b/test/com/sun/javadoc/testSinceTag/TestSinceTag.java Fri Oct 18 16:34:42 2013 -0700 58.3 @@ -23,7 +23,7 @@ 58.4 58.5 /* 58.6 * @test 58.7 - * @bug 7180906 58.8 + * @bug 7180906 8026567 58.9 * @summary Test to make sure that the since tag works correctly 58.10 * @author Bhavesh Patel 58.11 * @library ../lib/ 58.12 @@ -48,11 +48,11 @@ 58.13 //Input for string search tests. 58.14 private static final String[][] TEST = { 58.15 {BUG_ID + FS + "pkg1" + FS + "C1.html", 58.16 - "<dl>" + NL + "<dt><span class=\"strong\">Since:</span></dt>" + NL + 58.17 + "<dl>" + NL + "<dt><span class=\"simpleTagLabel\">Since:</span></dt>" + NL + 58.18 "<dd>JDK1.0</dd>" 58.19 }, 58.20 {BUG_ID + FS + "serialized-form.html", 58.21 - "<dl>" + NL + "<dt><span class=\"strong\">Since:</span></dt>" + NL + 58.22 + "<dl>" + NL + "<dt><span class=\"simpleTagLabel\">Since:</span></dt>" + NL + 58.23 "<dd>1.4</dd>" 58.24 } 58.25 };
59.1 --- a/test/com/sun/javadoc/testTagOutput/TestTagOutput.java Fri Oct 18 15:03:34 2013 -0700 59.2 +++ b/test/com/sun/javadoc/testTagOutput/TestTagOutput.java Fri Oct 18 16:34:42 2013 -0700 59.3 @@ -25,7 +25,7 @@ 59.4 59.5 /* 59.6 * @test 59.7 - * @bug 8026370 59.8 + * @bug 8026370 8026567 59.9 * @summary This test checks the generated tag output. 59.10 * @author Bhavesh Patel 59.11 * @library ../lib/ 59.12 @@ -38,15 +38,15 @@ 59.13 private static final String BUG_ID = "8026370"; 59.14 private static final String[][] TEST = { 59.15 {BUG_ID + FS + "pkg1" + FS + "DeprecatedTag.html", 59.16 - "<div class=\"block\"><span class=\"strong\">Deprecated.</span> </div>"}, 59.17 + "<div class=\"block\"><span class=\"deprecatedLabel\">Deprecated.</span> </div>"}, 59.18 {BUG_ID + FS + "pkg1" + FS + "DeprecatedTag.html", 59.19 - "<div class=\"block\"><span class=\"strong\">Deprecated.</span> " + 59.20 - "<span class=\"italic\">Do not use this.</span></div>"}}; 59.21 + "<div class=\"block\"><span class=\"deprecatedLabel\">Deprecated.</span> " + 59.22 + "<span class=\"deprecationComment\">Do not use this.</span></div>"}}; 59.23 59.24 private static final String[][] NEGATED_TEST = { 59.25 {BUG_ID + FS + "pkg1" + FS + "DeprecatedTag.html", 59.26 - "<div class=\"block\"><span class=\"strong\">Deprecated." + 59.27 - "</span> <span class=\"italic\"></span></div>"}}; 59.28 + "<div class=\"block\"><span class=\"deprecatedLabel\">Deprecated." + 59.29 + "</span> <span class=\"deprecationComment\"></span></div>"}}; 59.30 59.31 private static final String[] ARGS = 59.32 new String[] {
60.1 --- a/test/com/sun/javadoc/testTaglets/TestTaglets.java Fri Oct 18 15:03:34 2013 -0700 60.2 +++ b/test/com/sun/javadoc/testTaglets/TestTaglets.java Fri Oct 18 16:34:42 2013 -0700 60.3 @@ -55,7 +55,7 @@ 60.4 60.5 //Input for string search tests. 60.6 private static final String[][] TEST_4654308 = new String[][] { 60.7 - {"4654308" + FS + "C.html", "<span class=\"strong\">Foo:</span></dt>" + 60.8 + {"4654308" + FS + "C.html", "<span class=\"simpleTagLabel\">Foo:</span></dt>" + 60.9 "<dd>my only method is <a href=\"C.html#method--\"><code>here" + 60.10 "</code></a></dd></dl>"} 60.11 };
61.1 --- a/test/com/sun/javadoc/testTaglets/taglets/Foo.java Fri Oct 18 15:03:34 2013 -0700 61.2 +++ b/test/com/sun/javadoc/testTaglets/taglets/Foo.java Fri Oct 18 16:34:42 2013 -0700 61.3 @@ -50,7 +50,7 @@ 61.4 */ 61.5 public Content getTagletOutput(Tag tag, TagletWriter writer) { 61.6 ArrayList inlineTags = new ArrayList(); 61.7 - inlineTags.add(new TextTag(tag.holder(), "<dt><span class=\"strong\">Foo:</span></dt><dd>")); 61.8 + inlineTags.add(new TextTag(tag.holder(), "<dt><span class=\"simpleTagLabel\">Foo:</span></dt><dd>")); 61.9 inlineTags.addAll(Arrays.asList(tag.inlineTags())); 61.10 inlineTags.add(new TextTag(tag.holder(), "</dd>")); 61.11 return writer.commentTagsToOutput(tag,
62.1 --- a/test/com/sun/javadoc/testThrowsHead/TestThrowsHead.java Fri Oct 18 15:03:34 2013 -0700 62.2 +++ b/test/com/sun/javadoc/testThrowsHead/TestThrowsHead.java Fri Oct 18 16:34:42 2013 -0700 62.3 @@ -1,5 +1,5 @@ 62.4 /* 62.5 - * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. 62.6 + * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. 62.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 62.8 * 62.9 * This code is free software; you can redistribute it and/or modify it 62.10 @@ -23,7 +23,7 @@ 62.11 62.12 /** 62.13 * @test 62.14 - * @bug 4530727 62.15 + * @bug 4530727 8026567 62.16 * @summary When an exception is declared in the method signature but 62.17 * not documented with a throws tag, we generate a link to it in the 62.18 * throws section. Make sure that the link is below a Throws heading. 62.19 @@ -38,7 +38,7 @@ 62.20 62.21 private static final String BUG_ID = "4530727"; 62.22 private static final String[][] TEST = { 62.23 - {BUG_ID + FS + "C.html", "<dt><span class=\"strong\">Throws:</span>"} 62.24 + {BUG_ID + FS + "C.html", "<dt><span class=\"throwsLabel\">Throws:</span>"} 62.25 }; 62.26 private static final String[][] NEGATED_TEST = NO_TEST; 62.27 private static final String[] ARGS = new String[] {
63.1 --- a/test/com/sun/javadoc/testTypeAnnotations/TestTypeAnnotations.java Fri Oct 18 15:03:34 2013 -0700 63.2 +++ b/test/com/sun/javadoc/testTypeAnnotations/TestTypeAnnotations.java Fri Oct 18 16:34:42 2013 -0700 63.3 @@ -23,7 +23,7 @@ 63.4 63.5 /* 63.6 * @test 63.7 - * @bug 8005091 8009686 8025633 63.8 + * @bug 8005091 8009686 8025633 8026567 63.9 * @summary Make sure that type annotations are displayed correctly 63.10 * @author Bhavesh Patel 63.11 * @library ../lib/ 63.12 @@ -74,12 +74,12 @@ 63.13 63.14 // Test for type annotations on Class Parameters (ClassParameters.java). 63.15 {BUG_ID + FS + "typeannos" + FS + "ExtendsBound.html", 63.16 - "class <span class=\"strong\">ExtendsBound<K extends <a " + 63.17 + "class <span class=\"typeNameLabel\">ExtendsBound<K extends <a " + 63.18 "href=\"../typeannos/ClassParamA.html\" title=\"annotation in " + 63.19 "typeannos\">@ClassParamA</a> java.lang.String></span>" 63.20 }, 63.21 {BUG_ID + FS + "typeannos" + FS + "ExtendsGeneric.html", 63.22 - "<pre>class <span class=\"strong\">ExtendsGeneric<K extends " + 63.23 + "<pre>class <span class=\"typeNameLabel\">ExtendsGeneric<K extends " + 63.24 "<a href=\"../typeannos/ClassParamA.html\" title=\"annotation in " + 63.25 "typeannos\">@ClassParamA</a> <a href=\"../typeannos/Unannotated.html\" " + 63.26 "title=\"class in typeannos\">Unannotated</a><<a href=\"" + 63.27 @@ -87,24 +87,24 @@ 63.28 "@ClassParamB</a> java.lang.String>></span>" 63.29 }, 63.30 {BUG_ID + FS + "typeannos" + FS + "TwoBounds.html", 63.31 - "<pre>class <span class=\"strong\">TwoBounds<K extends <a href=\"" + 63.32 + "<pre>class <span class=\"typeNameLabel\">TwoBounds<K extends <a href=\"" + 63.33 "../typeannos/ClassParamA.html\" title=\"annotation in typeannos\">" + 63.34 "@ClassParamA</a> java.lang.String,V extends <a href=\"../typeannos/" + 63.35 "ClassParamB.html\" title=\"annotation in typeannos\">@ClassParamB" + 63.36 "</a> java.lang.String></span>" 63.37 }, 63.38 {BUG_ID + FS + "typeannos" + FS + "Complex1.html", 63.39 - "class <span class=\"strong\">Complex1<K extends <a href=\"../" + 63.40 + "class <span class=\"typeNameLabel\">Complex1<K extends <a href=\"../" + 63.41 "typeannos/ClassParamA.html\" title=\"annotation in typeannos\">" + 63.42 "@ClassParamA</a> java.lang.String & java.lang.Runnable></span>" 63.43 }, 63.44 {BUG_ID + FS + "typeannos" + FS + "Complex2.html", 63.45 - "class <span class=\"strong\">Complex2<K extends java.lang." + 63.46 + "class <span class=\"typeNameLabel\">Complex2<K extends java.lang." + 63.47 "String & <a href=\"../typeannos/ClassParamB.html\" title=\"" + 63.48 "annotation in typeannos\">@ClassParamB</a> java.lang.Runnable></span>" 63.49 }, 63.50 {BUG_ID + FS + "typeannos" + FS + "ComplexBoth.html", 63.51 - "class <span class=\"strong\">ComplexBoth<K extends <a href=\"" + 63.52 + "class <span class=\"typeNameLabel\">ComplexBoth<K extends <a href=\"" + 63.53 "../typeannos/ClassParamA.html\" title=\"annotation in typeannos\"" + 63.54 ">@ClassParamA</a> java.lang.String & <a href=\"../typeannos/" + 63.55 "ClassParamA.html\" title=\"annotation in typeannos\">@ClassParamA" +
64.1 --- a/test/com/sun/javadoc/testValueTag/TestValueTag.java Fri Oct 18 15:03:34 2013 -0700 64.2 +++ b/test/com/sun/javadoc/testValueTag/TestValueTag.java Fri Oct 18 16:34:42 2013 -0700 64.3 @@ -23,7 +23,7 @@ 64.4 64.5 /* 64.6 * @test 64.7 - * @bug 4764045 8004825 64.8 + * @bug 4764045 8004825 8026567 64.9 * @summary This test ensures that the value tag works in all 64.10 * use cases. The explainations for each test case are written below. 64.11 * @author jamieh 64.12 @@ -94,7 +94,7 @@ 64.13 "Result: <a href=\"../pkg2/Class3.html#TEST_17_PASSES\">\"Test 17 passes\"</a>"}, 64.14 //Test @value tag used with custom tag. 64.15 {BUG_ID + FS + "pkg1" + FS + "CustomTagUsage.html", 64.16 - "<dt><span class=\"strong\">Todo:</span></dt>" + NL + 64.17 + "<dt><span class=\"simpleTagLabel\">Todo:</span></dt>" + NL + 64.18 "<dd>the value of this constant is 55.</dd>"}, 64.19 //Test @value errors printed dues to invalid use or when used with 64.20 //non-constant or with bad references.
