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

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

*** 48,57 ****
--- 48,58 ----
  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.RawHtml;
  import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
  import jdk.javadoc.internal.doclets.toolkit.Content;
  import jdk.javadoc.internal.doclets.toolkit.ModuleSummaryWriter;
  import jdk.javadoc.internal.doclets.toolkit.util.CommentHelper;
*** 453,463 ****
       * @param htmltree the content tree to which the information is added
       */
      public void addSummaryHeader(Content startMarker, SectionName markerAnchor, Content heading,
              Content htmltree) {
          htmltree.addContent(startMarker);
!         htmltree.addContent(getMarkerAnchor(markerAnchor));
          htmltree.addContent(HtmlTree.HEADING(HtmlTag.H3, heading));
      }
  
      /**
       * Get a table.
--- 454,464 ----
       * @param htmltree the content tree to which the information is added
       */
      public void addSummaryHeader(Content startMarker, SectionName markerAnchor, Content heading,
              Content htmltree) {
          htmltree.addContent(startMarker);
!         htmltree.addContent(links.createAnchor(markerAnchor));
          htmltree.addContent(HtmlTree.HEADING(HtmlTag.H3, heading));
      }
  
      /**
       * Get a table.
*** 844,854 ****
      public void addModuleDescription(Content moduleContentTree) {
          if (!utils.getFullBody(mdle).isEmpty()) {
              Content tree = configuration.allowTag(HtmlTag.SECTION) ? HtmlTree.SECTION() : moduleContentTree;
              addDeprecationInfo(tree);
              tree.addContent(HtmlConstants.START_OF_MODULE_DESCRIPTION);
!             tree.addContent(getMarkerAnchor(SectionName.MODULE_DESCRIPTION));
              addInlineComment(mdle, tree);
              if (configuration.allowTag(HtmlTag.SECTION)) {
                  moduleContentTree.addContent(tree);
              }
          }
--- 845,855 ----
      public void addModuleDescription(Content moduleContentTree) {
          if (!utils.getFullBody(mdle).isEmpty()) {
              Content tree = configuration.allowTag(HtmlTag.SECTION) ? HtmlTree.SECTION() : moduleContentTree;
              addDeprecationInfo(tree);
              tree.addContent(HtmlConstants.START_OF_MODULE_DESCRIPTION);
!             tree.addContent(links.createAnchor(SectionName.MODULE_DESCRIPTION));
              addInlineComment(mdle, tree);
              if (configuration.allowTag(HtmlTag.SECTION)) {
                  moduleContentTree.addContent(tree);
              }
          }
*** 888,911 ****
          Content li = HtmlTree.LI(contents.moduleSubNavLabel);
          li.addContent(Contents.SPACE);
          Content ulNav = HtmlTree.UL(HtmlStyle.subNavList, li);
          Content liNav = new HtmlTree(HtmlTag.LI);
          liNav.addContent(!utils.getFullBody(mdle).isEmpty() && !configuration.nocomment
!                 ? getHyperLink(SectionName.MODULE_DESCRIPTION, contents.navModuleDescription)
                  : contents.navModuleDescription);
          addNavGap(liNav);
          liNav.addContent((display(requires) || display(indirectModules))
!                 ? getHyperLink(SectionName.MODULES, contents.navModules)
                  : contents.navModules);
          addNavGap(liNav);
          liNav.addContent((display(exportedPackages) || display(openedPackages) || display(concealedPackages)
                  || display(indirectPackages) || display(indirectOpenPackages))
!                 ? getHyperLink(SectionName.PACKAGES, contents.navPackages)
                  : contents.navPackages);
          addNavGap(liNav);
          liNav.addContent((displayServices(uses, usesTrees) || displayServices(provides.keySet(), providesTrees))
!                 ? getHyperLink(SectionName.SERVICES, contents.navServices)
                  : contents.navServices);
          ulNav.addContent(liNav);
          return ulNav;
      }
  
--- 889,912 ----
          Content li = HtmlTree.LI(contents.moduleSubNavLabel);
          li.addContent(Contents.SPACE);
          Content ulNav = HtmlTree.UL(HtmlStyle.subNavList, li);
          Content liNav = new HtmlTree(HtmlTag.LI);
          liNav.addContent(!utils.getFullBody(mdle).isEmpty() && !configuration.nocomment
!                 ? Links.createLink(SectionName.MODULE_DESCRIPTION, contents.navModuleDescription)
                  : contents.navModuleDescription);
          addNavGap(liNav);
          liNav.addContent((display(requires) || display(indirectModules))
!                 ? Links.createLink(SectionName.MODULES, contents.navModules)
                  : contents.navModules);
          addNavGap(liNav);
          liNav.addContent((display(exportedPackages) || display(openedPackages) || display(concealedPackages)
                  || display(indirectPackages) || display(indirectOpenPackages))
!                 ? Links.createLink(SectionName.PACKAGES, contents.navPackages)
                  : contents.navPackages);
          addNavGap(liNav);
          liNav.addContent((displayServices(uses, usesTrees) || displayServices(provides.keySet(), providesTrees))
!                 ? Links.createLink(SectionName.SERVICES, contents.navServices)
                  : contents.navServices);
          ulNav.addContent(liNav);
          return ulNav;
      }
  
*** 993,1003 ****
      public Content getNavLinkPrevious() {
          Content li;
          if (prevModule == null) {
              li = HtmlTree.LI(contents.prevModuleLabel);
          } else {
!             li = HtmlTree.LI(getHyperLink(pathToRoot.resolve(DocPaths.moduleSummary(
                      prevModule)), contents.prevModuleLabel, "", ""));
          }
          return li;
      }
  
--- 994,1004 ----
      public Content getNavLinkPrevious() {
          Content li;
          if (prevModule == null) {
              li = HtmlTree.LI(contents.prevModuleLabel);
          } else {
!             li = HtmlTree.LI(Links.createLink(pathToRoot.resolve(DocPaths.moduleSummary(
                      prevModule)), contents.prevModuleLabel, "", ""));
          }
          return li;
      }
  
*** 1010,1020 ****
      public Content getNavLinkNext() {
          Content li;
          if (nextModule == null) {
              li = HtmlTree.LI(contents.nextModuleLabel);
          } else {
!             li = HtmlTree.LI(getHyperLink(pathToRoot.resolve(DocPaths.moduleSummary(
                      nextModule)), contents.nextModuleLabel, "", ""));
          }
          return li;
      }
  }
--- 1011,1021 ----
      public Content getNavLinkNext() {
          Content li;
          if (nextModule == null) {
              li = HtmlTree.LI(contents.nextModuleLabel);
          } else {
!             li = HtmlTree.LI(Links.createLink(pathToRoot.resolve(DocPaths.moduleSummary(
                      nextModule)), contents.nextModuleLabel, "", ""));
          }
          return li;
      }
  }