src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.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.TableHeader;
  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.AnnotationTypeRequiredMemberWriter;
  import jdk.javadoc.internal.doclets.toolkit.Content;
  import jdk.javadoc.internal.doclets.toolkit.MemberSummaryWriter;
  
*** 108,118 ****
       * {@inheritDoc}
       */
      public void addAnnotationDetailsTreeHeader(TypeElement te,
              Content memberDetailsTree) {
          if (!writer.printedAnnotationHeading) {
!             memberDetailsTree.addContent(writer.getMarkerAnchor(
                      SectionName.ANNOTATION_TYPE_ELEMENT_DETAIL));
              Content heading = HtmlTree.HEADING(HtmlConstants.DETAILS_HEADING,
                      contents.annotationTypeDetailsLabel);
              memberDetailsTree.addContent(heading);
              writer.printedAnnotationHeading = true;
--- 109,119 ----
       * {@inheritDoc}
       */
      public void addAnnotationDetailsTreeHeader(TypeElement te,
              Content memberDetailsTree) {
          if (!writer.printedAnnotationHeading) {
!             memberDetailsTree.addContent(links.createAnchor(
                      SectionName.ANNOTATION_TYPE_ELEMENT_DETAIL));
              Content heading = HtmlTree.HEADING(HtmlConstants.DETAILS_HEADING,
                      contents.annotationTypeDetailsLabel);
              memberDetailsTree.addContent(heading);
              writer.printedAnnotationHeading = true;
*** 120,134 ****
      }
  
      /**
       * {@inheritDoc}
       */
!     public Content getAnnotationDocTreeHeader(Element member,
!             Content annotationDetailsTree) {
          String simpleName = name(member);
!         annotationDetailsTree.addContent(writer.getMarkerAnchor(simpleName +
!                 utils.signature((ExecutableElement) member)));
          Content annotationDocTree = writer.getMemberTreeHeader();
          Content heading = new HtmlTree(HtmlConstants.MEMBER_HEADING);
          heading.addContent(simpleName);
          annotationDocTree.addContent(heading);
          return annotationDocTree;
--- 121,135 ----
      }
  
      /**
       * {@inheritDoc}
       */
!     @Override
!     public Content getAnnotationDocTreeHeader(Element member, Content annotationDetailsTree) {
          String simpleName = name(member);
!         annotationDetailsTree.addContent(links.createAnchor(
!                 simpleName + utils.signature((ExecutableElement) member)));
          Content annotationDocTree = writer.getMemberTreeHeader();
          Content heading = new HtmlTree(HtmlConstants.MEMBER_HEADING);
          heading.addContent(simpleName);
          annotationDocTree.addContent(heading);
          return annotationDocTree;
*** 247,257 ****
  
      /**
       * {@inheritDoc}
       */
      public void addSummaryAnchor(TypeElement typeElement, Content memberTree) {
!         memberTree.addContent(writer.getMarkerAnchor(
                  SectionName.ANNOTATION_TYPE_REQUIRED_ELEMENT_SUMMARY));
      }
  
      /**
       * {@inheritDoc}
--- 248,258 ----
  
      /**
       * {@inheritDoc}
       */
      public void addSummaryAnchor(TypeElement typeElement, Content memberTree) {
!         memberTree.addContent(links.createAnchor(
                  SectionName.ANNOTATION_TYPE_REQUIRED_ELEMENT_SUMMARY));
      }
  
      /**
       * {@inheritDoc}
*** 302,312 ****
      /**
       * {@inheritDoc}
       */
      protected Content getNavSummaryLink(TypeElement typeElement, boolean link) {
          if (link) {
!             return writer.getHyperLink(
                      SectionName.ANNOTATION_TYPE_REQUIRED_ELEMENT_SUMMARY,
                      contents.navAnnotationTypeRequiredMember);
          } else {
              return contents.navAnnotationTypeRequiredMember;
          }
--- 303,313 ----
      /**
       * {@inheritDoc}
       */
      protected Content getNavSummaryLink(TypeElement typeElement, boolean link) {
          if (link) {
!             return Links.createLink(
                      SectionName.ANNOTATION_TYPE_REQUIRED_ELEMENT_SUMMARY,
                      contents.navAnnotationTypeRequiredMember);
          } else {
              return contents.navAnnotationTypeRequiredMember;
          }
*** 315,325 ****
      /**
       * {@inheritDoc}
       */
      protected void addNavDetailLink(boolean link, Content liNav) {
          if (link) {
!             liNav.addContent(writer.getHyperLink(
                      SectionName.ANNOTATION_TYPE_ELEMENT_DETAIL,
                      contents.navAnnotationTypeMember));
          } else {
              liNav.addContent(contents.navAnnotationTypeMember);
          }
--- 316,326 ----
      /**
       * {@inheritDoc}
       */
      protected void addNavDetailLink(boolean link, Content liNav) {
          if (link) {
!             liNav.addContent(Links.createLink(
                      SectionName.ANNOTATION_TYPE_ELEMENT_DETAIL,
                      contents.navAnnotationTypeMember));
          } else {
              liNav.addContent(contents.navAnnotationTypeMember);
          }