jdk-sandbox: comparison langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriterImpl.java

equal deleted inserted replaced

-:8c0d8d2c3519
+:96a1226aca18
 * @return a content tree for the module link
 */
 @Override
 protected Content getNavLinkModule() {
 Content linkContent = getModuleLink(utils.elementUtils.getModuleOf(typeElement),
-moduleLabel);
+contents.moduleLabel);
 Content li = HtmlTree.LI(linkContent);
 return li;
 }
 /**
 * @return a content tree for the package link
 */
 @Override
 protected Content getNavLinkPackage() {
 Content linkContent = getHyperLink(DocPaths.PACKAGE_SUMMARY,
-packageLabel);
+contents.packageLabel);
 Content li = HtmlTree.LI(linkContent);
 return li;
 }
 /**
 *
 * @return a content tree for the class link
 */
 @Override
 protected Content getNavLinkClass() {
-Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, classLabel);
+Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, contents.classLabel);
 return li;
 }
 /**
 * Get the class use link.
 *
 * @return a content tree for the class use link
 */
 @Override
 protected Content getNavLinkClassUse() {
-Content linkContent = getHyperLink(DocPaths.CLASS_USE.resolve(filename), useLabel);
+Content linkContent = getHyperLink(DocPaths.CLASS_USE.resolve(filename), contents.useLabel);
 Content li = HtmlTree.LI(linkContent);
 return li;
 }
 /**
 public Content getNavLinkPrevious() {
 Content li;
 if (prev != null) {
 Content prevLink = getLink(new LinkInfoImpl(configuration,
 LinkInfoImpl.Kind.CLASS, prev)
-.label(prevclassLabel).strong(true));
+.label(contents.prevClassLabel).strong(true));
 li = HtmlTree.LI(prevLink);
 }
 else
-li = HtmlTree.LI(prevclassLabel);
+li = HtmlTree.LI(contents.prevClassLabel);
 return li;
 }
 /**
 * Get link to next class.
 public Content getNavLinkNext() {
 Content li;
 if (next != null) {
 Content nextLink = getLink(new LinkInfoImpl(configuration,
 LinkInfoImpl.Kind.CLASS, next)
-.label(nextclassLabel).strong(true));
+.label(contents.nextClassLabel).strong(true));
 li = HtmlTree.LI(nextLink);
 }
 else
-li = HtmlTree.LI(nextclassLabel);
+li = HtmlTree.LI(contents.nextClassLabel);
 return li;
 }
 /**
 * {@inheritDoc}
 bodyTree.addContent(HtmlConstants.START_OF_CLASS_DATA);
 HtmlTree div = new HtmlTree(HtmlTag.DIV);
 div.addStyle(HtmlStyle.header);
 ModuleElement mdle = configuration.docEnv.getElementUtils().getModuleOf(typeElement);
 if (mdle != null && !mdle.isUnnamed()) {
-Content classModuleLabel = HtmlTree.SPAN(HtmlStyle.moduleLabelInClass, moduleLabel);
+Content classModuleLabel = HtmlTree.SPAN(HtmlStyle.moduleLabelInClass, contents.moduleLabel);
 Content moduleNameDiv = HtmlTree.DIV(HtmlStyle.subTitle, classModuleLabel);
-moduleNameDiv.addContent(getSpace());
+moduleNameDiv.addContent(Contents.SPACE);
 moduleNameDiv.addContent(getModuleLink(mdle,
 new StringContent(mdle.getQualifiedName().toString())));
 div.addContent(moduleNameDiv);
 }
 PackageElement pkg = utils.containingPackage(typeElement);
 if (!pkg.isUnnamed()) {
-Content classPackageLabel = HtmlTree.SPAN(HtmlStyle.packageLabelInClass, packageLabel);
+Content classPackageLabel = HtmlTree.SPAN(HtmlStyle.packageLabelInClass, contents.packageLabel);
 Content pkgNameDiv = HtmlTree.DIV(HtmlStyle.subTitle, classPackageLabel);
-pkgNameDiv.addContent(getSpace());
+pkgNameDiv.addContent(Contents.SPACE);
 Content pkgNameContent = getPackageLink(pkg,
 new StringContent(utils.getPackageName(pkg)));
 pkgNameDiv.addContent(pkgNameContent);
 div.addContent(pkgNameDiv);
 }
 typeElement.getQualifiedName().toString().equals("org.omg.CORBA.Object")) {
 return;    // Don't generate the list, too huge
 }
 Set<TypeElement> subclasses = classtree.directSubClasses(typeElement, false);
 if (!subclasses.isEmpty()) {
-Content label = getResource(
+Content label = contents.subclassesLabel;
-"doclet.Subclasses");
 Content dt = HtmlTree.DT(label);
 Content dl = HtmlTree.DL(dt);
 dl.addContent(getClassLinks(LinkInfoImpl.Kind.SUBCLASSES,
 subclasses));
 classInfoTree.addContent(dl);
 @Override
 public void addSubInterfacesInfo(Content classInfoTree) {
 if (utils.isInterface(typeElement)) {
 Set<TypeElement> subInterfaces = classtree.allSubClasses(typeElement, false);
 if (!subInterfaces.isEmpty()) {
-Content label = getResource(
+Content label = contents.subinterfacesLabel;
-"doclet.Subinterfaces");
 Content dt = HtmlTree.DT(label);
 Content dl = HtmlTree.DL(dt);
 dl.addContent(getClassLinks(LinkInfoImpl.Kind.SUBINTERFACES,
 subInterfaces));
 classInfoTree.addContent(dl);
 typeElement.getQualifiedName().toString().equals("java.io.Serializable")) {
 return;   // Don't generate the list, too big
 }
 Set<TypeElement> implcl = classtree.implementingClasses(typeElement);
 if (!implcl.isEmpty()) {
-Content label = getResource(
+Content label = contents.implementingClassesLabel;
-"doclet.Implementing_Classes");
 Content dt = HtmlTree.DT(label);
 Content dl = HtmlTree.DL(dt);
 dl.addContent(getClassLinks(LinkInfoImpl.Kind.IMPLEMENTED_CLASSES,
 implcl));
 classInfoTree.addContent(dl);
 @Override
 public void addImplementedInterfacesInfo(Content classInfoTree) {
 SortedSet<TypeMirror> interfaces = new TreeSet<>(utils.makeTypeMirrorClassUseComparator());
 interfaces.addAll(utils.getAllInterfaces(typeElement));
 if (utils.isClass(typeElement) && !interfaces.isEmpty()) {
-Content label = getResource(
+Content label = contents.allImplementedInterfacesLabel;
-"doclet.All_Implemented_Interfaces");
 Content dt = HtmlTree.DT(label);
 Content dl = HtmlTree.DL(dt);
 dl.addContent(getClassLinks(LinkInfoImpl.Kind.IMPLEMENTED_INTERFACES, interfaces));
 classInfoTree.addContent(dl);
 }
 SortedSet<TypeMirror> interfaces =
 new TreeSet<>(utils.makeTypeMirrorIndexUseComparator());
 interfaces.addAll(utils.getAllInterfaces(typeElement));
 if (utils.isInterface(typeElement) && !interfaces.isEmpty()) {
-Content label = getResource("doclet.All_Superinterfaces");
+Content label = contents.allSuperinterfacesLabel;
 Content dt = HtmlTree.DT(label);
 Content dl = HtmlTree.DL(dt);
 dl.addContent(getClassLinks(LinkInfoImpl.Kind.SUPER_INTERFACES, interfaces));
 classInfoTree.addContent(dl);
 }
 if (outerClass == null)
 return;
 new SimpleElementVisitor8<Void, Void>() {
 @Override @DefinedBy(Api.LANGUAGE_MODEL)
 public Void visitType(TypeElement e, Void p) {
-String label = utils.isInterface(e)
+Content label = utils.isInterface(e)
-? "doclet.Enclosing_Interface"
+? contents.enclosingInterfaceLabel
-: "doclet.Enclosing_Class";
+: contents.enclosingClassLabel;
-Content dt = HtmlTree.DT(getResource(label));
+Content dt = HtmlTree.DT(label);
 Content dl = HtmlTree.DL(dt);
 Content dd = new HtmlTree(HtmlTag.DD);
 dd.addContent(getLink(new LinkInfoImpl(configuration,
 LinkInfoImpl.Kind.CLASS, e)));
 dl.addContent(dd);
 * {@inheritDoc}
 */
 @Override
 public void addFunctionalInterfaceInfo (Content classInfoTree) {
 if (isFunctionalInterface()) {
-Content dt = HtmlTree.DT(getResource("doclet.Functional_Interface"));
+Content dt = HtmlTree.DT(contents.functionalInterface);
 Content dl = HtmlTree.DL(dt);
 Content dd = new HtmlTree(HtmlTag.DD);
-dd.addContent(getResource("doclet.Functional_Interface_Message"));
+dd.addContent(contents.functionalInterfaceMessage);
 dl.addContent(dd);
 classInfoTree.addContent(dl);
 }
 }
 public void addClassDeprecationInfo(Content classInfoTree) {
 Content hr = new HtmlTree(HtmlTag.HR);
 classInfoTree.addContent(hr);
 List<? extends DocTree> deprs = utils.getBlockTags(typeElement, DocTree.Kind.DEPRECATED);
 if (utils.isDeprecated(typeElement)) {
-Content deprLabel = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, deprecatedPhrase);
+Content deprLabel = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, contents.deprecatedPhrase);
 Content div = HtmlTree.DIV(HtmlStyle.block, deprLabel);
 if (!deprs.isEmpty()) {
 CommentHelper ch = utils.getCommentHelper(typeElement);
 DocTree dt = deprs.get(0);
 List<? extends DocTree> commentTags = ch.getBody(configuration, dt);
 if (!commentTags.isEmpty()) {
-div.addContent(getSpace());
+div.addContent(Contents.SPACE);
 addInlineDeprecatedComment(typeElement, deprs.get(0), div);
 }
 }
 classInfoTree.addContent(div);
 }
 * {@inheritDoc}
 */
 @Override
 protected Content getNavLinkTree() {
 Content treeLinkContent = getHyperLink(DocPaths.PACKAGE_TREE,
-treeLabel, "", "");
+contents.treeLabel, "", "");
 Content li = HtmlTree.LI(treeLinkContent);
 return li;
 }
 /**
 * Get summary links for navigation bar.
 *
 * @return the content tree for the navigation summary links
 */
 protected Content getNavSummaryLinks() throws Exception {
-Content li = HtmlTree.LI(summaryLabel);
+Content li = HtmlTree.LI(contents.summaryLabel);
-li.addContent(getSpace());
+li.addContent(Contents.SPACE);
 Content ulNav = HtmlTree.UL(HtmlStyle.subNavList, li);
 MemberSummaryBuilder memberSummaryBuilder = (MemberSummaryBuilder)
 configuration.getBuilderFactory().getMemberSummaryBuilder(this);
 for (VisibleMemberMap.Kind kind : VisibleMemberMap.Kind.summarySet) {
 Content liNav = new HtmlTree(HtmlTag.LI);
 continue;
 }
 AbstractMemberWriter writer =
 ((AbstractMemberWriter) memberSummaryBuilder.getMemberSummaryWriter(kind));
 if (writer == null) {
-liNav.addContent(getResource(VisibleMemberMap.Kind.getNavLinkLabels(kind)));
+liNav.addContent(contents.getContent(VisibleMemberMap.Kind.getNavLinkLabels(kind)));
 } else {
 writer.addNavSummaryLink(
 memberSummaryBuilder.members(kind),
 memberSummaryBuilder.getVisibleMemberMap(kind), liNav);
 }
 *
 * @return the content tree for the detail links
 * @throws java.lang.Exception
 */
 protected Content getNavDetailLinks() throws Exception {
-Content li = HtmlTree.LI(detailLabel);
+Content li = HtmlTree.LI(contents.detailLabel);
-li.addContent(getSpace());
+li.addContent(Contents.SPACE);
 Content ulNav = HtmlTree.UL(HtmlStyle.subNavList, li);
 MemberSummaryBuilder memberSummaryBuilder = (MemberSummaryBuilder)
 configuration.getBuilderFactory().getMemberSummaryBuilder(this);
 for (VisibleMemberMap.Kind kind : VisibleMemberMap.Kind.detailSet) {
 Content liNav = new HtmlTree(HtmlTag.LI);
 }
 if (kind == VisibleMemberMap.Kind.CONSTRUCTORS && utils.isEnum(typeElement)) {
 continue;
 }
 if (writer == null) {
-liNav.addContent(getResource(VisibleMemberMap.Kind.getNavLinkLabels(kind)));
+liNav.addContent(contents.getContent(VisibleMemberMap.Kind.getNavLinkLabels(kind)));
 } else {
 writer.addNavDetailLink(memberSummaryBuilder.members(kind), liNav);
 }
 if (kind != Kind.METHODS) {
 addNavGap(liNav);

changeset 40303	96a1226aca18
parent 39670	9d1eafbf29c6
child 40503	cb34fd6e8071