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

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

*** 37,46 ****
--- 37,47 ----
  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.AnnotationTypeFieldWriter;
  import jdk.javadoc.internal.doclets.toolkit.Content;
  import jdk.javadoc.internal.doclets.toolkit.MemberSummaryWriter;
  
*** 106,116 ****
       * {@inheritDoc}
       */
      public void addAnnotationDetailsTreeHeader(TypeElement typeElement,
              Content memberDetailsTree) {
          if (!writer.printedAnnotationFieldHeading) {
!             memberDetailsTree.addContent(writer.getMarkerAnchor(
                      SectionName.ANNOTATION_TYPE_FIELD_DETAIL));
              Content heading = HtmlTree.HEADING(HtmlConstants.DETAILS_HEADING,
                      contents.fieldDetailsLabel);
              memberDetailsTree.addContent(heading);
              writer.printedAnnotationFieldHeading = true;
--- 107,117 ----
       * {@inheritDoc}
       */
      public void addAnnotationDetailsTreeHeader(TypeElement typeElement,
              Content memberDetailsTree) {
          if (!writer.printedAnnotationFieldHeading) {
!             memberDetailsTree.addContent(links.createAnchor(
                      SectionName.ANNOTATION_TYPE_FIELD_DETAIL));
              Content heading = HtmlTree.HEADING(HtmlConstants.DETAILS_HEADING,
                      contents.fieldDetailsLabel);
              memberDetailsTree.addContent(heading);
              writer.printedAnnotationFieldHeading = true;
*** 120,131 ****
      /**
       * {@inheritDoc}
       */
      public Content getAnnotationDocTreeHeader(Element member,
              Content annotationDetailsTree) {
!         annotationDetailsTree.addContent(
!                 writer.getMarkerAnchor(name(member)));
          Content annotationDocTree = writer.getMemberTreeHeader();
          Content heading = new HtmlTree(HtmlConstants.MEMBER_HEADING);
          heading.addContent(name(member));
          annotationDocTree.addContent(heading);
          return annotationDocTree;
--- 121,131 ----
      /**
       * {@inheritDoc}
       */
      public Content getAnnotationDocTreeHeader(Element member,
              Content annotationDetailsTree) {
!         annotationDetailsTree.addContent(links.createAnchor(name(member)));
          Content annotationDocTree = writer.getMemberTreeHeader();
          Content heading = new HtmlTree(HtmlConstants.MEMBER_HEADING);
          heading.addContent(name(member));
          annotationDocTree.addContent(heading);
          return annotationDocTree;
*** 239,268 ****
      }
  
      /**
       * {@inheritDoc}
       */
      public void addSummaryAnchor(TypeElement typeElement, Content memberTree) {
!         memberTree.addContent(writer.getMarkerAnchor(
                  SectionName.ANNOTATION_TYPE_FIELD_SUMMARY));
      }
  
      /**
       * {@inheritDoc}
       */
      public void addInheritedSummaryAnchor(TypeElement typeElement, Content inheritedTree) {
      }
  
      /**
       * {@inheritDoc}
       */
      public void addInheritedSummaryLabel(TypeElement typeElement, Content inheritedTree) {
      }
  
      /**
       * {@inheritDoc}
       */
      protected void addSummaryLink(LinkInfoImpl.Kind context, TypeElement typeElement, Element member,
              Content tdSummary) {
          Content memberLink = HtmlTree.SPAN(HtmlStyle.memberNameLink,
                  writer.getDocLink(context, member, name(member), false));
          Content code = HtmlTree.CODE(memberLink);
--- 239,272 ----
      }
  
      /**
       * {@inheritDoc}
       */
+     @Override
      public void addSummaryAnchor(TypeElement typeElement, Content memberTree) {
!         memberTree.addContent(links.createAnchor(
                  SectionName.ANNOTATION_TYPE_FIELD_SUMMARY));
      }
  
      /**
       * {@inheritDoc}
       */
+     @Override
      public void addInheritedSummaryAnchor(TypeElement typeElement, Content inheritedTree) {
      }
  
      /**
       * {@inheritDoc}
       */
+     @Override
      public void addInheritedSummaryLabel(TypeElement typeElement, Content inheritedTree) {
      }
  
      /**
       * {@inheritDoc}
       */
+     @Override
      protected void addSummaryLink(LinkInfoImpl.Kind context, TypeElement typeElement, Element member,
              Content tdSummary) {
          Content memberLink = HtmlTree.SPAN(HtmlStyle.memberNameLink,
                  writer.getDocLink(context, member, name(member), false));
          Content code = HtmlTree.CODE(memberLink);
*** 295,305 ****
      /**
       * {@inheritDoc}
       */
      protected Content getNavSummaryLink(TypeElement typeElement, boolean link) {
          if (link) {
!             return writer.getHyperLink(
                      SectionName.ANNOTATION_TYPE_FIELD_SUMMARY,
                      contents.navField);
          } else {
              return contents.navField;
          }
--- 299,309 ----
      /**
       * {@inheritDoc}
       */
      protected Content getNavSummaryLink(TypeElement typeElement, boolean link) {
          if (link) {
!             return Links.createLink(
                      SectionName.ANNOTATION_TYPE_FIELD_SUMMARY,
                      contents.navField);
          } else {
              return contents.navField;
          }
*** 308,318 ****
      /**
       * {@inheritDoc}
       */
      protected void addNavDetailLink(boolean link, Content liNav) {
          if (link) {
!             liNav.addContent(writer.getHyperLink(
                      SectionName.ANNOTATION_TYPE_FIELD_DETAIL,
                      contents.navField));
          } else {
              liNav.addContent(contents.navField);
          }
--- 312,322 ----
      /**
       * {@inheritDoc}
       */
      protected void addNavDetailLink(boolean link, Content liNav) {
          if (link) {
!             liNav.addContent(Links.createLink(
                      SectionName.ANNOTATION_TYPE_FIELD_DETAIL,
                      contents.navField));
          } else {
              liNav.addContent(contents.navField);
          }