src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriterImpl.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.Content;
  import jdk.javadoc.internal.doclets.toolkit.PackageSummaryWriter;
  import jdk.javadoc.internal.doclets.toolkit.util.CommentHelper;
  import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
*** 318,328 ****
       */
      @Override
      public void addPackageDescription(Content packageContentTree) {
          if (!utils.getBody(packageElement).isEmpty()) {
              Content tree = configuration.allowTag(HtmlTag.SECTION) ? sectionTree : packageContentTree;
!             tree.addContent(getMarkerAnchor(SectionName.PACKAGE_DESCRIPTION));
              addDeprecationInfo(tree);
              addInlineComment(packageElement, tree);
          }
      }
  
--- 319,329 ----
       */
      @Override
      public void addPackageDescription(Content packageContentTree) {
          if (!utils.getBody(packageElement).isEmpty()) {
              Content tree = configuration.allowTag(HtmlTag.SECTION) ? sectionTree : packageContentTree;
!             tree.addContent(links.createAnchor(SectionName.PACKAGE_DESCRIPTION));
              addDeprecationInfo(tree);
              addInlineComment(packageElement, tree);
          }
      }
  
*** 382,392 ****
       *
       * @return a content tree for the class use link
       */
      @Override
      protected Content getNavLinkClassUse() {
!         Content useLink = getHyperLink(DocPaths.PACKAGE_USE,
                  contents.useLabel, "", "");
          Content li = HtmlTree.LI(useLink);
          return li;
      }
  
--- 383,393 ----
       *
       * @return a content tree for the class use link
       */
      @Override
      protected Content getNavLinkClassUse() {
!         Content useLink = Links.createLink(DocPaths.PACKAGE_USE,
                  contents.useLabel, "", "");
          Content li = HtmlTree.LI(useLink);
          return li;
      }
  
*** 400,410 ****
          Content li;
          if (prev == null) {
              li = HtmlTree.LI(contents.prevPackageLabel);
          } else {
              DocPath p = DocPath.relativePath(packageElement, prev);
!             li = HtmlTree.LI(getHyperLink(p.resolve(DocPaths.PACKAGE_SUMMARY),
                  contents.prevPackageLabel, "", ""));
          }
          return li;
      }
  
--- 401,411 ----
          Content li;
          if (prev == null) {
              li = HtmlTree.LI(contents.prevPackageLabel);
          } else {
              DocPath p = DocPath.relativePath(packageElement, prev);
!             li = HtmlTree.LI(Links.createLink(p.resolve(DocPaths.PACKAGE_SUMMARY),
                  contents.prevPackageLabel, "", ""));
          }
          return li;
      }
  
*** 418,428 ****
          Content li;
          if (next == null) {
              li = HtmlTree.LI(contents.nextPackageLabel);
          } else {
              DocPath p = DocPath.relativePath(packageElement, next);
!             li = HtmlTree.LI(getHyperLink(p.resolve(DocPaths.PACKAGE_SUMMARY),
                  contents.nextPackageLabel, "", ""));
          }
          return li;
      }
  
--- 419,429 ----
          Content li;
          if (next == null) {
              li = HtmlTree.LI(contents.nextPackageLabel);
          } else {
              DocPath p = DocPath.relativePath(packageElement, next);
!             li = HtmlTree.LI(Links.createLink(p.resolve(DocPaths.PACKAGE_SUMMARY),
                  contents.nextPackageLabel, "", ""));
          }
          return li;
      }
  
*** 432,442 ****
       *
       * @return a content tree for the tree link
       */
      @Override
      protected Content getNavLinkTree() {
!         Content useLink = getHyperLink(DocPaths.PACKAGE_TREE,
                  contents.treeLabel, "", "");
          Content li = HtmlTree.LI(useLink);
          return li;
      }
  
--- 433,443 ----
       *
       * @return a content tree for the tree link
       */
      @Override
      protected Content getNavLinkTree() {
!         Content useLink = Links.createLink(DocPaths.PACKAGE_TREE,
                  contents.treeLabel, "", "");
          Content li = HtmlTree.LI(useLink);
          return li;
      }