src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SplitIndexWriter.java
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SplitIndexWriter.java Wed Nov 27 12:18:40 2019 +0100
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SplitIndexWriter.java Wed Nov 27 13:08:16 2019 +0100
@@ -32,6 +32,8 @@
import java.util.Set;
import java.util.TreeSet;
+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.Entity;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
@@ -122,12 +124,11 @@
String title = resources.getText("doclet.Window_Split_Index",
unicode.toString());
HtmlTree body = getBody(getWindowTitle(title));
- HtmlTree header = HtmlTree.HEADER();
- addTop(header);
+ Content headerContent = new ContentBuilder();
+ addTop(headerContent);
navBar.setUserHeader(getUserHeaderFooter(true));
- header.add(navBar.getContent(true));
- body.add(header);
- HtmlTree main = HtmlTree.MAIN();
+ headerContent.add(navBar.getContent(true));
+ Content main = new ContentBuilder();
main.add(HtmlTree.DIV(HtmlStyle.header,
HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING,
contents.getContent("doclet.Index"))));
@@ -144,12 +145,15 @@
}
addLinksForIndexes(divTree);
main.add(divTree);
- body.add(main);
HtmlTree footer = HtmlTree.FOOTER();
navBar.setUserFooter(getUserHeaderFooter(false));
footer.add(navBar.getContent(false));
addBottom(footer);
- body.add(footer);
+ body.add(new BodyContents()
+ .setHeader(headerContent)
+ .addMainContent(main)
+ .setFooter(footer)
+ .toContent());
String description = "index: " + unicode;
printHtmlDocument(null, description, body);
}