Skip to content

Commit 1ef4e48

Browse files
hnshns
committed
8273860: Javadoc Deprecated API list should not use italic font for description column
Reviewed-by: jjg
1 parent 0cc66ae commit 1ef4e48

File tree

5 files changed

+23
-23
lines changed

5 files changed

+23
-23
lines changed

‎src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DeprecatedListWriter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ protected void addExtraIndexLink(DeprecatedAPIListBuilder list, Content target)
121121
protected void addComments(Element e, Content desc) {
122122
List<? extends DeprecatedTree> tags = utils.getDeprecatedTrees(e);
123123
if (!tags.isEmpty()) {
124-
addInlineDeprecatedComment(e, tags.get(0), desc);
124+
addInlineComment(e, tags.get(0), desc);
125125
} else {
126126
desc.add(Text.EMPTY);
127127
}

‎test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
2424
/*
2525
* @test
2626
* @bug 4927552 8026567 8071982 8162674 8175200 8175218 8183511 8186332
27-
* 8169819 8074407 8191030 8182765 8184205 8243533 8261976
27+
* 8169819 8074407 8191030 8182765 8184205 8243533 8261976 8273860
2828
* @summary test generated docs for deprecated items
2929
* @library ../../lib
3030
* @modules jdk.javadoc/jdk.javadoc.internal.tool
@@ -292,7 +292,7 @@ public void test() {
292292
<div class="table-header col-last">Description</div>
293293
<div class="col-summary-item-name even-row-color"><a href="pkg/TestEnum.html" title="enum class in pkg">pkg.TestEnum</a></div>
294294
<div class="col-last even-row-color">
295-
<div class="deprecation-comment">enum_test1 passes.</div>
295+
<div class="block">enum_test1 passes.</div>
296296
</div>""",
297297
"""
298298
<div id="exception-class">
@@ -302,11 +302,11 @@ public void test() {
302302
<div class="table-header col-last">Description</div>
303303
<div class="col-summary-item-name even-row-color"><a href="pkg/TestError.html" title="class in pkg">pkg.TestError</a></div>
304304
<div class="col-last even-row-color">
305-
<div class="deprecation-comment">error_test1 passes.</div>
305+
<div class="block">error_test1 passes.</div>
306306
</div>
307307
<div class="col-summary-item-name odd-row-color"><a href="pkg/TestException.html" title="class in pkg">pkg.TestException</a></div>
308308
<div class="col-last odd-row-color">
309-
<div class="deprecation-comment">exception_test1 passes.</div>
309+
<div class="block">exception_test1 passes.</div>
310310
</div>""",
311311
"""
312312
<div id="field">
@@ -318,23 +318,23 @@ public void test() {
318318
<div class="col-last even-row-color"></div>
319319
<div class="col-summary-item-name odd-row-color"><a href="pkg/TestAnnotationType.html#field">pkg.TestAnnotationType.field</a></div>
320320
<div class="col-last odd-row-color">
321-
<div class="deprecation-comment">annotation_test4 passes.</div>
321+
<div class="block">annotation_test4 passes.</div>
322322
</div>
323323
<div class="col-summary-item-name even-row-color"><a href="pkg/TestClass.html#field">pkg.TestClass.field</a></div>
324324
<div class="col-last even-row-color">
325-
<div class="deprecation-comment">class_test2 passes. This is the second sentence of deprecated description for a field.</div>
325+
<div class="block">class_test2 passes. This is the second sentence of deprecated description for a field.</div>
326326
</div>
327327
<div class="col-summary-item-name odd-row-color"><a href="pkg/TestError.html#field">pkg.TestError.field</a></div>
328328
<div class="col-last odd-row-color">
329-
<div class="deprecation-comment">error_test2 passes.</div>
329+
<div class="block">error_test2 passes.</div>
330330
</div>
331331
<div class="col-summary-item-name even-row-color"><a href="pkg/TestException.html#field">pkg.TestException.field</a></div>
332332
<div class="col-last even-row-color">
333-
<div class="deprecation-comment">exception_test2 passes.</div>
333+
<div class="block">exception_test2 passes.</div>
334334
</div>
335335
<div class="col-summary-item-name odd-row-color"><a href="pkg/TestInterface.html#field">pkg.TestInterface.field</a></div>
336336
<div class="col-last odd-row-color">
337-
<div class="deprecation-comment">interface_test2 passes.</div>
337+
<div class="block">interface_test2 passes.</div>
338338
</div>
339339
</div>
340340
</div>""",
@@ -348,23 +348,23 @@ public void test() {
348348
<div class="col-last even-row-color"></div>
349349
<div class="col-summary-item-name odd-row-color"><a href="pkg/TestAnnotationType.html#optional()">pkg.TestAnnotationType.optional()</a></div>
350350
<div class="col-last odd-row-color">
351-
<div class="deprecation-comment">annotation_test2 passes.</div>
351+
<div class="block">annotation_test2 passes.</div>
352352
</div>
353353
<div class="col-summary-item-name even-row-color"><a href="pkg/TestAnnotationType.html#required()">pkg.TestAnnotationType.required()</a></div>
354354
<div class="col-last even-row-color">
355-
<div class="deprecation-comment">annotation_test3 passes.</div>
355+
<div class="block">annotation_test3 passes.</div>
356356
</div>
357357
<div class="col-summary-item-name odd-row-color"><a href="pkg/TestClass.html#method()">pkg.TestClass.method()</a></div>
358358
<div class="col-last odd-row-color">
359-
<div class="deprecation-comment">class_test5 passes. This is the second sentence of deprecated description for a method.</div>
359+
<div class="block">class_test5 passes. This is the second sentence of deprecated description for a method.</div>
360360
</div>
361361
<div class="col-summary-item-name even-row-color"><a href="pkg/TestClass.html#overloadedMethod(int)">pkg.TestClass.overloadedMethod<wbr>(int)</a></div>
362362
<div class="col-last even-row-color">
363-
<div class="deprecation-comment">class_test7 passes. Overloaded method 2.</div>
363+
<div class="block">class_test7 passes. Overloaded method 2.</div>
364364
</div>
365365
<div class="col-summary-item-name odd-row-color"><a href="pkg/TestClass.html#overloadedMethod(java.lang.String)">pkg.TestClass.overloadedMethod<wbr>(String)</a></div>
366366
<div class="col-last odd-row-color">
367-
<div class="deprecation-comment">class_test6 passes. Overloaded method 1.</div>
367+
<div class="block">class_test6 passes. Overloaded method 1.</div>
368368
</div>""",
369369
"""
370370
<div id="constructor">
@@ -376,11 +376,11 @@ public void test() {
376376
<div class="col-last even-row-color"></div>
377377
<div class="col-summary-item-name odd-row-color"><a href="pkg/TestClass.html#%3Cinit%3E()">pkg.TestClass()</a></div>
378378
<div class="col-last odd-row-color">
379-
<div class="deprecation-comment">class_test3 passes. This is the second sentence of deprecated description for a constructor.</div>
379+
<div class="block">class_test3 passes. This is the second sentence of deprecated description for a constructor.</div>
380380
</div>
381381
<div class="col-summary-item-name even-row-color"><a href="pkg/TestClass.html#%3Cinit%3E(java.lang.String)">pkg.TestClass<wbr>(String)</a></div>
382382
<div class="col-last even-row-color">
383-
<div class="deprecation-comment">class_test4 passes. Overloaded constructor.</div>
383+
<div class="block">class_test4 passes. Overloaded constructor.</div>
384384
</div>""");
385385
}
386386
}

‎test/langtools/jdk/javadoc/doclet/testHtmlTableTags/TestHtmlTableTags.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2009, 2021, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2009, 2022, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -704,13 +704,13 @@ void checkHtmlTableContents() {
704704
"""
705705
<div class="col-summary-item-name even-row-color"><a href="pkg2/C2.html#dep_field">pkg2.C2.dep_field</a></div>
706706
<div class="col-last even-row-color">
707-
<div class="deprecation-comment">don't use this field anymore.</div>
707+
<div class="block">don't use this field anymore.</div>
708708
</div>""",
709709
"""
710710
<div class="col-summary-item-name even-row-color"><a href="pkg1/C1.html#deprecat\
711711
edMethod()">pkg1.C1.deprecatedMethod()</a></div>
712712
<div class="col-last even-row-color">
713-
<div class="deprecation-comment">don't use this anymore.</div>
713+
<div class="block">don't use this anymore.</div>
714714
</div>""");
715715

716716
// Constant values

‎test/langtools/jdk/javadoc/doclet/testModules/TestModules.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1117,7 +1117,7 @@ void checkModuleDeprecation(boolean found) {
11171117
"""
11181118
<div class="col-summary-item-name even-row-color"><a href="moduleA/module-summary.html">moduleA</a></div>
11191119
<div class="col-last even-row-color">
1120-
<div class="deprecation-comment">This module is deprecated.</div>""");
1120+
<div class="block">This module is deprecated.</div>""");
11211121
checkOutput("moduleB/module-summary.html", !found,
11221122
"""
11231123
<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span>

‎test/langtools/jdk/javadoc/doclet/testRecordTypes/TestRecordTypes.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@ public record R(int r1) { }""");
524524
<div class="table-header col-last">Description</div>
525525
<div class="col-summary-item-name even-row-color"><a href="p/R.html" title="class in p">p.R</a></div>
526526
<div class="col-last even-row-color">
527-
<div class="deprecation-comment">Do not use.</div>
527+
<div class="block">Do not use.</div>
528528
</div>""");
529529
}
530530

0 commit comments

Comments
 (0)