< prev index next >
test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/TestNewLanguageFeatures.java
Print this page
*** 79,90 ****
// 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 <a href=\"Coin.html\" title=\"enum in pkg\">Coin</a>" +
! " valueOf(java.lang.String name)</pre>\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" +
--- 79,92 ----
// 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.",
! "<div class=\"memberSignature\"><span class=\"modifiers\">public static</span> "
! + "<span class=\"returnType\"><a href=\"Coin.html\" title=\"enum in pkg\">Coin</a></span> "
! + "<span class=\"memberName\">valueOf</span>("
! + "<span class=\"arguments\">java.lang.String 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,151 ****
+ "<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 <T extends java.util.List,V> "
! + "java.lang.String[] methodThatHasTypeParameters",
// 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>[] e)</code>",
! "<pre class=\"methodSignature\">public <a href=\"TypeParameters.html\" "
! + "title=\"type parameter in TypeParameters\">E</a>[] "
! + "methodThatReturnsTypeParameterA(<a href=\"TypeParameters.html\" "
! + "title=\"type parameter in TypeParameters\">E</a>[] e)</pre>\n",
"<td class=\"colFirst\"><code><T extends java.lang.Object & java.lang.Comparable<? super T>>"
+ "<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<? extends T> coll)</code>",
--- 131,157 ----
+ "<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
! "<div class=\"memberSignature\"><span class=\"modifiers\">public</span> "
! + "<span class=\"typeParameters\"><T extends java.util.List,\nV></span>\n"
! + "<span class=\"returnType\">java.lang.String[]</span> <span class=\"memberName\">"
! + "methodThatHasTypeParameters</span>(<span class=\"arguments\">T param1,\n"
! + "V 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>[] e)</code>",
! "<div class=\"memberSignature\"><span class=\"modifiers\">public</span> <span "
! + "class=\"returnType\"><a href=\"TypeParameters.html\" title=\"type parameter in TypeParameters\">"
! + "E</a>[]</span> <span class=\"memberName\">methodThatReturnsTypeParameterA</span>("
! + "<span class=\"arguments\"><a href=\"TypeParameters.html\" title=\"type parameter in TypeParameters\">"
! + "E</a>[] e)</span></div>\n",
"<td class=\"colFirst\"><code><T extends java.lang.Object & java.lang.Comparable<? super T>>"
+ "<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<? extends T> coll)</code>",
*** 208,218 ****
//==============================================================
// Handle multiple bounds.
//==============================================================
checkOutput("pkg/MultiTypeParameters.html", true,
! "public <T extends java.lang.Number & java.lang.Runnable> T foo(T t)");
//==============================================================
// Test Class-Use Documentation for Type Parameters.
//==============================================================
// ClassUseTest1: <T extends Foo & Foo2>
--- 214,227 ----
//==============================================================
// Handle multiple bounds.
//==============================================================
checkOutput("pkg/MultiTypeParameters.html", true,
! "<div class=\"memberSignature\"><span class=\"modifiers\">public</span> "
! + "<span class=\"typeParameters\"><T extends java.lang.Number & java.lang.Runnable></span>\n"
! + "<span class=\"returnType\">T</span> <span class=\"memberName\">foo</span>"
! + "(<span class=\"arguments\">T t)</span></div>");
//==============================================================
// Test Class-Use Documentation for Type Parameters.
//==============================================================
// ClassUseTest1: <T extends Foo & Foo2>
*** 529,577 ****
+ "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 int field</pre>",
// 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 AnnotationTypeUsage()</pre>",
// 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 void method()</pre>",
// METHOD PARAMS
! "<pre class=\"methodSignature\">public void 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 documented,\n"
! + " int undocmented)</pre>",
// CONSTRUCTOR PARAMS
! "<pre>public 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 documented,\n"
! + " int undocmented)</pre>");
//=================================
// Annotatation Type Usage
//=================================
checkOutput("pkg/class-use/AnnotationType.html", true,
--- 538,583 ----
+ "required</a>=1994)\n"
+ "public class <span class=\"typeNameLabel\">"
+ "AnnotationTypeUsage</span>\n"
+ "extends java.lang.Object</pre>",
// FIELD
! "<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> <span class=\"returnType\">int</span>"
! + " <span class=\"memberName\">field</span></div>",
// CONSTRUCTOR
! "<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> "
! + "<span class=\"memberName\">AnnotationTypeUsage</span>()</div>",
// METHOD
! "<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> <span class=\"returnType\">"
! + "void</span> <span class=\"memberName\">method</span>()</div>",
// METHOD PARAMS
! "<div class=\"memberSignature\"><span class=\"modifiers\">public</span> <span "
! + "class=\"returnType\">void</span> <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 documented,\n"
! + "int undocmented)</span></div>",
// CONSTRUCTOR PARAMS
! "<div class=\"memberSignature\"><span class=\"modifiers\">public</span> "
! + "<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 documented,\n"
! + "int undocmented)</span></div>");
//=================================
// Annotatation Type Usage
//=================================
checkOutput("pkg/class-use/AnnotationType.html", true,
< prev index next >