test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java

changeset 243
edd944553131
parent 233
5240b1120530
child 554
9d9f26857129
     1.1 --- a/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java	Tue Mar 17 11:28:24 2009 -0700
     1.2 +++ b/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java	Thu Mar 19 19:00:54 2009 -0700
     1.3 @@ -58,7 +58,8 @@
     1.4                  "<A HREF=\"../pkg/Coin.html\" title=\"enum in pkg\">Coin</A>&gt;"
     1.5              },
     1.6              //Check for enum constant section
     1.7 -            {BUG_ID + FS + "pkg" + FS + "Coin.html", "<STRONG>Enum Constant Summary</STRONG>"},
     1.8 +            {BUG_ID + FS + "pkg" + FS + "Coin.html", "<CAPTION CLASS=\"TableCaption\">" + NL +
     1.9 +                     "Enum Constant Summary</CAPTION>"},
    1.10              //Detail for enum constant
    1.11              {BUG_ID + FS + "pkg" + FS + "Coin.html",
    1.12                  "<STRONG><A HREF=\"../pkg/Coin.html#Dime\">Dime</A></STRONG>"},
    1.13 @@ -158,9 +159,11 @@
    1.14                  "public @interface <STRONG>AnnotationType</STRONG>"},
    1.15              //Make sure member summary headings are correct.
    1.16              {BUG_ID + FS + "pkg" + FS + "AnnotationType.html",
    1.17 -                "<STRONG>Required Element Summary</STRONG>"},
    1.18 +                "<CAPTION CLASS=\"TableCaption\">" + NL +
    1.19 +                "Required Element Summary</CAPTION>"},
    1.20              {BUG_ID + FS + "pkg" + FS + "AnnotationType.html",
    1.21 -                "<STRONG>Optional Element Summary</STRONG>"},
    1.22 +                "<CAPTION CLASS=\"TableCaption\">" + NL +
    1.23 +                "Optional Element Summary</CAPTION>"},
    1.24              //Make sure element detail heading is correct
    1.25              {BUG_ID + FS + "pkg" + FS + "AnnotationType.html",
    1.26                  "Element Detail"},
    1.27 @@ -286,39 +289,57 @@
    1.28  
    1.29              //ClassUseTest1: <T extends Foo & Foo2>
    1.30              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html",
    1.31 -                 "<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>"
    1.32 +                     "<CAPTION CLASS=\"TableSubCaption\">" + NL +
    1.33 +                     "Classes in <A HREF=\"../../pkg2/package-summary.html\">pkg2" +
    1.34 +                     "</A> with type parameters of type <A HREF=\"../../pkg2/Foo.html\" " +
    1.35 +                     "title=\"class in pkg2\">Foo</A></CAPTION>"
    1.36              },
    1.37              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html",
    1.38                  "<TD><CODE><STRONG><A HREF=\"../../pkg2/ClassUseTest1.html\" title=\"class in pkg2\">ClassUseTest1&lt;T extends Foo & Foo2&gt;</A></STRONG></CODE>"
    1.39              },
    1.40              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html",
    1.41 -                "<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>"
    1.42 +                     "<CAPTION CLASS=\"TableSubCaption\">" + NL +
    1.43 +                     "Methods in <A HREF=\"../../pkg2/package-summary.html\">pkg2" +
    1.44 +                     "</A> with type parameters of type <A HREF=\"../../pkg2/Foo.html\" " +
    1.45 +                     "title=\"class in pkg2\">Foo</A></CAPTION>"
    1.46              },
    1.47              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html",
    1.48                  "<TD><CODE><STRONG>ClassUseTest1.</STRONG><STRONG><A HREF=\"../../pkg2/ClassUseTest1.html#method(T)\">method</A></STRONG>(T&nbsp;t)</CODE>"
    1.49              },
    1.50              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html",
    1.51 -                "<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>"
    1.52 +                     "<CAPTION CLASS=\"TableSubCaption\">" + NL +
    1.53 +                     "Fields in <A HREF=\"../../pkg2/package-summary.html\">pkg2" +
    1.54 +                     "</A> with type parameters of type <A HREF=\"../../pkg2/Foo.html\" " +
    1.55 +                     "title=\"class in pkg2\">Foo</A></CAPTION>"
    1.56              },
    1.57              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html",
    1.58                  "<A HREF=\"../../pkg2/ParamTest.html\" title=\"class in pkg2\">ParamTest</A>&lt;<A HREF=\"../../pkg2/Foo.html\" title=\"class in pkg2\">Foo</A>&gt;</CODE></FONT></TD>"
    1.59              },
    1.60  
    1.61              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html",
    1.62 -                "<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>"
    1.63 +                     "<CAPTION CLASS=\"TableSubCaption\">" + NL +
    1.64 +                     "Fields in <A HREF=\"../../pkg2/package-summary.html\">pkg2" +
    1.65 +                     "</A> declared as <A HREF=\"../../pkg2/ParamTest.html\" " +
    1.66 +                     "title=\"class in pkg2\">ParamTest</A></CAPTION>"
    1.67              },
    1.68              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html",
    1.69                  "<A HREF=\"../../pkg2/ParamTest.html\" title=\"class in pkg2\">ParamTest</A>&lt;<A HREF=\"../../pkg2/Foo.html\" title=\"class in pkg2\">Foo</A>&gt;</CODE></FONT></TD>"
    1.70              },
    1.71  
    1.72             {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo2.html",
    1.73 -            "<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>"
    1.74 +                    "<CAPTION CLASS=\"TableSubCaption\">" + NL +
    1.75 +                    "Classes in <A HREF=\"../../pkg2/package-summary.html\">pkg2" +
    1.76 +                    "</A> with type parameters of type <A HREF=\"../../pkg2/Foo2.html\" " +
    1.77 +                    "title=\"interface in pkg2\">Foo2</A></CAPTION>"
    1.78             },
    1.79             {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo2.html",
    1.80              "<TD><CODE><STRONG><A HREF=\"../../pkg2/ClassUseTest1.html\" title=\"class in pkg2\">ClassUseTest1&lt;T extends Foo & Foo2&gt;</A></STRONG></CODE>"
    1.81             },
    1.82             {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo2.html",
    1.83 -               "<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>"
    1.84 +                    "<CAPTION CLASS=\"TableSubCaption\">" + NL +
    1.85 +                    "Methods in <A HREF=\"../../pkg2/package-summary.html\">pkg2" +
    1.86 +                    "</A> with type parameters of type <A HREF=\"../../pkg2/Foo2.html\" " +
    1.87 +                    "title=\"interface in pkg2\">Foo2</A></CAPTION>"
    1.88              },
    1.89              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo2.html",
    1.90                 "<TD><CODE><STRONG>ClassUseTest1.</STRONG><STRONG><A HREF=\"../../pkg2/ClassUseTest1.html#method(T)\">method</A></STRONG>(T&nbsp;t)</CODE>"
    1.91 @@ -326,44 +347,66 @@
    1.92  
    1.93              //ClassUseTest2: <T extends ParamTest<Foo3>>
    1.94              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html",
    1.95 -              "<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>"
    1.96 +                     "<CAPTION CLASS=\"TableSubCaption\">" + NL +
    1.97 +                     "Classes in <A HREF=\"../../pkg2/package-summary.html\">pkg2" +
    1.98 +                     "</A> with type parameters of type <A HREF=\"../../pkg2/ParamTest.html\" " +
    1.99 +                     "title=\"class in pkg2\">ParamTest</A></CAPTION>"
   1.100              },
   1.101              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html",
   1.102                "<TD><CODE><STRONG><A HREF=\"../../pkg2/ClassUseTest2.html\" title=\"class in pkg2\">ClassUseTest2&lt;T extends ParamTest&lt;<A HREF=\"../../pkg2/Foo3.html\" title=\"class in pkg2\">Foo3</A>&gt;&gt;</A></STRONG></CODE>"
   1.103              },
   1.104              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html",
   1.105 -              "<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>"
   1.106 +                     "<CAPTION CLASS=\"TableSubCaption\">" + NL +
   1.107 +                     "Methods in <A HREF=\"../../pkg2/package-summary.html\">pkg2" +
   1.108 +                     "</A> with type parameters of type <A HREF=\"../../pkg2/ParamTest.html\" " +
   1.109 +                     "title=\"class in pkg2\">ParamTest</A></CAPTION>"
   1.110              },
   1.111              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html",
   1.112                "<TD><CODE><STRONG>ClassUseTest2.</STRONG><STRONG><A HREF=\"../../pkg2/ClassUseTest2.html#method(T)\">method</A></STRONG>(T&nbsp;t)</CODE>"
   1.113              },
   1.114              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html",
   1.115 -              "<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>"
   1.116 +                     "<CAPTION CLASS=\"TableSubCaption\">" + NL +
   1.117 +                     "Fields in <A HREF=\"../../pkg2/package-summary.html\">pkg2" +
   1.118 +                     "</A> declared as <A HREF=\"../../pkg2/ParamTest.html\" " +
   1.119 +                     "title=\"class in pkg2\">ParamTest</A></CAPTION>"
   1.120              },
   1.121              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html",
   1.122                "<A HREF=\"../../pkg2/ParamTest.html\" title=\"class in pkg2\">ParamTest</A>&lt;<A HREF=\"../../pkg2/Foo.html\" title=\"class in pkg2\">Foo</A>&gt;</CODE></FONT></TD>"
   1.123              },
   1.124              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html",
   1.125 -              "<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>"
   1.126 +                     "<CAPTION CLASS=\"TableSubCaption\">" + NL +
   1.127 +                     "Methods in <A HREF=\"../../pkg2/package-summary.html\">pkg2" +
   1.128 +                     "</A> with type parameters of type <A HREF=\"../../pkg2/ParamTest.html\" " +
   1.129 +                     "title=\"class in pkg2\">ParamTest</A></CAPTION>"
   1.130              },
   1.131              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html",
   1.132                "&lt;T extends <A HREF=\"../../pkg2/ParamTest.html\" title=\"class in pkg2\">ParamTest</A>&lt;<A HREF=\"../../pkg2/Foo3.html\" title=\"class in pkg2\">Foo3</A>&gt;&gt;"
   1.133              },
   1.134  
   1.135              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html",
   1.136 -                "<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>"
   1.137 +                     "<CAPTION CLASS=\"TableSubCaption\">" + NL +
   1.138 +                     "Classes in <A HREF=\"../../pkg2/package-summary.html\">pkg2" +
   1.139 +                     "</A> with type parameters of type <A HREF=\"../../pkg2/Foo3.html\" " +
   1.140 +                     "title=\"class in pkg2\">Foo3</A></CAPTION>"
   1.141              },
   1.142              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html",
   1.143                  "<TD><CODE><STRONG><A HREF=\"../../pkg2/ClassUseTest2.html\" title=\"class in pkg2\">ClassUseTest2&lt;T extends ParamTest&lt;<A HREF=\"../../pkg2/Foo3.html\" title=\"class in pkg2\">Foo3</A>&gt;&gt;</A></STRONG></CODE>"
   1.144              },
   1.145              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html",
   1.146 -                "<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>"
   1.147 +                     "<CAPTION CLASS=\"TableSubCaption\">" + NL +
   1.148 +                     "Methods in <A HREF=\"../../pkg2/package-summary.html\">pkg2" +
   1.149 +                     "</A> with type parameters of type <A HREF=\"../../pkg2/Foo3.html\" " +
   1.150 +                     "title=\"class in pkg2\">Foo3</A></CAPTION>"
   1.151              },
   1.152              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html",
   1.153                  "<TD><CODE><STRONG>ClassUseTest2.</STRONG><STRONG><A HREF=\"../../pkg2/ClassUseTest2.html#method(T)\">method</A></STRONG>(T&nbsp;t)</CODE>"
   1.154              },
   1.155              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html",
   1.156 -                "<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>"
   1.157 +                     "<CAPTION CLASS=\"TableSubCaption\">" + NL +
   1.158 +                     "Methods in <A HREF=\"../../pkg2/package-summary.html\">pkg2" +
   1.159 +                     "</A> that return types with arguments of type " +
   1.160 +                     "<A HREF=\"../../pkg2/Foo3.html\" title=\"class in pkg2\">" +
   1.161 +                     "Foo3</A></CAPTION>"
   1.162              },
   1.163              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html",
   1.164                  "&lt;T extends <A HREF=\"../../pkg2/ParamTest.html\" title=\"class in pkg2\">ParamTest</A>&lt;<A HREF=\"../../pkg2/Foo3.html\" title=\"class in pkg2\">Foo3</A>&gt;&gt;"
   1.165 @@ -371,38 +414,61 @@
   1.166  
   1.167              //ClassUseTest3: <T extends ParamTest2<List<? extends Foo4>>>
   1.168              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html",
   1.169 -                "<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>"
   1.170 +                     "<CAPTION CLASS=\"TableSubCaption\">" + NL +
   1.171 +                     "Classes in <A HREF=\"../../pkg2/package-summary.html\">pkg2" +
   1.172 +                     "</A> with type parameters of type " +
   1.173 +                     "<A HREF=\"../../pkg2/ParamTest2.html\" title=\"class in pkg2\">" +
   1.174 +                     "ParamTest2</A></CAPTION>"
   1.175              },
   1.176              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html",
   1.177                  "<TD><CODE><STRONG><A HREF=\"../../pkg2/ClassUseTest3.html\" title=\"class in pkg2\">ClassUseTest3&lt;T extends ParamTest2&lt;java.util.List&lt;? extends Foo4&gt;&gt;&gt;</A></STRONG></CODE>"
   1.178              },
   1.179              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html",
   1.180 -                "<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>"
   1.181 +                     "<CAPTION CLASS=\"TableSubCaption\">" + NL +
   1.182 +                     "Methods in <A HREF=\"../../pkg2/package-summary.html\">pkg2" +
   1.183 +                     "</A> with type parameters of type " +
   1.184 +                     "<A HREF=\"../../pkg2/ParamTest2.html\" title=\"class in pkg2\">" +
   1.185 +                     "ParamTest2</A></CAPTION>"
   1.186              },
   1.187              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html",
   1.188                  "<TD><CODE><STRONG>ClassUseTest3.</STRONG><STRONG><A HREF=\"../../pkg2/ClassUseTest3.html#method(T)\">method</A></STRONG>(T&nbsp;t)</CODE>"
   1.189              },
   1.190              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html",
   1.191 -                "<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>"
   1.192 +                     "<CAPTION CLASS=\"TableSubCaption\">" + NL +
   1.193 +                     "Methods in <A HREF=\"../../pkg2/package-summary.html\">pkg2" +
   1.194 +                     "</A> with type parameters of type " +
   1.195 +                     "<A HREF=\"../../pkg2/ParamTest2.html\" title=\"class in pkg2\">" +
   1.196 +                     "ParamTest2</A></CAPTION>"
   1.197              },
   1.198              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html",
   1.199                  "&lt;T extends <A HREF=\"../../pkg2/ParamTest2.html\" title=\"class in pkg2\">ParamTest2</A>&lt;java.util.List&lt;? extends <A HREF=\"../../pkg2/Foo4.html\" title=\"class in pkg2\">Foo4</A>&gt;&gt;&gt;"
   1.200              },
   1.201  
   1.202              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html",
   1.203 -                "<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>"
   1.204 +                     "<CAPTION CLASS=\"TableSubCaption\">" + NL +
   1.205 +                     "Classes in <A HREF=\"../../pkg2/package-summary.html\">pkg2" +
   1.206 +                     "</A> with type parameters of type " +
   1.207 +                     "<A HREF=\"../../pkg2/Foo4.html\" title=\"class in pkg2\">" +
   1.208 +                     "Foo4</A></CAPTION>"
   1.209              },
   1.210              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html",
   1.211                  "<TD><CODE><STRONG><A HREF=\"../../pkg2/ClassUseTest3.html\" title=\"class in pkg2\">ClassUseTest3&lt;T extends ParamTest2&lt;java.util.List&lt;? extends Foo4&gt;&gt;&gt;</A></STRONG></CODE>"
   1.212              },
   1.213              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html",
   1.214 -                "<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>"
   1.215 +                     "<CAPTION CLASS=\"TableSubCaption\">" + NL +
   1.216 +                     "Methods in <A HREF=\"../../pkg2/package-summary.html\">pkg2" +
   1.217 +                     "</A> with type parameters of type <A HREF=\"../../pkg2/Foo4.html\" " +
   1.218 +                     "title=\"class in pkg2\">Foo4</A></CAPTION>"
   1.219              },
   1.220              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html",
   1.221                  "<TD><CODE><STRONG>ClassUseTest3.</STRONG><STRONG><A HREF=\"../../pkg2/ClassUseTest3.html#method(T)\">method</A></STRONG>(T&nbsp;t)</CODE>"
   1.222              },
   1.223              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html",
   1.224 -                "<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>"
   1.225 +                     "<CAPTION CLASS=\"TableSubCaption\">" + NL +
   1.226 +                     "Methods in <A HREF=\"../../pkg2/package-summary.html\">pkg2" +
   1.227 +                     "</A> that return types with arguments of type " +
   1.228 +                     "<A HREF=\"../../pkg2/Foo4.html\" title=\"class in pkg2\">" +
   1.229 +                     "Foo4</A></CAPTION>"
   1.230              },
   1.231              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html",
   1.232                  "&lt;T extends <A HREF=\"../../pkg2/ParamTest2.html\" title=\"class in pkg2\">ParamTest2</A>&lt;java.util.List&lt;? extends <A HREF=\"../../pkg2/Foo4.html\" title=\"class in pkg2\">Foo4</A>&gt;&gt;&gt;"
   1.233 @@ -410,81 +476,147 @@
   1.234  
   1.235              //Type parameters in constructor and method args
   1.236              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html",
   1.237 -                "<TH ALIGN=\"left\" COLSPAN=\"2\">Method 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 +
   1.238 -                "</TR>" + NL +
   1.239 -                "<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL +
   1.240 -                "<TD ALIGN=\"right\" VALIGN=\"top\" WIDTH=\"1%\"><FONT SIZE=\"-1\">" + NL +
   1.241 -                "<CODE>&nbsp;void</CODE></FONT></TD>" + NL +
   1.242 -                "<TD><CODE><STRONG>ClassUseTest3.</STRONG><STRONG><A HREF=\"../../pkg2/ClassUseTest3.html#method(java.util.Set)\">method</A></STRONG>(java.util.Set&lt;<A HREF=\"../../pkg2/Foo4.html\" title=\"class in pkg2\">Foo4</A>&gt;&nbsp;p)</CODE>"
   1.243 +                     "<CAPTION CLASS=\"TableSubCaption\">" + NL +
   1.244 +                     "Method parameters in <A HREF=\"../../pkg2/package-summary.html\">pkg2" +
   1.245 +                     "</A> with type arguments of type <A HREF=\"../../pkg2/Foo4.html\" " +
   1.246 +                     "title=\"class in pkg2\">Foo4</A></CAPTION>" + NL +
   1.247 +                     "<TR>" + NL + "<TH CLASS=\"TableHeader\" SCOPE=\"col\"" +
   1.248 +                     " NOWRAP>Modifier and Type" +
   1.249 +                     "</TH>" + NL + "<TH CLASS=\"TableHeader\" SCOPE=\"col\"" +
   1.250 +                     " NOWRAP>Method and Description</TH>" + NL +
   1.251 +                     "</TR>" + NL +
   1.252 +                     "<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL +
   1.253 +                     "<TD ALIGN=\"right\" VALIGN=\"top\" WIDTH=\"1%\"><FONT SIZE=\"-1\">" + NL +
   1.254 +                     "<CODE>&nbsp;void</CODE></FONT></TD>" + NL +
   1.255 +                     "<TD><CODE><STRONG>ClassUseTest3.</STRONG><STRONG>" +
   1.256 +                     "<A HREF=\"../../pkg2/ClassUseTest3.html#method(java.util.Set)\">" +
   1.257 +                     "method</A></STRONG>(java.util.Set&lt;<A HREF=\"../../pkg2/Foo4.html\" " +
   1.258 +                     "title=\"class in pkg2\">Foo4</A>&gt;&nbsp;p)</CODE>"
   1.259              },
   1.260              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html",
   1.261 -                "<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 +
   1.262 -                "</TR>" + NL +
   1.263 -                "<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL +
   1.264 -                "<TD><CODE><STRONG><A HREF=\"../../pkg2/ClassUseTest3.html#ClassUseTest3(java.util.Set)\">ClassUseTest3</A></STRONG>(java.util.Set&lt;<A HREF=\"../../pkg2/Foo4.html\" title=\"class in pkg2\">Foo4</A>&gt;&nbsp;p)</CODE>"
   1.265 +                     "<CAPTION CLASS=\"TableSubCaption\">" + NL +
   1.266 +                     "Constructor parameters in <A HREF=\"../../pkg2/package-summary.html\">" +
   1.267 +                     "pkg2</A> with type arguments of type <A HREF=\"../../pkg2/Foo4.html\" " +
   1.268 +                     "title=\"class in pkg2\">Foo4</A></CAPTION>" + NL +
   1.269 +                     "<TR>" + NL + "<TH CLASS=\"TableHeader\" SCOPE=\"col\"" +
   1.270 +                     " NOWRAP>Constructor and Description" +
   1.271 +                     "</TH>" + NL + "</TR>" + NL +
   1.272 +                     "<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL +
   1.273 +                     "<TD><CODE><STRONG><A HREF=\"../../pkg2/ClassUseTest3.html#ClassUseTest3" +
   1.274 +                     "(java.util.Set)\">ClassUseTest3</A></STRONG>(java.util.Set&lt;" +
   1.275 +                     "<A HREF=\"../../pkg2/Foo4.html\" title=\"class in pkg2\">" +
   1.276 +                     "Foo4</A>&gt;&nbsp;p)</CODE>"
   1.277              },
   1.278  
   1.279              //=================================
   1.280              // Annotatation Type Usage
   1.281              //=================================
   1.282              {BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html",
   1.283 -                "<FONT SIZE=\"+2\">" + NL +
   1.284 -                "Packages with annotations of type <A HREF=\"../../pkg/AnnotationType.html\" title=\"annotation in pkg\">AnnotationType</A></FONT></TH>" + NL +
   1.285 -                "</TR>" + NL +
   1.286 -                "<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL +
   1.287 -                "<TD><A HREF=\"../../pkg/package-summary.html\"><STRONG>pkg</STRONG></A></TD>"
   1.288 +                     "Packages with annotations of type " +
   1.289 +                     "<A HREF=\"../../pkg/AnnotationType.html\" " +
   1.290 +                     "title=\"annotation in pkg\">AnnotationType</A></CAPTION>" + NL +
   1.291 +                     "<TR>" + NL + "<TH CLASS=\"TableHeader\" SCOPE=\"col\"" +
   1.292 +                     " NOWRAP>Package" +
   1.293 +                     "</TH>" + NL + "<TH CLASS=\"TableHeader\" SCOPE=\"col\"" +
   1.294 +                     " NOWRAP>Description</TH>" + NL + "</TR>" + NL +
   1.295 +                     "<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL +
   1.296 +                     "<TD><A HREF=\"../../pkg/package-summary.html\"><STRONG>pkg" +
   1.297 +                     "</STRONG></A></TD>"
   1.298              },
   1.299  
   1.300              {BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html",
   1.301 -                "Classes 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 +
   1.302 -                "</TR>" + NL +
   1.303 -                "<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL +
   1.304 -                "<TD ALIGN=\"right\" VALIGN=\"top\" WIDTH=\"1%\"><FONT SIZE=\"-1\">" + NL +
   1.305 -                "<CODE>&nbsp;class</CODE></FONT></TD>" + NL +
   1.306 -                "<TD><CODE><STRONG><A HREF=\"../../pkg/AnnotationTypeUsage.html\" title=\"class in pkg\">AnnotationTypeUsage</A></STRONG></CODE>"
   1.307 +                     "Classes in <A HREF=\"../../pkg/package-summary.html\">pkg" +
   1.308 +                     "</A> with annotations of type <A HREF=\"../../pkg/AnnotationType.html\" " +
   1.309 +                     "title=\"annotation in pkg\">AnnotationType</A></CAPTION>" + NL +
   1.310 +                     "<TR>" + NL + "<TH CLASS=\"TableHeader\" SCOPE=\"col\"" +
   1.311 +                     " NOWRAP>Modifier and Type" +
   1.312 +                     "</TH>" + NL + "<TH CLASS=\"TableHeader\" SCOPE=\"col\"" +
   1.313 +                     " NOWRAP>Class and Description</TH>" + NL +
   1.314 +                     "</TR>" + NL +
   1.315 +                     "<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL +
   1.316 +                     "<TD ALIGN=\"right\" VALIGN=\"top\" WIDTH=\"1%\"><FONT SIZE=\"-1\">" + NL +
   1.317 +                     "<CODE>&nbsp;class</CODE></FONT></TD>" + NL +
   1.318 +                     "<TD><CODE><STRONG><A HREF=\"../../pkg/AnnotationTypeUsage.html\" " +
   1.319 +                     "title=\"class in pkg\">AnnotationTypeUsage</A></STRONG></CODE>"
   1.320              },
   1.321  
   1.322              {BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html",
   1.323 -                "Fields 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 +
   1.324 -                "</TR>" + NL +
   1.325 -                "<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL +
   1.326 -                "<TD ALIGN=\"right\" VALIGN=\"top\" WIDTH=\"1%\"><FONT SIZE=\"-1\">" + NL +
   1.327 -                "<CODE>&nbsp;int</CODE></FONT></TD>" + NL +
   1.328 -                "<TD><CODE><STRONG>AnnotationTypeUsage.</STRONG><STRONG><A HREF=\"../../pkg/AnnotationTypeUsage.html#field\">field</A></STRONG></CODE>"
   1.329 +                     "Fields in <A HREF=\"../../pkg/package-summary.html\">pkg" +
   1.330 +                     "</A> with annotations of type <A HREF=\"../../pkg/AnnotationType.html\" " +
   1.331 +                     "title=\"annotation in pkg\">AnnotationType</A></CAPTION>" + NL +
   1.332 +                     "<TR>" + NL + "<TH CLASS=\"TableHeader\" SCOPE=\"col\"" +
   1.333 +                     " NOWRAP>Modifier and Type" +
   1.334 +                     "</TH>" + NL + "<TH CLASS=\"TableHeader\" SCOPE=\"col\"" +
   1.335 +                     " NOWRAP>Field and Description</TH>" + NL +
   1.336 +                     "</TR>" + NL +
   1.337 +                     "<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL +
   1.338 +                     "<TD ALIGN=\"right\" VALIGN=\"top\" WIDTH=\"1%\"><FONT SIZE=\"-1\">" + NL +
   1.339 +                     "<CODE>&nbsp;int</CODE></FONT></TD>" + NL +
   1.340 +                     "<TD><CODE><STRONG>AnnotationTypeUsage.</STRONG><STRONG>" +
   1.341 +                     "<A HREF=\"../../pkg/AnnotationTypeUsage.html#field\">field" +
   1.342 +                     "</A></STRONG></CODE>"
   1.343              },
   1.344  
   1.345              {BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html",
   1.346 -                "Methods 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 +
   1.347 -                "</TR>" + NL +
   1.348 -                "<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL +
   1.349 -                "<TD ALIGN=\"right\" VALIGN=\"top\" WIDTH=\"1%\"><FONT SIZE=\"-1\">" + NL +
   1.350 -                "<CODE>&nbsp;void</CODE></FONT></TD>" + NL +
   1.351 -                "<TD><CODE><STRONG>AnnotationTypeUsage.</STRONG><STRONG><A HREF=\"../../pkg/AnnotationTypeUsage.html#method()\">method</A></STRONG>()</CODE>"
   1.352 +                     "Methods in <A HREF=\"../../pkg/package-summary.html\">pkg" +
   1.353 +                     "</A> with annotations of type <A HREF=\"../../pkg/AnnotationType.html\" " +
   1.354 +                     "title=\"annotation in pkg\">AnnotationType</A></CAPTION>" + NL +
   1.355 +                     "<TR>" + NL + "<TH CLASS=\"TableHeader\" SCOPE=\"col\"" +
   1.356 +                     " NOWRAP>Modifier and Type" +
   1.357 +                     "</TH>" + NL + "<TH CLASS=\"TableHeader\" SCOPE=\"col\"" +
   1.358 +                     " NOWRAP>Method and Description</TH>" + NL +
   1.359 +                     "</TR>" + NL +
   1.360 +                     "<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL +
   1.361 +                     "<TD ALIGN=\"right\" VALIGN=\"top\" WIDTH=\"1%\"><FONT SIZE=\"-1\">" + NL +
   1.362 +                     "<CODE>&nbsp;void</CODE></FONT></TD>" + NL +
   1.363 +                     "<TD><CODE><STRONG>AnnotationTypeUsage.</STRONG><STRONG>" +
   1.364 +                     "<A HREF=\"../../pkg/AnnotationTypeUsage.html#method()\">" +
   1.365 +                     "method</A></STRONG>()</CODE>"
   1.366              },
   1.367  
   1.368              {BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html",
   1.369 -                "Method 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 +
   1.370 -                "</TR>" + NL +
   1.371 -                "<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL +
   1.372 -                "<TD ALIGN=\"right\" VALIGN=\"top\" WIDTH=\"1%\"><FONT SIZE=\"-1\">" + NL +
   1.373 -                "<CODE>&nbsp;void</CODE></FONT></TD>" + NL +
   1.374 -                "<TD><CODE><STRONG>AnnotationTypeUsage.</STRONG><STRONG><A HREF=\"../../pkg/AnnotationTypeUsage.html#methodWithParams(int, int)\">methodWithParams</A></STRONG>(int&nbsp;documented," + NL +
   1.375 -                "                 int&nbsp;undocmented)</CODE>"
   1.376 +                     "Method parameters in <A HREF=\"../../pkg/package-summary.html\">pkg" +
   1.377 +                     "</A> with annotations of type <A HREF=\"../../pkg/AnnotationType.html\" " +
   1.378 +                     "title=\"annotation in pkg\">AnnotationType</A></CAPTION>" + NL +
   1.379 +                     "<TR>" + NL + "<TH CLASS=\"TableHeader\" SCOPE=\"col\"" +
   1.380 +                     " NOWRAP>Modifier and Type" +
   1.381 +                     "</TH>" + NL + "<TH CLASS=\"TableHeader\" SCOPE=\"col\"" +
   1.382 +                     " NOWRAP>Method and Description</TH>" + NL +
   1.383 +                     "</TR>" + NL +
   1.384 +                     "<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL +
   1.385 +                     "<TD ALIGN=\"right\" VALIGN=\"top\" WIDTH=\"1%\"><FONT SIZE=\"-1\">" + NL +
   1.386 +                     "<CODE>&nbsp;void</CODE></FONT></TD>" + NL +
   1.387 +                     "<TD><CODE><STRONG>AnnotationTypeUsage.</STRONG><STRONG>" +
   1.388 +                     "<A HREF=\"../../pkg/AnnotationTypeUsage.html#methodWithParams" +
   1.389 +                     "(int, int)\">methodWithParams</A></STRONG>(int&nbsp;documented," + NL +
   1.390 +                     "                 int&nbsp;undocmented)</CODE>"
   1.391              },
   1.392  
   1.393              {BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html",
   1.394 -                "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 +
   1.395 -                "</TR>" + NL +
   1.396 -                "<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL +
   1.397 -                "<TD><CODE><STRONG><A HREF=\"../../pkg/AnnotationTypeUsage.html#AnnotationTypeUsage()\">AnnotationTypeUsage</A></STRONG>()</CODE>"
   1.398 +                     "Constructors in <A HREF=\"../../pkg/package-summary.html\">pkg" +
   1.399 +                     "</A> with annotations of type <A HREF=\"../../pkg/AnnotationType.html\" " +
   1.400 +                     "title=\"annotation in pkg\">AnnotationType</A></CAPTION>" + NL +
   1.401 +                     "<TR>" + NL + "<TH CLASS=\"TableHeader\" SCOPE=\"col\"" +
   1.402 +                     " NOWRAP>Constructor and Description" +
   1.403 +                     "</TH>" + NL + "</TR>" + NL +
   1.404 +                     "<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL +
   1.405 +                     "<TD><CODE><STRONG><A HREF=\"../../pkg/" +
   1.406 +                     "AnnotationTypeUsage.html#AnnotationTypeUsage()\">" +
   1.407 +                     "AnnotationTypeUsage</A></STRONG>()</CODE>"
   1.408              },
   1.409  
   1.410              {BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html",
   1.411 -                "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 +
   1.412 -                "</TR>" + NL +
   1.413 -                "<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL +
   1.414 -                "<TD><CODE><STRONG><A HREF=\"../../pkg/AnnotationTypeUsage.html#AnnotationTypeUsage(int, int)\">AnnotationTypeUsage</A></STRONG>(int&nbsp;documented," + NL +
   1.415 -                "                    int&nbsp;undocmented)</CODE>"
   1.416 +                     "Constructor parameters in <A HREF=\"../../pkg/package-summary.html\">pkg" +
   1.417 +                     "</A> with annotations of type <A HREF=\"../../pkg/AnnotationType.html\" " +
   1.418 +                     "title=\"annotation in pkg\">AnnotationType</A></CAPTION>" + NL +
   1.419 +                     "<TR>" + NL + "<TH CLASS=\"TableHeader\" SCOPE=\"col\"" +
   1.420 +                     " NOWRAP>Constructor and Description" +
   1.421 +                     "</TH>" + NL + "</TR>" + NL +
   1.422 +                     "<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL +
   1.423 +                     "<TD><CODE><STRONG><A HREF=\"../../pkg/" +
   1.424 +                     "AnnotationTypeUsage.html#AnnotationTypeUsage(int, int)\">" +
   1.425 +                     "AnnotationTypeUsage</A></STRONG>(int&nbsp;documented," + NL +
   1.426 +                     "                    int&nbsp;undocmented)</CODE>"
   1.427              },
   1.428  
   1.429              //=================================

mercurial