src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java

changeset 2147
130b8c0e570e
parent 2116
bf6b11347b1a
child 2212
4cb9de4dd420
equal deleted inserted replaced
2146:7de97abc4a5c 2147:130b8c0e570e
95 public Content deprecatedTagOutput(Doc doc) { 95 public Content deprecatedTagOutput(Doc doc) {
96 ContentBuilder result = new ContentBuilder(); 96 ContentBuilder result = new ContentBuilder();
97 Tag[] deprs = doc.tags("deprecated"); 97 Tag[] deprs = doc.tags("deprecated");
98 if (doc instanceof ClassDoc) { 98 if (doc instanceof ClassDoc) {
99 if (Util.isDeprecated((ProgramElementDoc) doc)) { 99 if (Util.isDeprecated((ProgramElementDoc) doc)) {
100 result.addContent(HtmlTree.SPAN(HtmlStyle.strong, 100 result.addContent(HtmlTree.SPAN(HtmlStyle.deprecatedLabel,
101 new StringContent(configuration.getText("doclet.Deprecated")))); 101 new StringContent(configuration.getText("doclet.Deprecated"))));
102 result.addContent(RawHtml.nbsp); 102 result.addContent(RawHtml.nbsp);
103 if (deprs.length > 0) { 103 if (deprs.length > 0) {
104 Tag[] commentTags = deprs[0].inlineTags(); 104 Tag[] commentTags = deprs[0].inlineTags();
105 if (commentTags.length > 0) { 105 if (commentTags.length > 0) {
110 } 110 }
111 } 111 }
112 } else { 112 } else {
113 MemberDoc member = (MemberDoc) doc; 113 MemberDoc member = (MemberDoc) doc;
114 if (Util.isDeprecated((ProgramElementDoc) doc)) { 114 if (Util.isDeprecated((ProgramElementDoc) doc)) {
115 result.addContent(HtmlTree.SPAN(HtmlStyle.strong, 115 result.addContent(HtmlTree.SPAN(HtmlStyle.deprecatedLabel,
116 new StringContent(configuration.getText("doclet.Deprecated")))); 116 new StringContent(configuration.getText("doclet.Deprecated"))));
117 result.addContent(RawHtml.nbsp); 117 result.addContent(RawHtml.nbsp);
118 if (deprs.length > 0) { 118 if (deprs.length > 0) {
119 Content body = commentTagsToOutput(null, doc, 119 Content body = commentTagsToOutput(null, doc,
120 deprs[0].inlineTags(), false); 120 deprs[0].inlineTags(), false);
121 if (!body.isEmpty()) 121 if (!body.isEmpty())
122 result.addContent(HtmlTree.SPAN(HtmlStyle.italic, body)); 122 result.addContent(HtmlTree.SPAN(HtmlStyle.deprecationComment, body));
123 } 123 }
124 } else { 124 } else {
125 if (Util.isDeprecated(member.containingClass())) { 125 if (Util.isDeprecated(member.containingClass())) {
126 result.addContent(HtmlTree.SPAN(HtmlStyle.strong, 126 result.addContent(HtmlTree.SPAN(HtmlStyle.deprecatedLabel,
127 new StringContent(configuration.getText("doclet.Deprecated")))); 127 new StringContent(configuration.getText("doclet.Deprecated"))));
128 result.addContent(RawHtml.nbsp); 128 result.addContent(RawHtml.nbsp);
129 } 129 }
130 } 130 }
131 } 131 }
149 149
150 /** 150 /**
151 * {@inheritDoc} 151 * {@inheritDoc}
152 */ 152 */
153 public Content getParamHeader(String header) { 153 public Content getParamHeader(String header) {
154 HtmlTree result = HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.strong, 154 HtmlTree result = HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.paramLabel,
155 new StringContent(header))); 155 new StringContent(header)));
156 return result; 156 return result;
157 } 157 }
158 158
159 /** 159 /**
184 /** 184 /**
185 * {@inheritDoc} 185 * {@inheritDoc}
186 */ 186 */
187 public Content returnTagOutput(Tag returnTag) { 187 public Content returnTagOutput(Tag returnTag) {
188 ContentBuilder result = new ContentBuilder(); 188 ContentBuilder result = new ContentBuilder();
189 result.addContent(HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.strong, 189 result.addContent(HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.returnLabel,
190 new StringContent(configuration.getText("doclet.Returns"))))); 190 new StringContent(configuration.getText("doclet.Returns")))));
191 result.addContent(HtmlTree.DD(htmlWriter.commentTagsToContent( 191 result.addContent(HtmlTree.DD(htmlWriter.commentTagsToContent(
192 returnTag, null, returnTag.inlineTags(), false))); 192 returnTag, null, returnTag.inlineTags(), false)));
193 return result; 193 return result;
194 } 194 }
229 } 229 }
230 if (body.isEmpty()) 230 if (body.isEmpty())
231 return body; 231 return body;
232 232
233 ContentBuilder result = new ContentBuilder(); 233 ContentBuilder result = new ContentBuilder();
234 result.addContent(HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.strong, 234 result.addContent(HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.seeLabel,
235 new StringContent(configuration.getText("doclet.See_Also"))))); 235 new StringContent(configuration.getText("doclet.See_Also")))));
236 result.addContent(HtmlTree.DD(body)); 236 result.addContent(HtmlTree.DD(body));
237 return result; 237 return result;
238 238
239 } 239 }
248 /** 248 /**
249 * {@inheritDoc} 249 * {@inheritDoc}
250 */ 250 */
251 public Content simpleTagOutput(Tag[] simpleTags, String header) { 251 public Content simpleTagOutput(Tag[] simpleTags, String header) {
252 ContentBuilder result = new ContentBuilder(); 252 ContentBuilder result = new ContentBuilder();
253 result.addContent(HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.strong, new RawHtml(header)))); 253 result.addContent(HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.simpleTagLabel, new RawHtml(header))));
254 ContentBuilder body = new ContentBuilder(); 254 ContentBuilder body = new ContentBuilder();
255 for (int i = 0; i < simpleTags.length; i++) { 255 for (int i = 0; i < simpleTags.length; i++) {
256 if (i > 0) { 256 if (i > 0) {
257 body.addContent(", "); 257 body.addContent(", ");
258 } 258 }
266 /** 266 /**
267 * {@inheritDoc} 267 * {@inheritDoc}
268 */ 268 */
269 public Content simpleTagOutput(Tag simpleTag, String header) { 269 public Content simpleTagOutput(Tag simpleTag, String header) {
270 ContentBuilder result = new ContentBuilder(); 270 ContentBuilder result = new ContentBuilder();
271 result.addContent(HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.strong, new RawHtml(header)))); 271 result.addContent(HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.simpleTagLabel, new RawHtml(header))));
272 Content body = htmlWriter.commentTagsToContent( 272 Content body = htmlWriter.commentTagsToContent(
273 simpleTag, null, simpleTag.inlineTags(), false); 273 simpleTag, null, simpleTag.inlineTags(), false);
274 result.addContent(HtmlTree.DD(body)); 274 result.addContent(HtmlTree.DD(body));
275 return result; 275 return result;
276 } 276 }
277 277
278 /** 278 /**
279 * {@inheritDoc} 279 * {@inheritDoc}
280 */ 280 */
281 public Content getThrowsHeader() { 281 public Content getThrowsHeader() {
282 HtmlTree result = HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.strong, 282 HtmlTree result = HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.throwsLabel,
283 new StringContent(configuration.getText("doclet.Throws")))); 283 new StringContent(configuration.getText("doclet.Throws"))));
284 return result; 284 return result;
285 } 285 }
286 286
287 /** 287 /**

mercurial