8240476: SystemPropertiesWriter does not conform to standard page layout
Reviewed-by: prappo
This commit is contained in:
parent
029fea432a
commit
32cba67284
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html
test/langtools/jdk/javadoc/doclet/testSystemPropertyPage
34
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SystemPropertiesWriter.java
34
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SystemPropertiesWriter.java
@ -25,6 +25,7 @@
|
|||||||
package jdk.javadoc.internal.doclets.formats.html;
|
package jdk.javadoc.internal.doclets.formats.html;
|
||||||
|
|
||||||
import jdk.javadoc.internal.doclets.formats.html.SearchIndexItem.Category;
|
import jdk.javadoc.internal.doclets.formats.html.SearchIndexItem.Category;
|
||||||
|
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.ContentBuilder;
|
||||||
import jdk.javadoc.internal.doclets.formats.html.markup.FixedStringContent;
|
import jdk.javadoc.internal.doclets.formats.html.markup.FixedStringContent;
|
||||||
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
|
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
|
||||||
@ -61,11 +62,6 @@ import static java.util.stream.Collectors.toList;
|
|||||||
*/
|
*/
|
||||||
public class SystemPropertiesWriter extends HtmlDocletWriter {
|
public class SystemPropertiesWriter extends HtmlDocletWriter {
|
||||||
|
|
||||||
/**
|
|
||||||
* The HTML tree for main tag.
|
|
||||||
*/
|
|
||||||
private final HtmlTree mainTree = HtmlTree.MAIN();
|
|
||||||
|
|
||||||
private final Navigation navBar;
|
private final Navigation navBar;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -108,28 +104,26 @@ public class SystemPropertiesWriter extends HtmlDocletWriter {
|
|||||||
* Prints all the system properties to the file.
|
* Prints all the system properties to the file.
|
||||||
*/
|
*/
|
||||||
protected void buildSystemPropertiesPage() throws DocFileIOException {
|
protected void buildSystemPropertiesPage() throws DocFileIOException {
|
||||||
String label = resources.getText("doclet.systemProperties");
|
String title = resources.getText("doclet.systemProperties");
|
||||||
HtmlTree bodyTree = getBody(getWindowTitle(label));
|
HtmlTree body = getBody(getWindowTitle(title));
|
||||||
HtmlTree header = HtmlTree.HEADER();
|
Content headerContent = new ContentBuilder();
|
||||||
addTop(header);
|
addTop(headerContent);
|
||||||
navBar.setUserHeader(getUserHeaderFooter(true));
|
navBar.setUserHeader(getUserHeaderFooter(true));
|
||||||
header.add(navBar.getContent(Navigation.Position.TOP));
|
headerContent.add(navBar.getContent(Navigation.Position.TOP));
|
||||||
bodyTree.add(header);
|
|
||||||
Content mainContent = new ContentBuilder();
|
Content mainContent = new ContentBuilder();
|
||||||
addSystemProperties(mainContent);
|
addSystemProperties(mainContent);
|
||||||
Content titleContent = new StringContent(resources.getText("doclet.systemProperties"));
|
|
||||||
Content pHeading = HtmlTree.HEADING_TITLE(Headings.PAGE_TITLE_HEADING,
|
|
||||||
HtmlStyle.title, titleContent);
|
|
||||||
Content headerDiv = HtmlTree.DIV(HtmlStyle.header, pHeading);
|
|
||||||
mainTree.add(headerDiv);
|
|
||||||
mainTree.add(mainContent);
|
|
||||||
bodyTree.add(mainTree);
|
|
||||||
Content footer = HtmlTree.FOOTER();
|
Content footer = HtmlTree.FOOTER();
|
||||||
navBar.setUserFooter(getUserHeaderFooter(false));
|
navBar.setUserFooter(getUserHeaderFooter(false));
|
||||||
footer.add(navBar.getContent(Navigation.Position.BOTTOM));
|
footer.add(navBar.getContent(Navigation.Position.BOTTOM));
|
||||||
addBottom(footer);
|
addBottom(footer);
|
||||||
bodyTree.add(footer);
|
body.add(new BodyContents()
|
||||||
printHtmlDocument(null, "system properties", bodyTree);
|
.setHeader(headerContent)
|
||||||
|
.addMainContent(HtmlTree.DIV(HtmlStyle.header,
|
||||||
|
HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING,
|
||||||
|
contents.getContent("doclet.systemProperties"))))
|
||||||
|
.addMainContent(mainContent)
|
||||||
|
.setFooter(footer));
|
||||||
|
printHtmlDocument(null, "system properties", body);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -23,7 +23,7 @@
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* @test
|
* @test
|
||||||
* @bug 8215038 8239487
|
* @bug 8215038 8239487 8240476
|
||||||
* @summary Add a page that lists all system properties
|
* @summary Add a page that lists all system properties
|
||||||
* @library /tools/lib ../../lib
|
* @library /tools/lib ../../lib
|
||||||
* @modules jdk.javadoc/jdk.javadoc.internal.tool
|
* @modules jdk.javadoc/jdk.javadoc.internal.tool
|
||||||
@ -65,6 +65,15 @@ public class TestSystemPropertyPage extends JavadocTester {
|
|||||||
"<a href=\"system-properties.html\">System Properties</a>");
|
"<a href=\"system-properties.html\">System Properties</a>");
|
||||||
|
|
||||||
checkOutput("system-properties.html", true,
|
checkOutput("system-properties.html", true,
|
||||||
|
"<div class=\"flex-box\">\n" +
|
||||||
|
"<header role=\"banner\" class=\"flex-header\">",
|
||||||
|
|
||||||
|
"<div class=\"flex-content\">\n" +
|
||||||
|
"<main role=\"main\">\n" +
|
||||||
|
"<div class=\"header\">\n" +
|
||||||
|
"<h1>System Properties</h1>\n" +
|
||||||
|
"</div>",
|
||||||
|
|
||||||
"<table>\n" +
|
"<table>\n" +
|
||||||
"<caption><span>System Properties Summary</span><span class=\"tab-end\"> </span></caption>\n" +
|
"<caption><span>System Properties Summary</span><span class=\"tab-end\"> </span></caption>\n" +
|
||||||
"<thead>\n" +
|
"<thead>\n" +
|
||||||
|
Loading…
x
Reference in New Issue
Block a user