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

changeset 766
90af8d87741f
parent 554
9d9f26857129
child 798
4868a36f6fd8
     1.1 --- a/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java	Tue Nov 30 09:38:48 2010 -0800
     1.2 +++ b/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java	Wed Dec 01 11:02:38 2010 -0800
     1.3 @@ -51,18 +51,18 @@
     1.4              // ENUM TESTING
     1.5              //=================================
     1.6              //Make sure enum header is correct.
     1.7 -            {BUG_ID + FS + "pkg" + FS + "Coin.html", "Enum Coin</H2>"},
     1.8 +            {BUG_ID + FS + "pkg" + FS + "Coin.html", "Enum Coin</h2>"},
     1.9              //Make sure enum signature is correct.
    1.10 -            {BUG_ID + FS + "pkg" + FS + "Coin.html", "public enum "+
    1.11 -                "<STRONG>Coin</STRONG>" + NL + "extends java.lang.Enum&lt;" +
    1.12 -                "<A HREF=\"../pkg/Coin.html\" title=\"enum in pkg\">Coin</A>&gt;"
    1.13 +            {BUG_ID + FS + "pkg" + FS + "Coin.html", "<pre>public enum <strong>Coin</strong>" + NL +
    1.14 +                "extends java.lang.Enum&lt;<a href=\"../pkg/Coin.html\" " +
    1.15 +                "title=\"enum in pkg\">Coin</a>&gt;</pre>"
    1.16              },
    1.17              //Check for enum constant section
    1.18 -            {BUG_ID + FS + "pkg" + FS + "Coin.html", "<CAPTION CLASS=\"TableCaption\">" + NL +
    1.19 -                     "Enum Constant Summary</CAPTION>"},
    1.20 +            {BUG_ID + FS + "pkg" + FS + "Coin.html", "<caption><span>Enum Constants" +
    1.21 +                     "</span><span class=\"tabEnd\">&nbsp;</span></caption>"},
    1.22              //Detail for enum constant
    1.23              {BUG_ID + FS + "pkg" + FS + "Coin.html",
    1.24 -                "<STRONG><A HREF=\"../pkg/Coin.html#Dime\">Dime</A></STRONG>"},
    1.25 +                "<strong><a href=\"../pkg/Coin.html#Dime\">Dime</a></strong>"},
    1.26              //Automatically insert documentation for values() and valueOf().
    1.27              {BUG_ID + FS + "pkg" + FS + "Coin.html",
    1.28                  "Returns an array containing the constants of this enum type,"},
    1.29 @@ -77,38 +77,39 @@
    1.30              //=================================
    1.31              //Make sure the header is correct.
    1.32              {BUG_ID + FS + "pkg" + FS + "TypeParameters.html",
    1.33 -                "Class TypeParameters&lt;E&gt;</H2>"},
    1.34 +                "Class TypeParameters&lt;E&gt;</h2>"},
    1.35              //Check class type parameters section.
    1.36              {BUG_ID + FS + "pkg" + FS + "TypeParameters.html",
    1.37 -                "<DT><STRONG>Type Parameters:</STRONG></DT><DD><CODE>E</CODE> - " +
    1.38 +                "<dt><span class=\"strong\">Type Parameters:</span></dt><dd><code>E</code> - " +
    1.39                  "the type parameter for this class."},
    1.40              //Type parameters in @see/@link
    1.41              {BUG_ID + FS + "pkg" + FS + "TypeParameters.html",
    1.42 -                "<DT><STRONG>See Also:</STRONG></DT><DD><A HREF=\"../pkg/TypeParameters.html\" " +
    1.43 -                    "title=\"class in pkg\"><CODE>TypeParameters</CODE></A></DD></DL>"},
    1.44 +                "<dl><dt><span class=\"strong\">See Also:</span></dt><dd>" +
    1.45 +                "<a href=\"../pkg/TypeParameters.html\" title=\"class in pkg\">" +
    1.46 +                "<code>TypeParameters</code></a></dd></dl>"},
    1.47              //Method that uses class type parameter.
    1.48              {BUG_ID + FS + "pkg" + FS + "TypeParameters.html",
    1.49 -                "(<A HREF=\"../pkg/TypeParameters.html\" title=\"type " +
    1.50 -                    "parameter in TypeParameters\">E</A>&nbsp;param)"},
    1.51 +                "(<a href=\"../pkg/TypeParameters.html\" title=\"type " +
    1.52 +                    "parameter in TypeParameters\">E</a>&nbsp;param)"},
    1.53              //Method type parameter section.
    1.54              {BUG_ID + FS + "pkg" + FS + "TypeParameters.html",
    1.55 -                "<STRONG>Type Parameters:</STRONG></DT><DD><CODE>T</CODE> - This is the first " +
    1.56 -                    "type parameter.</DD><DD><CODE>V</CODE> - This is the second type " +
    1.57 +                "<span class=\"strong\">Type Parameters:</span></dt><dd><code>T</code> - This is the first " +
    1.58 +                    "type parameter.</dd><dd><code>V</code> - This is the second type " +
    1.59                      "parameter."},
    1.60              //Signature of method with type parameters
    1.61              {BUG_ID + FS + "pkg" + FS + "TypeParameters.html",
    1.62 -                "public &lt;T extends java.util.List,V&gt; " +
    1.63 -                    "java.lang.String[] <STRONG>methodThatHasTypeParameters</STRONG>"},
    1.64 +                "public&nbsp;&lt;T extends java.util.List,V&gt;&nbsp;" +
    1.65 +                "java.lang.String[]&nbsp;methodThatHasTypeParameters"},
    1.66              //Wildcard testing.
    1.67              {BUG_ID + FS + "pkg" + FS + "Wildcards.html",
    1.68 -                "<A HREF=\"../pkg/TypeParameters.html\" title=\"class in pkg\">" +
    1.69 -                "TypeParameters</A>&lt;? super java.lang.String&gt;&nbsp;a"},
    1.70 +                "<a href=\"../pkg/TypeParameters.html\" title=\"class in pkg\">" +
    1.71 +                "TypeParameters</a>&lt;? super java.lang.String&gt;&nbsp;a"},
    1.72              {BUG_ID + FS + "pkg" + FS + "Wildcards.html",
    1.73 -                "<A HREF=\"../pkg/TypeParameters.html\" title=\"class in pkg\">" +
    1.74 -                "TypeParameters</A>&lt;? extends java.lang.StringBuffer&gt;&nbsp;b"},
    1.75 +                "<a href=\"../pkg/TypeParameters.html\" title=\"class in pkg\">" +
    1.76 +                "TypeParameters</a>&lt;? extends java.lang.StringBuffer&gt;&nbsp;b"},
    1.77              {BUG_ID + FS + "pkg" + FS + "Wildcards.html",
    1.78 -                "<A HREF=\"../pkg/TypeParameters.html\" title=\"class in pkg\">" +
    1.79 -                    "TypeParameters</A>&nbsp;c"},
    1.80 +                "<a href=\"../pkg/TypeParameters.html\" title=\"class in pkg\">" +
    1.81 +                    "TypeParameters</a>&nbsp;c"},
    1.82              //Bad type parameter warnings.
    1.83              {WARNING_OUTPUT, "warning - @param argument " +
    1.84                  "\"<BadClassTypeParam>\" is not a type parameter name."},
    1.85 @@ -117,18 +118,27 @@
    1.86  
    1.87              //Signature of subclass that has type parameters.
    1.88              {BUG_ID + FS + "pkg" + FS + "TypeParameterSubClass.html",
    1.89 -                "public class <STRONG>TypeParameterSubClass&lt;T extends java.lang.String&gt;" +
    1.90 -                "</STRONG>" + NL + "extends <A HREF=\"../pkg/TypeParameterSuperClass.html\" " +
    1.91 -                "title=\"class in pkg\">TypeParameterSuperClass</A>&lt;T&gt;"},
    1.92 +                "<pre>public class <strong>TypeParameterSubClass&lt;T extends " +
    1.93 +                "java.lang.String&gt;</strong>" + NL + "extends " +
    1.94 +                "<a href=\"../pkg/TypeParameterSuperClass.html\" title=\"class in pkg\">" +
    1.95 +                "TypeParameterSuperClass</a>&lt;T&gt;</pre>"},
    1.96  
    1.97              //Interface generic parameter substitution
    1.98              //Signature of subclass that has type parameters.
    1.99              {BUG_ID + FS + "pkg" + FS + "TypeParameters.html",
   1.100 -                "<STRONG>All Implemented Interfaces:</STRONG></DT> <DD><A HREF=\"../pkg/SubInterface.html\" title=\"interface in pkg\">SubInterface</A>&lt;E&gt;, <A HREF=\"../pkg/SuperInterface.html\" title=\"interface in pkg\">SuperInterface</A>&lt;E&gt;</DD>"},
   1.101 +                "<dl>" + NL + "<dt>All Implemented Interfaces:</dt>" + NL +
   1.102 +                "<dd><a href=\"../pkg/SubInterface.html\" title=\"interface in pkg\">" +
   1.103 +                "SubInterface</a>&lt;E&gt;, <a href=\"../pkg/SuperInterface.html\" " +
   1.104 +                "title=\"interface in pkg\">SuperInterface</a>&lt;E&gt;</dd>" + NL +
   1.105 +                "</dl>"},
   1.106              {BUG_ID + FS + "pkg" + FS + "SuperInterface.html",
   1.107 -                "<STRONG>All Known Subinterfaces:</STRONG></DT> <DD><A HREF=\"../pkg/SubInterface.html\" title=\"interface in pkg\">SubInterface</A>&lt;V&gt;</DD>"},
   1.108 +                "<dl>" + NL + "<dt>All Known Subinterfaces:</dt>" + NL +
   1.109 +                "<dd><a href=\"../pkg/SubInterface.html\" title=\"interface in pkg\">" +
   1.110 +                "SubInterface</a>&lt;V&gt;</dd>" + NL + "</dl>"},
   1.111              {BUG_ID + FS + "pkg" + FS + "SubInterface.html",
   1.112 -                "<STRONG>All Superinterfaces:</STRONG></DT> <DD><A HREF=\"../pkg/SuperInterface.html\" title=\"interface in pkg\">SuperInterface</A>&lt;V&gt;</DD>"},
   1.113 +                "<dl>" + NL + "<dt>All Superinterfaces:</dt>" + NL +
   1.114 +                "<dd><a href=\"../pkg/SuperInterface.html\" title=\"interface in pkg\">" +
   1.115 +                "SuperInterface</a>&lt;V&gt;</dd>" + NL + "</dl>"},
   1.116  
   1.117              //=================================
   1.118              // VAR ARG TESTING
   1.119 @@ -137,39 +147,40 @@
   1.120              {BUG_ID + FS + "pkg" + FS + "VarArgs.html", "(int[][]...&nbsp;i)"},
   1.121              {BUG_ID + FS + "pkg" + FS + "VarArgs.html", "(int[]...)"},
   1.122              {BUG_ID + FS + "pkg" + FS + "VarArgs.html",
   1.123 -                "<A HREF=\"../pkg/TypeParameters.html\" title=\"class in pkg\">" +
   1.124 -                "TypeParameters</A>...&nbsp;t"},
   1.125 +                "<a href=\"../pkg/TypeParameters.html\" title=\"class in pkg\">" +
   1.126 +                "TypeParameters</a>...&nbsp;t"},
   1.127  
   1.128              //=================================
   1.129              // ANNOTATION TYPE TESTING
   1.130              //=================================
   1.131              //Make sure the summary links are correct.
   1.132              {BUG_ID + FS + "pkg" + FS + "AnnotationType.html",
   1.133 -                "SUMMARY:&nbsp;<A HREF=\"#annotation_type_required_element_summary\">" +
   1.134 -                "REQUIRED</A>&nbsp;|&nbsp;<A HREF=\"#annotation_type_optional_element_summary\">" +
   1.135 -                "OPTIONAL</A>"},
   1.136 +                "<li>SUMMARY:&nbsp;</li>" + NL +
   1.137 +                "<li><a href=\"#annotation_type_required_element_summary\">" +
   1.138 +                "REQUIRED</a>&nbsp;|&nbsp;</li>" + NL + "<li>" +
   1.139 +                "<a href=\"#annotation_type_optional_element_summary\">OPTIONAL</a></li>"},
   1.140              //Make sure the detail links are correct.
   1.141              {BUG_ID + FS + "pkg" + FS + "AnnotationType.html",
   1.142 -                "DETAIL:&nbsp;<A HREF=\"#annotation_type_element_detail\">ELEMENT</A>"},
   1.143 +                "<li>DETAIL:&nbsp;</li>" + NL +
   1.144 +                "<li><a href=\"#annotation_type_element_detail\">ELEMENT</a></li>"},
   1.145              //Make sure the heading is correct.
   1.146              {BUG_ID + FS + "pkg" + FS + "AnnotationType.html",
   1.147 -                "Annotation Type AnnotationType</H2>"},
   1.148 +                "Annotation Type AnnotationType</h2>"},
   1.149              //Make sure the signature is correct.
   1.150              {BUG_ID + FS + "pkg" + FS + "AnnotationType.html",
   1.151 -                "public @interface <STRONG>AnnotationType</STRONG>"},
   1.152 +                "public @interface <strong>AnnotationType</strong>"},
   1.153              //Make sure member summary headings are correct.
   1.154              {BUG_ID + FS + "pkg" + FS + "AnnotationType.html",
   1.155 -                "<CAPTION CLASS=\"TableCaption\">" + NL +
   1.156 -                "Required Element Summary</CAPTION>"},
   1.157 +                "<h3>Required Element Summary</h3>"},
   1.158              {BUG_ID + FS + "pkg" + FS + "AnnotationType.html",
   1.159 -                "<CAPTION CLASS=\"TableCaption\">" + NL +
   1.160 -                "Optional Element Summary</CAPTION>"},
   1.161 +                "<h3>Optional Element Summary</h3>"},
   1.162              //Make sure element detail heading is correct
   1.163              {BUG_ID + FS + "pkg" + FS + "AnnotationType.html",
   1.164                  "Element Detail"},
   1.165              //Make sure default annotation type value is printed when necessary.
   1.166              {BUG_ID + FS + "pkg" + FS + "AnnotationType.html",
   1.167 -                "<STRONG>Default:</STRONG></DT><DD>\"unknown\"</DD>"},
   1.168 +                "<dl>" + NL + "<dt>Default:</dt>" + NL + "<dd>\"unknown\"</dd>" + NL +
   1.169 +                "</dl>"},
   1.170  
   1.171              //=================================
   1.172              // ANNOTATION TYPE USAGE TESTING
   1.173 @@ -177,51 +188,65 @@
   1.174  
   1.175              //PACKAGE
   1.176              {BUG_ID + FS + "pkg" + FS + "package-summary.html",
   1.177 -                "<A HREF=\"../pkg/AnnotationType.html\" title=\"annotation in pkg\">@AnnotationType</A>(<A HREF=\"../pkg/AnnotationType.html#optional()\">optional</A>=\"Package Annotation\"," + NL +
   1.178 -                "                <A HREF=\"../pkg/AnnotationType.html#required()\">required</A>=1994)"},
   1.179 +                "<a href=\"../pkg/AnnotationType.html\" title=\"annotation in pkg\">@AnnotationType</a>(<a href=\"../pkg/AnnotationType.html#optional()\">optional</a>=\"Package Annotation\"," + NL +
   1.180 +                "                <a href=\"../pkg/AnnotationType.html#required()\">required</a>=1994)"},
   1.181  
   1.182              //CLASS
   1.183              {BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html",
   1.184 -                "<FONT SIZE=\"-1\">" +
   1.185 -                "<A HREF=\"../pkg/AnnotationType.html\" title=\"annotation in pkg\">@AnnotationType</A>(<A HREF=\"../pkg/AnnotationType.html#optional()\">optional</A>=\"Class Annotation\","+NL +
   1.186 -                "                <A HREF=\"../pkg/AnnotationType.html#required()\">required</A>=1994)"+NL +
   1.187 -                "</FONT>public class <STRONG>AnnotationTypeUsage</STRONG>" + NL +
   1.188 -                "extends java.lang.Object"},
   1.189 +                "<pre><a href=\"../pkg/AnnotationType.html\" " +
   1.190 +                "title=\"annotation in pkg\">@AnnotationType</a>(" +
   1.191 +                "<a href=\"../pkg/AnnotationType.html#optional()\">optional</a>" +
   1.192 +                "=\"Class Annotation\"," + NL +
   1.193 +                "                <a href=\"../pkg/AnnotationType.html#required()\">" +
   1.194 +                "required</a>=1994)" + NL + "public class <strong>" +
   1.195 +                "AnnotationTypeUsage</strong>" + NL + "extends java.lang.Object</pre>"},
   1.196  
   1.197              //FIELD
   1.198              {BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html",
   1.199 -                "<FONT SIZE=\"-1\">" +
   1.200 -                "<A HREF=\"../pkg/AnnotationType.html\" title=\"annotation in pkg\">@AnnotationType</A>(<A HREF=\"../pkg/AnnotationType.html#optional()\">optional</A>=\"Field Annotation\","+NL +
   1.201 -                "                <A HREF=\"../pkg/AnnotationType.html#required()\">required</A>=1994)"+NL +
   1.202 -                "</FONT>public int <STRONG>field</STRONG>"},
   1.203 +                "<pre><a href=\"../pkg/AnnotationType.html\" " +
   1.204 +                "title=\"annotation in pkg\">@AnnotationType</a>(" +
   1.205 +                "<a href=\"../pkg/AnnotationType.html#optional()\">optional</a>" +
   1.206 +                "=\"Field Annotation\"," + NL +
   1.207 +                "                <a href=\"../pkg/AnnotationType.html#required()\">" +
   1.208 +                "required</a>=1994)" + NL + "public&nbsp;int field</pre>"},
   1.209  
   1.210              //CONSTRUCTOR
   1.211              {BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html",
   1.212 -                "<FONT SIZE=\"-1\">" +
   1.213 -                "<A HREF=\"../pkg/AnnotationType.html\" title=\"annotation in pkg\">@AnnotationType</A>(<A HREF=\"../pkg/AnnotationType.html#optional()\">optional</A>=\"Constructor Annotation\","+NL +
   1.214 -                "                <A HREF=\"../pkg/AnnotationType.html#required()\">required</A>=1994)"+NL +
   1.215 -                "</FONT>public <STRONG>AnnotationTypeUsage</STRONG>()"},
   1.216 +                "<pre><a href=\"../pkg/AnnotationType.html\" " +
   1.217 +                "title=\"annotation in pkg\">@AnnotationType</a>(" +
   1.218 +                "<a href=\"../pkg/AnnotationType.html#optional()\">optional</a>" +
   1.219 +                "=\"Constructor Annotation\"," + NL +
   1.220 +                "                <a href=\"../pkg/AnnotationType.html#required()\">" +
   1.221 +                "required</a>=1994)" + NL + "public&nbsp;AnnotationTypeUsage()</pre>"},
   1.222  
   1.223              //METHOD
   1.224              {BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html",
   1.225 -                "<FONT SIZE=\"-1\">" +
   1.226 -                "<A HREF=\"../pkg/AnnotationType.html\" title=\"annotation in pkg\">@AnnotationType</A>(<A HREF=\"../pkg/AnnotationType.html#optional()\">optional</A>=\"Method Annotation\","+NL +
   1.227 -                "                <A HREF=\"../pkg/AnnotationType.html#required()\">required</A>=1994)"+NL +
   1.228 -                "</FONT>public void <STRONG>method</STRONG>()"},
   1.229 +                "<pre><a href=\"../pkg/AnnotationType.html\" " +
   1.230 +                "title=\"annotation in pkg\">@AnnotationType</a>(" +
   1.231 +                "<a href=\"../pkg/AnnotationType.html#optional()\">optional</a>" +
   1.232 +                "=\"Method Annotation\"," + NL +
   1.233 +                "                <a href=\"../pkg/AnnotationType.html#required()\">" +
   1.234 +                "required</a>=1994)" + NL + "public&nbsp;void&nbsp;method()</pre>"},
   1.235  
   1.236              //METHOD PARAMS
   1.237              {BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html",
   1.238 -                "<PRE>" + NL +
   1.239 -                "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 +
   1.240 -                "                             int&nbsp;documented," + NL +
   1.241 -                "                             int&nbsp;undocmented)</PRE>"},
   1.242 +                "<pre>public&nbsp;void&nbsp;methodWithParams(" +
   1.243 +                "<a href=\"../pkg/AnnotationType.html\" title=\"annotation in pkg\">" +
   1.244 +                "@AnnotationType</a>(<a href=\"../pkg/AnnotationType.html#optional()\">" +
   1.245 +                "optional</a>=\"Parameter Annotation\",<a " +
   1.246 +                "href=\"../pkg/AnnotationType.html#required()\">required</a>=1994)" + NL +
   1.247 +                "                    int&nbsp;documented," + NL +
   1.248 +                "                    int&nbsp;undocmented)</pre>"},
   1.249  
   1.250              //CONSTRUCTOR PARAMS
   1.251              {BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html",
   1.252 -                "<PRE>" + NL +
   1.253 -                                "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 +
   1.254 -                                "                           int&nbsp;documented," + NL +
   1.255 -                "                           int&nbsp;undocmented)</PRE>"},
   1.256 +                "<pre>public&nbsp;AnnotationTypeUsage(<a " +
   1.257 +                "href=\"../pkg/AnnotationType.html\" title=\"annotation in pkg\">" +
   1.258 +                "@AnnotationType</a>(<a href=\"../pkg/AnnotationType.html#optional()\">" +
   1.259 +                "optional</a>=\"Constructor Param Annotation\",<a " +
   1.260 +                "href=\"../pkg/AnnotationType.html#required()\">required</a>=1994)" + NL +
   1.261 +                "                   int&nbsp;documented," + NL +
   1.262 +                "                   int&nbsp;undocmented)</pre>"},
   1.263  
   1.264              //=================================
   1.265              // ANNOTATION TYPE USAGE TESTING (All Different Types).
   1.266 @@ -229,59 +254,59 @@
   1.267  
   1.268              //Integer
   1.269              {BUG_ID + FS + "pkg1" + FS + "B.html",
   1.270 -                "<A HREF=\"../pkg1/A.html#d()\">d</A>=3.14,"},
   1.271 +                "<a href=\"../pkg1/A.html#d()\">d</a>=3.14,"},
   1.272  
   1.273              //Double
   1.274              {BUG_ID + FS + "pkg1" + FS + "B.html",
   1.275 -                "<A HREF=\"../pkg1/A.html#d()\">d</A>=3.14,"},
   1.276 +                "<a href=\"../pkg1/A.html#d()\">d</a>=3.14,"},
   1.277  
   1.278              //Boolean
   1.279              {BUG_ID + FS + "pkg1" + FS + "B.html",
   1.280 -                "<A HREF=\"../pkg1/A.html#b()\">b</A>=true,"},
   1.281 +                "<a href=\"../pkg1/A.html#b()\">b</a>=true,"},
   1.282  
   1.283              //String
   1.284              {BUG_ID + FS + "pkg1" + FS + "B.html",
   1.285 -                "<A HREF=\"../pkg1/A.html#s()\">s</A>=\"sigh\","},
   1.286 +                "<a href=\"../pkg1/A.html#s()\">s</a>=\"sigh\","},
   1.287  
   1.288              //Class
   1.289              {BUG_ID + FS + "pkg1" + FS + "B.html",
   1.290 -                "<A HREF=\"../pkg1/A.html#c()\">c</A>=<A HREF=\"../pkg2/Foo.html\" title=\"class in pkg2\">Foo.class</A>,"},
   1.291 +                "<a href=\"../pkg1/A.html#c()\">c</a>=<a href=\"../pkg2/Foo.html\" title=\"class in pkg2\">Foo.class</a>,"},
   1.292  
   1.293              //Bounded Class
   1.294              {BUG_ID + FS + "pkg1" + FS + "B.html",
   1.295 -                "<A HREF=\"../pkg1/A.html#w()\">w</A>=<A HREF=\"../pkg/TypeParameterSubClass.html\" title=\"class in pkg\">TypeParameterSubClass.class</A>,"},
   1.296 +                "<a href=\"../pkg1/A.html#w()\">w</a>=<a href=\"../pkg/TypeParameterSubClass.html\" title=\"class in pkg\">TypeParameterSubClass.class</a>,"},
   1.297  
   1.298              //Enum
   1.299              {BUG_ID + FS + "pkg1" + FS + "B.html",
   1.300 -                "<A HREF=\"../pkg1/A.html#e()\">e</A>=<A HREF=\"../pkg/Coin.html#Penny\">Penny</A>,"},
   1.301 +                "<a href=\"../pkg1/A.html#e()\">e</a>=<a href=\"../pkg/Coin.html#Penny\">Penny</a>,"},
   1.302  
   1.303              //Annotation Type
   1.304              {BUG_ID + FS + "pkg1" + FS + "B.html",
   1.305 -                "<A HREF=\"../pkg1/A.html#a()\">a</A>=<A HREF=\"../pkg/AnnotationType.html\" title=\"annotation in pkg\">@AnnotationType</A>(<A HREF=\"../pkg/AnnotationType.html#optional()\">optional</A>=\"foo\",<A HREF=\"../pkg/AnnotationType.html#required()\">required</A>=1994),"},
   1.306 +                "<a href=\"../pkg1/A.html#a()\">a</a>=<a href=\"../pkg/AnnotationType.html\" title=\"annotation in pkg\">@AnnotationType</a>(<a href=\"../pkg/AnnotationType.html#optional()\">optional</a>=\"foo\",<a href=\"../pkg/AnnotationType.html#required()\">required</a>=1994),"},
   1.307  
   1.308              //String Array
   1.309              {BUG_ID + FS + "pkg1" + FS + "B.html",
   1.310 -                "<A HREF=\"../pkg1/A.html#sa()\">sa</A>={\"up\",\"down\"},"},
   1.311 +                "<a href=\"../pkg1/A.html#sa()\">sa</a>={\"up\",\"down\"},"},
   1.312  
   1.313              //Primitive
   1.314              {BUG_ID + FS + "pkg1" + FS + "B.html",
   1.315 -                "<A HREF=\"../pkg1/A.html#primitiveClassTest()\">primitiveClassTest</A>=boolean.class,"},
   1.316 +                "<a href=\"../pkg1/A.html#primitiveClassTest()\">primitiveClassTest</a>=boolean.class,"},
   1.317  
   1.318              //XXX:  Add array test case after this if fixed:
   1.319              //5020899: Incorrect internal representation of class-valued annotation elements
   1.320  
   1.321              //Make sure that annotations are surrounded by <pre> and </pre>
   1.322              {BUG_ID + FS + "pkg1" + FS + "B.html",
   1.323 -                "<PRE><FONT SIZE=\"-1\"><A HREF=\"../pkg1/A.html\" title=\"annotation in pkg1\">@A</A>"},
   1.324 +                "<pre><a href=\"../pkg1/A.html\" title=\"annotation in pkg1\">@A</a>"},
   1.325              {BUG_ID + FS + "pkg1" + FS + "B.html",
   1.326 -                "</FONT>public interface <STRONG>B</STRONG></PRE>"},
   1.327 +                "public interface <strong>B</strong></pre>"},
   1.328  
   1.329  
   1.330              //==============================================================
   1.331              // Handle multiple bounds.
   1.332              //==============================================================
   1.333              {BUG_ID + FS + "pkg" + FS + "MultiTypeParameters.html",
   1.334 -                "public &lt;T extends java.lang.Number & java.lang.Runnable&gt; T <STRONG>foo</STRONG>(T&nbsp;t)"},
   1.335 +                "public&nbsp;&lt;T extends java.lang.Number & java.lang.Runnable&gt;&nbsp;T&nbsp;foo(T&nbsp;t)"},
   1.336  
   1.337              //==============================================================
   1.338              // Test Class-Use Documenation for Type Parameters.
   1.339 @@ -289,347 +314,356 @@
   1.340  
   1.341              //ClassUseTest1: <T extends Foo & Foo2>
   1.342              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html",
   1.343 -                     "<CAPTION CLASS=\"TableSubCaption\">" + NL +
   1.344 -                     "Classes in <A HREF=\"../../pkg2/package-summary.html\">pkg2" +
   1.345 -                     "</A> with type parameters of type <A HREF=\"../../pkg2/Foo.html\" " +
   1.346 -                     "title=\"class in pkg2\">Foo</A></CAPTION>"
   1.347 +                     "<caption><span>Classes in <a href=\"../../pkg2/" +
   1.348 +                     "package-summary.html\">pkg2</a> with type parameters of " +
   1.349 +                     "type <a href=\"../../pkg2/Foo.html\" title=\"class in pkg2\">" +
   1.350 +                     "Foo</a></span><span class=\"tabEnd\">&nbsp;</span></caption>"
   1.351              },
   1.352              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html",
   1.353 -                "<TD><CODE><STRONG><A HREF=\"../../pkg2/ClassUseTest1.html\" title=\"class in pkg2\">ClassUseTest1&lt;T extends Foo & Foo2&gt;</A></STRONG></CODE>"
   1.354 +                     "<td class=\"colLast\"><code><strong><a href=\"../../pkg2/" +
   1.355 +                     "ClassUseTest1.html\" title=\"class in pkg2\">ClassUseTest1" +
   1.356 +                     "&lt;T extends Foo & Foo2&gt;</a></strong></code>&nbsp;</td>"
   1.357              },
   1.358              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html",
   1.359 -                     "<CAPTION CLASS=\"TableSubCaption\">" + NL +
   1.360 -                     "Methods in <A HREF=\"../../pkg2/package-summary.html\">pkg2" +
   1.361 -                     "</A> with type parameters of type <A HREF=\"../../pkg2/Foo.html\" " +
   1.362 -                     "title=\"class in pkg2\">Foo</A></CAPTION>"
   1.363 +                     "<caption><span>Methods in <a href=\"../../pkg2/" +
   1.364 +                     "package-summary.html\">pkg2</a> with type parameters of " +
   1.365 +                     "type <a href=\"../../pkg2/Foo.html\" title=\"class in " +
   1.366 +                     "pkg2\">Foo</a></span><span class=\"tabEnd\">&nbsp;</span></caption>"
   1.367              },
   1.368              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html",
   1.369 -                "<TD><CODE><STRONG>ClassUseTest1.</STRONG><STRONG><A HREF=\"../../pkg2/ClassUseTest1.html#method(T)\">method</A></STRONG>(T&nbsp;t)</CODE>"
   1.370 +                     "<td class=\"colLast\"><span class=\"strong\">ClassUseTest1." +
   1.371 +                     "</span><code><strong><a href=\"../../pkg2/" +
   1.372 +                     "ClassUseTest1.html#method(T)\">method</a></strong>" +
   1.373 +                     "(T&nbsp;t)</code>&nbsp;</td>"
   1.374              },
   1.375              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html",
   1.376 -                     "<CAPTION CLASS=\"TableSubCaption\">" + NL +
   1.377 -                     "Fields in <A HREF=\"../../pkg2/package-summary.html\">pkg2" +
   1.378 -                     "</A> with type parameters of type <A HREF=\"../../pkg2/Foo.html\" " +
   1.379 -                     "title=\"class in pkg2\">Foo</A></CAPTION>"
   1.380 +                     "<caption><span>Fields in <a href=\"../../pkg2/" +
   1.381 +                     "package-summary.html\">pkg2</a> with type parameters of " +
   1.382 +                     "type <a href=\"../../pkg2/Foo.html\" title=\"class in pkg2\">" +
   1.383 +                     "Foo</a></span><span class=\"tabEnd\">&nbsp;</span></caption>"
   1.384              },
   1.385              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html",
   1.386 -                "<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.387 +                     "td class=\"colFirst\"><code><a href=\"../../pkg2/" +
   1.388 +                     "ParamTest.html\" title=\"class in pkg2\">ParamTest</a>" +
   1.389 +                     "&lt;<a href=\"../../pkg2/Foo.html\" title=\"class in pkg2\"" +
   1.390 +                     ">Foo</a>&gt;</code></td>"
   1.391              },
   1.392  
   1.393              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html",
   1.394 -                     "<CAPTION CLASS=\"TableSubCaption\">" + NL +
   1.395 -                     "Fields in <A HREF=\"../../pkg2/package-summary.html\">pkg2" +
   1.396 -                     "</A> declared as <A HREF=\"../../pkg2/ParamTest.html\" " +
   1.397 -                     "title=\"class in pkg2\">ParamTest</A></CAPTION>"
   1.398 +                     "<caption><span>Fields in <a href=\"../../pkg2/" +
   1.399 +                     "package-summary.html\">pkg2</a> declared as <a href=\"../" +
   1.400 +                     "../pkg2/ParamTest.html\" title=\"class in pkg2\">ParamTest" +
   1.401 +                     "</a></span><span class=\"tabEnd\">&nbsp;</span></caption>"
   1.402              },
   1.403              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html",
   1.404 -                "<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.405 +                     "<td class=\"colFirst\"><code><a href=\"../../pkg2/" +
   1.406 +                     "ParamTest.html\" title=\"class in pkg2\">ParamTest</a>&lt;<a " +
   1.407 +                     "href=\"../../pkg2/Foo.html\" title=\"class in pkg2\">Foo</a" +
   1.408 +                     ">&gt;</code></td>"
   1.409              },
   1.410  
   1.411             {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo2.html",
   1.412 -                    "<CAPTION CLASS=\"TableSubCaption\">" + NL +
   1.413 -                    "Classes in <A HREF=\"../../pkg2/package-summary.html\">pkg2" +
   1.414 -                    "</A> with type parameters of type <A HREF=\"../../pkg2/Foo2.html\" " +
   1.415 -                    "title=\"interface in pkg2\">Foo2</A></CAPTION>"
   1.416 +                    "<caption><span>Classes in <a href=\"../../pkg2/" +
   1.417 +                    "package-summary.html\">pkg2</a> with type parameters of " +
   1.418 +                    "type <a href=\"../../pkg2/Foo2.html\" title=\"interface " +
   1.419 +                    "in pkg2\">Foo2</a></span><span class=\"tabEnd\">&nbsp;" +
   1.420 +                    "</span></caption>"
   1.421             },
   1.422             {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo2.html",
   1.423 -            "<TD><CODE><STRONG><A HREF=\"../../pkg2/ClassUseTest1.html\" title=\"class in pkg2\">ClassUseTest1&lt;T extends Foo & Foo2&gt;</A></STRONG></CODE>"
   1.424 +                    "<td class=\"colLast\"><code><strong><a href=\"../../pkg2/" +
   1.425 +                    "ClassUseTest1.html\" title=\"class in pkg2\">" +
   1.426 +                    "ClassUseTest1&lt;T extends Foo & Foo2&gt;</a></strong>" +
   1.427 +                    "</code>&nbsp;</td>"
   1.428             },
   1.429             {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo2.html",
   1.430 -                    "<CAPTION CLASS=\"TableSubCaption\">" + NL +
   1.431 -                    "Methods in <A HREF=\"../../pkg2/package-summary.html\">pkg2" +
   1.432 -                    "</A> with type parameters of type <A HREF=\"../../pkg2/Foo2.html\" " +
   1.433 -                    "title=\"interface in pkg2\">Foo2</A></CAPTION>"
   1.434 +                    "<caption><span>Methods in <a href=\"../../pkg2/" +
   1.435 +                    "package-summary.html\">pkg2</a> with type parameters of " +
   1.436 +                    "type <a href=\"../../pkg2/Foo2.html\" title=\"interface " +
   1.437 +                    "in pkg2\">Foo2</a></span><span class=\"tabEnd\">&nbsp;" +
   1.438 +                    "</span></caption>"
   1.439              },
   1.440              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo2.html",
   1.441 -               "<TD><CODE><STRONG>ClassUseTest1.</STRONG><STRONG><A HREF=\"../../pkg2/ClassUseTest1.html#method(T)\">method</A></STRONG>(T&nbsp;t)</CODE>"
   1.442 +                     "<td class=\"colLast\"><span class=\"strong\">" +
   1.443 +                     "ClassUseTest1.</span><code><strong><a href=\"../../" +
   1.444 +                     "pkg2/ClassUseTest1.html#method(T)\">method</a></strong>" +
   1.445 +                     "(T&nbsp;t)</code>&nbsp;</td>"
   1.446              },
   1.447  
   1.448              //ClassUseTest2: <T extends ParamTest<Foo3>>
   1.449              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html",
   1.450 -                     "<CAPTION CLASS=\"TableSubCaption\">" + NL +
   1.451 -                     "Classes in <A HREF=\"../../pkg2/package-summary.html\">pkg2" +
   1.452 -                     "</A> with type parameters of type <A HREF=\"../../pkg2/ParamTest.html\" " +
   1.453 -                     "title=\"class in pkg2\">ParamTest</A></CAPTION>"
   1.454 +                     "<caption><span>Classes in <a href=\"../../pkg2/" +
   1.455 +                     "package-summary.html\">pkg2</a> with type parameters of " +
   1.456 +                     "type <a href=\"../../pkg2/ParamTest.html\" title=\"class " +
   1.457 +                     "in pkg2\">ParamTest</a></span><span class=\"tabEnd\">" +
   1.458 +                     "&nbsp;</span></caption>"
   1.459              },
   1.460              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html",
   1.461 -              "<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.462 +                     "<td class=\"colLast\"><code><strong><a href=\"../../pkg2/" +
   1.463 +                     "ClassUseTest2.html\" title=\"class in pkg2\">ClassUseTest2&lt;T " +
   1.464 +                     "extends ParamTest&lt;<a href=\"../../pkg2/Foo3.html\" title=\"class " +
   1.465 +                     "in pkg2\">Foo3</a>&gt;&gt;</a></strong></code>&nbsp;</td>"
   1.466              },
   1.467              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html",
   1.468 -                     "<CAPTION CLASS=\"TableSubCaption\">" + NL +
   1.469 -                     "Methods in <A HREF=\"../../pkg2/package-summary.html\">pkg2" +
   1.470 -                     "</A> with type parameters of type <A HREF=\"../../pkg2/ParamTest.html\" " +
   1.471 -                     "title=\"class in pkg2\">ParamTest</A></CAPTION>"
   1.472 +                     "<caption><span>Methods in <a href=\"../../pkg2/" +
   1.473 +                     "package-summary.html\">pkg2</a> with type parameters of " +
   1.474 +                     "type <a href=\"../../pkg2/ParamTest.html\" title=\"class " +
   1.475 +                     "in pkg2\">ParamTest</a></span><span class=\"tabEnd\">" +
   1.476 +                     "&nbsp;</span></caption>"
   1.477              },
   1.478              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html",
   1.479 -              "<TD><CODE><STRONG>ClassUseTest2.</STRONG><STRONG><A HREF=\"../../pkg2/ClassUseTest2.html#method(T)\">method</A></STRONG>(T&nbsp;t)</CODE>"
   1.480 +                     "<td class=\"colLast\"><span class=\"strong\">ClassUseTest2." +
   1.481 +                     "</span><code><strong><a href=\"../../pkg2/" +
   1.482 +                     "ClassUseTest2.html#method(T)\">method</a></strong>" +
   1.483 +                     "(T&nbsp;t)</code>&nbsp;</td>"
   1.484              },
   1.485              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html",
   1.486 -                     "<CAPTION CLASS=\"TableSubCaption\">" + NL +
   1.487 -                     "Fields in <A HREF=\"../../pkg2/package-summary.html\">pkg2" +
   1.488 -                     "</A> declared as <A HREF=\"../../pkg2/ParamTest.html\" " +
   1.489 -                     "title=\"class in pkg2\">ParamTest</A></CAPTION>"
   1.490 +                     "<caption><span>Fields in <a href=\"../../pkg2/" +
   1.491 +                     "package-summary.html\">pkg2</a> declared as <a href=\"../" +
   1.492 +                     "../pkg2/ParamTest.html\" title=\"class in pkg2\">ParamTest" +
   1.493 +                     "</a></span><span class=\"tabEnd\">&nbsp;</span></caption>"
   1.494              },
   1.495              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html",
   1.496 -              "<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.497 +                     "<td class=\"colFirst\"><code><a href=\"../../pkg2/" +
   1.498 +                     "ParamTest.html\" title=\"class in pkg2\">ParamTest</a>" +
   1.499 +                     "&lt;<a href=\"../../pkg2/Foo.html\" title=\"class in pkg2\">" +
   1.500 +                     "Foo</a>&gt;</code></td>"
   1.501              },
   1.502              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html",
   1.503 -                     "<CAPTION CLASS=\"TableSubCaption\">" + NL +
   1.504 -                     "Methods in <A HREF=\"../../pkg2/package-summary.html\">pkg2" +
   1.505 -                     "</A> with type parameters of type <A HREF=\"../../pkg2/ParamTest.html\" " +
   1.506 -                     "title=\"class in pkg2\">ParamTest</A></CAPTION>"
   1.507 +                     "<caption><span>Methods in <a href=\"../../pkg2/" +
   1.508 +                     "package-summary.html\">pkg2</a> with type parameters of " +
   1.509 +                     "type <a href=\"../../pkg2/ParamTest.html\" title=\"class " +
   1.510 +                     "in pkg2\">ParamTest</a></span><span class=\"tabEnd\">" +
   1.511 +                     "&nbsp;</span></caption>"
   1.512              },
   1.513              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html",
   1.514 -              "&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.515 +                     "<td class=\"colFirst\"><code>&lt;T extends <a href=\"../" +
   1.516 +                     "../pkg2/ParamTest.html\" title=\"class in pkg2\">ParamTest" +
   1.517 +                     "</a>&lt;<a href=\"../../pkg2/Foo3.html\" title=\"class in " +
   1.518 +                     "pkg2\">Foo3</a>&gt;&gt;&nbsp;<br><a href=\"../../pkg2/" +
   1.519 +                     "ParamTest.html\" title=\"class in pkg2\">ParamTest</a>" +
   1.520 +                     "&lt;<a href=\"../../pkg2/Foo3.html\" title=\"class in " +
   1.521 +                     "pkg2\">Foo3</a>&gt;</code></td>"
   1.522              },
   1.523  
   1.524              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html",
   1.525 -                     "<CAPTION CLASS=\"TableSubCaption\">" + NL +
   1.526 -                     "Classes in <A HREF=\"../../pkg2/package-summary.html\">pkg2" +
   1.527 -                     "</A> with type parameters of type <A HREF=\"../../pkg2/Foo3.html\" " +
   1.528 -                     "title=\"class in pkg2\">Foo3</A></CAPTION>"
   1.529 +                     "<caption><span>Classes in <a href=\"../../pkg2/" +
   1.530 +                     "package-summary.html\">pkg2</a> with type parameters of " +
   1.531 +                     "type <a href=\"../../pkg2/Foo3.html\" title=\"class in pkg2\">" +
   1.532 +                     "Foo3</a></span><span class=\"tabEnd\">&nbsp;</span></caption>"
   1.533              },
   1.534              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html",
   1.535 -                "<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.536 +                     "<td class=\"colLast\"><code><strong><a href=\"../../" +
   1.537 +                     "pkg2/ClassUseTest2.html\" title=\"class in pkg2\">" +
   1.538 +                     "ClassUseTest2&lt;T extends ParamTest&lt;<a href=\"../../" +
   1.539 +                     "pkg2/Foo3.html\" title=\"class in pkg2\">Foo3</a>&gt;&gt;" +
   1.540 +                     "</a></strong></code>&nbsp;</td>"
   1.541              },
   1.542              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html",
   1.543 -                     "<CAPTION CLASS=\"TableSubCaption\">" + NL +
   1.544 -                     "Methods in <A HREF=\"../../pkg2/package-summary.html\">pkg2" +
   1.545 -                     "</A> with type parameters of type <A HREF=\"../../pkg2/Foo3.html\" " +
   1.546 -                     "title=\"class in pkg2\">Foo3</A></CAPTION>"
   1.547 +                     "<caption><span>Methods in <a href=\"../../pkg2/" +
   1.548 +                     "package-summary.html\">pkg2</a> with type parameters of " +
   1.549 +                     "type <a href=\"../../pkg2/Foo3.html\" title=\"class in " +
   1.550 +                     "pkg2\">Foo3</a></span><span class=\"tabEnd\">&nbsp;" +
   1.551 +                     "</span></caption>"
   1.552              },
   1.553              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html",
   1.554 -                "<TD><CODE><STRONG>ClassUseTest2.</STRONG><STRONG><A HREF=\"../../pkg2/ClassUseTest2.html#method(T)\">method</A></STRONG>(T&nbsp;t)</CODE>"
   1.555 +                     "<td class=\"colLast\"><span class=\"strong\">ClassUseTest2." +
   1.556 +                     "</span><code><strong><a href=\"../../pkg2/" +
   1.557 +                     "ClassUseTest2.html#method(T)\">method</a></strong>" +
   1.558 +                     "(T&nbsp;t)</code>&nbsp;</td>"
   1.559              },
   1.560              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html",
   1.561 -                     "<CAPTION CLASS=\"TableSubCaption\">" + NL +
   1.562 -                     "Methods in <A HREF=\"../../pkg2/package-summary.html\">pkg2" +
   1.563 -                     "</A> that return types with arguments of type " +
   1.564 -                     "<A HREF=\"../../pkg2/Foo3.html\" title=\"class in pkg2\">" +
   1.565 -                     "Foo3</A></CAPTION>"
   1.566 +                     "<caption><span>Methods in <a href=\"../../pkg2/" +
   1.567 +                     "package-summary.html\">pkg2</a> that return types with " +
   1.568 +                     "arguments of type <a href=\"../../pkg2/Foo3.html\" title" +
   1.569 +                     "=\"class in pkg2\">Foo3</a></span><span class=\"tabEnd\">" +
   1.570 +                     "&nbsp;</span></caption>"
   1.571              },
   1.572              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html",
   1.573 -                "&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.574 +                     "<td class=\"colFirst\"><code>&lt;T extends <a href=\"../../" +
   1.575 +                     "pkg2/ParamTest.html\" title=\"class in pkg2\">ParamTest</a>&lt;" +
   1.576 +                     "<a href=\"../../pkg2/Foo3.html\" title=\"class in pkg2\">Foo3" +
   1.577 +                     "</a>&gt;&gt;&nbsp;<br><a href=\"../../pkg2/ParamTest.html\" " +
   1.578 +                     "title=\"class in pkg2\">ParamTest</a>&lt;<a href=\"../../pkg2/" +
   1.579 +                     "Foo3.html\" title=\"class in pkg2\">Foo3</a>&gt;</code></td>"
   1.580              },
   1.581  
   1.582              //ClassUseTest3: <T extends ParamTest2<List<? extends Foo4>>>
   1.583              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html",
   1.584 -                     "<CAPTION CLASS=\"TableSubCaption\">" + NL +
   1.585 -                     "Classes in <A HREF=\"../../pkg2/package-summary.html\">pkg2" +
   1.586 -                     "</A> with type parameters of type " +
   1.587 -                     "<A HREF=\"../../pkg2/ParamTest2.html\" title=\"class in pkg2\">" +
   1.588 -                     "ParamTest2</A></CAPTION>"
   1.589 +                     "<caption><span>Classes in <a href=\"../../pkg2/" +
   1.590 +                     "package-summary.html\">pkg2</a> with type parameters of " +
   1.591 +                     "type <a href=\"../../pkg2/ParamTest2.html\" title=\"class " +
   1.592 +                     "in pkg2\">ParamTest2</a></span><span class=\"tabEnd\">" +
   1.593 +                     "&nbsp;</span></caption>"
   1.594              },
   1.595              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html",
   1.596 -                "<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.597 +                     "<td class=\"colLast\"><code><strong><a href=\"../../pkg2/" +
   1.598 +                     "ClassUseTest3.html\" title=\"class in pkg2\">" +
   1.599 +                     "ClassUseTest3&lt;T extends ParamTest2&lt;java.util.List" +
   1.600 +                     "&lt;? extends Foo4&gt;&gt;&gt;</a></strong></code>&nbsp;</td>"
   1.601              },
   1.602              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html",
   1.603 -                     "<CAPTION CLASS=\"TableSubCaption\">" + NL +
   1.604 -                     "Methods in <A HREF=\"../../pkg2/package-summary.html\">pkg2" +
   1.605 -                     "</A> with type parameters of type " +
   1.606 -                     "<A HREF=\"../../pkg2/ParamTest2.html\" title=\"class in pkg2\">" +
   1.607 -                     "ParamTest2</A></CAPTION>"
   1.608 +                     "<caption><span>Methods in <a href=\"../../pkg2/" +
   1.609 +                     "package-summary.html\">pkg2</a> with type parameters of " +
   1.610 +                     "type <a href=\"../../pkg2/ParamTest2.html\" title=\"class " +
   1.611 +                     "in pkg2\">ParamTest2</a></span><span class=\"tabEnd\">" +
   1.612 +                     "&nbsp;</span></caption>"
   1.613              },
   1.614              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html",
   1.615 -                "<TD><CODE><STRONG>ClassUseTest3.</STRONG><STRONG><A HREF=\"../../pkg2/ClassUseTest3.html#method(T)\">method</A></STRONG>(T&nbsp;t)</CODE>"
   1.616 +                     "<td class=\"colLast\"><span class=\"strong\">ClassUseTest3" +
   1.617 +                     ".</span><code><strong><a href=\"../../pkg2/ClassUseTest3." +
   1.618 +                     "html#method(T)\">method</a></strong>(T&nbsp;t)</code>&nbsp;</td>"
   1.619              },
   1.620              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html",
   1.621 -                     "<CAPTION CLASS=\"TableSubCaption\">" + NL +
   1.622 -                     "Methods in <A HREF=\"../../pkg2/package-summary.html\">pkg2" +
   1.623 -                     "</A> with type parameters of type " +
   1.624 -                     "<A HREF=\"../../pkg2/ParamTest2.html\" title=\"class in pkg2\">" +
   1.625 -                     "ParamTest2</A></CAPTION>"
   1.626 -            },
   1.627 -            {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html",
   1.628 -                "&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.629 +                     "<td class=\"colFirst\"><code>&lt;T extends <a href=\"../" +
   1.630 +                     "../pkg2/ParamTest2.html\" title=\"class in pkg2\">" +
   1.631 +                     "ParamTest2</a>&lt;java.util.List&lt;? extends <a href=\".." +
   1.632 +                     "/../pkg2/Foo4.html\" title=\"class in pkg2\">Foo4</a>&gt;" +
   1.633 +                     "&gt;&gt;&nbsp;<br><a href=\"../../pkg2/ParamTest2.html\" " +
   1.634 +                     "title=\"class in pkg2\">ParamTest2</a>&lt;java.util.List" +
   1.635 +                     "&lt;? extends <a href=\"../../pkg2/Foo4.html\" title=\"" +
   1.636 +                     "class in pkg2\">Foo4</a>&gt;&gt;</code></td>"
   1.637              },
   1.638  
   1.639              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html",
   1.640 -                     "<CAPTION CLASS=\"TableSubCaption\">" + NL +
   1.641 -                     "Classes in <A HREF=\"../../pkg2/package-summary.html\">pkg2" +
   1.642 -                     "</A> with type parameters of type " +
   1.643 -                     "<A HREF=\"../../pkg2/Foo4.html\" title=\"class in pkg2\">" +
   1.644 -                     "Foo4</A></CAPTION>"
   1.645 +                     "<caption><span>Classes in <a href=\"../../pkg2/" +
   1.646 +                     "package-summary.html\">pkg2</a> with type parameters of " +
   1.647 +                     "type <a href=\"../../pkg2/Foo4.html\" title=\"class in " +
   1.648 +                     "pkg2\">Foo4</a></span><span class=\"tabEnd\">&nbsp;" +
   1.649 +                     "</span></caption>"
   1.650              },
   1.651              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html",
   1.652 -                "<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.653 +                     "<td class=\"colLast\"><code><strong><a href=\"../../" +
   1.654 +                     "pkg2/ClassUseTest3.html\" title=\"class in pkg2\">" +
   1.655 +                     "ClassUseTest3&lt;T extends ParamTest2&lt;java.util.List" +
   1.656 +                     "&lt;? extends Foo4&gt;&gt;&gt;</a></strong></code>&nbsp;</td>"
   1.657              },
   1.658              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html",
   1.659 -                     "<CAPTION CLASS=\"TableSubCaption\">" + NL +
   1.660 -                     "Methods in <A HREF=\"../../pkg2/package-summary.html\">pkg2" +
   1.661 -                     "</A> with type parameters of type <A HREF=\"../../pkg2/Foo4.html\" " +
   1.662 -                     "title=\"class in pkg2\">Foo4</A></CAPTION>"
   1.663 +                     "<caption><span>Methods in <a href=\"../../pkg2/" +
   1.664 +                     "package-summary.html\">pkg2</a> with type parameters of " +
   1.665 +                     "type <a href=\"../../pkg2/Foo4.html\" title=\"class in " +
   1.666 +                     "pkg2\">Foo4</a></span><span class=\"tabEnd\">&nbsp;</span></caption>"
   1.667              },
   1.668              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html",
   1.669 -                "<TD><CODE><STRONG>ClassUseTest3.</STRONG><STRONG><A HREF=\"../../pkg2/ClassUseTest3.html#method(T)\">method</A></STRONG>(T&nbsp;t)</CODE>"
   1.670 +                     "<td class=\"colLast\"><span class=\"strong\">ClassUseTest3." +
   1.671 +                     "</span><code><strong><a href=\"../../pkg2/ClassUseTest3." +
   1.672 +                     "html#method(T)\">method</a></strong>(T&nbsp;t)</code>" +
   1.673 +                     "&nbsp;</td>"
   1.674              },
   1.675              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html",
   1.676 -                     "<CAPTION CLASS=\"TableSubCaption\">" + NL +
   1.677 -                     "Methods in <A HREF=\"../../pkg2/package-summary.html\">pkg2" +
   1.678 -                     "</A> that return types with arguments of type " +
   1.679 -                     "<A HREF=\"../../pkg2/Foo4.html\" title=\"class in pkg2\">" +
   1.680 -                     "Foo4</A></CAPTION>"
   1.681 +                     "<caption><span>Methods in <a href=\"../../pkg2/" +
   1.682 +                     "package-summary.html\">pkg2</a> that return types with " +
   1.683 +                     "arguments of type <a href=\"../../pkg2/Foo4.html\" " +
   1.684 +                     "title=\"class in pkg2\">Foo4</a></span><span class=\"" +
   1.685 +                     "tabEnd\">&nbsp;</span></caption>"
   1.686              },
   1.687              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html",
   1.688 -                "&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.689 +                     "<td class=\"colFirst\"><code>&lt;T extends <a href=\"../" +
   1.690 +                     "../pkg2/ParamTest2.html\" title=\"class in pkg2\">" +
   1.691 +                     "ParamTest2</a>&lt;java.util.List&lt;? extends <a href=\".." +
   1.692 +                     "/../pkg2/Foo4.html\" title=\"class in pkg2\">Foo4</a>&gt;" +
   1.693 +                     "&gt;&gt;&nbsp;<br><a href=\"../../pkg2/ParamTest2.html\" " +
   1.694 +                     "title=\"class in pkg2\">ParamTest2</a>&lt;java.util.List" +
   1.695 +                     "&lt;? extends <a href=\"../../pkg2/Foo4.html\" title=\"" +
   1.696 +                     "class in pkg2\">Foo4</a>&gt;&gt;</code></td>"
   1.697              },
   1.698  
   1.699              //Type parameters in constructor and method args
   1.700              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html",
   1.701 -                     "<CAPTION CLASS=\"TableSubCaption\">" + NL +
   1.702 -                     "Method parameters in <A HREF=\"../../pkg2/package-summary.html\">pkg2" +
   1.703 -                     "</A> with type arguments of type <A HREF=\"../../pkg2/Foo4.html\" " +
   1.704 -                     "title=\"class in pkg2\">Foo4</A></CAPTION>" + NL +
   1.705 -                     "<TR>" + NL + "<TH CLASS=\"TableHeader\" SCOPE=\"col\"" +
   1.706 -                     " NOWRAP>Modifier and Type" +
   1.707 -                     "</TH>" + NL + "<TH CLASS=\"TableHeader\" SCOPE=\"col\"" +
   1.708 -                     " NOWRAP>Method and Description</TH>" + NL +
   1.709 -                     "</TR>" + NL +
   1.710 -                     "<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL +
   1.711 -                     "<TD ALIGN=\"right\" VALIGN=\"top\" WIDTH=\"1%\"><FONT SIZE=\"-1\">" + NL +
   1.712 -                     "<CODE>&nbsp;void</CODE></FONT></TD>" + NL +
   1.713 -                     "<TD><CODE><STRONG>ClassUseTest3.</STRONG><STRONG>" +
   1.714 -                     "<A HREF=\"../../pkg2/ClassUseTest3.html#method(java.util.Set)\">" +
   1.715 -                     "method</A></STRONG>(java.util.Set&lt;<A HREF=\"../../pkg2/Foo4.html\" " +
   1.716 -                     "title=\"class in pkg2\">Foo4</A>&gt;&nbsp;p)</CODE>"
   1.717 +                     "<caption><span>Method parameters in <a href=\"../../pkg2/" +
   1.718 +                     "package-summary.html\">pkg2</a> with type arguments of " +
   1.719 +                     "type <a href=\"../../pkg2/Foo4.html\" title=\"class in " +
   1.720 +                     "pkg2\">Foo4</a></span><span class=\"tabEnd\">&nbsp;" +
   1.721 +                     "</span></caption>" + NL + "<tr>" + NL +
   1.722 +                     "<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>" + NL +
   1.723 +                     "<th class=\"colLast\" scope=\"col\">Method and Description</th>" + NL +
   1.724 +                     "</tr>" + NL + "<tbody>" + NL + "<tr class=\"altColor\">" + NL +
   1.725 +                     "<td class=\"colFirst\"><code>void</code></td>" + NL +
   1.726 +                     "<td class=\"colLast\"><span class=\"strong\">ClassUseTest3." +
   1.727 +                     "</span><code><strong><a href=\"../../pkg2/ClassUseTest3." +
   1.728 +                     "html#method(java.util.Set)\">method</a></strong>(java." +
   1.729 +                     "util.Set&lt;<a href=\"../../pkg2/Foo4.html\" title=\"" +
   1.730 +                     "class in pkg2\">Foo4</a>&gt;&nbsp;p)</code>&nbsp;</td>" + NL +
   1.731 +                     "</tr>" + NL + "</tbody>"
   1.732              },
   1.733              {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html",
   1.734 -                     "<CAPTION CLASS=\"TableSubCaption\">" + NL +
   1.735 -                     "Constructor parameters in <A HREF=\"../../pkg2/package-summary.html\">" +
   1.736 -                     "pkg2</A> with type arguments of type <A HREF=\"../../pkg2/Foo4.html\" " +
   1.737 -                     "title=\"class in pkg2\">Foo4</A></CAPTION>" + NL +
   1.738 -                     "<TR>" + NL + "<TH CLASS=\"TableHeader\" SCOPE=\"col\"" +
   1.739 -                     " NOWRAP>Constructor and Description" +
   1.740 -                     "</TH>" + NL + "</TR>" + NL +
   1.741 -                     "<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL +
   1.742 -                     "<TD><CODE><STRONG><A HREF=\"../../pkg2/ClassUseTest3.html#ClassUseTest3" +
   1.743 -                     "(java.util.Set)\">ClassUseTest3</A></STRONG>(java.util.Set&lt;" +
   1.744 -                     "<A HREF=\"../../pkg2/Foo4.html\" title=\"class in pkg2\">" +
   1.745 -                     "Foo4</A>&gt;&nbsp;p)</CODE>"
   1.746 +                     "<caption><span>Constructor parameters in <a href=\"../../" +
   1.747 +                     "pkg2/package-summary.html\">pkg2</a> with type arguments " +
   1.748 +                     "of type <a href=\"../../pkg2/Foo4.html\" title=\"class in " +
   1.749 +                     "pkg2\">Foo4</a></span><span class=\"tabEnd\">&nbsp;" +
   1.750 +                     "</span></caption>"
   1.751              },
   1.752  
   1.753              //=================================
   1.754              // Annotatation Type Usage
   1.755              //=================================
   1.756              {BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html",
   1.757 -                     "Packages with annotations of type " +
   1.758 -                     "<A HREF=\"../../pkg/AnnotationType.html\" " +
   1.759 -                     "title=\"annotation in pkg\">AnnotationType</A></CAPTION>" + NL +
   1.760 -                     "<TR>" + NL + "<TH CLASS=\"TableHeader\" SCOPE=\"col\"" +
   1.761 -                     " NOWRAP>Package" +
   1.762 -                     "</TH>" + NL + "<TH CLASS=\"TableHeader\" SCOPE=\"col\"" +
   1.763 -                     " NOWRAP>Description</TH>" + NL + "</TR>" + NL +
   1.764 -                     "<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL +
   1.765 -                     "<TD><A HREF=\"../../pkg/package-summary.html\"><STRONG>pkg" +
   1.766 -                     "</STRONG></A></TD>"
   1.767 +                     "<caption><span>Packages with annotations of type <a href=\"" +
   1.768 +                     "../../pkg/AnnotationType.html\" title=\"annotation in pkg\">" +
   1.769 +                     "AnnotationType</a></span><span class=\"tabEnd\">&nbsp;" +
   1.770 +                     "</span></caption>"
   1.771              },
   1.772  
   1.773              {BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html",
   1.774 -                     "Classes in <A HREF=\"../../pkg/package-summary.html\">pkg" +
   1.775 -                     "</A> with annotations of type <A HREF=\"../../pkg/AnnotationType.html\" " +
   1.776 -                     "title=\"annotation in pkg\">AnnotationType</A></CAPTION>" + NL +
   1.777 -                     "<TR>" + NL + "<TH CLASS=\"TableHeader\" SCOPE=\"col\"" +
   1.778 -                     " NOWRAP>Modifier and Type" +
   1.779 -                     "</TH>" + NL + "<TH CLASS=\"TableHeader\" SCOPE=\"col\"" +
   1.780 -                     " NOWRAP>Class and Description</TH>" + NL +
   1.781 -                     "</TR>" + NL +
   1.782 -                     "<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL +
   1.783 -                     "<TD ALIGN=\"right\" VALIGN=\"top\" WIDTH=\"1%\"><FONT SIZE=\"-1\">" + NL +
   1.784 -                     "<CODE>&nbsp;class</CODE></FONT></TD>" + NL +
   1.785 -                     "<TD><CODE><STRONG><A HREF=\"../../pkg/AnnotationTypeUsage.html\" " +
   1.786 -                     "title=\"class in pkg\">AnnotationTypeUsage</A></STRONG></CODE>"
   1.787 +                     "<caption><span>Classes in <a href=\"../../pkg/" +
   1.788 +                     "package-summary.html\">pkg</a> with annotations of type " +
   1.789 +                     "<a href=\"../../pkg/AnnotationType.html\" title=\"" +
   1.790 +                     "annotation in pkg\">AnnotationType</a></span><span class" +
   1.791 +                     "=\"tabEnd\">&nbsp;</span></caption>"
   1.792              },
   1.793  
   1.794              {BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html",
   1.795 -                     "Fields in <A HREF=\"../../pkg/package-summary.html\">pkg" +
   1.796 -                     "</A> with annotations of type <A HREF=\"../../pkg/AnnotationType.html\" " +
   1.797 -                     "title=\"annotation in pkg\">AnnotationType</A></CAPTION>" + NL +
   1.798 -                     "<TR>" + NL + "<TH CLASS=\"TableHeader\" SCOPE=\"col\"" +
   1.799 -                     " NOWRAP>Modifier and Type" +
   1.800 -                     "</TH>" + NL + "<TH CLASS=\"TableHeader\" SCOPE=\"col\"" +
   1.801 -                     " NOWRAP>Field and Description</TH>" + NL +
   1.802 -                     "</TR>" + NL +
   1.803 -                     "<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL +
   1.804 -                     "<TD ALIGN=\"right\" VALIGN=\"top\" WIDTH=\"1%\"><FONT SIZE=\"-1\">" + NL +
   1.805 -                     "<CODE>&nbsp;int</CODE></FONT></TD>" + NL +
   1.806 -                     "<TD><CODE><STRONG>AnnotationTypeUsage.</STRONG><STRONG>" +
   1.807 -                     "<A HREF=\"../../pkg/AnnotationTypeUsage.html#field\">field" +
   1.808 -                     "</A></STRONG></CODE>"
   1.809 +                     "<caption><span>Fields in <a href=\"../../pkg/" +
   1.810 +                     "package-summary.html\">pkg</a> with annotations of type " +
   1.811 +                     "<a href=\"../../pkg/AnnotationType.html\" title=\"annotation " +
   1.812 +                     "in pkg\">AnnotationType</a></span><span class=\"tabEnd\">" +
   1.813 +                     "&nbsp;</span></caption>"
   1.814              },
   1.815  
   1.816              {BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html",
   1.817 -                     "Methods in <A HREF=\"../../pkg/package-summary.html\">pkg" +
   1.818 -                     "</A> with annotations of type <A HREF=\"../../pkg/AnnotationType.html\" " +
   1.819 -                     "title=\"annotation in pkg\">AnnotationType</A></CAPTION>" + NL +
   1.820 -                     "<TR>" + NL + "<TH CLASS=\"TableHeader\" SCOPE=\"col\"" +
   1.821 -                     " NOWRAP>Modifier and Type" +
   1.822 -                     "</TH>" + NL + "<TH CLASS=\"TableHeader\" SCOPE=\"col\"" +
   1.823 -                     " NOWRAP>Method and Description</TH>" + NL +
   1.824 -                     "</TR>" + NL +
   1.825 -                     "<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL +
   1.826 -                     "<TD ALIGN=\"right\" VALIGN=\"top\" WIDTH=\"1%\"><FONT SIZE=\"-1\">" + NL +
   1.827 -                     "<CODE>&nbsp;void</CODE></FONT></TD>" + NL +
   1.828 -                     "<TD><CODE><STRONG>AnnotationTypeUsage.</STRONG><STRONG>" +
   1.829 -                     "<A HREF=\"../../pkg/AnnotationTypeUsage.html#method()\">" +
   1.830 -                     "method</A></STRONG>()</CODE>"
   1.831 +                     "<caption><span>Methods in <a href=\"../../pkg/" +
   1.832 +                     "package-summary.html\">pkg</a> with annotations of type " +
   1.833 +                     "<a href=\"../../pkg/AnnotationType.html\" title=\"annotation " +
   1.834 +                     "in pkg\">AnnotationType</a></span><span class=\"tabEnd\">" +
   1.835 +                     "&nbsp;</span></caption>"
   1.836              },
   1.837  
   1.838              {BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html",
   1.839 -                     "Method parameters in <A HREF=\"../../pkg/package-summary.html\">pkg" +
   1.840 -                     "</A> with annotations of type <A HREF=\"../../pkg/AnnotationType.html\" " +
   1.841 -                     "title=\"annotation in pkg\">AnnotationType</A></CAPTION>" + NL +
   1.842 -                     "<TR>" + NL + "<TH CLASS=\"TableHeader\" SCOPE=\"col\"" +
   1.843 -                     " NOWRAP>Modifier and Type" +
   1.844 -                     "</TH>" + NL + "<TH CLASS=\"TableHeader\" SCOPE=\"col\"" +
   1.845 -                     " NOWRAP>Method and Description</TH>" + NL +
   1.846 -                     "</TR>" + NL +
   1.847 -                     "<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL +
   1.848 -                     "<TD ALIGN=\"right\" VALIGN=\"top\" WIDTH=\"1%\"><FONT SIZE=\"-1\">" + NL +
   1.849 -                     "<CODE>&nbsp;void</CODE></FONT></TD>" + NL +
   1.850 -                     "<TD><CODE><STRONG>AnnotationTypeUsage.</STRONG><STRONG>" +
   1.851 -                     "<A HREF=\"../../pkg/AnnotationTypeUsage.html#methodWithParams" +
   1.852 -                     "(int, int)\">methodWithParams</A></STRONG>(int&nbsp;documented," + NL +
   1.853 -                     "                 int&nbsp;undocmented)</CODE>"
   1.854 +                     "<caption><span>Method parameters in <a href=\"../../pkg/" +
   1.855 +                     "package-summary.html\">pkg</a> with annotations of type " +
   1.856 +                     "<a href=\"../../pkg/AnnotationType.html\" title=\"annotation " +
   1.857 +                     "in pkg\">AnnotationType</a></span><span class=\"tabEnd\">" +
   1.858 +                     "&nbsp;</span></caption>"
   1.859              },
   1.860  
   1.861              {BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html",
   1.862 -                     "Constructors in <A HREF=\"../../pkg/package-summary.html\">pkg" +
   1.863 -                     "</A> with annotations of type <A HREF=\"../../pkg/AnnotationType.html\" " +
   1.864 -                     "title=\"annotation in pkg\">AnnotationType</A></CAPTION>" + NL +
   1.865 -                     "<TR>" + NL + "<TH CLASS=\"TableHeader\" SCOPE=\"col\"" +
   1.866 -                     " NOWRAP>Constructor and Description" +
   1.867 -                     "</TH>" + NL + "</TR>" + NL +
   1.868 -                     "<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL +
   1.869 -                     "<TD><CODE><STRONG><A HREF=\"../../pkg/" +
   1.870 -                     "AnnotationTypeUsage.html#AnnotationTypeUsage()\">" +
   1.871 -                     "AnnotationTypeUsage</A></STRONG>()</CODE>"
   1.872 +                     "<caption><span>Constructors in <a href=\"../../pkg/" +
   1.873 +                     "package-summary.html\">pkg</a> with annotations of type " +
   1.874 +                     "<a href=\"../../pkg/AnnotationType.html\" title=\"annotation " +
   1.875 +                     "in pkg\">AnnotationType</a></span><span class=\"tabEnd\">" +
   1.876 +                     "&nbsp;</span></caption>"
   1.877              },
   1.878  
   1.879              {BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html",
   1.880 -                     "Constructor parameters in <A HREF=\"../../pkg/package-summary.html\">pkg" +
   1.881 -                     "</A> with annotations of type <A HREF=\"../../pkg/AnnotationType.html\" " +
   1.882 -                     "title=\"annotation in pkg\">AnnotationType</A></CAPTION>" + NL +
   1.883 -                     "<TR>" + NL + "<TH CLASS=\"TableHeader\" SCOPE=\"col\"" +
   1.884 -                     " NOWRAP>Constructor and Description" +
   1.885 -                     "</TH>" + NL + "</TR>" + NL +
   1.886 -                     "<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL +
   1.887 -                     "<TD><CODE><STRONG><A HREF=\"../../pkg/" +
   1.888 -                     "AnnotationTypeUsage.html#AnnotationTypeUsage(int, int)\">" +
   1.889 -                     "AnnotationTypeUsage</A></STRONG>(int&nbsp;documented," + NL +
   1.890 -                     "                    int&nbsp;undocmented)</CODE>"
   1.891 +                     "<caption><span>Constructor parameters in <a href=\"../../" +
   1.892 +                     "pkg/package-summary.html\">pkg</a> with annotations of " +
   1.893 +                     "type <a href=\"../../pkg/AnnotationType.html\" title=\"" +
   1.894 +                     "annotation in pkg\">AnnotationType</a></span><span class=\"" +
   1.895 +                     "tabEnd\">&nbsp;</span></caption>"
   1.896              },
   1.897  
   1.898              //=================================
   1.899              // TYPE PARAMETER IN INDEX
   1.900              //=================================
   1.901              {BUG_ID + FS + "index-all.html",
   1.902 -                "<A HREF=\"./pkg2/Foo.html#method(java.util.Vector)\"><STRONG>method(Vector&lt;Object&gt;)</STRONG></A>"
   1.903 +                "<span class=\"strong\"><a href=\"./pkg2/Foo.html#method(java.util.Vector)\">" +
   1.904 +                "method(Vector&lt;Object&gt;)</a></span>"
   1.905              },
   1.906              //=================================
   1.907              // TYPE PARAMETER IN INDEX
   1.908              //=================================
   1.909              {BUG_ID + FS + "index-all.html",
   1.910 -                "<A HREF=\"./pkg2/Foo.html#method(java.util.Vector)\"><STRONG>method(Vector&lt;Object&gt;)</STRONG></A>"
   1.911 +                "<span class=\"strong\"><a href=\"./pkg2/Foo.html#method(java.util.Vector)\">" +
   1.912 +                "method(Vector&lt;Object&gt;)</a></span>"
   1.913              },
   1.914          };
   1.915      private static final String[][] NEGATED_TEST = {
   1.916 @@ -637,15 +671,15 @@
   1.917          // ENUM TESTING
   1.918          //=================================
   1.919          //NO constructor section
   1.920 -        {BUG_ID + FS + "pkg" + FS + "Coin.html", "<STRONG>Constructor Summary</STRONG>"},
   1.921 +        {BUG_ID + FS + "pkg" + FS + "Coin.html", "<span class=\"strong\">Constructor Summary</span>"},
   1.922          //=================================
   1.923          // TYPE PARAMETER TESTING
   1.924          //=================================
   1.925          //No type parameters in class frame.
   1.926          {BUG_ID + FS + "allclasses-frame.html",
   1.927 -            "<A HREF=\"../pkg/TypeParameters.html\" title=\"class in pkg\">" +
   1.928 -                    "TypeParameters</A>&lt;<A HREF=\"../pkg/TypeParameters.html\" " +
   1.929 -                    "title=\"type parameter in TypeParameters\">E</A>&gt;"
   1.930 +            "<a href=\"../pkg/TypeParameters.html\" title=\"class in pkg\">" +
   1.931 +                    "TypeParameters</a>&lt;<a href=\"../pkg/TypeParameters.html\" " +
   1.932 +                    "title=\"type parameter in TypeParameters\">E</a>&gt;"
   1.933          },
   1.934  
   1.935          //==============================================================
   1.936 @@ -654,31 +688,27 @@
   1.937  
   1.938          //CLASS
   1.939          {BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html",
   1.940 -            "<FONT SIZE=\"-1\">" + NL +
   1.941 -            "<A HREF=\"../pkg/AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</A>(<A HREF=\"../pkg/AnnotationType.html#optional\">optional</A>=\"Class Annotation\"," + NL +
   1.942 -            "                <A HREF=\"../pkg/AnnotationType.html#required\">required</A>=1994)" + NL +
   1.943 -            "</FONT>public class <STRONG>AnnotationTypeUsage</STRONG></DT><DT>extends java.lang.Object</DT></DL>"},
   1.944 +            "<a href=\"../pkg/AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</a>(<a href=\"../pkg/AnnotationType.html#optional\">optional</a>=\"Class Annotation\"," + NL +
   1.945 +            "                <a href=\"../pkg/AnnotationType.html#required\">required</a>=1994)" + NL +
   1.946 +            "public class <strong>AnnotationTypeUsage</strong></dt><dt>extends java.lang.Object</dt>"},
   1.947  
   1.948          //FIELD
   1.949          {BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html",
   1.950 -            "<FONT SIZE=\"-1\">" + NL +
   1.951 -            "<A HREF=\"../pkg/AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</A>(<A HREF=\"../pkg/AnnotationType.html#optional\">optional</A>=\"Field Annotation\"," + NL +
   1.952 -            "                <A HREF=\"../pkg/AnnotationType.html#required\">required</A>=1994)" + NL +
   1.953 -            "</FONT>public int <STRONG>field</STRONG>"},
   1.954 +            "<a href=\"../pkg/AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</a>(<a href=\"../pkg/AnnotationType.html#optional\">optional</a>=\"Field Annotation\"," + NL +
   1.955 +            "                <a href=\"../pkg/AnnotationType.html#required\">required</a>=1994)" + NL +
   1.956 +            "public int <strong>field</strong>"},
   1.957  
   1.958          //CONSTRUCTOR
   1.959          {BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html",
   1.960 -            "<FONT SIZE=\"-1\">" + NL +
   1.961 -            "<A HREF=\"../pkg/AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</A>(<A HREF=\"../pkg/AnnotationType.html#optional\">optional</A>=\"Constructor Annotation\"," + NL +
   1.962 -            "                <A HREF=\"../pkg/AnnotationType.html#required\">required</A>=1994)" + NL +
   1.963 -            "</FONT>public <STRONG>AnnotationTypeUsage</STRONG>()"},
   1.964 +            "<a href=\"../pkg/AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</a>(<a href=\"../pkg/AnnotationType.html#optional\">optional</a>=\"Constructor Annotation\"," + NL +
   1.965 +            "                <a href=\"../pkg/AnnotationType.html#required\">required</a>=1994)" + NL +
   1.966 +            "public <strong>AnnotationTypeUsage</strong>()"},
   1.967  
   1.968          //METHOD
   1.969          {BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html",
   1.970 -            "<FONT SIZE=\"-1\">" + NL +
   1.971 -            "<A HREF=\"../pkg/AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</A>(<A HREF=\"../pkg/AnnotationType.html#optional\">optional</A>=\"Method Annotation\"," + NL +
   1.972 -            "                <A HREF=\"../pkg/AnnotationType.html#required\">required</A>=1994)" + NL +
   1.973 -            "</FONT>public void <STRONG>method</STRONG>()"},
   1.974 +            "<a href=\"../pkg/AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</a>(<a href=\"../pkg/AnnotationType.html#optional\">optional</a>=\"Method Annotation\"," + NL +
   1.975 +            "                <a href=\"../pkg/AnnotationType.html#required\">required</a>=1994)" + NL +
   1.976 +            "public void <strong>method</strong>()"},
   1.977  
   1.978          //=================================
   1.979          // Make sure annotation types do not

mercurial