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

8239817: Eliminate use of contentContainer and friends

Browse Source 
Reviewed-by: hannesw
This commit is contained in:
Jonathan Gibbons 2020-03-04 12:58:13 -08:00
parent 01ef6d791f
commit edb59b58b9
28 changed files with 95 additions and 158 deletions

5
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractOverviewIndexWriter.java

@ -97,10 +97,7 @@ public abstract class AbstractOverviewIndexWriter extends HtmlDocletWriter {
protected void addOverviewHeader(Content main) {
addConfigurationTitle(main);
if (!utils.getFullBody(configuration.overviewElement).isEmpty()) {
HtmlTree div = new HtmlTree(HtmlTag.DIV);
div.setStyle(HtmlStyle.contentContainer);
addOverviewComment(div);
main.add(div);
addOverviewComment(main);
}
}

10
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractTreeWriter.java

@ -103,14 +103,14 @@ public abstract class AbstractTreeWriter extends HtmlDocletWriter {
* @param sset classes which are at the most base level, all the
* other classes in this run will derive from these classes
* @param heading heading for the tree
* @param div the content tree to which the tree will be added
* @param content the content tree to which the tree will be added
*/
protected void addTree(SortedSet<TypeElement> sset, String heading, HtmlTree div) {
addTree(sset, heading, div, false);
protected void addTree(SortedSet<TypeElement> sset, String heading, Content content) {
addTree(sset, heading, content, false);
}
protected void addTree(SortedSet<TypeElement> sset, String heading,
HtmlTree div, boolean isEnums) {
Content content, boolean isEnums) {
if (!sset.isEmpty()) {
TypeElement firstTypeElement = sset.first();
Content headingContent = contents.getContent(heading);
@ -119,7 +119,7 @@ public abstract class AbstractTreeWriter extends HtmlDocletWriter {
HtmlTree htmlTree = HtmlTree.SECTION(HtmlStyle.hierarchy, sectionHeading);
addLevelInfo(!utils.isInterface(firstTypeElement) ? firstTypeElement : null,
sset, isEnums, htmlTree);
div.add(htmlTree);
content.add(htmlTree);
}
}

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

@ -149,9 +149,7 @@ public class AllClassesIndexWriter extends HtmlDocletWriter {
Content headerDiv = HtmlTree.DIV(HtmlStyle.header, pHeading);
content.add(headerDiv);
if (!table.isEmpty()) {
HtmlTree div = new HtmlTree(HtmlTag.DIV, table.toContent());
div.setStyle(HtmlStyle.allClassesContainer);
content.add(div);
content.add(table.toContent());
if (table.needsScript()) {
getMainBodyScript().append(table.getScript());
}

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

@ -81,9 +81,8 @@ public class AllPackagesIndexWriter extends HtmlDocletWriter {
addTop(headerContent);
navBar.setUserHeader(getUserHeaderFooter(true));
headerContent.add(navBar.getContent(true));
HtmlTree div = new HtmlTree(HtmlTag.DIV);
div.setStyle(HtmlStyle.allPackagesContainer);
addPackages(div);
Content mainContent = new ContentBuilder();
addPackages(mainContent);
Content titleContent = contents.allPackagesLabel;
Content pHeading = HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING, true,
HtmlStyle.title, titleContent);
@ -96,7 +95,7 @@ public class AllPackagesIndexWriter extends HtmlDocletWriter {
bodyTree.add(new BodyContents()
.setHeader(headerContent)
.addMainContent(headerDiv)
.addMainContent(div)
.addMainContent(mainContent)
.setFooter(footer)
.toContent());
printHtmlDocument(null, "package index", bodyTree);

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

@ -219,15 +219,14 @@ public class ClassUseWriter extends SubWriterHolderWriter {
*/
protected void generateClassUseFile() throws DocFileIOException {
HtmlTree body = getClassUseHeader();
HtmlTree div = new HtmlTree(HtmlTag.DIV);
div.setStyle(HtmlStyle.classUseContainer);
Content mainContent = new ContentBuilder();
if (pkgSet.size() > 0) {
addClassUse(div);
addClassUse(mainContent);
} else {
div.add(contents.getContent("doclet.ClassUse_No.usage.of.0",
mainContent.add(contents.getContent("doclet.ClassUse_No.usage.of.0",
utils.getFullyQualifiedName(typeElement)));
}
bodyContents.addMainContent(div);
bodyContents.addMainContent(mainContent);
HtmlTree footer = HtmlTree.FOOTER();
navBar.setUserFooter(getUserHeaderFooter(false));
footer.add(navBar.getContent(false));

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

@ -149,9 +149,7 @@ public class ConstantsSummaryWriterImpl extends HtmlDocletWriter implements Cons
@Override
public Content getConstantSummaries() {
HtmlTree summariesDiv = new HtmlTree(HtmlTag.DIV);
summariesDiv.setStyle(HtmlStyle.constantValuesContainer);
return summariesDiv;
return new ContentBuilder();
}
@Override

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

@ -283,8 +283,7 @@ public class DeprecatedListWriter extends SubWriterHolderWriter {
HtmlTree body = getHeader();
bodyContents.addMainContent(getContentsList(deprapi));
String memberTableSummary;
HtmlTree div = new HtmlTree(HtmlTag.DIV);
div.setStyle(HtmlStyle.contentContainer);
Content content = new ContentBuilder();
for (DeprElementKind kind : DeprElementKind.values()) {
if (deprapi.hasDocumentation(kind)) {
memberTableSummary = resources.getText("doclet.Member_Table_Summary",
@ -293,10 +292,10 @@ public class DeprecatedListWriter extends SubWriterHolderWriter {
TableHeader memberTableHeader = new TableHeader(
contents.getContent(getHeaderKey(kind)), contents.descriptionLabel);
addDeprecatedAPI(deprapi.getSet(kind), getAnchorName(kind),
getHeadingKey(kind), memberTableSummary, memberTableHeader, div);
getHeadingKey(kind), memberTableSummary, memberTableHeader, content);
}
}
bodyContents.addMainContent(div);
bodyContents.addMainContent(content);
HtmlTree htmlTree = HtmlTree.FOOTER();
navBar.setUserFooter(getUserHeaderFooter(false));
htmlTree.add(navBar.getContent(false));

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

@ -208,7 +208,7 @@ public class DocFilesHandlerImpl implements DocFilesHandler {
docletWriter.addBottom(footer);
htmlContent.add(new BodyContents()
.setHeader(headerContent)
.addMainContent(HtmlTree.DIV(HtmlStyle.contentContainer, pageContent))
.addMainContent(pageContent)
.setFooter(footer)
.toContent());
docletWriter.printHtmlDocument(Collections.emptyList(), null, localTagsContent, Collections.emptyList(), htmlContent);

10
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HelpWriter.java

@ -346,11 +346,9 @@ public class HelpWriter extends HtmlDocletWriter {
htmlTree.add(searchRefer);
ul.add(HtmlTree.LI(HtmlStyle.blockList, htmlTree));
Content divContent = HtmlTree.DIV(HtmlStyle.contentContainer, ul);
divContent.add(new HtmlTree(HtmlTag.HR));
Content footnote = HtmlTree.SPAN(HtmlStyle.emphasizedPhrase,
contents.getContent("doclet.help.footnote"));
divContent.add(footnote);
contentTree.add(divContent);
contentTree.add(ul);
contentTree.add(new HtmlTree(HtmlTag.HR));
contentTree.add(HtmlTree.SPAN(HtmlStyle.emphasizedPhrase,
contents.getContent("doclet.help.footnote")));
}
}

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

@ -117,8 +117,7 @@ public class ModuleIndexWriter extends AbstractOverviewIndexWriter {
}
}
Content div = HtmlTree.DIV(HtmlStyle.contentContainer, table.toContent());
main.add(div);
main.add(table.toContent());
if (table.needsScript()) {
mainBodyScript.append(table.getScript());

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

@ -218,9 +218,7 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW
*/
@Override
public Content getContentHeader() {
HtmlTree div = new HtmlTree(HtmlTag.DIV);
div.setStyle(HtmlStyle.contentContainer);
return div;
return new ContentBuilder();
}
/**

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

@ -118,8 +118,7 @@ public class PackageIndexWriter extends AbstractOverviewIndexWriter {
}
}
Content div = HtmlTree.DIV(HtmlStyle.contentContainer, table.toContent());
main.add(div);
main.add(table.toContent());
if (table.needsScript()) {
getMainBodyScript().append(table.getScript());

13
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageTreeWriter.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -108,13 +108,10 @@ public class PackageTreeWriter extends AbstractTreeWriter {
addLinkToMainTree(div);
}
mainContent.add(div);
HtmlTree divTree = new HtmlTree(HtmlTag.DIV);
divTree.setStyle(HtmlStyle.contentContainer);
addTree(classtree.baseClasses(), "doclet.Class_Hierarchy", divTree);
addTree(classtree.baseInterfaces(), "doclet.Interface_Hierarchy", divTree);
addTree(classtree.baseAnnotationTypes(), "doclet.Annotation_Type_Hierarchy", divTree);
addTree(classtree.baseEnums(), "doclet.Enum_Hierarchy", divTree, true);
mainContent.add(divTree);
addTree(classtree.baseClasses(), "doclet.Class_Hierarchy", mainContent);
addTree(classtree.baseInterfaces(), "doclet.Interface_Hierarchy", mainContent);
addTree(classtree.baseAnnotationTypes(), "doclet.Annotation_Type_Hierarchy", mainContent);
addTree(classtree.baseEnums(), "doclet.Enum_Hierarchy", mainContent, true);
bodyContents.addMainContent(mainContent);
HtmlTree footer = HtmlTree.FOOTER();
navBar.setUserFooter(getUserHeaderFooter(false));

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

@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -125,14 +125,13 @@ public class PackageUseWriter extends SubWriterHolderWriter {
*/
protected void generatePackageUseFile() throws DocFileIOException {
HtmlTree body = getPackageUseHeader();
HtmlTree div = new HtmlTree(HtmlTag.DIV);
div.setStyle(HtmlStyle.contentContainer);
Content mainContent = new ContentBuilder();
if (usingPackageToUsedClasses.isEmpty()) {
div.add(contents.getContent("doclet.ClassUse_No.usage.of.0", utils.getPackageName(packageElement)));
mainContent.add(contents.getContent("doclet.ClassUse_No.usage.of.0", utils.getPackageName(packageElement)));
} else {
addPackageUse(div);
addPackageUse(mainContent);
}
bodyContents.addMainContent(div);
bodyContents.addMainContent(mainContent);
HtmlTree footer = HtmlTree.FOOTER();
navBar.setUserFooter(getUserHeaderFooter(false));
footer.add(navBar.getContent(false));

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

@ -134,9 +134,7 @@ public class PackageWriterImpl extends HtmlDocletWriter
@Override
public Content getContentHeader() {
HtmlTree div = new HtmlTree(HtmlTag.DIV);
div.setStyle(HtmlStyle.contentContainer);
return div;
return new ContentBuilder();
}
/**

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

@ -225,9 +225,7 @@ public class SerializedFormWriterImpl extends SubWriterHolderWriter
*/
@Override
public void addSerializedContent(Content serializedTreeContent) {
HtmlTree divContent = HtmlTree.DIV(HtmlStyle.serializedFormContainer,
serializedTreeContent);
bodyContents.addMainContent(divContent);
bodyContents.addMainContent(serializedTreeContent);
}
@Override

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

@ -99,22 +99,21 @@ public class SingleIndexWriter extends AbstractIndexWriter {
addTop(headerContent);
navBar.setUserHeader(getUserHeaderFooter(true));
headerContent.add(navBar.getContent(true));
HtmlTree divTree = new HtmlTree(HtmlTag.DIV);
divTree.setStyle(HtmlStyle.contentContainer);
Content mainContent = new ContentBuilder();
elements = new TreeSet<>(indexBuilder.asMap().keySet());
elements.addAll(tagSearchIndexMap.keySet());
addLinksForIndexes(divTree);
addLinksForIndexes(mainContent);
for (Character unicode : elements) {
if (tagSearchIndexMap.get(unicode) == null) {
addContents(unicode, indexBuilder.getMemberList(unicode), divTree);
addContents(unicode, indexBuilder.getMemberList(unicode), mainContent);
} else if (indexBuilder.getMemberList(unicode) == null) {
addSearchContents(unicode, tagSearchIndexMap.get(unicode), divTree);
addSearchContents(unicode, tagSearchIndexMap.get(unicode), mainContent);
} else {
addContents(unicode, indexBuilder.getMemberList(unicode),
tagSearchIndexMap.get(unicode), divTree);
tagSearchIndexMap.get(unicode), mainContent);
}
}
addLinksForIndexes(divTree);
addLinksForIndexes(mainContent);
HtmlTree footer = HtmlTree.FOOTER();
navBar.setUserFooter(getUserHeaderFooter(false));
footer.add(navBar.getContent(false));
@ -124,7 +123,7 @@ public class SingleIndexWriter extends AbstractIndexWriter {
.addMainContent(HtmlTree.DIV(HtmlStyle.header,
HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING,
contents.getContent("doclet.Index"))))
.addMainContent(divTree)
.addMainContent(mainContent)
.setFooter(footer)
.toContent());
createSearchIndexFiles();

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

@ -130,19 +130,18 @@ public class SplitIndexWriter extends AbstractIndexWriter {
main.add(HtmlTree.DIV(HtmlStyle.header,
HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING,
contents.getContent("doclet.Index"))));
HtmlTree divTree = new HtmlTree(HtmlTag.DIV);
divTree.setStyle(HtmlStyle.contentContainer);
addLinksForIndexes(divTree);
Content mainContent = new ContentBuilder();
addLinksForIndexes(mainContent);
if (tagSearchIndexMap.get(unicode) == null) {
addContents(unicode, indexBuilder.getMemberList(unicode), divTree);
addContents(unicode, indexBuilder.getMemberList(unicode), mainContent);
} else if (indexBuilder.getMemberList(unicode) == null) {
addSearchContents(unicode, tagSearchIndexMap.get(unicode), divTree);
addSearchContents(unicode, tagSearchIndexMap.get(unicode), mainContent);
} else {
addContents(unicode, indexBuilder.getMemberList(unicode),
tagSearchIndexMap.get(unicode), divTree);
tagSearchIndexMap.get(unicode), mainContent);
}
addLinksForIndexes(divTree);
main.add(divTree);
addLinksForIndexes(mainContent);
main.add(mainContent);
HtmlTree footer = HtmlTree.FOOTER();
navBar.setUserFooter(getUserHeaderFooter(false));
footer.add(navBar.getContent(false));

5
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SubWriterHolderWriter.java

@ -32,6 +32,7 @@ import javax.lang.model.element.TypeElement;
import com.sun.source.doctree.DocTree;
import jdk.javadoc.internal.doclets.formats.html.markup.BodyContents;
import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
@ -179,9 +180,7 @@ public abstract class SubWriterHolderWriter extends HtmlDocletWriter {
* @return a content tree the document content header
*/
public Content getContentHeader() {
HtmlTree div = new HtmlTree(HtmlTag.DIV);
div.setStyle(HtmlStyle.contentContainer);
return div;
return new ContentBuilder();
}
/**

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

@ -98,15 +98,14 @@ public class SystemPropertiesWriter extends HtmlDocletWriter {
navBar.setUserHeader(getUserHeaderFooter(true));
header.add(navBar.getContent(true));
bodyTree.add(header);
HtmlTree div = new HtmlTree(HtmlTag.DIV);
div.setStyle(HtmlStyle.systemPropertiesContainer);
addSystemProperties(div);
Content mainContent = new ContentBuilder();
addSystemProperties(mainContent);
Content titleContent = new StringContent(resources.getText("doclet.systemProperties"));
Content pHeading = HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING, true,
HtmlStyle.title, titleContent);
Content headerDiv = HtmlTree.DIV(HtmlStyle.header, pHeading);
mainTree.add(headerDiv);
mainTree.add(div);
mainTree.add(mainContent);
bodyTree.add(mainTree);
Content footer = HtmlTree.FOOTER();
navBar.setUserFooter(getUserHeaderFooter(false));

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

@ -115,13 +115,10 @@ public class TreeWriter extends AbstractTreeWriter {
addPackageTreeLinks(div);
Content mainContent = new ContentBuilder();
mainContent.add(div);
HtmlTree divTree = new HtmlTree(HtmlTag.DIV);
divTree.setStyle(HtmlStyle.contentContainer);
addTree(classtree.baseClasses(), "doclet.Class_Hierarchy", divTree);
addTree(classtree.baseInterfaces(), "doclet.Interface_Hierarchy", divTree);
addTree(classtree.baseAnnotationTypes(), "doclet.Annotation_Type_Hierarchy", divTree);
addTree(classtree.baseEnums(), "doclet.Enum_Hierarchy", divTree, true);
mainContent.add(divTree);
addTree(classtree.baseClasses(), "doclet.Class_Hierarchy", mainContent);
addTree(classtree.baseInterfaces(), "doclet.Interface_Hierarchy", mainContent);
addTree(classtree.baseAnnotationTypes(), "doclet.Annotation_Type_Hierarchy", mainContent);
addTree(classtree.baseEnums(), "doclet.Enum_Hierarchy", mainContent, true);
HtmlTree footerTree = HtmlTree.FOOTER();
navBar.setUserFooter(getUserHeaderFooter(false));
footerTree.add(navBar.getContent(false));

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

@ -36,8 +36,6 @@ package jdk.javadoc.internal.doclets.formats.html.markup;
public enum HtmlStyle {
aboutLanguage,
activeTableTab,
allClassesContainer,
allPackagesContainer,
altColor,
annotations,
arguments,
@ -45,7 +43,6 @@ public enum HtmlStyle {
blockList,
bottomNav,
circle,
classUseContainer,
classUses,
colConstructorName,
colDeprecatedItemName,
@ -56,8 +53,6 @@ public enum HtmlStyle {
constructorDetails,
constructorSummary,
constantDetails,
constantValuesContainer,
contentContainer,
deprecatedLabel,
deprecatedSummary,
deprecationBlock,
@ -102,7 +97,6 @@ public enum HtmlStyle {
navBarCell1Rev,
navList,
navListSearch,
navPadding,
nestedClassSummary,
notes,
overviewSummary,
@ -120,7 +114,6 @@ public enum HtmlStyle {
rowColor,
searchTagLink,
searchTagResult,
serializedFormContainer,
serializedPackageContainer,
serializedClassDetails,
servicesSummary,
@ -131,11 +124,9 @@ public enum HtmlStyle {
subNavList,
subTitle,
summary,
systemPropertiesContainer,
systemPropertiesSummary,
tabEnd,
tableTab,
throwsLabel,
title,
topNav,
typeNameLabel,

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

@ -239,11 +239,6 @@ ul.subNavList li {
/*
* Styles for page header and footer.
*/
.header {
clear:both;
margin:0 20px;
padding:5px 0 0 0;
}
.title {
color:#2c4557;
margin:10px 0;
@ -281,30 +276,29 @@ body.class-declaration .summary .inheritedList h2 {
/*
* Styles for page layout containers.
*/
.contentContainer, .sourceContainer, .classUseContainer, .serializedFormContainer, .constantValuesContainer,
.allClassesContainer, .allPackagesContainer, .systemPropertiesContainer {
main {
clear:both;
padding:10px 20px;
position:relative;
}
.contentContainer .description dl dt, .contentContainer .details dl dt, .serializedFormContainer dl dt {
dl.notes > dt {
font-size:12px;
font-weight:bold;
margin:10px 0 0 0;
color:#4E4E4E;
}
.contentContainer .description dl dd, .contentContainer .details dl dd, .serializedFormContainer dl dd {
dl.notes > dd {
margin:5px 0 10px 0px;
font-size:14px;
font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif;
}
.serializedFormContainer dl.nameValue dt {
dl.nameValue > dt {
margin-left:1px;
font-size:1.1em;
display:inline;
font-weight:bold;
}
.serializedFormContainer dl.nameValue dd {
dl.nameValue > dd {
margin:0 0 0 1px;
font-size:1.1em;
display:inline;
@ -562,9 +556,6 @@ h1.hidden {
margin:0 10px 5px 0;
color:#474747;
}
dl.notes > dt {
font-weight:bold;
}
.deprecatedLabel, .descfrmTypeLabel, .implementationLabel, .memberNameLabel, .memberNameLink,
.moduleLabelInPackage, .moduleLabelInType, .overrideSpecifyLabel, .packageLabelInType,
.packageHierarchyLabel, .typeNameLabel, .typeNameLink, .searchTagLink {

8
test/langtools/jdk/javadoc/doclet/testHtmlLandmarkRegions/TestHtmlLandmarkRegions.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -23,7 +23,7 @@
/*
* @test
* @bug 8210047 8199892 8215599 8223378
* @bug 8210047 8199892 8215599 8223378 8239817
* @summary some pages contains content outside of landmark region
* @library /tools/lib ../../lib
* @modules
@ -132,8 +132,8 @@ public class TestHtmlLandmarkRegions extends JavadocTester {
checkOrder("pkg1/doc-files/s.html",
"<header role=\"banner\" class=\"flexHeader\">\n"
+ "<nav role=\"navigation\">\n",
"<main role=\"main\">\n"
+ "<div class=\"contentContainer\">A sample doc file",
"<main role=\"main\">"
+ "A sample doc file",
"<footer role=\"contentinfo\">\n"
+ "<nav role=\"navigation\">"
);

3
test/langtools/jdk/javadoc/doclet/testHtmlTag/TestHtmlTag.java

@ -107,8 +107,7 @@ public class TestHtmlTag extends JavadocTester {
checkExit(Exit.OK);
checkOutput("pkg3/package-summary.html", true,
"<div class=\"contentContainer\">\n"
+ "<section class=\"packageDescription\" id=\"package.description\">\n"
"<section class=\"packageDescription\" id=\"package.description\">\n"
+ "<div class=\"block\"><p>This is the first line. Note the newlines before the &lt;p&gt; is relevant.</div>\n"
+ "</section>");

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

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -100,8 +100,7 @@ public class TestHtmlVersion extends JavadocTester {
+ "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
// No package description
checkOutput("pkg1/package-summary.html", true,
"<div class=\"contentContainer\">\n"
+ "<section class=\"summary\">\n"
"<section class=\"summary\">\n"
+ "<ul class=\"blockList\">\n"
+ "<li class=\"blockList\">\n"
+ "<div class=\"typeSummary\">\n<table>\n"

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

@ -472,20 +472,16 @@ public class TestModules extends JavadocTester {
+ "word <span id=\"search_word\" class=\"searchTagResult\">search_word</span> with no description.</div>");
checkOutput("index.html", found,
"</script>\n"
+ "<div class=\"contentContainer\">\n"
+ "<div class=\"block\">The overview summary page header.</div>\n"
+ "</div>\n"
+ "<div class=\"contentContainer\">\n"
+ "<div class=\"overviewSummary\">\n"
+ "<table summary=\"Module Summary table, listing modules, and an explanation\">\n"
+ "<caption><span>Modules</span><span class=\"tabEnd\">&nbsp;</span></caption>");
checkOutput("index.html", false,
"</table>\n"
+ "</div>\n"
+ "<div class=\"contentContainer\">\n"
+ "<div class=\"block\">The overview summary page header.</div>\n"
+ "</div>\n"
+ "<div class=\"contentContainer\">\n"
+ "<div class=\"overviewSummary\">\n"
+ "<table summary=\"Module Summary table, listing modules, and an explanation\">\n"
+ "<caption><span>Modules</span><span class=\"tabEnd\">&nbsp;</span></caption>");
@ -493,15 +489,18 @@ public class TestModules extends JavadocTester {
void checkNoDescription(boolean found) {
checkOutput("moduleA/module-summary.html", found,
"<div class=\"contentContainer\">\n"
"<div class=\"header\">\n"
+ "<p>@Deprecated(forRemoval=true)\n"
+ "</p>\n"
+ "<h1 title=\"Module\" class=\"title\">Module&nbsp;moduleA</h1>\n"
+ "</div>"
+ "<ul class=\"blockList\">\n"
+ "<li class=\"blockList\">\n"
+ "<ul class=\"blockList\">\n"
+ "<li class=\"blockList\">\n"
+ "<!-- ============ PACKAGES SUMMARY =========== -->");
checkOutput("moduleB/module-summary.html", found,
"<div class=\"contentContainer\">\n"
+ "<ul class=\"blockList\">\n"
"<ul class=\"blockList\">\n"
+ "<li class=\"blockList\">\n"
+ "<ul class=\"blockList\">\n"
+ "<li class=\"blockList\">\n"
@ -528,10 +527,7 @@ public class TestModules extends JavadocTester {
+ "</header>\n"
+ "<div class=\"flexContent\">\n"
+ "<main role=\"main\">\n"
+ "<div class=\"contentContainer\">\n"
+ "<div class=\"block\">The overview summary page header.</div>\n"
+ "</div>\n"
+ "<div class=\"contentContainer\">\n"
+ "<div class=\"overviewSummary\">\n<table>\n"
+ "<caption><span>Modules</span><span class=\"tabEnd\">&nbsp;</span></caption>");
checkOutput("index.html", false,
@ -539,24 +535,31 @@ public class TestModules extends JavadocTester {
+ "</div>\n"
+ "</main>\n"
+ "<main role=\"main\">\n"
+ "<div class=\"contentContainer\">\n"
+ "<div class=\"block\">The overview summary page header.</div>\n"
+ "</div>\n"
+ "<div class=\"contentContainer\">\n"
+ "<div class=\"overviewSummary\">\n<table>\n"
+ "<caption><span>Modules</span><span class=\"tabEnd\">&nbsp;</span></caption>");
}
void checkHtml5NoDescription(boolean found) {
checkOutput("moduleA/module-summary.html", found,
"<div class=\"contentContainer\">\n"
"<div class=\"header\">\n"
+ "<p>@Deprecated(forRemoval=true)\n"
+ "</p>\n"
+ "<h1 title=\"Module\" class=\"title\">Module&nbsp;moduleA</h1>\n"
+ "</div>\n"
+ "<section class=\"summary\">\n"
+ "<ul class=\"blockList\">\n"
+ "<li class=\"blockList\">\n"
+ "<section class=\"packagesSummary\" id=\"packages.summary\">\n"
+ "<!-- ============ PACKAGES SUMMARY =========== -->");
checkOutput("moduleB/module-summary.html", found,
"<div class=\"contentContainer\">\n"
"<p><a href=\"testpkgmdlB/AnnotationType.html\" title=\"annotation in testpkgmdlB\">@AnnotationType</a>"
+ "(<a href=\"testpkgmdlB/AnnotationType.html#optional()\">optional</a>=\"Module Annotation\",\n"
+ " <a href=\"testpkgmdlB/AnnotationType.html#required()\">required</a>=2016)\n"
+ "</p>\n"
+ "<h1 title=\"Module\" class=\"title\">Module&nbsp;moduleB</h1>\n"
+ "</div>\n"
+ "<section class=\"summary\">\n"
+ "<ul class=\"blockList\">\n"
+ "<li class=\"blockList\">\n"
@ -655,10 +658,8 @@ public class TestModules extends JavadocTester {
+ "</thead>",
"</table>\n"
+ "</div>\n"
+ "<div class=\"contentContainer\">\n"
+ "<div class=\"block\">The overview summary page header.</div>\n"
+ "</div>\n"
+ "<div class=\"contentContainer\">\n"
+ "<div class=\"overviewSummary\">\n"
+ "<table summary=\"Package Summary table, listing packages, and an explanation\">\n"
+ "<caption><span>Packages</span><span class=\"tabEnd\">&nbsp;</span></caption>");
@ -673,10 +674,8 @@ public class TestModules extends JavadocTester {
+ "</tr>\n"
+ "</thead>\n",
"</script>\n"
+ "<div class=\"contentContainer\">\n"
+ "<div class=\"block\">The overview summary page header.</div>\n"
+ "</div>\n"
+ "<div class=\"contentContainer\">\n"
+ "<div class=\"overviewSummary\">\n"
+ "<table summary=\"Package Summary table, listing packages, and an explanation\">\n"
+ "<caption><span>Packages</span><span class=\"tabEnd\">&nbsp;</span></caption>");
@ -720,10 +719,9 @@ public class TestModules extends JavadocTester {
+ "</div>\n"
+ "</main>\n"
+ "<main role=\"main\">\n"
+ "<div class=\"contentContainer\">\n"
+ "<div class=\"block\">The overview summary page header.</div>\n"
+ "</div>\n"
+ "<div class=\"contentContainer\"><a id=\"Packages\">\n"
+ "<a id=\"Packages\">\n"
+ "<!-- -->\n"
+ "</a>\n"
+ "<div class=\"overviewSummary\">\n"
@ -742,10 +740,7 @@ public class TestModules extends JavadocTester {
+ "</header>\n"
+ "<div class=\"flexContent\">\n"
+ "<main role=\"main\">\n"
+ "<div class=\"contentContainer\">\n"
+ "<div class=\"block\">The overview summary page header.</div>\n"
+ "</div>\n"
+ "<div class=\"contentContainer\">\n"
+ "<div class=\"overviewSummary\">\n<table>\n"
+ "<caption><span>Packages</span><span class=\"tabEnd\">&nbsp;</span></caption>");
}
@ -1115,8 +1110,7 @@ public class TestModules extends JavadocTester {
void checkGroupOption() {
checkOutput("index.html", true,
"<div class=\"contentContainer\">\n"
+ "<div class=\"overviewSummary\">\n"
"<div class=\"overviewSummary\">\n"
+ "<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
+ " aria-selected=\"true\" aria-controls=\"overviewSummary_tabpanel\" tabindex=\"0\""
+ " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"activeTableTab\">All Modules</button>"
@ -1178,10 +1172,7 @@ public class TestModules extends JavadocTester {
void checkUnnamedModuleGroupOption() {
checkOutput("index.html", true,
"<div class=\"contentContainer\">\n"
+ "<div class=\"block\">The overview summary page header.</div>\n"
+ "</div>\n"
+ "<div class=\"contentContainer\">\n"
"<div class=\"block\">The overview summary page header.</div>\n"
+ "<div class=\"overviewSummary\">\n"
+ "<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
+ " aria-selected=\"true\" aria-controls=\"overviewSummary_tabpanel\" tabindex=\"0\""

7
test/langtools/jdk/javadoc/doclet/testOverview/TestOverview.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -71,9 +71,6 @@ public class TestOverview extends JavadocTester {
+ "<div class=\"header\">\n"
+ "<h1 class=\"title\">Document Title</h1>\n"
+ "</div>\n"
+ "<div class=\"contentContainer\">\n"
+ "<div class=\"block\">This is line1. This is line 2.</div>\n"
+ "</div>\n"
+ "<div class=\"contentContainer\">");
+ "<div class=\"block\">This is line1. This is line 2.</div>\n");
}
}