diff -r d4c11dcedac3 -r 1aa079321cd2 langtools/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java --- a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java Fri Dec 05 21:59:59 2008 -0800 +++ b/langtools/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java Thu Jan 08 16:26:59 2009 -0800 @@ -54,14 +54,14 @@ {BUG_ID + FS + "pkg" + FS + "Coin.html", "Enum Coin"}, //Make sure enum signature is correct. {BUG_ID + FS + "pkg" + FS + "Coin.html", "public enum "+ - "Coin

extends java.lang.Enum<" + + "Coin

extends java.lang.Enum<" + "Coin>" }, //Check for enum constant section - {BUG_ID + FS + "pkg" + FS + "Coin.html", "Enum Constant Summary"}, + {BUG_ID + FS + "pkg" + FS + "Coin.html", "Enum Constant Summary"}, //Detail for enum constant {BUG_ID + FS + "pkg" + FS + "Coin.html", - "Dime"}, + "Dime"}, //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>"}, //Check class type parameters section. {BUG_ID + FS + "pkg" + FS + "TypeParameters.html", - "

Type Parameters:

E - " + + "

Type Parameters:

E - " + "the type parameter for this class."}, //Type parameters in @see/@link {BUG_ID + FS + "pkg" + FS + "TypeParameters.html", - "

See Also:

TypeParameters"}, //Method that uses class type parameter. {BUG_ID + FS + "pkg" + FS + "TypeParameters.html", @@ -91,13 +91,13 @@ "parameter in TypeParameters\">E param)"}, //Method type parameter section. {BUG_ID + FS + "pkg" + FS + "TypeParameters.html", - "Type Parameters:

T - This is the first " + + "Type Parameters:

T - This is the first " + "type parameter.

V - 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[] methodThatHasTypeParameters"}, + "java.lang.String[] methodThatHasTypeParameters"}, //Wildcard testing. {BUG_ID + FS + "pkg" + FS + "Wildcards.html", "" + @@ -116,18 +116,18 @@ //Signature of subclass that has type parameters. {BUG_ID + FS + "pkg" + FS + "TypeParameterSubClass.html", - "public class TypeParameterSubClass<T extends java.lang.String>" + - "

extends TypeParameterSubClass<T extends java.lang.String>" + + "

extends TypeParameterSuperClass<T>"}, //Interface generic parameter substitution //Signature of subclass that has type parameters. {BUG_ID + FS + "pkg" + FS + "TypeParameters.html", - "All Implemented Interfaces:

SubInterface<E>, SuperInterface<E>

"}, + "All Implemented Interfaces:

SubInterface<E>, SuperInterface<E>

"}, {BUG_ID + FS + "pkg" + FS + "SuperInterface.html", - "All Known Subinterfaces:

SubInterface<V>

"}, + "All Known Subinterfaces:

SubInterface<V>

"}, {BUG_ID + FS + "pkg" + FS + "SubInterface.html", - "All Superinterfaces:

SuperInterface<V>

"}, + "All Superinterfaces:

SuperInterface<V>

"}, //================================= // VAR ARG TESTING @@ -155,18 +155,18 @@ "Annotation Type AnnotationType"}, //Make sure the signature is correct. {BUG_ID + FS + "pkg" + FS + "AnnotationType.html", - "public @interface AnnotationType"}, + "public @interface AnnotationType"}, //Make sure member summary headings are correct. {BUG_ID + FS + "pkg" + FS + "AnnotationType.html", - "Required Element Summary"}, + "Required Element Summary"}, {BUG_ID + FS + "pkg" + FS + "AnnotationType.html", - "Optional Element Summary"}, + "Optional Element Summary"}, //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", - "Default:

\"unknown\"

"}, + "Default:

\"unknown\"

"}, //================================= // ANNOTATION TYPE USAGE TESTING @@ -182,40 +182,40 @@ "" + "@AnnotationType(optional=\"Class Annotation\","+NL + " required=1994)"+NL + - "public class AnnotationTypeUsage

extends java.lang.Object"}, + "public class AnnotationTypeUsage

extends java.lang.Object"}, //FIELD {BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html", "" + "@AnnotationType(optional=\"Field Annotation\","+NL + " required=1994)"+NL + - "public int field"}, + "public int field"}, //CONSTRUCTOR {BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html", "" + "@AnnotationType(optional=\"Constructor Annotation\","+NL + " required=1994)"+NL + - "public AnnotationTypeUsage()"}, + "public AnnotationTypeUsage()"}, //METHOD {BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html", "" + "@AnnotationType(optional=\"Method Annotation\","+NL + " required=1994)"+NL + - "public void method()"}, + "public void method()"}, //METHOD PARAMS {BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html", "

" + NL +
-                "public void methodWithParams(@AnnotationType(optional=\"Parameter Annotation\",required=1994)" + NL +
+                "public void methodWithParams(@AnnotationType(optional=\"Parameter Annotation\",required=1994)" + NL +
                 "                             int documented," + NL +
                 "                             int undocmented)

"}, //CONSTRUCTOR PARAMS {BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html", "

" + NL +
-                                "public AnnotationTypeUsage(@AnnotationType(optional=\"Constructor Param Annotation\",required=1994)" + NL +
+                                "public AnnotationTypeUsage(@AnnotationType(optional=\"Constructor Param Annotation\",required=1994)" + NL +
                                 "                           int documented," + NL +
                 "                           int undocmented)

"}, @@ -270,7 +270,7 @@ {BUG_ID + FS + "pkg1" + FS + "B.html", "

@A"},
             {BUG_ID + FS + "pkg1" + FS + "B.html",
-                "public interface B" + NL +
+                "public interface B" + NL +
                     "

"}, @@ -278,7 +278,7 @@ // Handle multiple bounds. //============================================================== {BUG_ID + FS + "pkg" + FS + "MultiTypeParameters.html", - "public <T extends java.lang.Number & java.lang.Runnable> T foo(T t)"}, + "public <T extends java.lang.Number & java.lang.Runnable> T foo(T t)"}, //============================================================== // Test Class-Use Documenation for Type Parameters. @@ -289,13 +289,13 @@ "Classes in pkg2 with type parameters of type Foo" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html", - "ClassUseTest1<T extends Foo & Foo2>" + "ClassUseTest1<T extends Foo & Foo2>" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html", "Methods in pkg2 with type parameters of type Foo" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html", - "ClassUseTest1.method(T t)" + "ClassUseTest1.method(T t)" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html", "Fields in pkg2 with type parameters of type Foo" @@ -315,13 +315,13 @@ "Classes in pkg2 with type parameters of type Foo2" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo2.html", - "ClassUseTest1<T extends Foo & Foo2>" + "ClassUseTest1<T extends Foo & Foo2>" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo2.html", "Methods in pkg2 with type parameters of type Foo2" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo2.html", - "ClassUseTest1.method(T t)" + "ClassUseTest1.method(T t)" }, //ClassUseTest2: > @@ -329,13 +329,13 @@ "Classes in pkg2 with type parameters of type ParamTest" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html", - "ClassUseTest2<T extends ParamTest<Foo3>>" + "ClassUseTest2<T extends ParamTest<Foo3>>" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html", "Methods in pkg2 with type parameters of type ParamTest" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html", - "ClassUseTest2.method(T t)" + "ClassUseTest2.method(T t)" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html", "Fields in pkg2 declared as ParamTest" @@ -354,13 +354,13 @@ "Classes in pkg2 with type parameters of type Foo3" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html", - "ClassUseTest2<T extends ParamTest<Foo3>>" + "ClassUseTest2<T extends ParamTest<Foo3>>" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html", "Methods in pkg2 with type parameters of type Foo3" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html", - "ClassUseTest2.method(T t)" + "ClassUseTest2.method(T t)" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html", "Methods in pkg2 that return types with arguments of type Foo3" @@ -374,13 +374,13 @@ "Classes in pkg2 with type parameters of type ParamTest2" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html", - "ClassUseTest3<T extends ParamTest2<java.util.List<? extends Foo4>>>" + "ClassUseTest3<T extends ParamTest2<java.util.List<? extends Foo4>>>" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html", "Methods in pkg2 with type parameters of type ParamTest2" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html", - "ClassUseTest3.method(T t)" + "ClassUseTest3.method(T t)" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html", "Methods in pkg2 with type parameters of type ParamTest2" @@ -393,13 +393,13 @@ "Classes in pkg2 with type parameters of type Foo4" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html", - "ClassUseTest3<T extends ParamTest2<java.util.List<? extends Foo4>>>" + "ClassUseTest3<T extends ParamTest2<java.util.List<? extends Foo4>>>" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html", "Methods in pkg2 with type parameters of type Foo4" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html", - "ClassUseTest3.method(T t)" + "ClassUseTest3.method(T t)" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html", "Methods in pkg2 that return types with arguments of type Foo4" @@ -415,13 +415,13 @@ "" + NL + "" + NL + " void" + NL + - "ClassUseTest3.method(java.util.Set<Foo4> p)" + "ClassUseTest3.method(java.util.Set<Foo4> p)" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html", "Constructor parameters in pkg2 with type arguments of type Foo4" + NL + "" + NL + "" + NL + - "ClassUseTest3(java.util.Set<Foo4> p)" + "ClassUseTest3(java.util.Set<Foo4> p)" }, //================================= @@ -432,7 +432,7 @@ "Packages with annotations of type AnnotationType" + NL + "" + NL + "" + NL + - "pkg" + "pkg" }, {BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html", @@ -441,7 +441,7 @@ "" + NL + "" + NL + " class" + NL + - "AnnotationTypeUsage" + "AnnotationTypeUsage" }, {BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html", @@ -450,7 +450,7 @@ "" + NL + "" + NL + " int" + NL + - "AnnotationTypeUsage.field" + "AnnotationTypeUsage.field" }, {BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html", @@ -459,7 +459,7 @@ "" + NL + "" + NL + " void" + NL + - "AnnotationTypeUsage.method()" + "AnnotationTypeUsage.method()" }, {BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html", @@ -468,7 +468,7 @@ "" + NL + "" + NL + " void" + NL + - "

AnnotationTypeUsage.methodWithParams(int documented," + NL +
+                "AnnotationTypeUsage.methodWithParams(int documented," + NL +
                 "                 int undocmented)"
             },
 
@@ -476,14 +476,14 @@
                 "Constructors in pkg with annotations of type AnnotationType" + NL +
                 "" + NL +
                 "" + NL +
-                "AnnotationTypeUsage()"
+                "AnnotationTypeUsage()"
             },
 
             {BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html",
                 "Constructor parameters in pkg with annotations of type AnnotationType" + NL +
                 "" + NL +
                 "" + NL +
-                "AnnotationTypeUsage(int documented," + NL +
+                "AnnotationTypeUsage(int documented," + NL +
                 "                    int undocmented)"
             },
 
@@ -491,13 +491,13 @@
             // TYPE PARAMETER IN INDEX
             //=================================
             {BUG_ID + FS + "index-all.html",
-                "method(Vector<Object>)"
+                "method(Vector<Object>)"
             },
             //=================================
             // TYPE PARAMETER IN INDEX
             //=================================
             {BUG_ID + FS + "index-all.html",
-                "method(Vector<Object>)"
+                "method(Vector<Object>)"
             },
         };
     private static final String[][] NEGATED_TEST = {
@@ -505,7 +505,7 @@
         // ENUM TESTING
         //=================================
         //NO constructor section
-        {BUG_ID + FS + "pkg" + FS + "Coin.html", "Constructor Summary"},
+        {BUG_ID + FS + "pkg" + FS + "Coin.html", "Constructor Summary"},
         //=================================
         // TYPE PARAMETER TESTING
         //=================================
@@ -525,28 +525,28 @@
             "" + NL +
             "@AnnotationTypeUndocumented(optional=\"Class Annotation\"," + NL +
             "                required=1994)" + NL +
-            "public class AnnotationTypeUsage

extends java.lang.Object"},
+            "public class AnnotationTypeUsage

extends java.lang.Object"},
 
         //FIELD
         {BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html",
             "" + NL +
             "@AnnotationTypeUndocumented(optional=\"Field Annotation\"," + NL +
             "                required=1994)" + NL +
-            "public int field"},
+            "public int field"},
 
         //CONSTRUCTOR
         {BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html",
             "" + NL +
             "@AnnotationTypeUndocumented(optional=\"Constructor Annotation\"," + NL +
             "                required=1994)" + NL +
-            "public AnnotationTypeUsage()"},
+            "public AnnotationTypeUsage()"},
 
         //METHOD
         {BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html",
             "" + NL +
             "@AnnotationTypeUndocumented(optional=\"Method Annotation\"," + NL +
             "                required=1994)" + NL +
-            "public void method()"},
+            "public void method()"},
 
         //=================================
         // Make sure annotation types do not