Mercurial > jdk8-mips64-public > langtools / changeset
changeset
8025633: Fix javadoc to generate valid anchor names
Thu, 10 Oct 2013 10:51:15 -0700
- author
- bpatel
- date
- Thu, 10 Oct 2013 10:51:15 -0700
- changeset 2101
- 933ba3f81a87
- parent 2100
- 1e7ad879f15e
- child 2102
- 6dcf94e32a3a
8025633: Fix javadoc to generate valid anchor names
Reviewed-by: jjg
1.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java Thu Oct 10 08:51:55 2013 +0200 1.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java Thu Oct 10 10:51:15 2013 -0700 1.3 @@ -305,6 +305,6 @@ 1.4 buf.append(t.dimension()); 1.5 } 1.6 buf.append(")"); 1.7 - return foundTypeVariable ? buf.toString() : null; 1.8 + return foundTypeVariable ? writer.getName(buf.toString()) : null; 1.9 } 1.10 }
2.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/AbstractIndexWriter.java Thu Oct 10 08:51:55 2013 +0200 2.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AbstractIndexWriter.java Thu Oct 10 10:51:15 2013 -0700 2.3 @@ -89,10 +89,11 @@ 2.4 * @param memberlist List of members for the unicode character 2.5 * @param contentTree the content tree to which the information will be added 2.6 */ 2.7 - protected void addContents(Character unicode, List<? extends Doc> memberlist, 2.8 + protected void addContents(Character uc, List<? extends Doc> memberlist, 2.9 Content contentTree) { 2.10 - contentTree.addContent(getMarkerAnchor("_" + unicode + "_")); 2.11 - Content headContent = new StringContent(unicode.toString()); 2.12 + String unicode = uc.toString(); 2.13 + contentTree.addContent(getMarkerAnchorForIndex(unicode)); 2.14 + Content headContent = new StringContent(unicode); 2.15 Content heading = HtmlTree.HEADING(HtmlConstants.CONTENT_HEADING, false, 2.16 HtmlStyle.title, headContent); 2.17 contentTree.addContent(heading); 2.18 @@ -253,4 +254,24 @@ 2.19 addPreQualifiedClassLink(LinkInfoImpl.Kind.INDEX, containing, 2.20 false, contentTree); 2.21 } 2.22 + 2.23 + /** 2.24 + * Get the marker anchor which will be added to the index documentation tree. 2.25 + * 2.26 + * @param anchorNameForIndex the anchor name attribute for index page 2.27 + * @return a content tree for the marker anchor 2.28 + */ 2.29 + public Content getMarkerAnchorForIndex(String anchorNameForIndex) { 2.30 + return getMarkerAnchor(getNameForIndex(anchorNameForIndex), null); 2.31 + } 2.32 + 2.33 + /** 2.34 + * Generate a valid HTML name for member index page. 2.35 + * 2.36 + * @param unicode the string that needs to be converted to valid HTML name. 2.37 + * @return a valid HTML name string. 2.38 + */ 2.39 + public String getNameForIndex(String unicode) { 2.40 + return "I:" + getName(unicode); 2.41 + } 2.42 }
3.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeFieldWriterImpl.java Thu Oct 10 08:51:55 2013 +0200 3.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeFieldWriterImpl.java Thu Oct 10 10:51:15 2013 -0700 3.3 @@ -88,7 +88,7 @@ 3.4 Content memberDetailsTree) { 3.5 if (!writer.printedAnnotationFieldHeading) { 3.6 memberDetailsTree.addContent(writer.getMarkerAnchor( 3.7 - "annotation_type_field_detail")); 3.8 + SectionName.ANNOTATION_TYPE_FIELD_DETAIL)); 3.9 Content heading = HtmlTree.HEADING(HtmlConstants.DETAILS_HEADING, 3.10 writer.fieldDetailsLabel); 3.11 memberDetailsTree.addContent(heading); 3.12 @@ -217,7 +217,7 @@ 3.13 */ 3.14 public void addSummaryAnchor(ClassDoc cd, Content memberTree) { 3.15 memberTree.addContent(writer.getMarkerAnchor( 3.16 - "annotation_type_field_summary")); 3.17 + SectionName.ANNOTATION_TYPE_FIELD_SUMMARY)); 3.18 } 3.19 3.20 /** 3.21 @@ -272,7 +272,8 @@ 3.22 */ 3.23 protected Content getNavSummaryLink(ClassDoc cd, boolean link) { 3.24 if (link) { 3.25 - return writer.getHyperLink("annotation_type_field_summary", 3.26 + return writer.getHyperLink( 3.27 + SectionName.ANNOTATION_TYPE_FIELD_SUMMARY, 3.28 writer.getResource("doclet.navField")); 3.29 } else { 3.30 return writer.getResource("doclet.navField"); 3.31 @@ -284,7 +285,8 @@ 3.32 */ 3.33 protected void addNavDetailLink(boolean link, Content liNav) { 3.34 if (link) { 3.35 - liNav.addContent(writer.getHyperLink("annotation_type_field_detail", 3.36 + liNav.addContent(writer.getHyperLink( 3.37 + SectionName.ANNOTATION_TYPE_FIELD_DETAIL, 3.38 writer.getResource("doclet.navField"))); 3.39 } else { 3.40 liNav.addContent(writer.getResource("doclet.navField"));
4.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java Thu Oct 10 08:51:55 2013 +0200 4.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java Thu Oct 10 10:51:15 2013 -0700 4.3 @@ -133,7 +133,7 @@ 4.4 */ 4.5 public void addSummaryAnchor(ClassDoc cd, Content memberTree) { 4.6 memberTree.addContent(writer.getMarkerAnchor( 4.7 - "annotation_type_optional_element_summary")); 4.8 + SectionName.ANNOTATION_TYPE_OPTIONAL_ELEMENT_SUMMARY)); 4.9 } 4.10 4.11 /** 4.12 @@ -141,7 +141,8 @@ 4.13 */ 4.14 protected Content getNavSummaryLink(ClassDoc cd, boolean link) { 4.15 if (link) { 4.16 - return writer.getHyperLink("annotation_type_optional_element_summary", 4.17 + return writer.getHyperLink( 4.18 + SectionName.ANNOTATION_TYPE_OPTIONAL_ELEMENT_SUMMARY, 4.19 writer.getResource("doclet.navAnnotationTypeOptionalMember")); 4.20 } else { 4.21 return writer.getResource("doclet.navAnnotationTypeOptionalMember");
5.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java Thu Oct 10 08:51:55 2013 +0200 5.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java Thu Oct 10 10:51:15 2013 -0700 5.3 @@ -89,7 +89,7 @@ 5.4 Content memberDetailsTree) { 5.5 if (!writer.printedAnnotationHeading) { 5.6 memberDetailsTree.addContent(writer.getMarkerAnchor( 5.7 - "annotation_type_element_detail")); 5.8 + SectionName.ANNOTATION_TYPE_ELEMENT_DETAIL)); 5.9 Content heading = HtmlTree.HEADING(HtmlConstants.DETAILS_HEADING, 5.10 writer.annotationTypeDetailsLabel); 5.11 memberDetailsTree.addContent(heading); 5.12 @@ -219,7 +219,7 @@ 5.13 */ 5.14 public void addSummaryAnchor(ClassDoc cd, Content memberTree) { 5.15 memberTree.addContent(writer.getMarkerAnchor( 5.16 - "annotation_type_required_element_summary")); 5.17 + SectionName.ANNOTATION_TYPE_REQUIRED_ELEMENT_SUMMARY)); 5.18 } 5.19 5.20 /** 5.21 @@ -274,7 +274,8 @@ 5.22 */ 5.23 protected Content getNavSummaryLink(ClassDoc cd, boolean link) { 5.24 if (link) { 5.25 - return writer.getHyperLink("annotation_type_required_element_summary", 5.26 + return writer.getHyperLink( 5.27 + SectionName.ANNOTATION_TYPE_REQUIRED_ELEMENT_SUMMARY, 5.28 writer.getResource("doclet.navAnnotationTypeRequiredMember")); 5.29 } else { 5.30 return writer.getResource("doclet.navAnnotationTypeRequiredMember"); 5.31 @@ -286,7 +287,8 @@ 5.32 */ 5.33 protected void addNavDetailLink(boolean link, Content liNav) { 5.34 if (link) { 5.35 - liNav.addContent(writer.getHyperLink("annotation_type_element_detail", 5.36 + liNav.addContent(writer.getHyperLink( 5.37 + SectionName.ANNOTATION_TYPE_ELEMENT_DETAIL, 5.38 writer.getResource("doclet.navAnnotationTypeMember"))); 5.39 } else { 5.40 liNav.addContent(writer.getResource("doclet.navAnnotationTypeMember"));
6.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/ConstantsSummaryWriterImpl.java Thu Oct 10 08:51:55 2013 +0200 6.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/ConstantsSummaryWriterImpl.java Thu Oct 10 10:51:15 2013 -0700 6.3 @@ -107,7 +107,8 @@ 6.4 //add link to summary 6.5 Content link; 6.6 if (packageName.length() == 0) { 6.7 - link = getHyperLink(DocLink.fragment(DocletConstants.UNNAMED_PACKAGE_ANCHOR), 6.8 + link = getHyperLink(getDocLink( 6.9 + SectionName.UNNAMED_PACKAGE_ANCHOR), 6.10 defaultPackageLabel, "", ""); 6.11 } else { 6.12 Content packageNameContent = getPackageLabel(parsedPackageName); 6.13 @@ -153,7 +154,7 @@ 6.14 Content pkgNameContent; 6.15 if (parsedPackageName.length() == 0) { 6.16 summariesTree.addContent(getMarkerAnchor( 6.17 - DocletConstants.UNNAMED_PACKAGE_ANCHOR)); 6.18 + SectionName.UNNAMED_PACKAGE_ANCHOR)); 6.19 pkgNameContent = defaultPackageLabel; 6.20 } else { 6.21 summariesTree.addContent(getMarkerAnchor(
7.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/ConstructorWriterImpl.java Thu Oct 10 08:51:55 2013 +0200 7.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/ConstructorWriterImpl.java Thu Oct 10 10:51:15 2013 -0700 7.3 @@ -97,7 +97,8 @@ 7.4 Content memberDetailsTree) { 7.5 memberDetailsTree.addContent(HtmlConstants.START_OF_CONSTRUCTOR_DETAILS); 7.6 Content constructorDetailsTree = writer.getMemberTreeHeader(); 7.7 - constructorDetailsTree.addContent(writer.getMarkerAnchor("constructor_detail")); 7.8 + constructorDetailsTree.addContent(writer.getMarkerAnchor( 7.9 + SectionName.CONSTRUCTOR_DETAIL)); 7.10 Content heading = HtmlTree.HEADING(HtmlConstants.DETAILS_HEADING, 7.11 writer.constructorDetailsLabel); 7.12 constructorDetailsTree.addContent(heading); 7.13 @@ -256,7 +257,8 @@ 7.14 * {@inheritDoc} 7.15 */ 7.16 public void addSummaryAnchor(ClassDoc cd, Content memberTree) { 7.17 - memberTree.addContent(writer.getMarkerAnchor("constructor_summary")); 7.18 + memberTree.addContent(writer.getMarkerAnchor( 7.19 + SectionName.CONSTRUCTOR_SUMMARY)); 7.20 } 7.21 7.22 /** 7.23 @@ -280,7 +282,7 @@ 7.24 */ 7.25 protected Content getNavSummaryLink(ClassDoc cd, boolean link) { 7.26 if (link) { 7.27 - return writer.getHyperLink("constructor_summary", 7.28 + return writer.getHyperLink(SectionName.CONSTRUCTOR_SUMMARY, 7.29 writer.getResource("doclet.navConstructor")); 7.30 } else { 7.31 return writer.getResource("doclet.navConstructor"); 7.32 @@ -292,7 +294,8 @@ 7.33 */ 7.34 protected void addNavDetailLink(boolean link, Content liNav) { 7.35 if (link) { 7.36 - liNav.addContent(writer.getHyperLink("constructor_detail", 7.37 + liNav.addContent(writer.getHyperLink( 7.38 + SectionName.CONSTRUCTOR_DETAIL, 7.39 writer.getResource("doclet.navConstructor"))); 7.40 } else { 7.41 liNav.addContent(writer.getResource("doclet.navConstructor"));
8.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java Thu Oct 10 08:51:55 2013 +0200 8.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java Thu Oct 10 10:51:15 2013 -0700 8.3 @@ -48,8 +48,8 @@ 8.4 8.5 private static final String[] ANCHORS = new String[] { 8.6 "package", "interface", "class", "enum", "exception", "error", 8.7 - "annotation_type", "field", "method", "constructor", "enum_constant", 8.8 - "annotation_type_member" 8.9 + "annotation.type", "field", "method", "constructor", "enum.constant", 8.10 + "annotation.type.member" 8.11 }; 8.12 8.13 private static final String[] HEADING_KEYS = new String[] {
9.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/EnumConstantWriterImpl.java Thu Oct 10 08:51:55 2013 +0200 9.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/EnumConstantWriterImpl.java Thu Oct 10 10:51:15 2013 -0700 9.3 @@ -73,7 +73,8 @@ 9.4 Content memberDetailsTree) { 9.5 memberDetailsTree.addContent(HtmlConstants.START_OF_ENUM_CONSTANT_DETAILS); 9.6 Content enumConstantsDetailsTree = writer.getMemberTreeHeader(); 9.7 - enumConstantsDetailsTree.addContent(writer.getMarkerAnchor("enum_constant_detail")); 9.8 + enumConstantsDetailsTree.addContent(writer.getMarkerAnchor( 9.9 + SectionName.ENUM_CONSTANT_DETAIL)); 9.10 Content heading = HtmlTree.HEADING(HtmlConstants.DETAILS_HEADING, 9.11 writer.enumConstantsDetailsLabel); 9.12 enumConstantsDetailsTree.addContent(heading); 9.13 @@ -202,7 +203,8 @@ 9.14 * {@inheritDoc} 9.15 */ 9.16 public void addSummaryAnchor(ClassDoc cd, Content memberTree) { 9.17 - memberTree.addContent(writer.getMarkerAnchor("enum_constant_summary")); 9.18 + memberTree.addContent(writer.getMarkerAnchor( 9.19 + SectionName.ENUM_CONSTANT_SUMMARY)); 9.20 } 9.21 9.22 /** 9.23 @@ -263,11 +265,14 @@ 9.24 */ 9.25 protected Content getNavSummaryLink(ClassDoc cd, boolean link) { 9.26 if (link) { 9.27 - return writer.getHyperLink((cd == null)? 9.28 - "enum_constant_summary": 9.29 - "enum_constants_inherited_from_class_" + 9.30 - configuration.getClassName(cd), 9.31 - writer.getResource("doclet.navEnum")); 9.32 + if (cd == null) { 9.33 + return writer.getHyperLink(SectionName.ENUM_CONSTANT_SUMMARY, 9.34 + writer.getResource("doclet.navEnum")); 9.35 + } else { 9.36 + return writer.getHyperLink( 9.37 + SectionName.ENUM_CONSTANTS_INHERITANCE, 9.38 + configuration.getClassName(cd), writer.getResource("doclet.navEnum")); 9.39 + } 9.40 } else { 9.41 return writer.getResource("doclet.navEnum"); 9.42 } 9.43 @@ -278,7 +283,8 @@ 9.44 */ 9.45 protected void addNavDetailLink(boolean link, Content liNav) { 9.46 if (link) { 9.47 - liNav.addContent(writer.getHyperLink("enum_constant_detail", 9.48 + liNav.addContent(writer.getHyperLink( 9.49 + SectionName.ENUM_CONSTANT_DETAIL, 9.50 writer.getResource("doclet.navEnum"))); 9.51 } else { 9.52 liNav.addContent(writer.getResource("doclet.navEnum"));
10.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/FieldWriterImpl.java Thu Oct 10 08:51:55 2013 +0200 10.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/FieldWriterImpl.java Thu Oct 10 10:51:15 2013 -0700 10.3 @@ -74,7 +74,8 @@ 10.4 Content memberDetailsTree) { 10.5 memberDetailsTree.addContent(HtmlConstants.START_OF_FIELD_DETAILS); 10.6 Content fieldDetailsTree = writer.getMemberTreeHeader(); 10.7 - fieldDetailsTree.addContent(writer.getMarkerAnchor("field_detail")); 10.8 + fieldDetailsTree.addContent(writer.getMarkerAnchor( 10.9 + SectionName.FIELD_DETAIL)); 10.10 Content heading = HtmlTree.HEADING(HtmlConstants.DETAILS_HEADING, 10.11 writer.fieldDetailsLabel); 10.12 fieldDetailsTree.addContent(heading); 10.13 @@ -224,7 +225,8 @@ 10.14 * {@inheritDoc} 10.15 */ 10.16 public void addSummaryAnchor(ClassDoc cd, Content memberTree) { 10.17 - memberTree.addContent(writer.getMarkerAnchor("field_summary")); 10.18 + memberTree.addContent(writer.getMarkerAnchor( 10.19 + SectionName.FIELD_SUMMARY)); 10.20 } 10.21 10.22 /** 10.23 @@ -232,7 +234,7 @@ 10.24 */ 10.25 public void addInheritedSummaryAnchor(ClassDoc cd, Content inheritedTree) { 10.26 inheritedTree.addContent(writer.getMarkerAnchor( 10.27 - "fields_inherited_from_class_" + configuration.getClassName(cd))); 10.28 + SectionName.FIELDS_INHERITANCE, configuration.getClassName(cd))); 10.29 } 10.30 10.31 /** 10.32 @@ -293,11 +295,15 @@ 10.33 */ 10.34 protected Content getNavSummaryLink(ClassDoc cd, boolean link) { 10.35 if (link) { 10.36 - return writer.getHyperLink((cd == null)? 10.37 - "field_summary": 10.38 - "fields_inherited_from_class_" + 10.39 - configuration.getClassName(cd), 10.40 - writer.getResource("doclet.navField")); 10.41 + if (cd == null) { 10.42 + return writer.getHyperLink( 10.43 + SectionName.FIELD_SUMMARY, 10.44 + writer.getResource("doclet.navField")); 10.45 + } else { 10.46 + return writer.getHyperLink( 10.47 + SectionName.FIELDS_INHERITANCE, 10.48 + configuration.getClassName(cd), writer.getResource("doclet.navField")); 10.49 + } 10.50 } else { 10.51 return writer.getResource("doclet.navField"); 10.52 } 10.53 @@ -308,7 +314,8 @@ 10.54 */ 10.55 protected void addNavDetailLink(boolean link, Content liNav) { 10.56 if (link) { 10.57 - liNav.addContent(writer.getHyperLink("field_detail", 10.58 + liNav.addContent(writer.getHyperLink( 10.59 + SectionName.FIELD_DETAIL, 10.60 writer.getResource("doclet.navField"))); 10.61 } else { 10.62 liNav.addContent(writer.getResource("doclet.navField"));
11.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java Thu Oct 10 08:51:55 2013 +0200 11.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java Thu Oct 10 10:51:15 2013 -0700 11.3 @@ -509,28 +509,28 @@ 11.4 body.addContent(HtmlConstants.START_OF_TOP_NAVBAR); 11.5 navDiv.addStyle(HtmlStyle.topNav); 11.6 allClassesId += "navbar_top"; 11.7 - Content a = getMarkerAnchor("navbar_top"); 11.8 + Content a = getMarkerAnchor(SectionName.NAVBAR_TOP); 11.9 //WCAG - Hyperlinks should contain text or an image with alt text - for AT tools 11.10 navDiv.addContent(a); 11.11 Content skipLinkContent = HtmlTree.DIV(HtmlStyle.skipNav, getHyperLink( 11.12 - DocLink.fragment("skip-navbar_top"), skipNavLinks, 11.13 + getDocLink(SectionName.SKIP_NAVBAR_TOP), skipNavLinks, 11.14 skipNavLinks.toString(), "")); 11.15 navDiv.addContent(skipLinkContent); 11.16 } else { 11.17 body.addContent(HtmlConstants.START_OF_BOTTOM_NAVBAR); 11.18 navDiv.addStyle(HtmlStyle.bottomNav); 11.19 allClassesId += "navbar_bottom"; 11.20 - Content a = getMarkerAnchor("navbar_bottom"); 11.21 + Content a = getMarkerAnchor(SectionName.NAVBAR_BOTTOM); 11.22 navDiv.addContent(a); 11.23 Content skipLinkContent = HtmlTree.DIV(HtmlStyle.skipNav, getHyperLink( 11.24 - DocLink.fragment("skip-navbar_bottom"), skipNavLinks, 11.25 + getDocLink(SectionName.SKIP_NAVBAR_BOTTOM), skipNavLinks, 11.26 skipNavLinks.toString(), "")); 11.27 navDiv.addContent(skipLinkContent); 11.28 } 11.29 if (header) { 11.30 - navDiv.addContent(getMarkerAnchor("navbar_top_firstrow")); 11.31 + navDiv.addContent(getMarkerAnchor(SectionName.NAVBAR_TOP_FIRSTROW)); 11.32 } else { 11.33 - navDiv.addContent(getMarkerAnchor("navbar_bottom_firstrow")); 11.34 + navDiv.addContent(getMarkerAnchor(SectionName.NAVBAR_BOTTOM_FIRSTROW)); 11.35 } 11.36 HtmlTree navList = new HtmlTree(HtmlTag.UL); 11.37 navList.addStyle(HtmlStyle.navList); 11.38 @@ -577,11 +577,11 @@ 11.39 subDiv.addContent(getAllClassesLinkScript(allClassesId.toString())); 11.40 addSummaryDetailLinks(subDiv); 11.41 if (header) { 11.42 - subDiv.addContent(getMarkerAnchor("skip-navbar_top")); 11.43 + subDiv.addContent(getMarkerAnchor(SectionName.SKIP_NAVBAR_TOP)); 11.44 body.addContent(subDiv); 11.45 body.addContent(HtmlConstants.END_OF_TOP_NAVBAR); 11.46 } else { 11.47 - subDiv.addContent(getMarkerAnchor("skip-navbar_bottom")); 11.48 + subDiv.addContent(getMarkerAnchor(SectionName.SKIP_NAVBAR_BOTTOM)); 11.49 body.addContent(subDiv); 11.50 body.addContent(HtmlConstants.END_OF_BOTTOM_NAVBAR); 11.51 } 11.52 @@ -886,7 +886,28 @@ 11.53 * @return a content tree for the marker anchor 11.54 */ 11.55 public Content getMarkerAnchor(String anchorName) { 11.56 - return getMarkerAnchor(anchorName, null); 11.57 + return getMarkerAnchor(getName(anchorName), null); 11.58 + } 11.59 + 11.60 + /** 11.61 + * Get the marker anchor which will be added to the documentation tree. 11.62 + * 11.63 + * @param sectionName the section name anchor attribute for page 11.64 + * @return a content tree for the marker anchor 11.65 + */ 11.66 + public Content getMarkerAnchor(SectionName sectionName) { 11.67 + return getMarkerAnchor(sectionName.getName(), null); 11.68 + } 11.69 + 11.70 + /** 11.71 + * Get the marker anchor which will be added to the documentation tree. 11.72 + * 11.73 + * @param sectionName the section name anchor attribute for page 11.74 + * @param anchorName the anchor name combined with section name attribute for the page 11.75 + * @return a content tree for the marker anchor 11.76 + */ 11.77 + public Content getMarkerAnchor(SectionName sectionName, String anchorName) { 11.78 + return getMarkerAnchor(sectionName.getName() + getName(anchorName), null); 11.79 } 11.80 11.81 /** 11.82 @@ -1291,10 +1312,10 @@ 11.83 } else if (doc instanceof ExecutableMemberDoc) { 11.84 ExecutableMemberDoc emd = (ExecutableMemberDoc)doc; 11.85 return getLink(new LinkInfoImpl(configuration, context, classDoc) 11.86 - .label(label).where(getAnchor(emd, isProperty)).strong(strong)); 11.87 + .label(label).where(getName(getAnchor(emd, isProperty))).strong(strong)); 11.88 } else if (doc instanceof MemberDoc) { 11.89 return getLink(new LinkInfoImpl(configuration, context, classDoc) 11.90 - .label(label).where(doc.name()).strong(strong)); 11.91 + .label(label).where(getName(doc.name())).strong(strong)); 11.92 } else { 11.93 return label; 11.94 } 11.95 @@ -1319,10 +1340,10 @@ 11.96 } else if (doc instanceof ExecutableMemberDoc) { 11.97 ExecutableMemberDoc emd = (ExecutableMemberDoc) doc; 11.98 return getLink(new LinkInfoImpl(configuration, context, classDoc) 11.99 - .label(label).where(getAnchor(emd))); 11.100 + .label(label).where(getName(getAnchor(emd)))); 11.101 } else if (doc instanceof MemberDoc) { 11.102 return getLink(new LinkInfoImpl(configuration, context, classDoc) 11.103 - .label(label).where(doc.name())); 11.104 + .label(label).where(getName(doc.name()))); 11.105 } else { 11.106 return label; 11.107 }
12.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialFieldWriter.java Thu Oct 10 08:51:55 2013 +0200 12.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialFieldWriter.java Thu Oct 10 10:51:15 2013 -0700 12.3 @@ -49,8 +49,6 @@ 12.4 implements SerializedFormWriter.SerialFieldWriter { 12.5 ProgramElementDoc[] members = null; 12.6 12.7 - private boolean printedOverallAnchor = false; 12.8 - 12.9 public HtmlSerialFieldWriter(SubWriterHolderWriter writer, 12.10 ClassDoc classdoc) { 12.11 super(writer, classdoc); 12.12 @@ -98,10 +96,6 @@ 12.13 HtmlTree li = new HtmlTree(HtmlTag.LI); 12.14 li.addStyle(HtmlStyle.blockList); 12.15 if (serializableFieldsTree.isValid()) { 12.16 - if (!printedOverallAnchor) { 12.17 - li.addContent(writer.getMarkerAnchor("serializedForm")); 12.18 - printedOverallAnchor = true; 12.19 - } 12.20 Content headingContent = new StringContent(heading); 12.21 Content serialHeading = HtmlTree.HEADING(HtmlConstants.SERIALIZED_MEMBER_HEADING, 12.22 headingContent);
13.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialMethodWriter.java Thu Oct 10 08:51:55 2013 +0200 13.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialMethodWriter.java Thu Oct 10 10:51:15 2013 -0700 13.3 @@ -85,12 +85,10 @@ 13.4 * @return a content tree for the serializable methods content 13.5 */ 13.6 public Content getSerializableMethods(String heading, Content serializableMethodContent) { 13.7 - Content li = HtmlTree.LI(HtmlStyle.blockList, writer.getMarkerAnchor( 13.8 - "serialized_methods")); 13.9 Content headingContent = new StringContent(heading); 13.10 Content serialHeading = HtmlTree.HEADING(HtmlConstants.SERIALIZED_MEMBER_HEADING, 13.11 headingContent); 13.12 - li.addContent(serialHeading); 13.13 + Content li = HtmlTree.LI(HtmlStyle.blockList, serialHeading); 13.14 li.addContent(serializableMethodContent); 13.15 return li; 13.16 } 13.17 @@ -113,8 +111,6 @@ 13.18 * @param methodsContentTree the content tree to which the member header will be added 13.19 */ 13.20 public void addMemberHeader(MethodDoc member, Content methodsContentTree) { 13.21 - methodsContentTree.addContent(writer.getMarkerAnchor( 13.22 - writer.getAnchor(member))); 13.23 methodsContentTree.addContent(getHead(member)); 13.24 methodsContentTree.addContent(getSignature(member)); 13.25 }
14.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java Thu Oct 10 08:51:55 2013 +0200 14.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java Thu Oct 10 10:51:15 2013 -0700 14.3 @@ -85,7 +85,8 @@ 14.4 Content memberDetailsTree) { 14.5 memberDetailsTree.addContent(HtmlConstants.START_OF_METHOD_DETAILS); 14.6 Content methodDetailsTree = writer.getMemberTreeHeader(); 14.7 - methodDetailsTree.addContent(writer.getMarkerAnchor("method_detail")); 14.8 + methodDetailsTree.addContent(writer.getMarkerAnchor( 14.9 + SectionName.METHOD_DETAIL)); 14.10 Content heading = HtmlTree.HEADING(HtmlConstants.DETAILS_HEADING, 14.11 writer.methodDetailsLabel); 14.12 methodDetailsTree.addContent(heading); 14.13 @@ -244,7 +245,8 @@ 14.14 * {@inheritDoc} 14.15 */ 14.16 public void addSummaryAnchor(ClassDoc cd, Content memberTree) { 14.17 - memberTree.addContent(writer.getMarkerAnchor("method_summary")); 14.18 + memberTree.addContent(writer.getMarkerAnchor( 14.19 + SectionName.METHOD_SUMMARY)); 14.20 } 14.21 14.22 /** 14.23 @@ -252,8 +254,7 @@ 14.24 */ 14.25 public void addInheritedSummaryAnchor(ClassDoc cd, Content inheritedTree) { 14.26 inheritedTree.addContent(writer.getMarkerAnchor( 14.27 - "methods_inherited_from_class_" + 14.28 - configuration.getClassName(cd))); 14.29 + SectionName.METHODS_INHERITANCE, configuration.getClassName(cd))); 14.30 } 14.31 14.32 /** 14.33 @@ -318,7 +319,7 @@ 14.34 Content methlink = writer.getLink( 14.35 new LinkInfoImpl(writer.configuration, LinkInfoImpl.Kind.MEMBER, 14.36 overriddenType.asClassDoc()) 14.37 - .where(writer.getAnchor(method)).label(name)); 14.38 + .where(writer.getName(writer.getAnchor(method))).label(name)); 14.39 Content codeMethLink = HtmlTree.CODE(methlink); 14.40 Content dd = HtmlTree.DD(codeMethLink); 14.41 dd.addContent(writer.getSpace()); 14.42 @@ -400,11 +401,15 @@ 14.43 */ 14.44 protected Content getNavSummaryLink(ClassDoc cd, boolean link) { 14.45 if (link) { 14.46 - return writer.getHyperLink((cd == null)? 14.47 - "method_summary": 14.48 - "methods_inherited_from_class_" + 14.49 - configuration.getClassName(cd), 14.50 - writer.getResource("doclet.navMethod")); 14.51 + if (cd == null) { 14.52 + return writer.getHyperLink( 14.53 + SectionName.METHOD_SUMMARY, 14.54 + writer.getResource("doclet.navMethod")); 14.55 + } else { 14.56 + return writer.getHyperLink( 14.57 + SectionName.METHODS_INHERITANCE, 14.58 + configuration.getClassName(cd), writer.getResource("doclet.navMethod")); 14.59 + } 14.60 } else { 14.61 return writer.getResource("doclet.navMethod"); 14.62 } 14.63 @@ -415,8 +420,8 @@ 14.64 */ 14.65 protected void addNavDetailLink(boolean link, Content liNav) { 14.66 if (link) { 14.67 - liNav.addContent(writer.getHyperLink("method_detail", 14.68 - writer.getResource("doclet.navMethod"))); 14.69 + liNav.addContent(writer.getHyperLink( 14.70 + SectionName.METHOD_DETAIL, writer.getResource("doclet.navMethod"))); 14.71 } else { 14.72 liNav.addContent(writer.getResource("doclet.navMethod")); 14.73 }
15.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/NestedClassWriterImpl.java Thu Oct 10 08:51:55 2013 +0200 15.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/NestedClassWriterImpl.java Thu Oct 10 10:51:15 2013 -0700 15.3 @@ -132,7 +132,8 @@ 15.4 * {@inheritDoc} 15.5 */ 15.6 public void addSummaryAnchor(ClassDoc cd, Content memberTree) { 15.7 - memberTree.addContent(writer.getMarkerAnchor("nested_class_summary")); 15.8 + memberTree.addContent(writer.getMarkerAnchor( 15.9 + SectionName.NESTED_CLASS_SUMMARY)); 15.10 } 15.11 15.12 /** 15.13 @@ -140,7 +141,8 @@ 15.14 */ 15.15 public void addInheritedSummaryAnchor(ClassDoc cd, Content inheritedTree) { 15.16 inheritedTree.addContent(writer.getMarkerAnchor( 15.17 - "nested_classes_inherited_from_class_" + cd.qualifiedName())); 15.18 + SectionName.NESTED_CLASSES_INHERITANCE, 15.19 + cd.qualifiedName())); 15.20 } 15.21 15.22 /** 15.23 @@ -202,9 +204,15 @@ 15.24 */ 15.25 protected Content getNavSummaryLink(ClassDoc cd, boolean link) { 15.26 if (link) { 15.27 - return writer.getHyperLink((cd == null) ? "nested_class_summary": 15.28 - "nested_classes_inherited_from_class_" + cd.qualifiedName(), 15.29 - writer.getResource("doclet.navNested")); 15.30 + if (cd == null) { 15.31 + return writer.getHyperLink( 15.32 + SectionName.NESTED_CLASS_SUMMARY, 15.33 + writer.getResource("doclet.navNested")); 15.34 + } else { 15.35 + return writer.getHyperLink( 15.36 + SectionName.NESTED_CLASSES_INHERITANCE, 15.37 + cd.qualifiedName(), writer.getResource("doclet.navNested")); 15.38 + } 15.39 } else { 15.40 return writer.getResource("doclet.navNested"); 15.41 }
16.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java Thu Oct 10 08:51:55 2013 +0200 16.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java Thu Oct 10 10:51:15 2013 -0700 16.3 @@ -203,8 +203,9 @@ 16.4 Content see = seeLabel; 16.5 see.addContent(" "); 16.6 Content descPara = HtmlTree.P(see); 16.7 - Content descLink = getHyperLink(DocLink.fragment("overview_description"), 16.8 - descriptionLabel, "", ""); 16.9 + Content descLink = getHyperLink(getDocLink( 16.10 + SectionName.OVERVIEW_DESCRIPTION), 16.11 + descriptionLabel, "", ""); 16.12 descPara.addContent(descLink); 16.13 div.addContent(descPara); 16.14 body.addContent(div); 16.15 @@ -220,7 +221,8 @@ 16.16 */ 16.17 protected void addOverviewComment(Content htmltree) { 16.18 if (root.inlineTags().length > 0) { 16.19 - htmltree.addContent(getMarkerAnchor("overview_description")); 16.20 + htmltree.addContent( 16.21 + getMarkerAnchor(SectionName.OVERVIEW_DESCRIPTION)); 16.22 addInlineComment(root, htmltree); 16.23 } 16.24 }
17.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/PackageWriterImpl.java Thu Oct 10 08:51:55 2013 +0200 17.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/PackageWriterImpl.java Thu Oct 10 10:51:15 2013 -0700 17.3 @@ -112,7 +112,8 @@ 17.4 addSummaryComment(packageDoc, docSummaryDiv); 17.5 div.addContent(docSummaryDiv); 17.6 Content space = getSpace(); 17.7 - Content descLink = getHyperLink(DocLink.fragment("package_description"), 17.8 + Content descLink = getHyperLink(getDocLink( 17.9 + SectionName.PACKAGE_DESCRIPTION), 17.10 descriptionLabel, "", ""); 17.11 Content descPara = new HtmlTree(HtmlTag.P, seeLabel, space, descLink); 17.12 div.addContent(descPara); 17.13 @@ -211,7 +212,8 @@ 17.14 */ 17.15 public void addPackageDescription(Content packageContentTree) { 17.16 if (packageDoc.inlineTags().length > 0) { 17.17 - packageContentTree.addContent(getMarkerAnchor("package_description")); 17.18 + packageContentTree.addContent( 17.19 + getMarkerAnchor(SectionName.PACKAGE_DESCRIPTION)); 17.20 Content h2Content = new StringContent( 17.21 configuration.getText("doclet.Package_Description", 17.22 packageDoc.name()));
18.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/ProfilePackageWriterImpl.java Thu Oct 10 08:51:55 2013 +0200 18.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/ProfilePackageWriterImpl.java Thu Oct 10 10:51:15 2013 -0700 18.3 @@ -129,7 +129,8 @@ 18.4 addSummaryComment(packageDoc, docSummaryDiv); 18.5 div.addContent(docSummaryDiv); 18.6 Content space = getSpace(); 18.7 - Content descLink = getHyperLink(DocLink.fragment("package_description"), 18.8 + Content descLink = getHyperLink(getDocLink( 18.9 + SectionName.PACKAGE_DESCRIPTION), 18.10 descriptionLabel, "", ""); 18.11 Content descPara = new HtmlTree(HtmlTag.P, seeLabel, space, descLink); 18.12 div.addContent(descPara); 18.13 @@ -192,7 +193,8 @@ 18.14 */ 18.15 public void addPackageDescription(Content packageContentTree) { 18.16 if (packageDoc.inlineTags().length > 0) { 18.17 - packageContentTree.addContent(getMarkerAnchor("package_description")); 18.18 + packageContentTree.addContent( 18.19 + getMarkerAnchor(SectionName.PACKAGE_DESCRIPTION)); 18.20 Content h2Content = new StringContent( 18.21 configuration.getText("doclet.Package_Description", 18.22 packageDoc.name()));
19.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/PropertyWriterImpl.java Thu Oct 10 08:51:55 2013 +0200 19.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/PropertyWriterImpl.java Thu Oct 10 10:51:15 2013 -0700 19.3 @@ -70,7 +70,8 @@ 19.4 Content memberDetailsTree) { 19.5 memberDetailsTree.addContent(HtmlConstants.START_OF_PROPERTY_DETAILS); 19.6 Content propertyDetailsTree = writer.getMemberTreeHeader(); 19.7 - propertyDetailsTree.addContent(writer.getMarkerAnchor("property_detail")); 19.8 + propertyDetailsTree.addContent(writer.getMarkerAnchor( 19.9 + SectionName.PROPERTY_DETAIL)); 19.10 Content heading = HtmlTree.HEADING(HtmlConstants.DETAILS_HEADING, 19.11 writer.propertyDetailsLabel); 19.12 propertyDetailsTree.addContent(heading); 19.13 @@ -220,7 +221,8 @@ 19.14 * {@inheritDoc} 19.15 */ 19.16 public void addSummaryAnchor(ClassDoc cd, Content memberTree) { 19.17 - memberTree.addContent(writer.getMarkerAnchor("property_summary")); 19.18 + memberTree.addContent(writer.getMarkerAnchor( 19.19 + SectionName.PROPERTY_SUMMARY)); 19.20 } 19.21 19.22 /** 19.23 @@ -228,7 +230,8 @@ 19.24 */ 19.25 public void addInheritedSummaryAnchor(ClassDoc cd, Content inheritedTree) { 19.26 inheritedTree.addContent(writer.getMarkerAnchor( 19.27 - "properties_inherited_from_class_" + configuration.getClassName(cd))); 19.28 + SectionName.PROPERTIES_INHERITANCE, 19.29 + configuration.getClassName(cd))); 19.30 } 19.31 19.32 /** 19.33 @@ -297,11 +300,15 @@ 19.34 */ 19.35 protected Content getNavSummaryLink(ClassDoc cd, boolean link) { 19.36 if (link) { 19.37 - return writer.getHyperLink((cd == null)? 19.38 - "property_summary": 19.39 - "properties_inherited_from_class_" + 19.40 - configuration.getClassName(cd), 19.41 + if (cd == null) { 19.42 + return writer.getHyperLink( 19.43 + SectionName.PROPERTY_SUMMARY, 19.44 writer.getResource("doclet.navProperty")); 19.45 + } else { 19.46 + return writer.getHyperLink( 19.47 + SectionName.PROPERTIES_INHERITANCE, 19.48 + configuration.getClassName(cd), writer.getResource("doclet.navProperty")); 19.49 + } 19.50 } else { 19.51 return writer.getResource("doclet.navProperty"); 19.52 } 19.53 @@ -312,7 +319,8 @@ 19.54 */ 19.55 protected void addNavDetailLink(boolean link, Content liNav) { 19.56 if (link) { 19.57 - liNav.addContent(writer.getHyperLink("property_detail", 19.58 + liNav.addContent(writer.getHyperLink( 19.59 + SectionName.PROPERTY_DETAIL, 19.60 writer.getResource("doclet.navProperty"))); 19.61 } else { 19.62 liNav.addContent(writer.getResource("doclet.navProperty"));
20.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 20.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/SectionName.java Thu Oct 10 10:51:15 2013 -0700 20.3 @@ -0,0 +1,80 @@ 20.4 +/* 20.5 + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. 20.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 20.7 + * 20.8 + * This code is free software; you can redistribute it and/or modify it 20.9 + * under the terms of the GNU General Public License version 2 only, as 20.10 + * published by the Free Software Foundation. Oracle designates this 20.11 + * particular file as subject to the "Classpath" exception as provided 20.12 + * by Oracle in the LICENSE file that accompanied this code. 20.13 + * 20.14 + * This code is distributed in the hope that it will be useful, but WITHOUT 20.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 20.16 + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 20.17 + * version 2 for more details (a copy is included in the LICENSE file that 20.18 + * accompanied this code). 20.19 + * 20.20 + * You should have received a copy of the GNU General Public License version 20.21 + * 2 along with this work; if not, write to the Free Software Foundation, 20.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 20.23 + * 20.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 20.25 + * or visit www.oracle.com if you need additional information or have any 20.26 + * questions. 20.27 + */ 20.28 + 20.29 +package com.sun.tools.doclets.formats.html; 20.30 + 20.31 +/** 20.32 + * Enum representing various section names of generated API documentation. 20.33 + * 20.34 + * <p><b>This is NOT part of any supported API. 20.35 + * If you write code that depends on this, you do so at your own risk. 20.36 + * This code and its internal interfaces are subject to change or 20.37 + * deletion without notice.</b> 20.38 + * 20.39 + * @author Bhavesh Patel 20.40 + */ 20.41 +public enum SectionName { 20.42 + 20.43 + ANNOTATION_TYPE_ELEMENT_DETAIL("annotation.type.element.detail"), 20.44 + ANNOTATION_TYPE_FIELD_DETAIL("annotation.type.field.detail"), 20.45 + ANNOTATION_TYPE_FIELD_SUMMARY("annotation.type.field.summary"), 20.46 + ANNOTATION_TYPE_OPTIONAL_ELEMENT_SUMMARY("annotation.type.optional.element.summary"), 20.47 + ANNOTATION_TYPE_REQUIRED_ELEMENT_SUMMARY("annotation.type.required.element.summary"), 20.48 + CONSTRUCTOR_DETAIL("constructor.detail"), 20.49 + CONSTRUCTOR_SUMMARY("constructor.summary"), 20.50 + ENUM_CONSTANT_DETAIL("enum.constant.detail"), 20.51 + ENUM_CONSTANTS_INHERITANCE("enum.constants.inherited.from.class."), 20.52 + ENUM_CONSTANT_SUMMARY("enum.constant.summary"), 20.53 + FIELD_DETAIL("field.detail"), 20.54 + FIELDS_INHERITANCE("fields.inherited.from.class."), 20.55 + FIELD_SUMMARY("field.summary"), 20.56 + METHOD_DETAIL("method.detail"), 20.57 + METHODS_INHERITANCE("methods.inherited.from.class."), 20.58 + METHOD_SUMMARY("method.summary"), 20.59 + NAVBAR_BOTTOM("navbar.bottom"), 20.60 + NAVBAR_BOTTOM_FIRSTROW("navbar.bottom.firstrow"), 20.61 + NAVBAR_TOP("navbar.top"), 20.62 + NAVBAR_TOP_FIRSTROW("navbar.top.firstrow"), 20.63 + NESTED_CLASSES_INHERITANCE("nested.classes.inherited.from.class."), 20.64 + NESTED_CLASS_SUMMARY("nested.class.summary"), 20.65 + OVERVIEW_DESCRIPTION("overview.description"), 20.66 + PACKAGE_DESCRIPTION("package.description"), 20.67 + PROPERTY_DETAIL("property.detail"), 20.68 + PROPERTIES_INHERITANCE("properties.inherited.from.class."), 20.69 + PROPERTY_SUMMARY("property.summary"), 20.70 + SKIP_NAVBAR_BOTTOM("skip.navbar.bottom"), 20.71 + SKIP_NAVBAR_TOP("skip.navbar.top"), 20.72 + UNNAMED_PACKAGE_ANCHOR("unnamed.package"); 20.73 + 20.74 + private final String value; 20.75 + 20.76 + SectionName(String sName) { 20.77 + this.value = sName; 20.78 + } 20.79 + 20.80 + public String getName() { 20.81 + return this.value; 20.82 + } 20.83 +}
21.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/SingleIndexWriter.java Thu Oct 10 08:51:55 2013 +0200 21.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/SingleIndexWriter.java Thu Oct 10 10:51:15 2013 -0700 21.3 @@ -115,7 +115,8 @@ 21.4 for (int i = 0; i < indexbuilder.elements().length; i++) { 21.5 String unicode = (indexbuilder.elements())[i].toString(); 21.6 contentTree.addContent( 21.7 - getHyperLink("_" + unicode + "_", new StringContent(unicode))); 21.8 + getHyperLink(getNameForIndex(unicode), 21.9 + new StringContent(unicode))); 21.10 contentTree.addContent(getSpace()); 21.11 } 21.12 }
22.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java Thu Oct 10 08:51:55 2013 +0200 22.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java Thu Oct 10 10:51:15 2013 -0700 22.3 @@ -30,6 +30,7 @@ 22.4 22.5 import com.sun.javadoc.*; 22.6 import com.sun.tools.doclets.formats.html.ConfigurationImpl; 22.7 +import com.sun.tools.doclets.formats.html.SectionName; 22.8 import com.sun.tools.doclets.internal.toolkit.*; 22.9 import com.sun.tools.doclets.internal.toolkit.util.DocFile; 22.10 import com.sun.tools.doclets.internal.toolkit.util.DocLink; 22.11 @@ -78,7 +79,7 @@ 22.12 } 22.13 22.14 /** 22.15 - * Get Html Hyper Link string. 22.16 + * Get Html Hyper Link Content. 22.17 * 22.18 * @param where Position of the link in the file. Character '#' is not 22.19 * needed. 22.20 @@ -87,7 +88,125 @@ 22.21 */ 22.22 public Content getHyperLink(String where, 22.23 Content label) { 22.24 - return getHyperLink(DocLink.fragment(where), label, "", ""); 22.25 + return getHyperLink(getDocLink(where), label, "", ""); 22.26 + } 22.27 + 22.28 + /** 22.29 + * Get Html Hyper Link Content. 22.30 + * 22.31 + * @param sectionName The section name to which the link will be created. 22.32 + * @param label Tag for the link. 22.33 + * @return a content tree for the hyper link 22.34 + */ 22.35 + public Content getHyperLink(SectionName sectionName, 22.36 + Content label) { 22.37 + return getHyperLink(getDocLink(sectionName), label, "", ""); 22.38 + } 22.39 + 22.40 + /** 22.41 + * Get Html Hyper Link Content. 22.42 + * 22.43 + * @param sectionName The section name combined with where to which the link 22.44 + * will be created. 22.45 + * @param where The fragment combined with sectionName to which the link 22.46 + * will be created. 22.47 + * @param label Tag for the link. 22.48 + * @return a content tree for the hyper link 22.49 + */ 22.50 + public Content getHyperLink(SectionName sectionName, String where, 22.51 + Content label) { 22.52 + return getHyperLink(getDocLink(sectionName, where), label, "", ""); 22.53 + } 22.54 + 22.55 + /** 22.56 + * Get the link. 22.57 + * 22.58 + * @param where Position of the link in the file. 22.59 + * @return a DocLink object for the hyper link 22.60 + */ 22.61 + public DocLink getDocLink(String where) { 22.62 + return DocLink.fragment(getName(where)); 22.63 + } 22.64 + 22.65 + /** 22.66 + * Get the link. 22.67 + * 22.68 + * @param sectionName The section name to which the link will be created. 22.69 + * @return a DocLink object for the hyper link 22.70 + */ 22.71 + public DocLink getDocLink(SectionName sectionName) { 22.72 + return DocLink.fragment(sectionName.getName()); 22.73 + } 22.74 + 22.75 + /** 22.76 + * Get the link. 22.77 + * 22.78 + * @param sectionName The section name combined with where to which the link 22.79 + * will be created. 22.80 + * @param where The fragment combined with sectionName to which the link 22.81 + * will be created. 22.82 + * @return a DocLink object for the hyper link 22.83 + */ 22.84 + public DocLink getDocLink(SectionName sectionName, String where) { 22.85 + return DocLink.fragment(sectionName.getName() + getName(where)); 22.86 + } 22.87 + 22.88 + /** 22.89 + * Convert the name to a valid HTML name. 22.90 + * 22.91 + * @param name the name that needs to be converted to valid HTML name. 22.92 + * @return a valid HTML name string. 22.93 + */ 22.94 + public String getName(String name) { 22.95 + StringBuilder sb = new StringBuilder(); 22.96 + char ch; 22.97 + /* The HTML 4 spec at http://www.w3.org/TR/html4/types.html#h-6.2 mentions 22.98 + * that the name/id should begin with a letter followed by other valid characters. 22.99 + * The HTML 5 spec (draft) is more permissive on names/ids where the only restriction 22.100 + * is that it should be at least one character long and should not contain spaces. 22.101 + * The spec draft is @ http://www.w3.org/html/wg/drafts/html/master/dom.html#the-id-attribute. 22.102 + * 22.103 + * For HTML 4, we need to check for non-characters at the beginning of the name and 22.104 + * substitute it accordingly, "_" and "$" can appear at the beginning of a member name. 22.105 + * The method substitutes "$" with "Z:Z:D" and will prefix "_" with "Z:Z". 22.106 + */ 22.107 + for (int i = 0; i < name.length(); i++) { 22.108 + ch = name.charAt(i); 22.109 + switch (ch) { 22.110 + case '(': 22.111 + case ')': 22.112 + case '<': 22.113 + case '>': 22.114 + case ',': 22.115 + sb.append('-'); 22.116 + break; 22.117 + case ' ': 22.118 + case '[': 22.119 + break; 22.120 + case ']': 22.121 + sb.append(":A"); 22.122 + break; 22.123 + // Any appearance of $ needs to be substituted with ":D" and not with hyphen 22.124 + // since a field name "P$$ and a method P(), both valid member names, can end 22.125 + // up as "P--". A member name beginning with $ needs to be substituted with 22.126 + // "Z:Z:D". 22.127 + case '$': 22.128 + if (i == 0) 22.129 + sb.append("Z:Z"); 22.130 + sb.append(":D"); 22.131 + break; 22.132 + // A member name beginning with _ needs to be prefixed with "Z:Z" since valid anchor 22.133 + // names can only begin with a letter. 22.134 + case '_': 22.135 + if (i == 0) 22.136 + sb.append("Z:Z"); 22.137 + sb.append(ch); 22.138 + break; 22.139 + default: 22.140 + sb.append(ch); 22.141 + } 22.142 + } 22.143 + return sb.toString(); 22.144 } 22.145 22.146 /**
23.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletConstants.java Thu Oct 10 08:51:55 2013 +0200 23.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletConstants.java Thu Oct 10 10:51:15 2013 -0700 23.3 @@ -58,9 +58,4 @@ 23.4 * The default package file name. 23.5 */ 23.6 public static final String DEFAULT_PACKAGE_FILE_NAME = "default"; 23.7 - 23.8 - /** 23.9 - * The anchor for the default package. 23.10 - */ 23.11 - public static final String UNNAMED_PACKAGE_ANCHOR = "unnamed_package"; 23.12 }
24.1 --- a/test/com/sun/javadoc/AccessSkipNav/AccessSkipNav.java Thu Oct 10 08:51:55 2013 +0200 24.2 +++ b/test/com/sun/javadoc/AccessSkipNav/AccessSkipNav.java Thu Oct 10 10:51:15 2013 -0700 24.3 @@ -23,7 +23,7 @@ 24.4 24.5 /* 24.6 * @test 24.7 - * @bug 4638136 7198273 24.8 + * @bug 4638136 7198273 8025633 24.9 * @summary Add ability to skip over nav bar for accessibility 24.10 * @author dkramer 24.11 * @run main AccessSkipNav 24.12 @@ -86,20 +86,20 @@ 24.13 // Testing only for the presence of the <a href> and <a name> 24.14 24.15 // Top navbar <a href> 24.16 - { "<a href=\"#skip-navbar_top\" title=\"Skip navigation links\">Skip navigation links</a>", 24.17 + { "<a href=\"#skip.navbar.top\" title=\"Skip navigation links\">Skip navigation links</a>", 24.18 TMPDEST_DIR1 + "p1" + FS + "C1.html" }, 24.19 24.20 // Top navbar <a name> 24.21 - { "<a name=\"skip-navbar_top\">" + LS + 24.22 + { "<a name=\"skip.navbar.top\">" + LS + 24.23 "<!-- -->" + LS + "</a>", 24.24 TMPDEST_DIR1 + "p1" + FS + "C1.html" }, 24.25 24.26 // Bottom navbar <a href> 24.27 - { "<a href=\"#skip-navbar_bottom\" title=\"Skip navigation links\">Skip navigation links</a>", 24.28 + { "<a href=\"#skip.navbar.bottom\" title=\"Skip navigation links\">Skip navigation links</a>", 24.29 TMPDEST_DIR1 + "p1" + FS + "C1.html" }, 24.30 24.31 // Bottom navbar <a name> 24.32 - { "<a name=\"skip-navbar_bottom\">" + LS + 24.33 + { "<a name=\"skip.navbar.bottom\">" + LS + 24.34 "<!-- -->" + LS + "</a>", 24.35 TMPDEST_DIR1 + "p1" + FS + "C1.html" } 24.36 };
25.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 25.2 +++ b/test/com/sun/javadoc/testAnchorNames/TestAnchorNames.java Thu Oct 10 10:51:15 2013 -0700 25.3 @@ -0,0 +1,290 @@ 25.4 +/* 25.5 + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. 25.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 25.7 + * 25.8 + * This code is free software; you can redistribute it and/or modify it 25.9 + * under the terms of the GNU General Public License version 2 only, as 25.10 + * published by the Free Software Foundation. 25.11 + * 25.12 + * This code is distributed in the hope that it will be useful, but WITHOUT 25.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 25.14 + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 25.15 + * version 2 for more details (a copy is included in the LICENSE file that 25.16 + * accompanied this code). 25.17 + * 25.18 + * You should have received a copy of the GNU General Public License version 25.19 + * 2 along with this work; if not, write to the Free Software Foundation, 25.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 25.21 + * 25.22 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 25.23 + * or visit www.oracle.com if you need additional information or have any 25.24 + * questions. 25.25 + */ 25.26 + 25.27 +/* 25.28 + * @test 25.29 + * @bug 8025633 25.30 + * @summary Test for valid name attribute in HTML anchors. 25.31 + * @author Bhavesh Patel 25.32 + * @library ../lib/ 25.33 + * @build JavadocTester TestAnchorNames 25.34 + * @run main TestAnchorNames 25.35 + */ 25.36 + 25.37 +public class TestAnchorNames extends JavadocTester { 25.38 + 25.39 + private static final String BUG_ID = "8025633"; 25.40 + 25.41 + //Input for string search tests. 25.42 + private static final String[][] TEST = { 25.43 + 25.44 + //Test some section markers and links to these markers 25.45 + 25.46 + {BUG_ID + FS + "pkg1" + FS + "RegClass.html", 25.47 + "<a name=\"skip.navbar.top\">" 25.48 + }, 25.49 + {BUG_ID + FS + "pkg1" + FS + "RegClass.html", 25.50 + "<a href=\"#skip.navbar.top\" title=\"Skip navigation links\">" 25.51 + }, 25.52 + {BUG_ID + FS + "pkg1" + FS + "RegClass.html", 25.53 + "<a name=\"nested.class.summary\">" 25.54 + }, 25.55 + {BUG_ID + FS + "pkg1" + FS + "RegClass.html", 25.56 + "<a href=\"#nested.class.summary\">" 25.57 + }, 25.58 + {BUG_ID + FS + "pkg1" + FS + "RegClass.html", 25.59 + "<a name=\"method.summary\">" 25.60 + }, 25.61 + {BUG_ID + FS + "pkg1" + FS + "RegClass.html", 25.62 + "<a href=\"#method.summary\">" 25.63 + }, 25.64 + {BUG_ID + FS + "pkg1" + FS + "RegClass.html", 25.65 + "<a name=\"field.detail\">" 25.66 + }, 25.67 + {BUG_ID + FS + "pkg1" + FS + "RegClass.html", 25.68 + "<a href=\"#field.detail\">" 25.69 + }, 25.70 + {BUG_ID + FS + "pkg1" + FS + "RegClass.html", 25.71 + "<a name=\"constructor.detail\">" 25.72 + }, 25.73 + {BUG_ID + FS + "pkg1" + FS + "RegClass.html", 25.74 + "<a href=\"#constructor.detail\">" 25.75 + }, 25.76 + 25.77 + //Test some members and link to these members 25.78 + 25.79 + //The marker for this appears in the serialized-form.html which we will 25.80 + //test below 25.81 + {BUG_ID + FS + "pkg1" + FS + "RegClass.html", 25.82 + "<a href=\"../serialized-form.html#pkg1.RegClass\">" 25.83 + }, 25.84 + //Test some fields 25.85 + {BUG_ID + FS + "pkg1" + FS + "RegClass.html", 25.86 + "<a name=\"Z:Z_\">" 25.87 + }, 25.88 + {BUG_ID + FS + "pkg1" + FS + "RegClass.html", 25.89 + "<a href=\"../pkg1/RegClass.html#Z:Z_\">" 25.90 + }, 25.91 + {BUG_ID + FS + "pkg1" + FS + "RegClass.html", 25.92 + "<a name=\"Z:Z_:D\">" 25.93 + }, 25.94 + {BUG_ID + FS + "pkg1" + FS + "RegClass.html", 25.95 + "<a href=\"../pkg1/RegClass.html#Z:Z_:D\">" 25.96 + }, 25.97 + {BUG_ID + FS + "pkg1" + FS + "RegClass.html", 25.98 + "<a name=\"Z:Z:D_\">" 25.99 + }, 25.100 + {BUG_ID + FS + "pkg1" + FS + "RegClass.html", 25.101 + "<a href=\"../pkg1/RegClass.html#Z:Z:D_\">" 25.102 + }, 25.103 + {BUG_ID + FS + "pkg1" + FS + "RegClass.html", 25.104 + "<a name=\"Z:Z:Dfield\">" 25.105 + }, 25.106 + {BUG_ID + FS + "pkg1" + FS + "RegClass.html", 25.107 + "<a href=\"../pkg1/RegClass.html#Z:Z:Dfield\">" 25.108 + }, 25.109 + {BUG_ID + FS + "pkg1" + FS + "RegClass.html", 25.110 + "<a name=\"fieldInCla:D:D\">" 25.111 + }, 25.112 + {BUG_ID + FS + "pkg1" + FS + "RegClass.html", 25.113 + "<a href=\"../pkg1/RegClass.html#fieldInCla:D:D\">" 25.114 + }, 25.115 + {BUG_ID + FS + "pkg1" + FS + "RegClass.html", 25.116 + "<a name=\"S_:D:D:D:D:DINT\">" 25.117 + }, 25.118 + {BUG_ID + FS + "pkg1" + FS + "RegClass.html", 25.119 + "<a href=\"../pkg1/RegClass.html#S_:D:D:D:D:DINT\">" 25.120 + }, 25.121 + {BUG_ID + FS + "pkg1" + FS + "RegClass.html", 25.122 + "<a name=\"method:D:D\">" 25.123 + }, 25.124 + {BUG_ID + FS + "pkg1" + FS + "RegClass.html", 25.125 + "<a href=\"../pkg1/RegClass.html#method:D:D\">" 25.126 + }, 25.127 + {BUG_ID + FS + "pkg1" + FS + "DeprMemClass.html", 25.128 + "<a name=\"Z:Z_field_In_Class\">" 25.129 + }, 25.130 + {BUG_ID + FS + "pkg1" + FS + "DeprMemClass.html", 25.131 + "<a href=\"../pkg1/DeprMemClass.html#Z:Z_field_In_Class\">" 25.132 + }, 25.133 + //Test constructor 25.134 + {BUG_ID + FS + "pkg1" + FS + "RegClass.html", 25.135 + "<a name=\"RegClass-java.lang.String-int-\">" 25.136 + }, 25.137 + {BUG_ID + FS + "pkg1" + FS + "RegClass.html", 25.138 + "<a href=\"../pkg1/RegClass.html#RegClass-java.lang.String-int-\">" 25.139 + }, 25.140 + //Test some methods 25.141 + {BUG_ID + FS + "pkg1" + FS + "RegClass.html", 25.142 + "<a name=\"Z:Z_methodInClass-java.lang.String-\">" 25.143 + }, 25.144 + {BUG_ID + FS + "pkg1" + FS + "RegClass.html", 25.145 + "<a href=\"../pkg1/RegClass.html#Z:Z_methodInClass-java.lang.String-\">" 25.146 + }, 25.147 + {BUG_ID + FS + "pkg1" + FS + "RegClass.html", 25.148 + "<a name=\"method--\">" 25.149 + }, 25.150 + {BUG_ID + FS + "pkg1" + FS + "RegClass.html", 25.151 + "<a href=\"../pkg1/RegClass.html#method--\">" 25.152 + }, 25.153 + {BUG_ID + FS + "pkg1" + FS + "RegClass.html", 25.154 + "<a name=\"foo-java.util.Map-\">" 25.155 + }, 25.156 + {BUG_ID + FS + "pkg1" + FS + "RegClass.html", 25.157 + "<a href=\"../pkg1/RegClass.html#foo-java.util.Map-\">" 25.158 + }, 25.159 + {BUG_ID + FS + "pkg1" + FS + "RegClass.html", 25.160 + "<a name=\"methodInCla:Ds-java.lang.String:A-\">" 25.161 + }, 25.162 + {BUG_ID + FS + "pkg1" + FS + "RegClass.html", 25.163 + "<a href=\"../pkg1/RegClass.html#methodInCla:Ds-java.lang.String:A-\">" 25.164 + }, 25.165 + {BUG_ID + FS + "pkg1" + FS + "RegClass.html", 25.166 + "<a name=\"Z:Z_methodInClas:D-java.lang.String-int-\">" 25.167 + }, 25.168 + {BUG_ID + FS + "pkg1" + FS + "RegClass.html", 25.169 + "<a href=\"../pkg1/RegClass.html#Z:Z_methodInClas:D-java.lang.String-int-\">" 25.170 + }, 25.171 + {BUG_ID + FS + "pkg1" + FS + "RegClass.html", 25.172 + "<a name=\"methodD-pkg1.RegClass.:DA-\">" 25.173 + }, 25.174 + {BUG_ID + FS + "pkg1" + FS + "RegClass.html", 25.175 + "<a href=\"../pkg1/RegClass.html#methodD-pkg1.RegClass.:DA-\">" 25.176 + }, 25.177 + {BUG_ID + FS + "pkg1" + FS + "RegClass.html", 25.178 + "<a name=\"methodD-pkg1.RegClass.D:A-\">" 25.179 + }, 25.180 + {BUG_ID + FS + "pkg1" + FS + "RegClass.html", 25.181 + "<a href=\"../pkg1/RegClass.html#methodD-pkg1.RegClass.D:A-\">" 25.182 + }, 25.183 + {BUG_ID + FS + "pkg1" + FS + "DeprMemClass.html", 25.184 + "<a name=\"Z:Z:Dmethod_In_Class--\">" 25.185 + }, 25.186 + {BUG_ID + FS + "pkg1" + FS + "DeprMemClass.html", 25.187 + "<a href=\"../pkg1/DeprMemClass.html#Z:Z:Dmethod_In_Class--\">" 25.188 + }, 25.189 + 25.190 + //Test enum 25.191 + 25.192 + {BUG_ID + FS + "pkg1" + FS + "RegClass.Te$t_Enum.html", 25.193 + "<a name=\"Z:Z:DFLD2\">" 25.194 + }, 25.195 + {BUG_ID + FS + "pkg1" + FS + "RegClass.Te$t_Enum.html", 25.196 + "<a href=\"../pkg1/RegClass.Te$t_Enum.html#Z:Z:DFLD2\">" 25.197 + }, 25.198 + 25.199 + //Test nested class 25.200 + 25.201 + {BUG_ID + FS + "pkg1" + FS + "RegClass._NestedClas$.html", 25.202 + "<a name=\"RegClass._NestedClas:D--\">" 25.203 + }, 25.204 + {BUG_ID + FS + "pkg1" + FS + "RegClass._NestedClas$.html", 25.205 + "<a href=\"../pkg1/RegClass._NestedClas$.html#RegClass._NestedClas:D--\">" 25.206 + }, 25.207 + 25.208 + //Test class use page 25.209 + 25.210 + {BUG_ID + FS + "pkg1" + FS + "class-use" + FS + "DeprMemClass.html", 25.211 + "<a href=\"../../pkg1/RegClass.html#d____mc\">" 25.212 + }, 25.213 + 25.214 + //Test deprecated list page 25.215 + 25.216 + {BUG_ID + FS + "deprecated-list.html", 25.217 + "<a href=\"pkg1/DeprMemClass.html#Z:Z_field_In_Class\">" 25.218 + }, 25.219 + {BUG_ID + FS + "deprecated-list.html", 25.220 + "<a href=\"pkg1/DeprMemClass.html#Z:Z:Dmethod_In_Class--\">" 25.221 + }, 25.222 + 25.223 + //Test constant values page 25.224 + 25.225 + {BUG_ID + FS + "constant-values.html", 25.226 + "<a href=\"pkg1/RegClass.html#S_:D:D:D:D:DINT\">" 25.227 + }, 25.228 + 25.229 + //Test serialized form page 25.230 + 25.231 + //This is the marker for the link that appears in the pkg1.RegClass.html page 25.232 + {BUG_ID + FS + "serialized-form.html", 25.233 + "<a name=\"pkg1.RegClass\">" 25.234 + }, 25.235 + 25.236 + //Test member name index page 25.237 + 25.238 + {BUG_ID + FS + "index-all.html", 25.239 + "<a name=\"I:Z:Z:D\">" 25.240 + }, 25.241 + {BUG_ID + FS + "index-all.html", 25.242 + "<a href=\"#I:Z:Z:D\">$" 25.243 + }, 25.244 + {BUG_ID + FS + "index-all.html", 25.245 + "<a href=\"#I:Z:Z_\">_" 25.246 + } 25.247 + }; 25.248 + 25.249 + private static final String[][] NEGATED_TEST = { 25.250 + //The marker name conversion should only affect HTML anchors. It should not 25.251 + //affect the lables. 25.252 + {BUG_ID + FS + "pkg1" + FS + "RegClass.html", 25.253 + " Z:Z_" 25.254 + }, 25.255 + {BUG_ID + FS + "pkg1" + FS + "RegClass.html", 25.256 + " Z:Z:Dfield" 25.257 + }, 25.258 + {BUG_ID + FS + "pkg1" + FS + "RegClass.html", 25.259 + " Z:Z_field_In_Class" 25.260 + }, 25.261 + {BUG_ID + FS + "pkg1" + FS + "RegClass.html", 25.262 + " S_:D:D:D:D:DINT" 25.263 + }, 25.264 + }; 25.265 + 25.266 + private static final String[] ARGS = new String[] { 25.267 + "-d", BUG_ID, "-sourcepath", SRC_DIR, "-use", "pkg1" 25.268 + }; 25.269 + 25.270 + /** 25.271 + * The entry point of the test. 25.272 + * @param args the array of command line arguments. 25.273 + */ 25.274 + public static void main(String[] args) throws Exception { 25.275 + TestAnchorNames tester = new TestAnchorNames(); 25.276 + run(tester, ARGS, TEST, NEGATED_TEST); 25.277 + tester.printSummary(); 25.278 + } 25.279 + 25.280 + /** 25.281 + * {@inheritDoc} 25.282 + */ 25.283 + public String getBugId() { 25.284 + return BUG_ID; 25.285 + } 25.286 + 25.287 + /** 25.288 + * {@inheritDoc} 25.289 + */ 25.290 + public String getBugName() { 25.291 + return getClass().getName(); 25.292 + } 25.293 +}
26.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 26.2 +++ b/test/com/sun/javadoc/testAnchorNames/pkg1/DeprMemClass.java Thu Oct 10 10:51:15 2013 -0700 26.3 @@ -0,0 +1,45 @@ 26.4 +/* 26.5 + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. 26.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 26.7 + * 26.8 + * This code is free software; you can redistribute it and/or modify it 26.9 + * under the terms of the GNU General Public License version 2 only, as 26.10 + * published by the Free Software Foundation. 26.11 + * 26.12 + * This code is distributed in the hope that it will be useful, but WITHOUT 26.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 26.14 + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 26.15 + * version 2 for more details (a copy is included in the LICENSE file that 26.16 + * accompanied this code). 26.17 + * 26.18 + * You should have received a copy of the GNU General Public License version 26.19 + * 2 along with this work; if not, write to the Free Software Foundation, 26.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 26.21 + * 26.22 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 26.23 + * or visit www.oracle.com if you need additional information or have any 26.24 + * questions. 26.25 + */ 26.26 + 26.27 +package pkg1; 26.28 + 26.29 +public class DeprMemClass 26.30 +{ 26.31 + /** 26.32 + * Field in the class. 26.33 + * @deprecated Do not use this field. 26.34 + */ 26.35 + public int _field_In_Class; 26.36 + 26.37 + public int _fld; 26.38 + 26.39 + /** 26.40 + * Method in the class. 26.41 + * @deprecated Do not use this method. 26.42 + */ 26.43 + public void $method_In_Class() { 26.44 + } 26.45 + 26.46 + public void regularMethod() { 26.47 + } 26.48 +}
27.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 27.2 +++ b/test/com/sun/javadoc/testAnchorNames/pkg1/RegClass.java Thu Oct 10 10:51:15 2013 -0700 27.3 @@ -0,0 +1,186 @@ 27.4 +/* 27.5 + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. 27.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 27.7 + * 27.8 + * This code is free software; you can redistribute it and/or modify it 27.9 + * under the terms of the GNU General Public License version 2 only, as 27.10 + * published by the Free Software Foundation. 27.11 + * 27.12 + * This code is distributed in the hope that it will be useful, but WITHOUT 27.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 27.14 + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 27.15 + * version 2 for more details (a copy is included in the LICENSE file that 27.16 + * accompanied this code). 27.17 + * 27.18 + * You should have received a copy of the GNU General Public License version 27.19 + * 2 along with this work; if not, write to the Free Software Foundation, 27.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 27.21 + * 27.22 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 27.23 + * or visit www.oracle.com if you need additional information or have any 27.24 + * questions. 27.25 + */ 27.26 + 27.27 +package pkg1; 27.28 + 27.29 +import java.io.Serializable; 27.30 +import java.util.Map; 27.31 + 27.32 +/** 27.33 + * @serial This is the serial tag's comment. 27.34 + */ 27.35 +public class RegClass implements Serializable { 27.36 + 27.37 + /** 27.38 + * Normal field in class. 27.39 + */ 27.40 + public String field; 27.41 + 27.42 + /** 27.43 + * Normal field in class. 27.44 + */ 27.45 + public String method$$; 27.46 + 27.47 + /** 27.48 + * Filed staring with $. 27.49 + */ 27.50 + public String $field; 27.51 + 27.52 + /** 27.53 + * Filed staring with underscore. 27.54 + */ 27.55 + public String _field; 27.56 + 27.57 + /** 27.58 + * Serial field 27.59 + * @serial 27.60 + */ 27.61 + public boolean t_e$t; 27.62 + 27.63 + /** 27.64 + * Field in class with a $ in the name. 27.65 + */ 27.66 + public String fieldInCla$$; 27.67 + 27.68 + /** 27.69 + * Field name as just an underscore. 27.70 + */ 27.71 + public int _; 27.72 + 27.73 + /** 27.74 + * Field name as just a $. 27.75 + */ 27.76 + public int $; 27.77 + 27.78 + /** 27.79 + * Field name with underscore and $. 27.80 + */ 27.81 + public int _$; 27.82 + 27.83 + /** 27.84 + * Field name with $ and underscore. 27.85 + */ 27.86 + public int $_; 27.87 + 27.88 + /** 27.89 + * An array. 27.90 + */ 27.91 + public int arr[]; 27.92 + 27.93 + /** 27.94 + * Another array. 27.95 + */ 27.96 + public int[] arr1; 27.97 + 27.98 + /** 27.99 + * A constant field. 27.100 + */ 27.101 + public static final int S_$$$$$INT = 0; 27.102 + 27.103 + /** 27.104 + * Another field. 27.105 + */ 27.106 + public DeprMemClass d____mc; 27.107 + 27.108 + /** 27.109 + * An enum. 27.110 + */ 27.111 + public static enum Te$t_Enum { 27.112 + FLD_1, 27.113 + $FLD2 27.114 + }; 27.115 + 27.116 + /** 27.117 + * A constructor. 27.118 + */ 27.119 + public RegClass(String p, int i) { 27.120 + } 27.121 + 27.122 + /** 27.123 + * Method in Class. 27.124 + * @param p a string 27.125 + */ 27.126 + public void _methodInClass(String p) { 27.127 + } 27.128 + 27.129 + /** 27.130 + * Method in Class. 27.131 + * @param p a string 27.132 + * @param i an int 27.133 + */ 27.134 + public void _methodInClas$(String p, int i) { 27.135 + } 27.136 + 27.137 + /** 27.138 + * Method with $ in the name. 27.139 + * @param p a string array 27.140 + */ 27.141 + public void methodInCla$s(String[] p) { 27.142 + } 27.143 + 27.144 + /** 27.145 + * Method with D[] as a parameter. 27.146 + * @param p an array of D 27.147 + */ 27.148 + public void methodD(D[] p) { 27.149 + } 27.150 + 27.151 + /** 27.152 + * Method with $A as a parameter. 27.153 + * @param p an object of $A 27.154 + */ 27.155 + public void methodD($A p) { 27.156 + } 27.157 + 27.158 + /** 27.159 + * Serial test. 27.160 + * @serialData This is a serial data comment. 27.161 + * @return null 27.162 + */ 27.163 + protected Object $readResolve(){return null;} 27.164 + 27.165 + /** 27.166 + * Simple method. 27.167 + */ 27.168 + public void method() {} 27.169 + 27.170 + /** 27.171 + * Generics. 27.172 + */ 27.173 + public static <A> void foo(Map<A, Map<A, A>> map) {} 27.174 + 27.175 + /** 27.176 + * A nested class. 27.177 + */ 27.178 + public class _NestedClas$ {} 27.179 + 27.180 + /** 27.181 + * Nested class D. 27.182 + */ 27.183 + class D {} 27.184 + 27.185 + /** 27.186 + * Nested class $A. 27.187 + */ 27.188 + class $A {} 27.189 +}
28.1 --- a/test/com/sun/javadoc/testAnnotationOptional/TestAnnotationOptional.java Thu Oct 10 08:51:55 2013 +0200 28.2 +++ b/test/com/sun/javadoc/testAnnotationOptional/TestAnnotationOptional.java Thu Oct 10 10:51:15 2013 -0700 28.3 @@ -1,5 +1,5 @@ 28.4 /* 28.5 - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. 28.6 + * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved. 28.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 28.8 * 28.9 * This code is free software; you can redistribute it and/or modify it 28.10 @@ -23,7 +23,8 @@ 28.11 28.12 /* 28.13 * @test 28.14 - * @summary Make sure that annotations types with optional elements has 28.15 + * @bug 8025633 28.16 + * @summary Make sure that annotations types with optional elements have 28.17 * element headers 28.18 * @author Mahmood Ali 28.19 * @library ../lib/ 28.20 @@ -45,7 +46,7 @@ 28.21 //Input for string search tests. 28.22 private static final String[][] TEST = { 28.23 {BUG_ID + FS + "pkg" + FS + "AnnotationOptional.html", 28.24 - "<a name=\"annotation_type_element_detail\">" 28.25 + "<a name=\"annotation.type.element.detail\">" 28.26 } 28.27 }; 28.28
29.1 --- a/test/com/sun/javadoc/testAnnotationTypes/TestAnnotationTypes.java Thu Oct 10 08:51:55 2013 +0200 29.2 +++ b/test/com/sun/javadoc/testAnnotationTypes/TestAnnotationTypes.java Thu Oct 10 10:51:15 2013 -0700 29.3 @@ -23,7 +23,7 @@ 29.4 29.5 /* 29.6 * @test 29.7 - * @bug 4973609 8015249 29.8 + * @bug 4973609 8015249 8025633 29.9 * @summary Make sure that annotation types with 0 members does not have 29.10 * extra HR tags. 29.11 * @author jamieh 29.12 @@ -45,11 +45,11 @@ 29.13 //Input for string search tests. 29.14 private static final String[][] TEST = { 29.15 {BUG_ID + FS + "pkg" + FS + "AnnotationTypeField.html", 29.16 - "<li>Summary: </li>" + NL + "<li><a href=\"#annotation_type_" + 29.17 - "field_summary\">Field</a> | </li>"}, 29.18 + "<li>Summary: </li>" + NL + "<li><a href=\"#annotation.type." + 29.19 + "field.summary\">Field</a> | </li>"}, 29.20 {BUG_ID + FS + "pkg" + FS + "AnnotationTypeField.html", 29.21 - "<li>Detail: </li>" + NL + "<li><a href=\"#annotation_type_" + 29.22 - "field_detail\">Field</a> | </li>"}, 29.23 + "<li>Detail: </li>" + NL + "<li><a href=\"#annotation.type." + 29.24 + "field.detail\">Field</a> | </li>"}, 29.25 {BUG_ID + FS + "pkg" + FS + "AnnotationTypeField.html", 29.26 "<!-- =========== ANNOTATION TYPE FIELD SUMMARY =========== -->"}, 29.27 {BUG_ID + FS + "pkg" + FS + "AnnotationTypeField.html",
30.1 --- a/test/com/sun/javadoc/testClassCrossReferences/TestClassCrossReferences.java Thu Oct 10 08:51:55 2013 +0200 30.2 +++ b/test/com/sun/javadoc/testClassCrossReferences/TestClassCrossReferences.java Thu Oct 10 10:51:15 2013 -0700 30.3 @@ -23,7 +23,7 @@ 30.4 30.5 /* 30.6 * @test 30.7 - * @bug 4652655 4857717 30.8 + * @bug 4652655 4857717 8025633 30.9 * @summary This test verifies that class cross references work properly. 30.10 * @author jamieh 30.11 * @library ../lib/ 30.12 @@ -45,7 +45,7 @@ 30.13 "<a href=\"http://java.sun.com/j2se/1.4/docs/api/java/math/BigDecimal.html?is-external=true\" " + 30.14 "title=\"class or interface in java.math\"><code>Link to external class BigDecimal</code></a>"}, 30.15 {BUG_ID + FS + "C.html", 30.16 - "<a href=\"http://java.sun.com/j2se/1.4/docs/api/java/math/BigInteger.html?is-external=true#gcd(java.math.BigInteger)\" " + 30.17 + "<a href=\"http://java.sun.com/j2se/1.4/docs/api/java/math/BigInteger.html?is-external=true#gcd-java.math.BigInteger-\" " + 30.18 "title=\"class or interface in java.math\"><code>Link to external member gcd</code></a>"}, 30.19 {BUG_ID + FS + "C.html", 30.20 "<dl>" + NL + "<dt><span class=\"strong\">Overrides:</span></dt>" + NL +
31.1 --- a/test/com/sun/javadoc/testExternalOverridenMethod/TestExternalOverridenMethod.java Thu Oct 10 08:51:55 2013 +0200 31.2 +++ b/test/com/sun/javadoc/testExternalOverridenMethod/TestExternalOverridenMethod.java Thu Oct 10 10:51:15 2013 -0700 31.3 @@ -23,14 +23,13 @@ 31.4 31.5 /* 31.6 * @test 31.7 - * @bug 4857717 31.8 + * @bug 4857717 8025633 31.9 * @summary Test to make sure that externally overriden and implemented methods 31.10 * are documented properly. The method should still include "implements" or 31.11 * "overrides" documentation even though the method is external. 31.12 * @author jamieh 31.13 * @library ../lib/ 31.14 - * @build JavadocTester 31.15 - * @build TestExternalOverridenMethod 31.16 + * @build JavadocTester TestExternalOverridenMethod 31.17 * @run main TestExternalOverridenMethod 31.18 */ 31.19 31.20 @@ -40,13 +39,13 @@ 31.21 private static final String[][] TEST = { 31.22 {BUG_ID + FS + "pkg" + FS + "XReader.html", 31.23 "<dt><span class=\"strong\">Overrides:</span></dt>" + NL + 31.24 - "<dd><code><a href=\"http://java.sun.com/j2se/1.4.1/docs/api/java/io/FilterReader.html?is-external=true#read()\" " + 31.25 + "<dd><code><a href=\"http://java.sun.com/j2se/1.4.1/docs/api/java/io/FilterReader.html?is-external=true#read--\" " + 31.26 "title=\"class or interface in java.io\">read</a></code> in class <code>" + 31.27 "<a href=\"http://java.sun.com/j2se/1.4.1/docs/api/java/io/FilterReader.html?is-external=true\" " + 31.28 "title=\"class or interface in java.io\">FilterReader</a></code></dd>"}, 31.29 {BUG_ID + FS + "pkg" + FS + "XReader.html", 31.30 "<dt><span class=\"strong\">Specified by:</span></dt>" + NL + 31.31 - "<dd><code><a href=\"http://java.sun.com/j2se/1.4.1/docs/api/java/io/DataInput.html?is-external=true#readInt()\" " + 31.32 + "<dd><code><a href=\"http://java.sun.com/j2se/1.4.1/docs/api/java/io/DataInput.html?is-external=true#readInt--\" " + 31.33 "title=\"class or interface in java.io\">readInt</a></code> in interface <code>" + 31.34 "<a href=\"http://java.sun.com/j2se/1.4.1/docs/api/java/io/DataInput.html?is-external=true\" " + 31.35 "title=\"class or interface in java.io\">DataInput</a></code></dd>"}};
32.1 --- a/test/com/sun/javadoc/testHref/TestHref.java Thu Oct 10 08:51:55 2013 +0200 32.2 +++ b/test/com/sun/javadoc/testHref/TestHref.java Thu Oct 10 10:51:15 2013 -0700 32.3 @@ -23,7 +23,7 @@ 32.4 32.5 /* 32.6 * @test 32.7 - * @bug 4663254 8016328 32.8 + * @bug 4663254 8016328 8025633 32.9 * @summary Verify that spaces do not appear in hrefs and anchors. 32.10 * @author jamieh 32.11 * @library ../lib/ 32.12 @@ -46,31 +46,31 @@ 32.13 private static final String[][] TEST = { 32.14 //External link. 32.15 {BUG_ID + FS + "pkg" + FS + "C1.html", 32.16 - "href=\"http://java.sun.com/j2se/1.4/docs/api/java/lang/Object.html?is-external=true#wait(long,%20int)\"" 32.17 + "href=\"http://java.sun.com/j2se/1.4/docs/api/java/lang/Object.html?is-external=true#wait-long-int-\"" 32.18 }, 32.19 //Member summary table link. 32.20 {BUG_ID + FS + "pkg" + FS + "C1.html", 32.21 - "href=\"../pkg/C1.html#method(int,%20int,%20java.util.ArrayList)\"" 32.22 + "href=\"../pkg/C1.html#method-int-int-java.util.ArrayList-\"" 32.23 }, 32.24 //Anchor test. 32.25 {BUG_ID + FS + "pkg" + FS + "C1.html", 32.26 - "<a name=\"method(int, int, java.util.ArrayList)\">" + NL + 32.27 + "<a name=\"method-int-int-java.util.ArrayList-\">" + NL + 32.28 "<!-- -->" + NL + 32.29 "</a>" 32.30 }, 32.31 //Backward compatibility anchor test. 32.32 {BUG_ID + FS + "pkg" + FS + "C1.html", 32.33 - "<a name=\"method(int, int, java.util.ArrayList)\">" + NL + 32.34 + "<a name=\"method-int-int-java.util.ArrayList-\">" + NL + 32.35 "<!-- -->" + NL + 32.36 "</a>" 32.37 }, 32.38 //{@link} test. 32.39 {BUG_ID + FS + "pkg" + FS + "C2.html", 32.40 - "Link: <a href=\"../pkg/C1.html#method(int,%20int,%20java.util.ArrayList)\">" 32.41 + "Link: <a href=\"../pkg/C1.html#method-int-int-java.util.ArrayList-\">" 32.42 }, 32.43 //@see test. 32.44 {BUG_ID + FS + "pkg" + FS + "C2.html", 32.45 - "See Also:</span></dt>" + NL + "<dd><a href=\"../pkg/C1.html#method(int,%20int,%20java.util.ArrayList)\">" 32.46 + "See Also:</span></dt>" + NL + "<dd><a href=\"../pkg/C1.html#method-int-int-java.util.ArrayList-\">" 32.47 }, 32.48 32.49 //Header does not link to the page itself.
33.1 --- a/test/com/sun/javadoc/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java Thu Oct 10 08:51:55 2013 +0200 33.2 +++ b/test/com/sun/javadoc/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java Thu Oct 10 10:51:15 2013 -0700 33.3 @@ -25,7 +25,7 @@ 33.4 33.5 /* 33.6 * @test 33.7 - * @bug 6786690 6820360 33.8 + * @bug 6786690 6820360 8025633 33.9 * @summary This test verifies the nesting of definition list tags. 33.10 * @author Bhavesh Patel 33.11 * @library ../lib/ 33.12 @@ -64,7 +64,7 @@ 33.13 {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>" + NL + "<dt><span class=\"strong\">Since:</span></dt>" + NL + 33.14 "<dd>1.4</dd>" + NL + 33.15 "<dt><span class=\"strong\">See Also:</span></dt>" + NL + "<dd>" + 33.16 - "<a href=\"../pkg1/C1.html#setUndecorated(boolean)\">" + 33.17 + "<a href=\"../pkg1/C1.html#setUndecorated-boolean-\">" + 33.18 "<code>setUndecorated(boolean)</code></a></dd>" + NL + "</dl>"}, 33.19 {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>"+ NL + "<dt><span class=\"strong\">Parameters:</span></dt>" + NL + "<dd><code>title" + 33.20 "</code> - the title</dd>" + NL + "<dd><code>test</code> - boolean value" + 33.21 @@ -79,11 +79,11 @@ 33.22 "if decorations are to be enabled.</dd>" + NL + "<dt><span class=\"strong\">Since:" + 33.23 "</span></dt>" + NL + "<dd>1.4</dd>" + NL + 33.24 "<dt><span class=\"strong\">See Also:</span></dt>" + NL + "<dd>" + 33.25 - "<a href=\"../pkg1/C1.html#readObject()\"><code>readObject()" + 33.26 + "<a href=\"../pkg1/C1.html#readObject--\"><code>readObject()" + 33.27 "</code></a></dd>" + NL + "</dl>"}, 33.28 {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>" + NL + "<dt><span class=\"strong\">Throws:</span></dt>" + NL + 33.29 "<dd><code>java.io.IOException</code></dd>" + NL + "<dt><span class=\"strong\">See Also:" + 33.30 - "</span></dt>" + NL + "<dd><a href=\"../pkg1/C1.html#setUndecorated(boolean)\">" + 33.31 + "</span></dt>" + NL + "<dd><a href=\"../pkg1/C1.html#setUndecorated-boolean-\">" + 33.32 "<code>setUndecorated(boolean)</code></a></dd>" + NL + "</dl>"}, 33.33 {BUG_ID + FS + "pkg1" + FS + "C2.html", "<dl>" + NL + "<dt><span class=\"strong\">Parameters:" + 33.34 "</span></dt>" + NL + "<dd><code>set</code> - boolean</dd>" + NL + "<dt><span class=\"strong\">" + 33.35 @@ -91,20 +91,20 @@ 33.36 {BUG_ID + FS + "serialized-form.html", "<dl>" + NL + "<dt><span class=\"strong\">Throws:</span>" + 33.37 "</dt>" + NL + "<dd><code>" + 33.38 "java.io.IOException</code></dd>" + NL + "<dt><span class=\"strong\">See Also:</span>" + 33.39 - "</dt>" + NL + "<dd><a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + 33.40 + "</dt>" + NL + "<dd><a href=\"pkg1/C1.html#setUndecorated-boolean-\">" + 33.41 "<code>C1.setUndecorated(boolean)</code></a></dd>" + NL + "</dl>"}, 33.42 {BUG_ID + FS + "serialized-form.html", "<span class=\"strong\">Deprecated.</span>" + 33.43 " <span class=\"italic\">As of JDK version 1.5, replaced by" + NL + 33.44 - " <a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + 33.45 + " <a href=\"pkg1/C1.html#setUndecorated-boolean-\">" + 33.46 "<code>setUndecorated(boolean)</code></a>.</span></div>" + NL + 33.47 "<div class=\"block\">This field indicates whether the C1 is " + 33.48 "undecorated.</div>" + NL + " " + NL + "<dl>" + NL + "<dt><span class=\"strong\">Since:</span></dt>" + NL + 33.49 "<dd>1.4</dd>" + NL + "<dt><span class=\"strong\">See Also:</span>" + 33.50 - "</dt>" + NL + "<dd><a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + 33.51 + "</dt>" + NL + "<dd><a href=\"pkg1/C1.html#setUndecorated-boolean-\">" + 33.52 "<code>C1.setUndecorated(boolean)</code></a></dd>" + NL + "</dl>"}, 33.53 {BUG_ID + FS + "serialized-form.html", "<span class=\"strong\">Deprecated.</span>" + 33.54 " <span class=\"italic\">As of JDK version 1.5, replaced by" + NL + 33.55 - " <a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + 33.56 + " <a href=\"pkg1/C1.html#setUndecorated-boolean-\">" + 33.57 "<code>setUndecorated(boolean)</code></a>.</span></div>" + NL + 33.58 "<div class=\"block\">Reads the object stream.</div>" + NL + 33.59 "<dl>" + NL + "<dt><span class=\"strong\">Throws:" + 33.60 @@ -141,29 +141,29 @@ 33.61 " if no decorations are" + NL + " to be enabled;" + NL + 33.62 " <code>false</code> if decorations are to be enabled." + 33.63 "</dd>" + NL + "<dt><span class=\"strong\">Since:</span></dt>" + NL + "<dd>1.4</dd>" + NL + 33.64 - "<dt><span class=\"strong\">See Also:</span></dt>" + NL + "<dd><a href=\"../pkg1/C1.html#readObject()\">" + 33.65 + "<dt><span class=\"strong\">See Also:</span></dt>" + NL + "<dd><a href=\"../pkg1/C1.html#readObject--\">" + 33.66 "<code>readObject()</code></a></dd>" + NL + "</dl>"}, 33.67 {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>" + NL + "<dt><span class=\"strong\">Throws:</span>" + 33.68 "</dt>" + NL + "<dd><code>java.io.IOException</code></dd>" + NL + "<dt>" + 33.69 - "<span class=\"strong\">See Also:</span></dt>" + NL + "<dd><a href=\"../pkg1/C1.html#setUndecorated(boolean)\">" + 33.70 + "<span class=\"strong\">See Also:</span></dt>" + NL + "<dd><a href=\"../pkg1/C1.html#setUndecorated-boolean-\">" + 33.71 "<code>setUndecorated(boolean)</code></a></dd>" + NL + "</dl>"}, 33.72 {BUG_ID + FS + "serialized-form.html", "<dl>" + NL + "<dt><span class=\"strong\">Throws:</span>" + 33.73 "</dt>" + NL + "<dd><code>" + 33.74 "java.io.IOException</code></dd>" + NL + "<dt><span class=\"strong\">See Also:</span>" + 33.75 - "</dt>" + NL + "<dd><a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + 33.76 + "</dt>" + NL + "<dd><a href=\"pkg1/C1.html#setUndecorated-boolean-\">" + 33.77 "<code>C1.setUndecorated(boolean)</code></a></dd>" + NL + "</dl>"}, 33.78 {BUG_ID + FS + "serialized-form.html", "<span class=\"strong\">Deprecated.</span>" + 33.79 " <span class=\"italic\">As of JDK version 1.5, replaced by" + NL + 33.80 - " <a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + 33.81 + " <a href=\"pkg1/C1.html#setUndecorated-boolean-\">" + 33.82 "<code>setUndecorated(boolean)</code></a>.</span></div>" + NL + 33.83 "<div class=\"block\">This field indicates whether the C1 is " + 33.84 "undecorated.</div>" + NL + " " + NL + "<dl>" + NL + "<dt><span class=\"strong\">Since:</span></dt>" + NL + 33.85 "<dd>1.4</dd>" + NL + "<dt><span class=\"strong\">See Also:</span>" + 33.86 - "</dt>" + NL + "<dd><a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + 33.87 + "</dt>" + NL + "<dd><a href=\"pkg1/C1.html#setUndecorated-boolean-\">" + 33.88 "<code>C1.setUndecorated(boolean)</code></a></dd>" + NL + "</dl>"}, 33.89 {BUG_ID + FS + "serialized-form.html", "<span class=\"strong\">Deprecated.</span>" + 33.90 " <span class=\"italic\">As of JDK version 1.5, replaced by" + NL + 33.91 - " <a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + 33.92 + " <a href=\"pkg1/C1.html#setUndecorated-boolean-\">" + 33.93 "<code>setUndecorated(boolean)</code></a>.</span></div>" + NL + 33.94 "<div class=\"block\">Reads the object stream.</div>" + NL + 33.95 "<dl>" + NL + "<dt><span class=\"strong\">Throws:" + 33.96 @@ -188,12 +188,12 @@ 33.97 {BUG_ID + FS + "serialized-form.html", "<pre>boolean " + 33.98 "undecorated</pre>" + NL + "<div class=\"block\"><span class=\"strong\">" + 33.99 "Deprecated.</span> <span class=\"italic\">As of JDK version 1.5, replaced by" + NL + 33.100 - " <a href=\"pkg1/C1.html#setUndecorated(boolean)\"><code>" + 33.101 + " <a href=\"pkg1/C1.html#setUndecorated-boolean-\"><code>" + 33.102 "setUndecorated(boolean)</code></a>.</span></div>" + NL + "</li>"}, 33.103 {BUG_ID + FS + "serialized-form.html", "<span class=\"strong\">" + 33.104 "Deprecated.</span> <span class=\"italic\">As of JDK version" + 33.105 " 1.5, replaced by" + NL + 33.106 - " <a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + 33.107 + " <a href=\"pkg1/C1.html#setUndecorated-boolean-\">" + 33.108 "<code>setUndecorated(boolean)</code></a>.</span></div>" + NL + "</li>"}}; 33.109 33.110 // Test for valid HTML generation which should not comprise of empty
34.1 --- a/test/com/sun/javadoc/testInterface/TestInterface.java Thu Oct 10 08:51:55 2013 +0200 34.2 +++ b/test/com/sun/javadoc/testInterface/TestInterface.java Thu Oct 10 10:51:15 2013 -0700 34.3 @@ -23,7 +23,7 @@ 34.4 34.5 /* 34.6 * @test 34.7 - * @bug 4682448 4947464 5029946 34.8 + * @bug 4682448 4947464 5029946 8025633 34.9 * @summary Verify that the public modifier does not show up in the 34.10 * documentation for public methods, as recommended by the JLS. 34.11 * If A implements I and B extends A, B should be in the list of 34.12 @@ -84,7 +84,7 @@ 34.13 //Make sure "Specified By" has substituted type parameters. 34.14 {BUG_ID + FS + "pkg" + FS + "Child.html", 34.15 "<dt><span class=\"strong\">Specified by:</span></dt>" + NL + 34.16 - "<dd><code><a href=\"../pkg/Interface.html#method()\">method</a>" + 34.17 + "<dd><code><a href=\"../pkg/Interface.html#method--\">method</a>" + 34.18 "</code> in interface <code>" + 34.19 "<a href=\"../pkg/Interface.html\" title=\"interface in pkg\">" + 34.20 "Interface</a><<a href=\"../pkg/Child.html\" title=\"type parameter in Child\">" + 34.21 @@ -93,7 +93,7 @@ 34.22 //Make sure "Overrides" has substituted type parameters. 34.23 {BUG_ID + FS + "pkg" + FS + "Child.html", 34.24 "<dt><span class=\"strong\">Overrides:</span></dt>" + NL + 34.25 - "<dd><code><a href=\"../pkg/Parent.html#method()\">method</a>" + 34.26 + "<dd><code><a href=\"../pkg/Parent.html#method--\">method</a>" + 34.27 "</code> in class <code><a href=\"../pkg/Parent.html\" " + 34.28 "title=\"class in pkg\">Parent</a><<a href=\"../pkg/Child.html\" " + 34.29 "title=\"type parameter in Child\">T</a>></code></dd>"
35.1 --- a/test/com/sun/javadoc/testJavaFX/TestJavaFX.java Thu Oct 10 08:51:55 2013 +0200 35.2 +++ b/test/com/sun/javadoc/testJavaFX/TestJavaFX.java Thu Oct 10 10:51:15 2013 -0700 35.3 @@ -23,7 +23,7 @@ 35.4 35.5 /* 35.6 * @test 35.7 - * @bug 7112427 8012295 35.8 + * @bug 7112427 8012295 8025633 35.9 * @summary Test of the JavaFX doclet features. 35.10 * @author jvalenta 35.11 * @library ../lib/ 35.12 @@ -38,8 +38,8 @@ 35.13 private static final String[][] TEST = 35.14 new String[][] { 35.15 {"./" + BUG_ID + "/C.html", 35.16 - "<dt><span class=\"strong\">See Also:</span></dt>" + NL + "<dd><a href=\"C.html#getRate()\"><code>getRate()</code></a>, " + NL + 35.17 - "<a href=\"C.html#setRate(double)\"><code>setRate(double)</code></a></dd>"}, 35.18 + "<dt><span class=\"strong\">See Also:</span></dt>" + NL + "<dd><a href=\"C.html#getRate--\"><code>getRate()</code></a>, " + NL + 35.19 + "<a href=\"C.html#setRate-double-\"><code>setRate(double)</code></a></dd>"}, 35.20 {"./" + BUG_ID + "/C.html", 35.21 "<pre>public final void setRate(double value)</pre>" + NL + 35.22 "<div class=\"block\">Sets the value of the property rate.</div>" + NL + 35.23 @@ -63,7 +63,7 @@ 35.24 {"./" + BUG_ID + "/C.html", 35.25 "<span class=\"strong\">Property description:</span>"}, 35.26 {"./" + BUG_ID + "/C.html", 35.27 - "<td class=\"colLast\"><code><span class=\"strong\"><a href=\"C.html#setTestMethodProperty()\">setTestMethodProperty</a></span>()</code> </td>" }, 35.28 + "<td class=\"colLast\"><code><span class=\"strong\"><a href=\"C.html#setTestMethodProperty--\">setTestMethodProperty</a></span>()</code> </td>" }, 35.29 {"./" + BUG_ID + "/C.html", 35.30 "<h4>isPaused</h4>" + NL + 35.31 "<pre>public final double isPaused()</pre>" + NL +
36.1 --- a/test/com/sun/javadoc/testLinkTaglet/TestLinkTaglet.java Thu Oct 10 08:51:55 2013 +0200 36.2 +++ b/test/com/sun/javadoc/testLinkTaglet/TestLinkTaglet.java Thu Oct 10 10:51:15 2013 -0700 36.3 @@ -23,7 +23,7 @@ 36.4 36.5 /* 36.6 * @test 36.7 - * @bug 4732864 6280605 7064544 8014636 8016328 36.8 + * @bug 4732864 6280605 7064544 8014636 8016328 8025633 36.9 * @summary Make sure that you can link from one member to another using 36.10 * non-qualified name, furthermore, ensure the right one is linked. 36.11 * @author jamieh 36.12 @@ -49,9 +49,9 @@ 36.13 "Qualified Link: <a href=\"../pkg/C.InnerC.html\" title=\"class in pkg\"><code>C.InnerC</code></a>.<br/>" + NL + 36.14 " Unqualified Link1: <a href=\"../pkg/C.InnerC.html\" title=\"class in pkg\"><code>C.InnerC</code></a>.<br/>" + NL + 36.15 " Unqualified Link2: <a href=\"../pkg/C.InnerC.html\" title=\"class in pkg\"><code>C.InnerC</code></a>.<br/>" + NL + 36.16 - " Qualified Link: <a href=\"../pkg/C.html#method(pkg.C.InnerC,%20pkg.C.InnerC2)\"><code>method(pkg.C.InnerC, pkg.C.InnerC2)</code></a>.<br/>" + NL + 36.17 - " Unqualified Link: <a href=\"../pkg/C.html#method(pkg.C.InnerC,%20pkg.C.InnerC2)\"><code>method(C.InnerC, C.InnerC2)</code></a>.<br/>" + NL + 36.18 - " Unqualified Link: <a href=\"../pkg/C.html#method(pkg.C.InnerC,%20pkg.C.InnerC2)\"><code>method(InnerC, InnerC2)</code></a>.<br/>" 36.19 + " Qualified Link: <a href=\"../pkg/C.html#method-pkg.C.InnerC-pkg.C.InnerC2-\"><code>method(pkg.C.InnerC, pkg.C.InnerC2)</code></a>.<br/>" + NL + 36.20 + " Unqualified Link: <a href=\"../pkg/C.html#method-pkg.C.InnerC-pkg.C.InnerC2-\"><code>method(C.InnerC, C.InnerC2)</code></a>.<br/>" + NL + 36.21 + " Unqualified Link: <a href=\"../pkg/C.html#method-pkg.C.InnerC-pkg.C.InnerC2-\"><code>method(InnerC, InnerC2)</code></a>.<br/>" 36.22 }, 36.23 {BUG_ID + FS + "pkg" + FS + "C.InnerC.html", 36.24 "Link to member in outer class: <a href=\"../pkg/C.html#MEMBER\"><code>C.MEMBER</code></a> <br/>" + NL +
37.1 --- a/test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java Thu Oct 10 08:51:55 2013 +0200 37.2 +++ b/test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java Thu Oct 10 10:51:15 2013 -0700 37.3 @@ -23,7 +23,7 @@ 37.4 37.5 /* 37.6 * @test 37.7 - * @bug 4638588 4635809 6256068 6270645 37.8 + * @bug 4638588 4635809 6256068 6270645 8025633 37.9 * @summary Test to make sure that members are inherited properly in the Javadoc. 37.10 * Verify that inheritence labels are correct. 37.11 * @author jamieh 37.12 @@ -44,7 +44,7 @@ 37.13 37.14 //Public method should be inherited 37.15 {BUG_ID + FS + "pkg" + FS + "SubClass.html", 37.16 - "<a href=\"../pkg/BaseClass.html#pubMethod()\">"}, 37.17 + "<a href=\"../pkg/BaseClass.html#pubMethod--\">"}, 37.18 37.19 //Public inner class should be inherited. 37.20 {BUG_ID + FS + "pkg" + FS + "SubClass.html", 37.21 @@ -56,7 +56,7 @@ 37.22 37.23 //Protected method should be inherited 37.24 {BUG_ID + FS + "pkg" + FS + "SubClass.html", 37.25 - "<a href=\"../pkg/BaseClass.html#proMethod()\">"}, 37.26 + "<a href=\"../pkg/BaseClass.html#proMethod--\">"}, 37.27 37.28 //Protected inner class should be inherited. 37.29 {BUG_ID + FS + "pkg" + FS + "SubClass.html", 37.30 @@ -73,14 +73,14 @@ 37.31 // Test overriding/implementing methods with generic parameters. 37.32 {BUG_ID + FS + "pkg" + FS + "BaseClass.html", 37.33 "<dl>" + NL + "<dt><span class=\"strong\">Specified by:</span></dt>" + NL + 37.34 - "<dd><code><a href=\"../pkg/BaseInterface.html#getAnnotation(java.lang.Class)\">" + 37.35 + "<dd><code><a href=\"../pkg/BaseInterface.html#getAnnotation-java.lang.Class-\">" + 37.36 "getAnnotation</a></code> in interface <code>" + 37.37 "<a href=\"../pkg/BaseInterface.html\" title=\"interface in pkg\">" + 37.38 "BaseInterface</a></code></dd>" + NL + "</dl>"}, 37.39 37.40 // Test diamond inheritence member summary (6256068) 37.41 {BUG_ID + FS + "diamond" + FS + "Z.html", 37.42 - "<code><a href=\"../diamond/A.html#aMethod()\">aMethod</a></code>"}, 37.43 + "<code><a href=\"../diamond/A.html#aMethod--\">aMethod</a></code>"}, 37.44 37.45 // Test that doc is inherited from closed parent (6270645) 37.46 {BUG_ID + FS + "inheritDist" + FS + "C.html", 37.47 @@ -90,7 +90,7 @@ 37.48 37.49 private static final String[][] NEGATED_TEST = { 37.50 {BUG_ID + FS + "pkg" + FS + "SubClass.html", 37.51 - "<a href=\"../pkg/BaseClass.html#staticMethod()\">staticMethod</a></code>"}, 37.52 + "<a href=\"../pkg/BaseClass.html#staticMethod--\">staticMethod</a></code>"}, 37.53 }; 37.54 private static final String[] ARGS = 37.55 new String[] {
38.1 --- a/test/com/sun/javadoc/testMemberSummary/TestMemberSummary.java Thu Oct 10 08:51:55 2013 +0200 38.2 +++ b/test/com/sun/javadoc/testMemberSummary/TestMemberSummary.java Thu Oct 10 10:51:15 2013 -0700 38.3 @@ -23,7 +23,7 @@ 38.4 38.5 /* 38.6 * @test 38.7 - * @bug 4951228 6290760 38.8 + * @bug 4951228 6290760 8025633 38.9 * @summary Test the case where the overriden method returns a different 38.10 * type than the method in the child class. Make sure the 38.11 * documentation is inherited but the return type isn't. 38.12 @@ -49,7 +49,7 @@ 38.13 // Check return type in member summary. 38.14 {BUG_ID + FS + "pkg" + FS + "PublicChild.html", 38.15 "<code><a href=\"../pkg/PublicChild.html\" title=\"class in pkg\">PublicChild</a></code></td>" + NL + 38.16 - "<td class=\"colLast\"><code><span class=\"strong\"><a href=\"../pkg/PublicChild.html#returnTypeTest()\">" + 38.17 + "<td class=\"colLast\"><code><span class=\"strong\"><a href=\"../pkg/PublicChild.html#returnTypeTest--\">" + 38.18 "returnTypeTest</a></span>()</code>" 38.19 }, 38.20 // Check return type in member detail. 38.21 @@ -60,9 +60,9 @@ 38.22 38.23 // Legacy anchor dimensions (6290760) 38.24 {BUG_ID + FS + "pkg2" + FS + "A.html", 38.25 - "<a name=\"f(java.lang.Object[])\">" + NL + 38.26 + "<a name=\"f-java.lang.Object:A-\">" + NL + 38.27 "<!-- -->" + NL + 38.28 - "</a><a name=\"f(T[])\">" + NL + 38.29 + "</a><a name=\"f-T:A-\">" + NL + 38.30 "<!-- -->" + NL + 38.31 "</a>" 38.32 },
39.1 --- a/test/com/sun/javadoc/testNavigation/TestNavigation.java Thu Oct 10 08:51:55 2013 +0200 39.2 +++ b/test/com/sun/javadoc/testNavigation/TestNavigation.java Thu Oct 10 10:51:15 2013 -0700 39.3 @@ -23,7 +23,7 @@ 39.4 39.5 /* 39.6 * @test 39.7 - * @bug 4131628 4664607 7025314 8023700 7198273 39.8 + * @bug 4131628 4664607 7025314 8023700 7198273 8025633 39.9 * @summary Make sure the Next/Prev Class links iterate through all types. 39.10 * Make sure the navagation is 2 columns, not 3. 39.11 * @author jamieh 39.12 @@ -60,7 +60,7 @@ 39.13 {BUG_ID + FS + "pkg" + FS + "I.html", "<li>Next Class</li>"}, 39.14 // Test for 4664607 39.15 {BUG_ID + FS + "pkg" + FS + "I.html", 39.16 - "<div class=\"skipNav\"><a href=\"#skip-navbar_top\" title=\"Skip navigation links\">Skip navigation links</a></div>" + NL + "<a name=\"navbar_top_firstrow\">" + NL + 39.17 + "<div class=\"skipNav\"><a href=\"#skip.navbar.top\" title=\"Skip navigation links\">Skip navigation links</a></div>" + NL + "<a name=\"navbar.top.firstrow\">" + NL + 39.18 "<!-- -->" + NL + "</a>"} 39.19 }; 39.20 private static final String[][] NEGATED_TEST = NO_TEST;
40.1 --- a/test/com/sun/javadoc/testNestedGenerics/TestNestedGenerics.java Thu Oct 10 08:51:55 2013 +0200 40.2 +++ b/test/com/sun/javadoc/testNestedGenerics/TestNestedGenerics.java Thu Oct 10 10:51:15 2013 -0700 40.3 @@ -1,5 +1,5 @@ 40.4 /* 40.5 - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. 40.6 + * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. 40.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 40.8 * 40.9 * This code is free software; you can redistribute it and/or modify it 40.10 @@ -23,7 +23,7 @@ 40.11 40.12 /* 40.13 * @test 40.14 - * @bug 6758050 40.15 + * @bug 6758050 8025633 40.16 * @summary Test HTML output for nested generic types. 40.17 * @author bpatel 40.18 * @library ../lib/ 40.19 @@ -46,7 +46,7 @@ 40.20 private static final String[][] TEST = { 40.21 {BUG_ID + FS + "pkg" + FS + "NestedGenerics.html", 40.22 "<div class=\"block\">Contains <a " + 40.23 - "href=\"../pkg/NestedGenerics.html#foo(java.util.Map)\"><code>foo" + 40.24 + "href=\"../pkg/NestedGenerics.html#foo-java.util.Map-\"><code>foo" + 40.25 "(java.util.Map<A, java.util.Map<A, A>>)</code></a></div>" 40.26 } 40.27 };
41.1 --- a/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java Thu Oct 10 08:51:55 2013 +0200 41.2 +++ b/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java Thu Oct 10 10:51:15 2013 -0700 41.3 @@ -23,7 +23,7 @@ 41.4 41.5 /* 41.6 * @test 41.7 - * @bug 4789689 4905985 4927164 4827184 4993906 5004549 7025314 7010344 41.8 + * @bug 4789689 4905985 4927164 4827184 4993906 5004549 7025314 7010344 8025633 41.9 * @summary Run Javadoc on a set of source files that demonstrate new 41.10 * language features. Check the output to ensure that the new 41.11 * language features are properly documented. 41.12 @@ -145,7 +145,7 @@ 41.13 //================================= 41.14 {BUG_ID + FS + "pkg" + FS + "VarArgs.html", "(int... i)"}, 41.15 {BUG_ID + FS + "pkg" + FS + "VarArgs.html", "(int[][]... i)"}, 41.16 - {BUG_ID + FS + "pkg" + FS + "VarArgs.html", "(int[]...)"}, 41.17 + {BUG_ID + FS + "pkg" + FS + "VarArgs.html", "-int:A...-"}, 41.18 {BUG_ID + FS + "pkg" + FS + "VarArgs.html", 41.19 "<a href=\"../pkg/TypeParameters.html\" title=\"class in pkg\">" + 41.20 "TypeParameters</a>... t"}, 41.21 @@ -156,13 +156,13 @@ 41.22 //Make sure the summary links are correct. 41.23 {BUG_ID + FS + "pkg" + FS + "AnnotationType.html", 41.24 "<li>Summary: </li>" + NL + "<li>Field | </li>" + NL + 41.25 - "<li><a href=\"#annotation_type_required_element_summary\">" + 41.26 + "<li><a href=\"#annotation.type.required.element.summary\">" + 41.27 "Required</a> | </li>" + NL + "<li>" + 41.28 - "<a href=\"#annotation_type_optional_element_summary\">Optional</a></li>"}, 41.29 + "<a href=\"#annotation.type.optional.element.summary\">Optional</a></li>"}, 41.30 //Make sure the detail links are correct. 41.31 {BUG_ID + FS + "pkg" + FS + "AnnotationType.html", 41.32 "<li>Detail: </li>" + NL + "<li>Field | </li>" + NL + 41.33 - "<li><a href=\"#annotation_type_element_detail\">Element</a></li>"}, 41.34 + "<li><a href=\"#annotation.type.element.detail\">Element</a></li>"}, 41.35 //Make sure the heading is correct. 41.36 {BUG_ID + FS + "pkg" + FS + "AnnotationType.html", 41.37 "Annotation Type AnnotationType</h2>"}, 41.38 @@ -188,16 +188,16 @@ 41.39 41.40 //PACKAGE 41.41 {BUG_ID + FS + "pkg" + FS + "package-summary.html", 41.42 - "<a href=\"../pkg/AnnotationType.html\" title=\"annotation in pkg\">@AnnotationType</a>(<a href=\"../pkg/AnnotationType.html#optional()\">optional</a>=\"Package Annotation\"," + NL + 41.43 - " <a href=\"../pkg/AnnotationType.html#required()\">required</a>=1994)"}, 41.44 + "<a href=\"../pkg/AnnotationType.html\" title=\"annotation in pkg\">@AnnotationType</a>(<a href=\"../pkg/AnnotationType.html#optional--\">optional</a>=\"Package Annotation\"," + NL + 41.45 + " <a href=\"../pkg/AnnotationType.html#required--\">required</a>=1994)"}, 41.46 41.47 //CLASS 41.48 {BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html", 41.49 "<pre><a href=\"../pkg/AnnotationType.html\" " + 41.50 "title=\"annotation in pkg\">@AnnotationType</a>(" + 41.51 - "<a href=\"../pkg/AnnotationType.html#optional()\">optional</a>" + 41.52 + "<a href=\"../pkg/AnnotationType.html#optional--\">optional</a>" + 41.53 "=\"Class Annotation\"," + NL + 41.54 - " <a href=\"../pkg/AnnotationType.html#required()\">" + 41.55 + " <a href=\"../pkg/AnnotationType.html#required--\">" + 41.56 "required</a>=1994)" + NL + "public class <span class=\"strong\">" + 41.57 "AnnotationTypeUsage</span>" + NL + "extends java.lang.Object</pre>"}, 41.58 41.59 @@ -205,36 +205,36 @@ 41.60 {BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html", 41.61 "<pre><a href=\"../pkg/AnnotationType.html\" " + 41.62 "title=\"annotation in pkg\">@AnnotationType</a>(" + 41.63 - "<a href=\"../pkg/AnnotationType.html#optional()\">optional</a>" + 41.64 + "<a href=\"../pkg/AnnotationType.html#optional--\">optional</a>" + 41.65 "=\"Field Annotation\"," + NL + 41.66 - " <a href=\"../pkg/AnnotationType.html#required()\">" + 41.67 + " <a href=\"../pkg/AnnotationType.html#required--\">" + 41.68 "required</a>=1994)" + NL + "public int field</pre>"}, 41.69 41.70 //CONSTRUCTOR 41.71 {BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html", 41.72 "<pre><a href=\"../pkg/AnnotationType.html\" " + 41.73 "title=\"annotation in pkg\">@AnnotationType</a>(" + 41.74 - "<a href=\"../pkg/AnnotationType.html#optional()\">optional</a>" + 41.75 + "<a href=\"../pkg/AnnotationType.html#optional--\">optional</a>" + 41.76 "=\"Constructor Annotation\"," + NL + 41.77 - " <a href=\"../pkg/AnnotationType.html#required()\">" + 41.78 + " <a href=\"../pkg/AnnotationType.html#required--\">" + 41.79 "required</a>=1994)" + NL + "public AnnotationTypeUsage()</pre>"}, 41.80 41.81 //METHOD 41.82 {BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html", 41.83 "<pre><a href=\"../pkg/AnnotationType.html\" " + 41.84 "title=\"annotation in pkg\">@AnnotationType</a>(" + 41.85 - "<a href=\"../pkg/AnnotationType.html#optional()\">optional</a>" + 41.86 + "<a href=\"../pkg/AnnotationType.html#optional--\">optional</a>" + 41.87 "=\"Method Annotation\"," + NL + 41.88 - " <a href=\"../pkg/AnnotationType.html#required()\">" + 41.89 + " <a href=\"../pkg/AnnotationType.html#required--\">" + 41.90 "required</a>=1994)" + NL + "public void method()</pre>"}, 41.91 41.92 //METHOD PARAMS 41.93 {BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html", 41.94 "<pre>public void methodWithParams(" + 41.95 "<a href=\"../pkg/AnnotationType.html\" title=\"annotation in pkg\">" + 41.96 - "@AnnotationType</a>(<a href=\"../pkg/AnnotationType.html#optional()\">" + 41.97 + "@AnnotationType</a>(<a href=\"../pkg/AnnotationType.html#optional--\">" + 41.98 "optional</a>=\"Parameter Annotation\",<a " + 41.99 - "href=\"../pkg/AnnotationType.html#required()\">required</a>=1994)" + NL + 41.100 + "href=\"../pkg/AnnotationType.html#required--\">required</a>=1994)" + NL + 41.101 " int documented," + NL + 41.102 " int undocmented)</pre>"}, 41.103 41.104 @@ -242,9 +242,9 @@ 41.105 {BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html", 41.106 "<pre>public AnnotationTypeUsage(<a " + 41.107 "href=\"../pkg/AnnotationType.html\" title=\"annotation in pkg\">" + 41.108 - "@AnnotationType</a>(<a href=\"../pkg/AnnotationType.html#optional()\">" + 41.109 + "@AnnotationType</a>(<a href=\"../pkg/AnnotationType.html#optional--\">" + 41.110 "optional</a>=\"Constructor Param Annotation\",<a " + 41.111 - "href=\"../pkg/AnnotationType.html#required()\">required</a>=1994)" + NL + 41.112 + "href=\"../pkg/AnnotationType.html#required--\">required</a>=1994)" + NL + 41.113 " int documented," + NL + 41.114 " int undocmented)</pre>"}, 41.115 41.116 @@ -254,43 +254,43 @@ 41.117 41.118 //Integer 41.119 {BUG_ID + FS + "pkg1" + FS + "B.html", 41.120 - "<a href=\"../pkg1/A.html#d()\">d</a>=3.14,"}, 41.121 + "<a href=\"../pkg1/A.html#d--\">d</a>=3.14,"}, 41.122 41.123 //Double 41.124 {BUG_ID + FS + "pkg1" + FS + "B.html", 41.125 - "<a href=\"../pkg1/A.html#d()\">d</a>=3.14,"}, 41.126 + "<a href=\"../pkg1/A.html#d--\">d</a>=3.14,"}, 41.127 41.128 //Boolean 41.129 {BUG_ID + FS + "pkg1" + FS + "B.html", 41.130 - "<a href=\"../pkg1/A.html#b()\">b</a>=true,"}, 41.131 + "<a href=\"../pkg1/A.html#b--\">b</a>=true,"}, 41.132 41.133 //String 41.134 {BUG_ID + FS + "pkg1" + FS + "B.html", 41.135 - "<a href=\"../pkg1/A.html#s()\">s</a>=\"sigh\","}, 41.136 + "<a href=\"../pkg1/A.html#s--\">s</a>=\"sigh\","}, 41.137 41.138 //Class 41.139 {BUG_ID + FS + "pkg1" + FS + "B.html", 41.140 - "<a href=\"../pkg1/A.html#c()\">c</a>=<a href=\"../pkg2/Foo.html\" title=\"class in pkg2\">Foo.class</a>,"}, 41.141 + "<a href=\"../pkg1/A.html#c--\">c</a>=<a href=\"../pkg2/Foo.html\" title=\"class in pkg2\">Foo.class</a>,"}, 41.142 41.143 //Bounded Class 41.144 {BUG_ID + FS + "pkg1" + FS + "B.html", 41.145 - "<a href=\"../pkg1/A.html#w()\">w</a>=<a href=\"../pkg/TypeParameterSubClass.html\" title=\"class in pkg\">TypeParameterSubClass.class</a>,"}, 41.146 + "<a href=\"../pkg1/A.html#w--\">w</a>=<a href=\"../pkg/TypeParameterSubClass.html\" title=\"class in pkg\">TypeParameterSubClass.class</a>,"}, 41.147 41.148 //Enum 41.149 {BUG_ID + FS + "pkg1" + FS + "B.html", 41.150 - "<a href=\"../pkg1/A.html#e()\">e</a>=<a href=\"../pkg/Coin.html#Penny\">Penny</a>,"}, 41.151 + "<a href=\"../pkg1/A.html#e--\">e</a>=<a href=\"../pkg/Coin.html#Penny\">Penny</a>,"}, 41.152 41.153 //Annotation Type 41.154 {BUG_ID + FS + "pkg1" + FS + "B.html", 41.155 - "<a href=\"../pkg1/A.html#a()\">a</a>=<a href=\"../pkg/AnnotationType.html\" title=\"annotation in pkg\">@AnnotationType</a>(<a href=\"../pkg/AnnotationType.html#optional()\">optional</a>=\"foo\",<a href=\"../pkg/AnnotationType.html#required()\">required</a>=1994),"}, 41.156 + "<a href=\"../pkg1/A.html#a--\">a</a>=<a href=\"../pkg/AnnotationType.html\" title=\"annotation in pkg\">@AnnotationType</a>(<a href=\"../pkg/AnnotationType.html#optional--\">optional</a>=\"foo\",<a href=\"../pkg/AnnotationType.html#required--\">required</a>=1994),"}, 41.157 41.158 //String Array 41.159 {BUG_ID + FS + "pkg1" + FS + "B.html", 41.160 - "<a href=\"../pkg1/A.html#sa()\">sa</a>={\"up\",\"down\"},"}, 41.161 + "<a href=\"../pkg1/A.html#sa--\">sa</a>={\"up\",\"down\"},"}, 41.162 41.163 //Primitive 41.164 {BUG_ID + FS + "pkg1" + FS + "B.html", 41.165 - "<a href=\"../pkg1/A.html#primitiveClassTest()\">primitiveClassTest</a>=boolean.class,"}, 41.166 + "<a href=\"../pkg1/A.html#primitiveClassTest--\">primitiveClassTest</a>=boolean.class,"}, 41.167 41.168 //XXX: Add array test case after this if fixed: 41.169 //5020899: Incorrect internal representation of class-valued annotation elements 41.170 @@ -335,7 +335,7 @@ 41.171 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html", 41.172 "<td class=\"colLast\"><span class=\"strong\">ClassUseTest1." + 41.173 "</span><code><span class=\"strong\"><a href=\"../../pkg2/" + 41.174 - "ClassUseTest1.html#method(T)\">method</a></span>" + 41.175 + "ClassUseTest1.html#method-T-\">method</a></span>" + 41.176 "(T t)</code> </td>" 41.177 }, 41.178 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html", 41.179 @@ -388,7 +388,7 @@ 41.180 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo2.html", 41.181 "<td class=\"colLast\"><span class=\"strong\">" + 41.182 "ClassUseTest1.</span><code><span class=\"strong\"><a href=\"../../" + 41.183 - "pkg2/ClassUseTest1.html#method(T)\">method</a></span>" + 41.184 + "pkg2/ClassUseTest1.html#method-T-\">method</a></span>" + 41.185 "(T t)</code> </td>" 41.186 }, 41.187 41.188 @@ -417,7 +417,7 @@ 41.189 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html", 41.190 "<td class=\"colLast\"><span class=\"strong\">ClassUseTest2." + 41.191 "</span><code><span class=\"strong\"><a href=\"../../pkg2/" + 41.192 - "ClassUseTest2.html#method(T)\">method</a></span>" + 41.193 + "ClassUseTest2.html#method-T-\">method</a></span>" + 41.194 "(T t)</code> </td>" 41.195 }, 41.196 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html", 41.197 @@ -472,7 +472,7 @@ 41.198 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html", 41.199 "<td class=\"colLast\"><span class=\"strong\">ClassUseTest2." + 41.200 "</span><code><span class=\"strong\"><a href=\"../../pkg2/" + 41.201 - "ClassUseTest2.html#method(T)\">method</a></span>" + 41.202 + "ClassUseTest2.html#method-T-\">method</a></span>" + 41.203 "(T t)</code> </td>" 41.204 }, 41.205 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html", 41.206 @@ -517,7 +517,7 @@ 41.207 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html", 41.208 "<td class=\"colLast\"><span class=\"strong\">ClassUseTest3" + 41.209 ".</span><code><span class=\"strong\"><a href=\"../../pkg2/ClassUseTest3." + 41.210 - "html#method(T)\">method</a></span>(T t)</code> </td>" 41.211 + "html#method-T-\">method</a></span>(T t)</code> </td>" 41.212 }, 41.213 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html", 41.214 "<td class=\"colFirst\"><code><T extends <a href=\"../" + 41.215 @@ -554,7 +554,7 @@ 41.216 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html", 41.217 "<td class=\"colLast\"><span class=\"strong\">ClassUseTest3." + 41.218 "</span><code><span class=\"strong\"><a href=\"../../pkg2/ClassUseTest3." + 41.219 - "html#method(T)\">method</a></span>(T t)</code>" + 41.220 + "html#method-T-\">method</a></span>(T t)</code>" + 41.221 " </td>" 41.222 }, 41.223 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html", 41.224 @@ -588,7 +588,7 @@ 41.225 "<td class=\"colFirst\"><code>void</code></td>" + NL + 41.226 "<td class=\"colLast\"><span class=\"strong\">ClassUseTest3." + 41.227 "</span><code><span class=\"strong\"><a href=\"../../pkg2/ClassUseTest3." + 41.228 - "html#method(java.util.Set)\">method</a></span>(java." + 41.229 + "html#method-java.util.Set-\">method</a></span>(java." + 41.230 "util.Set<<a href=\"../../pkg2/Foo4.html\" title=\"" + 41.231 "class in pkg2\">Foo4</a>> p)</code> </td>" + NL + 41.232 "</tr>" + NL + "</tbody>" 41.233 @@ -663,14 +663,14 @@ 41.234 // TYPE PARAMETER IN INDEX 41.235 //================================= 41.236 {BUG_ID + FS + "index-all.html", 41.237 - "<span class=\"strong\"><a href=\"pkg2/Foo.html#method(java.util.Vector)\">" + 41.238 + "<span class=\"strong\"><a href=\"pkg2/Foo.html#method-java.util.Vector-\">" + 41.239 "method(Vector<Object>)</a></span>" 41.240 }, 41.241 //================================= 41.242 // TYPE PARAMETER IN INDEX 41.243 //================================= 41.244 {BUG_ID + FS + "index-all.html", 41.245 - "<span class=\"strong\"><a href=\"pkg2/Foo.html#method(java.util.Vector)\">" + 41.246 + "<span class=\"strong\"><a href=\"pkg2/Foo.html#method-java.util.Vector-\">" + 41.247 "method(Vector<Object>)</a></span>" 41.248 }, 41.249 };
42.1 --- a/test/com/sun/javadoc/testOverridenMethods/TestOverridenMethodDocCopy.java Thu Oct 10 08:51:55 2013 +0200 42.2 +++ b/test/com/sun/javadoc/testOverridenMethods/TestOverridenMethodDocCopy.java Thu Oct 10 10:51:15 2013 -0700 42.3 @@ -23,7 +23,7 @@ 42.4 42.5 /* 42.6 * @test 42.7 - * @bug 4368820 42.8 + * @bug 4368820 8025633 42.9 * @summary Inherited comment should link directly to member, not just 42.10 * class 42.11 * @author jamieh 42.12 @@ -47,7 +47,7 @@ 42.13 private static final String[][] TEST = { 42.14 {BUG_ID + FS + "pkg1" + FS + "SubClass.html", 42.15 "<span class=\"strong\">Description copied from class: <code>" + 42.16 - "<a href=\"../pkg1/BaseClass.html#overridenMethodWithDocsToCopy()\">" + 42.17 + "<a href=\"../pkg1/BaseClass.html#overridenMethodWithDocsToCopy--\">" + 42.18 "BaseClass</a></code></span>" 42.19 } 42.20 };
43.1 --- a/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPackageFlag.java Thu Oct 10 08:51:55 2013 +0200 43.2 +++ b/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPackageFlag.java Thu Oct 10 10:51:15 2013 -0700 43.3 @@ -23,7 +23,7 @@ 43.4 43.5 /* 43.6 * @test 43.7 - * @bug 4634891 43.8 + * @bug 4634891 8025633 43.9 * @summary Determine if overriden methods are properly documented when 43.10 * -protected (default) visibility flag is used. 43.11 * @author jamieh 43.12 @@ -41,14 +41,14 @@ 43.13 //The public method should be overriden 43.14 {BUG_ID + FS + "pkg1" + FS + "SubClass.html", 43.15 "<dt><span class=\"strong\">Overrides:</span></dt>" + NL + 43.16 - "<dd><code><a href=\"../pkg1/BaseClass.html#publicMethod()\">" + 43.17 + "<dd><code><a href=\"../pkg1/BaseClass.html#publicMethod--\">" + 43.18 "publicMethod</a></code> in class <code>" + 43.19 "<a href=\"../pkg1/BaseClass.html\" title=\"class in pkg1\">BaseClass</a></code></dd>"}, 43.20 43.21 //The public method in different package should be overriden 43.22 {BUG_ID + FS + "pkg2" + FS + "SubClass.html", 43.23 "<dt><span class=\"strong\">Overrides:</span></dt>" + NL + 43.24 - "<dd><code><a href=\"../pkg1/BaseClass.html#publicMethod()\">" + 43.25 + "<dd><code><a href=\"../pkg1/BaseClass.html#publicMethod--\">" + 43.26 "publicMethod</a></code> in class <code>" + 43.27 "<a href=\"../pkg1/BaseClass.html\" title=\"class in pkg1\">BaseClass</a></code></dd>"}, 43.28 43.29 @@ -56,7 +56,7 @@ 43.30 //package. 43.31 {BUG_ID + FS + "pkg1" + FS + "SubClass.html", 43.32 "<dt><span class=\"strong\">Overrides:</span></dt>" + NL + 43.33 - "<dd><code><a href=\"../pkg1/BaseClass.html#packagePrivateMethod()\">" + 43.34 + "<dd><code><a href=\"../pkg1/BaseClass.html#packagePrivateMethod--\">" + 43.35 "packagePrivateMethod</a></code> in class <code>" + 43.36 "<a href=\"../pkg1/BaseClass.html\" title=\"class in pkg1\">BaseClass</a></code></dd>"} 43.37 };
44.1 --- a/test/com/sun/javadoc/testPrivateClasses/TestPrivateClasses.java Thu Oct 10 08:51:55 2013 +0200 44.2 +++ b/test/com/sun/javadoc/testPrivateClasses/TestPrivateClasses.java Thu Oct 10 10:51:15 2013 -0700 44.3 @@ -23,7 +23,7 @@ 44.4 44.5 /* 44.6 * @test 44.7 - * @bug 4780441 4874845 4978816 8014017 8016328 44.8 + * @bug 4780441 4874845 4978816 8014017 8016328 8025633 44.9 * @summary Make sure that when the -private flag is not used, members 44.10 * inherited from package private class are documented in the child. 44.11 * 44.12 @@ -66,7 +66,7 @@ 44.13 44.14 // Method inheritence from non-public superclass. 44.15 {BUG_ID + "-1" + FS + "pkg" + FS + "PublicChild.html", 44.16 - "<a href=\"../pkg/PublicChild.html#methodInheritedFromParent(int)\">" + 44.17 + "<a href=\"../pkg/PublicChild.html#methodInheritedFromParent-int-\">" + 44.18 "methodInheritedFromParent</a>" 44.19 }, 44.20 44.21 @@ -78,7 +78,7 @@ 44.22 44.23 // Method inheritence from non-public superinterface. 44.24 {BUG_ID + "-1" + FS + "pkg" + FS + "PublicInterface.html", 44.25 - "<a href=\"../pkg/PublicInterface.html#methodInterface(int)\">" + 44.26 + "<a href=\"../pkg/PublicInterface.html#methodInterface-int-\">" + 44.27 "methodInterface</a>" 44.28 }, 44.29 44.30 @@ -139,7 +139,7 @@ 44.31 //Do not inherit private interface method with generic parameters. 44.32 //This method has been implemented. 44.33 {BUG_ID + "-1" + FS + "pkg2" + FS + "C.html", 44.34 - "<span class=\"strong\"><a href=\"../pkg2/I.html#hello(T)\">hello</a></span>"}, 44.35 + "<span class=\"strong\"><a href=\"../pkg2/I.html#hello-T-\">hello</a></span>"}, 44.36 }; 44.37 44.38 // Test output when -private flag is used. 44.39 @@ -171,20 +171,20 @@ 44.40 "PrivateParent</a>" 44.41 }, 44.42 {BUG_ID + "-2" + FS + "pkg" + FS + "PublicChild.html", 44.43 - "<a href=\"../pkg/PrivateParent.html#methodInheritedFromParent(int)\">" + 44.44 + "<a href=\"../pkg/PrivateParent.html#methodInheritedFromParent-int-\">" + 44.45 "methodInheritedFromParent</a>" 44.46 }, 44.47 // Should document that a method overrides method from private class. 44.48 {BUG_ID + "-2" + FS + "pkg" + FS + "PublicChild.html", 44.49 "<dt><span class=\"strong\">Overrides:</span></dt>" + NL + 44.50 - "<dd><code><a href=\"../pkg/PrivateParent.html#methodOverridenFromParent(char[],%20int,%20T,%20V,%20java.util.List)\">" + 44.51 + "<dd><code><a href=\"../pkg/PrivateParent.html#methodOverridenFromParent-char:A-int-T-V-java.util.List-\">" + 44.52 "methodOverridenFromParent</a></code> in class <code>" + 44.53 "<a href=\"../pkg/PrivateParent.html\" title=\"class in pkg\">" + 44.54 "PrivateParent</a></code></dd>"}, 44.55 // Should document that a method is specified by private interface. 44.56 {BUG_ID + "-2" + FS + "pkg" + FS + "PublicChild.html", 44.57 "<dt><span class=\"strong\">Specified by:</span></dt>" + NL + 44.58 - "<dd><code><a href=\"../pkg/PrivateInterface.html#methodInterface(int)\">" + 44.59 + "<dd><code><a href=\"../pkg/PrivateInterface.html#methodInterface-int-\">" + 44.60 "methodInterface</a></code> in interface <code>" + 44.61 "<a href=\"../pkg/PrivateInterface.html\" title=\"interface in pkg\">" + 44.62 "PrivateInterface</a></code></dd>"}, 44.63 @@ -195,7 +195,7 @@ 44.64 "PrivateInterface</a>" 44.65 }, 44.66 {BUG_ID + "-2" + FS + "pkg" + FS + "PrivateInterface.html", 44.67 - "<a href=\"../pkg/PrivateInterface.html#methodInterface(int)\">" + 44.68 + "<a href=\"../pkg/PrivateInterface.html#methodInterface-int-\">" + 44.69 "methodInterface</a>" 44.70 }, 44.71 // Should mention that any documentation was copied. 44.72 @@ -228,11 +228,11 @@ 44.73 //with generic parameters has been implemented. 44.74 {BUG_ID + "-2" + FS + "pkg2" + FS + "C.html", 44.75 "<span class=\"strong\">Description copied from interface: <code>" + 44.76 - "<a href=\"../pkg2/I.html#hello(T)\">I</a></code></span>"}, 44.77 + "<a href=\"../pkg2/I.html#hello-T-\">I</a></code></span>"}, 44.78 44.79 {BUG_ID + "-2" + FS + "pkg2" + FS + "C.html", 44.80 "<dt><span class=\"strong\">Specified by:</span></dt>" + NL + 44.81 - "<dd><code><a href=\"../pkg2/I.html#hello(T)\">hello</a></code>" + 44.82 + "<dd><code><a href=\"../pkg2/I.html#hello-T-\">hello</a></code>" + 44.83 " in interface <code>" + 44.84 "<a href=\"../pkg2/I.html\" title=\"interface in pkg2\">I</a>" + 44.85 "<java.lang.String></code></dd>"},
45.1 --- a/test/com/sun/javadoc/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java Thu Oct 10 08:51:55 2013 +0200 45.2 +++ b/test/com/sun/javadoc/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java Thu Oct 10 10:51:15 2013 -0700 45.3 @@ -25,7 +25,7 @@ 45.4 45.5 /* 45.6 * @test 45.7 - * @bug 6802694 45.8 + * @bug 6802694 8025633 45.9 * @summary This test verifies deprecation info in serialized-form.html. 45.10 * @author Bhavesh Patel 45.11 * @library ../lib/ 45.12 @@ -44,21 +44,21 @@ 45.13 {BUG_ID + FS + "serialized-form.html", "<dl>" + NL + 45.14 "<dt><span class=\"strong\">Throws:</span></dt>" + NL + "<dd><code>" + 45.15 "java.io.IOException</code></dd>"+ NL + "<dt><span class=\"strong\">See Also:</span>" + 45.16 - "</dt>" + NL + "<dd><a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + 45.17 + "</dt>" + NL + "<dd><a href=\"pkg1/C1.html#setUndecorated-boolean-\">" + 45.18 "<code>C1.setUndecorated(boolean)</code></a></dd>" + NL + "</dl>"}, 45.19 {BUG_ID + FS + "serialized-form.html", "<span class=\"strong\">Deprecated.</span>" + 45.20 " <span class=\"italic\">As of JDK version 1.5, replaced by" + NL + 45.21 - " <a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + 45.22 + " <a href=\"pkg1/C1.html#setUndecorated-boolean-\">" + 45.23 "<code>setUndecorated(boolean)</code></a>.</span></div>" + NL + 45.24 "<div class=\"block\">This field indicates whether the C1 " + 45.25 "is undecorated.</div>" + NL + " " + NL + 45.26 "<dl>" + NL + "<dt><span class=\"strong\">Since:</span></dt>" + NL + 45.27 "<dd>1.4</dd>" + NL + "<dt><span class=\"strong\">See Also:</span>" + 45.28 - "</dt>" + NL + "<dd><a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + 45.29 + "</dt>" + NL + "<dd><a href=\"pkg1/C1.html#setUndecorated-boolean-\">" + 45.30 "<code>C1.setUndecorated(boolean)</code></a></dd>" + NL + "</dl>"}, 45.31 {BUG_ID + FS + "serialized-form.html", "<span class=\"strong\">Deprecated.</span>" + 45.32 " <span class=\"italic\">As of JDK version 1.5, replaced by" + NL + 45.33 - " <a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + 45.34 + " <a href=\"pkg1/C1.html#setUndecorated-boolean-\">" + 45.35 "<code>setUndecorated(boolean)</code></a>.</span></div>" + NL + 45.36 "<div class=\"block\">Reads the object stream.</div>" + NL + 45.37 "<dl>" + NL + "<dt><span class=\"strong\">Throws:</span></dt>" + NL + "<dd><code><code>" + 45.38 @@ -75,12 +75,12 @@ 45.39 {BUG_ID + FS + "serialized-form.html", "<pre>boolean undecorated</pre>" + NL + 45.40 "<div class=\"block\"><span class=\"strong\">Deprecated.</span> <span class=\"italic\">" + 45.41 "As of JDK version 1.5, replaced by" + NL + 45.42 - " <a href=\"pkg1/C1.html#setUndecorated(boolean)\"><code>" + 45.43 + " <a href=\"pkg1/C1.html#setUndecorated-boolean-\"><code>" + 45.44 "setUndecorated(boolean)</code></a>.</span></div>" + NL + "</li>"}, 45.45 {BUG_ID + FS + "serialized-form.html", "<span class=\"strong\">" + 45.46 "Deprecated.</span> <span class=\"italic\">As of JDK version" + 45.47 " 1.5, replaced by" + NL + 45.48 - " <a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + 45.49 + " <a href=\"pkg1/C1.html#setUndecorated-boolean-\">" + 45.50 "<code>setUndecorated(boolean)</code></a>.</span></div>" + NL + "</li>"}}; 45.51 45.52 // Test with -nodeprecated option. The serialized-form.html should
46.1 --- a/test/com/sun/javadoc/testTaglets/TestTaglets.java Thu Oct 10 08:51:55 2013 +0200 46.2 +++ b/test/com/sun/javadoc/testTaglets/TestTaglets.java Thu Oct 10 10:51:15 2013 -0700 46.3 @@ -1,5 +1,5 @@ 46.4 /* 46.5 - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. 46.6 + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. 46.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 46.8 * 46.9 * This code is free software; you can redistribute it and/or modify it 46.10 @@ -23,7 +23,7 @@ 46.11 46.12 /* 46.13 * @test 46.14 - * @bug 4654308 4767038 46.15 + * @bug 4654308 4767038 8025633 46.16 * @summary Use a Taglet and include some inline tags such as {@link}. The 46.17 * inline tags should be interpreted properly. 46.18 * Run Javadoc on some sample source that uses {@inheritDoc}. Make 46.19 @@ -56,7 +56,7 @@ 46.20 //Input for string search tests. 46.21 private static final String[][] TEST_4654308 = new String[][] { 46.22 {"4654308" + FS + "C.html", "<span class=\"strong\">Foo:</span></dt>" + 46.23 - "<dd>my only method is <a href=\"C.html#method()\"><code>here" + 46.24 + "<dd>my only method is <a href=\"C.html#method--\"><code>here" + 46.25 "</code></a></dd></dl>"} 46.26 }; 46.27 private static final String[][] NEGATED_TEST_4654308 = NO_TEST;
47.1 --- a/test/com/sun/javadoc/testTypeAnnotations/TestTypeAnnotations.java Thu Oct 10 08:51:55 2013 +0200 47.2 +++ b/test/com/sun/javadoc/testTypeAnnotations/TestTypeAnnotations.java Thu Oct 10 10:51:15 2013 -0700 47.3 @@ -23,7 +23,7 @@ 47.4 47.5 /* 47.6 * @test 47.7 - * @bug 8005091 8009686 47.8 + * @bug 8005091 8009686 8025633 47.9 * @summary Make sure that type annotations are displayed correctly 47.10 * @author Bhavesh Patel 47.11 * @library ../lib/ 47.12 @@ -272,13 +272,13 @@ 47.13 "<pre>void oneException()" + NL + 47.14 " throws <a href=\"../typeannos/ThrB.html\" title=\"" + 47.15 "annotation in typeannos\">@ThrB</a>(<a href=\"../typeannos/" + 47.16 - "ThrB.html#value()\">value</a>=\"m\") java.lang.Exception</pre>" 47.17 + "ThrB.html#value--\">value</a>=\"m\") java.lang.Exception</pre>" 47.18 }, 47.19 {BUG_ID + FS + "typeannos" + FS + "ThrWithValue.html", 47.20 "<pre>void twoExceptions()" + NL + 47.21 " throws <a href=\"../typeannos/ThrB.html\" title=\"" + 47.22 "annotation in typeannos\">@ThrB</a>(<a href=\"../typeannos/" + 47.23 - "ThrB.html#value()\">value</a>=\"m\") java.lang.RuntimeException," + NL + 47.24 + "ThrB.html#value--\">value</a>=\"m\") java.lang.RuntimeException," + NL + 47.25 " <a href=\"../typeannos/ThrA.html\" title=\"" + 47.26 "annotation in typeannos\">@ThrA</a> java.lang.Exception</pre>" 47.27 }, 47.28 @@ -307,14 +307,14 @@ 47.29 "<pre>void wcSuper(<a href=\"../typeannos/MyList.html\" title=\"" + 47.30 "class in typeannos\">MyList</a><? super <a href=\"../typeannos/" + 47.31 "WldB.html\" title=\"annotation in typeannos\">@WldB</a>(<a href=\"" + 47.32 - "../typeannos/WldB.html#value()\">value</a>=\"m\") java.lang." + 47.33 + "../typeannos/WldB.html#value--\">value</a>=\"m\") java.lang." + 47.34 "String> l)</pre>" 47.35 }, 47.36 {BUG_ID + FS + "typeannos" + FS + "BoundWithValue.html", 47.37 "<pre><a href=\"../typeannos/MyList.html\" title=\"class in " + 47.38 "typeannos\">MyList</a><? extends <a href=\"../typeannos/WldB." + 47.39 "html\" title=\"annotation in typeannos\">@WldB</a>(<a href=\"../" + 47.40 - "typeannos/WldB.html#value()\">value</a>=\"m\") java.lang.String" + 47.41 + "typeannos/WldB.html#value--\">value</a>=\"m\") java.lang.String" + 47.42 "> returnWcExtends()</pre>" 47.43 }, 47.44 47.45 @@ -329,7 +329,7 @@ 47.46 "<pre>java.lang.String nonVoid(<a href=\"../typeannos/RcvrA." + 47.47 "html\" title=\"annotation in typeannos\">@RcvrA</a> <a href=\"../" + 47.48 "typeannos/RcvrB.html\" title=\"annotation in typeannos\">@RcvrB" + 47.49 - "</a>(<a href=\"../typeannos/RcvrB.html#value()\">value</a>=\"m\")" + 47.50 + "</a>(<a href=\"../typeannos/RcvrB.html#value--\">value</a>=\"m\")" + 47.51 " DefaultUnmodified this)</pre>" 47.52 }, 47.53 {BUG_ID + FS + "typeannos" + FS + "DefaultUnmodified.html", 47.54 @@ -354,7 +354,7 @@ 47.55 {BUG_ID + FS + "typeannos" + FS + "WithValue.html", 47.56 "<pre><T extends java.lang.Runnable> void accept(" + 47.57 "<a href=\"../typeannos/RcvrB.html\" title=\"annotation in " + 47.58 - "typeannos\">@RcvrB</a>(<a href=\"../typeannos/RcvrB.html#value()\">" + 47.59 + "typeannos\">@RcvrB</a>(<a href=\"../typeannos/RcvrB.html#value--\">" + 47.60 "value</a>=\"m\") WithValue this," + NL + 47.61 " T r)" + NL + 47.62 " throws java.lang.Exception</pre>" 47.63 @@ -362,7 +362,7 @@ 47.64 {BUG_ID + FS + "typeannos" + FS + "WithFinal.html", 47.65 "<pre>java.lang.String nonVoid(<a href=\"../typeannos/RcvrB." + 47.66 "html\" title=\"annotation in typeannos\">@RcvrB</a>(<a href=\"../" + 47.67 - "typeannos/RcvrB.html#value()\">value</a>=\"m\") WithFinal" + 47.68 + "typeannos/RcvrB.html#value--\">value</a>=\"m\") WithFinal" + 47.69 " this)</pre>" 47.70 }, 47.71 {BUG_ID + FS + "typeannos" + FS + "WithBody.html",
48.1 --- a/test/com/sun/javadoc/testTypeParams/TestTypeParameters.java Thu Oct 10 08:51:55 2013 +0200 48.2 +++ b/test/com/sun/javadoc/testTypeParams/TestTypeParameters.java Thu Oct 10 10:51:15 2013 -0700 48.3 @@ -23,7 +23,7 @@ 48.4 48.5 /* 48.6 * @test 48.7 - * @bug 4927167 4974929 7010344 48.8 + * @bug 4927167 4974929 7010344 8025633 48.9 * @summary When the type parameters are more than 10 characters in length, 48.10 * make sure there is a line break between type params and return type 48.11 * in member summary. Also, test for type parameter links in package-summary and 48.12 @@ -71,7 +71,7 @@ 48.13 }, 48.14 //Nested type parameters 48.15 {BUG_ID + FS + "pkg" + FS + "C.html", 48.16 - "<a name=\"formatDetails(java.util.Collection, java.util.Collection)\">" + NL + 48.17 + "<a name=\"formatDetails-java.util.Collection-java.util.Collection-\">" + NL + 48.18 "<!-- -->" + NL + 48.19 "</a>" 48.20 },
49.1 --- a/test/com/sun/javadoc/testWarnings/TestWarnings.java Thu Oct 10 08:51:55 2013 +0200 49.2 +++ b/test/com/sun/javadoc/testWarnings/TestWarnings.java Thu Oct 10 10:51:15 2013 -0700 49.3 @@ -23,7 +23,7 @@ 49.4 49.5 /* 49.6 * @test 49.7 - * @bug 4515705 4804296 4702454 4697036 49.8 + * @bug 4515705 4804296 4702454 4697036 8025633 49.9 * @summary Make sure that first sentence warning only appears once. 49.10 * Make sure that only warnings/errors are printed when quiet is used. 49.11 * Make sure that links to private/unincluded methods do not cause 49.12 @@ -65,8 +65,8 @@ 49.13 }; 49.14 49.15 private static final String[][] TEST2 = { 49.16 - {BUG_ID + FS + "pkg" + FS + "X.html", "<a href=\"../pkg/X.html#m()\"><code>m()</code></a><br/>"}, 49.17 - {BUG_ID + FS + "pkg" + FS + "X.html", "<a href=\"../pkg/X.html#X()\"><code>X()</code></a><br/>"}, 49.18 + {BUG_ID + FS + "pkg" + FS + "X.html", "<a href=\"../pkg/X.html#m--\"><code>m()</code></a><br/>"}, 49.19 + {BUG_ID + FS + "pkg" + FS + "X.html", "<a href=\"../pkg/X.html#X--\"><code>X()</code></a><br/>"}, 49.20 {BUG_ID + FS + "pkg" + FS + "X.html", "<a href=\"../pkg/X.html#f\"><code>f</code></a><br/>"}, 49.21 }; 49.22
