8280393: Promote use of HtmlTree factory methods
Reviewed-by: jjg
This commit is contained in:
parent
47b1c51bbd
commit
ab2c8d3c9b
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html
ClassUseWriter.javaClassWriterImpl.javaConstantsSummaryWriterImpl.javaHelpWriter.javaHtmlDocletWriter.javaHtmlSerialFieldWriter.javaHtmlSerialMethodWriter.javaIndexWriter.javaModuleWriterImpl.javaNavigation.javaPackageTreeWriter.javaPackageUseWriter.javaPackageWriterImpl.javaSerializedFormWriterImpl.javaSubWriterHolderWriter.javaTable.javaTagletWriterImpl.javaTreeWriter.java
markup
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1998, 2022, 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
|
||||
@ -296,8 +296,7 @@ public class ClassUseWriter extends SubWriterHolderWriter {
|
||||
* @param contentTree the content tree to which the class elements will be added
|
||||
*/
|
||||
protected void addClassList(Content contentTree) {
|
||||
HtmlTree ul = new HtmlTree(TagName.UL);
|
||||
ul.setStyle(HtmlStyle.blockList);
|
||||
HtmlTree ul = HtmlTree.UL(HtmlStyle.blockList);
|
||||
for (PackageElement pkg : pkgSet) {
|
||||
HtmlTree htmlTree = HtmlTree.SECTION(HtmlStyle.detail)
|
||||
.setId(htmlIds.forPackage(pkg));
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1997, 2022, 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
|
||||
@ -105,8 +105,7 @@ public class ClassWriterImpl extends SubWriterHolderWriter implements ClassWrite
|
||||
@Override
|
||||
public Content getHeader(String header) {
|
||||
HtmlTree bodyTree = getBody(getWindowTitle(utils.getSimpleName(typeElement)));
|
||||
HtmlTree div = new HtmlTree(TagName.DIV);
|
||||
div.setStyle(HtmlStyle.header);
|
||||
HtmlTree div = HtmlTree.DIV(HtmlStyle.header);
|
||||
if (configuration.showModules) {
|
||||
ModuleElement mdle = configuration.docEnv.getElementUtils().getModuleOf(typeElement);
|
||||
Content classModuleLabel = HtmlTree.SPAN(HtmlStyle.moduleLabelInType, contents.moduleLabel);
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2001, 2022, 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
|
||||
@ -165,9 +165,7 @@ public class ConstantsSummaryWriterImpl extends HtmlDocletWriter implements Cons
|
||||
|
||||
@Override
|
||||
public Content getClassConstantHeader() {
|
||||
HtmlTree ul = new HtmlTree(TagName.UL);
|
||||
ul.setStyle(HtmlStyle.blockList);
|
||||
return ul;
|
||||
return HtmlTree.UL(HtmlStyle.blockList);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1998, 2022, 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
|
||||
@ -128,9 +128,7 @@ public class HelpWriter extends HtmlDocletWriter {
|
||||
* </ul>
|
||||
*/
|
||||
protected void addHelpFileContents(Content contentTree) {
|
||||
HtmlTree mainTOC = new HtmlTree(TagName.UL).setStyle(HtmlStyle.helpTOC);
|
||||
|
||||
|
||||
HtmlTree mainTOC = HtmlTree.UL(HtmlStyle.helpTOC);
|
||||
|
||||
contentTree.add(HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING, HtmlStyle.title,
|
||||
getContent("doclet.help.main_heading")))
|
||||
@ -185,7 +183,7 @@ public class HelpWriter extends HtmlDocletWriter {
|
||||
}
|
||||
content.add(navSection);
|
||||
|
||||
HtmlTree subTOC = new HtmlTree(TagName.UL).setStyle(HtmlStyle.helpSubTOC);
|
||||
HtmlTree subTOC = HtmlTree.UL(HtmlStyle.helpSubTOC);
|
||||
|
||||
HtmlTree section;
|
||||
|
||||
@ -193,7 +191,7 @@ public class HelpWriter extends HtmlDocletWriter {
|
||||
if (options.createIndex()) {
|
||||
section = newHelpSection(getContent("doclet.help.search.head"), subTOC, HtmlIds.HELP_SEARCH);
|
||||
Content searchIntro = HtmlTree.P(getContent("doclet.help.search.intro"));
|
||||
Content searchExamples = new HtmlTree(TagName.UL).setStyle(HtmlStyle.helpSectionList);
|
||||
Content searchExamples = HtmlTree.UL(HtmlStyle.helpSectionList);
|
||||
for (String[] example : SEARCH_EXAMPLES) {
|
||||
searchExamples.add(HtmlTree.LI(
|
||||
getContent("doclet.help.search.example",
|
||||
@ -240,7 +238,7 @@ public class HelpWriter extends HtmlDocletWriter {
|
||||
.add(HtmlTree.HEADING(Headings.CONTENT_HEADING, pageKindsHeading).setId(HtmlIds.HELP_PAGES))
|
||||
.add(contents.getContent("doclet.help.page_kinds.intro"));
|
||||
|
||||
HtmlTree subTOC = new HtmlTree(TagName.UL).setStyle(HtmlStyle.helpSubTOC);
|
||||
HtmlTree subTOC = HtmlTree.UL(HtmlStyle.helpSubTOC);
|
||||
|
||||
HtmlTree section;
|
||||
|
||||
|
@ -2380,8 +2380,7 @@ public class HtmlDocletWriter {
|
||||
Content leadingNote = contents.getContent("doclet.PreviewLeadingNote", nameCode);
|
||||
previewDiv.add(HtmlTree.SPAN(HtmlStyle.previewLabel,
|
||||
leadingNote));
|
||||
HtmlTree ul = new HtmlTree(TagName.UL);
|
||||
ul.setStyle(HtmlStyle.previewComment);
|
||||
HtmlTree ul = HtmlTree.UL(HtmlStyle.previewComment);
|
||||
for (Content note : previewNotes) {
|
||||
ul.add(HtmlTree.LI(note));
|
||||
}
|
||||
|
8
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlSerialFieldWriter.java
8
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlSerialFieldWriter.java
@ -71,9 +71,7 @@ public class HtmlSerialFieldWriter extends FieldWriterImpl
|
||||
*/
|
||||
@Override
|
||||
public Content getSerializableFieldsHeader() {
|
||||
HtmlTree ul = new HtmlTree(TagName.UL);
|
||||
ul.setStyle(HtmlStyle.blockList);
|
||||
return ul;
|
||||
return HtmlTree.UL(HtmlStyle.blockList);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -84,9 +82,7 @@ public class HtmlSerialFieldWriter extends FieldWriterImpl
|
||||
*/
|
||||
@Override
|
||||
public Content getFieldsContentHeader(boolean isLastContent) {
|
||||
HtmlTree li = new HtmlTree(TagName.LI);
|
||||
li.setStyle(HtmlStyle.blockList);
|
||||
return li;
|
||||
return new HtmlTree(TagName.LI).setStyle(HtmlStyle.blockList);
|
||||
}
|
||||
|
||||
/**
|
||||
|
10
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlSerialMethodWriter.java
10
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlSerialMethodWriter.java
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1998, 2022, 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
|
||||
@ -60,9 +60,7 @@ public class HtmlSerialMethodWriter extends MethodWriterImpl implements
|
||||
*/
|
||||
@Override
|
||||
public Content getSerializableMethodsHeader() {
|
||||
HtmlTree ul = new HtmlTree(TagName.UL);
|
||||
ul.setStyle(HtmlStyle.blockList);
|
||||
return ul;
|
||||
return HtmlTree.UL(HtmlStyle.blockList);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -73,9 +71,7 @@ public class HtmlSerialMethodWriter extends MethodWriterImpl implements
|
||||
*/
|
||||
@Override
|
||||
public Content getMethodsContentHeader(boolean isLastContent) {
|
||||
HtmlTree li = new HtmlTree(TagName.LI);
|
||||
li.setStyle(HtmlStyle.blockList);
|
||||
return li;
|
||||
return new HtmlTree(TagName.LI);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1998, 2022, 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
|
||||
@ -292,8 +292,7 @@ public class IndexWriter extends HtmlDocletWriter {
|
||||
*/
|
||||
protected void addComment(Element element, Content contentTree) {
|
||||
Content span = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, getDeprecatedPhrase(element));
|
||||
HtmlTree div = new HtmlTree(TagName.DIV);
|
||||
div.setStyle(HtmlStyle.deprecationBlock);
|
||||
HtmlTree div = HtmlTree.DIV(HtmlStyle.deprecationBlock);
|
||||
if (utils.isDeprecated(element)) {
|
||||
div.add(span);
|
||||
List<? extends DeprecatedTree> tags = utils.getDeprecatedTrees(element);
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2016, 2022, 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
|
||||
@ -180,8 +180,7 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW
|
||||
@Override
|
||||
public Content getModuleHeader(String heading) {
|
||||
HtmlTree bodyTree = getBody(getWindowTitle(mdle.getQualifiedName().toString()));
|
||||
HtmlTree div = new HtmlTree(TagName.DIV);
|
||||
div.setStyle(HtmlStyle.header);
|
||||
HtmlTree div = HtmlTree.DIV(HtmlStyle.header);
|
||||
Content moduleHead = new ContentBuilder();
|
||||
moduleHead.add(mdle.isOpen() && (configuration.docEnv.getModuleMode() == ModuleMode.ALL)
|
||||
? contents.openModuleLabel : contents.moduleLabel);
|
||||
@ -222,7 +221,7 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW
|
||||
*/
|
||||
@Override
|
||||
public Content getSummariesList() {
|
||||
return new HtmlTree(TagName.UL).setStyle(HtmlStyle.summaryList);
|
||||
return HtmlTree.UL(HtmlStyle.summaryList);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -799,8 +798,7 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW
|
||||
List<? extends DeprecatedTree> deprs = utils.getDeprecatedTrees(mdle);
|
||||
if (utils.isDeprecated(mdle)) {
|
||||
CommentHelper ch = utils.getCommentHelper(mdle);
|
||||
HtmlTree deprDiv = new HtmlTree(TagName.DIV);
|
||||
deprDiv.setStyle(HtmlStyle.deprecationBlock);
|
||||
HtmlTree deprDiv = HtmlTree.DIV(HtmlStyle.deprecationBlock);
|
||||
Content deprPhrase = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, getDeprecatedPhrase(mdle));
|
||||
deprDiv.add(deprPhrase);
|
||||
if (!deprs.isEmpty()) {
|
||||
@ -859,8 +857,7 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW
|
||||
public void addPackageDeprecationInfo(Content li, PackageElement pkg) {
|
||||
if (utils.isDeprecated(pkg)) {
|
||||
List<? extends DeprecatedTree> deprs = utils.getDeprecatedTrees(pkg);
|
||||
HtmlTree deprDiv = new HtmlTree(TagName.DIV);
|
||||
deprDiv.setStyle(HtmlStyle.deprecationBlock);
|
||||
HtmlTree deprDiv = HtmlTree.DIV(HtmlStyle.deprecationBlock);
|
||||
Content deprPhrase = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, getDeprecatedPhrase(pkg));
|
||||
deprDiv.add(deprPhrase);
|
||||
if (!deprs.isEmpty()) {
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2018, 2022, 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
|
||||
@ -29,7 +29,6 @@ import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
import javax.lang.model.element.Element;
|
||||
import javax.lang.model.element.ElementKind;
|
||||
import javax.lang.model.element.ModuleElement;
|
||||
import javax.lang.model.element.PackageElement;
|
||||
import javax.lang.model.element.TypeElement;
|
||||
@ -635,21 +634,21 @@ public class Navigation {
|
||||
.put(HtmlAttr.TITLE, rowListTitle);
|
||||
addMainNavLinks(navList);
|
||||
navDiv.add(navList);
|
||||
HtmlTree ulNavSummaryRight = new HtmlTree(TagName.UL).setStyle(HtmlStyle.subNavListSmall);
|
||||
HtmlTree ulNavSummaryRight = HtmlTree.UL(HtmlStyle.subNavListSmall);
|
||||
addSummaryLinks(ulNavSummaryRight, true);
|
||||
addDetailLinks(ulNavSummaryRight, true);
|
||||
navDiv.add(ulNavSummaryRight);
|
||||
tree.add(navDiv);
|
||||
|
||||
HtmlTree subDiv = new HtmlTree(TagName.DIV).setStyle(HtmlStyle.subNav);
|
||||
HtmlTree subDiv = HtmlTree.DIV(HtmlStyle.subNav);
|
||||
|
||||
HtmlTree div = new HtmlTree(TagName.DIV).setId(HtmlIds.NAVBAR_SUB_LIST);
|
||||
// Add the summary links if present.
|
||||
HtmlTree ulNavSummary = new HtmlTree(TagName.UL).setStyle(HtmlStyle.subNavList);
|
||||
HtmlTree ulNavSummary = HtmlTree.UL(HtmlStyle.subNavList);
|
||||
addSummaryLinks(ulNavSummary, false);
|
||||
div.add(ulNavSummary);
|
||||
// Add the detail links if present.
|
||||
HtmlTree ulNavDetail = new HtmlTree(TagName.UL).setStyle(HtmlStyle.subNavList);
|
||||
HtmlTree ulNavDetail = HtmlTree.UL(HtmlStyle.subNavList);
|
||||
addDetailLinks(ulNavDetail, false);
|
||||
div.add(ulNavDetail);
|
||||
subDiv.add(div);
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1998, 2020, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1998, 2022, 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
|
||||
@ -147,8 +147,7 @@ public class PackageTreeWriter extends AbstractTreeWriter {
|
||||
Content span = HtmlTree.SPAN(HtmlStyle.packageHierarchyLabel,
|
||||
contents.packageHierarchies);
|
||||
div.add(span);
|
||||
HtmlTree ul = new HtmlTree (TagName.UL);
|
||||
ul.setStyle(HtmlStyle.horizontal);
|
||||
HtmlTree ul = HtmlTree.UL(HtmlStyle.horizontal);
|
||||
ul.add(getNavLinkMainTree(resources.getText("doclet.All_Packages")));
|
||||
div.add(ul);
|
||||
}
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1998, 2022, 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
|
||||
@ -181,8 +181,7 @@ public class PackageUseWriter extends SubWriterHolderWriter {
|
||||
protected void addClassList(Content contentTree) {
|
||||
TableHeader classTableHeader = new TableHeader(
|
||||
contents.classLabel, contents.descriptionLabel);
|
||||
HtmlTree ul = new HtmlTree(TagName.UL);
|
||||
ul.setStyle(HtmlStyle.blockList);
|
||||
HtmlTree ul = HtmlTree.UL(HtmlStyle.blockList);
|
||||
for (String packageName : usingPackageToUsedClasses.keySet()) {
|
||||
PackageElement usingPackage = utils.elementUtils.getPackageElement(packageName);
|
||||
HtmlTree section = HtmlTree.SECTION(HtmlStyle.detail)
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1997, 2022, 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
|
||||
@ -111,8 +111,7 @@ public class PackageWriterImpl extends HtmlDocletWriter
|
||||
public Content getPackageHeader() {
|
||||
String packageName = getLocalizedPackageName(packageElement).toString();
|
||||
HtmlTree bodyTree = getBody(getWindowTitle(packageName));
|
||||
HtmlTree div = new HtmlTree(TagName.DIV);
|
||||
div.setStyle(HtmlStyle.header);
|
||||
HtmlTree div = HtmlTree.DIV(HtmlStyle.header);
|
||||
if (configuration.showModules) {
|
||||
ModuleElement mdle = configuration.docEnv.getElementUtils().getModuleOf(packageElement);
|
||||
Content classModuleLabel = HtmlTree.SPAN(HtmlStyle.moduleLabelInPackage, contents.moduleLabel);
|
||||
@ -212,8 +211,7 @@ public class PackageWriterImpl extends HtmlDocletWriter
|
||||
List<? extends DeprecatedTree> deprs = utils.getDeprecatedTrees(packageElement);
|
||||
if (utils.isDeprecated(packageElement)) {
|
||||
CommentHelper ch = utils.getCommentHelper(packageElement);
|
||||
HtmlTree deprDiv = new HtmlTree(TagName.DIV);
|
||||
deprDiv.setStyle(HtmlStyle.deprecationBlock);
|
||||
HtmlTree deprDiv = HtmlTree.DIV(HtmlStyle.deprecationBlock);
|
||||
Content deprPhrase = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, getDeprecatedPhrase(packageElement));
|
||||
deprDiv.add(deprPhrase);
|
||||
if (!deprs.isEmpty()) {
|
||||
@ -228,7 +226,7 @@ public class PackageWriterImpl extends HtmlDocletWriter
|
||||
|
||||
@Override
|
||||
public Content getSummariesList() {
|
||||
return new HtmlTree(TagName.UL).setStyle(HtmlStyle.summaryList);
|
||||
return HtmlTree.UL(HtmlStyle.summaryList);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1998, 2022, 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
|
||||
@ -33,7 +33,6 @@ import javax.lang.model.element.TypeElement;
|
||||
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.TagName;
|
||||
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
|
||||
import jdk.javadoc.internal.doclets.formats.html.Navigation.PageMode;
|
||||
import jdk.javadoc.internal.doclets.formats.html.markup.Text;
|
||||
@ -90,9 +89,7 @@ public class SerializedFormWriterImpl extends SubWriterHolderWriter
|
||||
*/
|
||||
@Override
|
||||
public Content getSerializedSummariesHeader() {
|
||||
HtmlTree ul = new HtmlTree(TagName.UL);
|
||||
ul.setStyle(HtmlStyle.blockList);
|
||||
return ul;
|
||||
return HtmlTree.UL(HtmlStyle.blockList);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -127,9 +124,8 @@ public class SerializedFormWriterImpl extends SubWriterHolderWriter
|
||||
*/
|
||||
@Override
|
||||
public Content getClassSerializedHeader() {
|
||||
HtmlTree ul = new HtmlTree(TagName.UL);
|
||||
ul.setStyle(HtmlStyle.blockList);
|
||||
return ul;
|
||||
return HtmlTree.UL(HtmlStyle.blockList);
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
@ -220,9 +216,8 @@ public class SerializedFormWriterImpl extends SubWriterHolderWriter
|
||||
*/
|
||||
@Override
|
||||
public Content getClassContentHeader() {
|
||||
HtmlTree ul = new HtmlTree(TagName.UL);
|
||||
ul.setStyle(HtmlStyle.blockList);
|
||||
return ul;
|
||||
return HtmlTree.UL(HtmlStyle.blockList);
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
|
17
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SubWriterHolderWriter.java
17
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SubWriterHolderWriter.java
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1997, 2022, 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
|
||||
@ -36,7 +36,6 @@ 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.HtmlId;
|
||||
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
|
||||
import jdk.javadoc.internal.doclets.formats.html.markup.TagName;
|
||||
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
|
||||
import jdk.javadoc.internal.doclets.toolkit.Content;
|
||||
import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
|
||||
@ -207,9 +206,7 @@ public abstract class SubWriterHolderWriter extends HtmlDocletWriter {
|
||||
* @return a content tree for the member header
|
||||
*/
|
||||
public Content getMemberTreeHeader() {
|
||||
HtmlTree ul = new HtmlTree(TagName.UL);
|
||||
ul.setStyle(HtmlStyle.blockList);
|
||||
return ul;
|
||||
return HtmlTree.UL(HtmlStyle.blockList);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -218,7 +215,7 @@ public abstract class SubWriterHolderWriter extends HtmlDocletWriter {
|
||||
* @return a list to be used for the list of summaries for members of a given kind
|
||||
*/
|
||||
public Content getSummariesList() {
|
||||
return new HtmlTree(TagName.UL).setStyle(HtmlStyle.summaryList);
|
||||
return HtmlTree.UL(HtmlStyle.summaryList);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -238,7 +235,7 @@ public abstract class SubWriterHolderWriter extends HtmlDocletWriter {
|
||||
* @return a list to be used for the list of details for members of a given kind
|
||||
*/
|
||||
public Content getDetailsList() {
|
||||
return new HtmlTree(TagName.UL).setStyle(HtmlStyle.detailsList);
|
||||
return HtmlTree.UL(HtmlStyle.detailsList);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -257,7 +254,7 @@ public abstract class SubWriterHolderWriter extends HtmlDocletWriter {
|
||||
* @return a list to be used for the list of members of a given kind
|
||||
*/
|
||||
public Content getMemberList() {
|
||||
return new HtmlTree(TagName.UL).setStyle(HtmlStyle.memberList);
|
||||
return HtmlTree.UL(HtmlStyle.memberList);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -271,9 +268,7 @@ public abstract class SubWriterHolderWriter extends HtmlDocletWriter {
|
||||
}
|
||||
|
||||
public Content getMemberInheritedTree() {
|
||||
HtmlTree div = new HtmlTree(TagName.DIV);
|
||||
div.setStyle(HtmlStyle.inheritedList);
|
||||
return div;
|
||||
return HtmlTree.DIV(HtmlStyle.inheritedList);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2003, 2022, 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
|
||||
@ -386,7 +386,7 @@ public class Table extends Content {
|
||||
default -> throw new IllegalStateException();
|
||||
};
|
||||
|
||||
HtmlTree table = new HtmlTree(TagName.DIV).setStyle(tableStyle).addStyle(columnStyle);
|
||||
HtmlTree table = HtmlTree.DIV(tableStyle).addStyle(columnStyle);
|
||||
if ((tabMap == null || tabs.size() == 1) && !alwaysShowDefaultTab) {
|
||||
if (tabMap == null) {
|
||||
main.add(caption);
|
||||
@ -396,7 +396,7 @@ public class Table extends Content {
|
||||
table.add(getTableBody());
|
||||
main.add(table);
|
||||
} else {
|
||||
HtmlTree tablist = new HtmlTree(TagName.DIV).setStyle(tabListStyle)
|
||||
HtmlTree tablist = HtmlTree.DIV(tabListStyle)
|
||||
.put(HtmlAttr.ROLE, "tablist")
|
||||
.put(HtmlAttr.ARIA_ORIENTATION, "horizontal");
|
||||
|
||||
@ -481,8 +481,6 @@ public class Table extends Content {
|
||||
}
|
||||
|
||||
private HtmlTree getCaption(Content title) {
|
||||
return new HtmlTree(TagName.DIV)
|
||||
.setStyle(HtmlStyle.caption)
|
||||
.add(HtmlTree.SPAN(title));
|
||||
return HtmlTree.DIV(HtmlStyle.caption, HtmlTree.SPAN(title));
|
||||
}
|
||||
}
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2003, 2022, 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
|
||||
@ -352,8 +352,7 @@ public class TagletWriterImpl extends TagletWriter {
|
||||
// Use a different style if any link label is longer than 30 chars or contains commas.
|
||||
boolean hasLongLabels = links.stream()
|
||||
.anyMatch(c -> c.charCount() > SEE_TAG_MAX_INLINE_LENGTH || c.toString().contains(","));
|
||||
HtmlTree seeList = new HtmlTree(TagName.UL)
|
||||
.setStyle(hasLongLabels ? HtmlStyle.seeListLong : HtmlStyle.seeList);
|
||||
HtmlTree seeList = HtmlTree.UL(hasLongLabels ? HtmlStyle.seeListLong : HtmlStyle.seeList);
|
||||
links.stream().filter(Content::isValid).forEach(item -> {
|
||||
seeList.add(HtmlTree.LI(item));
|
||||
});
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1997, 2022, 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
|
||||
@ -32,10 +32,8 @@ import javax.lang.model.element.PackageElement;
|
||||
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.TagName;
|
||||
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
|
||||
import jdk.javadoc.internal.doclets.formats.html.Navigation.PageMode;
|
||||
import jdk.javadoc.internal.doclets.formats.html.markup.Text;
|
||||
import jdk.javadoc.internal.doclets.toolkit.Content;
|
||||
import jdk.javadoc.internal.doclets.toolkit.util.ClassTree;
|
||||
import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
|
||||
@ -135,8 +133,7 @@ public class TreeWriter extends AbstractTreeWriter {
|
||||
Content span = HtmlTree.SPAN(HtmlStyle.packageHierarchyLabel,
|
||||
contents.packageHierarchies);
|
||||
contentTree.add(span);
|
||||
HtmlTree ul = new HtmlTree(TagName.UL);
|
||||
ul.setStyle(HtmlStyle.horizontal);
|
||||
HtmlTree ul = HtmlTree.UL(HtmlStyle.horizontal);
|
||||
int i = 0;
|
||||
for (PackageElement pkg : packages) {
|
||||
// If the package name length is 0 or if -nodeprecated option
|
||||
|
@ -845,6 +845,17 @@ public class HtmlTree extends Content {
|
||||
.add(body);
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates an HTML {@code UL} element with the given style.
|
||||
*
|
||||
* @param style the style
|
||||
* @return the element
|
||||
*/
|
||||
public static HtmlTree UL(HtmlStyle style) {
|
||||
return new HtmlTree(TagName.UL)
|
||||
.setStyle(style);
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates an HTML {@code UL} element with the given style and some content.
|
||||
*
|
||||
|
Loading…
x
Reference in New Issue
Block a user