src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstantsSummaryWriterImpl.java

rev 47482 : 8190295: Introduce a new Table builder class
rev 47486 : 8190821: Introduce a new Links builder class

*** 38,47 ****
--- 38,48 ----
  import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
  import jdk.javadoc.internal.doclets.formats.html.markup.HtmlConstants;
  import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
  import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
  import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
+ import jdk.javadoc.internal.doclets.formats.html.markup.Links;
  import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
  import jdk.javadoc.internal.doclets.toolkit.ConstantsSummaryWriter;
  import jdk.javadoc.internal.doclets.toolkit.Content;
  import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
  import jdk.javadoc.internal.doclets.toolkit.util.DocLink;
*** 132,149 ****
      public void addLinkToPackageContent(PackageElement pkg,
              Set<PackageElement> printedPackageHeaders, Content contentListTree) {
          //add link to summary
          Content link;
          if (pkg.isUnnamed()) {
!             link = getHyperLink(getDocLink(
!                     SectionName.UNNAMED_PACKAGE_ANCHOR),
                      contents.defaultPackageLabel, "", "");
          } else {
              String parsedPackageName = utils.parsePackageName(pkg);
              Content packageNameContent = getPackageLabel(parsedPackageName);
              packageNameContent.addContent(".*");
!             link = getHyperLink(DocLink.fragment(parsedPackageName),
                      packageNameContent, "", "");
              PackageElement abbrevPkg = configuration.workArounds.getAbbreviatedPackageElement(pkg);
              printedPackageHeaders.add(abbrevPkg);
          }
          contentListTree.addContent(HtmlTree.LI(link));
--- 133,149 ----
      public void addLinkToPackageContent(PackageElement pkg,
              Set<PackageElement> printedPackageHeaders, Content contentListTree) {
          //add link to summary
          Content link;
          if (pkg.isUnnamed()) {
!             link = Links.createLink(SectionName.UNNAMED_PACKAGE_ANCHOR,
                      contents.defaultPackageLabel, "", "");
          } else {
              String parsedPackageName = utils.parsePackageName(pkg);
              Content packageNameContent = getPackageLabel(parsedPackageName);
              packageNameContent.addContent(".*");
!             link = Links.createLink(DocLink.fragment(parsedPackageName),
                      packageNameContent, "", "");
              PackageElement abbrevPkg = configuration.workArounds.getAbbreviatedPackageElement(pkg);
              printedPackageHeaders.add(abbrevPkg);
          }
          contentListTree.addContent(HtmlTree.LI(link));
*** 191,206 ****
          Content pkgNameContent;
          if (!first && configuration.allowTag(HtmlTag.SECTION)) {
              summariesTree.addContent(summaryTree);
          }
          if (pkg.isUnnamed()) {
!             summariesTree.addContent(getMarkerAnchor(
!                     SectionName.UNNAMED_PACKAGE_ANCHOR));
              pkgNameContent = contents.defaultPackageLabel;
          } else {
              String parsedPackageName = utils.parsePackageName(pkg);
!             summariesTree.addContent(getMarkerAnchor(parsedPackageName));
              pkgNameContent = getPackageLabel(parsedPackageName);
          }
          Content headingContent = new StringContent(".*");
          Content heading = HtmlTree.HEADING(HtmlConstants.PACKAGE_HEADING, true,
                  pkgNameContent);
--- 191,205 ----
          Content pkgNameContent;
          if (!first && configuration.allowTag(HtmlTag.SECTION)) {
              summariesTree.addContent(summaryTree);
          }
          if (pkg.isUnnamed()) {
!             summariesTree.addContent(links.createAnchor(SectionName.UNNAMED_PACKAGE_ANCHOR));
              pkgNameContent = contents.defaultPackageLabel;
          } else {
              String parsedPackageName = utils.parsePackageName(pkg);
!             summariesTree.addContent(links.createAnchor(parsedPackageName));
              pkgNameContent = getPackageLabel(parsedPackageName);
          }
          Content headingContent = new StringContent(".*");
          Content heading = HtmlTree.HEADING(HtmlConstants.PACKAGE_HEADING, true,
                  pkgNameContent);
*** 275,286 ****
       *
       * @param member the field to be documented.
       * @return the type column of the constant table row
       */
      private Content getTypeColumn(VariableElement member) {
!         Content anchor = getMarkerAnchor(currentTypeElement.getQualifiedName() +
!                 "." + member.getSimpleName());
          Content typeContent = new ContentBuilder();
          typeContent.addContent(anchor);
          Content code = new HtmlTree(HtmlTag.CODE);
          for (Modifier mod : member.getModifiers()) {
              Content modifier = new StringContent(mod.toString());
--- 274,285 ----
       *
       * @param member the field to be documented.
       * @return the type column of the constant table row
       */
      private Content getTypeColumn(VariableElement member) {
!         Content anchor = links.createAnchor(
!                 currentTypeElement.getQualifiedName() + "." + member.getSimpleName());
          Content typeContent = new ContentBuilder();
          typeContent.addContent(anchor);
          Content code = new HtmlTree(HtmlTag.CODE);
          for (Modifier mod : member.getModifiers()) {
              Content modifier = new StringContent(mod.toString());