diff -r 889ec3ddc91b -r edd944553131 test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java --- a/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java Tue Mar 17 11:28:24 2009 -0700 +++ b/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java Thu Mar 19 19:00:54 2009 -0700 @@ -58,7 +58,8 @@ "Coin>" }, //Check for enum constant section - {BUG_ID + FS + "pkg" + FS + "Coin.html", "Enum Constant Summary"}, + {BUG_ID + FS + "pkg" + FS + "Coin.html", "" + NL + + "Enum Constant Summary"}, //Detail for enum constant {BUG_ID + FS + "pkg" + FS + "Coin.html", "Dime"}, @@ -158,9 +159,11 @@ "public @interface AnnotationType"}, //Make sure member summary headings are correct. {BUG_ID + FS + "pkg" + FS + "AnnotationType.html", - "Required Element Summary"}, + "" + NL + + "Required Element Summary"}, {BUG_ID + FS + "pkg" + FS + "AnnotationType.html", - "Optional Element Summary"}, + "" + NL + + "Optional Element Summary"}, //Make sure element detail heading is correct {BUG_ID + FS + "pkg" + FS + "AnnotationType.html", "Element Detail"}, @@ -286,39 +289,57 @@ //ClassUseTest1: {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html", - "Classes in pkg2 with type parameters of type Foo" + "" + NL + + "Classes in pkg2" + + " with type parameters of type Foo" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html", "ClassUseTest1<T extends Foo & Foo2>" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html", - "Methods in pkg2 with type parameters of type Foo" + "" + NL + + "Methods in pkg2" + + " with type parameters of type Foo" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html", "ClassUseTest1.method(T t)" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html", - "Fields in pkg2 with type parameters of type Foo" + "" + NL + + "Fields in pkg2" + + " with type parameters of type Foo" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html", "ParamTest<Foo>" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html", - "Fields in pkg2 declared as ParamTest" + "" + NL + + "Fields in pkg2" + + " declared as ParamTest" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html", "ParamTest<Foo>" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo2.html", - "Classes in pkg2 with type parameters of type Foo2" + "" + NL + + "Classes in pkg2" + + " with type parameters of type Foo2" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo2.html", "ClassUseTest1<T extends Foo & Foo2>" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo2.html", - "Methods in pkg2 with type parameters of type Foo2" + "" + NL + + "Methods in pkg2" + + " with type parameters of type Foo2" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo2.html", "ClassUseTest1.method(T t)" @@ -326,44 +347,66 @@ //ClassUseTest2: > {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html", - "Classes in pkg2 with type parameters of type ParamTest" + "" + NL + + "Classes in pkg2" + + " with type parameters of type ParamTest" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html", "ClassUseTest2<T extends ParamTest<Foo3>>" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html", - "Methods in pkg2 with type parameters of type ParamTest" + "" + NL + + "Methods in pkg2" + + " with type parameters of type ParamTest" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html", "ClassUseTest2.method(T t)" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html", - "Fields in pkg2 declared as ParamTest" + "" + NL + + "Fields in pkg2" + + " declared as ParamTest" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html", "ParamTest<Foo>" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html", - "Methods in pkg2 with type parameters of type ParamTest" + "" + NL + + "Methods in pkg2" + + " with type parameters of type ParamTest" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html", "<T extends ParamTest<Foo3>>" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html", - "Classes in pkg2 with type parameters of type Foo3" + "" + NL + + "Classes in pkg2" + + " with type parameters of type Foo3" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html", "ClassUseTest2<T extends ParamTest<Foo3>>" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html", - "Methods in pkg2 with type parameters of type Foo3" + "" + NL + + "Methods in pkg2" + + " with type parameters of type Foo3" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html", "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" + "" + NL + + "Methods in pkg2" + + " that return types with arguments of type " + + "" + + "Foo3" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html", "<T extends ParamTest<Foo3>>" @@ -371,38 +414,61 @@ //ClassUseTest3: >> {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html", - "Classes in pkg2 with type parameters of type ParamTest2" + "" + NL + + "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>>>" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html", - "Methods in pkg2 with type parameters of type ParamTest2" + "" + NL + + "Methods in pkg2" + + " with type parameters of type " + + "" + + "ParamTest2" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html", "ClassUseTest3.method(T t)" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html", - "Methods in pkg2 with type parameters of type ParamTest2" + "" + NL + + "Methods in pkg2" + + " with type parameters of type " + + "" + + "ParamTest2" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html", "<T extends ParamTest2<java.util.List<? extends Foo4>>>" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html", - "Classes in pkg2 with type parameters of type Foo4" + "" + NL + + "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>>>" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html", - "Methods in pkg2 with type parameters of type Foo4" + "" + NL + + "Methods in pkg2" + + " with type parameters of type Foo4" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html", "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" + "" + NL + + "Methods in pkg2" + + " that return types with arguments of type " + + "" + + "Foo4" }, {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html", "<T extends ParamTest2<java.util.List<? extends Foo4>>>" @@ -410,81 +476,147 @@ //Type parameters in constructor and method args {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html", - "Method parameters in pkg2 with type arguments of type Foo4" + NL + - "" + NL + - "" + NL + - "" + NL + - " void" + NL + - "ClassUseTest3.method(java.util.Set<Foo4> p)" + "" + NL + + "Method parameters in pkg2" + + " with type arguments of type Foo4" + NL + + "" + NL + "Modifier and Type" + + "" + NL + "Method and Description" + NL + + "" + NL + + "" + NL + + "" + NL + + " void" + NL + + "

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)" + "" + NL + + "Constructor parameters in " + + "pkg2 with type arguments of type Foo4" + NL + + "" + NL + "Constructor and Description" + + "" + NL + "" + NL + + "" + NL + + "

ClassUseTest3(java.util.Set<" +
+                     "" +
+                     "Foo4> p)

" }, //================================= // Annotatation Type Usage //================================= {BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html", - "" + NL + - "Packages with annotations of type AnnotationType" + NL + - "" + NL + - "" + NL + - "pkg" + "Packages with annotations of type " + + "AnnotationType" + NL + + "" + NL + "Package" + + "" + NL + "Description" + NL + "" + NL + + "" + NL + + "pkg" + + "" }, {BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html", - "Classes in pkg with annotations of type AnnotationType" + NL + - "" + NL + - "" + NL + - "" + NL + - " class" + NL + - "AnnotationTypeUsage" + "Classes in pkg" + + " with annotations of type AnnotationType" + NL + + "" + NL + "Modifier and Type" + + "" + NL + "Class and Description" + NL + + "" + NL + + "" + NL + + "" + NL + + " class" + NL + + "AnnotationTypeUsage" }, {BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html", - "Fields in pkg with annotations of type AnnotationType" + NL + - "" + NL + - "" + NL + - "" + NL + - " int" + NL + - "AnnotationTypeUsage.field" + "Fields in pkg" + + " with annotations of type AnnotationType" + NL + + "" + NL + "Modifier and Type" + + "" + NL + "Field and Description" + NL + + "" + NL + + "" + NL + + "" + NL + + " int" + NL + + "

AnnotationTypeUsage." +
+                     "field" +
+                     "

" }, {BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html", - "Methods in pkg with annotations of type AnnotationType" + NL + - "" + NL + - "" + NL + - "" + NL + - " void" + NL + - "AnnotationTypeUsage.method()" + "Methods in pkg" + + " with annotations of type AnnotationType" + NL + + "" + NL + "Modifier and Type" + + "" + NL + "Method and Description" + NL + + "" + NL + + "" + NL + + "" + NL + + " void" + NL + + "

AnnotationTypeUsage." +
+                     "" +
+                     "method()

" }, {BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html", - "Method parameters in pkg with annotations of type AnnotationType" + NL + - "" + NL + - "" + NL + - "" + NL + - " void" + NL + - "

AnnotationTypeUsage.methodWithParams(int documented," + NL +
-                "                 int undocmented)

" + "Method parameters in pkg" + + " with annotations of type AnnotationType" + NL + + "" + NL + "Modifier and Type" + + "" + NL + "Method and Description" + NL + + "" + NL + + "" + NL + + "" + NL + + " void" + NL + + "

AnnotationTypeUsage." +
+                     "methodWithParams(int documented," + NL +
+                     "                 int undocmented)

" }, {BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html", - "Constructors in pkg with annotations of type AnnotationType" + NL + - "" + NL + - "" + NL + - "AnnotationTypeUsage()" + "Constructors in pkg" + + " with annotations of type AnnotationType" + NL + + "" + NL + "Constructor and Description" + + "" + NL + "" + NL + + "" + NL + + "

" +
+                     "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 +
-                "                    int undocmented)

" + "Constructor parameters in pkg" + + " with annotations of type AnnotationType" + NL + + "" + NL + "Constructor and Description" + + "" + NL + "" + NL + + "" + NL + + "

" +
+                     "AnnotationTypeUsage(int documented," + NL +
+                     "                    int undocmented)

" }, //=================================