diff -r 5af9fa90cd7b -r 48b88b9c11eb src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassUseWriter.java --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassUseWriter.java Wed Nov 27 12:18:40 2019 +0100 +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassUseWriter.java Wed Nov 27 13:08:16 2019 +0100 @@ -100,11 +100,6 @@ private final Navigation navBar; /** - * The HTML tree for main tag. - */ - protected HtmlTree mainTree = HtmlTree.MAIN(); - - /** * Constructor. * * @param filename the file to be generated. @@ -154,7 +149,7 @@ constrSubWriter = new ConstructorWriterImpl(this); fieldSubWriter = new FieldWriterImpl(this); classSubWriter = new NestedClassWriterImpl(this); - this.navBar = new Navigation(typeElement, configuration, fixedNavDiv, PageMode.USE, path); + this.navBar = new Navigation(typeElement, configuration, PageMode.USE, path); } /** @@ -232,13 +227,13 @@ div.add(contents.getContent("doclet.ClassUse_No.usage.of.0", utils.getFullyQualifiedName(typeElement))); } - mainTree.add(div); - body.add(mainTree); + bodyContents.addMainContent(div); HtmlTree footer = HtmlTree.FOOTER(); navBar.setUserFooter(getUserHeaderFooter(false)); footer.add(navBar.getContent(false)); addBottom(footer); - body.add(footer); + bodyContents.setFooter(footer); + body.add(bodyContents.toContent()); String description = getDescription("use", typeElement); printHtmlDocument(null, description, body); } @@ -432,8 +427,8 @@ String title = resources.getText("doclet.Window_ClassUse_Header", cltype, clname); HtmlTree bodyTree = getBody(getWindowTitle(title)); - HtmlTree htmlTree = HtmlTree.HEADER(); - addTop(htmlTree); + Content headerContent = new ContentBuilder(); + addTop(headerContent); Content mdleLinkContent = getModuleLink(utils.elementUtils.getModuleOf(typeElement), contents.moduleLabel); navBar.setNavLinkModule(mdleLinkContent); @@ -442,16 +437,15 @@ .label(resources.getText("doclet.Class"))); navBar.setNavLinkClass(classLinkContent); navBar.setUserHeader(getUserHeaderFooter(true)); - htmlTree.add(navBar.getContent(true)); - bodyTree.add(htmlTree); - ContentBuilder headContent = new ContentBuilder(); - headContent.add(contents.getContent("doclet.ClassUse_Title", cltype)); - headContent.add(new HtmlTree(HtmlTag.BR)); - headContent.add(clname); + headerContent.add(navBar.getContent(true)); + ContentBuilder headingContent = new ContentBuilder(); + headingContent.add(contents.getContent("doclet.ClassUse_Title", cltype)); + headingContent.add(new HtmlTree(HtmlTag.BR)); + headingContent.add(clname); Content heading = HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING, - true, HtmlStyle.title, headContent); + true, HtmlStyle.title, headingContent); Content div = HtmlTree.DIV(HtmlStyle.header, heading); - mainTree.add(div); + bodyContents.setHeader(headerContent).addMainContent(div); return bodyTree; } }