From d8497d254a2f185da5d697a634cee0888c63fd1d Mon Sep 17 00:00:00 2001 From: Derek Thomson Date: Thu, 14 Mar 2019 13:33:10 -0700 Subject: [PATCH] 8219691: method summary table head should be enclosed in Reviewed-by: jjg --- .../doclets/formats/html/markup/HtmlTag.java | 3 +- .../doclets/formats/html/markup/Table.java | 5 +- .../TestDeprecatedDocs.java | 10 ++- .../javadoc/doclet/testJavaFX/TestJavaFX.java | 5 +- .../testModules/TestIndirectExportsOpens.java | 2 + .../testModules/TestModuleServices.java | 12 ++++ .../doclet/testModules/TestModules.java | 63 ++++++++++++++----- .../TestNewLanguageFeatures.java | 2 + .../testPackagePage/TestPackagePage.java | 10 ++- .../javadoc/doclet/testSearch/TestSearch.java | 2 + .../TestUnnamedPackage.java | 6 +- 11 files changed, 96 insertions(+), 24 deletions(-) diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlTag.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlTag.java index 1181c301ca9..b5ccb16a039 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlTag.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlTag.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2019, 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 @@ -85,6 +85,7 @@ public enum HtmlTag { SUB(BlockType.INLINE, EndTag.END), TABLE, TBODY, + THEAD, TD, TH, TITLE(BlockType.OTHER, EndTag.END), diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Table.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Table.java index 602e15033d3..845d3950365 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Table.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Table.java @@ -190,7 +190,6 @@ public class Table { * *

Notes: *

* @@ -450,7 +449,9 @@ public class Table { private Content getTableBody() { ContentBuilder tableContent = new ContentBuilder(); - tableContent.add(header.toContent()); + Content thead = new HtmlTree(HtmlTag.THEAD); + thead.add(header.toContent()); + tableContent.add(thead); Content tbody = new HtmlTree(HtmlTag.TBODY); bodyRows.forEach(row -> tbody.add(row)); tableContent.add(tbody); diff --git a/test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java b/test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java index 08778a30b5c..c3957f6789f 100644 --- a/test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java +++ b/test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java @@ -215,17 +215,21 @@ public class TestDeprecatedDocs extends JavadocTester { "
\n" + "\n" + "\n" + + "\n" + "\n" + "\n" + "\n" - + "", + + "\n" + + "", "
\n" + "
For Removal 
ElementDescription
\n" + "\n" + + "\n" + "\n" + "\n" + "\n" + "\n" + + "\n" + "\n" + "\n" + "\n" @@ -239,10 +243,12 @@ public class TestDeprecatedDocs extends JavadocTester { "
\n" + "
Enums 
EnumDescription
pkg.TestEnum
\n" + "\n" + + "\n" + "\n" + "\n" + "\n" + "\n" + + "\n" + "\n" + "\n" + "\n" @@ -256,10 +262,12 @@ public class TestDeprecatedDocs extends JavadocTester { "
\n" + "
Exceptions 
ExceptionsDescription
pkg.TestException
\n" + "\n" + + "\n" + "\n" + "\n" + "\n" + "\n" + + "\n" + "\n" + "\n" + "\n" diff --git a/test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java b/test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java index c91f74e7d73..2a4f11f01ab 100644 --- a/test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java +++ b/test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java @@ -252,10 +252,13 @@ public class TestJavaFX extends JavadocTester { checkExit(Exit.OK); checkOutput("pkg2/Test.html", false, "

Property Summary

"); checkOutput("pkg2/Test.html", true, - "\n" + "\n" + + "\n" + + "\n" + "\n" + "\n" + "\n" + + "\n" + "\n" + "\n" + "\n" diff --git a/test/langtools/jdk/javadoc/doclet/testModules/TestIndirectExportsOpens.java b/test/langtools/jdk/javadoc/doclet/testModules/TestIndirectExportsOpens.java index 864fbf5251f..f00b48f880b 100644 --- a/test/langtools/jdk/javadoc/doclet/testModules/TestIndirectExportsOpens.java +++ b/test/langtools/jdk/javadoc/doclet/testModules/TestIndirectExportsOpens.java @@ -193,10 +193,12 @@ public class TestIndirectExportsOpens extends JavadocTester { "
\n" + "
Fields 
FieldDescription
pkg.DeprecatedClassByAnnotation.fieldModifier and Type
Modifier and TypeMethodDescription
<T> java.lang.Object
\n" + "\n" + + "\n" + "\n" + "\n" + "\n" + "\n" + + "\n" + "\n" + "\n" + "\n" diff --git a/test/langtools/jdk/javadoc/doclet/testModules/TestModuleServices.java b/test/langtools/jdk/javadoc/doclet/testModules/TestModuleServices.java index 3c5fdee8898..d024487a6ce 100644 --- a/test/langtools/jdk/javadoc/doclet/testModules/TestModuleServices.java +++ b/test/langtools/jdk/javadoc/doclet/testModules/TestModuleServices.java @@ -199,10 +199,12 @@ public class TestModuleServices extends JavadocTester { checkOutput("m/module-summary.html", true, "
\n
" + typeString + " 
FromPackages
m
\n" + "\n" + + "\n" + "\n" + "\n" + "\n" + "\n" + + "\n" + "\n" + "\n" + "\n" + @@ -240,10 +242,12 @@ public class TestModuleServices extends JavadocTester { checkOutput("m/module-summary.html", true, "
\n
Uses 
TypeDescription
A
\n" + "\n" + + "\n" + "\n" + "\n" + "\n" + "\n" + + "\n" + "\n" + "\n" + "\n" + @@ -307,10 +311,12 @@ public class TestModuleServices extends JavadocTester { checkOutput("m/module-summary.html", true, "
\n
Uses 
TypeDescription
A
\n" + "\n" + + "\n" + "\n" + "\n" + "\n" + "\n" + + "\n" + "\n" + "\n" + "\n" + @@ -351,10 +357,12 @@ public class TestModuleServices extends JavadocTester { checkOutput("m/module-summary.html", true, "
\n
Provides 
TypeDescription
A
\n" + "\n" + + "\n" + "\n" + "\n" + "\n" + "\n" + + "\n" + "\n" + "\n" + "\n" + @@ -394,10 +402,12 @@ public class TestModuleServices extends JavadocTester { checkOutput("m/module-summary.html", true, "
\n
Provides 
TypeDescription
A
\n" + "\n" + + "\n" + "\n" + "\n" + "\n" + "\n" + + "\n" + "\n" + "\n" + "\n" + @@ -408,10 +418,12 @@ public class TestModuleServices extends JavadocTester { "
Provides 
TypeDescription
A
", "
\n\n" + "\n" + + "\n" + "\n" + "\n" + "\n" + "\n" + + "\n" + "\n" + "\n" + "\n" + diff --git a/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java b/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java index d1cc0af7679..97aaa563aa7 100644 --- a/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java +++ b/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java @@ -623,18 +623,22 @@ public class TestModules extends JavadocTester { "
\n" + "
Uses 
TypeDescription
B
\n" + "\n" + + "\n" + "\n" + "\n" + "\n" - + ""); + + "\n" + + ""); checkOutput("overview-summary.html", false, "
\n" + "
Modules 
ModuleDescription
\n" + "\n" + + "\n" + "\n" + "\n" + "\n" - + ""); + + "\n" + + ""); } void checkOverviewSummaryPackages() { @@ -642,10 +646,12 @@ public class TestModules extends JavadocTester { "
\n" + "
Packages 
PackageDescription
\n" + "\n" + + "\n" + "\n" + "\n" + "\n" - + "", + + "\n" + + "", "
Modules 
ModuleDescription
\n" + "
\n" + "
\n" @@ -659,10 +665,12 @@ public class TestModules extends JavadocTester { "
\n" + "\n" + "\n" + + "n" + "\n" + "\n" + "\n" - + "", + + "\n" + + "\n", "\n" + "
\n" + "
The overview summary page header.
\n" @@ -678,18 +686,22 @@ public class TestModules extends JavadocTester { "
\n" + "
Packages 
PackageDescription
\n" + "\n" + + "\n" + "\n" + "\n" + "\n" - + ""); + + "\n" + + ""); checkOutput("overview-summary.html", false, "
\n" + "
Modules 
ModuleDescription
\n" + "\n" + + "\n" + "\n" + "\n" + "\n" - + ""); + + "\n" + + ""); } void checkHtml5OverviewSummaryPackages() { @@ -697,10 +709,12 @@ public class TestModules extends JavadocTester { "
\n" + "
Packages 
PackageDescription
\n" + "\n" + + "\n" + "\n" + "\n" + "\n" - + "", + + "\n" + + "", "
Modules 
ModuleDescription
\n" + "
\n" + "\n" @@ -717,10 +731,12 @@ public class TestModules extends JavadocTester { checkOutput("overview-summary.html", true, "
\n\n" + "\n" + + "\n" + "\n" + "\n" + "\n" - + "", + + "\n" + + "", "\n" + "\n" + "\n" @@ -788,20 +804,26 @@ public class TestModules extends JavadocTester { + "
With a test description for uses.
\n\n" + "", "\n" + + "\n" + "\n" + "\n" + "\n" - + "", + + "\n" + + "", "\n" + + "\n" + "\n" + "\n" + "\n" - + "", + + "\n" + + "", "\n" + + "\n" + "\n" + "\n" + "\n" - + ""); + + "\n" + + ""); } void checkAggregatorModuleSummary() { @@ -978,18 +1000,21 @@ public class TestModules extends JavadocTester { + "", "
\n
Packages 
PackageDescription
Opens 
PackageDescription
Uses 
TypeDescription
Provides 
TypeDescription
\n" + "\n" + + "\n" + "\n" + "\n" + "\n" + "", "
\n
Requires 
ModifierModuleDescription
\n" + "\n" + + "\n" + "\n" + "\n" + "\n" + "", "
\n
Indirect Requires 
ModifierModuleDescription
\n" + "\n" + + "\n" + "\n" + "\n" + "\n" @@ -1011,10 +1036,12 @@ public class TestModules extends JavadocTester { + "", "
\n
Indirect Opens 
FromPackages 
\n" + "\n" + + "\n" + "\n" + "\n" + "\n" + "\n" + + "\n" + "\n" + "\n" + "\n" @@ -1081,11 +1108,13 @@ public class TestModules extends JavadocTester { + " class=\"tableTab\" onclick=\"show(2);\">Opens"); checkOutput("moduleC/module-summary.html", found, "\n" + + "\n" + "\n" + "\n" + "\n" + "\n" - + ""); + + "\n" + + ""); checkOutput("moduletags/module-summary.html", true, "\n" + ""); @@ -1301,16 +1330,20 @@ public class TestModules extends JavadocTester { + " onclick=\"show(2);\">Class Summary\n", - "\n" + "\n" + + "\n" + "\n" + "\n" - + ""); + + "\n" + + "\n"); checkOutput("allpackages-index.html", true, "\n" + + "\n" + "\n" + "\n" + "\n" - + "\n"); + + "\n" + + ""); checkOutput("allclasses-index.html", found, "
Opens 
PackageDescription
testpkgmdlB
Exports 
PackageExported To ModulesDescription
testpkgmdltags 
ClassDescription
Package Summary 
PackageDescription
\n"); checkOutput("allpackages-index.html", found, diff --git a/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/TestNewLanguageFeatures.java b/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/TestNewLanguageFeatures.java index c04f0c1b5cb..e3afa631541 100644 --- a/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/TestNewLanguageFeatures.java +++ b/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/TestNewLanguageFeatures.java @@ -426,11 +426,13 @@ public class TestNewLanguageFeatures extends JavadocTester { + "type Foo4 " + "\n" + + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + + "\n" + "\n" + "\n" + "\n" diff --git a/test/langtools/jdk/javadoc/doclet/testPackagePage/TestPackagePage.java b/test/langtools/jdk/javadoc/doclet/testPackagePage/TestPackagePage.java index 9610d48b1d5..273e0b2e594 100644 --- a/test/langtools/jdk/javadoc/doclet/testPackagePage/TestPackagePage.java +++ b/test/langtools/jdk/javadoc/doclet/testPackagePage/TestPackagePage.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2019, 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 @@ -87,17 +87,21 @@ public class TestPackagePage extends JavadocTester { checkOutput("allclasses-index.html", true, "
\n
Modifier and TypeMethodDescription
void
\n" + "\n" + + "\n" + "\n" + "\n" + "\n" - + "\n"); + + "\n" + + "\n"); checkOutput("allpackages-index.html", true, "
\n
Class Summary 
ClassDescription
\n" + "\n" + + "\n" + "\n" + "\n" + "\n" - + "\n"); + + "\n" + + "\n"); checkOutput("type-search-index.js", true, "{\"l\":\"All Classes\",\"url\":\"allclasses-index.html\"}"); checkOutput("package-search-index.js", true, diff --git a/test/langtools/jdk/javadoc/doclet/testSearch/TestSearch.java b/test/langtools/jdk/javadoc/doclet/testSearch/TestSearch.java index aa39c9e8e0f..8a1a0f8bf64 100644 --- a/test/langtools/jdk/javadoc/doclet/testSearch/TestSearch.java +++ b/test/langtools/jdk/javadoc/doclet/testSearch/TestSearch.java @@ -717,6 +717,7 @@ public class TestSearch extends JavadocTester { + " id=\"t6\" class=\"tableTab\" onclick=\"show(32);\">Annotation Types Summary\n" + "
\n" + "
Package Summary 
PackageDescription
\n" + + "\n" + "\n" + "\n" + "\n" @@ -726,6 +727,7 @@ public class TestSearch extends JavadocTester { checkOutput("allpackages-index.html", true, "
\n
ClassDescription
\n" + "\n" + + "\n" + "\n" + "\n" + "\n" diff --git a/test/langtools/jdk/javadoc/doclet/testUnnamedPackage/TestUnnamedPackage.java b/test/langtools/jdk/javadoc/doclet/testUnnamedPackage/TestUnnamedPackage.java index f0599ff5b23..ab8d839e7e9 100644 --- a/test/langtools/jdk/javadoc/doclet/testUnnamedPackage/TestUnnamedPackage.java +++ b/test/langtools/jdk/javadoc/doclet/testUnnamedPackage/TestUnnamedPackage.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2019, 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 @@ -69,10 +69,12 @@ public class TestUnnamedPackage extends JavadocTester { checkOutput("allclasses-index.html", true, "
\n
Package Summary 
PackageDescription
\n" + "\n" + + "\n" + "\n" + "\n" + "\n" + "\n" + + "\n" + "\n" + "\n" + "\n" @@ -86,10 +88,12 @@ public class TestUnnamedPackage extends JavadocTester { checkOutput("allpackages-index.html", true, "
\n
Class Summary 
ClassDescription
C
\n" + "\n" + + "\n" + "\n" + "\n" + "\n" + "\n" + + "\n" + "\n" + "\n" + "\n"
Package Summary 
PackageDescription
<Unnamed>