8219691: method summary table head should be enclosed in <thead>
Reviewed-by: jjg
Contributed-by: dthomson@google.com
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlTag.java Thu Mar 14 11:39:58 2019 -0700
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlTag.java Thu Mar 14 13:33:10 2019 -0700
@@ -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 @@
SUB(BlockType.INLINE, EndTag.END),
TABLE,
TBODY,
+ THEAD,
TD,
TH,
TITLE(BlockType.OTHER, EndTag.END),
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Table.java Thu Mar 14 11:39:58 2019 -0700
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Table.java Thu Mar 14 13:33:10 2019 -0700
@@ -190,7 +190,6 @@
*
* <p>Notes:
* <ul>
- * <li>This currently does not use a {@code <thead>} tag, but probably should, eventually
* <li>The column styles are not currently applied to the header, but probably should, eventually
* </ul>
*
@@ -450,7 +449,9 @@
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);
--- a/test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java Thu Mar 14 11:39:58 2019 -0700
+++ b/test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java Thu Mar 14 13:33:10 2019 -0700
@@ -215,17 +215,21 @@
"<div class=\"deprecatedSummary\">\n"
+ "<table>\n"
+ "<caption><span>For Removal</span><span class=\"tabEnd\"> </span></caption>\n"
+ + "<thead>\n"
+ "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Element</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n"
- + "</tr>",
+ + "</tr>\n"
+ + "</thead>",
"<div class=\"deprecatedSummary\">\n"
+ "<table>\n"
+ "<caption><span>Enums</span><span class=\"tabEnd\"> </span></caption>\n"
+ + "<thead>\n"
+ "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Enum</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n"
+ "</tr>\n"
+ + "</thead>\n"
+ "<tbody>\n"
+ "<tr class=\"altColor\">\n"
+ "<th class=\"colDeprecatedItemName\" scope=\"row\"><a href=\"pkg/TestEnum.html\" title=\"enum in pkg\">pkg.TestEnum</a></th>\n"
@@ -239,10 +243,12 @@
"<div class=\"deprecatedSummary\">\n"
+ "<table>\n"
+ "<caption><span>Exceptions</span><span class=\"tabEnd\"> </span></caption>\n"
+ + "<thead>\n"
+ "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Exceptions</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n"
+ "</tr>\n"
+ + "</thead>\n"
+ "<tbody>\n"
+ "<tr class=\"altColor\">\n"
+ "<th class=\"colDeprecatedItemName\" scope=\"row\"><a href=\"pkg/TestException.html\" title=\"class in pkg\">pkg.TestException</a></th>\n"
@@ -256,10 +262,12 @@
"<div class=\"deprecatedSummary\">\n"
+ "<table>\n"
+ "<caption><span>Fields</span><span class=\"tabEnd\"> </span></caption>\n"
+ + "<thead>\n"
+ "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Field</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n"
+ "</tr>\n"
+ + "</thead>\n"
+ "<tbody>\n"
+ "<tr class=\"altColor\">\n"
+ "<th class=\"colDeprecatedItemName\" scope=\"row\"><a href=\"pkg/DeprecatedClassByAnnotation.html#field\">pkg.DeprecatedClassByAnnotation.field</a></th>\n"
--- a/test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java Thu Mar 14 11:39:58 2019 -0700
+++ b/test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java Thu Mar 14 13:33:10 2019 -0700
@@ -252,10 +252,13 @@
checkExit(Exit.OK);
checkOutput("pkg2/Test.html", false, "<h2>Property Summary</h2>");
checkOutput("pkg2/Test.html", true,
- "<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n"
+ "<thead>\n"
+ + "<tr>\n"
+ + "<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n"
+ "<th class=\"colSecond\" scope=\"col\">Method</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n"
+ "</tr>\n"
+ + "</thead>\n"
+ "<tbody>\n"
+ "<tr class=\"altColor\" id=\"i0\">\n"
+ "<td class=\"colFirst\"><code><T> java.lang.Object</code></td>\n"
--- a/test/langtools/jdk/javadoc/doclet/testModules/TestIndirectExportsOpens.java Thu Mar 14 11:39:58 2019 -0700
+++ b/test/langtools/jdk/javadoc/doclet/testModules/TestIndirectExportsOpens.java Thu Mar 14 13:33:10 2019 -0700
@@ -193,10 +193,12 @@
"<div class=\"packagesSummary\">\n"
+ "<table>\n"
+ "<caption><span>" + typeString + "</span><span class=\"tabEnd\"> </span></caption>\n"
+ + "<thead>\n"
+ "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">From</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Packages</th>\n"
+ "</tr>\n"
+ + "</thead>\n"
+ "<tbody>\n"
+ "<tr class=\"altColor\">\n"
+ "<th class=\"colFirst\" scope=\"row\"><a href=\"../m/module-summary.html\">m</a></th>\n"
--- a/test/langtools/jdk/javadoc/doclet/testModules/TestModuleServices.java Thu Mar 14 11:39:58 2019 -0700
+++ b/test/langtools/jdk/javadoc/doclet/testModules/TestModuleServices.java Thu Mar 14 13:33:10 2019 -0700
@@ -199,10 +199,12 @@
checkOutput("m/module-summary.html", true,
"<div class=\"usesSummary\">\n<table>\n" +
"<caption><span>Uses</span><span class=\"tabEnd\"> </span></caption>\n" +
+ "<thead>\n" +
"<tr>\n" +
"<th class=\"colFirst\" scope=\"col\">Type</th>\n" +
"<th class=\"colLast\" scope=\"col\">Description</th>\n" +
"</tr>\n" +
+ "</thead>\n" +
"<tbody>\n" +
"<tr class=\"altColor\">\n" +
"<th class=\"colFirst\" scope=\"row\"><a href=\"p1/A.html\" title=\"class in p1\">A</a></th>\n" +
@@ -240,10 +242,12 @@
checkOutput("m/module-summary.html", true,
"<div class=\"usesSummary\">\n<table>\n" +
"<caption><span>Uses</span><span class=\"tabEnd\"> </span></caption>\n" +
+ "<thead>\n" +
"<tr>\n" +
"<th class=\"colFirst\" scope=\"col\">Type</th>\n" +
"<th class=\"colLast\" scope=\"col\">Description</th>\n" +
"</tr>\n" +
+ "</thead>\n" +
"<tbody>\n" +
"<tr class=\"altColor\">\n" +
"<th class=\"colFirst\" scope=\"row\"><a href=\"p1/A.html\" title=\"class in p1\">A</a></th>\n" +
@@ -307,10 +311,12 @@
checkOutput("m/module-summary.html", true,
"<div class=\"providesSummary\">\n<table>\n" +
"<caption><span>Provides</span><span class=\"tabEnd\"> </span></caption>\n" +
+ "<thead>\n" +
"<tr>\n" +
"<th class=\"colFirst\" scope=\"col\">Type</th>\n" +
"<th class=\"colLast\" scope=\"col\">Description</th>\n" +
"</tr>\n" +
+ "</thead>\n" +
"<tbody>\n" +
"<tr class=\"altColor\">\n" +
"<th class=\"colFirst\" scope=\"row\"><a href=\"p1/A.html\" title=\"interface in p1\">A</a></th>\n" +
@@ -351,10 +357,12 @@
checkOutput("m/module-summary.html", true,
"<div class=\"providesSummary\">\n<table>\n" +
"<caption><span>Provides</span><span class=\"tabEnd\"> </span></caption>\n" +
+ "<thead>\n" +
"<tr>\n" +
"<th class=\"colFirst\" scope=\"col\">Type</th>\n" +
"<th class=\"colLast\" scope=\"col\">Description</th>\n" +
"</tr>\n" +
+ "</thead>\n" +
"<tbody>\n" +
"<tr class=\"altColor\">\n" +
"<th class=\"colFirst\" scope=\"row\"><a href=\"p1/A.html\" title=\"interface in p1\">A</a></th>\n" +
@@ -394,10 +402,12 @@
checkOutput("m/module-summary.html", true,
"<div class=\"providesSummary\">\n<table>\n" +
"<caption><span>Provides</span><span class=\"tabEnd\"> </span></caption>\n" +
+ "<thead>\n" +
"<tr>\n" +
"<th class=\"colFirst\" scope=\"col\">Type</th>\n" +
"<th class=\"colLast\" scope=\"col\">Description</th>\n" +
"</tr>\n" +
+ "</thead>\n" +
"<tbody>\n" +
"<tr class=\"altColor\">\n" +
"<th class=\"colFirst\" scope=\"row\"><a href=\"p1/A.html\" title=\"interface in p1\">A</a></th>\n" +
@@ -408,10 +418,12 @@
"</table>",
"<div class=\"usesSummary\">\n<table>\n" +
"<caption><span>Uses</span><span class=\"tabEnd\"> </span></caption>\n" +
+ "<thead>\n" +
"<tr>\n" +
"<th class=\"colFirst\" scope=\"col\">Type</th>\n" +
"<th class=\"colLast\" scope=\"col\">Description</th>\n" +
"</tr>\n" +
+ "</thead>\n" +
"<tbody>\n" +
"<tr class=\"altColor\">\n" +
"<th class=\"colFirst\" scope=\"row\"><a href=\"p2/B.html\" title=\"class in p2\">B</a></th>\n" +
--- a/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java Thu Mar 14 11:39:58 2019 -0700
+++ b/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java Thu Mar 14 13:33:10 2019 -0700
@@ -623,18 +623,22 @@
"<div class=\"overviewSummary\">\n"
+ "<table summary=\"Module Summary table, listing modules, and an explanation\">\n"
+ "<caption><span>Modules</span><span class=\"tabEnd\"> </span></caption>\n"
+ + "<thead>\n"
+ "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Module</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n"
- + "</tr>");
+ + "</tr>\n"
+ + "</thead>");
checkOutput("overview-summary.html", false,
"<div class=\"overviewSummary\">\n"
+ "<table summary=\"Package Summary table, listing packages, and an explanation\">\n"
+ "<caption><span>Packages</span><span class=\"tabEnd\"> </span></caption>\n"
+ + "<thead>\n"
+ "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Package</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n"
- + "</tr>");
+ + "</tr>\n"
+ + "</thead>");
}
void checkOverviewSummaryPackages() {
@@ -642,10 +646,12 @@
"<div class=\"overviewSummary\">\n"
+ "<table summary=\"Module Summary table, listing modules, and an explanation\">\n"
+ "<caption><span>Modules</span><span class=\"tabEnd\"> </span></caption>\n"
+ + "<thead>\n"
+ "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Module</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n"
- + "</tr>",
+ + "</tr>\n"
+ + "</thead>",
"</table>\n"
+ "</div>\n"
+ "<div class=\"contentContainer\">\n"
@@ -659,10 +665,12 @@
"<div class=\"overviewSummary\">\n"
+ "<table summary=\"Package Summary table, listing packages, and an explanation\">\n"
+ "<caption><span>Packages</span><span class=\"tabEnd\"> </span></caption>\n"
+ + "<thead>n"
+ "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Package</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n"
- + "</tr>",
+ + "</tr>\n"
+ + "</thead>\n",
"</script>\n"
+ "<div class=\"contentContainer\">\n"
+ "<div class=\"block\">The overview summary page header.</div>\n"
@@ -678,18 +686,22 @@
"<div class=\"overviewSummary\">\n"
+ "<table>\n"
+ "<caption><span>Modules</span><span class=\"tabEnd\"> </span></caption>\n"
+ + "<thead>\n"
+ "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Module</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n"
- + "</tr>");
+ + "</tr>\n"
+ + "</thead>");
checkOutput("overview-summary.html", false,
"<div class=\"overviewSummary\">\n"
+ "<table>\n"
+ "<caption><span>Packages</span><span class=\"tabEnd\"> </span></caption>\n"
+ + "<thead>\n"
+ "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Package</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n"
- + "</tr>");
+ + "</tr>\n"
+ + "</thead>");
}
void checkHtml5OverviewSummaryPackages() {
@@ -697,10 +709,12 @@
"<div class=\"overviewSummary\">\n"
+ "<table>\n"
+ "<caption><span>Modules</span><span class=\"tabEnd\"> </span></caption>\n"
+ + "<thead>\n"
+ "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Module</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n"
- + "</tr>",
+ + "</tr>\n"
+ + "</thead>",
"</table>\n"
+ "</div>\n"
+ "</main>\n"
@@ -717,10 +731,12 @@
checkOutput("overview-summary.html", true,
"<div class=\"overviewSummary\">\n<table>\n"
+ "<caption><span>Packages</span><span class=\"tabEnd\"> </span></caption>\n"
+ + "<thead>\n"
+ "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Package</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n"
- + "</tr>",
+ + "</tr>\n"
+ + "</thead>",
"</script>\n"
+ "</nav>\n"
+ "</header>\n"
@@ -788,20 +804,26 @@
+ "<div class=\"block\">With a test description for uses.</div>\n</td>\n"
+ "</tr>",
"<caption><span>Opens</span><span class=\"tabEnd\"> </span></caption>\n"
+ + "<thead>\n"
+ "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Package</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n"
- + "</tr>",
+ + "</tr>\n"
+ + "</thead>",
"<caption><span>Uses</span><span class=\"tabEnd\"> </span></caption>\n"
+ + "<thead>\n"
+ "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Type</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n"
- + "</tr>",
+ + "</tr>\n"
+ + "</thead>",
"<caption><span>Provides</span><span class=\"tabEnd\"> </span></caption>\n"
+ + "<thead>\n"
+ "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Type</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n"
- + "</tr>");
+ + "</tr>\n"
+ + "</thead>");
}
void checkAggregatorModuleSummary() {
@@ -978,18 +1000,21 @@
+ "</td>",
"<div class=\"requiresSummary\">\n<table>\n"
+ "<caption><span>Requires</span><span class=\"tabEnd\"> </span></caption>\n"
+ + "<thead>\n"
+ "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Modifier</th>\n"
+ "<th class=\"colSecond\" scope=\"col\">Module</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>",
"<div class=\"requiresSummary\">\n<table>\n"
+ "<caption><span>Indirect Requires</span><span class=\"tabEnd\"> </span></caption>\n"
+ + "<thead>\n"
+ "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Modifier</th>\n"
+ "<th class=\"colSecond\" scope=\"col\">Module</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>",
"<div class=\"packagesSummary\">\n<table>\n"
+ "<caption><span>Indirect Opens</span><span class=\"tabEnd\"> </span></caption>\n"
+ + "<thead>\n"
+ "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">From</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Packages</th>\n"
@@ -1011,10 +1036,12 @@
+ "<td class=\"colLast\"> </td>",
"<div class=\"packagesSummary\">\n<table>\n"
+ "<caption><span>Opens</span><span class=\"tabEnd\"> </span></caption>\n"
+ + "<thead>\n"
+ "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Package</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n"
+ "</tr>\n"
+ + "</thead>\n"
+ "<tbody>\n"
+ "<tr class=\"altColor\" id=\"i0\">\n"
+ "<th class=\"colFirst\" scope=\"row\"><a href=\"testpkgmdlB/package-summary.html\">testpkgmdlB</a></th>\n"
@@ -1081,11 +1108,13 @@
+ " class=\"tableTab\" onclick=\"show(2);\">Opens</button></div>");
checkOutput("moduleC/module-summary.html", found,
"<caption><span>Exports</span><span class=\"tabEnd\"> </span></caption>\n"
+ + "<thead>\n"
+ "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Package</th>\n"
+ "<th class=\"colSecond\" scope=\"col\">Exported To Modules</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n"
- + "</tr>");
+ + "</tr>\n"
+ + "</thead>");
checkOutput("moduletags/module-summary.html", true,
"<th class=\"colFirst\" scope=\"row\"><a href=\"testpkgmdltags/package-summary.html\">testpkgmdltags</a></th>\n"
+ "<td class=\"colLast\"> </td>");
@@ -1301,16 +1330,20 @@
+ " onclick=\"show(2);\">Class Summary</button><button role=\"tab\" aria-selected=\"false\""
+ " aria-controls=\"typeSummary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
+ " id=\"t6\" class=\"tableTab\" onclick=\"show(32);\">Annotation Types Summary</button></div>\n",
- "<tr>\n"
+ "<thead>\n"
+ + "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Class</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n"
- + "</tr>");
+ + "</tr>\n"
+ + "</thead>\n");
checkOutput("allpackages-index.html", true,
"<caption><span>Package Summary</span><span class=\"tabEnd\"> </span></caption>\n"
+ + "<thead>\n"
+ "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Package</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n"
- + "</tr>\n");
+ + "</tr>\n"
+ + "</thead>");
checkOutput("allclasses-index.html", found,
"<table aria-labelledby=\"t0\">\n");
checkOutput("allpackages-index.html", found,
--- a/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/TestNewLanguageFeatures.java Thu Mar 14 11:39:58 2019 -0700
+++ b/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/TestNewLanguageFeatures.java Thu Mar 14 13:33:10 2019 -0700
@@ -426,11 +426,13 @@
+ "type <a href=\"../Foo4.html\" title=\"class in "
+ "pkg2\">Foo4</a></span><span class=\"tabEnd\"> "
+ "</span></caption>\n"
+ + "<thead>\n"
+ "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n"
+ "<th class=\"colSecond\" scope=\"col\">Method</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n"
+ "</tr>\n"
+ + "</thead>\n"
+ "<tbody>\n"
+ "<tr class=\"altColor\">\n"
+ "<td class=\"colFirst\"><code>void</code></td>\n"
--- a/test/langtools/jdk/javadoc/doclet/testPackagePage/TestPackagePage.java Thu Mar 14 11:39:58 2019 -0700
+++ b/test/langtools/jdk/javadoc/doclet/testPackagePage/TestPackagePage.java Thu Mar 14 13:33:10 2019 -0700
@@ -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 @@
checkOutput("allclasses-index.html", true,
"<div class=\"typeSummary\">\n<table>\n"
+ "<caption><span>Class Summary</span><span class=\"tabEnd\"> </span></caption>\n"
+ + "<thead>\n"
+ "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Class</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n"
- + "</tr>\n");
+ + "</tr>\n"
+ + "</thead>\n");
checkOutput("allpackages-index.html", true,
"<div class=\"packagesSummary\">\n<table>\n"
+ "<caption><span>Package Summary</span><span class=\"tabEnd\"> </span></caption>\n"
+ + "<thead>\n"
+ "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Package</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n"
- + "</tr>\n");
+ + "</tr>\n"
+ + "</thead>\n");
checkOutput("type-search-index.js", true,
"{\"l\":\"All Classes\",\"url\":\"allclasses-index.html\"}");
checkOutput("package-search-index.js", true,
--- a/test/langtools/jdk/javadoc/doclet/testSearch/TestSearch.java Thu Mar 14 11:39:58 2019 -0700
+++ b/test/langtools/jdk/javadoc/doclet/testSearch/TestSearch.java Thu Mar 14 13:33:10 2019 -0700
@@ -717,6 +717,7 @@
+ " id=\"t6\" class=\"tableTab\" onclick=\"show(32);\">Annotation Types Summary</button></div>\n"
+ "<div id=\"typeSummary_tabpanel\" role=\"tabpanel\">\n"
+ "<table aria-labelledby=\"t0\">\n"
+ + "<thead>\n"
+ "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Class</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n"
@@ -726,6 +727,7 @@
checkOutput("allpackages-index.html", true,
"<div class=\"packagesSummary\">\n<table>\n"
+ "<caption><span>Package Summary</span><span class=\"tabEnd\"> </span></caption>\n"
+ + "<thead>\n"
+ "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Package</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n"
--- a/test/langtools/jdk/javadoc/doclet/testUnnamedPackage/TestUnnamedPackage.java Thu Mar 14 11:39:58 2019 -0700
+++ b/test/langtools/jdk/javadoc/doclet/testUnnamedPackage/TestUnnamedPackage.java Thu Mar 14 13:33:10 2019 -0700
@@ -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 @@
checkOutput("allclasses-index.html", true,
"<div class=\"typeSummary\">\n<table>\n"
+ "<caption><span>Class Summary</span><span class=\"tabEnd\"> </span></caption>\n"
+ + "<thead>\n"
+ "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Class</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n"
+ "</tr>\n"
+ + "</thead>\n"
+ "<tbody>\n"
+ "<tr class=\"altColor\" id=\"i0\">\n"
+ "<td class=\"colFirst\"><a href=\"C.html\" title=\"class in <Unnamed>\">C</a></td>\n"
@@ -86,10 +88,12 @@
checkOutput("allpackages-index.html", true,
"<div class=\"packagesSummary\">\n<table>\n"
+ "<caption><span>Package Summary</span><span class=\"tabEnd\"> </span></caption>\n"
+ + "<thead>\n"
+ "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Package</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n"
+ "</tr>\n"
+ + "</thead>\n"
+ "<tbody>\n"
+ "<tr class=\"altColor\">\n"
+ "<th class=\"colFirst\" scope=\"row\"><a href=\"package-summary.html\"><Unnamed></a></th>\n"