--- old/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeFieldWriterImpl.java 2020-01-07 15:23:38.000000000 +0100 +++ new/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeFieldWriterImpl.java 2020-01-07 15:23:38.000000000 +0100 @@ -70,7 +70,7 @@ memberSummaryTree.add( MarkerComments.START_OF_ANNOTATION_TYPE_FIELD_SUMMARY); Content memberTree = new ContentBuilder(); - writer.addSummaryHeader(this, typeElement, memberTree); + writer.addSummaryHeader(this, memberTree); return memberTree; } @@ -85,7 +85,8 @@ * {@inheritDoc} */ public void addMemberTree(Content memberSummaryTree, Content memberTree) { - writer.addMemberTree(HtmlStyle.fieldSummary, memberSummaryTree, memberTree); + writer.addMemberTree(HtmlStyle.fieldSummary, + SectionName.ANNOTATION_TYPE_FIELD_SUMMARY, memberSummaryTree, memberTree); } /** @@ -98,13 +99,11 @@ /** * {@inheritDoc} */ - public Content getAnnotationDetailsTreeHeader(TypeElement typeElement) { + public Content getAnnotationDetailsTreeHeader() { Content memberDetailsTree = new ContentBuilder(); if (!writer.printedAnnotationFieldHeading) { Content heading = HtmlTree.HEADING(Headings.TypeDeclaration.DETAILS_HEADING, contents.fieldDetailsLabel); - memberDetailsTree.add(links.createAnchor( - SectionName.ANNOTATION_TYPE_FIELD_DETAIL)); memberDetailsTree.add(heading); writer.printedAnnotationFieldHeading = true; } @@ -114,13 +113,12 @@ /** * {@inheritDoc} */ - public Content getAnnotationDocTreeHeader(Element member, - Content annotationDetailsTree) { + public Content getAnnotationDocTreeHeader(Element member) { Content annotationDocTree = new ContentBuilder(); - Content heading = new HtmlTree(Headings.TypeDeclaration.MEMBER_HEADING); - heading.add(links.createAnchor(name(member), new StringContent(name(member)))); + Content heading = new HtmlTree(Headings.TypeDeclaration.MEMBER_HEADING, + new StringContent(name(member))); annotationDocTree.add(heading); - return HtmlTree.SECTION(HtmlStyle.detail, annotationDocTree); + return HtmlTree.SECTION(HtmlStyle.detail, annotationDocTree).setId(name(member)); } /** @@ -160,7 +158,8 @@ Content annotationDetails = new ContentBuilder(); annotationDetails.add(annotationDetailsTreeHeader); annotationDetails.add(annotationDetailsTree); - return getMemberTree(HtmlTree.SECTION(HtmlStyle.fieldDetails, annotationDetails)); + return getMemberTree(HtmlTree.SECTION(HtmlStyle.fieldDetails, annotationDetails) + .setId(SectionName.ANNOTATION_TYPE_FIELD_DETAIL.getName())); } /** @@ -174,7 +173,7 @@ * {@inheritDoc} */ public void addSummaryLabel(Content memberTree) { - Content label = HtmlTree.HEADING(Headings.TypeDeclaration.SUMMARY_HEADING, + HtmlTree label = HtmlTree.HEADING(Headings.TypeDeclaration.SUMMARY_HEADING, contents.fieldSummaryLabel); memberTree.add(label); } @@ -206,22 +205,6 @@ * {@inheritDoc} */ @Override - public void addSummaryAnchor(TypeElement typeElement, Content memberTree) { - memberTree.add(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) { }