< prev index next >

test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/TestNewLanguageFeatures.java

Print this page

        

@@ -79,12 +79,14 @@
                 // Automatically insert documentation for values() and valueOf().
                 "Returns an array containing the constants of this enum type,",
                 "Returns the enum constant of this type with the specified name",
                 "Overloaded valueOf() method has correct documentation.",
                 "Overloaded values method  has correct documentation.",
-                "<pre class=\"methodSignature\">public static&nbsp;<a href=\"Coin.html\" title=\"enum in pkg\">Coin</a>" +
-                "&nbsp;valueOf​(java.lang.String&nbsp;name)</pre>\n" +
+                "<div class=\"memberSignature\"><span class=\"modifiers\">public static</span>&nbsp;"
+                + "<span class=\"returnType\"><a href=\"Coin.html\" title=\"enum in pkg\">Coin</a></span>&nbsp;"
+                + "<span class=\"memberName\">valueOf</span>​("
+                + "<span class=\"arguments\">java.lang.String&nbsp;name)</span></div>\n" +
                 "<div class=\"block\">Returns the enum constant of this type with the specified name.\n" +
                 "The string must match <i>exactly</i> an identifier used to declare an\n" +
                 "enum constant in this type.  (Extraneous whitespace characters are \n" +
                 "not permitted.)</div>\n" +
                 "<dl>\n" +

@@ -129,23 +131,27 @@
                 + "<dd><code>T</code> - This is the first "
                 + "type parameter.</dd>\n"
                 + "<dd><code>V</code> - This is the second type "
                 + "parameter.",
                 // Signature of method with type parameters
-                "public&nbsp;&lt;T extends java.util.List,​V&gt;&nbsp;"
-                + "java.lang.String[]&nbsp;methodThatHasTypeParameters",
+                "<div class=\"memberSignature\"><span class=\"modifiers\">public</span>&nbsp;"
+                + "<span class=\"typeParameters\">&lt;T extends java.util.List,​\nV&gt;</span>\n"
+                + "<span class=\"returnType\">java.lang.String[]</span>&nbsp;<span class=\"memberName\">"
+                + "methodThatHasTypeParameters</span>​(<span class=\"arguments\">T&nbsp;param1,\n"
+                + "V&nbsp;param2)</span></div>",
                 // Method that returns TypeParameters
                 "<td class=\"colFirst\"><code><a href=\"TypeParameters.html\" "
                 + "title=\"type parameter in TypeParameters\">E</a>[]</code></td>\n"
                 + "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">"
                 + "<a href=\"#methodThatReturnsTypeParameterA(E%5B%5D)\">"
                 + "methodThatReturnsTypeParameterA</a></span>​(<a href=\"TypeParameters.html\" "
                 + "title=\"type parameter in TypeParameters\">E</a>[]&nbsp;e)</code>",
-                "<pre class=\"methodSignature\">public&nbsp;<a href=\"TypeParameters.html\" "
-                + "title=\"type parameter in TypeParameters\">E</a>[]&nbsp;"
-                + "methodThatReturnsTypeParameterA​(<a href=\"TypeParameters.html\" "
-                + "title=\"type parameter in TypeParameters\">E</a>[]&nbsp;e)</pre>\n",
+                "<div class=\"memberSignature\"><span class=\"modifiers\">public</span>&nbsp;<span "
+                + "class=\"returnType\"><a href=\"TypeParameters.html\" title=\"type parameter in TypeParameters\">"
+                + "E</a>[]</span>&nbsp;<span class=\"memberName\">methodThatReturnsTypeParameterA</span>​("
+                + "<span class=\"arguments\"><a href=\"TypeParameters.html\" title=\"type parameter in TypeParameters\">"
+                + "E</a>[]&nbsp;e)</span></div>\n",
                 "<td class=\"colFirst\"><code>&lt;T extends java.lang.Object &amp; java.lang.Comparable&lt;? super T&gt;&gt;"
                 + "<br>T</code></td>\n"
                 + "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">"
                 + "<a href=\"#methodtThatReturnsTypeParametersB(java.util.Collection)\">"
                 + "methodtThatReturnsTypeParametersB</a></span>​(java.util.Collection&lt;? extends T&gt;&nbsp;coll)</code>",

@@ -208,11 +214,14 @@
 
         //==============================================================
         // Handle multiple bounds.
         //==============================================================
         checkOutput("pkg/MultiTypeParameters.html", true,
-                "public&nbsp;&lt;T extends java.lang.Number &amp; java.lang.Runnable&gt;&nbsp;T&nbsp;foo​(T&nbsp;t)");
+                "<div class=\"memberSignature\"><span class=\"modifiers\">public</span>&nbsp;"
+                + "<span class=\"typeParameters\">&lt;T extends java.lang.Number &amp; java.lang.Runnable&gt;</span>\n"
+                + "<span class=\"returnType\">T</span>&nbsp;<span class=\"memberName\">foo</span>​"
+                + "(<span class=\"arguments\">T&nbsp;t)</span></div>");
 
         //==============================================================
         // Test Class-Use Documentation for Type Parameters.
         //==============================================================
         // ClassUseTest1: <T extends Foo & Foo2>

@@ -529,49 +538,46 @@
                 + "required</a>=1994)\n"
                 + "public class <span class=\"typeNameLabel\">"
                 + "AnnotationTypeUsage</span>\n"
                 + "extends java.lang.Object</pre>",
                 // FIELD
-                "<pre><a href=\"AnnotationType.html\" "
-                + "title=\"annotation in pkg\">@AnnotationType</a>("
-                + "<a href=\"AnnotationType.html#optional()\">optional</a>"
-                + "=\"Field Annotation\",\n"
-                + "                <a href=\"AnnotationType.html#required()\">"
-                + "required</a>=1994)\n"
-                + "public&nbsp;int field</pre>",
+                "<div class=\"memberSignature\"><span class=\"annotations\"><a href=\"AnnotationType.html\" "
+                + "title=\"annotation in pkg\">@AnnotationType</a>(<a href=\"AnnotationType.html#optional()\">"
+                + "optional</a>=\"Field Annotation\",\n"
+                + "                <a href=\"AnnotationType.html#required()\">required</a>=1994)\n"
+                + "</span><span class=\"modifiers\">public</span>&nbsp;<span class=\"returnType\">int</span>"
+                + "&nbsp;<span class=\"memberName\">field</span></div>",
                 // CONSTRUCTOR
-                "<pre><a href=\"AnnotationType.html\" "
-                + "title=\"annotation in pkg\">@AnnotationType</a>("
-                + "<a href=\"AnnotationType.html#optional()\">optional</a>"
-                + "=\"Constructor Annotation\",\n"
-                + "                <a href=\"AnnotationType.html#required()\">"
-                + "required</a>=1994)\n"
-                + "public&nbsp;AnnotationTypeUsage()</pre>",
+                "<div class=\"memberSignature\"><span class=\"annotations\"><a href=\"AnnotationType.html\" "
+                + "title=\"annotation in pkg\">@AnnotationType</a>(<a href=\"AnnotationType.html#optional()\">"
+                + "optional</a>=\"Constructor Annotation\",\n"
+                + "                <a href=\"AnnotationType.html#required()\">required</a>=1994)\n"
+                + "</span><span class=\"modifiers\">public</span>&nbsp;"
+                + "<span class=\"memberName\">AnnotationTypeUsage</span>()</div>",
                 // METHOD
-                "<pre class=\"methodSignature\"><a href=\"AnnotationType.html\" "
-                + "title=\"annotation in pkg\">@AnnotationType</a>("
-                + "<a href=\"AnnotationType.html#optional()\">optional</a>"
-                + "=\"Method Annotation\",\n"
-                + "                <a href=\"AnnotationType.html#required()\">"
-                + "required</a>=1994)\n"
-                + "public&nbsp;void&nbsp;method()</pre>",
+                "<div class=\"memberSignature\"><span class=\"annotations\"><a href=\"AnnotationType.html\" "
+                + "title=\"annotation in pkg\">@AnnotationType</a>(<a href=\"AnnotationType.html#optional()\">"
+                + "optional</a>=\"Method Annotation\",\n"
+                + "                <a href=\"AnnotationType.html#required()\">required</a>=1994)\n"
+                + "</span><span class=\"modifiers\">public</span>&nbsp;<span class=\"returnType\">"
+                + "void</span>&nbsp;<span class=\"memberName\">method</span>()</div>",
                 // METHOD PARAMS
-                "<pre class=\"methodSignature\">public&nbsp;void&nbsp;methodWithParams​("
-                + "<a href=\"AnnotationType.html\" title=\"annotation in pkg\">"
-                + "@AnnotationType</a>(<a href=\"AnnotationType.html#optional()\">"
-                + "optional</a>=\"Parameter Annotation\",<a "
-                + "href=\"AnnotationType.html#required()\">required</a>=1994)\n"
-                + "                             int&nbsp;documented,\n"
-                + "                             int&nbsp;undocmented)</pre>",
+                "<div class=\"memberSignature\"><span class=\"modifiers\">public</span>&nbsp;<span "
+                + "class=\"returnType\">void</span>&nbsp;<span class=\"memberName\">methodWithParams</span>"
+                + "​(<span class=\"arguments\"><a href=\"AnnotationType.html\" title=\"annotation in pkg\">"
+                + "@AnnotationType</a>(<a href=\"AnnotationType.html#optional()\">optional</a>"
+                + "=\"Parameter Annotation\",<a href=\"AnnotationType.html#required()\">required</a>=1994)\n"
+                + "int&nbsp;documented,\n"
+                + "int&nbsp;undocmented)</span></div>",
                 // CONSTRUCTOR PARAMS
-                "<pre>public&nbsp;AnnotationTypeUsage​(<a "
-                + "href=\"AnnotationType.html\" title=\"annotation in pkg\">"
-                + "@AnnotationType</a>(<a href=\"AnnotationType.html#optional()\">"
-                + "optional</a>=\"Constructor Param Annotation\",<a "
-                + "href=\"AnnotationType.html#required()\">required</a>=1994)\n"
-                + "                           int&nbsp;documented,\n"
-                + "                           int&nbsp;undocmented)</pre>");
+                "<div class=\"memberSignature\"><span class=\"modifiers\">public</span>&nbsp;"
+                + "<span class=\"memberName\">AnnotationTypeUsage</span>​(<span class=\"arguments\">"
+                + "<a href=\"AnnotationType.html\" title=\"annotation in pkg\">@AnnotationType</a>("
+                + "<a href=\"AnnotationType.html#optional()\">optional</a>=\"Constructor Param Annotation\","
+                + "<a href=\"AnnotationType.html#required()\">required</a>=1994)\n"
+                + "int&nbsp;documented,\n"
+                + "int&nbsp;undocmented)</span></div>");
 
         //=================================
         // Annotatation Type Usage
         //=================================
         checkOutput("pkg/class-use/AnnotationType.html", true,
< prev index next >