1.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java Fri Oct 18 15:03:34 2013 -0700 1.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java Fri Oct 18 16:34:42 2013 -0700 1.3 @@ -97,7 +97,7 @@ 1.4 Tag[] deprs = doc.tags("deprecated"); 1.5 if (doc instanceof ClassDoc) { 1.6 if (Util.isDeprecated((ProgramElementDoc) doc)) { 1.7 - result.addContent(HtmlTree.SPAN(HtmlStyle.strong, 1.8 + result.addContent(HtmlTree.SPAN(HtmlStyle.deprecatedLabel, 1.9 new StringContent(configuration.getText("doclet.Deprecated")))); 1.10 result.addContent(RawHtml.nbsp); 1.11 if (deprs.length > 0) { 1.12 @@ -112,18 +112,18 @@ 1.13 } else { 1.14 MemberDoc member = (MemberDoc) doc; 1.15 if (Util.isDeprecated((ProgramElementDoc) doc)) { 1.16 - result.addContent(HtmlTree.SPAN(HtmlStyle.strong, 1.17 + result.addContent(HtmlTree.SPAN(HtmlStyle.deprecatedLabel, 1.18 new StringContent(configuration.getText("doclet.Deprecated")))); 1.19 result.addContent(RawHtml.nbsp); 1.20 if (deprs.length > 0) { 1.21 Content body = commentTagsToOutput(null, doc, 1.22 deprs[0].inlineTags(), false); 1.23 if (!body.isEmpty()) 1.24 - result.addContent(HtmlTree.SPAN(HtmlStyle.italic, body)); 1.25 + result.addContent(HtmlTree.SPAN(HtmlStyle.deprecationComment, body)); 1.26 } 1.27 } else { 1.28 if (Util.isDeprecated(member.containingClass())) { 1.29 - result.addContent(HtmlTree.SPAN(HtmlStyle.strong, 1.30 + result.addContent(HtmlTree.SPAN(HtmlStyle.deprecatedLabel, 1.31 new StringContent(configuration.getText("doclet.Deprecated")))); 1.32 result.addContent(RawHtml.nbsp); 1.33 } 1.34 @@ -151,7 +151,7 @@ 1.35 * {@inheritDoc} 1.36 */ 1.37 public Content getParamHeader(String header) { 1.38 - HtmlTree result = HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.strong, 1.39 + HtmlTree result = HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.paramLabel, 1.40 new StringContent(header))); 1.41 return result; 1.42 } 1.43 @@ -186,7 +186,7 @@ 1.44 */ 1.45 public Content returnTagOutput(Tag returnTag) { 1.46 ContentBuilder result = new ContentBuilder(); 1.47 - result.addContent(HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.strong, 1.48 + result.addContent(HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.returnLabel, 1.49 new StringContent(configuration.getText("doclet.Returns"))))); 1.50 result.addContent(HtmlTree.DD(htmlWriter.commentTagsToContent( 1.51 returnTag, null, returnTag.inlineTags(), false))); 1.52 @@ -231,7 +231,7 @@ 1.53 return body; 1.54 1.55 ContentBuilder result = new ContentBuilder(); 1.56 - result.addContent(HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.strong, 1.57 + result.addContent(HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.seeLabel, 1.58 new StringContent(configuration.getText("doclet.See_Also"))))); 1.59 result.addContent(HtmlTree.DD(body)); 1.60 return result; 1.61 @@ -250,7 +250,7 @@ 1.62 */ 1.63 public Content simpleTagOutput(Tag[] simpleTags, String header) { 1.64 ContentBuilder result = new ContentBuilder(); 1.65 - result.addContent(HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.strong, new RawHtml(header)))); 1.66 + result.addContent(HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.simpleTagLabel, new RawHtml(header)))); 1.67 ContentBuilder body = new ContentBuilder(); 1.68 for (int i = 0; i < simpleTags.length; i++) { 1.69 if (i > 0) { 1.70 @@ -268,7 +268,7 @@ 1.71 */ 1.72 public Content simpleTagOutput(Tag simpleTag, String header) { 1.73 ContentBuilder result = new ContentBuilder(); 1.74 - result.addContent(HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.strong, new RawHtml(header)))); 1.75 + result.addContent(HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.simpleTagLabel, new RawHtml(header)))); 1.76 Content body = htmlWriter.commentTagsToContent( 1.77 simpleTag, null, simpleTag.inlineTags(), false); 1.78 result.addContent(HtmlTree.DD(body)); 1.79 @@ -279,7 +279,7 @@ 1.80 * {@inheritDoc} 1.81 */ 1.82 public Content getThrowsHeader() { 1.83 - HtmlTree result = HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.strong, 1.84 + HtmlTree result = HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.throwsLabel, 1.85 new StringContent(configuration.getText("doclet.Throws")))); 1.86 return result; 1.87 }