Copyright $(THIS_YEAR) Sun Microsystems, Inc. All Rights Reserved. Use is subject to license terms. Also see the documentation redistribution policy.
' JAVADOCOVERVIEW = $(SHARE_SRC)/classes/overview-core.html @@ -120,7 +120,7 @@ -group $(DOMAPI_GROUPNAME) $(DOMAPI_REGEXP) DOMAPI_JAVADOCTITLE = 'Common DOM API' DOMAPI_JAVADOCWINDOWTITLE = 'Common DOM API' -DOMAPI_JAVADOCHEADER = 'Common DOM API' +DOMAPI_JAVADOCHEADER = 'Common DOM API' DOMAPI_JAVADOCBOTTOM = 'Submit a bug or feature"+NL+"
i - a param."+NL+"
i - a param." + NL + "
@Deprecated" + NL +
- "public class DeprecatedClassByAnnotation"},
+ "public class DeprecatedClassByAnnotation"},
- {TARGET_FILE2, "public int field" + NL +
+ {TARGET_FILE2, "public int field" + NL +
"Overrides:read in class " +
"FilterReader"},
{BUG_ID + FS + "pkg" + FS + "XReader.html",
- "Specified by:Specified by:readInt in interface " +
"" + NL +
- "Class Summary"
+ "Class Summary"
},
// Class documentation
{BUG_ID + FS + "pkg1" + FS + "C1.html",
"" + NL +
- "Field Summary "
+ "Field Summary"
},
{BUG_ID + FS + "pkg1" + FS + "C1.html",
- "Methods inherited from class " + "java.lang.Object "
+ "Methods inherited from class " + "java.lang.Object "
},
// Class use documentation
@@ -76,7 +76,7 @@
// Deprecated
{BUG_ID + FS + "deprecated-list.html",
"" + NL +
- "Deprecated Methods "
+ "Deprecated Methods"
},
// Constant values
@@ -90,20 +90,20 @@
// Serialized Form
{BUG_ID + FS + "serialized-form.html",
"" + NL +
- "Package pkg1 "
+ "Package pkg1"
},
{BUG_ID + FS + "serialized-form.html",
"" + NL +
- "Class pkg1.C1 extends java.lang.Object " + "implements Serializable "
+ "Class pkg1.C1 extends java.lang.Object " + "implements Serializable"
},
{BUG_ID + FS + "serialized-form.html",
"" + NL +
- "Serialized Fields "
+ "Serialized Fields"
},
// Overview Frame
{BUG_ID + FS + "overview-frame.html",
- "" + NL + "Test Files "
+ "" + NL + "Test Files "
},
{BUG_ID + FS + "overview-frame.html",
"" + NL +
diff -r 952b42dad1fc -r 28000d78abfa langtools/test/com/sun/javadoc/testHelpOption/TestHelpOption.java
--- a/langtools/test/com/sun/javadoc/testHelpOption/TestHelpOption.java Mon Jan 26 12:07:54 2009 -0800
+++ b/langtools/test/com/sun/javadoc/testHelpOption/TestHelpOption.java Mon Feb 09 13:47:26 2009 -0800
@@ -91,7 +91,8 @@
private static final String[][] TEST2 = {
{BUG_ID + FS + "TestHelpOption.html",
- "<A HREF=\"help-doc.html\"><FONT CLASS=\"NavBarFont1\">" +
"<B>Help</B></FONT></A>"
+ "<A HREF=\"help-doc.html\"><FONT CLASS=\"NavBarFont1\">" +
+ "<STRONG>Help</STRONG></FONT></A>"
},
};
private static final String[][] NEGATED_TEST2 = NO_TEST;
diff -r 952b42dad1fc -r 28000d78abfa langtools/test/com/sun/javadoc/testHref/TestHref.java
--- a/langtools/test/com/sun/javadoc/testHref/TestHref.java Mon Jan 26 12:07:54 2009 -0800
+++ b/langtools/test/com/sun/javadoc/testHref/TestHref.java Mon Feb 09 13:47:26 2009 -0800
@@ -67,7 +67,7 @@
},
//@see test.
{BUG_ID + FS + "pkg" + FS + "C2.html",
- "See Also:</B><DD><A HREF=\"../pkg/C1.html#method(int, int, java.util.ArrayList)\">"
+ "See Also:</STRONG><DD><A HREF=\"../pkg/C1.html#method(int, int, java.util.ArrayList)\">"
},
//Header does not link to the page itself.
@@ -77,7 +77,7 @@
//Signature does not link to the page itself.
{BUG_ID + FS + "pkg" + FS + "C4.html",
- "public abstract class <B>C4<E extends C4<E>></B>"
+ "public abstract class <STRONG>C4<E extends C4<E>></STRONG>"
},
};
private static final String[][] NEGATED_TEST =
diff -r 952b42dad1fc -r 28000d78abfa langtools/test/com/sun/javadoc/testHtmlStrongTag/TestHtmlStrongTag.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/com/sun/javadoc/testHtmlStrongTag/TestHtmlStrongTag.java Mon Feb 09 13:47:26 2009 -0800
@@ -0,0 +1,82 @@
+/*
+ * Copyright 1999-2008 Sun Microsystems, Inc. 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. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the LICENSE file that accompanied this code.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6786028
+ * @summary This test verifys the use of <strong> HTML tag instead of <B> by Javadoc std doclet.
+ * @author Bhavesh Patel
+ * @library ../lib/
+ * @build JavadocTester
+ * @build TestHtmlStrongTag
+ * @run main TestHtmlStrongTag
+ */
+
+public class TestHtmlStrongTag extends JavadocTester {
+
+ private static final String BUG_ID = "6786028";
+ private static final String[][] TEST1 = {
+ {BUG_ID + FS + "pkg1" + FS + "C1.html", "<STRONG>Method Summary</STRONG>"},
+ {BUG_ID + FS + "pkg1" + FS + "C1.html", "<STRONG>See Also:</STRONG>"},
+ {BUG_ID + FS + "pkg1" + FS + "package-summary.html", "<STRONG>Class Summary</STRONG>"}};
+ private static final String[][] NEGATED_TEST1 = {
+ {BUG_ID + FS + "pkg1" + FS + "C1.html", "<B>"}};
+ private static final String[][] TEST2 = {
+ {BUG_ID + FS + "pkg2" + FS + "C2.html", "<STRONG>Method Summary</STRONG>"},
+ {BUG_ID + FS + "pkg2" + FS + "C2.html", "<B>Comments:</B>"},
+ {BUG_ID + FS + "pkg1" + FS + "package-summary.html", "<STRONG>Class Summary</STRONG>"}};
+
+ private static final String[] ARGS1 =
+ new String[] {
+ "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg1"};
+ private static final String[] ARGS2 =
+ new String[] {
+ "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg2"};
+
+ /**
+ * The entry point of the test.
+ * @param args the array of command line arguments.
+ */
+ public static void main(String[] args) {
+ TestHtmlStrongTag tester = new TestHtmlStrongTag();
+ run(tester, ARGS1, TEST1, NEGATED_TEST1);
+ run(tester, ARGS2, TEST2, NO_TEST);
+ tester.printSummary();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getBugId() {
+ return BUG_ID;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getBugName() {
+ return getClass().getName();
+ }
+}
diff -r 952b42dad1fc -r 28000d78abfa langtools/test/com/sun/javadoc/testHtmlStrongTag/pkg1/C1.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/com/sun/javadoc/testHtmlStrongTag/pkg1/C1.java Mon Feb 09 13:47:26 2009 -0800
@@ -0,0 +1,36 @@
+/*
+ * Copyright 1999-2008 Sun Microsystems, Inc. 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. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the LICENSE file that accompanied this code.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package pkg1;
+
+/**
+ * @see java.lang.Object#wait(long, int)
+ */
+public class C1 {
+
+ public void method(int param1, int param2) {
+
+ }
+}
diff -r 952b42dad1fc -r 28000d78abfa langtools/test/com/sun/javadoc/testHtmlStrongTag/pkg2/C2.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/com/sun/javadoc/testHtmlStrongTag/pkg2/C2.java Mon Feb 09 13:47:26 2009 -0800
@@ -0,0 +1,31 @@
+/*
+ * Copyright 1999-2008 Sun Microsystems, Inc. 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. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the LICENSE file that accompanied this code.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package pkg2;
+
+/**
+ * <B>Comments:</B> Class 2
+ */
+public class C2 {}
diff -r 952b42dad1fc -r 28000d78abfa langtools/test/com/sun/javadoc/testIndex/TestIndex.java
--- a/langtools/test/com/sun/javadoc/testIndex/TestIndex.java Mon Jan 26 12:07:54 2009 -0800
+++ b/langtools/test/com/sun/javadoc/testIndex/TestIndex.java Mon Feb 09 13:47:26 2009 -0800
@@ -54,27 +54,27 @@
//Test index-all.html
{BUG_ID + FS + "index-all.html",
- "<A HREF=\"./pkg/C.html\" title=\"class in pkg\"><B>C</B></A>" +
+ "<A HREF=\"./pkg/C.html\" title=\"class in pkg\"><STRONG>C</STRONG></A>" +
" - Class in <A HREF=\"./pkg/package-summary.html\">pkg</A>"},
{BUG_ID + FS + "index-all.html",
"<A HREF=\"./pkg/Interface.html\" title=\"interface in pkg\">" +
- "<B>Interface</B></A> - Interface in " +
+ "<STRONG>Interface</STRONG></A> - Interface in " +
"<A HREF=\"./pkg/package-summary.html\">pkg</A>"},
{BUG_ID + FS + "index-all.html",
"<A HREF=\"./pkg/AnnotationType.html\" title=\"annotation in pkg\">" +
- "<B>AnnotationType</B></A> - Annotation Type in " +
+ "<STRONG>AnnotationType</STRONG></A> - Annotation Type in " +
"<A HREF=\"./pkg/package-summary.html\">pkg</A>"},
{BUG_ID + FS + "index-all.html",
"<A HREF=\"./pkg/Coin.html\" title=\"enum in pkg\">" +
- "<B>Coin</B></A> - Enum in " +
+ "<STRONG>Coin</STRONG></A> - Enum in " +
"<A HREF=\"./pkg/package-summary.html\">pkg</A>"},
{BUG_ID + FS + "index-all.html",
"Class in <A HREF=\"./package-summary.html\"><Unnamed></A>"},
{BUG_ID + FS + "index-all.html",
- "<DT><A HREF=\"./pkg/C.html#Java\"><B>Java</B></A> - " + NL +
+ "<DT><A HREF=\"./pkg/C.html#Java\"><STRONG>Java</STRONG></A> - " + NL +
"Static variable in class pkg.<A HREF=\"./pkg/C.html\" title=\"class in pkg\">C</A>" + NL +
"<DD> " + NL +
- "<DT><A HREF=\"./pkg/C.html#JDK\"><B>JDK</B></A> - " + NL +
+ "<DT><A HREF=\"./pkg/C.html#JDK\"><STRONG>JDK</STRONG></A> - " + NL +
"Static variable in class pkg.<A HREF=\"./pkg/C.html\" title=\"class in pkg\">C</A>" + NL +
"<DD> "},
};
diff -r 952b42dad1fc -r 28000d78abfa langtools/test/com/sun/javadoc/testInterface/TestInterface.java
--- a/langtools/test/com/sun/javadoc/testInterface/TestInterface.java Mon Jan 26 12:07:54 2009 -0800
+++ b/langtools/test/com/sun/javadoc/testInterface/TestInterface.java Mon Feb 09 13:47:26 2009 -0800
@@ -48,14 +48,14 @@
//Input for string search tests.
private static final String[][] TEST = {
{BUG_ID + FS + "pkg" + FS + "Interface.html",
- "int <B>method</B>()"},
+ "int <STRONG>method</STRONG>()"},
{BUG_ID + FS + "pkg" + FS + "Interface.html",
- "static final int <B>field</B>"},
+ "static final int <STRONG>field</STRONG>"},
// Make sure known implementing class list is correct and omits type parameters.
{BUG_ID + FS + "pkg" + FS + "Interface.html",
- "<DT><B>All Known Implementing Classes:</B> " +
+ "<DT><STRONG>All Known Implementing Classes:</STRONG> " +
"<DD><A HREF=\"../pkg/Child.html\" " +
"title=\"class in pkg\">Child</A>, " +
"<A HREF=\"../pkg/Parent.html\" title=\"class in pkg\">" +
@@ -63,34 +63,34 @@
// Make sure "All Implemented Interfaces": has substituted type parameters
{BUG_ID + FS + "pkg" + FS + "Child.html",
- "<B>All Implemented Interfaces:</B> <DD><A HREF=\"../pkg/Interface.html\" title=\"interface in pkg\">Interface</A><T>"
+ "<STRONG>All Implemented Interfaces:</STRONG> <DD><A HREF=\"../pkg/Interface.html\" title=\"interface in pkg\">Interface</A><T>"
},
//Make sure Class Tree has substituted type parameters.
{BUG_ID + FS + "pkg" + FS + "Child.html",
"<PRE>" + NL +
"java.lang.Object" + NL +
" <IMG SRC=\"../resources/inherit.gif\" ALT=\"extended by \"><A HREF=\"../pkg/Parent.html\" title=\"class in pkg\">pkg.Parent</A><T>" + NL +
- " <IMG SRC=\"../resources/inherit.gif\" ALT=\"extended by \"><B>pkg.Child<T></B>" + NL +
+ " <IMG SRC=\"../resources/inherit.gif\" ALT=\"extended by \"><STRONG>pkg.Child<T></STRONG>" + NL +
"</PRE>"
},
//Make sure "Direct Know Subclasses" omits type parameters
{BUG_ID + FS + "pkg" + FS + "Parent.html",
- "<B>Direct Known Subclasses:</B> <DD><A HREF=\"../pkg/Child.html\" title=\"class in pkg\">Child</A>"
+ "<STRONG>Direct Known Subclasses:</STRONG> <DD><A HREF=\"../pkg/Child.html\" title=\"class in pkg\">Child</A>"
},
//Make sure "Specified By" has substituted type parameters.
{BUG_ID + FS + "pkg" + FS + "Child.html",
- "<B>Specified by:</B><DD><CODE><A HREF=\"../pkg/Interface.html#method()\">method</A></CODE> in interface <CODE><A HREF=\"../pkg/Interface.html\" title=\"interface in pkg\">Interface</A><<A HREF=\"../pkg/Child.html\" title=\"type parameter in Child\">T</A>></CODE>"
+ "<STRONG>Specified by:</STRONG><DD><CODE><A HREF=\"../pkg/Interface.html#method()\">method</A></CODE> in interface <CODE><A HREF=\"../pkg/Interface.html\" title=\"interface in pkg\">Interface</A><<A HREF=\"../pkg/Child.html\" title=\"type parameter in Child\">T</A>></CODE>"
},
//Make sure "Overrides" has substituted type parameters.
{BUG_ID + FS + "pkg" + FS + "Child.html",
- "<B>Overrides:</B><DD><CODE><A HREF=\"../pkg/Parent.html#method()\">method</A></CODE> in class <CODE><A HREF=\"../pkg/Parent.html\" title=\"class in pkg\">Parent</A><<A HREF=\"../pkg/Child.html\" title=\"type parameter in Child\">T</A>></CODE>"
+ "<STRONG>Overrides:</STRONG><DD><CODE><A HREF=\"../pkg/Parent.html#method()\">method</A></CODE> in class <CODE><A HREF=\"../pkg/Parent.html\" title=\"class in pkg\">Parent</A><<A HREF=\"../pkg/Child.html\" title=\"type parameter in Child\">T</A>></CODE>"
},
};
private static final String[][] NEGATED_TEST = {
{BUG_ID + FS + "pkg" + FS + "Interface.html",
- "public int <B>method</B>()"},
+ "public int <STRONG>method</STRONG>()"},
{BUG_ID + FS + "pkg" + FS + "Interface.html",
- "public static final int <B>field</B>"},
+ "public static final int <STRONG>field</STRONG>"},
};
/**
diff -r 952b42dad1fc -r 28000d78abfa langtools/test/com/sun/javadoc/testJavascript/TestJavascript.java
--- a/langtools/test/com/sun/javadoc/testJavascript/TestJavascript.java Mon Jan 26 12:07:54 2009 -0800
+++ b/langtools/test/com/sun/javadoc/testJavascript/TestJavascript.java Mon Feb 09 13:47:26 2009 -0800
@@ -45,9 +45,9 @@
//Input for string search tests.
private static final String[][] TEST = {
{BUG_ID + FS + "pkg" + FS + "C.html",
- "<A HREF=\"../index.html?pkg/C.html\" target=\"_top\"><B>FRAMES</B></A>"},
+ "<A HREF=\"../index.html?pkg/C.html\" target=\"_top\"><STRONG>FRAMES</STRONG></A>"},
{BUG_ID + FS + "TestJavascript.html",
- "<A HREF=\"index.html?TestJavascript.html\" target=\"_top\"><B>FRAMES</B></A>"},
+ "<A HREF=\"index.html?TestJavascript.html\" target=\"_top\"><STRONG>FRAMES</STRONG></A>"},
{BUG_ID + FS + "index.html",
"<SCRIPT type=\"text/javascript\">" + NL +
" targetPage = \"\" + window.location.search;" + NL +
diff -r 952b42dad1fc -r 28000d78abfa langtools/test/com/sun/javadoc/testLinkOption/TestLinkOption.java
--- a/langtools/test/com/sun/javadoc/testLinkOption/TestLinkOption.java Mon Jan 26 12:07:54 2009 -0800
+++ b/langtools/test/com/sun/javadoc/testLinkOption/TestLinkOption.java Mon Feb 09 13:47:26 2009 -0800
@@ -63,7 +63,7 @@
"title=\"class or interface in java.lang\">Object</A> p3)"
},
{BUG_ID + "-1" + FS + "java" + FS + "lang" + FS + "StringBuilderChild.html",
- "public abstract class <B>StringBuilderChild</B><DT>extends <A HREF=\"http://java.sun.com/j2se/1.4/docs/api/java/lang/Object.html?is-external=true\" title=\"class or interface in java.lang\">Object</A>"
+ "public abstract class <STRONG>StringBuilderChild</STRONG><DT>extends <A HREF=\"http://java.sun.com/j2se/1.4/docs/api/java/lang/Object.html?is-external=true\" title=\"class or interface in java.lang\">Object</A>"
},
};
diff -r 952b42dad1fc -r 28000d78abfa langtools/test/com/sun/javadoc/testLinkTaglet/TestLinkTaglet.java
--- a/langtools/test/com/sun/javadoc/testLinkTaglet/TestLinkTaglet.java Mon Jan 26 12:07:54 2009 -0800
+++ b/langtools/test/com/sun/javadoc/testLinkTaglet/TestLinkTaglet.java Mon Feb 09 13:47:26 2009 -0800
@@ -59,7 +59,7 @@
" Link to another inner class: <A HREF=\"../pkg/C.InnerC2.html\" title=\"class in pkg\"><CODE>C.InnerC2</CODE></A>"
},
{BUG_ID + FS + "pkg" + FS + "C.InnerC2.html",
- "Enclosing class:</B><DD><A HREF=\"../pkg/C.html\" title=\"class in pkg\">C</A>"
+ "Enclosing class:</STRONG><DD><A HREF=\"../pkg/C.html\" title=\"class in pkg\">C</A>"
},
};
private static final String[][] NEGATED_TEST = {
diff -r 952b42dad1fc -r 28000d78abfa langtools/test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java
--- a/langtools/test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java Mon Jan 26 12:07:54 2009 -0800
+++ b/langtools/test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java Mon Feb 09 13:47:26 2009 -0800
@@ -64,13 +64,17 @@
// New labels as of 1.5.0
{BUG_ID + FS + "pkg" + FS + "SubClass.html",
- "<B>Nested classes/interfaces inherited from class pkg." +
"<A HREF=\"../pkg/BaseClass.html\" title=\"class in pkg\">" +
"BaseClass</A></B>"},
+ "<STRONG>Nested classes/interfaces inherited from class pkg." +
+ "<A HREF=\"../pkg/BaseClass.html\" title=\"class in pkg\">" +
+ "BaseClass</A></STRONG>"},
{BUG_ID + FS + "pkg" + FS + "SubClass.html",
- "<B>Nested classes/interfaces inherited from interface pkg." +
"<A HREF=\"../pkg/BaseInterface.html\" title=\"interface in pkg\">" +
"BaseInterface</A></B>"},
+ "<STRONG>Nested classes/interfaces inherited from interface pkg." +
+ "<A HREF=\"../pkg/BaseInterface.html\" title=\"interface in pkg\">" +
+ "BaseInterface</A></STRONG>"},
// Test overriding/implementing methods with generic parameters.
{BUG_ID + FS + "pkg" + FS + "BaseClass.html",
- "<DT><B>Specified by:</B><DD><CODE><A HREF=\"../pkg/BaseInterface.html#getAnnotation(java.lang.Class)\">getAnnotation</A></CODE> in interface <CODE><A HREF=\"../pkg/BaseInterface.html\" title=\"interface in pkg\">BaseInterface</A></CODE></DL>"},
+ "<DT><STRONG>Specified by:</STRONG><DD><CODE><A HREF=\"../pkg/BaseInterface.html#getAnnotation(java.lang.Class)\">getAnnotation</A></CODE> in interface <CODE><A HREF=\"../pkg/BaseInterface.html\" title=\"interface in pkg\">BaseInterface</A></CODE></DL>"},
// Test diamond inheritence member summary (6256068)
{BUG_ID + FS + "diamond" + FS + "Z.html",
diff -r 952b42dad1fc -r 28000d78abfa langtools/test/com/sun/javadoc/testMemberSummary/TestMemberSummary.java
--- a/langtools/test/com/sun/javadoc/testMemberSummary/TestMemberSummary.java Mon Jan 26 12:07:54 2009 -0800
+++ b/langtools/test/com/sun/javadoc/testMemberSummary/TestMemberSummary.java Mon Feb 09 13:47:26 2009 -0800
@@ -50,14 +50,14 @@
{BUG_ID + FS + "pkg" + FS + "PublicChild.html",
"<CODE> <A HREF=\"../pkg/PublicChild.html\" " +
"title=\"class in pkg\">PublicChild</A></CODE></FONT></TD>" + NL +
- "<TD><CODE><B><A HREF=\"../pkg/PublicChild.html#" +
- "returnTypeTest()\">returnTypeTest</A></B>()</CODE>"
+ "<TD><CODE><STRONG><A HREF=\"../pkg/PublicChild.html#" +
+ "returnTypeTest()\">returnTypeTest</A></STRONG>()</CODE>"
},
// Check return type in member detail.
{BUG_ID + FS + "pkg" + FS + "PublicChild.html",
"public <A HREF=\"../pkg/PublicChild.html\" " +
"title=\"class in pkg\">PublicChild</A> " +
- "<B>returnTypeTest</B>()"
+ "<STRONG>returnTypeTest</STRONG>()"
},
// Legacy anchor dimensions (6290760)
diff -r 952b42dad1fc -r 28000d78abfa langtools/test/com/sun/javadoc/testNavagation/TestNavagation.java
--- a/langtools/test/com/sun/javadoc/testNavagation/TestNavagation.java Mon Jan 26 12:07:54 2009 -0800
+++ b/langtools/test/com/sun/javadoc/testNavagation/TestNavagation.java Mon Feb 09 13:47:26 2009 -0800
@@ -47,17 +47,17 @@
private static final String[][] TEST = {
{BUG_ID + FS + "pkg" + FS + "A.html", " PREV CLASS "},
{BUG_ID + FS + "pkg" + FS + "A.html",
- "<A HREF=\"../pkg/C.html\" title=\"class in pkg\"><B>NEXT CLASS</B></A>"},
+ "<A HREF=\"../pkg/C.html\" title=\"class in pkg\"><STRONG>NEXT CLASS</STRONG></A>"},
{BUG_ID + FS + "pkg" + FS + "C.html",
- "<A HREF=\"../pkg/A.html\" title=\"annotation in pkg\"><B>PREV CLASS</B></A>"},
+ "<A HREF=\"../pkg/A.html\" title=\"annotation in pkg\"><STRONG>PREV CLASS</STRONG></A>"},
{BUG_ID + FS + "pkg" + FS + "C.html",
- "<A HREF=\"../pkg/E.html\" title=\"enum in pkg\"><B>NEXT CLASS</B></A>"},
+ "<A HREF=\"../pkg/E.html\" title=\"enum in pkg\"><STRONG>NEXT CLASS</STRONG></A>"},
{BUG_ID + FS + "pkg" + FS + "E.html",
- "<A HREF=\"../pkg/C.html\" title=\"class in pkg\"><B>PREV CLASS</B></A>"},
+ "<A HREF=\"../pkg/C.html\" title=\"class in pkg\"><STRONG>PREV CLASS</STRONG></A>"},
{BUG_ID + FS + "pkg" + FS + "E.html",
- "<A HREF=\"../pkg/I.html\" title=\"interface in pkg\"><B>NEXT CLASS</B></A>"},
+ "<A HREF=\"../pkg/I.html\" title=\"interface in pkg\"><STRONG>NEXT CLASS</STRONG></A>"},
{BUG_ID + FS + "pkg" + FS + "I.html",
- "<A HREF=\"../pkg/E.html\" title=\"enum in pkg\"><B>PREV CLASS</B></A>"},
+ "<A HREF=\"../pkg/E.html\" title=\"enum in pkg\"><STRONG>PREV CLASS</STRONG></A>"},
{BUG_ID + FS + "pkg" + FS + "I.html", " NEXT CLASS"},
// Test for 4664607
{BUG_ID + FS + "pkg" + FS + "I.html",
diff -r 952b42dad1fc -r 28000d78abfa langtools/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java
--- a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java Mon Jan 26 12:07:54 2009 -0800
+++ b/langtools/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java Mon Feb 09 13:47:26 2009 -0800
@@ -54,14 +54,14 @@
{BUG_ID + FS + "pkg" + FS + "Coin.html", "Enum Coin</H2>"},
//Make sure enum signature is correct.
{BUG_ID + FS + "pkg" + FS + "Coin.html", "public enum "+
- "<B>Coin</B><DT>extends java.lang.Enum<" +
+ "<STRONG>Coin</STRONG><DT>extends java.lang.Enum<" +
"<A HREF=\"../pkg/Coin.html\" title=\"enum in pkg\">Coin</A>>"
},
//Check for enum constant section
- {BUG_ID + FS + "pkg" + FS + "Coin.html", "<B>Enum Constant Summary</B>"},
+ {BUG_ID + FS + "pkg" + FS + "Coin.html", "<STRONG>Enum Constant Summary</STRONG>"},
//Detail for enum constant
{BUG_ID + FS + "pkg" + FS + "Coin.html",
- "<B><A HREF=\"../pkg/Coin.html#Dime\">Dime</A></B>"},
+ "<STRONG><A HREF=\"../pkg/Coin.html#Dime\">Dime</A></STRONG>"},
//Automatically insert documentation for values() and valueOf().
{BUG_ID + FS + "pkg" + FS + "Coin.html",
"Returns an array containing the constants of this enum type,"},
@@ -79,11 +79,11 @@
"Class TypeParameters<E></H2>"},
//Check class type parameters section.
{BUG_ID + FS + "pkg" + FS + "TypeParameters.html",
- "<DT><B>Type Parameters:</B><DD><CODE>E</CODE> - " +
+ "<DT><STRONG>Type Parameters:</STRONG><DD><CODE>E</CODE> - " +
"the type parameter for this class."},
//Type parameters in @see/@link
{BUG_ID + FS + "pkg" + FS + "TypeParameters.html",
- "<DT><B>See Also:</B><DD><A HREF=\"../pkg/TypeParameters.html\" " +
+ "<DT><STRONG>See Also:</STRONG><DD><A HREF=\"../pkg/TypeParameters.html\" " +
"title=\"class in pkg\"><CODE>TypeParameters</CODE></A></DL>"},
//Method that uses class type parameter.
{BUG_ID + FS + "pkg" + FS + "TypeParameters.html",
@@ -91,13 +91,13 @@
"parameter in TypeParameters\">E</A> param)"},
//Method type parameter section.
{BUG_ID + FS + "pkg" + FS + "TypeParameters.html",
- "<B>Type Parameters:</B><DD><CODE>T</CODE> - This is the first " +
+ "<STRONG>Type Parameters:</STRONG><DD><CODE>T</CODE> - This is the first " +
"type parameter.<DD><CODE>V</CODE> - This is the second type " +
"parameter."},
//Signature of method with type parameters
{BUG_ID + FS + "pkg" + FS + "TypeParameters.html",
"public <T extends java.util.List,V> " +
- "java.lang.String[] <B>methodThatHasTypeParameters</B>"},
+ "java.lang.String[] <STRONG>methodThatHasTypeParameters</STRONG>"},
//Wildcard testing.
{BUG_ID + FS + "pkg" + FS + "Wildcards.html",
"<A HREF=\"../pkg/TypeParameters.html\" title=\"class in pkg\">" +
@@ -116,18 +116,18 @@
//Signature of subclass that has type parameters.
{BUG_ID + FS + "pkg" + FS + "TypeParameterSubClass.html",
- "public class <B>TypeParameterSubClass<T extends java.lang.String>" +
- "</B><DT>extends <A HREF=\"../pkg/TypeParameterSuperClass.html\" " +
+ "public class <STRONG>TypeParameterSubClass<T extends java.lang.String>" +
+ "</STRONG><DT>extends <A HREF=\"../pkg/TypeParameterSuperClass.html\" " +
"title=\"class in pkg\">TypeParameterSuperClass</A><T>"},
//Interface generic parameter substitution
//Signature of subclass that has type parameters.
{BUG_ID + FS + "pkg" + FS + "TypeParameters.html",
- "<B>All Implemented Interfaces:</B> <DD><A HREF=\"../pkg/SubInterface.html\" title=\"interface in pkg\">SubInterface</A><E>, <A HREF=\"../pkg/SuperInterface.html\" title=\"interface in pkg\">SuperInterface</A><E></DD>"},
+ "<STRONG>All Implemented Interfaces:</STRONG> <DD><A HREF=\"../pkg/SubInterface.html\" title=\"interface in pkg\">SubInterface</A><E>, <A HREF=\"../pkg/SuperInterface.html\" title=\"interface in pkg\">SuperInterface</A><E></DD>"},
{BUG_ID + FS + "pkg" + FS + "SuperInterface.html",
- "<B>All Known Subinterfaces:</B> <DD><A HREF=\"../pkg/SubInterface.html\" title=\"interface in pkg\">SubInterface</A><V></DD>"},
+ "<STRONG>All Known Subinterfaces:</STRONG> <DD><A HREF=\"../pkg/SubInterface.html\" title=\"interface in pkg\">SubInterface</A><V></DD>"},
{BUG_ID + FS + "pkg" + FS + "SubInterface.html",
- "<B>All Superinterfaces:</B> <DD><A HREF=\"../pkg/SuperInterface.html\" title=\"interface in pkg\">SuperInterface</A><V></DD>"},
+ "<STRONG>All Superinterfaces:</STRONG> <DD><A HREF=\"../pkg/SuperInterface.html\" title=\"interface in pkg\">SuperInterface</A><V></DD>"},
//=================================
// VAR ARG TESTING
@@ -155,18 +155,18 @@
"Annotation Type AnnotationType</H2>"},
//Make sure the signature is correct.
{BUG_ID + FS + "pkg" + FS + "AnnotationType.html",
- "public @interface <B>AnnotationType</B>"},
+ "public @interface <STRONG>AnnotationType</STRONG>"},
//Make sure member summary headings are correct.
{BUG_ID + FS + "pkg" + FS + "AnnotationType.html",
- "<B>Required Element Summary</B>"},
+ "<STRONG>Required Element Summary</STRONG>"},
{BUG_ID + FS + "pkg" + FS + "AnnotationType.html",
- "<B>Optional Element Summary</B>"},
+ "<STRONG>Optional Element Summary</STRONG>"},
//Make sure element detail heading is correct
{BUG_ID + FS + "pkg" + FS + "AnnotationType.html",
"Element Detail"},
//Make sure default annotation type value is printed when necessary.
{BUG_ID + FS + "pkg" + FS + "AnnotationType.html",
- "<B>Default:</B><DD>\"unknown\"</DD>"},
+ "<STRONG>Default:</STRONG><DD>\"unknown\"</DD>"},
//=================================
// ANNOTATION TYPE USAGE TESTING
@@ -182,40 +182,40 @@
"<FONT SIZE=\"-1\">" +
"<A HREF=\"../pkg/AnnotationType.html\" title=\"annotation in pkg\">@AnnotationType</A>(<A HREF=\"../pkg/AnnotationType.html#optional()\">optional</A>=\"Class Annotation\","+NL +
" <A HREF=\"../pkg/AnnotationType.html#required()\">required</A>=1994)"+NL +
- "</FONT>public class <B>AnnotationTypeUsage</B><DT>extends java.lang.Object</DL>"},
+ "</FONT>public class <STRONG>AnnotationTypeUsage</STRONG><DT>extends java.lang.Object</DL>"},
//FIELD
{BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html",
"<FONT SIZE=\"-1\">" +
"<A HREF=\"../pkg/AnnotationType.html\" title=\"annotation in pkg\">@AnnotationType</A>(<A HREF=\"../pkg/AnnotationType.html#optional()\">optional</A>=\"Field Annotation\","+NL +
" <A HREF=\"../pkg/AnnotationType.html#required()\">required</A>=1994)"+NL +
- "</FONT>public int <B>field</B>"},
+ "</FONT>public int <STRONG>field</STRONG>"},
//CONSTRUCTOR
{BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html",
"<FONT SIZE=\"-1\">" +
"<A HREF=\"../pkg/AnnotationType.html\" title=\"annotation in pkg\">@AnnotationType</A>(<A HREF=\"../pkg/AnnotationType.html#optional()\">optional</A>=\"Constructor Annotation\","+NL +
" <A HREF=\"../pkg/AnnotationType.html#required()\">required</A>=1994)"+NL +
- "</FONT>public <B>AnnotationTypeUsage</B>()"},
+ "</FONT>public <STRONG>AnnotationTypeUsage</STRONG>()"},
//METHOD
{BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html",
"<FONT SIZE=\"-1\">" +
"<A HREF=\"../pkg/AnnotationType.html\" title=\"annotation in pkg\">@AnnotationType</A>(<A HREF=\"../pkg/AnnotationType.html#optional()\">optional</A>=\"Method Annotation\","+NL +
" <A HREF=\"../pkg/AnnotationType.html#required()\">required</A>=1994)"+NL +
- "</FONT>public void <B>method</B>()"},
+ "</FONT>public void <STRONG>method</STRONG>()"},
//METHOD PARAMS
{BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html",
"<PRE>" + NL +
- "public void <B>methodWithParams</B>(<FONT SIZE=\"-1\"><A HREF=\"../pkg/AnnotationType.html\" title=\"annotation in pkg\">@AnnotationType</A>(<A HREF=\"../pkg/AnnotationType.html#optional()\">optional</A>=\"Parameter Annotation\",<A HREF=\"../pkg/AnnotationType.html#required()\">required</A>=1994)</FONT>" + NL +
+ "public void <STRONG>methodWithParams</STRONG>(<FONT SIZE=\"-1\"><A HREF=\"../pkg/AnnotationType.html\" title=\"annotation in pkg\">@AnnotationType</A>(<A HREF=\"../pkg/AnnotationType.html#optional()\">optional</A>=\"Parameter Annotation\",<A HREF=\"../pkg/AnnotationType.html#required()\">required</A>=1994)</FONT>" + NL +
" int documented," + NL +
" int undocmented)</PRE>"},
//CONSTRUCTOR PARAMS
{BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html",
"<PRE>" + NL +
- "public <B>AnnotationTypeUsage</B>(<FONT SIZE=\"-1\"><A HREF=\"../pkg/AnnotationType.html\" title=\"annotation in pkg\">@AnnotationType</A>(<A HREF=\"../pkg/AnnotationType.html#optional()\">optional</A>=\"Constructor Param Annotation\",<A HREF=\"../pkg/AnnotationType.html#required()\">required</A>=1994)</FONT>" + NL +
+ "public <STRONG>AnnotationTypeUsage</STRONG>(<FONT SIZE=\"-1\"><A HREF=\"../pkg/AnnotationType.html\" title=\"annotation in pkg\">@AnnotationType</A>(<A HREF=\"../pkg/AnnotationType.html#optional()\">optional</A>=\"Constructor Param Annotation\",<A HREF=\"../pkg/AnnotationType.html#required()\">required</A>=1994)</FONT>" + NL +
" int documented," + NL +
" int undocmented)</PRE>"},
@@ -270,7 +270,7 @@
{BUG_ID + FS + "pkg1" + FS + "B.html",
"<PRE><FONT SIZE=\"-1\"><A HREF=\"../pkg1/A.html\" title=\"annotation in pkg1\">@A</A>"},
{BUG_ID + FS + "pkg1" + FS + "B.html",
- "</FONT>public interface <B>B</B></DL>" + NL +
+ "</FONT>public interface <STRONG>B</STRONG></DL>" + NL +
"</PRE>"},
@@ -278,7 +278,7 @@
// Handle multiple bounds.
//==============================================================
{BUG_ID + FS + "pkg" + FS + "MultiTypeParameters.html",
- "public <T extends java.lang.Number & java.lang.Runnable> T <B>foo</B>(T t)"},
+ "public <T extends java.lang.Number & java.lang.Runnable> T <STRONG>foo</STRONG>(T t)"},
//==============================================================
// Test Class-Use Documenation for Type Parameters.
@@ -289,13 +289,13 @@
"<TH ALIGN=\"left\" COLSPAN=\"2\">Classes in <A HREF=\"../../pkg2/package-summary.html\">pkg2</A> with type parameters of type <A HREF=\"../../pkg2/Foo.html\" title=\"class in pkg2\">Foo</A></FONT></TH>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html",
- "<TD><CODE><B><A HREF=\"../../pkg2/ClassUseTest1.html\" title=\"class in pkg2\">ClassUseTest1<T extends Foo & Foo2></A></B></CODE>"
+ "<TD><CODE><STRONG><A HREF=\"../../pkg2/ClassUseTest1.html\" title=\"class in pkg2\">ClassUseTest1<T extends Foo & Foo2></A></STRONG></CODE>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html",
"<TH ALIGN=\"left\" COLSPAN=\"2\">Methods in <A HREF=\"../../pkg2/package-summary.html\">pkg2</A> with type parameters of type <A HREF=\"../../pkg2/Foo.html\" title=\"class in pkg2\">Foo</A></FONT></TH>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html",
- "<TD><CODE><B>ClassUseTest1.</B><B><A HREF=\"../../pkg2/ClassUseTest1.html#method(T)\">method</A></B>(T t)</CODE>"
+ "<TD><CODE><STRONG>ClassUseTest1.</STRONG><STRONG><A HREF=\"../../pkg2/ClassUseTest1.html#method(T)\">method</A></STRONG>(T t)</CODE>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html",
"<TH ALIGN=\"left\" COLSPAN=\"2\">Fields in <A HREF=\"../../pkg2/package-summary.html\">pkg2</A> with type parameters of type <A HREF=\"../../pkg2/Foo.html\" title=\"class in pkg2\">Foo</A></FONT></TH>"
@@ -315,13 +315,13 @@
"<TH ALIGN=\"left\" COLSPAN=\"2\">Classes in <A HREF=\"../../pkg2/package-summary.html\">pkg2</A> with type parameters of type <A HREF=\"../../pkg2/Foo2.html\" title=\"interface in pkg2\">Foo2</A></FONT></TH>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo2.html",
- "<TD><CODE><B><A HREF=\"../../pkg2/ClassUseTest1.html\" title=\"class in pkg2\">ClassUseTest1<T extends Foo & Foo2></A></B></CODE>"
+ "<TD><CODE><STRONG><A HREF=\"../../pkg2/ClassUseTest1.html\" title=\"class in pkg2\">ClassUseTest1<T extends Foo & Foo2></A></STRONG></CODE>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo2.html",
"<TH ALIGN=\"left\" COLSPAN=\"2\">Methods in <A HREF=\"../../pkg2/package-summary.html\">pkg2</A> with type parameters of type <A HREF=\"../../pkg2/Foo2.html\" title=\"interface in pkg2\">Foo2</A></FONT></TH>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo2.html",
- "<TD><CODE><B>ClassUseTest1.</B><B><A HREF=\"../../pkg2/ClassUseTest1.html#method(T)\">method</A></B>(T t)</CODE>"
+ "<TD><CODE><STRONG>ClassUseTest1.</STRONG><STRONG><A HREF=\"../../pkg2/ClassUseTest1.html#method(T)\">method</A></STRONG>(T t)</CODE>"
},
//ClassUseTest2: <T extends ParamTest<Foo3>>
@@ -329,13 +329,13 @@
"<TH ALIGN=\"left\" COLSPAN=\"2\">Classes in <A HREF=\"../../pkg2/package-summary.html\">pkg2</A> with type parameters of type <A HREF=\"../../pkg2/ParamTest.html\" title=\"class in pkg2\">ParamTest</A></FONT></TH>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html",
- "<TD><CODE><B><A HREF=\"../../pkg2/ClassUseTest2.html\" title=\"class in pkg2\">ClassUseTest2<T extends ParamTest<<A HREF=\"../../pkg2/Foo3.html\" title=\"class in pkg2\">Foo3</A>>></A></B></CODE>"
+ "<TD><CODE><STRONG><A HREF=\"../../pkg2/ClassUseTest2.html\" title=\"class in pkg2\">ClassUseTest2<T extends ParamTest<<A HREF=\"../../pkg2/Foo3.html\" title=\"class in pkg2\">Foo3</A>>></A></STRONG></CODE>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html",
"<TH ALIGN=\"left\" COLSPAN=\"2\">Methods in <A HREF=\"../../pkg2/package-summary.html\">pkg2</A> with type parameters of type <A HREF=\"../../pkg2/ParamTest.html\" title=\"class in pkg2\">ParamTest</A></FONT></TH>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html",
- "<TD><CODE><B>ClassUseTest2.</B><B><A HREF=\"../../pkg2/ClassUseTest2.html#method(T)\">method</A></B>(T t)</CODE>"
+ "<TD><CODE><STRONG>ClassUseTest2.</STRONG><STRONG><A HREF=\"../../pkg2/ClassUseTest2.html#method(T)\">method</A></STRONG>(T t)</CODE>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html",
"<TH ALIGN=\"left\" COLSPAN=\"2\">Fields in <A HREF=\"../../pkg2/package-summary.html\">pkg2</A> declared as <A HREF=\"../../pkg2/ParamTest.html\" title=\"class in pkg2\">ParamTest</A></FONT></TH>"
@@ -354,13 +354,13 @@
"<TH ALIGN=\"left\" COLSPAN=\"2\">Classes in <A HREF=\"../../pkg2/package-summary.html\">pkg2</A> with type parameters of type <A HREF=\"../../pkg2/Foo3.html\" title=\"class in pkg2\">Foo3</A></FONT></TH>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html",
- "<TD><CODE><B><A HREF=\"../../pkg2/ClassUseTest2.html\" title=\"class in pkg2\">ClassUseTest2<T extends ParamTest<<A HREF=\"../../pkg2/Foo3.html\" title=\"class in pkg2\">Foo3</A>>></A></B></CODE>"
+ "<TD><CODE><STRONG><A HREF=\"../../pkg2/ClassUseTest2.html\" title=\"class in pkg2\">ClassUseTest2<T extends ParamTest<<A HREF=\"../../pkg2/Foo3.html\" title=\"class in pkg2\">Foo3</A>>></A></STRONG></CODE>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html",
"<TH ALIGN=\"left\" COLSPAN=\"2\">Methods in <A HREF=\"../../pkg2/package-summary.html\">pkg2</A> with type parameters of type <A HREF=\"../../pkg2/Foo3.html\" title=\"class in pkg2\">Foo3</A></FONT></TH>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html",
- "<TD><CODE><B>ClassUseTest2.</B><B><A HREF=\"../../pkg2/ClassUseTest2.html#method(T)\">method</A></B>(T t)</CODE>"
+ "<TD><CODE><STRONG>ClassUseTest2.</STRONG><STRONG><A HREF=\"../../pkg2/ClassUseTest2.html#method(T)\">method</A></STRONG>(T t)</CODE>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html",
"<TH ALIGN=\"left\" COLSPAN=\"2\">Methods in <A HREF=\"../../pkg2/package-summary.html\">pkg2</A> that return types with arguments of type <A HREF=\"../../pkg2/Foo3.html\" title=\"class in pkg2\">Foo3</A></FONT></TH>"
@@ -374,13 +374,13 @@
"<TH ALIGN=\"left\" COLSPAN=\"2\">Classes in <A HREF=\"../../pkg2/package-summary.html\">pkg2</A> with type parameters of type <A HREF=\"../../pkg2/ParamTest2.html\" title=\"class in pkg2\">ParamTest2</A></FONT></TH>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html",
- "<TD><CODE><B><A HREF=\"../../pkg2/ClassUseTest3.html\" title=\"class in pkg2\">ClassUseTest3<T extends ParamTest2<java.util.List<? extends Foo4>>></A></B></CODE>"
+ "<TD><CODE><STRONG><A HREF=\"../../pkg2/ClassUseTest3.html\" title=\"class in pkg2\">ClassUseTest3<T extends ParamTest2<java.util.List<? extends Foo4>>></A></STRONG></CODE>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html",
"<TH ALIGN=\"left\" COLSPAN=\"2\">Methods in <A HREF=\"../../pkg2/package-summary.html\">pkg2</A> with type parameters of type <A HREF=\"../../pkg2/ParamTest2.html\" title=\"class in pkg2\">ParamTest2</A></FONT></TH>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html",
- "<TD><CODE><B>ClassUseTest3.</B><B><A HREF=\"../../pkg2/ClassUseTest3.html#method(T)\">method</A></B>(T t)</CODE>"
+ "<TD><CODE><STRONG>ClassUseTest3.</STRONG><STRONG><A HREF=\"../../pkg2/ClassUseTest3.html#method(T)\">method</A></STRONG>(T t)</CODE>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html",
"<TH ALIGN=\"left\" COLSPAN=\"2\">Methods in <A HREF=\"../../pkg2/package-summary.html\">pkg2</A> with type parameters of type <A HREF=\"../../pkg2/ParamTest2.html\" title=\"class in pkg2\">ParamTest2</A></FONT></TH>"
@@ -393,13 +393,13 @@
"<TH ALIGN=\"left\" COLSPAN=\"2\">Classes in <A HREF=\"../../pkg2/package-summary.html\">pkg2</A> with type parameters of type <A HREF=\"../../pkg2/Foo4.html\" title=\"class in pkg2\">Foo4</A></FONT></TH>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html",
- "<TD><CODE><B><A HREF=\"../../pkg2/ClassUseTest3.html\" title=\"class in pkg2\">ClassUseTest3<T extends ParamTest2<java.util.List<? extends Foo4>>></A></B></CODE>"
+ "<TD><CODE><STRONG><A HREF=\"../../pkg2/ClassUseTest3.html\" title=\"class in pkg2\">ClassUseTest3<T extends ParamTest2<java.util.List<? extends Foo4>>></A></STRONG></CODE>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html",
"<TH ALIGN=\"left\" COLSPAN=\"2\">Methods in <A HREF=\"../../pkg2/package-summary.html\">pkg2</A> with type parameters of type <A HREF=\"../../pkg2/Foo4.html\" title=\"class in pkg2\">Foo4</A></FONT></TH>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html",
- "<TD><CODE><B>ClassUseTest3.</B><B><A HREF=\"../../pkg2/ClassUseTest3.html#method(T)\">method</A></B>(T t)</CODE>"
+ "<TD><CODE><STRONG>ClassUseTest3.</STRONG><STRONG><A HREF=\"../../pkg2/ClassUseTest3.html#method(T)\">method</A></STRONG>(T t)</CODE>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html",
"<TH ALIGN=\"left\" COLSPAN=\"2\">Methods in <A HREF=\"../../pkg2/package-summary.html\">pkg2</A> that return types with arguments of type <A HREF=\"../../pkg2/Foo4.html\" title=\"class in pkg2\">Foo4</A></FONT></TH>"
@@ -415,13 +415,13 @@
"<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL +
"<TD ALIGN=\"right\" VALIGN=\"top\" WIDTH=\"1%\"><FONT SIZE=\"-1\">" + NL +
"<CODE> void</CODE></FONT></TD>" + NL +
- "<TD><CODE><B>ClassUseTest3.</B><B><A HREF=\"../../pkg2/ClassUseTest3.html#method(java.util.Set)\">method</A></B>(java.util.Set<<A HREF=\"../../pkg2/Foo4.html\" title=\"class in pkg2\">Foo4</A>> p)</CODE>"
+ "<TD><CODE><STRONG>ClassUseTest3.</STRONG><STRONG><A HREF=\"../../pkg2/ClassUseTest3.html#method(java.util.Set)\">method</A></STRONG>(java.util.Set<<A HREF=\"../../pkg2/Foo4.html\" title=\"class in pkg2\">Foo4</A>> p)</CODE>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html",
"<TH ALIGN=\"left\" COLSPAN=\"2\">Constructor parameters in <A HREF=\"../../pkg2/package-summary.html\">pkg2</A> with type arguments of type <A HREF=\"../../pkg2/Foo4.html\" title=\"class in pkg2\">Foo4</A></FONT></TH>" + NL +
"</TR>" + NL +
"<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL +
- "<TD><CODE><B><A HREF=\"../../pkg2/ClassUseTest3.html#ClassUseTest3(java.util.Set)\">ClassUseTest3</A></B>(java.util.Set<<A HREF=\"../../pkg2/Foo4.html\" title=\"class in pkg2\">Foo4</A>> p)</CODE>"
+ "<TD><CODE><STRONG><A HREF=\"../../pkg2/ClassUseTest3.html#ClassUseTest3(java.util.Set)\">ClassUseTest3</A></STRONG>(java.util.Set<<A HREF=\"../../pkg2/Foo4.html\" title=\"class in pkg2\">Foo4</A>> p)</CODE>"
},
//=================================
@@ -432,7 +432,7 @@
"Packages with annotations of type <A HREF=\"../../pkg/AnnotationType.html\" title=\"annotation in pkg\">AnnotationType</A></FONT></TH>" + NL +
"</TR>" + NL +
"<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL +
- "<TD><A HREF=\"../../pkg/package-summary.html\"><B>pkg</B></A></TD>"
+ "<TD><A HREF=\"../../pkg/package-summary.html\"><STRONG>pkg</STRONG></A></TD>"
},
{BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html",
@@ -441,7 +441,7 @@
"<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL +
"<TD ALIGN=\"right\" VALIGN=\"top\" WIDTH=\"1%\"><FONT SIZE=\"-1\">" + NL +
"<CODE> class</CODE></FONT></TD>" + NL +
- "<TD><CODE><B><A HREF=\"../../pkg/AnnotationTypeUsage.html\" title=\"class in pkg\">AnnotationTypeUsage</A></B></CODE>"
+ "<TD><CODE><STRONG><A HREF=\"../../pkg/AnnotationTypeUsage.html\" title=\"class in pkg\">AnnotationTypeUsage</A></STRONG></CODE>"
},
{BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html",
@@ -450,7 +450,7 @@
"<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL +
"<TD ALIGN=\"right\" VALIGN=\"top\" WIDTH=\"1%\"><FONT SIZE=\"-1\">" + NL +
"<CODE> int</CODE></FONT></TD>" + NL +
- "<TD><CODE><B>AnnotationTypeUsage.</B><B><A HREF=\"../../pkg/AnnotationTypeUsage.html#field\">field</A></B></CODE>"
+ "<TD><CODE><STRONG>AnnotationTypeUsage.</STRONG><STRONG><A HREF=\"../../pkg/AnnotationTypeUsage.html#field\">field</A></STRONG></CODE>"
},
{BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html",
@@ -459,7 +459,7 @@
"<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL +
"<TD ALIGN=\"right\" VALIGN=\"top\" WIDTH=\"1%\"><FONT SIZE=\"-1\">" + NL +
"<CODE> void</CODE></FONT></TD>" + NL +
- "<TD><CODE><B>AnnotationTypeUsage.</B><B><A HREF=\"../../pkg/AnnotationTypeUsage.html#method()\">method</A></B>()</CODE>"
+ "<TD><CODE><STRONG>AnnotationTypeUsage.</STRONG><STRONG><A HREF=\"../../pkg/AnnotationTypeUsage.html#method()\">method</A></STRONG>()</CODE>"
},
{BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html",
@@ -468,7 +468,7 @@
"<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL +
"<TD ALIGN=\"right\" VALIGN=\"top\" WIDTH=\"1%\"><FONT SIZE=\"-1\">" + NL +
"<CODE> void</CODE></FONT></TD>" + NL +
- "<TD><CODE><B>AnnotationTypeUsage.</B><B><A HREF=\"../../pkg/AnnotationTypeUsage.html#methodWithParams(int, int)\">methodWithParams</A></B>(int documented," + NL +
+ "<TD><CODE><STRONG>AnnotationTypeUsage.</STRONG><STRONG><A HREF=\"../../pkg/AnnotationTypeUsage.html#methodWithParams(int, int)\">methodWithParams</A></STRONG>(int documented," + NL +
" int undocmented)</CODE>"
},
@@ -476,14 +476,14 @@
"Constructors in <A HREF=\"../../pkg/package-summary.html\">pkg</A> with annotations of type <A HREF=\"../../pkg/AnnotationType.html\" title=\"annotation in pkg\">AnnotationType</A></FONT></TH>" + NL +
"</TR>" + NL +
"<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL +
- "<TD><CODE><B><A HREF=\"../../pkg/AnnotationTypeUsage.html#AnnotationTypeUsage()\">AnnotationTypeUsage</A></B>()</CODE>"
+ "<TD><CODE><STRONG><A HREF=\"../../pkg/AnnotationTypeUsage.html#AnnotationTypeUsage()\">AnnotationTypeUsage</A></STRONG>()</CODE>"
},
{BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html",
"Constructor parameters in <A HREF=\"../../pkg/package-summary.html\">pkg</A> with annotations of type <A HREF=\"../../pkg/AnnotationType.html\" title=\"annotation in pkg\">AnnotationType</A></FONT></TH>" + NL +
"</TR>" + NL +
"<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL +
- "<TD><CODE><B><A HREF=\"../../pkg/AnnotationTypeUsage.html#AnnotationTypeUsage(int, int)\">AnnotationTypeUsage</A></B>(int documented," + NL +
+ "<TD><CODE><STRONG><A HREF=\"../../pkg/AnnotationTypeUsage.html#AnnotationTypeUsage(int, int)\">AnnotationTypeUsage</A></STRONG>(int documented," + NL +
" int undocmented)</CODE>"
},
@@ -491,13 +491,13 @@
// TYPE PARAMETER IN INDEX
//=================================
{BUG_ID + FS + "index-all.html",
- "<A HREF=\"./pkg2/Foo.html#method(java.util.Vector)\"><B>method(Vector<Object>)</B></A>"
+ "<A HREF=\"./pkg2/Foo.html#method(java.util.Vector)\"><STRONG>method(Vector<Object>)</STRONG></A>"
},
//=================================
// TYPE PARAMETER IN INDEX
//=================================
{BUG_ID + FS + "index-all.html",
- "<A HREF=\"./pkg2/Foo.html#method(java.util.Vector)\"><B>method(Vector<Object>)</B></A>"
+ "<A HREF=\"./pkg2/Foo.html#method(java.util.Vector)\"><STRONG>method(Vector<Object>)</STRONG></A>"
},
};
private static final String[][] NEGATED_TEST = {
@@ -505,7 +505,7 @@
// ENUM TESTING
//=================================
//NO constructor section
- {BUG_ID + FS + "pkg" + FS + "Coin.html", "<B>Constructor Summary</B>"},
+ {BUG_ID + FS + "pkg" + FS + "Coin.html", "<STRONG>Constructor Summary</STRONG>"},
//=================================
// TYPE PARAMETER TESTING
//=================================
@@ -525,28 +525,28 @@
"<FONT SIZE=\"-1\">" + NL +
"<A HREF=\"../pkg/AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</A>(<A HREF=\"../pkg/AnnotationType.html#optional\">optional</A>=\"Class Annotation\"," + NL +
" <A HREF=\"../pkg/AnnotationType.html#required\">required</A>=1994)" + NL +
- "</FONT>public class <B>AnnotationTypeUsage</B><DT>extends java.lang.Object</DL>"},
+ "</FONT>public class <STRONG>AnnotationTypeUsage</STRONG><DT>extends java.lang.Object</DL>"},
//FIELD
{BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html",
"<FONT SIZE=\"-1\">" + NL +
"<A HREF=\"../pkg/AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</A>(<A HREF=\"../pkg/AnnotationType.html#optional\">optional</A>=\"Field Annotation\"," + NL +
" <A HREF=\"../pkg/AnnotationType.html#required\">required</A>=1994)" + NL +
- "</FONT>public int <B>field</B>"},
+ "</FONT>public int <STRONG>field</STRONG>"},
//CONSTRUCTOR
{BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html",
"<FONT SIZE=\"-1\">" + NL +
"<A HREF=\"../pkg/AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</A>(<A HREF=\"../pkg/AnnotationType.html#optional\">optional</A>=\"Constructor Annotation\"," + NL +
" <A HREF=\"../pkg/AnnotationType.html#required\">required</A>=1994)" + NL +
- "</FONT>public <B>AnnotationTypeUsage</B>()"},
+ "</FONT>public <STRONG>AnnotationTypeUsage</STRONG>()"},
//METHOD
{BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html",
"<FONT SIZE=\"-1\">" + NL +
"<A HREF=\"../pkg/AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</A>(<A HREF=\"../pkg/AnnotationType.html#optional\">optional</A>=\"Method Annotation\"," + NL +
" <A HREF=\"../pkg/AnnotationType.html#required\">required</A>=1994)" + NL +
- "</FONT>public void <B>method</B>()"},
+ "</FONT>public void <STRONG>method</STRONG>()"},
//=================================
// Make sure annotation types do not
diff -r 952b42dad1fc -r 28000d78abfa langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenMethodDocCopy.java
--- a/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenMethodDocCopy.java Mon Jan 26 12:07:54 2009 -0800
+++ b/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenMethodDocCopy.java Mon Feb 09 13:47:26 2009 -0800
@@ -46,9 +46,9 @@
//Input for string search tests.
private static final String[][] TEST = {
{BUG_ID + FS + "pkg1" + FS + "SubClass.html",
- "<B>Description copied from class: <CODE>" +
+ "<STRONG>Description copied from class: <CODE>" +
"<A HREF=\"../pkg1/BaseClass.html#overridenMethodWithDocsToCopy()\">" +
- "BaseClass</A></CODE></B>"
+ "BaseClass</A></CODE></STRONG>"
}
};
private static final String[][] NEGATED_TEST = NO_TEST;
diff -r 952b42dad1fc -r 28000d78abfa langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethods.java
--- a/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethods.java Mon Jan 26 12:07:54 2009 -0800
+++ b/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethods.java Mon Feb 09 13:47:26 2009 -0800
@@ -40,11 +40,11 @@
private static final String[][] TEST = {
//The public method should be overriden
{BUG_ID + FS + "pkg1" + FS + "SubClass.html",
- "Overrides:</B><DD><CODE><A HREF=\"../pkg1/BaseClass.html#publicMethod"},
+ "Overrides:</STRONG><DD><CODE><A HREF=\"../pkg1/BaseClass.html#publicMethod"},
//The public method in different package should be overriden
{BUG_ID + FS + "pkg2" + FS + "SubClass.html",
- "Overrides:</B><DD><CODE><A HREF=\"../pkg1/BaseClass.html#publicMethod"}
+ "Overrides:</STRONG><DD><CODE><A HREF=\"../pkg1/BaseClass.html#publicMethod"}
};
private static final String[][] NEGATED_TEST = {
@@ -52,20 +52,20 @@
//The package private method should be overriden since the base and sub class are in the same
//package. However, the link should not show up because the package private methods are not documented.
{BUG_ID + FS + "pkg1" + FS + "SubClass.html",
- "Overrides:</B><DD><CODE><A HREF=\"../pkg1/BaseClass.html#packagePrivateMethod"},
+ "Overrides:</STRONG><DD><CODE><A HREF=\"../pkg1/BaseClass.html#packagePrivateMethod"},
//The private method in should not be overriden
{BUG_ID + FS + "pkg1" + FS + "SubClass.html",
- "Overrides:</B><DD><CODE><A HREF=\"../pkg1/BaseClass.html#privateMethod"},
+ "Overrides:</STRONG><DD><CODE><A HREF=\"../pkg1/BaseClass.html#privateMethod"},
//The private method in different package should not be overriden
{BUG_ID + FS + "pkg2" + FS + "SubClass.html",
- "Overrides:</B><DD><CODE><A HREF=\"../pkg1/BaseClass.html#privateMethod"},
+ "Overrides:</STRONG><DD><CODE><A HREF=\"../pkg1/BaseClass.html#privateMethod"},
//The package private method should not be overriden since the base and sub class are in
//different packages.
{BUG_ID + FS + "pkg2" + FS + "SubClass.html",
- "Overrides:</B><DD><CODE><A HREF=\"../pkg1/BaseClass.html#packagePrivateMethod"}
+ "Overrides:</STRONG><DD><CODE><A HREF=\"../pkg1/BaseClass.html#packagePrivateMethod"}
};
private static final String[] ARGS =
diff -r 952b42dad1fc -r 28000d78abfa langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPackageFlag.java
--- a/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPackageFlag.java Mon Jan 26 12:07:54 2009 -0800
+++ b/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPackageFlag.java Mon Feb 09 13:47:26 2009 -0800
@@ -40,32 +40,32 @@
private static final String[][] TEST = {
//The public method should be overriden
{BUG_ID + FS + "pkg1" + FS + "SubClass.html",
- "Overrides:</B><DD><CODE><A HREF=\"../pkg1/BaseClass.html#publicMethod"},
+ "Overrides:</STRONG><DD><CODE><A HREF=\"../pkg1/BaseClass.html#publicMethod"},
//The public method in different package should be overriden
{BUG_ID + FS + "pkg2" + FS + "SubClass.html",
- "Overrides:</B><DD><CODE><A HREF=\"../pkg1/BaseClass.html#publicMethod"},
+ "Overrides:</STRONG><DD><CODE><A HREF=\"../pkg1/BaseClass.html#publicMethod"},
//The package private method should be overriden since the base and sub class are in the same
//package.
{BUG_ID + FS + "pkg1" + FS + "SubClass.html",
- "Overrides:</B><DD><CODE><A HREF=\"../pkg1/BaseClass.html#packagePrivateMethod"}
+ "Overrides:</STRONG><DD><CODE><A HREF=\"../pkg1/BaseClass.html#packagePrivateMethod"}
};
private static final String[][] NEGATED_TEST = {
//The private method in should not be overriden
{BUG_ID + FS + "pkg1" + FS + "SubClass.html",
- "Overrides:</B><DD><CODE><A HREF=\"../pkg1/BaseClass.html#privateMethod"},
+ "Overrides:</STRONG><DD><CODE><A HREF=\"../pkg1/BaseClass.html#privateMethod"},
//The private method in different package should not be overriden
{BUG_ID + FS + "pkg2" + FS + "SubClass.html",
- "Overrides:</B><DD><CODE><A HREF=\"../pkg1/BaseClass.html#privateMethod"},
+ "Overrides:</STRONG><DD><CODE><A HREF=\"../pkg1/BaseClass.html#privateMethod"},
//The package private method should not be overriden since the base and sub class are in
//different packages.
{BUG_ID + FS + "pkg2" + FS + "SubClass.html",
- "Overrides:</B><DD><CODE><A HREF=\"../pkg1/BaseClass.html#packagePrivateMethod"},
+ "Overrides:</STRONG><DD><CODE><A HREF=\"../pkg1/BaseClass.html#packagePrivateMethod"},
};
private static final String[] ARGS =
diff -r 952b42dad1fc -r 28000d78abfa langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPrivateFlag.java
--- a/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPrivateFlag.java Mon Jan 26 12:07:54 2009 -0800
+++ b/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPrivateFlag.java Mon Feb 09 13:47:26 2009 -0800
@@ -40,32 +40,32 @@
private static final String[][] TEST = {
//The public method should be overriden
{BUG_ID + FS + "pkg1" + FS + "SubClass.html",
- "Overrides:</B><DD><CODE><A HREF=\"../pkg1/BaseClass.html#publicMethod"},
+ "Overrides:</STRONG><DD><CODE><A HREF=\"../pkg1/BaseClass.html#publicMethod"},
//The package private method should be overriden since the base and sub class are in the same
//package.
{BUG_ID + FS + "pkg1" + FS + "SubClass.html",
- "Overrides:</B><DD><CODE><A HREF=\"../pkg1/BaseClass.html#packagePrivateMethod"},
+ "Overrides:</STRONG><DD><CODE><A HREF=\"../pkg1/BaseClass.html#packagePrivateMethod"},
//The public method in different package should be overriden
{BUG_ID + FS + "pkg2" + FS + "SubClass.html",
- "Overrides:</B><DD><CODE><A HREF=\"../pkg1/BaseClass.html#publicMethod"},
+ "Overrides:</STRONG><DD><CODE><A HREF=\"../pkg1/BaseClass.html#publicMethod"},
};
private static final String[][] NEGATED_TEST = {
//The private method in should not be overriden
{BUG_ID + FS + "pkg1" + FS + "SubClass.html",
- "Overrides:</B><DD><CODE><A HREF=\"../pkg1/BaseClass.html#privateMethod"},
+ "Overrides:</STRONG><DD><CODE><A HREF=\"../pkg1/BaseClass.html#privateMethod"},
//The private method in different package should not be overriden
{BUG_ID + FS + "pkg2" + FS + "SubClass.html",
- "Overrides:</B><DD><CODE><A HREF=\"../pkg1/BaseClass.html#privateMethod"},
+ "Overrides:</STRONG><DD><CODE><A HREF=\"../pkg1/BaseClass.html#privateMethod"},
//The package private method should not be overriden since the base and sub class are in
//different packages.
{BUG_ID + FS + "pkg2" + FS + "SubClass.html",
- "Overrides:</B><DD><CODE><A HREF=\"../pkg1/BaseClass.html#packagePrivateMethod"}
+ "Overrides:</STRONG><DD><CODE><A HREF=\"../pkg1/BaseClass.html#packagePrivateMethod"}
};
diff -r 952b42dad1fc -r 28000d78abfa langtools/test/com/sun/javadoc/testPackagePage/TestPackagePage.java
--- a/langtools/test/com/sun/javadoc/testPackagePage/TestPackagePage.java Mon Jan 26 12:07:54 2009 -0800
+++ b/langtools/test/com/sun/javadoc/testPackagePage/TestPackagePage.java Mon Feb 09 13:47:26 2009 -0800
@@ -43,23 +43,24 @@
},
//With just one package, all general pages link to the single package page.
{BUG_ID + "-1" + FS + "com" + FS + "pkg" + FS + "C.html",
- "<A HREF=\"../../com/pkg/package-summary.html\">" +
"<FONT CLASS=\"NavBarFont1\"><B>Package</B></FONT></A>"
+ "<A HREF=\"../../com/pkg/package-summary.html\">" +
+ "<FONT CLASS=\"NavBarFont1\"><STRONG>Package</STRONG></FONT></A>"
},
{BUG_ID + "-1" + FS + "com" + FS + "pkg" + FS + "package-tree.html",
"<A HREF=\"../../com/pkg/package-summary.html\">" +
- "<FONT CLASS=\"NavBarFont1\"><B>Package</B></FONT></A>"
+ "<FONT CLASS=\"NavBarFont1\"><STRONG>Package</STRONG></FONT></A>"
},
{BUG_ID + "-1" + FS + "deprecated-list.html",
"<A HREF=\"com/pkg/package-summary.html\">" +
- "<FONT CLASS=\"NavBarFont1\"><B>Package</B></FONT></A>"
+ "<FONT CLASS=\"NavBarFont1\"><STRONG>Package</STRONG></FONT></A>"
},
{BUG_ID + "-1" + FS + "index-all.html",
"<A HREF=\"./com/pkg/package-summary.html\">" +
- "<FONT CLASS=\"NavBarFont1\"><B>Package</B></FONT></A>"
+ "<FONT CLASS=\"NavBarFont1\"><STRONG>Package</STRONG></FONT></A>"
},
{BUG_ID + "-1" + FS + "help-doc.html",
"<A HREF=\"com/pkg/package-summary.html\">" +
- "<FONT CLASS=\"NavBarFont1\"><B>Package</B></FONT></A>"
+ "<FONT CLASS=\"NavBarFont1\"><STRONG>Package</STRONG></FONT></A>"
},
};
diff -r 952b42dad1fc -r 28000d78abfa langtools/test/com/sun/javadoc/testParamTaglet/TestParamTaglet.java
--- a/langtools/test/com/sun/javadoc/testParamTaglet/TestParamTaglet.java Mon Jan 26 12:07:54 2009 -0800
+++ b/langtools/test/com/sun/javadoc/testParamTaglet/TestParamTaglet.java Mon Feb 09 13:47:26 2009 -0800
@@ -48,12 +48,12 @@
private static final String[][] TEST = {
//Regular param tags.
{BUG_ID + FS + "pkg" + FS + "C.html",
- "<B>Parameters:</B><DD><CODE>param1</CODE> - testing 1 2 3." +
+ "<STRONG>Parameters:</STRONG><DD><CODE>param1</CODE> - testing 1 2 3." +
"<DD><CODE>param2</CODE> - testing 1 2 3."
},
//Param tags that don't match with any real parameters.
{BUG_ID + FS + "pkg" + FS + "C.html",
- "<B>Parameters:</B><DD><CODE><I>p1</I></CODE> - testing 1 2 3." +
+ "<STRONG>Parameters:</STRONG><DD><CODE><I>p1</I></CODE> - testing 1 2 3." +
"<DD><CODE><I>p2</I></CODE> - testing 1 2 3."
},
//{@inherit} doc misuse does not cause doclet to throw exception.
diff -r 952b42dad1fc -r 28000d78abfa langtools/test/com/sun/javadoc/testPrivateClasses/TestPrivateClasses.java
--- a/langtools/test/com/sun/javadoc/testPrivateClasses/TestPrivateClasses.java Mon Jan 26 12:07:54 2009 -0800
+++ b/langtools/test/com/sun/javadoc/testPrivateClasses/TestPrivateClasses.java Mon Feb 09 13:47:26 2009 -0800
@@ -85,22 +85,22 @@
"<PRE>" + NL +
"java.lang.Object" + NL +
" <IMG SRC=\"../resources/inherit.gif\" " +
- "ALT=\"extended by \"><B>pkg.PublicChild</B>" + NL +
+ "ALT=\"extended by \"><STRONG>pkg.PublicChild</STRONG>" + NL +
"</PRE>"
},
// Method is documented as though it is declared in the inheriting method.
{BUG_ID + "-1" + FS + "pkg" + FS + "PublicChild.html",
- "public void <B>methodInheritedFromParent</B>(int p1)"
+ "public void <STRONG>methodInheritedFromParent</STRONG>(int p1)"
},
//Make sure implemented interfaces from private superclass are inherited
{BUG_ID + "-1" + FS + "pkg" + FS + "PublicInterface.html",
- "<B>All Known Implementing Classes:</B> <DD><A HREF=\"../pkg/PublicChild.html\" " +
+ "<STRONG>All Known Implementing Classes:</STRONG> <DD><A HREF=\"../pkg/PublicChild.html\" " +
"title=\"class in pkg\">PublicChild</A>"},
{BUG_ID + "-1" + FS + "pkg" + FS + "PublicChild.html",
- "<B>All Implemented Interfaces:</B> <DD><A HREF=\"../pkg/PublicInterface.html\" " +
+ "<STRONG>All Implemented Interfaces:</STRONG> <DD><A HREF=\"../pkg/PublicInterface.html\" " +
"title=\"interface in pkg\">PublicInterface</A>"},
//Generic interface method test.
@@ -110,12 +110,12 @@
private static final String[][] NEGATED_TEST1 = {
// Should not document that a method overrides method from private class.
{BUG_ID + "-1" + FS + "pkg" + FS + "PublicChild.html",
- "<B>Overrides:</B>"},
+ "<STRONG>Overrides:</STRONG>"},
// Should not document that a method specified by private interface.
{BUG_ID + "-1" + FS + "pkg" + FS + "PublicChild.html",
- "<B>Specified by:</B>"},
+ "<STRONG>Specified by:</STRONG>"},
{BUG_ID + "-1" + FS + "pkg" + FS + "PublicInterface.html",
- "<B>Specified by:</B>"},
+ "<STRONG>Specified by:</STRONG>"},
// Should not mention that any documentation was copied.
{BUG_ID + "-1" + FS + "pkg" + FS + "PublicChild.html",
"Description copied from"},
@@ -137,7 +137,7 @@
//Do not inherit private interface method with generic parameters.
//This method has been implemented.
{BUG_ID + "-1" + FS + "pkg2" + FS + "C.html",
- "<B><A HREF=\"../pkg2/I.html#hello(T)\">hello</A></B>"},
+ "<STRONG><A HREF=\"../pkg2/I.html#hello(T)\">hello</A></STRONG>"},
};
// Test output when -private flag is used.
@@ -174,14 +174,14 @@
},
// Should document that a method overrides method from private class.
{BUG_ID + "-2" + FS + "pkg" + FS + "PublicChild.html",
- "<B>Overrides:</B><DD><CODE>" +
+ "<STRONG>Overrides:</STRONG><DD><CODE>" +
"<A HREF=\"../pkg/PrivateParent.html#methodOverridenFromParent(char[], int, T, V, java.util.List)\">" +
"methodOverridenFromParent</A></CODE> in class <CODE>" +
"<A HREF=\"../pkg/PrivateParent.html\" title=\"class in pkg\">" +
"PrivateParent</A></CODE></DL>"},
// Should document that a method is specified by private interface.
{BUG_ID + "-2" + FS + "pkg" + FS + "PublicChild.html",
- "<B>Specified by:</B><DD><CODE>" +
+ "<STRONG>Specified by:</STRONG><DD><CODE>" +
"<A HREF=\"../pkg/PrivateInterface.html#methodInterface(int)\">" +
"methodInterface</A></CODE> in interface <CODE>" +
"<A HREF=\"../pkg/PrivateInterface.html\" title=\"interface in pkg\">" +
@@ -209,12 +209,12 @@
//Make sure implemented interfaces from private superclass are inherited
{BUG_ID + "-2" + FS + "pkg" + FS + "PublicInterface.html",
- "<B>All Known Implementing Classes:</B> <DD><A HREF=\"../pkg/PrivateParent.html\" " +
+ "<STRONG>All Known Implementing Classes:</STRONG> <DD><A HREF=\"../pkg/PrivateParent.html\" " +
"title=\"class in pkg\">PrivateParent</A>, " +
"<A HREF=\"../pkg/PublicChild.html\" title=\"class in pkg\">PublicChild</A>"},
{BUG_ID + "-2" + FS + "pkg" + FS + "PublicChild.html",
- "<B>All Implemented Interfaces:</B> <DD><A HREF=\"../pkg/PrivateInterface.html\" " +
+ "<STRONG>All Implemented Interfaces:</STRONG> <DD><A HREF=\"../pkg/PrivateInterface.html\" " +
"title=\"interface in pkg\">PrivateInterface</A>, " +
"<A HREF=\"../pkg/PublicInterface.html\" title=\"interface in pkg\">" +
"PublicInterface</A>"},
@@ -222,10 +222,13 @@
//Since private flag is used, we can document that private interface method
//with generic parameters has been implemented.
{BUG_ID + "-2" + FS + "pkg2" + FS + "C.html",
- "<B>Description copied from interface: " +
"<CODE><A HREF=\"../pkg2/I.html#hello(T)\">I</A></CODE></B>"},
+ "<STRONG>Description copied from interface: " +
+ "<CODE><A HREF=\"../pkg2/I.html#hello(T)\">I</A></CODE></STRONG>"},
{BUG_ID + "-2" + FS + "pkg2" + FS + "C.html",
- "<B>Specified by:</B><DD><CODE><A HREF=\"../pkg2/I.html#hello(T)\">" +
"hello</A></CODE> in interface <CODE><A HREF=\"../pkg2/I.html\" " +
"title=\"interface in pkg2\">I</A>"},
+ "<STRONG>Specified by:</STRONG><DD><CODE><A HREF=\"../pkg2/I.html#hello(T)\">" +
+ "hello</A></CODE> in interface <CODE><A HREF=\"../pkg2/I.html\" " +
+ "title=\"interface in pkg2\">I</A>"},
};
private static final String[][] NEGATED_TEST2 = NO_TEST;
diff -r 952b42dad1fc -r 28000d78abfa langtools/test/com/sun/javadoc/testSerializedForm/TestSerializedForm.java
--- a/langtools/test/com/sun/javadoc/testSerializedForm/TestSerializedForm.java Mon Jan 26 12:07:54 2009 -0800
+++ b/langtools/test/com/sun/javadoc/testSerializedForm/TestSerializedForm.java Mon Feb 09 13:47:26 2009 -0800
@@ -47,11 +47,11 @@
private static final String[][] TEST = {
{BUG_ID + FS + "serialized-form.html",
- "protected java.lang.Object <B>readResolve</B>()"},
+ "protected java.lang.Object <STRONG>readResolve</STRONG>()"},
{BUG_ID + FS + "serialized-form.html",
- "protected java.lang.Object <B>writeReplace</B>()"},
+ "protected java.lang.Object <STRONG>writeReplace</STRONG>()"},
{BUG_ID + FS + "serialized-form.html",
- "protected java.lang.Object <B>readObjectNoData</B>()"},
+ "protected java.lang.Object <STRONG>readObjectNoData</STRONG>()"},
{BUG_ID + FS + "serialized-form.html",
"See Also"},
};
diff -r 952b42dad1fc -r 28000d78abfa langtools/test/com/sun/javadoc/testSimpleTag/TestSimpleTag.java
--- a/langtools/test/com/sun/javadoc/testSimpleTag/TestSimpleTag.java Mon Jan 26 12:07:54 2009 -0800
+++ b/langtools/test/com/sun/javadoc/testSimpleTag/TestSimpleTag.java Mon Feb 09 13:47:26 2009 -0800
@@ -42,13 +42,13 @@
private static final String[][] TEST =
new String[][] {
{"./" + BUG_ID + "/C.html",
- "<B>Todo:</B>"},
+ "<STRONG>Todo:</STRONG>"},
{"./" + BUG_ID + "/C.html",
- "<B>EJB Beans:</B>"},
+ "<STRONG>EJB Beans:</STRONG>"},
{"./" + BUG_ID + "/C.html",
- "<B>Regular Tag:</B>"},
+ "<STRONG>Regular Tag:</STRONG>"},
{"./" + BUG_ID + "/C.html",
- "<B>Back-Slash-Tag:</B>"},
+ "<STRONG>Back-Slash-Tag:</STRONG>"},
};
private static final String[] ARGS = new String[] {
diff -r 952b42dad1fc -r 28000d78abfa langtools/test/com/sun/javadoc/testSummaryHeading/TestSummaryHeading.java
--- a/langtools/test/com/sun/javadoc/testSummaryHeading/TestSummaryHeading.java Mon Jan 26 12:07:54 2009 -0800
+++ b/langtools/test/com/sun/javadoc/testSummaryHeading/TestSummaryHeading.java Mon Feb 09 13:47:26 2009 -0800
@@ -46,7 +46,7 @@
//Input for string search tests.
private static final String[][] TEST = {
- {BUG_ID + FS + "C.html", "<B>Method Summary</B>"}
+ {BUG_ID + FS + "C.html", "<STRONG>Method Summary</STRONG>"}
};
private static final String[][] NEGATED_TEST = NO_TEST;
diff -r 952b42dad1fc -r 28000d78abfa langtools/test/com/sun/javadoc/testThrowsHead/TestThrowsHead.java
--- a/langtools/test/com/sun/javadoc/testThrowsHead/TestThrowsHead.java Mon Jan 26 12:07:54 2009 -0800
+++ b/langtools/test/com/sun/javadoc/testThrowsHead/TestThrowsHead.java Mon Feb 09 13:47:26 2009 -0800
@@ -38,7 +38,7 @@
private static final String BUG_ID = "4530727";
private static final String[][] TEST = {
- {BUG_ID + FS + "C.html", "<DT><B>Throws:</B>"}
+ {BUG_ID + FS + "C.html", "<DT><STRONG>Throws:</STRONG>"}
};
private static final String[][] NEGATED_TEST = NO_TEST;
private static final String[] ARGS = new String[] {
diff -r 952b42dad1fc -r 28000d78abfa langtools/test/com/sun/javadoc/testValueTag/TestValueTag.java
--- a/langtools/test/com/sun/javadoc/testValueTag/TestValueTag.java Mon Jan 26 12:07:54 2009 -0800
+++ b/langtools/test/com/sun/javadoc/testValueTag/TestValueTag.java Mon Feb 09 13:47:26 2009 -0800
@@ -88,7 +88,7 @@
"Result: <A HREF=\"../pkg2/Class3.html#TEST_17_PASSES\">\"Test 17 passes\"</A>"},
//Test @value tag used with custom tag.
{BUG_ID + FS + "pkg1" + FS + "CustomTagUsage.html",
- "<DT><B>Todo:</B></DT>" + NL +
+ "<DT><STRONG>Todo:</STRONG></DT>" + NL +
" <DD>the value of this constant is 55.</DD>"},
//Test @value warning printed when used with non-constant.
{WARNING_OUTPUT,"warning - @value tag (which references nonConstant) " +
diff -r 952b42dad1fc -r 28000d78abfa langtools/test/tools/javac/cast/6558559/T6558559a.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/cast/6558559/T6558559a.java Mon Feb 09 13:47:26 2009 -0800
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6558559
+ * @summary Extra "unchecked" diagnostic
+ * @author Maurizio Cimadamore
+ *
+ * @compile T6558559a.java -Xlint:unchecked -Werror
+ */
+
+class T6558559a {
+ interface A<T> {}
+
+ static class B<T> {}
+
+ A<?> x = null;
+ B<?> y = (B<?>)x;
+}
\ No newline at end of file
diff -r 952b42dad1fc -r 28000d78abfa langtools/test/tools/javac/cast/6558559/T6558559b.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/cast/6558559/T6558559b.java Mon Feb 09 13:47:26 2009 -0800
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6558559
+ * @summary Extra "unchecked" diagnostic
+ * @author Maurizio Cimadamore
+ *
+ * @compile T6558559b.java -Xlint:unchecked -Werror
+ */
+
+import java.util.*;
+
+class T6558559b {
+ void test(List rawList, List<?> unboundList) {
+ Throwable t0 = (Throwable) Collections.emptyList();
+ Throwable t1 = (Throwable) rawList;
+ Throwable t2 = (Throwable) unboundList;
+ Object o = unboundList;
+ Throwable t3 = (Throwable) o;
+ }
+}
\ No newline at end of file
diff -r 952b42dad1fc -r 28000d78abfa langtools/test/tools/javac/cast/6665356/T6665356.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/cast/6665356/T6665356.java Mon Feb 09 13:47:26 2009 -0800
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @author Maurizio Cimadamore
+ * @bug 6665356
+ * @summary Cast not allowed when both qualifying type and inner class are parameterized
+ * @compile/fail/ref=T6665356.out -XDrawDiagnostics T6665356.java
+ */
+
+class T6665356 {
+ class Outer<S> {
+ class Inner<T> {}
+ }
+
+ void cast1(Outer<Integer>.Inner<Long> p) {
+ Object o = (Outer<Integer>.Inner<Long>)p;
+ }
+
+ void cast2(Outer<Integer>.Inner<Long> p) {
+ Object o = (Outer<? extends Number>.Inner<Long>)p;
+ }
+
+ void cast3(Outer<Integer>.Inner<Long> p) {
+ Object o = (Outer<Integer>.Inner<? extends Number>)p;
+ }
+
+ void cast4(Outer<Integer>.Inner<Long> p) {
+ Object o = (Outer<? extends Number>.Inner<? extends Number>)p;
+ }
+
+ void cast5(Outer<Integer>.Inner<Long> p) {
+ Object o = (Outer<? super Number>.Inner<Long>)p;
+ }
+
+ void cast6(Outer<Integer>.Inner<Long> p) {
+ Object o = (Outer<Integer>.Inner<? super Number>)p;
+ }
+
+ void cast7(Outer<Integer>.Inner<Long> p) {
+ Object o = (Outer<? super Number>.Inner<? super Number>)p;
+ }
+
+ void cast8(Outer<Integer>.Inner<Long> p) {
+ Object o = (Outer<? extends String>.Inner<Long>)p;
+ }
+
+ void cast9(Outer<Integer>.Inner<Long> p) {
+ Object o = (Outer<Integer>.Inner<? extends String>)p;
+ }
+
+ void cast10(Outer<Integer>.Inner<Long> p) {
+ Object o = (Outer<? super String>.Inner<Long>)p;
+ }
+
+ void cast11(Outer<Integer>.Inner<Long> p) {
+ Object o = (Outer<Integer>.Inner<? super String>)p;
+ }
+}
\ No newline at end of file
diff -r 952b42dad1fc -r 28000d78abfa langtools/test/tools/javac/cast/6665356/T6665356.out
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/cast/6665356/T6665356.out Mon Feb 09 13:47:26 2009 -0800
@@ -0,0 +1,8 @@
+T6665356.java:54:55: compiler.err.prob.found.req: (- compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<? super java.lang.Number>.Inner<java.lang.Long>
+T6665356.java:58:58: compiler.err.prob.found.req: (- compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<java.lang.Integer>.Inner<? super java.lang.Number>
+T6665356.java:62:65: compiler.err.prob.found.req: (- compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<? super java.lang.Number>.Inner<? super java.lang.Number>
+T6665356.java:66:57: compiler.err.prob.found.req: (- compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<? extends java.lang.String>.Inner<java.lang.Long>
+T6665356.java:70:60: compiler.err.prob.found.req: (- compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<java.lang.Integer>.Inner<? extends java.lang.String>
+T6665356.java:74:55: compiler.err.prob.found.req: (- compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<? super java.lang.String>.Inner<java.lang.Long>
+T6665356.java:78:58: compiler.err.prob.found.req: (- compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<java.lang.Integer>.Inner<? super java.lang.String>
+7 errors
\ No newline at end of file
diff -r 952b42dad1fc -r 28000d78abfa langtools/test/tools/javac/generics/6723444/T6723444.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/generics/6723444/T6723444.java Mon Feb 09 13:47:26 2009 -0800
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6723444
+ *
+ * @summary javac fails to substitute type variables into a constructor's throws clause
+ * @author Mark Mahieu
+ * @compile/fail/ref=T6723444.out -XDstdout -XDrawDiagnostics T6723444.java
+ *
+ */
+public class T6723444 {
+
+ static class Foo<X extends Throwable> {
+ Foo() throws X {}
+ }
+
+ <X extends Throwable> T6723444()
+ throws X {}
+
+ <X extends Throwable> T6723444(Foo<X> foo)
+ throws X {}
+
+ <X1 extends Throwable, X2 extends Throwable> T6723444(Foo<X1> foo, int i)
+ throws X1, X2 {}
+
+ public static void main(String[] args) throws Exception {
+
+ // the following 8 statements should compile without error
+
+ Foo<Exception> exFoo = new Foo<Exception>();
+ exFoo = new Foo<Exception>() {};
+
+ new<Exception> T6723444();
+ new<Exception> T6723444() {};
+ new T6723444(exFoo);
+ new T6723444(exFoo) {};
+ new<Exception, Exception> T6723444(exFoo, 1);
+ new<Exception, Exception> T6723444(exFoo, 1) {};
+
+ // the remaining statements should all raise an
+ // unreported exception error
+
+ new T6723444(exFoo, 1);
+ new T6723444(exFoo, 1) {};
+
+ Foo<Throwable> thFoo = new Foo<Throwable>();
+ thFoo = new Foo<Throwable>() {};
+
+ new<Throwable> T6723444();
+ new<Throwable> T6723444() {};
+ new T6723444(thFoo);
+ new T6723444(thFoo) {};
+ new T6723444(thFoo, 1);
+ new T6723444(thFoo, 1) {};
+ new<Throwable, Throwable> T6723444(thFoo, 1);
+ new<Throwable, Throwable> T6723444(thFoo, 1) {};
+ }
+}
diff -r 952b42dad1fc -r 28000d78abfa langtools/test/tools/javac/generics/6723444/T6723444.out
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/generics/6723444/T6723444.out Mon Feb 09 13:47:26 2009 -0800
@@ -0,0 +1,13 @@
+T6723444.java:65:9: compiler.err.unreported.exception.need.to.catch.or.throw: X2
+T6723444.java:66:9: compiler.err.unreported.exception.need.to.catch.or.throw: X2
+T6723444.java:68:32: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
+T6723444.java:69:17: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
+T6723444.java:71:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
+T6723444.java:72:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
+T6723444.java:73:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
+T6723444.java:74:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
+T6723444.java:75:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
+T6723444.java:76:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
+T6723444.java:77:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
+T6723444.java:78:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
+12 errors
\ No newline at end of file
diff -r 952b42dad1fc -r 28000d78abfa langtools/test/tools/javac/generics/rare/6665356/T6665356.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/generics/rare/6665356/T6665356.java Mon Feb 09 13:47:26 2009 -0800
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @author Maurizio Cimadamore
+ * @bug 6665356
+ * @summary Cast not allowed when both qualifying type and inner class are parameterized
+ * @compile/fail/ref=T6665356.out -XDrawDiagnostics T6665356.java
+ */
+
+class T6665356 {
+ class Outer<S> {
+ class Inner<T> {}
+ }
+
+ void test1() {
+ boolean b;
+ b = null instanceof Outer.Inner;
+ b = null instanceof Outer<?>.Inner;
+ b = null instanceof Outer.Inner<?>;
+ b = null instanceof Outer<?>.Inner<?>;
+ }
+
+ void test2() {
+ boolean b;
+ Object o;
+ o = (Outer.Inner)null;
+ o = (Outer<?>.Inner)null;
+ o = (Outer.Inner<?>)null;
+ o = (Outer<?>.Inner<?>)null;
+ }
+}
\ No newline at end of file
diff -r 952b42dad1fc -r 28000d78abfa langtools/test/tools/javac/generics/rare/6665356/T6665356.out
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/generics/rare/6665356/T6665356.out Mon Feb 09 13:47:26 2009 -0800
@@ -0,0 +1,5 @@
+T6665356.java:40:37: compiler.err.improperly.formed.type.param.missing
+T6665356.java:41:40: compiler.err.improperly.formed.type.inner.raw.param
+T6665356.java:49:23: compiler.err.improperly.formed.type.param.missing
+T6665356.java:50:25: compiler.err.improperly.formed.type.inner.raw.param
+4 errors
\ No newline at end of file
diff -r 952b42dad1fc -r 28000d78abfa langtools/test/tools/javac/processing/6512707/T6512707.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/processing/6512707/T6512707.java Mon Feb 09 13:47:26 2009 -0800
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6512707
+ * @summary "incompatible types" after (unrelated) annotation processing
+ * @author Peter Runge
+ * @compile T6512707.java
+ *
+ * @compile -processor T6512707 TestAnnotation.java
+ */
+
+import java.util.Set;
+import javax.annotation.processing.*;
+import javax.lang.model.SourceVersion;
+import javax.lang.model.element.*;
+import javax.lang.model.util.*;
+
+/**
+ * Dummy processor to force bug 6512707 to show - it does not matter what
+ * the annotation processor does for this bug.
+ */
+@SupportedAnnotationTypes("*")
+public class T6512707 extends AbstractProcessor {
+
+ public boolean process(Set<? extends TypeElement> annotations,
+ RoundEnvironment roundEnv) {
+ return(false);
+ }
+
+ @Override
+ public SourceVersion getSupportedSourceVersion() {
+ return SourceVersion.latest();
+ }
+}
diff -r 952b42dad1fc -r 28000d78abfa langtools/test/tools/javac/processing/6512707/TestAnnotation.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/processing/6512707/TestAnnotation.java Mon Feb 09 13:47:26 2009 -0800
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+public @interface TestAnnotation
+{
+ public TestEnum value() default TestEnum.TWO;
+}
+
diff -r 952b42dad1fc -r 28000d78abfa langtools/test/tools/javac/processing/6512707/TestEnum.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/processing/6512707/TestEnum.java Mon Feb 09 13:47:26 2009 -0800
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+public enum TestEnum
+{
+ ONE,
+ TWO
+}
+