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

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

*** 36,45 ****
--- 36,46 ----
  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.Content;
  import jdk.javadoc.internal.doclets.toolkit.util.ClassUseMapper;
  import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
  import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
*** 176,186 ****
                  .setCaption(caption)
                  .setHeader(getPackageTableHeader())
                  .setColumnStyles(HtmlStyle.colFirst, HtmlStyle.colLast);
          for (String pkgname: usingPackageToUsedClasses.keySet()) {
              PackageElement pkg = utils.elementUtils.getPackageElement(pkgname);
!             Content packageLink = getHyperLink(utils.getPackageName(pkg),
                      new StringContent(utils.getPackageName(pkg)));
              Content summary = new ContentBuilder();
              if (pkg != null && !pkg.isUnnamed()) {
                  addSummaryComment(pkg, summary);
              } else {
--- 177,187 ----
                  .setCaption(caption)
                  .setHeader(getPackageTableHeader())
                  .setColumnStyles(HtmlStyle.colFirst, HtmlStyle.colLast);
          for (String pkgname: usingPackageToUsedClasses.keySet()) {
              PackageElement pkg = utils.elementUtils.getPackageElement(pkgname);
!             Content packageLink = links.createLink(utils.getPackageName(pkg),
                      new StringContent(utils.getPackageName(pkg)));
              Content summary = new ContentBuilder();
              if (pkg != null && !pkg.isUnnamed()) {
                  addSummaryComment(pkg, summary);
              } else {
*** 203,213 ****
          for (String packageName : usingPackageToUsedClasses.keySet()) {
              PackageElement usingPackage = utils.elementUtils.getPackageElement(packageName);
              HtmlTree li = new HtmlTree(HtmlTag.LI);
              li.setStyle(HtmlStyle.blockList);
              if (usingPackage != null) {
!                 li.addContent(getMarkerAnchor(utils.getPackageName(usingPackage)));
              }
              String tableSummary = resources.getText("doclet.Use_Table_Summary",
                                                          resources.getText("doclet.classes"));
              Content caption = contents.getContent(
                      "doclet.ClassUse_Classes.in.0.used.by.1",
--- 204,214 ----
          for (String packageName : usingPackageToUsedClasses.keySet()) {
              PackageElement usingPackage = utils.elementUtils.getPackageElement(packageName);
              HtmlTree li = new HtmlTree(HtmlTag.LI);
              li.setStyle(HtmlStyle.blockList);
              if (usingPackage != null) {
!                 li.addContent(links.createAnchor(utils.getPackageName(usingPackage)));
              }
              String tableSummary = resources.getText("doclet.Use_Table_Summary",
                                                          resources.getText("doclet.classes"));
              Content caption = contents.getContent(
                      "doclet.ClassUse_Classes.in.0.used.by.1",
*** 220,230 ****
                      .setColumnStyles(HtmlStyle.colFirst, HtmlStyle.colLast);
              for (TypeElement te : usingPackageToUsedClasses.get(packageName)) {
                  DocPath dp = pathString(te,
                          DocPaths.CLASS_USE.resolve(DocPath.forName(utils, te)));
                  Content stringContent = new StringContent(utils.getSimpleName(te));
!                 Content typeContent = getHyperLink(dp.fragment(getPackageAnchorName(usingPackage)),
                          stringContent);
                  Content summary = new ContentBuilder();
                  addIndexComment(te, summary);
  
                  table.addRow(typeContent, summary);
--- 221,231 ----
                      .setColumnStyles(HtmlStyle.colFirst, HtmlStyle.colLast);
              for (TypeElement te : usingPackageToUsedClasses.get(packageName)) {
                  DocPath dp = pathString(te,
                          DocPaths.CLASS_USE.resolve(DocPath.forName(utils, te)));
                  Content stringContent = new StringContent(utils.getSimpleName(te));
!                 Content typeContent = Links.createLink(dp.fragment(getPackageAnchorName(usingPackage)),
                          stringContent);
                  Content summary = new ContentBuilder();
                  addIndexComment(te, summary);
  
                  table.addRow(typeContent, summary);
*** 285,295 ****
       *
       * @return a content tree for the package link
       */
      @Override
      protected Content getNavLinkPackage() {
!         Content linkContent = getHyperLink(DocPaths.PACKAGE_SUMMARY,
                  contents.packageLabel);
          Content li = HtmlTree.LI(linkContent);
          return li;
      }
  
--- 286,296 ----
       *
       * @return a content tree for the package link
       */
      @Override
      protected Content getNavLinkPackage() {
!         Content linkContent = Links.createLink(DocPaths.PACKAGE_SUMMARY,
                  contents.packageLabel);
          Content li = HtmlTree.LI(linkContent);
          return li;
      }
  
*** 309,319 ****
       *
       * @return a content tree for the tree link
       */
      @Override
      protected Content getNavLinkTree() {
!         Content linkContent = getHyperLink(DocPaths.PACKAGE_TREE,
                  contents.treeLabel);
          Content li = HtmlTree.LI(linkContent);
          return li;
      }
  }
--- 310,320 ----
       *
       * @return a content tree for the tree link
       */
      @Override
      protected Content getNavLinkTree() {
!         Content linkContent = Links.createLink(DocPaths.PACKAGE_TREE,
                  contents.treeLabel);
          Content li = HtmlTree.LI(linkContent);
          return li;
      }
  }