From 08a660a12d8ed4f32168cd0df0896c90c8e6e7a0 Mon Sep 17 00:00:00 2001 From: bpatel Date: Tue, 26 Sep 2017 20:03:48 -0700 Subject: [PATCH] 8183511: improve style for deprecated text Reviewed-by: jjg, ksrini --- .../formats/html/AbstractIndexWriter.java | 2 +- .../formats/html/AbstractMemberWriter.java | 2 +- .../html/AnnotationTypeWriterImpl.java | 7 +- .../doclets/formats/html/ClassWriterImpl.java | 7 +- .../formats/html/ModuleWriterImpl.java | 4 +- .../formats/html/PackageWriterImpl.java | 2 +- .../formats/html/markup/HtmlStyle.java | 2 +- .../builders/AnnotationTypeBuilder.java | 2 +- .../toolkit/builders/ClassBuilder.java | 2 +- .../doclets/toolkit/resources/stylesheet.css | 11 +++ .../TestDeprecatedDocs.java | 78 +++++++++---------- .../TestHtmlDefinitionListTag.java | 4 +- .../doclet/testModules/TestModules.java | 10 +-- .../TestPackageDeprecation.java | 6 +- .../TestSerializedFormDeprecationInfo.java | 6 +- .../doclet/testStylesheet/TestStylesheet.java | 13 +++- .../doclet/testTagOutput/TestTagOutput.java | 10 +-- 17 files changed, 94 insertions(+), 74 deletions(-) diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractIndexWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractIndexWriter.java index f2c93a7082..f10eb2c1a1 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractIndexWriter.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractIndexWriter.java @@ -364,7 +364,7 @@ public class AbstractIndexWriter extends HtmlDocletWriter { List tags; Content span = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, getDeprecatedPhrase(element)); HtmlTree div = new HtmlTree(HtmlTag.DIV); - div.addStyle(HtmlStyle.block); + div.addStyle(HtmlStyle.deprecationBlock); if (utils.isDeprecated(element)) { div.addContent(span); tags = utils.getBlockTags(element, DocTree.Kind.DEPRECATED); diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java index f02bb2d990..b21108327b 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java @@ -355,7 +355,7 @@ public abstract class AbstractMemberWriter { writer.getTagletWriterInstance(false)); if (!output.isEmpty()) { Content deprecatedContent = output; - Content div = HtmlTree.DIV(HtmlStyle.block, deprecatedContent); + Content div = HtmlTree.DIV(HtmlStyle.deprecationBlock, deprecatedContent); contentTree.addContent(div); } } diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeWriterImpl.java index f2cf118960..10630dbe55 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeWriterImpl.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeWriterImpl.java @@ -278,7 +278,8 @@ public class AnnotationTypeWriterImpl extends SubWriterHolderWriter */ @Override public void addAnnotationTypeSignature(String modifiers, Content annotationInfoTree) { - annotationInfoTree.addContent(new HtmlTree(HtmlTag.BR)); + Content hr = new HtmlTree(HtmlTag.HR); + annotationInfoTree.addContent(hr); Content pre = new HtmlTree(HtmlTag.PRE); addAnnotationInfo(annotationType, pre); pre.addContent(modifiers); @@ -324,13 +325,11 @@ public class AnnotationTypeWriterImpl extends SubWriterHolderWriter */ @Override public void addAnnotationTypeDeprecationInfo(Content annotationInfoTree) { - Content hr = new HtmlTree(HtmlTag.HR); - annotationInfoTree.addContent(hr); List deprs = utils.getBlockTags(annotationType, DocTree.Kind.DEPRECATED); if (utils.isDeprecated(annotationType)) { CommentHelper ch = utils.getCommentHelper(annotationType); Content deprLabel = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, getDeprecatedPhrase(annotationType)); - Content div = HtmlTree.DIV(HtmlStyle.block, deprLabel); + Content div = HtmlTree.DIV(HtmlStyle.deprecationBlock, deprLabel); if (!deprs.isEmpty()) { List commentTags = ch.getDescription(configuration, deprs.get(0)); diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriterImpl.java index b67ac97ff9..638ce8ada5 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriterImpl.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriterImpl.java @@ -293,7 +293,8 @@ public class ClassWriterImpl extends SubWriterHolderWriter implements ClassWrite */ @Override public void addClassSignature(String modifiers, Content classInfoTree) { - classInfoTree.addContent(new HtmlTree(HtmlTag.BR)); + Content hr = new HtmlTree(HtmlTag.HR); + classInfoTree.addContent(hr); Content pre = new HtmlTree(HtmlTag.PRE); addAnnotationInfo(typeElement, pre); pre.addContent(modifiers); @@ -606,12 +607,10 @@ public class ClassWriterImpl extends SubWriterHolderWriter implements ClassWrite */ @Override public void addClassDeprecationInfo(Content classInfoTree) { - Content hr = new HtmlTree(HtmlTag.HR); - classInfoTree.addContent(hr); List deprs = utils.getBlockTags(typeElement, DocTree.Kind.DEPRECATED); if (utils.isDeprecated(typeElement)) { Content deprLabel = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, getDeprecatedPhrase(typeElement)); - Content div = HtmlTree.DIV(HtmlStyle.block, deprLabel); + Content div = HtmlTree.DIV(HtmlStyle.deprecationBlock, deprLabel); if (!deprs.isEmpty()) { CommentHelper ch = utils.getCommentHelper(typeElement); DocTree dt = deprs.get(0); diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java index a67ff907ed..01c2ed85be 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java @@ -929,7 +929,7 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW if (utils.isDeprecated(mdle)) { CommentHelper ch = utils.getCommentHelper(mdle); HtmlTree deprDiv = new HtmlTree(HtmlTag.DIV); - deprDiv.addStyle(HtmlStyle.deprecatedContent); + deprDiv.addStyle(HtmlStyle.deprecationBlock); Content deprPhrase = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, getDeprecatedPhrase(mdle)); deprDiv.addContent(deprPhrase); if (!deprs.isEmpty()) { @@ -1064,7 +1064,7 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW if (utils.isDeprecated(pkg)) { deprs = utils.getDeprecatedTrees(pkg); HtmlTree deprDiv = new HtmlTree(HtmlTag.DIV); - deprDiv.addStyle(HtmlStyle.deprecatedContent); + deprDiv.addStyle(HtmlStyle.deprecationBlock); Content deprPhrase = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, getDeprecatedPhrase(pkg)); deprDiv.addContent(deprPhrase); if (!deprs.isEmpty()) { diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriterImpl.java index f3c590df99..dbdcb52b43 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriterImpl.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriterImpl.java @@ -171,7 +171,7 @@ public class PackageWriterImpl extends HtmlDocletWriter if (utils.isDeprecated(packageElement)) { CommentHelper ch = utils.getCommentHelper(packageElement); HtmlTree deprDiv = new HtmlTree(HtmlTag.DIV); - deprDiv.addStyle(HtmlStyle.deprecatedContent); + deprDiv.addStyle(HtmlStyle.deprecationBlock); Content deprPhrase = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, getDeprecatedPhrase(packageElement)); deprDiv.addContent(deprPhrase); if (!deprs.isEmpty()) { diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlStyle.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlStyle.java index ad6c183448..955ad9357b 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlStyle.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlStyle.java @@ -53,9 +53,9 @@ public enum HtmlStyle { constantsSummary, constantValuesContainer, contentContainer, - deprecatedContent, deprecatedLabel, deprecatedSummary, + deprecationBlock, deprecationComment, description, descfrmTypeLabel, diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AnnotationTypeBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AnnotationTypeBuilder.java index 01115b6985..4d91887239 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AnnotationTypeBuilder.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AnnotationTypeBuilder.java @@ -147,8 +147,8 @@ public class AnnotationTypeBuilder extends AbstractBuilder { throws DocletException { Content annotationInfoTree = writer.getAnnotationInfoTreeHeader(); - buildDeprecationInfo(annotationInfoTree); buildAnnotationTypeSignature(annotationInfoTree); + buildDeprecationInfo(annotationInfoTree); buildAnnotationTypeDescription(annotationInfoTree); buildAnnotationTypeTagInfo(annotationInfoTree); diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ClassBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ClassBuilder.java index 7e527993cb..a3a6eaa575 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ClassBuilder.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ClassBuilder.java @@ -175,8 +175,8 @@ public class ClassBuilder extends AbstractBuilder { buildInterfaceUsageInfo(classInfoTree); buildNestedClassInfo(classInfoTree); buildFunctionalInterfaceInfo(classInfoTree); - buildDeprecationInfo(classInfoTree); buildClassSignature(classInfoTree); + buildDeprecationInfo(classInfoTree); buildClassDescription(classInfoTree); buildClassTagInfo(classInfoTree); diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/stylesheet.css b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/stylesheet.css index 098096f6f4..7cb1dd7cb7 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/stylesheet.css +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/stylesheet.css @@ -645,6 +645,17 @@ h1.hidden { .deprecationComment, .emphasizedPhrase, .interfaceName { font-style:italic; } +.deprecationBlock { + font-size:14px; + font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif; + border-style:solid; + border-width:thin; + border-radius:10px; + padding:10px; + margin-bottom:10px; + margin-right:10px; + display:inline-block; +} div.block div.block span.deprecationComment, div.block div.block span.emphasizedPhrase, div.block div.block span.interfaceName { diff --git a/test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java b/test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java index a801c88705..8dd3bccc29 100644 --- a/test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java +++ b/test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java @@ -23,7 +23,7 @@ /* * @test - * @bug 4927552 8026567 8071982 8162674 8175200 8175218 + * @bug 4927552 8026567 8071982 8162674 8175200 8175218 8183511 * @summary * @author jamieh * @library ../lib @@ -81,85 +81,85 @@ public class TestDeprecatedDocs extends JavadocTester { + "extends java.lang.Object", "
@Deprecated(forRemoval=true)\n"
                 + "public int field
\n" - + "
Deprecated, for removal: This API element is subject to removal in a future version. 
", + + "
Deprecated, for removal: This API element is subject to removal in a future version. 
", "
@Deprecated(forRemoval=true)\n"
                 + "public DeprecatedClassByAnnotation​()
\n" - + "
Deprecated, for removal: This API element is subject to removal in a future version. 
", + + "
Deprecated, for removal: This API element is subject to removal in a future version. 
", "
@Deprecated\n"
                 + "public void method​()
\n" - + "
Deprecated. 
"); + + "
Deprecated. 
"); checkOutput("pkg/TestAnnotationType.html", true, - "
Deprecated, for removal: This API element is subject to removal in a future version. \n" - + "
annotation_test1 passes.
\n" - + "
\n" - + "
\n" + "
\n" + "
@Deprecated(forRemoval=true)\n"
                 + "@Documented\n"
-                + "public @interface TestAnnotationType
", + + "public @interface TestAnnotationType\n" + + "
Deprecated, for removal: This API element is subject to removal in a future version. \n" + + "
annotation_test1 passes.
\n" + + "
\n", "
@Deprecated(forRemoval=true)\n"
                 + "static final int field
\n" - + "
Deprecated, for removal: This " + + "
Deprecated, for removal: This " + "API element is subject to removal in a future version. annotation_test4 passes.
", "
@Deprecated(forRemoval=true)\n"
                 + "int required
\n" - + "
Deprecated, for removal: This API element is subject to removal in a future version. " + + "
Deprecated, for removal: This API element is subject to removal in a future version. " + "annotation_test3 passes.
", "
java.lang.String optional
\n" - + "
Deprecated. annotation_test2 passes.
"); + + "
Deprecated. annotation_test2 passes.
"); checkOutput("pkg/TestClass.html", true, - "
Deprecated, for removal: This API element is subject to removal in a future version. \n" - + "
class_test1 passes.
\n" - + "
\n" - + "
\n" + "
\n" + "
@Deprecated(forRemoval=true)\n"
                 + "public class TestClass\n"
-                + "extends java.lang.Object
", + + "extends java.lang.Object\n" + + "
Deprecated, for removal: This API element is subject to removal in a future version. \n" + + "
class_test1 passes.
\n" + + "
", "
@Deprecated(forRemoval=true)\n"
                 + "public TestClass​()
\n" - + "
Deprecated, for removal: This API element is subject to removal in a future version. " + + "
Deprecated, for removal: This API element is subject to removal in a future version. " + "class_test3 passes.
"); checkOutput("pkg/TestEnum.html", true, - "
Deprecated, for removal: This API element is subject to removal in a future version. \n" - + "
enum_test1 passes.
\n" - + "
\n" - + "
\n" + "
\n" + "
@Deprecated(forRemoval=true)\n"
                 + "public enum TestEnum\n"
-                + "extends java.lang.Enum<TestEnum>
", + + "extends java.lang.Enum<TestEnum>\n" + + "
Deprecated, for removal: This API element is subject to removal in a future version. \n" + + "
enum_test1 passes.
\n" + + "
", "
@Deprecated(forRemoval=true)\n"
                 + "public static final TestEnum FOR_REMOVAL
\n" - + "
Deprecated, for removal: This API element is subject to removal in a future version. " + + "
Deprecated, for removal: This API element is subject to removal in a future version. " + "enum_test3 passes.
"); checkOutput("pkg/TestError.html", true, - "
Deprecated, for removal: This API element is subject to removal in a future version. \n" - + "
error_test1 passes.
\n" - + "
\n" - + "
\n" + "
\n" + "
@Deprecated(forRemoval=true)\n"
                 + "public class TestError\n"
-                + "extends java.lang.Error
"); + + "extends java.lang.Error\n" + + "
Deprecated, for removal: This API element is subject to removal in a future version. \n" + + "
error_test1 passes.
\n" + + "
"); checkOutput("pkg/TestException.html", true, - "
Deprecated, for removal: This API element is subject to removal in a future version. \n" - + "
exception_test1 passes.
\n" - + "
\n" - + "
\n" + "
\n" + "
@Deprecated(forRemoval=true)\n"
                 + "public class TestException\n"
-                + "extends java.lang.Exception
"); + + "extends java.lang.Exception\n" + + "
Deprecated, for removal: This API element is subject to removal in a future version. \n" + + "
exception_test1 passes.
\n" + + "
"); checkOutput("pkg/TestInterface.html", true, - "
Deprecated, for removal: This API element is subject to removal in a future version. \n" - + "
interface_test1 passes.
\n" - + "
\n" - + "
\n" + "
\n" + "
@Deprecated(forRemoval=true)\n"
                 + "public class TestInterface\n"
-                + "extends java.lang.Object
"); + + "extends java.lang.Object\n" + + "
Deprecated, for removal: This API element is subject to removal in a future version. \n" + + "
interface_test1 passes.
\n" + + "
"); checkOutput("deprecated-list.html", true, "
    \n" diff --git a/test/langtools/jdk/javadoc/doclet/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java b/test/langtools/jdk/javadoc/doclet/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java index 6e516a4ef0..a7193ede3b 100644 --- a/test/langtools/jdk/javadoc/doclet/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java +++ b/test/langtools/jdk/javadoc/doclet/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java @@ -23,7 +23,7 @@ /* * @test - * @bug 6786690 6820360 8025633 8026567 8175200 + * @bug 6786690 6820360 8025633 8026567 8175200 8183511 * @summary This test verifies the nesting of definition list tags. * @author Bhavesh Patel * @library ../lib @@ -385,7 +385,7 @@ public class TestHtmlDefinitionListTag extends JavadocTester { checkOutput("serialized-form.html", expectFound, "
    boolean " +
                 "undecorated
    \n" + - "
    " + + "
    " + "Deprecated. As of JDK version 1.5, replaced by\n" + " " + "setUndecorated(boolean).
    \n" + diff --git a/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java b/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java index 5e6d7dc506..3b71bc3d82 100644 --- a/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java +++ b/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java @@ -25,7 +25,7 @@ * @test * @bug 8154119 8154262 8156077 8157987 8154261 8154817 8135291 8155995 8162363 * 8168766 8168688 8162674 8160196 8175799 8174974 8176778 8177562 8175218 8175823 8166306 - * 8178043 8181622 + * 8178043 8181622 8183511 * @summary Test modules support in javadoc. * @author bpatel * @library ../lib @@ -446,7 +446,7 @@ public class TestModules extends JavadocTester { void checkHtml5Description(boolean found) { checkOutput("moduleA-summary.html", found, "
    \n" - + "
    Deprecated, for removal:" + + "
    Deprecated, for removal:" + " This API element is subject to removal in a future version.\n" + "
    This module is deprecated.
    \n" + "
    \n" @@ -1015,7 +1015,7 @@ public class TestModules extends JavadocTester { void checkModuleDeprecation(boolean found) { checkOutput("moduleA-summary.html", found, - "
    Deprecated, for removal:" + "
    Deprecated, for removal:" + " This API element is subject to removal in a future version.\n" + "
    This module is deprecated.
    \n" + "
    "); @@ -1031,12 +1031,12 @@ public class TestModules extends JavadocTester { + "\n" + ""); checkOutput("moduleB-summary.html", !found, - "
    Deprecated.\n" + "
    Deprecated.\n" + "
    This module is deprecated using just the javadoc tag.
    "); checkOutput("moduletags-summary.html", found, "

    @Deprecated\n" + "

    ", - "
    Deprecated.
    "); + "
    Deprecated.
    "); } void checkModuleAnnotation() { diff --git a/test/langtools/jdk/javadoc/doclet/testPackageDeprecation/TestPackageDeprecation.java b/test/langtools/jdk/javadoc/doclet/testPackageDeprecation/TestPackageDeprecation.java index fe7652e96f..f736caa339 100644 --- a/test/langtools/jdk/javadoc/doclet/testPackageDeprecation/TestPackageDeprecation.java +++ b/test/langtools/jdk/javadoc/doclet/testPackageDeprecation/TestPackageDeprecation.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -23,7 +23,7 @@ /* * @test - * @bug 6492694 8026567 8048351 8162363 + * @bug 6492694 8026567 8048351 8162363 8183511 * @summary Test package deprecation. * @author bpatel * @library ../lib/ @@ -48,7 +48,7 @@ public class TestPackageDeprecation extends JavadocTester { checkExit(Exit.OK); checkOutput("pkg1/package-summary.html", true, - "
    Deprecated.\n" + + "
    Deprecated.\n" + "
    This package is Deprecated." + "
    " ); diff --git a/test/langtools/jdk/javadoc/doclet/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java b/test/langtools/jdk/javadoc/doclet/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java index dff273f1a8..3597e1c8c2 100644 --- a/test/langtools/jdk/javadoc/doclet/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java +++ b/test/langtools/jdk/javadoc/doclet/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -23,7 +23,7 @@ /* * @test - * @bug 6802694 8025633 8026567 + * @bug 6802694 8025633 8026567 8183511 * @summary This test verifies deprecation info in serialized-form.html. * @author Bhavesh Patel * @library ../lib @@ -135,7 +135,7 @@ public class TestSerializedFormDeprecationInfo extends JavadocTester { void checkNoComment(boolean expectFound) { checkOutput("serialized-form.html", expectFound, "
    boolean undecorated
    \n" - + "
    Deprecated. " + + "
    Deprecated. " + "As of JDK version 1.5, replaced by\n" + " " + "setUndecorated(boolean).
    \n" diff --git a/test/langtools/jdk/javadoc/doclet/testStylesheet/TestStylesheet.java b/test/langtools/jdk/javadoc/doclet/testStylesheet/TestStylesheet.java index 2440a58afa..2c3ba5cfb6 100644 --- a/test/langtools/jdk/javadoc/doclet/testStylesheet/TestStylesheet.java +++ b/test/langtools/jdk/javadoc/doclet/testStylesheet/TestStylesheet.java @@ -24,7 +24,7 @@ /* * @test * @bug 4494033 7028815 7052425 8007338 8023608 8008164 8016549 8072461 8154261 8162363 8160196 8151743 8177417 - * 8175218 8176452 8181215 8182263 + * 8175218 8176452 8181215 8182263 8183511 * @summary Run tests on doclet stylesheet. * @author jamieh * @library ../lib @@ -186,6 +186,17 @@ public class TestStylesheet extends JavadocTester { + ".constantValuesContainer td a:link, .constantValuesContainer td a:visited {\n" + " font-weight:bold;\n" + "}", + ".deprecationBlock {\n" + + " font-size:14px;\n" + + " font-family:'DejaVu Serif', Georgia, \"Times New Roman\", Times, serif;\n" + + " border-style:solid;\n" + + " border-width:thin;\n" + + " border-radius:10px;\n" + + " padding:10px;\n" + + " margin-bottom:10px;\n" + + " margin-right:10px;\n" + + " display:inline-block;\n" + + "}", "#reset {\n" + " background-color: rgb(255,255,255);\n" + " background-image:url('resources/x.png');\n" diff --git a/test/langtools/jdk/javadoc/doclet/testTagOutput/TestTagOutput.java b/test/langtools/jdk/javadoc/doclet/testTagOutput/TestTagOutput.java index b36111451c..46a08f63bd 100644 --- a/test/langtools/jdk/javadoc/doclet/testTagOutput/TestTagOutput.java +++ b/test/langtools/jdk/javadoc/doclet/testTagOutput/TestTagOutput.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -23,7 +23,7 @@ /* * @test - * @bug 8026370 8026567 + * @bug 8026370 8026567 8183511 * @summary This test checks the generated tag output. * @author Bhavesh Patel * @library ../lib @@ -47,12 +47,12 @@ public class TestTagOutput extends JavadocTester { checkExit(Exit.OK); checkOutput("pkg1/DeprecatedTag.html", true, - "
    Deprecated. 
    ", - "
    Deprecated. " + + "
    Deprecated. 
    ", + "
    Deprecated. " + "Do not use this.
    "); checkOutput("pkg1/DeprecatedTag.html", false, - "
    Deprecated." + + "
    Deprecated." + " 
    "); } } -- GitLab