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

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

*** 35,44 ****
--- 35,45 ----
  
  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.MemberSummaryWriter;
  import jdk.javadoc.internal.doclets.toolkit.PropertyWriter;
  
*** 88,99 ****
      @Override
      public Content getPropertyDetailsTreeHeader(TypeElement typeElement,
              Content memberDetailsTree) {
          memberDetailsTree.addContent(HtmlConstants.START_OF_PROPERTY_DETAILS);
          Content propertyDetailsTree = writer.getMemberTreeHeader();
!         propertyDetailsTree.addContent(writer.getMarkerAnchor(
!                 SectionName.PROPERTY_DETAIL));
          Content heading = HtmlTree.HEADING(HtmlConstants.DETAILS_HEADING,
                  contents.propertyDetailsLabel);
          propertyDetailsTree.addContent(heading);
          return propertyDetailsTree;
      }
--- 89,99 ----
      @Override
      public Content getPropertyDetailsTreeHeader(TypeElement typeElement,
              Content memberDetailsTree) {
          memberDetailsTree.addContent(HtmlConstants.START_OF_PROPERTY_DETAILS);
          Content propertyDetailsTree = writer.getMemberTreeHeader();
!         propertyDetailsTree.addContent(links.createAnchor(SectionName.PROPERTY_DETAIL));
          Content heading = HtmlTree.HEADING(HtmlConstants.DETAILS_HEADING,
                  contents.propertyDetailsLabel);
          propertyDetailsTree.addContent(heading);
          return propertyDetailsTree;
      }
*** 102,113 ****
       * {@inheritDoc}
       */
      @Override
      public Content getPropertyDocTreeHeader(ExecutableElement property,
              Content propertyDetailsTree) {
!         propertyDetailsTree.addContent(
!                 writer.getMarkerAnchor(name(property)));
          Content propertyDocTree = writer.getMemberTreeHeader();
          Content heading = new HtmlTree(HtmlConstants.MEMBER_HEADING);
          heading.addContent(utils.getPropertyLabel(name(property)));
          propertyDocTree.addContent(heading);
          return propertyDocTree;
--- 102,112 ----
       * {@inheritDoc}
       */
      @Override
      public Content getPropertyDocTreeHeader(ExecutableElement property,
              Content propertyDetailsTree) {
!         propertyDetailsTree.addContent(links.createAnchor(name(property)));
          Content propertyDocTree = writer.getMemberTreeHeader();
          Content heading = new HtmlTree(HtmlConstants.MEMBER_HEADING);
          heading.addContent(utils.getPropertyLabel(name(property)));
          propertyDocTree.addContent(heading);
          return propertyDocTree;
*** 251,270 ****
      /**
       * {@inheritDoc}
       */
      @Override
      public void addSummaryAnchor(TypeElement typeElement, Content memberTree) {
!         memberTree.addContent(writer.getMarkerAnchor(
!                 SectionName.PROPERTY_SUMMARY));
      }
  
      /**
       * {@inheritDoc}
       */
      @Override
      public void addInheritedSummaryAnchor(TypeElement typeElement, Content inheritedTree) {
!         inheritedTree.addContent(writer.getMarkerAnchor(
                  SectionName.PROPERTIES_INHERITANCE,
                  configuration.getClassName(typeElement)));
      }
  
      /**
--- 250,268 ----
      /**
       * {@inheritDoc}
       */
      @Override
      public void addSummaryAnchor(TypeElement typeElement, Content memberTree) {
!         memberTree.addContent(links.createAnchor(SectionName.PROPERTY_SUMMARY));
      }
  
      /**
       * {@inheritDoc}
       */
      @Override
      public void addInheritedSummaryAnchor(TypeElement typeElement, Content inheritedTree) {
!         inheritedTree.addContent(links.createAnchor(
                  SectionName.PROPERTIES_INHERITANCE,
                  configuration.getClassName(typeElement)));
      }
  
      /**
*** 342,356 ****
       */
      @Override
      protected Content getNavSummaryLink(TypeElement typeElement, boolean link) {
          if (link) {
              if (typeElement == null) {
!                 return writer.getHyperLink(
                  SectionName.PROPERTY_SUMMARY,
                  contents.navProperty);
              } else {
!                 return writer.getHyperLink(
                  SectionName.PROPERTIES_INHERITANCE,
                  configuration.getClassName(typeElement), contents.navProperty);
              }
          } else {
              return contents.navProperty;
--- 340,354 ----
       */
      @Override
      protected Content getNavSummaryLink(TypeElement typeElement, boolean link) {
          if (link) {
              if (typeElement == null) {
!                 return Links.createLink(
                          SectionName.PROPERTY_SUMMARY,
                          contents.navProperty);
              } else {
!                 return links.createLink(
                          SectionName.PROPERTIES_INHERITANCE,
                          configuration.getClassName(typeElement), contents.navProperty);
              }
          } else {
              return contents.navProperty;
*** 361,371 ****
       * {@inheritDoc}
       */
      @Override
      protected void addNavDetailLink(boolean link, Content liNav) {
          if (link) {
!             liNav.addContent(writer.getHyperLink(
                      SectionName.PROPERTY_DETAIL,
                      contents.navProperty));
          } else {
              liNav.addContent(contents.navProperty);
          }
--- 359,369 ----
       * {@inheritDoc}
       */
      @Override
      protected void addNavDetailLink(boolean link, Content liNav) {
          if (link) {
!             liNav.addContent(Links.createLink(
                      SectionName.PROPERTY_DETAIL,
                      contents.navProperty));
          } else {
              liNav.addContent(contents.navProperty);
          }