This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ *
+ * @author Bhavesh Patel
+ */
+public enum SectionName {
+
+ ANNOTATION_TYPE_ELEMENT_DETAIL("annotation.type.element.detail"),
+ ANNOTATION_TYPE_FIELD_DETAIL("annotation.type.field.detail"),
+ ANNOTATION_TYPE_FIELD_SUMMARY("annotation.type.field.summary"),
+ ANNOTATION_TYPE_OPTIONAL_ELEMENT_SUMMARY("annotation.type.optional.element.summary"),
+ ANNOTATION_TYPE_REQUIRED_ELEMENT_SUMMARY("annotation.type.required.element.summary"),
+ CONSTRUCTOR_DETAIL("constructor.detail"),
+ CONSTRUCTOR_SUMMARY("constructor.summary"),
+ ENUM_CONSTANT_DETAIL("enum.constant.detail"),
+ ENUM_CONSTANTS_INHERITANCE("enum.constants.inherited.from.class."),
+ ENUM_CONSTANT_SUMMARY("enum.constant.summary"),
+ FIELD_DETAIL("field.detail"),
+ FIELDS_INHERITANCE("fields.inherited.from.class."),
+ FIELD_SUMMARY("field.summary"),
+ METHOD_DETAIL("method.detail"),
+ METHODS_INHERITANCE("methods.inherited.from.class."),
+ METHOD_SUMMARY("method.summary"),
+ NAVBAR_BOTTOM("navbar.bottom"),
+ NAVBAR_BOTTOM_FIRSTROW("navbar.bottom.firstrow"),
+ NAVBAR_TOP("navbar.top"),
+ NAVBAR_TOP_FIRSTROW("navbar.top.firstrow"),
+ NESTED_CLASSES_INHERITANCE("nested.classes.inherited.from.class."),
+ NESTED_CLASS_SUMMARY("nested.class.summary"),
+ OVERVIEW_DESCRIPTION("overview.description"),
+ PACKAGE_DESCRIPTION("package.description"),
+ PROPERTY_DETAIL("property.detail"),
+ PROPERTIES_INHERITANCE("properties.inherited.from.class."),
+ PROPERTY_SUMMARY("property.summary"),
+ SKIP_NAVBAR_BOTTOM("skip.navbar.bottom"),
+ SKIP_NAVBAR_TOP("skip.navbar.top"),
+ UNNAMED_PACKAGE_ANCHOR("unnamed.package");
+
+ private final String value;
+
+ SectionName(String sName) {
+ this.value = sName;
+ }
+
+ public String getName() {
+ return this.value;
+ }
+}
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SingleIndexWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SingleIndexWriter.java
index 43718e4699c..a561a0395d0 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SingleIndexWriter.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SingleIndexWriter.java
@@ -115,7 +115,8 @@ public class SingleIndexWriter extends AbstractIndexWriter {
for (int i = 0; i < indexbuilder.elements().length; i++) {
String unicode = (indexbuilder.elements())[i].toString();
contentTree.addContent(
- getHyperLink("_" + unicode + "_", new StringContent(unicode)));
+ getHyperLink(getNameForIndex(unicode),
+ new StringContent(unicode)));
contentTree.addContent(getSpace());
}
}
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java
index c780e962cac..ee8cc9cb12e 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java
@@ -30,6 +30,7 @@ import java.util.*;
import com.sun.javadoc.*;
import com.sun.tools.doclets.formats.html.ConfigurationImpl;
+import com.sun.tools.doclets.formats.html.SectionName;
import com.sun.tools.doclets.internal.toolkit.*;
import com.sun.tools.doclets.internal.toolkit.util.DocFile;
import com.sun.tools.doclets.internal.toolkit.util.DocLink;
@@ -78,7 +79,7 @@ public abstract class HtmlDocWriter extends HtmlWriter {
}
/**
- * Get Html Hyper Link string.
+ * Get Html Hyper Link Content.
*
* @param where Position of the link in the file. Character '#' is not
* needed.
@@ -87,7 +88,125 @@ public abstract class HtmlDocWriter extends HtmlWriter {
*/
public Content getHyperLink(String where,
Content label) {
- return getHyperLink(DocLink.fragment(where), label, "", "");
+ return getHyperLink(getDocLink(where), label, "", "");
+ }
+
+ /**
+ * Get Html Hyper Link Content.
+ *
+ * @param sectionName The section name to which the link will be created.
+ * @param label Tag for the link.
+ * @return a content tree for the hyper link
+ */
+ public Content getHyperLink(SectionName sectionName,
+ Content label) {
+ return getHyperLink(getDocLink(sectionName), label, "", "");
+ }
+
+ /**
+ * Get Html Hyper Link Content.
+ *
+ * @param sectionName The section name combined with where to which the link
+ * will be created.
+ * @param where The fragment combined with sectionName to which the link
+ * will be created.
+ * @param label Tag for the link.
+ * @return a content tree for the hyper link
+ */
+ public Content getHyperLink(SectionName sectionName, String where,
+ Content label) {
+ return getHyperLink(getDocLink(sectionName, where), label, "", "");
+ }
+
+ /**
+ * Get the link.
+ *
+ * @param where Position of the link in the file.
+ * @return a DocLink object for the hyper link
+ */
+ public DocLink getDocLink(String where) {
+ return DocLink.fragment(getName(where));
+ }
+
+ /**
+ * Get the link.
+ *
+ * @param sectionName The section name to which the link will be created.
+ * @return a DocLink object for the hyper link
+ */
+ public DocLink getDocLink(SectionName sectionName) {
+ return DocLink.fragment(sectionName.getName());
+ }
+
+ /**
+ * Get the link.
+ *
+ * @param sectionName The section name combined with where to which the link
+ * will be created.
+ * @param where The fragment combined with sectionName to which the link
+ * will be created.
+ * @return a DocLink object for the hyper link
+ */
+ public DocLink getDocLink(SectionName sectionName, String where) {
+ return DocLink.fragment(sectionName.getName() + getName(where));
+ }
+
+ /**
+ * Convert the name to a valid HTML name.
+ *
+ * @param name the name that needs to be converted to valid HTML name.
+ * @return a valid HTML name string.
+ */
+ public String getName(String name) {
+ StringBuilder sb = new StringBuilder();
+ char ch;
+ /* The HTML 4 spec at http://www.w3.org/TR/html4/types.html#h-6.2 mentions
+ * that the name/id should begin with a letter followed by other valid characters.
+ * The HTML 5 spec (draft) is more permissive on names/ids where the only restriction
+ * is that it should be at least one character long and should not contain spaces.
+ * The spec draft is @ http://www.w3.org/html/wg/drafts/html/master/dom.html#the-id-attribute.
+ *
+ * For HTML 4, we need to check for non-characters at the beginning of the name and
+ * substitute it accordingly, "_" and "$" can appear at the beginning of a member name.
+ * The method substitutes "$" with "Z:Z:D" and will prefix "_" with "Z:Z".
+ */
+ for (int i = 0; i < name.length(); i++) {
+ ch = name.charAt(i);
+ switch (ch) {
+ case '(':
+ case ')':
+ case '<':
+ case '>':
+ case ',':
+ sb.append('-');
+ break;
+ case ' ':
+ case '[':
+ break;
+ case ']':
+ sb.append(":A");
+ break;
+ // Any appearance of $ needs to be substituted with ":D" and not with hyphen
+ // since a field name "P$$ and a method P(), both valid member names, can end
+ // up as "P--". A member name beginning with $ needs to be substituted with
+ // "Z:Z:D".
+ case '$':
+ if (i == 0)
+ sb.append("Z:Z");
+ sb.append(":D");
+ break;
+ // A member name beginning with _ needs to be prefixed with "Z:Z" since valid anchor
+ // names can only begin with a letter.
+ case '_':
+ if (i == 0)
+ sb.append("Z:Z");
+ sb.append(ch);
+ break;
+ default:
+ sb.append(ch);
+ }
+ }
+ return sb.toString();
}
/**
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletConstants.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletConstants.java
index c76b2ed26c1..5742cd0bf6a 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletConstants.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletConstants.java
@@ -58,9 +58,4 @@ public class DocletConstants {
* The default package file name.
*/
public static final String DEFAULT_PACKAGE_FILE_NAME = "default";
-
- /**
- * The anchor for the default package.
- */
- public static final String UNNAMED_PACKAGE_ANCHOR = "unnamed_package";
}
diff --git a/langtools/test/com/sun/javadoc/AccessSkipNav/AccessSkipNav.java b/langtools/test/com/sun/javadoc/AccessSkipNav/AccessSkipNav.java
index 6ad89feb8bf..0c05190333f 100644
--- a/langtools/test/com/sun/javadoc/AccessSkipNav/AccessSkipNav.java
+++ b/langtools/test/com/sun/javadoc/AccessSkipNav/AccessSkipNav.java
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 4638136 7198273
+ * @bug 4638136 7198273 8025633
* @summary Add ability to skip over nav bar for accessibility
* @author dkramer
* @run main AccessSkipNav
@@ -86,20 +86,20 @@ public class AccessSkipNav {
// Testing only for the presence of the and
// Top navbar
- { "Skip navigation links",
+ { "Skip navigation links",
TMPDEST_DIR1 + "p1" + FS + "C1.html" },
// Top navbar
- { "" + LS +
+ { "" + LS +
"" + LS + "",
TMPDEST_DIR1 + "p1" + FS + "C1.html" },
// Bottom navbar
- { "Skip navigation links",
+ { "Skip navigation links",
TMPDEST_DIR1 + "p1" + FS + "C1.html" },
// Bottom navbar
- { "" + LS +
+ { "" + LS +
"" + LS + "",
TMPDEST_DIR1 + "p1" + FS + "C1.html" }
};
diff --git a/langtools/test/com/sun/javadoc/testAnchorNames/TestAnchorNames.java b/langtools/test/com/sun/javadoc/testAnchorNames/TestAnchorNames.java
new file mode 100644
index 00000000000..c5cb7519325
--- /dev/null
+++ b/langtools/test/com/sun/javadoc/testAnchorNames/TestAnchorNames.java
@@ -0,0 +1,290 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8025633
+ * @summary Test for valid name attribute in HTML anchors.
+ * @author Bhavesh Patel
+ * @library ../lib/
+ * @build JavadocTester TestAnchorNames
+ * @run main TestAnchorNames
+ */
+
+public class TestAnchorNames extends JavadocTester {
+
+ private static final String BUG_ID = "8025633";
+
+ //Input for string search tests.
+ private static final String[][] TEST = {
+
+ //Test some section markers and links to these markers
+
+ {BUG_ID + FS + "pkg1" + FS + "RegClass.html",
+ ""
+ },
+ {BUG_ID + FS + "pkg1" + FS + "RegClass.html",
+ ""
+ },
+ {BUG_ID + FS + "pkg1" + FS + "RegClass.html",
+ ""
+ },
+ {BUG_ID + FS + "pkg1" + FS + "RegClass.html",
+ ""
+ },
+ {BUG_ID + FS + "pkg1" + FS + "RegClass.html",
+ ""
+ },
+ {BUG_ID + FS + "pkg1" + FS + "RegClass.html",
+ ""
+ },
+ {BUG_ID + FS + "pkg1" + FS + "RegClass.html",
+ ""
+ },
+ {BUG_ID + FS + "pkg1" + FS + "RegClass.html",
+ ""
+ },
+ {BUG_ID + FS + "pkg1" + FS + "RegClass.html",
+ ""
+ },
+ {BUG_ID + FS + "pkg1" + FS + "RegClass.html",
+ ""
+ },
+
+ //Test some members and link to these members
+
+ //The marker for this appears in the serialized-form.html which we will
+ //test below
+ {BUG_ID + FS + "pkg1" + FS + "RegClass.html",
+ ""
+ },
+ //Test some fields
+ {BUG_ID + FS + "pkg1" + FS + "RegClass.html",
+ ""
+ },
+ {BUG_ID + FS + "pkg1" + FS + "RegClass.html",
+ ""
+ },
+ {BUG_ID + FS + "pkg1" + FS + "RegClass.html",
+ ""
+ },
+ {BUG_ID + FS + "pkg1" + FS + "RegClass.html",
+ ""
+ },
+ {BUG_ID + FS + "pkg1" + FS + "RegClass.html",
+ ""
+ },
+ {BUG_ID + FS + "pkg1" + FS + "RegClass.html",
+ ""
+ },
+ {BUG_ID + FS + "pkg1" + FS + "RegClass.html",
+ ""
+ },
+ {BUG_ID + FS + "pkg1" + FS + "RegClass.html",
+ ""
+ },
+ {BUG_ID + FS + "pkg1" + FS + "RegClass.html",
+ ""
+ },
+ {BUG_ID + FS + "pkg1" + FS + "RegClass.html",
+ ""
+ },
+ {BUG_ID + FS + "pkg1" + FS + "RegClass.html",
+ ""
+ },
+ {BUG_ID + FS + "pkg1" + FS + "RegClass.html",
+ ""
+ },
+ {BUG_ID + FS + "pkg1" + FS + "RegClass.html",
+ ""
+ },
+ {BUG_ID + FS + "pkg1" + FS + "RegClass.html",
+ ""
+ },
+ {BUG_ID + FS + "pkg1" + FS + "DeprMemClass.html",
+ ""
+ },
+ {BUG_ID + FS + "pkg1" + FS + "DeprMemClass.html",
+ ""
+ },
+ //Test constructor
+ {BUG_ID + FS + "pkg1" + FS + "RegClass.html",
+ ""
+ },
+ {BUG_ID + FS + "pkg1" + FS + "RegClass.html",
+ ""
+ },
+ //Test some methods
+ {BUG_ID + FS + "pkg1" + FS + "RegClass.html",
+ ""
+ },
+ {BUG_ID + FS + "pkg1" + FS + "RegClass.html",
+ ""
+ },
+ {BUG_ID + FS + "pkg1" + FS + "RegClass.html",
+ ""
+ },
+ {BUG_ID + FS + "pkg1" + FS + "RegClass.html",
+ ""
+ },
+ {BUG_ID + FS + "pkg1" + FS + "RegClass.html",
+ ""
+ },
+ {BUG_ID + FS + "pkg1" + FS + "RegClass.html",
+ ""
+ },
+ {BUG_ID + FS + "pkg1" + FS + "RegClass.html",
+ ""
+ },
+ {BUG_ID + FS + "pkg1" + FS + "RegClass.html",
+ ""
+ },
+ {BUG_ID + FS + "pkg1" + FS + "RegClass.html",
+ ""
+ },
+ {BUG_ID + FS + "pkg1" + FS + "RegClass.html",
+ ""
+ },
+ {BUG_ID + FS + "pkg1" + FS + "RegClass.html",
+ ""
+ },
+ {BUG_ID + FS + "pkg1" + FS + "RegClass.html",
+ ""
+ },
+ {BUG_ID + FS + "pkg1" + FS + "RegClass.html",
+ ""
+ },
+ {BUG_ID + FS + "pkg1" + FS + "RegClass.html",
+ ""
+ },
+ {BUG_ID + FS + "pkg1" + FS + "DeprMemClass.html",
+ ""
+ },
+ {BUG_ID + FS + "pkg1" + FS + "DeprMemClass.html",
+ ""
+ },
+
+ //Test enum
+
+ {BUG_ID + FS + "pkg1" + FS + "RegClass.Te$t_Enum.html",
+ ""
+ },
+ {BUG_ID + FS + "pkg1" + FS + "RegClass.Te$t_Enum.html",
+ ""
+ },
+
+ //Test nested class
+
+ {BUG_ID + FS + "pkg1" + FS + "RegClass._NestedClas$.html",
+ ""
+ },
+ {BUG_ID + FS + "pkg1" + FS + "RegClass._NestedClas$.html",
+ ""
+ },
+
+ //Test class use page
+
+ {BUG_ID + FS + "pkg1" + FS + "class-use" + FS + "DeprMemClass.html",
+ ""
+ },
+
+ //Test deprecated list page
+
+ {BUG_ID + FS + "deprecated-list.html",
+ ""
+ },
+ {BUG_ID + FS + "deprecated-list.html",
+ ""
+ },
+
+ //Test constant values page
+
+ {BUG_ID + FS + "constant-values.html",
+ ""
+ },
+
+ //Test serialized form page
+
+ //This is the marker for the link that appears in the pkg1.RegClass.html page
+ {BUG_ID + FS + "serialized-form.html",
+ ""
+ },
+
+ //Test member name index page
+
+ {BUG_ID + FS + "index-all.html",
+ ""
+ },
+ {BUG_ID + FS + "index-all.html",
+ "$"
+ },
+ {BUG_ID + FS + "index-all.html",
+ "_"
+ }
+ };
+
+ private static final String[][] NEGATED_TEST = {
+ //The marker name conversion should only affect HTML anchors. It should not
+ //affect the lables.
+ {BUG_ID + FS + "pkg1" + FS + "RegClass.html",
+ " Z:Z_"
+ },
+ {BUG_ID + FS + "pkg1" + FS + "RegClass.html",
+ " Z:Z:Dfield"
+ },
+ {BUG_ID + FS + "pkg1" + FS + "RegClass.html",
+ " Z:Z_field_In_Class"
+ },
+ {BUG_ID + FS + "pkg1" + FS + "RegClass.html",
+ " S_:D:D:D:D:DINT"
+ },
+ };
+
+ private static final String[] ARGS = new String[] {
+ "-d", BUG_ID, "-sourcepath", SRC_DIR, "-use", "pkg1"
+ };
+
+ /**
+ * The entry point of the test.
+ * @param args the array of command line arguments.
+ */
+ public static void main(String[] args) throws Exception {
+ TestAnchorNames tester = new TestAnchorNames();
+ run(tester, ARGS, TEST, NEGATED_TEST);
+ tester.printSummary();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getBugId() {
+ return BUG_ID;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getBugName() {
+ return getClass().getName();
+ }
+}
diff --git a/langtools/test/com/sun/javadoc/testAnchorNames/pkg1/DeprMemClass.java b/langtools/test/com/sun/javadoc/testAnchorNames/pkg1/DeprMemClass.java
new file mode 100644
index 00000000000..7d2407656e6
--- /dev/null
+++ b/langtools/test/com/sun/javadoc/testAnchorNames/pkg1/DeprMemClass.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package pkg1;
+
+public class DeprMemClass
+{
+ /**
+ * Field in the class.
+ * @deprecated Do not use this field.
+ */
+ public int _field_In_Class;
+
+ public int _fld;
+
+ /**
+ * Method in the class.
+ * @deprecated Do not use this method.
+ */
+ public void $method_In_Class() {
+ }
+
+ public void regularMethod() {
+ }
+}
diff --git a/langtools/test/com/sun/javadoc/testAnchorNames/pkg1/RegClass.java b/langtools/test/com/sun/javadoc/testAnchorNames/pkg1/RegClass.java
new file mode 100644
index 00000000000..60aae773eb6
--- /dev/null
+++ b/langtools/test/com/sun/javadoc/testAnchorNames/pkg1/RegClass.java
@@ -0,0 +1,186 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package pkg1;
+
+import java.io.Serializable;
+import java.util.Map;
+
+/**
+ * @serial This is the serial tag's comment.
+ */
+public class RegClass implements Serializable {
+
+ /**
+ * Normal field in class.
+ */
+ public String field;
+
+ /**
+ * Normal field in class.
+ */
+ public String method$$;
+
+ /**
+ * Filed staring with $.
+ */
+ public String $field;
+
+ /**
+ * Filed staring with underscore.
+ */
+ public String _field;
+
+ /**
+ * Serial field
+ * @serial
+ */
+ public boolean t_e$t;
+
+ /**
+ * Field in class with a $ in the name.
+ */
+ public String fieldInCla$$;
+
+ /**
+ * Field name as just an underscore.
+ */
+ public int _;
+
+ /**
+ * Field name as just a $.
+ */
+ public int $;
+
+ /**
+ * Field name with underscore and $.
+ */
+ public int _$;
+
+ /**
+ * Field name with $ and underscore.
+ */
+ public int $_;
+
+ /**
+ * An array.
+ */
+ public int arr[];
+
+ /**
+ * Another array.
+ */
+ public int[] arr1;
+
+ /**
+ * A constant field.
+ */
+ public static final int S_$$$$$INT = 0;
+
+ /**
+ * Another field.
+ */
+ public DeprMemClass d____mc;
+
+ /**
+ * An enum.
+ */
+ public static enum Te$t_Enum {
+ FLD_1,
+ $FLD2
+ };
+
+ /**
+ * A constructor.
+ */
+ public RegClass(String p, int i) {
+ }
+
+ /**
+ * Method in Class.
+ * @param p a string
+ */
+ public void _methodInClass(String p) {
+ }
+
+ /**
+ * Method in Class.
+ * @param p a string
+ * @param i an int
+ */
+ public void _methodInClas$(String p, int i) {
+ }
+
+ /**
+ * Method with $ in the name.
+ * @param p a string array
+ */
+ public void methodInCla$s(String[] p) {
+ }
+
+ /**
+ * Method with D[] as a parameter.
+ * @param p an array of D
+ */
+ public void methodD(D[] p) {
+ }
+
+ /**
+ * Method with $A as a parameter.
+ * @param p an object of $A
+ */
+ public void methodD($A p) {
+ }
+
+ /**
+ * Serial test.
+ * @serialData This is a serial data comment.
+ * @return null
+ */
+ protected Object $readResolve(){return null;}
+
+ /**
+ * Simple method.
+ */
+ public void method() {}
+
+ /**
+ * Generics.
+ */
+ public static void foo(MapLink to external class BigDecimal"},
{BUG_ID + FS + "C.html",
- "Link to external member gcd"},
{BUG_ID + FS + "C.html",
"" + NL + "
"},
{BUG_ID + FS + "pkg1" + FS + "C1.html", "read in class " +
"FilterReaderreadInt in interface " +
"DataInput" + NL + "
"},
{BUG_ID + FS + "pkg1" + FS + "C1.html", "setUndecorated(boolean)"+ NL + "
"},
{BUG_ID + FS + "pkg1" + FS + "C1.html", "title" +
" - the titletest - boolean value" +
@@ -79,11 +79,11 @@ public class TestHtmlDefinitionListTag extends JavadocTester {
"if decorations are to be enabled.readObject()" +
+ "readObject()" +
"" + NL + "
"},
{BUG_ID + FS + "pkg1" + FS + "C2.html", "java.io.IOExceptionsetUndecorated(boolean)" + NL + "
"},
{BUG_ID + FS + "serialized-form.html", "Deprecated." +
" As of JDK version 1.5, replaced by" + NL +
- " " +
+ " " +
"set - boolean" + NL + "
" +
"java.io.IOExceptionC1.setUndecorated(boolean)setUndecorated(boolean)." + NL +
"" + NL + "
"},
{BUG_ID + FS + "serialized-form.html", "Deprecated." +
" As of JDK version 1.5, replaced by" + NL +
- " " +
+ " " +
"C1.setUndecorated(boolean)setUndecorated(boolean)." + NL +
"" + NL + "
false if decorations are to be enabled." +
"readObject()" + NL + "
"},
{BUG_ID + FS + "serialized-form.html", "java.io.IOExceptionsetUndecorated(boolean)" + NL + "
"},
{BUG_ID + FS + "serialized-form.html", "Deprecated." +
" As of JDK version 1.5, replaced by" + NL +
- " " +
+ " " +
"" +
"java.io.IOExceptionC1.setUndecorated(boolean)setUndecorated(boolean)." + NL +
"" + NL + "
"},
{BUG_ID + FS + "serialized-form.html", "Deprecated." +
" As of JDK version 1.5, replaced by" + NL +
- " " +
+ " " +
"C1.setUndecorated(boolean)setUndecorated(boolean)." + NL +
"" + NL + "
"},
{BUG_ID + FS + "serialized-form.html", "Deprecated." +
" As of JDK version 1.5, replaced by" + NL +
- " " +
+ " " +
"boolean " +
"undecorated" + NL + "" +
+ " " +
"setUndecorated(boolean).setUndecorated(boolean)." + NL + ""}};
// Test for valid HTML generation which should not comprise of empty
diff --git a/langtools/test/com/sun/javadoc/testInterface/TestInterface.java b/langtools/test/com/sun/javadoc/testInterface/TestInterface.java
index cfaff523fde..39f8e212629 100644
--- a/langtools/test/com/sun/javadoc/testInterface/TestInterface.java
+++ b/langtools/test/com/sun/javadoc/testInterface/TestInterface.java
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 4682448 4947464 5029946
+ * @bug 4682448 4947464 5029946 8025633
* @summary Verify that the public modifier does not show up in the
* documentation for public methods, as recommended by the JLS.
* If A implements I and B extends A, B should be in the list of
@@ -84,7 +84,7 @@ public class TestInterface extends JavadocTester {
//Make sure "Specified By" has substituted type parameters.
{BUG_ID + FS + "pkg" + FS + "Child.html",
"method" +
+ "method" +
" in interface " +
"" +
"Interface<" +
@@ -93,7 +93,7 @@ public class TestInterface extends JavadocTester {
//Make sure "Overrides" has substituted type parameters.
{BUG_ID + FS + "pkg" + FS + "Child.html",
""},
};
private static final String[] ARGS =
new String[] {
diff --git a/langtools/test/com/sun/javadoc/testMemberSummary/TestMemberSummary.java b/langtools/test/com/sun/javadoc/testMemberSummary/TestMemberSummary.java
index fdbb664deff..eff1de42046 100644
--- a/langtools/test/com/sun/javadoc/testMemberSummary/TestMemberSummary.java
+++ b/langtools/test/com/sun/javadoc/testMemberSummary/TestMemberSummary.java
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 4951228 6290760
+ * @bug 4951228 6290760 8025633
* @summary Test the case where the overriden method returns a different
* type than the method in the child class. Make sure the
* documentation is inherited but the return type isn't.
@@ -49,7 +49,7 @@ public class TestMemberSummary extends JavadocTester {
// Check return type in member summary.
{BUG_ID + FS + "pkg" + FS + "PublicChild.html",
"method" +
+ ""},
+ "staticMethodmethod" +
" in class Parent<T>getRate(), " + NL +
- "setRate(double)getRate(), " + NL +
+ "setRate(double)public final void setRate(double value)
" + NL +
"setTestMethodProperty() setTestMethodProperty() isPaused
" + NL +
"public final double isPaused()
" + NL +
diff --git a/langtools/test/com/sun/javadoc/testLinkTaglet/TestLinkTaglet.java b/langtools/test/com/sun/javadoc/testLinkTaglet/TestLinkTaglet.java
index ef9dd2bbb9a..49ce35d0700 100644
--- a/langtools/test/com/sun/javadoc/testLinkTaglet/TestLinkTaglet.java
+++ b/langtools/test/com/sun/javadoc/testLinkTaglet/TestLinkTaglet.java
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 4732864 6280605 7064544 8014636 8016328
+ * @bug 4732864 6280605 7064544 8014636 8016328 8025633
* @summary Make sure that you can link from one member to another using
* non-qualified name, furthermore, ensure the right one is linked.
* @author jamieh
@@ -49,9 +49,9 @@ public class TestLinkTaglet extends JavadocTester {
"Qualified Link: C.InnerC.
" + NL +
" Unqualified Link1: C.InnerC.
" + NL +
" Unqualified Link2: C.InnerC.
" + NL +
- " Qualified Link: method(pkg.C.InnerC, pkg.C.InnerC2).
" + NL +
- " Unqualified Link: method(C.InnerC, C.InnerC2).
" + NL +
- " Unqualified Link: method(InnerC, InnerC2).
"
+ " Qualified Link: method(pkg.C.InnerC, pkg.C.InnerC2).
" + NL +
+ " Unqualified Link: method(C.InnerC, C.InnerC2).
" + NL +
+ " Unqualified Link: method(InnerC, InnerC2).
"
},
{BUG_ID + FS + "pkg" + FS + "C.InnerC.html",
"Link to member in outer class: C.MEMBER
" + NL +
diff --git a/langtools/test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java b/langtools/test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java
index 4d90d8791fb..62b9235e952 100644
--- a/langtools/test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java
+++ b/langtools/test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 4638588 4635809 6256068 6270645
+ * @bug 4638588 4635809 6256068 6270645 8025633
* @summary Test to make sure that members are inherited properly in the Javadoc.
* Verify that inheritence labels are correct.
* @author jamieh
@@ -44,7 +44,7 @@ public class TestMemberInheritence extends JavadocTester {
//Public method should be inherited
{BUG_ID + FS + "pkg" + FS + "SubClass.html",
- ""},
+ ""},
//Public inner class should be inherited.
{BUG_ID + FS + "pkg" + FS + "SubClass.html",
@@ -56,7 +56,7 @@ public class TestMemberInheritence extends JavadocTester {
//Protected method should be inherited
{BUG_ID + FS + "pkg" + FS + "SubClass.html",
- ""},
+ ""},
//Protected inner class should be inherited.
{BUG_ID + FS + "pkg" + FS + "SubClass.html",
@@ -73,14 +73,14 @@ public class TestMemberInheritence extends JavadocTester {
// Test overriding/implementing methods with generic parameters.
{BUG_ID + FS + "pkg" + FS + "BaseClass.html",
"" + NL + "
"},
// Test diamond inheritence member summary (6256068)
{BUG_ID + FS + "diamond" + FS + "Z.html",
- "" +
+ "" +
"getAnnotation in interface " +
"" +
"BaseInterfaceaMethod"},
+ "aMethod"},
// Test that doc is inherited from closed parent (6270645)
{BUG_ID + FS + "inheritDist" + FS + "C.html",
@@ -90,7 +90,7 @@ public class TestMemberInheritence extends JavadocTester {
private static final String[][] NEGATED_TEST = {
{BUG_ID + FS + "pkg" + FS + "SubClass.html",
- "staticMethodPublicChild" + NL +
- "" +
+ " " +
"returnTypeTest()"
},
// Check return type in member detail.
@@ -60,9 +60,9 @@ public class TestMemberSummary extends JavadocTester {
// Legacy anchor dimensions (6290760)
{BUG_ID + FS + "pkg2" + FS + "A.html",
- "" + NL +
+ "" + NL +
"" + NL +
- "" + NL +
+ "" + NL +
"" + NL +
""
},
diff --git a/langtools/test/com/sun/javadoc/testNavigation/TestNavigation.java b/langtools/test/com/sun/javadoc/testNavigation/TestNavigation.java
index 4466eb87d0e..d8187147bd2 100644
--- a/langtools/test/com/sun/javadoc/testNavigation/TestNavigation.java
+++ b/langtools/test/com/sun/javadoc/testNavigation/TestNavigation.java
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 4131628 4664607 7025314 8023700 7198273
+ * @bug 4131628 4664607 7025314 8023700 7198273 8025633
* @summary Make sure the Next/Prev Class links iterate through all types.
* Make sure the navagation is 2 columns, not 3.
* @author jamieh
@@ -60,7 +60,7 @@ public class TestNavigation extends JavadocTester {
{BUG_ID + FS + "pkg" + FS + "I.html", "@AnnotationType(" +
- "optional" +
+ "optional" +
"=\"Class Annotation\"," + NL +
- " " +
+ " " +
"required=1994)" + NL + "public class " +
"AnnotationTypeUsage" + NL + "extends java.lang.Object
"},
@@ -205,36 +205,36 @@ public class TestNewLanguageFeatures extends JavadocTester {
{BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html",
"@AnnotationType(" +
- "optional" +
+ "optional" +
"=\"Field Annotation\"," + NL +
- " " +
+ " " +
"required=1994)" + NL + "public int field
"},
//CONSTRUCTOR
{BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html",
"@AnnotationType(" +
- "optional" +
+ "optional" +
"=\"Constructor Annotation\"," + NL +
- " " +
+ " " +
"required=1994)" + NL + "public AnnotationTypeUsage()
"},
//METHOD
{BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html",
"@AnnotationType(" +
- "optional" +
+ "optional" +
"=\"Method Annotation\"," + NL +
- " " +
+ " " +
"required=1994)" + NL + "public void method()
"},
//METHOD PARAMS
{BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html",
"public void methodWithParams(" +
"" +
- "@AnnotationType(" +
+ "@AnnotationType(" +
"optional=\"Parameter Annotation\",required=1994)" + NL +
+ "href=\"../pkg/AnnotationType.html#required--\">required=1994)" + NL +
" int documented," + NL +
" int undocmented)"},
@@ -242,9 +242,9 @@ public class TestNewLanguageFeatures extends JavadocTester {
{BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html",
"public AnnotationTypeUsage(" +
- "@AnnotationType(" +
+ "@AnnotationType(" +
"optional=\"Constructor Param Annotation\",required=1994)" + NL +
+ "href=\"../pkg/AnnotationType.html#required--\">required=1994)" + NL +
" int documented," + NL +
" int undocmented)
"},
@@ -254,43 +254,43 @@ public class TestNewLanguageFeatures extends JavadocTester {
//Integer
{BUG_ID + FS + "pkg1" + FS + "B.html",
- "d=3.14,"},
+ "d=3.14,"},
//Double
{BUG_ID + FS + "pkg1" + FS + "B.html",
- "d=3.14,"},
+ "d=3.14,"},
//Boolean
{BUG_ID + FS + "pkg1" + FS + "B.html",
- "b=true,"},
+ "b=true,"},
//String
{BUG_ID + FS + "pkg1" + FS + "B.html",
- "s=\"sigh\","},
+ "s=\"sigh\","},
//Class
{BUG_ID + FS + "pkg1" + FS + "B.html",
- "c=Foo.class,"},
+ "c=Foo.class,"},
//Bounded Class
{BUG_ID + FS + "pkg1" + FS + "B.html",
- "w=TypeParameterSubClass.class,"},
+ "w=TypeParameterSubClass.class,"},
//Enum
{BUG_ID + FS + "pkg1" + FS + "B.html",
- "e=Penny,"},
+ "e=Penny,"},
//Annotation Type
{BUG_ID + FS + "pkg1" + FS + "B.html",
- "a=@AnnotationType(optional=\"foo\",required=1994),"},
+ "a=@AnnotationType(optional=\"foo\",required=1994),"},
//String Array
{BUG_ID + FS + "pkg1" + FS + "B.html",
- "sa={\"up\",\"down\"},"},
+ "sa={\"up\",\"down\"},"},
//Primitive
{BUG_ID + FS + "pkg1" + FS + "B.html",
- "primitiveClassTest=boolean.class,"},
+ "primitiveClassTest=boolean.class,"},
//XXX: Add array test case after this if fixed:
//5020899: Incorrect internal representation of class-valued annotation elements
@@ -335,7 +335,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html",
"ClassUseTest1." +
" "
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html",
@@ -388,7 +388,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo2.html",
"method" +
+ "ClassUseTest1.html#method-T-\">method" +
"(T t) " +
"ClassUseTest1. "
},
@@ -417,7 +417,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html",
"method" +
+ "pkg2/ClassUseTest1.html#method-T-\">method" +
"(T t) ClassUseTest2." +
" "
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html",
@@ -472,7 +472,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html",
"method" +
+ "ClassUseTest2.html#method-T-\">method" +
"(T t) ClassUseTest2." +
" "
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html",
@@ -517,7 +517,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html",
"method" +
+ "ClassUseTest2.html#method-T-\">method" +
"(T t) ClassUseTest3" +
". "
+ "html#method-T-\">method(T t)method(T t) <T extends ClassUseTest3." +
"" +
" method(T t)" +
+ "html#method-T-\">method(T t)voidClassUseTest3." +
" " + NL +
"" + NL + ""
@@ -663,14 +663,14 @@ public class TestNewLanguageFeatures extends JavadocTester {
// TYPE PARAMETER IN INDEX
//=================================
{BUG_ID + FS + "index-all.html",
- "" +
+ "" +
"method(Vector<Object>)"
},
//=================================
// TYPE PARAMETER IN INDEX
//=================================
{BUG_ID + FS + "index-all.html",
- "" +
+ "" +
"method(Vector<Object>)"
},
};
diff --git a/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenMethodDocCopy.java b/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenMethodDocCopy.java
index 68999480d44..506fde14a71 100644
--- a/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenMethodDocCopy.java
+++ b/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenMethodDocCopy.java
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 4368820
+ * @bug 4368820 8025633
* @summary Inherited comment should link directly to member, not just
* class
* @author jamieh
@@ -47,7 +47,7 @@ public class TestOverridenMethodDocCopy extends JavadocTester {
private static final String[][] TEST = {
{BUG_ID + FS + "pkg1" + FS + "SubClass.html",
"Description copied from class: method(java." +
+ "html#method-java.util.Set-\">method(java." +
"util.Set<Foo4> p) " +
- "" +
+ "" +
"BaseClass"
}
};
diff --git a/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPackageFlag.java b/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPackageFlag.java
index 702c54c8309..018f04a2817 100644
--- a/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPackageFlag.java
+++ b/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPackageFlag.java
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 4634891
+ * @bug 4634891 8025633
* @summary Determine if overriden methods are properly documented when
* -protected (default) visibility flag is used.
* @author jamieh
@@ -41,14 +41,14 @@ public class TestOverridenPrivateMethodsWithPackageFlag extends JavadocTester {
//The public method should be overriden
{BUG_ID + FS + "pkg1" + FS + "SubClass.html",
"" +
+ "" +
"publicMethod in class " +
"BaseClass" +
+ "" +
"publicMethod in class " +
"BaseClass" +
+ "" +
"packagePrivateMethod in class " +
"BaseClass" +
+ "" +
"methodOverridenFromParent in class " +
"" +
"PrivateParent" +
+ "" +
"methodInterface in interface " +
"" +
"PrivateInterface" +
- "I"},
+ "Ihello" +
+ "hello" +
" in interface " +
"I" +
"<java.lang.String>" + NL +
"
" +
"java.io.IOExceptionC1.setUndecorated(boolean)setUndecorated(boolean)." + NL +
"" + NL + "
"},
{BUG_ID + FS + "serialized-form.html", "Deprecated." +
" As of JDK version 1.5, replaced by" + NL +
- " " +
+ " " +
"C1.setUndecorated(boolean)setUndecorated(boolean)." + NL +
"" + NL + "
"}
};
private static final String[][] NEGATED_TEST_4654308 = NO_TEST;
diff --git a/langtools/test/com/sun/javadoc/testTypeAnnotations/TestTypeAnnotations.java b/langtools/test/com/sun/javadoc/testTypeAnnotations/TestTypeAnnotations.java
index 61d5758bb5d..d1eb1179aee 100644
--- a/langtools/test/com/sun/javadoc/testTypeAnnotations/TestTypeAnnotations.java
+++ b/langtools/test/com/sun/javadoc/testTypeAnnotations/TestTypeAnnotations.java
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 8005091 8009686
+ * @bug 8005091 8009686 8025633
* @summary Make sure that type annotations are displayed correctly
* @author Bhavesh Patel
* @library ../lib/
@@ -272,13 +272,13 @@ public class TestTypeAnnotations extends JavadocTester {
"" +
@@ -75,12 +75,12 @@ public class TestSerializedFormDeprecationInfo extends JavadocTester {
{BUG_ID + FS + "serialized-form.html", "boolean undecorated
" + NL +
"" +
+ " " +
"setUndecorated(boolean).setUndecorated(boolean)." + NL + ""}};
// Test with -nodeprecated option. The serialized-form.html should
diff --git a/langtools/test/com/sun/javadoc/testTaglets/TestTaglets.java b/langtools/test/com/sun/javadoc/testTaglets/TestTaglets.java
index 53461390e52..e49e857e6fe 100644
--- a/langtools/test/com/sun/javadoc/testTaglets/TestTaglets.java
+++ b/langtools/test/com/sun/javadoc/testTaglets/TestTaglets.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 4654308 4767038
+ * @bug 4654308 4767038 8025633
* @summary Use a Taglet and include some inline tags such as {@link}. The
* inline tags should be interpreted properly.
* Run Javadoc on some sample source that uses {@inheritDoc}. Make
@@ -56,7 +56,7 @@ public class TestTaglets extends JavadocTester {
//Input for string search tests.
private static final String[][] TEST_4654308 = new String[][] {
{"4654308" + FS + "C.html", "Foo:" +
- "here" +
+ "here" +
"void oneException()" + NL +
" throws @ThrB(value=\"m\") java.lang.Exception"
+ "ThrB.html#value--\">value
void twoExceptions()" + NL +
" throws @ThrB(value=\"m\") java.lang.RuntimeException," + NL +
+ "ThrB.html#value--\">value=\"m\") java.lang.RuntimeException," + NL +
" @ThrA java.lang.Exception"
},
@@ -307,14 +307,14 @@ public class TestTypeAnnotations extends JavadocTester {
"void wcSuper(MyList<? super @WldB(value=\"m\") java.lang." + + "../typeannos/WldB.html#value--\">value=\"m\") java.lang." + "String> l)" }, {BUG_ID + FS + "typeannos" + FS + "BoundWithValue.html", "
MyList<? extends @WldB(value=\"m\") java.lang.String" + + "typeannos/WldB.html#value--\">value=\"m\") java.lang.String" + "> returnWcExtends()" }, @@ -329,7 +329,7 @@ public class TestTypeAnnotations extends JavadocTester { "
java.lang.String nonVoid(@RcvrA @RcvrB" + - "(value=\"m\")" + + "(value=\"m\")" + " DefaultUnmodified this)" }, {BUG_ID + FS + "typeannos" + FS + "DefaultUnmodified.html", @@ -354,7 +354,7 @@ public class TestTypeAnnotations extends JavadocTester { {BUG_ID + FS + "typeannos" + FS + "WithValue.html", "
<T extends java.lang.Runnable> void accept(" +
"@RcvrB(" +
+ "typeannos\">@RcvrB(" +
"value=\"m\") WithValue this," + NL +
" T r)" + NL +
" throws java.lang.Exception"
@@ -362,7 +362,7 @@ public class TestTypeAnnotations extends JavadocTester {
{BUG_ID + FS + "typeannos" + FS + "WithFinal.html",
"java.lang.String nonVoid(@RcvrB(value=\"m\") WithFinal" + + "typeannos/RcvrB.html#value--\">value=\"m\") WithFinal" + " this)" }, {BUG_ID + FS + "typeannos" + FS + "WithBody.html", diff --git a/langtools/test/com/sun/javadoc/testTypeParams/TestTypeParameters.java b/langtools/test/com/sun/javadoc/testTypeParams/TestTypeParameters.java index ee352a1b385..14e7ba47a6a 100644 --- a/langtools/test/com/sun/javadoc/testTypeParams/TestTypeParameters.java +++ b/langtools/test/com/sun/javadoc/testTypeParams/TestTypeParameters.java @@ -23,7 +23,7 @@ /* * @test - * @bug 4927167 4974929 7010344 + * @bug 4927167 4974929 7010344 8025633 * @summary When the type parameters are more than 10 characters in length, * make sure there is a line break between type params and return type * in member summary. Also, test for type parameter links in package-summary and @@ -71,7 +71,7 @@ public class TestTypeParameters extends JavadocTester { }, //Nested type parameters {BUG_ID + FS + "pkg" + FS + "C.html", - "" + NL + + "" + NL + "" + NL + "" }, diff --git a/langtools/test/com/sun/javadoc/testWarnings/TestWarnings.java b/langtools/test/com/sun/javadoc/testWarnings/TestWarnings.java index d5f697a213e..7152cced990 100644 --- a/langtools/test/com/sun/javadoc/testWarnings/TestWarnings.java +++ b/langtools/test/com/sun/javadoc/testWarnings/TestWarnings.java @@ -23,7 +23,7 @@ /* * @test - * @bug 4515705 4804296 4702454 4697036 + * @bug 4515705 4804296 4702454 4697036 8025633 * @summary Make sure that first sentence warning only appears once. * Make sure that only warnings/errors are printed when quiet is used. * Make sure that links to private/unincluded methods do not cause @@ -65,8 +65,8 @@ public class TestWarnings extends JavadocTester { }; private static final String[][] TEST2 = { - {BUG_ID + FS + "pkg" + FS + "X.html", "
m()X()m()X()f