stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8242649: improve the CSS class names used for summary and details tables

Browse Source 
Reviewed-by: hannesw
This commit is contained in:
Jonathan Gibbons 2020-04-24 09:14:51 -07:00
parent 94a99ab9e5
commit f9b816b8f9
44 changed files with 474 additions and 453 deletions

2
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java

@ -328,7 +328,7 @@ public abstract class AbstractMemberWriter implements MemberSummaryWriter, Membe
List<? extends Element> members = mems;
boolean printedUseTableHeader = false;
if (members.size() > 0) {
Table useTable = new Table(HtmlStyle.useSummary)
Table useTable = new Table(HtmlStyle.useSummary, HtmlStyle.summaryTable)
.setCaption(heading)
.setRowScopeColumn(1)
.setColumnStyles(HtmlStyle.colFirst, HtmlStyle.colSecond, HtmlStyle.colLast);

3
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllClassesIndexWriter.java

@ -120,10 +120,11 @@ public class AllClassesIndexWriter extends HtmlDocletWriter {
* @param content HtmlTree content to which the links will be added
*/
protected void addContents(Content content) {
Table table = new Table(HtmlStyle.typeSummary)
Table table = new Table(HtmlStyle.typeSummary, HtmlStyle.summaryTable)
.setHeader(new TableHeader(contents.classLabel, contents.descriptionLabel))
.setRowScopeColumn(1)
.setColumnStyles(HtmlStyle.colFirst, HtmlStyle.colLast)
.setId("all-classes-table")
.setDefaultTab(resources.getText("doclet.All_Classes"))
.addTab(resources.interfaceSummary, utils::isInterface)
.addTab(resources.classSummary, e -> utils.isOrdinaryClass((TypeElement)e))

4
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllPackagesIndexWriter.java

@ -104,8 +104,8 @@ public class AllPackagesIndexWriter extends HtmlDocletWriter {
* @param content HtmlTree content to which the links will be added
*/
protected void addPackages(Content content) {
Table table = new Table(HtmlStyle.packagesSummary)
.setCaption(getTableCaption(new StringContent(resources.packageSummary)))
Table table = new Table(HtmlStyle.packagesSummary, HtmlStyle.summaryTable)
.setCaption(new StringContent(resources.packageSummary))
.setHeader(new TableHeader(contents.packageLabel, contents.descriptionLabel))
.setColumnStyles(HtmlStyle.colFirst, HtmlStyle.colLast);
for (PackageElement pkg : configuration.packages) {

2
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java

@ -164,7 +164,7 @@ public class AnnotationTypeRequiredMemberWriterImpl extends AbstractMemberWriter
@Override
protected Table createSummaryTable() {
return new Table(HtmlStyle.memberSummary)
return new Table(HtmlStyle.memberSummary, HtmlStyle.summaryTable)
.setCaption(getCaption())
.setHeader(getSummaryTableHeader(typeElement))
.setRowScopeColumn(1)

12
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassUseWriter.java

@ -257,11 +257,11 @@ public class ClassUseWriter extends SubWriterHolderWriter {
* @param contentTree the content tree to which the packages elements will be added
*/
protected void addPackageList(Content contentTree) {
Content caption = getTableCaption(contents.getContent(
Content caption = contents.getContent(
"doclet.ClassUse_Packages.that.use.0",
getLink(new LinkInfoImpl(configuration,
LinkInfoImpl.Kind.CLASS_USE_HEADER, typeElement))));
Table table = new Table(HtmlStyle.useSummary)
LinkInfoImpl.Kind.CLASS_USE_HEADER, typeElement)));
Table table = new Table(HtmlStyle.useSummary, HtmlStyle.summaryTable)
.setCaption(caption)
.setHeader(getPackageTableHeader())
.setColumnStyles(HtmlStyle.colFirst, HtmlStyle.colLast);
@ -282,12 +282,12 @@ public class ClassUseWriter extends SubWriterHolderWriter {
pkgToPackageAnnotations.isEmpty()) {
return;
}
Content caption = getTableCaption(contents.getContent(
Content caption = contents.getContent(
"doclet.ClassUse_PackageAnnotation",
getLink(new LinkInfoImpl(configuration,
LinkInfoImpl.Kind.CLASS_USE_HEADER, typeElement))));
LinkInfoImpl.Kind.CLASS_USE_HEADER, typeElement)));
Table table = new Table(HtmlStyle.useSummary)
Table table = new Table(HtmlStyle.useSummary, HtmlStyle.summaryTable)
.setCaption(caption)
.setHeader(getPackageTableHeader())
.setColumnStyles(HtmlStyle.colFirst, HtmlStyle.colLast);

2
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstantsSummaryWriterImpl.java

@ -205,7 +205,7 @@ public class ConstantsSummaryWriterImpl extends HtmlDocletWriter implements Cons
}
caption.add(classlink);
Table table = new Table(HtmlStyle.constantsSummary)
Table table = new Table(HtmlStyle.constantsSummary, HtmlStyle.summaryTable)
.setCaption(caption)
.setHeader(constantsTableHeader)
.setRowScopeColumn(1)

2
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstructorWriterImpl.java

@ -196,7 +196,7 @@ public class ConstructorWriterImpl extends AbstractExecutableMemberWriter
rowScopeColumn = 0;
}
return new Table(HtmlStyle.memberSummary)
return new Table(HtmlStyle.memberSummary, HtmlStyle.summaryTable)
.setCaption(contents.constructors)
.setHeader(getSummaryTableHeader(typeElement))
.setRowScopeColumn(rowScopeColumn)

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

@ -373,7 +373,7 @@ public class DeprecatedListWriter extends SubWriterHolderWriter {
String tableSummary, TableHeader tableHeader, Content contentTree) {
if (deprList.size() > 0) {
Content caption = contents.getContent(headingKey);
Table table = new Table(HtmlStyle.deprecatedSummary)
Table table = new Table(HtmlStyle.deprecatedSummary, HtmlStyle.summaryTable)
.setCaption(caption)
.setHeader(tableHeader)
.setId(id)

2
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/EnumConstantWriterImpl.java

@ -142,7 +142,7 @@ public class EnumConstantWriterImpl extends AbstractMemberWriter
@Override
protected Table createSummaryTable() {
return new Table(HtmlStyle.memberSummary)
return new Table(HtmlStyle.memberSummary, HtmlStyle.summaryTable)
.setCaption(contents.getContent("doclet.Enum_Constants"))
.setHeader(getSummaryTableHeader(typeElement))
.setColumnStyles(HtmlStyle.colFirst, HtmlStyle.colLast);

2
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FieldWriterImpl.java

@ -147,7 +147,7 @@ public class FieldWriterImpl extends AbstractMemberWriter
List<HtmlStyle> bodyRowStyles = Arrays.asList(HtmlStyle.colFirst, HtmlStyle.colSecond,
HtmlStyle.colLast);
return new Table(HtmlStyle.memberSummary)
return new Table(HtmlStyle.memberSummary, HtmlStyle.summaryTable)
.setCaption(contents.fields)
.setHeader(getSummaryTableHeader(typeElement))
.setRowScopeColumn(1)

15
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java

@ -516,21 +516,6 @@ public class HtmlDocletWriter {
return li;
}
/**
* Get table caption.
*
* @param title the content for the caption
* @return a content tree for the caption
*/
public Content getTableCaption(Content title) {
Content captionSpan = HtmlTree.SPAN(title);
Content space = Entity.NO_BREAK_SPACE;
Content tabSpan = HtmlTree.SPAN(HtmlStyle.tabEnd, space);
Content caption = HtmlTree.CAPTION(captionSpan);
caption.add(tabSpan);
return caption;
}
/**
* Returns a packagename content.
*

3
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MethodWriterImpl.java

@ -191,10 +191,11 @@ public class MethodWriterImpl extends AbstractExecutableMemberWriter
@Override
protected Table createSummaryTable() {
return new Table(HtmlStyle.memberSummary)
return new Table(HtmlStyle.memberSummary, HtmlStyle.summaryTable)
.setHeader(getSummaryTableHeader(typeElement))
.setRowScopeColumn(1)
.setColumnStyles(HtmlStyle.colFirst, HtmlStyle.colSecond, HtmlStyle.colLast)
.setId("method-summary-table")
.setDefaultTab(resources.getText("doclet.All_Methods"))
.addTab(resources.getText("doclet.Static_Methods"), utils::isStatic)
.addTab(resources.getText("doclet.Instance_Methods"), e -> !utils.isStatic(e))

3
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexWriter.java

@ -91,9 +91,10 @@ public class ModuleIndexWriter extends AbstractOverviewIndexWriter {
if (!groupModuleMap.keySet().isEmpty()) {
TableHeader tableHeader = new TableHeader(contents.moduleLabel, contents.descriptionLabel);
Table table = new Table(HtmlStyle.overviewSummary)
Table table = new Table(HtmlStyle.overviewSummary, HtmlStyle.summaryTable)
.setHeader(tableHeader)
.setColumnStyles(HtmlStyle.colFirst, HtmlStyle.colLast)
.setId("all-modules-table")
.setDefaultTab(resources.getText("doclet.All_Modules"))
.setTabScript(i -> "show(" + i + ");")
.setTabId(i -> (i == 0) ? "t0" : ("t" + (1 << (i - 1))));

11
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java

@ -456,7 +456,7 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW
*/
private Table getTable2(Content caption, HtmlStyle tableStyle,
TableHeader tableHeader) {
return new Table(tableStyle)
return new Table(tableStyle, HtmlStyle.detailsTable)
.setCaption(caption)
.setHeader(tableHeader)
.setColumnStyles(HtmlStyle.colFirst, HtmlStyle.colLast);
@ -473,7 +473,7 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW
*/
private Table getTable3(Content caption, String tableSummary, HtmlStyle tableStyle,
TableHeader tableHeader) {
return new Table(tableStyle)
return new Table(tableStyle, HtmlStyle.detailsTable)
.setCaption(caption)
.setHeader(tableHeader)
.setRowScopeColumn(1)
@ -494,7 +494,7 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW
String tableSummary = resources.getText("doclet.Member_Table_Summary",
text,
resources.getText("doclet.modules"));
Content caption = getTableCaption(new StringContent(text));
Content caption = new StringContent(text);
Table table = getTable3(caption, tableSummary, HtmlStyle.requiresSummary,
requiresTableHeader);
addModulesList(requires, table);
@ -506,7 +506,7 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW
String amrTableSummary = resources.getText("doclet.Member_Table_Summary",
amrText,
resources.getText("doclet.modules"));
Content amrCaption = getTableCaption(new StringContent(amrText));
Content amrCaption = new StringContent(amrText);
Table amrTable = getTable3(amrCaption, amrTableSummary, HtmlStyle.requiresSummary,
requiresTableHeader);
addModulesList(indirectModules, amrTable);
@ -568,7 +568,8 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW
* @param li
*/
public void addPackageSummary(HtmlTree li) {
Table table = new Table(HtmlStyle.packagesSummary)
Table table = new Table(HtmlStyle.packagesSummary, HtmlStyle.summaryTable)
.setId("package-summary-table")
.setDefaultTab(resources.getText("doclet.All_Packages"))
.addTab(resources.getText("doclet.Exported_Packages_Summary"), this::isExported)
.addTab(resources.getText("doclet.Opened_Packages_Summary"), this::isOpened)

2
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NestedClassWriterImpl.java

@ -95,7 +95,7 @@ public class NestedClassWriterImpl extends AbstractMemberWriter
List<HtmlStyle> bodyRowStyles = Arrays.asList(HtmlStyle.colFirst, HtmlStyle.colSecond,
HtmlStyle.colLast);
return new Table(HtmlStyle.memberSummary)
return new Table(HtmlStyle.memberSummary, HtmlStyle.summaryTable)
.setCaption(contents.getContent("doclet.Nested_Classes"))
.setHeader(getSummaryTableHeader(typeElement))
.setRowScopeColumn(1)

3
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageIndexWriter.java

@ -92,9 +92,10 @@ public class PackageIndexWriter extends AbstractOverviewIndexWriter {
= configuration.group.groupPackages(packages);
if (!groupPackageMap.keySet().isEmpty()) {
Table table = new Table(HtmlStyle.overviewSummary)
Table table = new Table(HtmlStyle.overviewSummary, HtmlStyle.summaryTable)
.setHeader(getPackageTableHeader())
.setColumnStyles(HtmlStyle.colFirst, HtmlStyle.colLast)
.setId("all-packages-table")
.setDefaultTab(resources.getText("doclet.All_Packages"))
.setTabScript(i -> "show(" + i + ");")
.setTabId(i -> (i == 0) ? "t0" : ("t" + (1 << (i - 1))));

4
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageUseWriter.java

@ -165,7 +165,7 @@ public class PackageUseWriter extends SubWriterHolderWriter {
Content caption = contents.getContent(
"doclet.ClassUse_Packages.that.use.0",
getPackageLink(packageElement, utils.getPackageName(packageElement)));
Table table = new Table(HtmlStyle.useSummary)
Table table = new Table(HtmlStyle.useSummary, HtmlStyle.summaryTable)
.setCaption(caption)
.setHeader(getPackageTableHeader())
.setColumnStyles(HtmlStyle.colFirst, HtmlStyle.colLast);
@ -204,7 +204,7 @@ public class PackageUseWriter extends SubWriterHolderWriter {
"doclet.ClassUse_Classes.in.0.used.by.1",
getPackageLink(packageElement, utils.getPackageName(packageElement)),
getPackageLink(usingPackage, utils.getPackageName(usingPackage)));
Table table = new Table(HtmlStyle.useSummary)
Table table = new Table(HtmlStyle.useSummary, HtmlStyle.summaryTable)
.setCaption(caption)
.setHeader(classTableHeader)
.setColumnStyles(HtmlStyle.colFirst, HtmlStyle.colLast);

4
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriterImpl.java

@ -209,8 +209,8 @@ public class PackageWriterImpl extends HtmlDocletWriter
public void addClassesSummary(SortedSet<TypeElement> classes, String label,
TableHeader tableHeader, Content summaryContentTree) {
if(!classes.isEmpty()) {
Table table = new Table(HtmlStyle.typeSummary)
.setCaption(getTableCaption(new StringContent(label)))
Table table = new Table(HtmlStyle.typeSummary, HtmlStyle.summaryTable)
.setCaption(new StringContent(label))
.setHeader(tableHeader)
.setColumnStyles(HtmlStyle.colFirst, HtmlStyle.colLast);

2
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PropertyWriterImpl.java

@ -156,7 +156,7 @@ public class PropertyWriterImpl extends AbstractMemberWriter
@Override
protected Table createSummaryTable() {
return new Table(HtmlStyle.memberSummary)
return new Table(HtmlStyle.memberSummary, HtmlStyle.summaryTable)
.setCaption(contents.properties)
.setHeader(getSummaryTableHeader(typeElement))
.setColumnStyles(HtmlStyle.colFirst, HtmlStyle.colSecond, HtmlStyle.colLast)

4
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SystemPropertiesWriter.java

@ -134,8 +134,8 @@ public class SystemPropertiesWriter extends HtmlDocletWriter {
protected void addSystemProperties(Content content) {
Map<String, List<SearchIndexItem>> searchIndexMap = groupSystemProperties();
Content separator = new StringContent(", ");
Table table = new Table(HtmlStyle.systemPropertiesSummary)
.setCaption(getTableCaption(contents.systemPropertiesSummaryLabel))
Table table = new Table(HtmlStyle.systemPropertiesSummary, HtmlStyle.summaryTable)
.setCaption(contents.systemPropertiesSummaryLabel)
.setHeader(new TableHeader(contents.propertyLabel, contents.referencedIn))
.setColumnStyles(HtmlStyle.colFirst, HtmlStyle.colLast);
for (Entry<String, List<SearchIndexItem>> entry : searchIndexMap.entrySet()) {

97
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlStyle.java

@ -46,18 +46,11 @@ import java.util.regex.Pattern;
*/
public enum HtmlStyle {
aboutLanguage,
activeTableTab,
altColor,
block,
blockList,
bottomNav,
circle,
classUses,
colConstructorName,
colDeprecatedItemName,
colFirst,
colLast,
colSecond,
constantsSummary,
constructorDetails,
constructorSummary,
@ -110,7 +103,6 @@ public enum HtmlStyle {
propertySummary,
providesSummary,
requiresSummary,
rowColor,
searchTagLink,
searchTagResult,
serializedPackageContainer,
@ -125,8 +117,6 @@ public enum HtmlStyle {
summary,
summaryList,
systemPropertiesSummary,
tabEnd,
tableTab,
title,
topNav,
typeNameLabel,
@ -136,6 +126,93 @@ public enum HtmlStyle {
usesSummary,
verticalSeparator,
//<editor-fold desc="tables">
// The following constants are used for "summary" and "details" tables.
// Most tables are summary tables, meaning that, in part, they provide links to details elsewhere.
// A module page has details tables containing the details of the directives.
/**
* The class of a {@code table} element used to present details of a program element.
*/
detailsTable,
/**
* The class of a {@code table} element used to present a summary of the enclosed
* elements of a program element. A {@code summaryTable} typically references
* items in a corresponding {@link #detailsList}.
*/
summaryTable,
/**
* The class of the "tab" that indicates the currently displayed contents of a table.
* This is used when the table provides filtered views.
*/
activeTableTab,
/**
* The class of a "tab" that indicates an alternate view of the contents of a table.
* This is used when the table provides filtered views.
*/
tableTab,
/**
* The class of the {@code div} element that contains the tabs used to select
* the contents of the associated table to be displayed.
*/
tableTabs,
/**
* The class of the cells in a table column used to display the name
* of a constructor.
*/
colConstructorName,
/**
* The class of the cells in a table column used to display the name
* of a deprecated item.
*/
colDeprecatedItemName,
/**
* The class of the first column of cells in a table.
* This is typically the "type and modifiers" column, where the type is
* the type of a field or the return type of a method.
*/
colFirst,
/**
* The class of the last column of cells in a table.
* This is typically the "description" column, where the description is
* the first sentence of the elemen ts documentation comment.
*/
colLast,
/**
* The class of the second column of cells in a table.
* This is typically the column that defines the name of a field or the
* name and parameters of a method.
*/
colSecond,
/**
* A class used to provide the background for the rows of a table,
* to provide a "striped" effect. This class and {@link #rowColor}
* are used on alternating rows.
* The classes are applied dynamically when table "tabs" are used
* to filter the set of rows to be displayed
*/
altColor,
/**
* A class used to provide the background for the rows of a table,
* to provide a "striped" effect. This class and {@link #altColor}
* are used on alternating rows.
* The classes are applied dynamically when table "tabs" are used
* to filter the set of rows to be displayed
*/
rowColor,
//</editor-fold>
//<editor-fold desc="documentation comments">
// The following constants are used for the components used to present the content
// generated from documentation comments.

56
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Table.java

@ -54,20 +54,29 @@ import jdk.javadoc.internal.doclets.toolkit.Content;
*
* Many methods return the current object, to facilitate fluent builder-style usage.
*
* A table may support filtered views, which can be selected by clicking on
* one of a list of tabs above the table. If the table does not support filtered
* views, the {@code <caption>} element is typically displayed as a single (inactive)
* tab.
*
* Tables are always enclosed in a {@code <div>} element, which will also contain
* a {@code <div>} element for the list of tabs, when the table supports filtered views.
*
* <p><b>This is NOT part of any supported API.
* If you write code that depends on this, you do so at your own risk.
* This code and its internal interfaces are subject to change or
* deletion without notice.</b>
*/
public class Table extends Content {
private final HtmlStyle topStyle;
private final HtmlStyle tableStyle;
private Content caption;
private Map<String, Predicate<Element>> tabMap;
private String defaultTab;
private Set<String> tabs;
private HtmlStyle tabListStyle = HtmlStyle.tableTabs;
private HtmlStyle activeTabStyle = HtmlStyle.activeTableTab;
private HtmlStyle tabStyle = HtmlStyle.tableTab;
private HtmlStyle tabEnd = HtmlStyle.tabEnd;
private IntFunction<String> tabScript;
private Function<Integer, String> tabId = (i -> "t" + i);
private TableHeader header;
@ -82,10 +91,12 @@ public class Table extends Content {
/**
* Creates a builder for an HTML table.
*
* @param style the style class for the {@code <table>} tag
* @param topStyle the style class for the top-level {@code <div>} element
* @param tableStyle the style class for the {@code <table>} element
*/
public Table(HtmlStyle style) {
this.tableStyle = style;
public Table(HtmlStyle topStyle, HtmlStyle tableStyle) {
this.topStyle = topStyle;
this.tableStyle = tableStyle;
bodyRows = new ArrayList<>();
bodyRowMasks = new ArrayList<>();
}
@ -97,20 +108,11 @@ public class Table extends Content {
* The caption should be suitable for use as the content of a {@code <caption>}
* element.
*
* <b>For compatibility, the code currently accepts a {@code <caption>} element
* as well. This should be removed when all clients rely on using the {@code <caption>}
* element being generated by this class.</b>
*
* @param captionContent the caption
* @return this object
*/
public Table setCaption(Content captionContent) {
if (captionContent instanceof HtmlTree
&& ((HtmlTree) captionContent).tagName == TagName.CAPTION) {
caption = captionContent;
} else {
caption = getCaption(captionContent);
}
caption = getCaption(captionContent);
return this;
}
@ -161,15 +163,15 @@ public class Table extends Content {
/**
* Sets the name of the styles used to display the tabs.
*
* @param tabListStyle the style for the {@code <div>} element containing the tabs
* @param activeTabStyle the style for the active tab
* @param tabStyle the style for other tabs
* @param tabEnd the style for the padding that appears within each tab
* @return this object
*/
public Table setTabStyles(HtmlStyle activeTabStyle, HtmlStyle tabStyle, HtmlStyle tabEnd) {
public Table setTabStyles(HtmlStyle tabListStyle, HtmlStyle activeTabStyle, HtmlStyle tabStyle) {
this.tabListStyle = tabListStyle;
this.activeTabStyle = activeTabStyle;
this.tabStyle = tabStyle;
this.tabEnd = tabEnd;
return this;
}
@ -279,6 +281,9 @@ public class Table extends Content {
/**
* Sets the id attribute of the table.
* This is required if the table has tabs, in which case a subsidiary id
* will be generated for the tabpanel. This subsidiary id is required for
* the ARIA support.
*
* @param id the id
* @return this object
@ -411,12 +416,11 @@ public class Table extends Content {
* @return the HTML
*/
private Content toContent() {
HtmlTree mainDiv = new HtmlTree(TagName.DIV);
mainDiv.setStyle(tableStyle);
HtmlTree mainDiv = new HtmlTree(TagName.DIV).setStyle(topStyle);
if (id != null) {
mainDiv.setId(id);
}
HtmlTree table = new HtmlTree(TagName.TABLE);
HtmlTree table = new HtmlTree(TagName.TABLE).setStyle(tableStyle);
if (tabMap == null || tabs.size() == 1) {
if (tabMap == null) {
table.add(caption);
@ -427,7 +431,7 @@ public class Table extends Content {
table.add(getTableBody());
mainDiv.add(table);
} else {
HtmlTree tablist = new HtmlTree(TagName.DIV)
HtmlTree tablist = new HtmlTree(TagName.DIV).setStyle(tabListStyle)
.put(HtmlAttr.ROLE, "tablist")
.put(HtmlAttr.ARIA_ORIENTATION, "horizontal");
@ -443,8 +447,11 @@ public class Table extends Content {
tablist.add(tab);
}
}
if (id == null) {
throw new IllegalStateException("no id set for table");
}
HtmlTree tabpanel = new HtmlTree(TagName.DIV)
.put(HtmlAttr.ID, tableStyle.cssName() + "_tabpanel")
.put(HtmlAttr.ID, id + ".tabpanel")
.put(HtmlAttr.ROLE, "tabpanel");
table.add(getTableBody());
tabpanel.add(table);
@ -458,7 +465,7 @@ public class Table extends Content {
HtmlTree tab = new HtmlTree(TagName.BUTTON)
.put(HtmlAttr.ROLE, "tab")
.put(HtmlAttr.ARIA_SELECTED, defaultTab ? "true" : "false")
.put(HtmlAttr.ARIA_CONTROLS, tableStyle.cssName() + "_tabpanel")
.put(HtmlAttr.ARIA_CONTROLS, id + ".tabpanel")
.put(HtmlAttr.TABINDEX, defaultTab ? "0" : "-1")
.put(HtmlAttr.ONKEYDOWN, "switchTab(event)")
.put(HtmlAttr.ID, tabId)
@ -550,7 +557,6 @@ public class Table extends Content {
private HtmlTree getCaption(Content title) {
return new HtmlTree(TagName.CAPTION)
.add(HtmlTree.SPAN(title))
.add(HtmlTree.SPAN(tabEnd, Entity.NO_BREAK_SPACE));
.add(HtmlTree.SPAN(title));
}
}

23
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/stylesheet.css

@ -409,34 +409,25 @@ table tr td dl, table tr td dl dt, table tr td dl dd {
border: none;
height:16px;
}
.overview-summary .tab-end, .member-summary .tab-end, .type-summary .tab-end,
.use-summary .tab-end, .constants-summary .tab-end, .deprecated-summary .tab-end,
.requires-summary .tab-end, .packages-summary .tab-end, .provides-summary .tab-end, .uses-summary .tab-end {
display:none;
width:5px;
position:relative;
float:left;
background-color:#F8981D;
}
.overview-summary [role=tablist] button, .member-summary [role=tablist] button,
.type-summary [role=tablist] button, .packages-summary [role=tablist] button {
div.table-tabs > button {
border: none;
cursor: pointer;
padding: 5px 12px 7px 12px;
font-weight: bold;
margin-right: 3px;
}
.overview-summary [role=tablist] .active-table-tab, .member-summary [role=tablist] .active-table-tab,
.type-summary [role=tablist] .active-table-tab, .packages-summary [role=tablist] .active-table-tab {
div.table-tabs > button.active-table-tab {
background: #F8981D;
color: #253441;
}
.overview-summary [role=tablist] .table-tab, .member-summary [role=tablist] .table-tab,
.type-summary [role=tablist] .table-tab, .packages-summary [role=tablist] .table-tab {
div.table-tabs > button.table-tab {
background: #4D7A97;
color: #FFFFFF;
}
.row-color th, .alt-color th {
.row-color th,
.alt-color th {
font-weight:normal;
}
.overview-summary td, .member-summary td, .type-summary td,

32
test/langtools/jdk/javadoc/doclet/testAbstractMethod/TestAbstractMethod.java

@ -50,45 +50,45 @@ public class TestAbstractMethod extends JavadocTester {
checkOutput("pkg/A.html", true,
"<td class=\"col-first\"><code>default void</code></td>",
"<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\" "
+ "aria-selected=\"true\" aria-controls=\"member-summary_tabpanel\" tabindex=\"0\""
"<div class=\"table-tabs\" role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\" "
+ "aria-selected=\"true\" aria-controls=\"method-summary-table.tabpanel\" tabindex=\"0\""
+ " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"active-table-tab\">All Methods"
+ "</button><button role=\"tab\" aria-selected=\"false\""
+ " aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\" "
+ " aria-controls=\"method-summary-table.tabpanel\" tabindex=\"-1\" "
+ "onkeydown=\"switchTab(event)\" id=\"t2\" class=\"table-tab\""
+ " onclick=\"show(2);\">Instance Methods</button><button role=\"tab\""
+ " aria-selected=\"false\" aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\""
+ " aria-selected=\"false\" aria-controls=\"method-summary-table.tabpanel\" tabindex=\"-1\""
+ " onkeydown=\"switchTab(event)\" id=\"t3\" class=\"table-tab\" onclick=\"show(4);\">"
+ "Abstract Methods</button><button role=\"tab\" aria-selected=\"false\""
+ " aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\""
+ " aria-controls=\"method-summary-table.tabpanel\" tabindex=\"-1\""
+ " onkeydown=\"switchTab(event)\" id=\"t5\" class=\"table-tab\" onclick=\"show(16);\">"
+ "Default Methods</button></div>");
checkOutput("pkg/B.html", true,
"<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
+ " aria-selected=\"true\" aria-controls=\"member-summary_tabpanel\" tabindex=\"0\""
"<div class=\"table-tabs\" role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
+ " aria-selected=\"true\" aria-controls=\"method-summary-table.tabpanel\" tabindex=\"0\""
+ " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"active-table-tab\">All Methods"
+ "</button><button role=\"tab\" aria-selected=\"false\""
+ " aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\""
+ " aria-controls=\"method-summary-table.tabpanel\" tabindex=\"-1\""
+ " onkeydown=\"switchTab(event)\" id=\"t2\" class=\"table-tab\" onclick=\"show(2);\">"
+ "Instance Methods</button><button role=\"tab\" aria-selected=\"false\""
+ " aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\""
+ " aria-controls=\"method-summary-table.tabpanel\" tabindex=\"-1\""
+ " onkeydown=\"switchTab(event)\" id=\"t3\" class=\"table-tab\" onclick=\"show(4);\">"
+ "Abstract Methods</button><button role=\"tab\" aria-selected=\"false\""
+ " aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\""
+ " aria-controls=\"method-summary-table.tabpanel\" tabindex=\"-1\""
+ " onkeydown=\"switchTab(event)\" id=\"t4\" class=\"table-tab\""
+ " onclick=\"show(8);\">Concrete Methods</button></div>",
"<td class=\"col-first\"><code>abstract void</code></td>");
checkOutput("pkg/C.html", true,
"<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
+ " aria-selected=\"true\" aria-controls=\"member-summary_tabpanel\" tabindex=\"0\""
"<div class=\"table-tabs\" role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
+ " aria-selected=\"true\" aria-controls=\"method-summary-table.tabpanel\" tabindex=\"0\""
+ " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"active-table-tab\">All Methods"
+ "</button><button role=\"tab\" aria-selected=\"false\""
+ " aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\""
+ " aria-controls=\"method-summary-table.tabpanel\" tabindex=\"-1\""
+ " onkeydown=\"switchTab(event)\" id=\"t2\" class=\"table-tab\" onclick=\"show(2);\">"
+ "Instance Methods</button><button role=\"tab\" aria-selected=\"false\""
+ " aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\""
+ " aria-controls=\"method-summary-table.tabpanel\" tabindex=\"-1\""
+ " onkeydown=\"switchTab(event)\" id=\"t5\" class=\"table-tab\" onclick=\"show(16);\">"
+ "Default Methods</button></div>");
@ -96,13 +96,13 @@ public class TestAbstractMethod extends JavadocTester {
"<td class=\"col-first\"><code>abstract void</code></td>");
checkOutput("pkg/B.html", false,
"<button role=\"tab\" aria-selected=\"false\" aria-controls=\"member-summary_tabpanel\""
"<button role=\"tab\" aria-selected=\"false\" aria-controls=\"method-summary.tabpanel\""
+ " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t5\" class=\"table-tab\""
+ " onclick=\"show(16);\">Default Methods</button>",
"<td class=\"col-first\"><code>default void</code></td>");
checkOutput("pkg/C.html", false,
"<button role=\"tab\" aria-selected=\"false\" aria-controls=\"member-summary_tabpanel\""
"<button role=\"tab\" aria-selected=\"false\" aria-controls=\"method-summary.tabpanel\""
+ " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t3\" class=\"table-tab\""
+ " onclick=\"show(4);\">Abstract Methods</button>"
+ "<span class=\"tab-end\">&nbsp;</span>");

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

@ -215,8 +215,8 @@ public class TestDeprecatedDocs extends JavadocTester {
+ "<li><a href=\"#annotation.type.member\">Annotation Type Elements</a></li>\n"
+ "</ul>",
"<div class=\"deprecated-summary\" id=\"forRemoval\">\n"
+ "<table>\n"
+ "<caption><span>For Removal</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
+ "<table class=\"summary-table\">\n"
+ "<caption><span>For Removal</span></caption>\n"
+ "<thead>\n"
+ "<tr>\n"
+ "<th class=\"col-first\" scope=\"col\">Element</th>\n"
@ -224,8 +224,8 @@ public class TestDeprecatedDocs extends JavadocTester {
+ "</tr>\n"
+ "</thead>",
"<div class=\"deprecated-summary\" id=\"enum\">\n"
+ "<table>\n"
+ "<caption><span>Enums</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
+ "<table class=\"summary-table\">\n"
+ "<caption><span>Enums</span></caption>\n"
+ "<thead>\n"
+ "<tr>\n"
+ "<th class=\"col-first\" scope=\"col\">Enum</th>\n"
@ -243,8 +243,8 @@ public class TestDeprecatedDocs extends JavadocTester {
+ "</table>\n"
+ "</div>",
"<div class=\"deprecated-summary\" id=\"exception\">\n"
+ "<table>\n"
+ "<caption><span>Exceptions</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
+ "<table class=\"summary-table\">\n"
+ "<caption><span>Exceptions</span></caption>\n"
+ "<thead>\n"
+ "<tr>\n"
+ "<th class=\"col-first\" scope=\"col\">Exceptions</th>\n"
@ -262,8 +262,8 @@ public class TestDeprecatedDocs extends JavadocTester {
+ "</table>\n"
+ "</div>",
"<div class=\"deprecated-summary\" id=\"field\">\n"
+ "<table>\n"
+ "<caption><span>Fields</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
+ "<table class=\"summary-table\">\n"
+ "<caption><span>Fields</span></caption>\n"
+ "<thead>\n"
+ "<tr>\n"
+ "<th class=\"col-first\" scope=\"col\">Field</th>\n"

4
test/langtools/jdk/javadoc/doclet/testGroupName/TestGroupName.java

@ -65,7 +65,7 @@ public class TestGroupName extends JavadocTester {
checkExit(Exit.OK);
checkOutput("index.html", true,
"<button role=\"tab\" aria-selected=\"false\" aria-controls=\"overview-summary_tabpanel\""
"<button role=\"tab\" aria-selected=\"false\" aria-controls=\"all-packages-table.tabpanel\""
+ " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t1\" class=\"table-tab\""
+ " onclick=\"show(1);\">abc &lt; &amp; &gt; def</button>",
",\"abc < & > def\"],");
@ -100,7 +100,7 @@ public class TestGroupName extends JavadocTester {
checkExit(Exit.OK);
checkOutput("index.html", true,
"<button role=\"tab\" aria-selected=\"false\" aria-controls=\"overview-summary_tabpanel\""
"<button role=\"tab\" aria-selected=\"false\" aria-controls=\"all-modules-table.tabpanel\""
+ " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t2\" class=\"table-tab\""
+ " onclick=\"show(2);\">Other Modules</button>",
",\"abc < & > def\"],");

18
test/langtools/jdk/javadoc/doclet/testHtmlTableStyles/TestHtmlTableStyles.java

@ -23,7 +23,7 @@
/*
* @test
* @bug 8008164 8169819 8183037 8182765 8196202 8184205
* @bug 8008164 8169819 8183037 8182765 8196202 8184205 8242649
* @summary Test styles on HTML tables generated by javadoc.
* @library ../../lib
* @modules jdk.javadoc/jdk.javadoc.internal.tool
@ -56,23 +56,23 @@ public class TestHtmlTableStyles extends JavadocTester {
checkOutput("pkg1/TestTable.html", true,
"<table summary=\"Summary\" border cellpadding=3 cellspacing=1>",
"<div class=\"member-summary\">\n<table>",
"<div class=\"member-summary\">\n<table>",
"<div class=\"member-summary\">\n<table>");
"<div class=\"member-summary\">\n<table class=\"summary-table\">",
"<div class=\"member-summary\">\n<table class=\"summary-table\">",
"<div class=\"member-summary\">\n<table class=\"summary-table\">");
checkOutput("pkg1/package-summary.html", true,
"<div class=\"type-summary\">\n<table>");
"<div class=\"type-summary\">\n<table class=\"summary-table\">");
checkOutput("pkg1/class-use/TestTable.html", true,
"<div class=\"use-summary\">\n<table>");
"<div class=\"use-summary\">\n<table class=\"summary-table\">");
checkOutput("index.html", true,
"<div class=\"overview-summary\">\n<table>");
"<div class=\"overview-summary\" id=\"all-packages-table\">\n<table class=\"summary-table\">");
checkOutput("deprecated-list.html", true,
"<div class=\"deprecated-summary\" id=\"method\">\n<table>");
"<div class=\"deprecated-summary\" id=\"method\">\n<table class=\"summary-table\">");
checkOutput("constant-values.html", true,
"<div class=\"constants-summary\">\n<table>");
"<div class=\"constants-summary\">\n<table class=\"summary-table\">");
}
}

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

@ -23,7 +23,7 @@
/*
* @test
* @bug 6786688 8008164 8162363 8169819 8183037 8182765 8184205
* @bug 6786688 8008164 8162363 8169819 8183037 8182765 8184205 8242649
* @summary HTML tables should have table summary, caption and table headers.
* @library ../../lib
* @modules jdk.javadoc/jdk.javadoc.internal.tool
@ -65,70 +65,70 @@ public class TestHtmlTableTags extends JavadocTester {
void checkHtmlTableTag() {
//Package summary
checkOutput("pkg1/package-summary.html", true,
"<div class=\"type-summary\">\n<table>",
"<div class=\"type-summary\">\n<table>");
"<div class=\"type-summary\">\n<table class=\"summary-table\">",
"<div class=\"type-summary\">\n<table class=\"summary-table\">");
checkOutput("pkg2/package-summary.html", true,
"<div class=\"type-summary\">\n<table>",
"<div class=\"type-summary\">\n<table>");
"<div class=\"type-summary\">\n<table class=\"summary-table\">",
"<div class=\"type-summary\">\n<table class=\"summary-table\">");
// Class documentation
checkOutput("pkg1/C1.html", true,
"<div class=\"member-summary\">\n<table>",
"<div class=\"member-summary\">\n<table>");
"<div class=\"member-summary\">\n<table class=\"summary-table\">",
"<div class=\"member-summary\">\n<table class=\"summary-table\">");
checkOutput("pkg2/C2.html", true,
"<div class=\"member-summary\">\n<table>",
"<div class=\"member-summary\">\n<table>");
"<div class=\"member-summary\">\n<table class=\"summary-table\">",
"<div class=\"member-summary\">\n<table class=\"summary-table\">");
checkOutput("pkg2/C2.ModalExclusionType.html", true,
"<div class=\"member-summary\">\n<table>");
"<div class=\"member-summary\">\n<table class=\"summary-table\">");
checkOutput("pkg2/C3.html", true,
"<div class=\"member-summary\">\n<table>");
"<div class=\"member-summary\">\n<table class=\"summary-table\">");
checkOutput("pkg2/C4.html", true,
"<div class=\"member-summary\">\n<table>");
"<div class=\"member-summary\">\n<table class=\"summary-table\">");
// Class use documentation
checkOutput("pkg1/class-use/I1.html", true,
"<div class=\"use-summary\">\n<table>");
"<div class=\"use-summary\">\n<table class=\"summary-table\">");
checkOutput("pkg1/class-use/C1.html", true,
"<div class=\"use-summary\">\n<table>",
"<div class=\"use-summary\">\n<table>");
"<div class=\"use-summary\">\n<table class=\"summary-table\">",
"<div class=\"use-summary\">\n<table class=\"summary-table\">");
checkOutput("pkg2/class-use/C2.html", true,
"<div class=\"use-summary\">\n<table>",
"<div class=\"use-summary\">\n<table>");
"<div class=\"use-summary\">\n<table class=\"summary-table\">",
"<div class=\"use-summary\">\n<table class=\"summary-table\">");
checkOutput("pkg2/class-use/C2.ModalExclusionType.html", true,
"<div class=\"use-summary\">\n<table>");
"<div class=\"use-summary\">\n<table class=\"summary-table\">");
checkOutput("pkg2/class-use/C2.ModalExclusionType.html", true,
"<div class=\"use-summary\">\n<table>");
"<div class=\"use-summary\">\n<table class=\"summary-table\">");
// Package use documentation
checkOutput("pkg1/package-use.html", true,
"<div class=\"use-summary\">\n<table>",
"<div class=\"use-summary\">\n<table>");
"<div class=\"use-summary\">\n<table class=\"summary-table\">",
"<div class=\"use-summary\">\n<table class=\"summary-table\">");
checkOutput("pkg2/package-use.html", true,
"<div class=\"use-summary\">\n<table>",
"<div class=\"use-summary\">\n<table>");
"<div class=\"use-summary\">\n<table class=\"summary-table\">",
"<div class=\"use-summary\">\n<table class=\"summary-table\">");
// Deprecated
checkOutput("deprecated-list.html", true,
"<div class=\"deprecated-summary\" id=\"field\">\n<table>",
"<div class=\"deprecated-summary\" id=\"method\">\n<table>");
"<div class=\"deprecated-summary\" id=\"field\">\n<table class=\"summary-table\">",
"<div class=\"deprecated-summary\" id=\"method\">\n<table class=\"summary-table\">");
// Constant values
checkOutput("constant-values.html", true,
"<div class=\"constants-summary\">\n<table>");
"<div class=\"constants-summary\">\n<table class=\"summary-table\">");
// Overview Summary
checkOutput("index.html", true,
"<div class=\"overview-summary\">\n<table>");
"<div class=\"overview-summary\" id=\"all-packages-table\">\n<table class=\"summary-table\">");
}
/*
@ -239,7 +239,7 @@ public class TestHtmlTableTags extends JavadocTester {
// Overview Summary
checkOutput("index.html", true,
"<div class=\"overview-summary\">\n"
"<div class=\"overview-summary\" id=\"all-packages\">\n"
+ "<table summary=\"Package Summary table, listing packages, and an explanation\">");
}
@ -249,110 +249,97 @@ public class TestHtmlTableTags extends JavadocTester {
void checkHtmlTableCaptions() {
//Package summary
checkOutput("pkg1/package-summary.html", true,
"<caption><span>Class Summary</span><span class=\"tab-end\">"
+ "&nbsp;</span></caption>",
"<caption><span>Interface Summary</span><span class=\"tab-end\">"
+ "&nbsp;</span></caption>");
"<caption><span>Class Summary</span></caption>",
"<caption><span>Interface Summary</span></caption>");
checkOutput("pkg2/package-summary.html", true,
"<caption><span>Enum Summary</span><span class=\"tab-end\">"
+ "&nbsp;</span></caption>",
"<caption><span>Annotation Types Summary</span><span class=\"tab-end\">"
+ "&nbsp;</span></caption>");
"<caption><span>Enum Summary</span></caption>",
"<caption><span>Annotation Types Summary</span></caption>");
// Class documentation
checkOutput("pkg1/C1.html", true,
"<caption><span>Fields</span><span class=\"tab-end\">&nbsp;</span></caption>",
"<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
+ " aria-selected=\"true\" aria-controls=\"member-summary_tabpanel\" tabindex=\"0\""
"<caption><span>Fields</span></caption>",
"<div class=\"table-tabs\" role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
+ " aria-selected=\"true\" aria-controls=\"method-summary-table.tabpanel\" tabindex=\"0\""
+ " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"active-table-tab\">All Methods"
+ "</button><button role=\"tab\" aria-selected=\"false\""
+ " aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\""
+ " aria-controls=\"method-summary-table.tabpanel\" tabindex=\"-1\""
+ " onkeydown=\"switchTab(event)\" id=\"t2\" class=\"table-tab\" onclick=\"show(2);\">"
+ "Instance Methods</button><button role=\"tab\" aria-selected=\"false\""
+ " aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\""
+ " aria-controls=\"method-summary-table.tabpanel\" tabindex=\"-1\""
+ " onkeydown=\"switchTab(event)\" id=\"t4\" class=\"table-tab\" onclick=\"show(8);\">"
+ "Concrete Methods</button><button role=\"tab\" aria-selected=\"false\""
+ " aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
+ " aria-controls=\"method-summary-table.tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
+ " id=\"t6\" class=\"table-tab\" onclick=\"show(32);\">Deprecated Methods</button></div>\n");
checkOutput("pkg2/C2.html", true,
"<caption><span>Nested Classes</span><span class=\"tab-end\">&nbsp;</span></caption>",
"<caption><span>Constructors</span><span class=\"tab-end\">&nbsp;</span></caption>");
"<caption><span>Nested Classes</span></caption>",
"<caption><span>Constructors</span></caption>");
checkOutput("pkg2/C2.ModalExclusionType.html", true,
"<caption><span>Enum Constants</span><span class=\"tab-end\">&nbsp;</span></caption>");
"<caption><span>Enum Constants</span></caption>");
checkOutput("pkg2/C3.html", true,
"<caption><span>Required Elements</span><span class=\"tab-end\">&nbsp;"
+ "</span></caption>");
"<caption><span>Required Elements</span></caption>");
checkOutput("pkg2/C4.html", true,
"<caption><span>Optional Elements</span><span class=\"tab-end\">&nbsp;"
+ "</span></caption>");
"<caption><span>Optional Elements</span></caption>");
// Class use documentation
checkOutput("pkg1/class-use/I1.html", true,
"<caption><span>Packages that use <a href=\"../I1.html\" "
+ "title=\"interface in pkg1\">I1</a></span><span class=\"tab-end\">"
+ "&nbsp;</span></caption>");
+ "title=\"interface in pkg1\">I1</a></span></caption>");
checkOutput("pkg1/class-use/C1.html", true,
"<caption><span>Fields in <a href=\"../../pkg2/package-summary.html\">"
+ "pkg2</a> declared as <a href=\"../C1.html\" "
+ "title=\"class in pkg1\">C1</a></span><span class=\"tab-end\">&nbsp;"
+ "</span></caption>",
+ "title=\"class in pkg1\">C1</a></span></caption>",
"<caption><span>Methods in <a href=\"../../pkg2/package-summary.html\">"
+ "pkg2</a> that return <a href=\"../C1.html\" "
+ "title=\"class in pkg1\">C1</a></span><span class=\"tab-end\">"
+ "&nbsp;</span></caption>");
+ "title=\"class in pkg1\">C1</a></span></caption>");
checkOutput("pkg2/class-use/C2.html", true,
"<caption><span>Fields in <a href=\"../../pkg1/package-summary.html\">"
+ "pkg1</a> declared as <a href=\"../C2.html\" "
+ "title=\"class in pkg2\">C2</a></span><span class=\"tab-end\">"
+ "&nbsp;</span></caption>",
+ "title=\"class in pkg2\">C2</a></span></caption>",
"<caption><span>Methods in <a href=\"../../pkg1/package-summary.html\">"
+ "pkg1</a> that return <a href=\"../C2.html\" "
+ "title=\"class in pkg2\">C2</a></span><span class=\"tab-end\">"
+ "&nbsp;</span></caption>");
+ "title=\"class in pkg2\">C2</a></span></caption>");
checkOutput("pkg2/class-use/C2.ModalExclusionType.html", true,
"<caption><span>Methods in <a href=\"../package-summary.html\">"
+ "pkg2</a> that return <a href=\"../C2.ModalExclusionType.html\" "
+ "title=\"enum in pkg2\">C2.ModalExclusionType</a></span>"
+ "<span class=\"tab-end\">&nbsp;</span></caption>");
+ "</caption>");
// Package use documentation
checkOutput("pkg1/package-use.html", true,
"<caption><span>Packages that use <a href=\"package-summary.html\">"
+ "pkg1</a></span><span class=\"tab-end\">&nbsp;</span></caption>",
+ "pkg1</a></span></caption>",
"<caption><span>Classes in <a href=\"package-summary.html\">"
+ "pkg1</a> used by <a href=\"package-summary.html\">pkg1</a>"
+ "</span><span class=\"tab-end\">&nbsp;</span></caption>");
+ "</span></caption>");
checkOutput("pkg2/package-use.html", true,
"<caption><span>Packages that use <a href=\"package-summary.html\">"
+ "pkg2</a></span><span class=\"tab-end\">&nbsp;</span></caption>",
+ "pkg2</a></span></caption>",
"<caption><span>Classes in <a href=\"package-summary.html\">"
+ "pkg2</a> used by <a href=\"../pkg1/package-summary.html\">pkg1</a>"
+ "</span><span class=\"tab-end\">&nbsp;</span></caption>");
+ "</span></caption>");
// Deprecated
checkOutput("deprecated-list.html", true,
"<caption><span>Fields</span><span class=\"tab-end\">"
+ "&nbsp;</span></caption>",
"<caption><span>Methods</span><span class=\"tab-end\">"
+ "&nbsp;</span></caption>");
"<caption><span>Fields</span></caption>",
"<caption><span>Methods</span></caption>");
// Constant values
checkOutput("constant-values.html", true,
"<caption><span>pkg1.<a href=\"pkg1/C1.html\" title=\"class in pkg1\">"
+ "C1</a></span><span class=\"tab-end\">&nbsp;</span></caption>");
+ "C1</a></span></caption>");
// Overview Summary
checkOutput("index.html", true,
"<caption><span>Packages</span><span class=\"tab-end\">&nbsp;</span></caption>");
"<caption><span>Packages</span></caption>");
}
/*

40
test/langtools/jdk/javadoc/doclet/testHtmlVersion/TestHtmlVersion.java

@ -72,8 +72,8 @@ public class TestHtmlVersion extends JavadocTester {
"<!DOCTYPE HTML>",
"<meta name=\"dc.created\"",
"<ul id=\"navbar.top.firstrow\" class=\"nav-list\" title=\"Navigation\">\n",
"<div class=\"overview-summary\">\n"
+ "<table>\n"
"<div class=\"overview-summary\" id=\"all-packages-table\">\n"
+ "<table class=\"summary-table\">\n"
+ "<caption>",
"<header role=\"banner\" class=\"flex-header\">\n"
+ "<nav role=\"navigation\">\n"
@ -87,7 +87,7 @@ public class TestHtmlVersion extends JavadocTester {
"<!DOCTYPE HTML>",
"<meta name=\"dc.created\"",
"<ul id=\"navbar.top.firstrow\" class=\"nav-list\" title=\"Navigation\">\n",
"<div class=\"type-summary\">\n<table>",
"<div class=\"type-summary\">\n<table class=\"summary-table\">",
"<header role=\"banner\" class=\"flex-header\">\n"
+ "<nav role=\"navigation\">\n"
+ "<!-- ========= START OF TOP NAVBAR ======= -->",
@ -103,8 +103,8 @@ public class TestHtmlVersion extends JavadocTester {
"<section class=\"summary\">\n"
+ "<ul class=\"summary-list\">\n"
+ "<li>\n"
+ "<div class=\"type-summary\">\n<table>\n"
+ "<caption><span>Class Summary</span><span class=\"tab-end\">&nbsp;</span></caption>");
+ "<div class=\"type-summary\">\n<table class=\"summary-table\">\n"
+ "<caption><span>Class Summary</span></caption>");
// Test for package-tree page
checkOutput("pkg/package-tree.html", true,
@ -134,7 +134,7 @@ public class TestHtmlVersion extends JavadocTester {
"<!DOCTYPE HTML>",
"<meta name=\"dc.created\"",
"<ul id=\"navbar.top.firstrow\" class=\"nav-list\" title=\"Navigation\">\n",
"<div class=\"use-summary\">\n<table>",
"<div class=\"use-summary\">\n<table class=\"summary-table\">",
"<header role=\"banner\" class=\"flex-header\">\n"
+ "<nav role=\"navigation\">\n"
+ "<!-- ========= START OF TOP NAVBAR ======= -->",
@ -149,7 +149,7 @@ public class TestHtmlVersion extends JavadocTester {
"<!DOCTYPE HTML>",
"<meta name=\"dc.created\"",
"<ul id=\"navbar.top.firstrow\" class=\"nav-list\" title=\"Navigation\">\n",
"<div class=\"constants-summary\">\n<table>",
"<div class=\"constants-summary\">\n<table class=\"summary-table\">",
"<header role=\"banner\" class=\"flex-header\">\n"
+ "<nav role=\"navigation\">\n"
+ "<!-- ========= START OF TOP NAVBAR ======= -->",
@ -168,7 +168,7 @@ public class TestHtmlVersion extends JavadocTester {
"<!DOCTYPE HTML>",
"<meta name=\"dc.created\"",
"<ul id=\"navbar.top.firstrow\" class=\"nav-list\" title=\"Navigation\">\n",
"<div class=\"deprecated-summary\" id=\"class\">\n<table>",
"<div class=\"deprecated-summary\" id=\"class\">\n<table class=\"summary-table\">",
"<header role=\"banner\" class=\"flex-header\">\n"
+ "<nav role=\"navigation\">\n"
+ "<!-- ========= START OF TOP NAVBAR ======= -->",
@ -271,13 +271,13 @@ public class TestHtmlVersion extends JavadocTester {
+ "<div class=\"header\">",
"<section class=\"nested-class-summary\" id=\"nested.class.summary\">\n"
+ "<h2>Nested Class Summary</h2>\n"
+ "<div class=\"member-summary\">\n<table>",
+ "<div class=\"member-summary\">\n<table class=\"summary-table\">",
"<section class=\"field-summary\" id=\"field.summary\">\n"
+ "<h2>Field Summary</h2>\n"
+ "<div class=\"member-summary\">\n<table>",
+ "<div class=\"member-summary\">\n<table class=\"summary-table\">",
"<section class=\"constructor-summary\" id=\"constructor.summary\">\n"
+ "<h2>Constructor Summary</h2>\n"
+ "<div class=\"member-summary\">\n<table>",
+ "<div class=\"member-summary\">\n<table class=\"summary-table\">",
"<section class=\"method-summary\" id=\"method.summary\">\n"
+ "<h2>Method Summary</h2>",
"<section class=\"field-details\" id=\"field.detail\">\n"
@ -304,11 +304,11 @@ public class TestHtmlVersion extends JavadocTester {
"<section class=\"constants-summary\" id=\"enum.constant.summary\">\n"
+ "<h2>Enum Constant Summary</h2>\n"
+ "<div class=\"member-summary\">\n",
"<table aria-labelledby=\"t0\">\n",
"<table class=\"summary-table\" aria-labelledby=\"t0\">\n",
"<section class=\"method-summary\" id=\"method.summary\">\n"
+ "<h2>Method Summary</h2>\n"
+ "<div class=\"member-summary\">\n",
"<table aria-labelledby=\"t0\">",
+ "<div class=\"member-summary\" id=\"method-summary-table\">\n",
"<table class=\"summary-table\" aria-labelledby=\"t0\">",
"<section class=\"constant-details\" id=\"enum.constant.detail\">\n"
+ "<h2>Enum Constant Details</h2>\n",
"<section class=\"method-details\" id=\"method.detail\">\n"
@ -330,8 +330,8 @@ public class TestHtmlVersion extends JavadocTester {
+ "<div class=\"header\">",
"<section class=\"method-summary\" id=\"method.summary\">\n"
+ "<h2>Method Summary</h2>\n"
+ "<div class=\"member-summary\">\n",
"<table aria-labelledby=\"t0\">\n",
+ "<div class=\"member-summary\" id=\"method-summary-table\">\n",
"<table class=\"summary-table\" aria-labelledby=\"t0\">\n",
"<section class=\"method-details\" id=\"method.detail\">\n"
+ "<h2>Method Details</h2>\n",
"<footer role=\"contentinfo\">\n"
@ -389,10 +389,10 @@ public class TestHtmlVersion extends JavadocTester {
+ "<div class=\"header\">",
"<section class=\"member-summary\" id=\"annotation.type.required.element.summary\">\n"
+ "<h2>Required Element Summary</h2>\n"
+ "<div class=\"member-summary\">\n<table>",
+ "<div class=\"member-summary\">\n<table class=\"summary-table\">",
"<section class=\"member-summary\" id=\"annotation.type.optional.element.summary\">\n"
+ "<h2>Optional Element Summary</h2>\n"
+ "<div class=\"member-summary\">\n<table>",
+ "<div class=\"member-summary\">\n<table class=\"summary-table\">",
"<section class=\"details\" id=\"annotation.type.element.detail\">\n"
+ "<ul class=\"details-list\">\n"
+ "<!-- ============ ANNOTATION TYPE MEMBER DETAIL =========== -->\n"
@ -413,10 +413,10 @@ public class TestHtmlVersion extends JavadocTester {
+ "<!-- ========= START OF TOP NAVBAR ======= -->",
"<main role=\"main\">\n"
+ "<div class=\"header\">",
"<div class=\"use-summary\">\n<table>",
"<div class=\"use-summary\">\n<table class=\"summary-table\">",
"<section class=\"detail\" id=\"pkg\">\n"
+ "<h2>Uses of <a href=\"../RegClass.html\" title=\"class in pkg1\">RegClass</a> in <a href=\"../../pkg/package-summary.html\">pkg</a></h2>\n"
+ "<div class=\"use-summary\">\n<table>",
+ "<div class=\"use-summary\">\n<table class=\"summary-table\">",
"<footer role=\"contentinfo\">\n"
+ "<nav role=\"navigation\">\n"
+ "<!-- ======= START OF BOTTOM NAVBAR ====== -->");

8
test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java

@ -155,8 +155,8 @@ public class TestJavaFX extends JavadocTester {
+ "<dd>JavaFX 8.0</dd>",
"<section class=\"property-summary\" id=\"property.summary\">\n"
+ "<h2>Property Summary</h2>\n"
+ "<div class=\"member-summary\">\n<table>\n"
+ "<caption><span>Properties</span><span class=\"tab-end\">&nbsp;</span></caption>",
+ "<div class=\"member-summary\">\n<table class=\"summary-table\">\n"
+ "<caption><span>Properties</span></caption>",
"<tr class=\"alt-color\">\n"
+ "<td class=\"col-first\"><code><a href=\"C.BooleanProperty.html\" title=\"class in pkg1\">C.BooleanProperty</a></code></td>\n",
"<tr class=\"row-color\">\n"
@ -238,8 +238,8 @@ public class TestJavaFX extends JavadocTester {
+ "</section>",
"<section class=\"property-summary\" id=\"property.summary\">\n"
+ "<h2>Property Summary</h2>\n"
+ "<div class=\"member-summary\">\n<table>\n"
+ "<caption><span>Properties</span><span class=\"tab-end\">&nbsp;</span></caption>");
+ "<div class=\"member-summary\">\n<table class=\"summary-table\">\n"
+ "<caption><span>Properties</span></caption>");
checkOutput("pkg2/Test.html", false,
"<h2>Property Summary</h2>\n"

10
test/langtools/jdk/javadoc/doclet/testLambdaFeature/TestLambdaFeature.java

@ -58,16 +58,16 @@ public class TestLambdaFeature extends JavadocTester {
"<td class=\"col-first\"><code>default void</code></td>",
"<div class=\"member-signature\"><span class=\"modifiers\">default</span>&nbsp;"
+ "<span class=\"return-type\">void</span>&nbsp;<span class=\"member-name\">defaultMethod</span>()</div>\n",
"<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
+ " aria-selected=\"true\" aria-controls=\"member-summary_tabpanel\" tabindex=\"0\""
"<div class=\"table-tabs\" role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
+ " aria-selected=\"true\" aria-controls=\"method-summary-table.tabpanel\" tabindex=\"0\""
+ " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"active-table-tab\">All Methods"
+ "</button><button role=\"tab\" aria-selected=\"false\""
+ " aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
+ " aria-controls=\"method-summary-table.tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
+ " id=\"t2\" class=\"table-tab\" onclick=\"show(2);\">Instance Methods</button>"
+ "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"member-summary_tabpanel\""
+ "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"method-summary-table.tabpanel\""
+ " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t3\" class=\"table-tab\""
+ " onclick=\"show(4);\">Abstract Methods</button><button role=\"tab\" aria-selected=\"false\""
+ " aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
+ " aria-controls=\"method-summary-table.tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
+ " id=\"t5\" class=\"table-tab\" onclick=\"show(16);\">Default Methods</button></div>",
"<dl class=\"notes\">\n"
+ "<dt>Functional Interface:</dt>\n"

8
test/langtools/jdk/javadoc/doclet/testLists/TestLists.java

@ -183,7 +183,7 @@ public class TestLists extends JavadocTester {
+ "<section class=\"field-summary\" id=\"field.summary\">\n"
+ "<h2>Field Summary</h2>\n"
+ "<div class=\"member-summary\">\n"
+ "<table>",
+ "<table class=\"summary-table\">",
"</section>\n"
+ "</li>\n"
+ "<!-- ======== CONSTRUCTOR SUMMARY ======== -->\n"
@ -191,7 +191,7 @@ public class TestLists extends JavadocTester {
+ "<section class=\"constructor-summary\" id=\"constructor.summary\">\n"
+ "<h2>Constructor Summary</h2>\n"
+ "<div class=\"member-summary\">\n"
+ "<table>");
+ "<table class=\"summary-table\">");
checkOutput("p/E.html", true,
"</section>\n"
@ -201,7 +201,7 @@ public class TestLists extends JavadocTester {
+ "<section class=\"constants-summary\" id=\"enum.constant.summary\">\n"
+ "<h2>Enum Constant Summary</h2>\n"
+ "<div class=\"member-summary\">\n"
+ "<table>");
+ "<table class=\"summary-table\">");
checkOutput("p/A.html", true,
"<section class=\"summary\">\n"
@ -211,7 +211,7 @@ public class TestLists extends JavadocTester {
+ "<section class=\"member-summary\" id=\"annotation.type.required.element.summary\">\n"
+ "<h2>Required Element Summary</h2>\n"
+ "<div class=\"member-summary\">\n"
+ "<table>");
+ "<table class=\"summary-table\">");
}
}

45
test/langtools/jdk/javadoc/doclet/testMethodTypes/TestMethodTypes.java

@ -49,18 +49,18 @@ public class TestMethodTypes extends JavadocTester {
checkOutput("pkg1/A.html", true,
"var data = {",
"<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
+ " aria-selected=\"true\" aria-controls=\"member-summary_tabpanel\" tabindex=\"0\""
"<div class=\"table-tabs\" role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
+ " aria-selected=\"true\" aria-controls=\"method-summary-table.tabpanel\" tabindex=\"0\""
+ " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"active-table-tab\">All Methods</button>"
+ "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"member-summary_tabpanel\""
+ "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"method-summary-table.tabpanel\""
+ " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t1\" class=\"table-tab\""
+ " onclick=\"show(1);\">Static Methods</button><button role=\"tab\" aria-selected=\"false\""
+ " aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
+ " aria-controls=\"method-summary-table.tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
+ " id=\"t2\" class=\"table-tab\" onclick=\"show(2);\">Instance Methods</button>"
+ "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"member-summary_tabpanel\""
+ "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"method-summary-table.tabpanel\""
+ " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t4\" class=\"table-tab\""
+ " onclick=\"show(8);\">Concrete Methods</button><button role=\"tab\""
+ " aria-selected=\"false\" aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\""
+ " aria-selected=\"false\" aria-controls=\"method-summary-table.tabpanel\" tabindex=\"-1\""
+ " onkeydown=\"switchTab(event)\" id=\"t6\" class=\"table-tab\" onclick=\"show(32);\">"
+ "Deprecated Methods</button></div>",
"<tr class=\"alt-color\" id=\"i0\">");
@ -68,49 +68,46 @@ public class TestMethodTypes extends JavadocTester {
checkOutput("pkg1/B.html", true,
"var data = {\"i0\":6,\"i1\":18,\"i2\":18,\"i3\":1,\"i4\":1,"
+ "\"i5\":6,\"i6\":6,\"i7\":6,\"i8\":6};\n",
"<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
+ " aria-selected=\"true\" aria-controls=\"member-summary_tabpanel\" tabindex=\"0\""
"<div class=\"table-tabs\" role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
+ " aria-selected=\"true\" aria-controls=\"method-summary-table.tabpanel\" tabindex=\"0\""
+ " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"active-table-tab\">All Methods"
+ "</button><button role=\"tab\" aria-selected=\"false\""
+ " aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\""
+ " aria-controls=\"method-summary-table.tabpanel\" tabindex=\"-1\""
+ " onkeydown=\"switchTab(event)\" id=\"t1\" class=\"table-tab\" onclick=\"show(1);\">"
+ "Static Methods</button><button role=\"tab\" aria-selected=\"false\""
+ " aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
+ " aria-controls=\"method-summary-table.tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
+ " id=\"t2\" class=\"table-tab\" onclick=\"show(2);\">Instance Methods</button>"
+ "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"member-summary_tabpanel\""
+ "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"method-summary-table.tabpanel\""
+ " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t3\" class=\"table-tab\""
+ " onclick=\"show(4);\">Abstract Methods</button><button role=\"tab\""
+ " aria-selected=\"false\" aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\""
+ " aria-selected=\"false\" aria-controls=\"method-summary-table.tabpanel\" tabindex=\"-1\""
+ " onkeydown=\"switchTab(event)\" id=\"t5\" class=\"table-tab\" onclick=\"show(16);\">"
+ "Default Methods</button></div>");
checkOutput("pkg1/D.html", true,
"var data = {",
"<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
+ " aria-selected=\"true\" aria-controls=\"member-summary_tabpanel\" tabindex=\"0\""
"<div class=\"table-tabs\" role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
+ " aria-selected=\"true\" aria-controls=\"method-summary-table.tabpanel\" tabindex=\"0\""
+ " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"active-table-tab\">All Methods</button>"
+ "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"member-summary_tabpanel\""
+ "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"method-summary-table.tabpanel\""
+ " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t2\" class=\"table-tab\""
+ " onclick=\"show(2);\">Instance Methods</button><button role=\"tab\" aria-selected=\"false\""
+ " aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
+ " aria-controls=\"method-summary-table.tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
+ " id=\"t3\" class=\"table-tab\" onclick=\"show(4);\">Abstract Methods</button>"
+ "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"member-summary_tabpanel\""
+ "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"method-summary-table.tabpanel\""
+ " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t4\" class=\"table-tab\""
+ " onclick=\"show(8);\">Concrete Methods</button><button role=\"tab\" aria-selected=\"false\""
+ " aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
+ " aria-controls=\"method-summary-table.tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
+ " id=\"t6\" class=\"table-tab\" onclick=\"show(32);\">Deprecated Methods</button></div>",
"<tr class=\"alt-color\" id=\"i0\">");
checkOutput("pkg1/A.html", false,
"<caption><span>Methods</span><span class=\"tab-end\">&nbsp;</span>"
+ "</caption>");
"<caption><span>Methods</span></caption>");
checkOutput("pkg1/B.html", false,
"<caption><span>Methods</span><span class=\"tab-end\">&nbsp;</span>"
+ "</caption>");
"<caption><span>Methods</span></caption>");
checkOutput("pkg1/D.html", false,
"<caption><span>Methods</span><span class=\"tab-end\">&nbsp;</span>"
+ "</caption>");
"<caption><span>Methods</span></caption>");
}
}

4
test/langtools/jdk/javadoc/doclet/testModules/TestIndirectExportsOpens.java

@ -191,8 +191,8 @@ public class TestIndirectExportsOpens extends JavadocTester {
checkOutput("a/module-summary.html", present,
"<div class=\"packages-summary\">\n"
+ "<table>\n"
+ "<caption><span>" + typeString + "</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
+ "<table class=\"details-table\">\n"
+ "<caption><span>" + typeString + "</span></caption>\n"
+ "<thead>\n"
+ "<tr>\n"
+ "<th class=\"col-first\" scope=\"col\">From</th>\n"

15
test/langtools/jdk/javadoc/doclet/testModules/TestModulePackages.java

@ -414,26 +414,26 @@ public class TestModulePackages extends JavadocTester {
if (kinds.length > 1) {
Set<TabKind> kindSet = Set.of(kinds);
StringBuilder sb = new StringBuilder();
sb.append("<div role=\"tablist\" aria-orientation=\"horizontal\">"
sb.append("<div class=\"table-tabs\" role=\"tablist\" aria-orientation=\"horizontal\">"
+ "<button role=\"tab\" aria-selected=\"true\""
+ " aria-controls=\"packages-summary_tabpanel\" tabindex=\"0\""
+ " aria-controls=\"package-summary-table.tabpanel\" tabindex=\"0\""
+ " onkeydown=\"switchTab(event)\""
+ " id=\"t0\" class=\"active-table-tab\">All Packages</button>");
if (kindSet.contains(TabKind.EXPORTS)) {
sb.append("<button role=\"tab\" aria-selected=\"false\""
+ " aria-controls=\"packages-summary_tabpanel\" tabindex=\"-1\""
+ " aria-controls=\"package-summary-table.tabpanel\" tabindex=\"-1\""
+ " onkeydown=\"switchTab(event)\" id=\"t1\" class=\"table-tab\""
+ " onclick=\"show(1);\">Exports</button>");
}
if (kindSet.contains(TabKind.OPENS)) {
sb.append("<button role=\"tab\" aria-selected=\"false\""
+ " aria-controls=\"packages-summary_tabpanel\" tabindex=\"-1\""
+ " aria-controls=\"package-summary-table.tabpanel\" tabindex=\"-1\""
+ " onkeydown=\"switchTab(event)\" id=\"t2\" class=\"table-tab\""
+ " onclick=\"show(2);\">Opens</button>");
}
if (kindSet.contains(TabKind.CONCEALED)) {
sb.append("<button role=\"tab\" aria-selected=\"false\""
+ " aria-controls=\"packages-summary_tabpanel\" tabindex=\"-1\" "
+ " aria-controls=\"package-summary-table.tabpanel\" tabindex=\"-1\" "
+ "onkeydown=\"switchTab(event)\" id=\"t3\" class=\"table-tab\" "
+ "onclick=\"show(4);\">Concealed</button>");
}
@ -442,10 +442,7 @@ public class TestModulePackages extends JavadocTester {
} else {
TabKind k = kinds[0];
String name = k.toString().charAt(0) + k.toString().substring(1).toLowerCase();
expect = "<caption>"
+ "<span>" + name + "</span>"
+ "<span class=\"tab-end\">&nbsp;</span>"
+ "</caption>";
expect = "<caption><span>" + name + "</span></caption>";
}
checkOutput(moduleName + "/module-summary.html", true, expect);

24
test/langtools/jdk/javadoc/doclet/testModules/TestModuleServices.java

@ -197,8 +197,8 @@ public class TestModuleServices extends JavadocTester {
"<h2>Services</h2>");
checkOutput("m/module-summary.html", true,
"<div class=\"uses-summary\">\n<table>\n" +
"<caption><span>Uses</span><span class=\"tab-end\">&nbsp;</span></caption>\n" +
"<div class=\"uses-summary\">\n<table class=\"details-table\">\n" +
"<caption><span>Uses</span></caption>\n" +
"<thead>\n" +
"<tr>\n" +
"<th class=\"col-first\" scope=\"col\">Type</th>\n" +
@ -240,8 +240,8 @@ public class TestModuleServices extends JavadocTester {
"<h2>Services</h2>");
checkOutput("m/module-summary.html", true,
"<div class=\"uses-summary\">\n<table>\n" +
"<caption><span>Uses</span><span class=\"tab-end\">&nbsp;</span></caption>\n" +
"<div class=\"uses-summary\">\n<table class=\"details-table\">\n" +
"<caption><span>Uses</span></caption>\n" +
"<thead>\n" +
"<tr>\n" +
"<th class=\"col-first\" scope=\"col\">Type</th>\n" +
@ -309,8 +309,8 @@ public class TestModuleServices extends JavadocTester {
"<h2>Services</h2>");
checkOutput("m/module-summary.html", true,
"<div class=\"provides-summary\">\n<table>\n" +
"<caption><span>Provides</span><span class=\"tab-end\">&nbsp;</span></caption>\n" +
"<div class=\"provides-summary\">\n<table class=\"details-table\">\n" +
"<caption><span>Provides</span></caption>\n" +
"<thead>\n" +
"<tr>\n" +
"<th class=\"col-first\" scope=\"col\">Type</th>\n" +
@ -355,8 +355,8 @@ public class TestModuleServices extends JavadocTester {
"<h2>Services</h2>");
checkOutput("m/module-summary.html", true,
"<div class=\"provides-summary\">\n<table>\n" +
"<caption><span>Provides</span><span class=\"tab-end\">&nbsp;</span></caption>\n" +
"<div class=\"provides-summary\">\n<table class=\"details-table\">\n" +
"<caption><span>Provides</span></caption>\n" +
"<thead>\n" +
"<tr>\n" +
"<th class=\"col-first\" scope=\"col\">Type</th>\n" +
@ -400,8 +400,8 @@ public class TestModuleServices extends JavadocTester {
"<h2>Services</h2>");
checkOutput("m/module-summary.html", true,
"<div class=\"provides-summary\">\n<table>\n" +
"<caption><span>Provides</span><span class=\"tab-end\">&nbsp;</span></caption>\n" +
"<div class=\"provides-summary\">\n<table class=\"details-table\">\n" +
"<caption><span>Provides</span></caption>\n" +
"<thead>\n" +
"<tr>\n" +
"<th class=\"col-first\" scope=\"col\">Type</th>\n" +
@ -416,8 +416,8 @@ public class TestModuleServices extends JavadocTester {
"</tr>\n" +
"</tbody>\n" +
"</table>",
"<div class=\"uses-summary\">\n<table>\n" +
"<caption><span>Uses</span><span class=\"tab-end\">&nbsp;</span></caption>\n" +
"<div class=\"uses-summary\">\n<table class=\"details-table\">\n" +
"<caption><span>Uses</span></caption>\n" +
"<thead>\n" +
"<tr>\n" +
"<th class=\"col-first\" scope=\"col\">Type</th>\n" +

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

@ -528,8 +528,8 @@ public class TestModules extends JavadocTester {
+ "<div class=\"flex-content\">\n"
+ "<main role=\"main\">\n"
+ "<div class=\"block\">The overview summary page header.</div>\n"
+ "<div class=\"overview-summary\">\n<table>\n"
+ "<caption><span>Modules</span><span class=\"tab-end\">&nbsp;</span></caption>");
+ "<div class=\"overview-summary\" id=\"all-modules-table\">\n<table class=\"summary-table\">\n"
+ "<caption><span>Modules</span></caption>");
checkOutput("index.html", false,
"</table>\n"
+ "</div>\n"
@ -537,8 +537,8 @@ public class TestModules extends JavadocTester {
+ "<main role=\"main\">\n"
+ "<div class=\"block\">The overview summary page header.</div>\n"
+ "</div>\n"
+ "<div class=\"overview-summary\">\n<table>\n"
+ "<caption><span>Modules</span><span class=\"tab-end\">&nbsp;</span></caption>");
+ "<div class=\"overview-summary\" id=\"all-modules-table\">\n<table class=\"summary-table\">\n"
+ "<caption><span>Modules</span><</caption>");
}
void checkHtml5NoDescription(boolean found) {
@ -626,7 +626,7 @@ public class TestModules extends JavadocTester {
checkOutput("index.html", true,
"<div class=\"overview-summary\">\n"
+ "<table summary=\"Module Summary table, listing modules, and an explanation\">\n"
+ "<caption><span>Modules</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
+ "<caption><span>Modules</span></caption>\n"
+ "<thead>\n"
+ "<tr>\n"
+ "<th class=\"col-first\" scope=\"col\">Module</th>\n"
@ -636,7 +636,7 @@ public class TestModules extends JavadocTester {
checkOutput("overview-summary.html", false,
"<div class=\"overview-summary\">\n"
+ "<table summary=\"Package Summary table, listing packages, and an explanation\">\n"
+ "<caption><span>Packages</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
+ "<caption><span>Packages</span></caption>\n"
+ "<thead>\n"
+ "<tr>\n"
+ "<th class=\"col-first\" scope=\"col\">Package</th>\n"
@ -649,7 +649,7 @@ public class TestModules extends JavadocTester {
checkOutput("index.html", false,
"<div class=\"overview-summary\">\n"
+ "<table summary=\"Module Summary table, listing modules, and an explanation\">\n"
+ "<caption><span>Modules</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
+ "<caption><span>Modules</span></caption>\n"
+ "<thead>\n"
+ "<tr>\n"
+ "<th class=\"col-first\" scope=\"col\">Module</th>\n"
@ -662,11 +662,11 @@ public class TestModules extends JavadocTester {
+ "</div>\n"
+ "<div class=\"overview-summary\">\n"
+ "<table summary=\"Package Summary table, listing packages, and an explanation\">\n"
+ "<caption><span>Packages</span><span class=\"tab-end\">&nbsp;</span></caption>");
+ "<caption><span>Packages</span></caption>");
checkOutput("index.html", true,
"<div class=\"overview-summary\">\n"
+ "<table summary=\"Package Summary table, listing packages, and an explanation\">\n"
+ "<caption><span>Packages</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
+ "<caption><span>Packages</span></caption>\n"
+ "<thead>n"
+ "<tr>\n"
+ "<th class=\"col-first\" scope=\"col\">Package</th>\n"
@ -678,14 +678,14 @@ public class TestModules extends JavadocTester {
+ "</div>\n"
+ "<div class=\"overview-summary\">\n"
+ "<table summary=\"Package Summary table, listing packages, and an explanation\">\n"
+ "<caption><span>Packages</span><span class=\"tab-end\">&nbsp;</span></caption>");
+ "<caption><span>Packages</span></caption>");
}
void checkHtml5OverviewSummaryModules() {
checkOutput("index.html", true,
"<div class=\"overview-summary\">\n"
+ "<table>\n"
+ "<caption><span>Modules</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
"<div class=\"overview-summary\" id=\"all-modules-table\">\n"
+ "<table class=\"summary-table\">\n"
+ "<caption><span>Modules</span></caption>\n"
+ "<thead>\n"
+ "<tr>\n"
+ "<th class=\"col-first\" scope=\"col\">Module</th>\n"
@ -693,9 +693,9 @@ public class TestModules extends JavadocTester {
+ "</tr>\n"
+ "</thead>");
checkOutput("overview-summary.html", false,
"<div class=\"overview-summary\">\n"
+ "<table>\n"
+ "<caption><span>Packages</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
"<div class=\"overview-summary\" id=\"all-modules-table\">\n"
+ "<table class=\"summary-table\">\n"
+ "<caption><span>Packages</span></caption>\n"
+ "<thead>\n"
+ "<tr>\n"
+ "<th class=\"col-first\" scope=\"col\">Package</th>\n"
@ -706,9 +706,9 @@ public class TestModules extends JavadocTester {
void checkHtml5OverviewSummaryPackages() {
checkOutput("index.html", false,
"<div class=\"overview-summary\">\n"
+ "<table>\n"
+ "<caption><span>Modules</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
"<div class=\"overview-summary\" id=\"all-modules-table\">\n"
+ "<table class=\"summary-table\">\n"
+ "<caption><span>Modules</span></caption>\n"
+ "<thead>\n"
+ "<tr>\n"
+ "<th class=\"col-first\" scope=\"col\">Module</th>\n"
@ -726,10 +726,10 @@ public class TestModules extends JavadocTester {
+ "</a>\n"
+ "<div class=\"overview-summary\">\n"
+ "<table>\n"
+ "<caption><span>Packages</span><span class=\"tab-end\">&nbsp;</span></caption>");
+ "<caption><span>Packages</span></caption>");
checkOutput("index.html", true,
"<div class=\"overview-summary\">\n<table>\n"
+ "<caption><span>Packages</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
"<div class=\"overview-summary\" id=\"all-packages-table\">\n<table class=\"summary-table\">\n"
+ "<caption><span>Packages</span></caption>\n"
+ "<thead>\n"
+ "<tr>\n"
+ "<th class=\"col-first\" scope=\"col\">Package</th>\n"
@ -741,8 +741,8 @@ public class TestModules extends JavadocTester {
+ "<div class=\"flex-content\">\n"
+ "<main role=\"main\">\n"
+ "<div class=\"block\">The overview summary page header.</div>\n"
+ "<div class=\"overview-summary\">\n<table>\n"
+ "<caption><span>Packages</span><span class=\"tab-end\">&nbsp;</span></caption>");
+ "<div class=\"overview-summary\" id=\"all-packages-table\">\n<table class=\"summary-table\">\n"
+ "<caption><span>Packages</span></caption>");
}
void checkModuleSummary() {
@ -791,21 +791,21 @@ public class TestModules extends JavadocTester {
+ "<td class=\"col-last\">\n"
+ "<div class=\"block\">With a test description for uses.</div>\n</td>\n"
+ "</tr>",
"<caption><span>Opens</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
"<caption><span>Opens</span></caption>\n"
+ "<thead>\n"
+ "<tr>\n"
+ "<th class=\"col-first\" scope=\"col\">Package</th>\n"
+ "<th class=\"col-last\" scope=\"col\">Description</th>\n"
+ "</tr>\n"
+ "</thead>",
"<caption><span>Uses</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
"<caption><span>Uses</span></caption>\n"
+ "<thead>\n"
+ "<tr>\n"
+ "<th class=\"col-first\" scope=\"col\">Type</th>\n"
+ "<th class=\"col-last\" scope=\"col\">Description</th>\n"
+ "</tr>\n"
+ "</thead>",
"<caption><span>Provides</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
"<caption><span>Provides</span></caption>\n"
+ "<thead>\n"
+ "<tr>\n"
+ "<th class=\"col-first\" scope=\"col\">Type</th>\n"
@ -929,37 +929,37 @@ public class TestModules extends JavadocTester {
+ "<li><a href=\"#modules.summary\">Modules</a>&nbsp;|&nbsp;</li>\n"
+ "<li><a href=\"#packages.summary\">Packages</a>&nbsp;|&nbsp;</li>\n"
+ "<li>Services</li>",
"<div class=\"requires-summary\">\n<table>\n"
+ "<caption><span>Indirect Requires</span><span class=\"tab-end\">&nbsp;</span></caption>",
"<div class=\"requires-summary\">\n<table class=\"details-table\">\n"
+ "<caption><span>Indirect Requires</span></caption>",
"<td class=\"col-first\">transitive</td>\n"
+ "<th class=\"col-second\" scope=\"row\"><a href=\"../moduleB/module-summary.html\">moduleB</a></th>\n"
+ "<td class=\"col-last\">\n"
+ "<div class=\"block\">This is a test description for the moduleB module.</div>\n"
+ "</td>",
"<div class=\"packages-summary\">\n<table>\n"
+ "<caption><span>Indirect Exports</span><span class=\"tab-end\">&nbsp;</span></caption>",
"<div class=\"packages-summary\">\n<table class=\"details-table\">\n"
+ "<caption><span>Indirect Exports</span></caption>",
"<td class=\"col-first\">transitive static</td>\n"
+ "<th class=\"col-second\" scope=\"row\"><a href=\"../moduleA/module-summary.html\">moduleA</a></th>\n"
+ "<td class=\"col-last\">\n"
+ "<div class=\"block\">This is a test description for the moduleA module with a Search "
+ "phrase search phrase.</div>\n"
+ "</td>",
"<div class=\"requires-summary\">\n<table>\n"
+ "<caption><span>Requires</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
"<div class=\"requires-summary\">\n<table class=\"details-table\">\n"
+ "<caption><span>Requires</span></caption>\n"
+ "<thead>\n"
+ "<tr>\n"
+ "<th class=\"col-first\" scope=\"col\">Modifier</th>\n"
+ "<th class=\"col-second\" scope=\"col\">Module</th>\n"
+ "<th class=\"col-last\" scope=\"col\">Description</th>",
"<div class=\"requires-summary\">\n<table>\n"
+ "<caption><span>Indirect Requires</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
"<div class=\"requires-summary\">\n<table class=\"details-table\">\n"
+ "<caption><span>Indirect Requires</span></caption>\n"
+ "<thead>\n"
+ "<tr>\n"
+ "<th class=\"col-first\" scope=\"col\">Modifier</th>\n"
+ "<th class=\"col-second\" scope=\"col\">Module</th>\n"
+ "<th class=\"col-last\" scope=\"col\">Description</th>",
"<div class=\"packages-summary\">\n<table>\n"
+ "<caption><span>Indirect Opens</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
"<div class=\"packages-summary\">\n<table class=\"details-table\">\n"
+ "<caption><span>Indirect Opens</span></caption>\n"
+ "<thead>\n"
+ "<tr>\n"
+ "<th class=\"col-first\" scope=\"col\">From</th>\n"
@ -980,8 +980,8 @@ public class TestModules extends JavadocTester {
+ "<li><a href=\"#services.summary\">Services</a></li>",
"<th class=\"col-first\" scope=\"row\"><a href=\"testpkgmdlB/package-summary.html\">testpkgmdlB</a></th>\n"
+ "<td class=\"col-last\">&nbsp;</td>",
"<div class=\"packages-summary\">\n<table>\n"
+ "<caption><span>Opens</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
"<div class=\"packages-summary\" id=\"package-summary-table\">\n<table class=\"summary-table\">\n"
+ "<caption><span>Opens</span></caption>\n"
+ "<thead>\n"
+ "<tr>\n"
+ "<th class=\"col-first\" scope=\"col\">Package</th>\n"
@ -1015,12 +1015,12 @@ public class TestModules extends JavadocTester {
"<th class=\"col-first\" scope=\"row\"><a href=\"testpkgmdlA/package-summary.html\">testpkgmdlA</a></th>\n"
+ "<td class=\"col-second\">All Modules</td>\n"
+ "<td class=\"col-last\">&nbsp;</td>",
"<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\" aria-selected=\"true\""
+ " aria-controls=\"packages-summary_tabpanel\" tabindex=\"0\" onkeydown=\"switchTab(event)\" id=\"t0\""
"<div class=\"table-tabs\" role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\" aria-selected=\"true\""
+ " aria-controls=\"package-summary-table.tabpanel\" tabindex=\"0\" onkeydown=\"switchTab(event)\" id=\"t0\""
+ " class=\"active-table-tab\">All Packages</button><button role=\"tab\" aria-selected=\"false\""
+ " aria-controls=\"packages-summary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t1\""
+ " aria-controls=\"package-summary-table.tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t1\""
+ " class=\"table-tab\" onclick=\"show(1);\">Exports</button><button role=\"tab\" aria-selected=\"false\""
+ " aria-controls=\"packages-summary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t3\""
+ " aria-controls=\"package-summary-table.tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t3\""
+ " class=\"table-tab\" onclick=\"show(4);\">Concealed</button></div>",
"<th class=\"col-first\" scope=\"row\"><a href=\"concealedpkgmdlA/package-summary.html\">concealedpkgmdlA</a></th>\n"
+ "<td class=\"col-second\">None</td>\n"
@ -1045,15 +1045,15 @@ public class TestModules extends JavadocTester {
"<th class=\"col-first\" scope=\"row\"><a href=\"testpkg2mdlB/TestInterfaceInModuleB.html\" title=\"interface in testpkg2mdlB\">TestInterfaceInModuleB</a></th>\n"
+ "<td class=\"col-last\">&nbsp;<br>(<span class=\"implementation-label\">Implementation(s):</span>&nbsp;<a href=\"testpkgmdlB/TestClassInModuleB.html\" "
+ "title=\"class in testpkgmdlB\">TestClassInModuleB</a>)</td>",
"<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\" aria-selected=\"true\""
+ " aria-controls=\"packages-summary_tabpanel\" tabindex=\"0\" onkeydown=\"switchTab(event)\" id=\"t0\""
"<div class=\"table-tabs\" role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\" aria-selected=\"true\""
+ " aria-controls=\"package-summary-table.tabpanel\" tabindex=\"0\" onkeydown=\"switchTab(event)\" id=\"t0\""
+ " class=\"active-table-tab\">All Packages</button><button role=\"tab\" aria-selected=\"false\""
+ " aria-controls=\"packages-summary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t1\""
+ " aria-controls=\"package-summary-table.tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t1\""
+ " class=\"table-tab\" onclick=\"show(1);\">Exports</button><button role=\"tab\" aria-selected=\"false\""
+ " aria-controls=\"packages-summary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t2\""
+ " aria-controls=\"package-summary-table.tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t2\""
+ " class=\"table-tab\" onclick=\"show(2);\">Opens</button></div>");
checkOutput("moduleC/module-summary.html", found,
"<caption><span>Exports</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
"<caption><span>Exports</span></caption>\n"
+ "<thead>\n"
+ "<tr>\n"
+ "<th class=\"col-first\" scope=\"col\">Package</th>\n"
@ -1105,25 +1105,25 @@ public class TestModules extends JavadocTester {
checkOutput("moduleNoExport/module-summary.html", found,
"<!-- ============ PACKAGES SUMMARY =========== -->\n"
+ "<h2>Packages</h2>",
"<caption><span>Concealed</span><span class=\"tab-end\">&nbsp;</span></caption>");
"<caption><span>Concealed</span></caption>");
}
void checkGroupOption() {
checkOutput("index.html", true,
"<div class=\"overview-summary\">\n"
+ "<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
+ " aria-selected=\"true\" aria-controls=\"overview-summary_tabpanel\" tabindex=\"0\""
"<div class=\"overview-summary\" id=\"all-modules-table\">\n"
+ "<div class=\"table-tabs\" role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
+ " aria-selected=\"true\" aria-controls=\"all-modules-table.tabpanel\" tabindex=\"0\""
+ " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"active-table-tab\">All Modules</button>"
+ "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"overview-summary_tabpanel\""
+ "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"all-modules-table.tabpanel\""
+ " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t1\" class=\"table-tab\""
+ " onclick=\"show(1);\">Module Group A</button><button role=\"tab\" aria-selected=\"false\""
+ " aria-controls=\"overview-summary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
+ " aria-controls=\"all-modules-table.tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
+ " id=\"t2\" class=\"table-tab\" onclick=\"show(2);\">Module Group B &amp; C</button><button"
+ " role=\"tab\" aria-selected=\"false\" aria-controls=\"overview-summary_tabpanel\" tabindex=\"-1\""
+ " role=\"tab\" aria-selected=\"false\" aria-controls=\"all-modules-table.tabpanel\" tabindex=\"-1\""
+ " onkeydown=\"switchTab(event)\" id=\"t4\" class=\"table-tab\" onclick=\"show(4);\">"
+ "Other Modules</button></div>\n"
+ "<div id=\"overview-summary_tabpanel\" role=\"tabpanel\">\n"
+ "<table aria-labelledby=\"t0\">",
+ "<div id=\"all-modules-table.tabpanel\" role=\"tabpanel\">\n"
+ "<table class=\"summary-table\" aria-labelledby=\"t0\">",
"var data = {\"i0\":1,\"i1\":2,\"i2\":2,\"i3\":4};\n"
+ "var tabs = {65535:[\"t0\",\"All Modules\"],1:[\"t1\",\"Module Group A\"],2:[\"t2\",\"Module Group B & C\"],4:[\"t4\",\"Other Modules\"]};\n"
+ "var altColor = \"alt-color\";\n"
@ -1132,39 +1132,39 @@ public class TestModules extends JavadocTester {
+ "var activeTableTab = \"active-table-tab\";");
checkOutput("index.html", false,
"<div class=\"overview-summary\">\n<table>\n"
+ "<caption><span>Modules</span><span class=\"tab-end\">&nbsp;</span></caption>",
+ "<caption><span>Modules</span></caption>",
"Java SE Modules");
}
void checkGroupOptionOrdering() {
checkOutput("index.html", true,
"<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
+ " aria-selected=\"true\" aria-controls=\"overview-summary_tabpanel\" tabindex=\"0\""
"<div class=\"table-tabs\" role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
+ " aria-selected=\"true\" aria-controls=\"all-modules-table.tabpanel\" tabindex=\"0\""
+ " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"active-table-tab\">All Modules</button>"
+ "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"overview-summary_tabpanel\""
+ "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"all-modules-table.tabpanel\""
+ " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t1\" class=\"table-tab\""
+ " onclick=\"show(1);\">B Group</button><button role=\"tab\" aria-selected=\"false\""
+ " aria-controls=\"overview-summary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
+ " aria-controls=\"all-modules-table.tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
+ " id=\"t2\" class=\"table-tab\" onclick=\"show(2);\">C Group</button><button role=\"tab\""
+ " aria-selected=\"false\" aria-controls=\"overview-summary_tabpanel\" tabindex=\"-1\""
+ " aria-selected=\"false\" aria-controls=\"all-modules-table.tabpanel\" tabindex=\"-1\""
+ " onkeydown=\"switchTab(event)\" id=\"t4\" class=\"table-tab\" onclick=\"show(4);\">A Group"
+ "</button><button role=\"tab\" aria-selected=\"false\" aria-controls=\"overview-summary_tabpanel\""
+ "</button><button role=\"tab\" aria-selected=\"false\" aria-controls=\"all-modules-table.tabpanel\""
+ " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t8\" class=\"table-tab\" onclick=\"show(8);\">"
+ "Other Modules</button></div>",
"var tabs = {65535:[\"t0\",\"All Modules\"],1:[\"t1\",\"B Group\"],2:[\"t2\",\"C Group\"],"
+ "4:[\"t4\",\"A Group\"],8:[\"t8\",\"Other Modules\"]};");
checkOutput("index.html", false,
"<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
+ " aria-selected=\"true\" aria-controls=\"overview-summary_tabpanel\" tabindex=\"0\""
"<div class=\"table-tabs\" role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
+ " aria-selected=\"true\" aria-controls=\"all-modules-table.tabpanel\" tabindex=\"0\""
+ " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"active-table-tab\">All Modules</button>"
+ "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"overview-summary_tabpanel\""
+ "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"all-modules-table.tabpanel\""
+ " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t1\" class=\"table-tab\""
+ " onclick=\"show(1);\">A Group</button><button role=\"tab\" aria-selected=\"false\""
+ " aria-controls=\"overview-summary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
+ " aria-controls=\"all-modules-table.tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
+ " id=\"t2\" class=\"table-tab\" onclick=\"show(2);\">B Group</button><button role=\"tab\""
+ " aria-selected=\"false\" aria-controls=\"overview-summary_tabpanel\" tabindex=\"-1\""
+ " aria-selected=\"false\" aria-controls=\"all-modules-table.tabpanel\" tabindex=\"-1\""
+ " onkeydown=\"switchTab(event)\" id=\"t4\" class=\"table-tab\" onclick=\"show(4);\">C Group"
+ "</button><button role=\"tab\" aria-selected=\"false\" aria-controls=\"overview-summary_tabpanel\""
+ "</button><button role=\"tab\" aria-selected=\"false\" aria-controls=\"all-modules-table.tabpanel\""
+ " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t8\" class=\"table-tab\""
+ " onclick=\"show(8);\">Other Modules</button></div>",
"Java SE Modules");
@ -1173,17 +1173,17 @@ public class TestModules extends JavadocTester {
void checkUnnamedModuleGroupOption() {
checkOutput("index.html", true,
"<div class=\"block\">The overview summary page header.</div>\n"
+ "<div class=\"overview-summary\">\n"
+ "<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
+ " aria-selected=\"true\" aria-controls=\"overview-summary_tabpanel\" tabindex=\"0\""
+ "<div class=\"overview-summary\" id=\"all-packages-table\">\n"
+ "<div class=\"table-tabs\" role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
+ " aria-selected=\"true\" aria-controls=\"all-packages-table.tabpanel\" tabindex=\"0\""
+ " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"active-table-tab\">All Packages</button>"
+ "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"overview-summary_tabpanel\""
+ "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"all-packages-table.tabpanel\""
+ " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t1\" class=\"table-tab\""
+ " onclick=\"show(1);\">Package Group 0</button><button role=\"tab\" aria-selected=\"false\""
+ " aria-controls=\"overview-summary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
+ " aria-controls=\"all-packages-table.tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
+ " id=\"t2\" class=\"table-tab\" onclick=\"show(2);\">Package Group 1</button></div>\n"
+ "<div id=\"overview-summary_tabpanel\" role=\"tabpanel\">\n"
+ "<table aria-labelledby=\"t0\">",
+ "<div id=\"all-packages-table.tabpanel\" role=\"tabpanel\">\n"
+ "<table class=\"summary-table\" aria-labelledby=\"t0\">",
"var data = {\"i0\":1,\"i1\":2};\n"
+ "var tabs = {65535:[\"t0\",\"All Packages\"],1:[\"t1\",\"Package Group 0\"],2:[\"t2\",\"Package Group 1\"]};\n"
+ "var altColor = \"alt-color\";\n"
@ -1194,13 +1194,13 @@ public class TestModules extends JavadocTester {
void checkGroupOptionPackageOrdering() {
checkOutput("index.html", true,
"<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
+ " aria-selected=\"true\" aria-controls=\"overview-summary_tabpanel\" tabindex=\"0\""
"<div class=\"table-tabs\" role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
+ " aria-selected=\"true\" aria-controls=\"all-packages-table.tabpanel\" tabindex=\"0\""
+ " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"active-table-tab\">All Packages</button>"
+ "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"overview-summary_tabpanel\""
+ "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"all-packages-table.tabpanel\""
+ " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t1\" class=\"table-tab\""
+ " onclick=\"show(1);\">Z Group</button><button role=\"tab\" aria-selected=\"false\""
+ " aria-controls=\"overview-summary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
+ " aria-controls=\"all-packages-table.tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
+ " id=\"t2\" class=\"table-tab\" onclick=\"show(2);\">A Group</button></div>",
"var tabs = {65535:[\"t0\",\"All Packages\"],1:[\"t1\",\"Z Group\"],2:[\"t2\",\"A Group\"]};");
}
@ -1249,7 +1249,7 @@ public class TestModules extends JavadocTester {
void checkLinkSource(boolean includePrivate) {
checkOutput("moduleA/module-summary.html", !includePrivate,
"<table>\n<caption><span>Exports</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
"<table class=\"summary-table\">\n<caption><span>Exports</span></caption>\n"
+ "<thead>\n<tr>\n<th class=\"col-first\" scope=\"col\">Package</th>\n"
+ "<th class=\"col-last\" scope=\"col\">Description</th>\n</tr>\n</thead>\n"
+ "<tbody>\n<tr class=\"alt-color\" id=\"i0\">\n"
@ -1280,13 +1280,13 @@ public class TestModules extends JavadocTester {
void checkAllPkgsAllClasses(boolean found) {
checkOutput("allclasses-index.html", true,
"<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
+ " aria-selected=\"true\" aria-controls=\"type-summary_tabpanel\" tabindex=\"0\""
"<div class=\"table-tabs\" role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
+ " aria-selected=\"true\" aria-controls=\"all-classes-table.tabpanel\" tabindex=\"0\""
+ " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"active-table-tab\">All Classes</button>"
+ "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"type-summary_tabpanel\""
+ "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"all-classes-table.tabpanel\""
+ " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t2\" class=\"table-tab\""
+ " onclick=\"show(2);\">Class Summary</button><button role=\"tab\" aria-selected=\"false\""
+ " aria-controls=\"type-summary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
+ " aria-controls=\"all-classes-table.tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
+ " id=\"t6\" class=\"table-tab\" onclick=\"show(32);\">Annotation Types Summary</button></div>\n",
"<thead>\n"
+ "<tr>\n"
@ -1295,7 +1295,7 @@ public class TestModules extends JavadocTester {
+ "</tr>\n"
+ "</thead>\n");
checkOutput("allpackages-index.html", true,
"<caption><span>Package Summary</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
"<caption><span>Package Summary</span></caption>\n"
+ "<thead>\n"
+ "<tr>\n"
+ "<th class=\"col-first\" scope=\"col\">Package</th>\n"
@ -1303,9 +1303,9 @@ public class TestModules extends JavadocTester {
+ "</tr>\n"
+ "</thead>");
checkOutput("allclasses-index.html", found,
"<table aria-labelledby=\"t0\">\n");
"<table class=\"summary-table\" aria-labelledby=\"t0\">\n");
checkOutput("allpackages-index.html", found,
"<div class=\"packages-summary\">\n<table>\n");
"<div class=\"packages-summary\">\n<table class=\"summary-table\">\n");
checkOutput("allclasses-index.html", !found,
"<table summary=\"Class Summary table, listing classes, and an explanation\" aria-labelledby=\"t0\">");
checkOutput("allpackages-index.html", !found,

77
test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/TestNewLanguageFeatures.java

@ -71,8 +71,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
+ "extends java.lang.Enum&lt;<a href=\"Coin.html\" "
+ "title=\"enum in pkg\">Coin</a>&gt;</pre>",
// Check for enum constant section
"<caption><span>Enum Constants"
+ "</span><span class=\"tab-end\">&nbsp;</span></caption>",
"<caption><span>Enum Constants</span></caption>",
// Detail for enum constant
"<span class=\"member-name-link\"><a href=\"#Dime\">Dime</a></span>",
// Automatically insert documentation for values() and valueOf().
@ -228,7 +227,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
"<caption><span>Classes in <a href=\"../"
+ "package-summary.html\">pkg2</a> with type parameters of "
+ "type <a href=\"../Foo.html\" title=\"class in pkg2\">"
+ "Foo</a></span><span class=\"tab-end\">&nbsp;</span></caption>",
+ "Foo</a></span></caption>",
"<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\"><a href=\"../ClassUseTest1.html\" "
+ "title=\"class in pkg2\">ClassUseTest1</a>&lt;T extends "
+ "<a href=\"../Foo.html\" title=\"class in pkg2\">Foo"
@ -237,7 +236,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
"<caption><span>Methods in <a href=\"../"
+ "package-summary.html\">pkg2</a> with type parameters of "
+ "type <a href=\"../Foo.html\" title=\"class in "
+ "pkg2\">Foo</a></span><span class=\"tab-end\">&nbsp;</span></caption>",
+ "pkg2\">Foo</a></span></caption>",
"<th class=\"col-second\" scope=\"row\"><span class=\"type-name-label\">ClassUseTest1."
+ "</span><code><span class=\"member-name-link\"><a href=\"../"
+ "ClassUseTest1.html#method(T)\">method</a></span>"
@ -245,7 +244,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
"<caption><span>Fields in <a href=\"../"
+ "package-summary.html\">pkg2</a> with type parameters of "
+ "type <a href=\"../Foo.html\" title=\"class in pkg2\">"
+ "Foo</a></span><span class=\"tab-end\">&nbsp;</span></caption>",
+ "Foo</a></span></caption>",
"td class=\"col-first\"><code><a href=\"../"
+ "ParamTest.html\" title=\"class in pkg2\">ParamTest</a>"
+ "&lt;<a href=\"../Foo.html\" title=\"class in pkg2\""
@ -256,7 +255,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
"<caption><span>Fields in <a href=\"../"
+ "package-summary.html\">pkg2</a> declared as <a href=\"../"
+ "ParamTest.html\" title=\"class in pkg2\">ParamTest"
+ "</a></span><span class=\"tab-end\">&nbsp;</span></caption>",
+ "</a></span></caption>",
"<td class=\"col-first\"><code><a href=\"../"
+ "ParamTest.html\" title=\"class in pkg2\">ParamTest</a>&lt;<a "
+ "href=\"../Foo.html\" title=\"class in pkg2\">Foo</a"
@ -267,8 +266,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
"<caption><span>Classes in <a href=\"../"
+ "package-summary.html\">pkg2</a> with type parameters of "
+ "type <a href=\"../Foo2.html\" title=\"interface "
+ "in pkg2\">Foo2</a></span><span class=\"tab-end\">&nbsp;"
+ "</span></caption>",
+ "in pkg2\">Foo2</a></span></caption>",
"<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\"><a href=\"../ClassUseTest1.html\" "
+ "title=\"class in pkg2\">ClassUseTest1</a>&lt;T extends "
+ "<a href=\"../Foo.html\" title=\"class in pkg2\">Foo"
@ -277,8 +275,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
"<caption><span>Methods in <a href=\"../"
+ "package-summary.html\">pkg2</a> with type parameters of "
+ "type <a href=\"../Foo2.html\" title=\"interface "
+ "in pkg2\">Foo2</a></span><span class=\"tab-end\">&nbsp;"
+ "</span></caption>",
+ "in pkg2\">Foo2</a></span></caption>",
"<th class=\"col-second\" scope=\"row\"><span class=\"type-name-label\">"
+ "ClassUseTest1.</span><code><span class=\"member-name-link\"><a href=\"../"
+ "ClassUseTest1.html#method(T)\">method</a></span>"
@ -290,8 +287,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
"<caption><span>Classes in <a href=\"../"
+ "package-summary.html\">pkg2</a> with type parameters of "
+ "type <a href=\"../ParamTest.html\" title=\"class "
+ "in pkg2\">ParamTest</a></span><span class=\"tab-end\">"
+ "&nbsp;</span></caption>",
+ "in pkg2\">ParamTest</a></span></caption>",
"<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\"><a href=\"../ClassUseTest2.html\" "
+ "title=\"class in pkg2\">ClassUseTest2</a>&lt;T extends "
+ "<a href=\"../ParamTest.html\" title=\"class in pkg2\">"
@ -300,8 +296,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
"<caption><span>Methods in <a href=\"../"
+ "package-summary.html\">pkg2</a> with type parameters of "
+ "type <a href=\"../ParamTest.html\" title=\"class "
+ "in pkg2\">ParamTest</a></span><span class=\"tab-end\">"
+ "&nbsp;</span></caption>",
+ "in pkg2\">ParamTest</a></span></caption>",
"<th class=\"col-second\" scope=\"row\"><span class=\"type-name-label\">ClassUseTest2."
+ "</span><code><span class=\"member-name-link\"><a href=\"../"
+ "ClassUseTest2.html#method(T)\">method</a></span>"
@ -309,7 +304,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
"<caption><span>Fields in <a href=\"../"
+ "package-summary.html\">pkg2</a> declared as <a href=\"../"
+ "ParamTest.html\" title=\"class in pkg2\">ParamTest"
+ "</a></span><span class=\"tab-end\">&nbsp;</span></caption>",
+ "</a></span></caption>",
"<td class=\"col-first\"><code><a href=\"../"
+ "ParamTest.html\" title=\"class in pkg2\">ParamTest</a>"
+ "&lt;<a href=\"../Foo.html\" title=\"class in pkg2\">"
@ -317,8 +312,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
"<caption><span>Methods in <a href=\"../"
+ "package-summary.html\">pkg2</a> with type parameters of "
+ "type <a href=\"../ParamTest.html\" title=\"class "
+ "in pkg2\">ParamTest</a></span><span class=\"tab-end\">"
+ "&nbsp;</span></caption>",
+ "in pkg2\">ParamTest</a></span></caption>",
"<td class=\"col-first\"><code>&lt;T extends <a href=\"../"
+ "ParamTest.html\" title=\"class in pkg2\">ParamTest"
+ "</a>&lt;<a href=\"../Foo3.html\" title=\"class in "
@ -332,7 +326,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
"<caption><span>Classes in <a href=\"../"
+ "package-summary.html\">pkg2</a> with type parameters of "
+ "type <a href=\"../Foo3.html\" title=\"class in pkg2\">"
+ "Foo3</a></span><span class=\"tab-end\">&nbsp;</span></caption>",
+ "Foo3</a></span></caption>",
"<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\"><a href=\"../ClassUseTest2.html\" "
+ "title=\"class in pkg2\">ClassUseTest2</a>&lt;T extends "
+ "<a href=\"../ParamTest.html\" title=\"class in pkg2\">"
@ -341,8 +335,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
"<caption><span>Methods in <a href=\"../"
+ "package-summary.html\">pkg2</a> with type parameters of "
+ "type <a href=\"../Foo3.html\" title=\"class in "
+ "pkg2\">Foo3</a></span><span class=\"tab-end\">&nbsp;"
+ "</span></caption>",
+ "pkg2\">Foo3</a></span></caption>",
"<th class=\"col-second\" scope=\"row\"><span class=\"type-name-label\">ClassUseTest2."
+ "</span><code><span class=\"member-name-link\"><a href=\"../"
+ "ClassUseTest2.html#method(T)\">method</a></span>"
@ -350,8 +343,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
"<caption><span>Methods in <a href=\"../"
+ "package-summary.html\">pkg2</a> that return types with "
+ "arguments of type <a href=\"../Foo3.html\" title"
+ "=\"class in pkg2\">Foo3</a></span><span class=\"tab-end\">"
+ "&nbsp;</span></caption>",
+ "=\"class in pkg2\">Foo3</a></span></caption>",
"<td class=\"col-first\"><code>&lt;T extends <a href=\"../"
+ "ParamTest.html\" title=\"class in pkg2\">ParamTest</a>&lt;"
+ "<a href=\"../Foo3.html\" title=\"class in pkg2\">Foo3"
@ -365,8 +357,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
"<caption><span>Classes in <a href=\"../"
+ "package-summary.html\">pkg2</a> with type parameters of "
+ "type <a href=\"../ParamTest2.html\" title=\"class "
+ "in pkg2\">ParamTest2</a></span><span class=\"tab-end\">"
+ "&nbsp;</span></caption>",
+ "in pkg2\">ParamTest2</a></span></caption>",
"<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\"><a href=\"../ClassUseTest3.html\" "
+ "title=\"class in pkg2\">ClassUseTest3</a>&lt;T extends "
+ "<a href=\"../ParamTest2.html\" title=\"class in pkg2\">"
@ -376,8 +367,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
"<caption><span>Methods in <a href=\"../"
+ "package-summary.html\">pkg2</a> with type parameters of "
+ "type <a href=\"../ParamTest2.html\" title=\"class "
+ "in pkg2\">ParamTest2</a></span><span class=\"tab-end\">"
+ "&nbsp;</span></caption>",
+ "in pkg2\">ParamTest2</a></span></caption>",
"<th class=\"col-second\" scope=\"row\"><span class=\"type-name-label\">ClassUseTest3"
+ ".</span><code><span class=\"member-name-link\"><a href=\"../ClassUseTest3."
+ "html#method(T)\">method</a></span>&#8203;(T&nbsp;t)</code></th>",
@ -395,8 +385,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
"<caption><span>Classes in <a href=\"../"
+ "package-summary.html\">pkg2</a> with type parameters of "
+ "type <a href=\"../Foo4.html\" title=\"class in "
+ "pkg2\">Foo4</a></span><span class=\"tab-end\">&nbsp;"
+ "</span></caption>",
+ "pkg2\">Foo4</a></span></caption>",
"<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\"><a href=\"../ClassUseTest3.html\" "
+ "title=\"class in pkg2\">ClassUseTest3</a>&lt;T extends "
+ "<a href=\"../ParamTest2.html\" title=\"class in pkg2\">"
@ -406,7 +395,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
"<caption><span>Methods in <a href=\"../"
+ "package-summary.html\">pkg2</a> with type parameters of "
+ "type <a href=\"../Foo4.html\" title=\"class in "
+ "pkg2\">Foo4</a></span><span class=\"tab-end\">&nbsp;</span></caption>",
+ "pkg2\">Foo4</a></span></caption>",
"<th class=\"col-second\" scope=\"row\"><span class=\"type-name-label\">ClassUseTest3."
+ "</span><code><span class=\"member-name-link\"><a href=\"../ClassUseTest3."
+ "html#method(T)\">method</a></span>&#8203;(T&nbsp;t)</code>"
@ -414,8 +403,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
"<caption><span>Methods in <a href=\"../"
+ "package-summary.html\">pkg2</a> that return types with "
+ "arguments of type <a href=\"../Foo4.html\" "
+ "title=\"class in pkg2\">Foo4</a></span><span class=\""
+ "tab-end\">&nbsp;</span></caption>",
+ "title=\"class in pkg2\">Foo4</a></span></caption>",
"<td class=\"col-first\"><code>&lt;T extends <a href=\"../"
+ "ParamTest2.html\" title=\"class in pkg2\">"
+ "ParamTest2</a>&lt;java.util.List&lt;? extends <a href=\".."
@ -431,8 +419,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
"<caption><span>Method parameters in <a href=\"../"
+ "package-summary.html\">pkg2</a> with type arguments of "
+ "type <a href=\"../Foo4.html\" title=\"class in "
+ "pkg2\">Foo4</a></span><span class=\"tab-end\">&nbsp;"
+ "</span></caption>\n"
+ "pkg2\">Foo4</a></span></caption>\n"
+ "<thead>\n"
+ "<tr>\n"
+ "<th class=\"col-first\" scope=\"col\">Modifier and Type</th>\n"
@ -451,8 +438,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
"<caption><span>Constructor parameters in <a href=\"../"
+ "package-summary.html\">pkg2</a> with type arguments "
+ "of type <a href=\"../Foo4.html\" title=\"class in "
+ "pkg2\">Foo4</a></span><span class=\"tab-end\">&nbsp;"
+ "</span></caption>"
+ "pkg2\">Foo4</a></span></caption>"
);
//=================================
@ -582,38 +568,31 @@ public class TestNewLanguageFeatures extends JavadocTester {
checkOutput("pkg/class-use/AnnotationType.html", true,
"<caption><span>Packages with annotations of type <a href=\""
+ "../AnnotationType.html\" title=\"annotation in pkg\">"
+ "AnnotationType</a></span><span class=\"tab-end\">&nbsp;"
+ "</span></caption>",
+ "AnnotationType</a></span></caption>",
"<caption><span>Classes in <a href=\"../"
+ "package-summary.html\">pkg</a> with annotations of type "
+ "<a href=\"../AnnotationType.html\" title=\""
+ "annotation in pkg\">AnnotationType</a></span><span class"
+ "=\"tab-end\">&nbsp;</span></caption>",
+ "annotation in pkg\">AnnotationType</a></span></caption>",
"<caption><span>Fields in <a href=\"../"
+ "package-summary.html\">pkg</a> with annotations of type "
+ "<a href=\"../AnnotationType.html\" title=\"annotation "
+ "in pkg\">AnnotationType</a></span><span class=\"tab-end\">"
+ "&nbsp;</span></caption>",
+ "in pkg\">AnnotationType</a></span></caption>",
"<caption><span>Methods in <a href=\"../"
+ "package-summary.html\">pkg</a> with annotations of type "
+ "<a href=\"../AnnotationType.html\" title=\"annotation "
+ "in pkg\">AnnotationType</a></span><span class=\"tab-end\">"
+ "&nbsp;</span></caption>",
+ "in pkg\">AnnotationType</a></span></caption>",
"<caption><span>Method parameters in <a href=\"../"
+ "package-summary.html\">pkg</a> with annotations of type "
+ "<a href=\"../AnnotationType.html\" title=\"annotation "
+ "in pkg\">AnnotationType</a></span><span class=\"tab-end\">"
+ "&nbsp;</span></caption>",
+ "in pkg\">AnnotationType</a></span></caption>",
"<caption><span>Constructors in <a href=\"../"
+ "package-summary.html\">pkg</a> with annotations of type "
+ "<a href=\"../AnnotationType.html\" title=\"annotation "
+ "in pkg\">AnnotationType</a></span><span class=\"tab-end\">"
+ "&nbsp;</span></caption>",
+ "in pkg\">AnnotationType</a></span></caption>",
"<caption><span>Constructor parameters in <a href=\"../"
+ "package-summary.html\">pkg</a> with annotations of "
+ "type <a href=\"../AnnotationType.html\" title=\""
+ "annotation in pkg\">AnnotationType</a></span><span class=\""
+ "tab-end\">&nbsp;</span></caption>"
+ "annotation in pkg\">AnnotationType</a></span></caption>"
);
//==============================================================

2
test/langtools/jdk/javadoc/doclet/testOverriddenMethods/TestOverrideMethods.java

@ -260,7 +260,7 @@ public class TestOverrideMethods extends JavadocTester {
// Check methods with covariant return types
// Only m2 should be shown in summary; m1 and m3 should listed as declared in Base
checkOutput("pkg6/Sub.html", true,
"<table aria-labelledby=\"t0\">\n"
"<table class=\"summary-table\" aria-labelledby=\"t0\">\n"
+ "<thead>\n"
+ "<tr>\n"
+ "<th class=\"col-first\" scope=\"col\">Modifier and Type</th>\n"

8
test/langtools/jdk/javadoc/doclet/testPackagePage/TestPackagePage.java

@ -84,8 +84,8 @@ public class TestPackagePage extends JavadocTester {
checkOutput("help-doc.html", true,
"<li>Package</li>");
checkOutput("allclasses-index.html", true,
"<div class=\"type-summary\">\n<table>\n"
+ "<caption><span>Class Summary</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
"<div class=\"type-summary\" id=\"all-classes-table\">\n<table class=\"summary-table\">\n"
+ "<caption><span>Class Summary</span></caption>\n"
+ "<thead>\n"
+ "<tr>\n"
+ "<th class=\"col-first\" scope=\"col\">Class</th>\n"
@ -93,8 +93,8 @@ public class TestPackagePage extends JavadocTester {
+ "</tr>\n"
+ "</thead>\n");
checkOutput("allpackages-index.html", true,
"<div class=\"packages-summary\">\n<table>\n"
+ "<caption><span>Package Summary</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
"<div class=\"packages-summary\">\n<table class=\"summary-table\">\n"
+ "<caption><span>Package Summary</span></caption>\n"
+ "<thead>\n"
+ "<tr>\n"
+ "<th class=\"col-first\" scope=\"col\">Package</th>\n"

26
test/langtools/jdk/javadoc/doclet/testSearch/TestSearch.java

@ -687,27 +687,27 @@ public class TestSearch extends JavadocTester {
void checkAllPkgsAllClasses() {
checkOutput("allclasses-index.html", true,
"<div class=\"type-summary\">\n"
+ "<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
+ " aria-selected=\"true\" aria-controls=\"type-summary_tabpanel\" tabindex=\"0\""
"<div class=\"type-summary\" id=\"all-classes-table\">\n"
+ "<div class=\"table-tabs\" role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
+ " aria-selected=\"true\" aria-controls=\"all-classes-table.tabpanel\" tabindex=\"0\""
+ " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"active-table-tab\">All Classes</button>"
+ "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"type-summary_tabpanel\""
+ "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"all-classes-table.tabpanel\""
+ " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t1\" class=\"table-tab\""
+ " onclick=\"show(1);\">Interface Summary</button><button role=\"tab\" aria-selected=\"false\""
+ " aria-controls=\"type-summary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
+ " aria-controls=\"all-classes-table.tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
+ " id=\"t2\" class=\"table-tab\" onclick=\"show(2);\">Class Summary</button><button role=\"tab\""
+ " aria-selected=\"false\" aria-controls=\"type-summary_tabpanel\" tabindex=\"-1\""
+ " aria-selected=\"false\" aria-controls=\"all-classes-table.tabpanel\" tabindex=\"-1\""
+ " onkeydown=\"switchTab(event)\" id=\"t3\" class=\"table-tab\" onclick=\"show(4);\">"
+ "Enum Summary</button><button role=\"tab\" aria-selected=\"false\""
+ " aria-controls=\"type-summary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
+ " aria-controls=\"all-classes-table.tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
+ " id=\"t4\" class=\"table-tab\" onclick=\"show(8);\">Exception Summary</button><button role=\"tab\""
+ " aria-selected=\"false\" aria-controls=\"type-summary_tabpanel\" tabindex=\"-1\""
+ " aria-selected=\"false\" aria-controls=\"all-classes-table.tabpanel\" tabindex=\"-1\""
+ " onkeydown=\"switchTab(event)\" id=\"t5\" class=\"table-tab\" onclick=\"show(16);\">"
+ "Error Summary</button><button role=\"tab\" aria-selected=\"false\""
+ " aria-controls=\"type-summary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
+ " aria-controls=\"all-classes-table.tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
+ " id=\"t6\" class=\"table-tab\" onclick=\"show(32);\">Annotation Types Summary</button></div>\n"
+ "<div id=\"type-summary_tabpanel\" role=\"tabpanel\">\n"
+ "<table aria-labelledby=\"t0\">\n"
+ "<div id=\"all-classes-table.tabpanel\" role=\"tabpanel\">\n"
+ "<table class=\"summary-table\" aria-labelledby=\"t0\">\n"
+ "<thead>\n"
+ "<tr>\n"
+ "<th class=\"col-first\" scope=\"col\">Class</th>\n"
@ -716,8 +716,8 @@ public class TestSearch extends JavadocTester {
"var data = {\"i0\":32,\"i1\":2,\"i2\":4,\"i3\":2,\"i4\":2,\"i5\":1,\"i6\":2,\"i7\":32,"
+ "\"i8\":2,\"i9\":4,\"i10\":16,\"i11\":16,\"i12\":8,\"i13\":8,\"i14\":1,\"i15\":2};");
checkOutput("allpackages-index.html", true,
"<div class=\"packages-summary\">\n<table>\n"
+ "<caption><span>Package Summary</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
"<div class=\"packages-summary\">\n<table class=\"summary-table\">\n"
+ "<caption><span>Package Summary</span></caption>\n"
+ "<thead>\n"
+ "<tr>\n"
+ "<th class=\"col-first\" scope=\"col\">Package</th>\n"

13
test/langtools/jdk/javadoc/doclet/testStylesheet/TestStylesheet.java

@ -118,21 +118,18 @@ public class TestStylesheet extends JavadocTester {
+ " border: none;\n"
+ " height:16px;\n"
+ "}",
".overview-summary [role=tablist] button, .member-summary [role=tablist] button,\n"
+ ".type-summary [role=tablist] button, .packages-summary [role=tablist] button {\n"
"div.table-tabs > button {\n"
+ " border: none;\n"
+ " cursor: pointer;\n"
+ " padding: 5px 12px 7px 12px;\n"
+ " font-weight: bold;\n"
+ " margin-right: 3px;\n"
+ "}",
".overview-summary [role=tablist] .active-table-tab, .member-summary [role=tablist] .active-table-tab,\n"
+ ".type-summary [role=tablist] .active-table-tab, .packages-summary [role=tablist] .active-table-tab {\n"
+ "}\n"
+ "div.table-tabs > button.active-table-tab {\n"
+ " background: #F8981D;\n"
+ " color: #253441;\n"
+ "}",
".overview-summary [role=tablist] .table-tab, .member-summary [role=tablist] .table-tab,\n"
+ ".type-summary [role=tablist] .table-tab, .packages-summary [role=tablist] .table-tab {\n"
+ "}\n"
+ "div.table-tabs > button.table-tab {\n"
+ " background: #4D7A97;\n"
+ " color: #FFFFFF;\n"
+ "}",

4
test/langtools/jdk/javadoc/doclet/testSystemPropertyPage/TestSystemPropertyPage.java

@ -74,8 +74,8 @@ public class TestSystemPropertyPage extends JavadocTester {
"<h1>System Properties</h1>\n" +
"</div>",
"<table>\n" +
"<caption><span>System Properties Summary</span><span class=\"tab-end\">&nbsp;</span></caption>\n" +
"<table class=\"summary-table\">\n" +
"<caption><span>System Properties Summary</span></caption>\n" +
"<thead>\n" +
"<tr>\n" +
"<th class=\"col-first\" scope=\"col\">Property</th>\n" +

8
test/langtools/jdk/javadoc/doclet/testUnnamedPackage/TestUnnamedPackage.java

@ -66,8 +66,8 @@ public class TestUnnamedPackage extends JavadocTester {
"<a href=\"package-summary.html\">");
checkOutput("allclasses-index.html", true,
"<div class=\"type-summary\">\n<table>\n"
+ "<caption><span>Class Summary</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
"<div class=\"type-summary\" id=\"all-classes-table\">\n<table class=\"summary-table\">\n"
+ "<caption><span>Class Summary</span></caption>\n"
+ "<thead>\n"
+ "<tr>\n"
+ "<th class=\"col-first\" scope=\"col\">Class</th>\n"
@ -85,8 +85,8 @@ public class TestUnnamedPackage extends JavadocTester {
+ "</table>");
checkOutput("allpackages-index.html", true,
"<div class=\"packages-summary\">\n<table>\n"
+ "<caption><span>Package Summary</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
"<div class=\"packages-summary\">\n<table class=\"summary-table\">\n"
+ "<caption><span>Package Summary</span></caption>\n"
+ "<thead>\n"
+ "<tr>\n"
+ "<th class=\"col-first\" scope=\"col\">Package</th>\n"