stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8186332: Fix method signature in method summary table

Browse Source 
Reviewed-by: jjg, ksrini
This commit is contained in:
Bhavesh Patel 2017-09-27 16:47:07 -07:00
parent 5d2a4c319a
commit 6db0190cb5
16 changed files with 110 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractExecutableMemberWriter.java
View File

@ -39,6 +39,7 @@ import javax.lang.model.type.TypeMirror;
import javax.lang.model.type.TypeVariable;
import javax.lang.model.util.SimpleTypeVisitor9;
import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
import jdk.javadoc.internal.doclets.toolkit.Content;
@ -199,55 +200,61 @@ public abstract class AbstractExecutableMemberWriter extends AbstractMemberWrite
*/
protected void addParameters(ExecutableElement member,
boolean includeAnnotations, Content htmltree, int indentSize) {
htmltree.addContent(Contents.ZERO_WIDTH_SPACE);
htmltree.addContent("(");
Content paramTree = new ContentBuilder();
String sep = "";
List<? extends VariableElement> parameters = member.getParameters();
CharSequence indent = makeSpace(indentSize + 1);
TypeMirror rcvrType = member.getReceiverType();
if (includeAnnotations && rcvrType != null && utils.isAnnotated(rcvrType)) {
List<? extends AnnotationMirror> annotationMirrors = rcvrType.getAnnotationMirrors();
addReceiverAnnotations(member, rcvrType, annotationMirrors, htmltree);
addReceiverAnnotations(member, rcvrType, annotationMirrors, paramTree);
sep = "," + DocletConstants.NL + indent;
}
int paramstart;
for (paramstart = 0; paramstart < parameters.size(); paramstart++) {
htmltree.addContent(sep);
paramTree.addContent(sep);
VariableElement param = parameters.get(paramstart);
if (param.getKind() != ElementKind.INSTANCE_INIT) {
if (includeAnnotations) {
boolean foundAnnotations =
writer.addAnnotationInfo(indent.length(),
member, param, htmltree);
member, param, paramTree);
if (foundAnnotations) {
htmltree.addContent(DocletConstants.NL);
htmltree.addContent(indent);
paramTree.addContent(DocletConstants.NL);
paramTree.addContent(indent);
}
}
addParam(member, param,
(paramstart == parameters.size() - 1) && member.isVarArgs(), htmltree);
(paramstart == parameters.size() - 1) && member.isVarArgs(), paramTree);
break;
}
}
for (int i = paramstart + 1; i < parameters.size(); i++) {
htmltree.addContent(",");
htmltree.addContent(DocletConstants.NL);
htmltree.addContent(indent);
paramTree.addContent(",");
paramTree.addContent(DocletConstants.NL);
paramTree.addContent(indent);
if (includeAnnotations) {
boolean foundAnnotations =
writer.addAnnotationInfo(indent.length(), member, parameters.get(i),
htmltree);
paramTree);
if (foundAnnotations) {
htmltree.addContent(DocletConstants.NL);
htmltree.addContent(indent);
paramTree.addContent(DocletConstants.NL);
paramTree.addContent(indent);
}
}
addParam(member, parameters.get(i), (i == parameters.size() - 1) && member.isVarArgs(),
htmltree);
paramTree);
}
if (paramTree.isEmpty()) {
htmltree.addContent("()");
} else {
htmltree.addContent(Contents.ZERO_WIDTH_SPACE);
htmltree.addContent("(");
htmltree.addContent(paramTree);
paramTree.addContent(")");
}
htmltree.addContent(")");
}
/**

8
test/langtools/jdk/javadoc/doclet/testClassLinks/TestClassLinks.java
View File

@ -23,7 +23,7 @@
/*
* @test
* @bug 8163800 8175200
* @bug 8163800 8175200 8186332
* @summary The fix for JDK-8072052 shows up other minor incorrect use of styles
* @library ../lib
* @modules jdk.javadoc/jdk.javadoc.internal.tool
@ -51,11 +51,11 @@ public class TestClassLinks extends JavadocTester {
checkOutput("p/C1.html", true,
"<code><a href=\"../p/C2.html\" title=\"class in p\">C2</a></code>",
"<code><span class=\"memberNameLink\"><a href=\"../p/C1.html#C1--\">C1</a></span>&#8203;()</code>");
"<code><span class=\"memberNameLink\"><a href=\"../p/C1.html#C1--\">C1</a></span>()</code>");
checkOutput("p/C2.html", true,
"<code><a href=\"../p/C3.html\" title=\"class in p\">C3</a></code>",
"<code><span class=\"memberNameLink\"><a href=\"../p/C2.html#C2--\">C2</a></span>&#8203;()</code>");
"<code><span class=\"memberNameLink\"><a href=\"../p/C2.html#C2--\">C2</a></span>()</code>");
checkOutput("p/C3.html", true,
"<code><a href=\"../p/I1.html\" title=\"interface in p\">I1</a></code>, "
@ -63,7 +63,7 @@ public class TestClassLinks extends JavadocTester {
+ "<code><a href=\"../p/I2.html\" title=\"interface in p\">I2</a></code>, "
+ "<code><a href=\"../p/IT1.html\" title=\"interface in p\">IT1</a>&lt;T&gt;</code>, "
+ "<code><a href=\"../p/IT2.html\" title=\"interface in p\">IT2</a>&lt;java.lang.String&gt;</code>",
"<code><span class=\"memberNameLink\"><a href=\"../p/C3.html#C3--\">C3</a></span>&#8203;()</code>");
"<code><span class=\"memberNameLink\"><a href=\"../p/C3.html#C3--\">C3</a></span>()</code>");
checkOutput("p/I1.html", true,
"<code><a href=\"../p/C3.html\" title=\"class in p\">C3</a></code>",

8
test/langtools/jdk/javadoc/doclet/testConstructors/TestConstructors.java
View File

@ -23,7 +23,7 @@
/*
* @test
* @bug 8025524 8031625 8081854 8175200
* @bug 8025524 8031625 8081854 8175200 8186332
* @summary Test for constructor name which should be a non-qualified name.
* @author Bhavesh Patel
* @library ../lib
@ -58,19 +58,19 @@ public class TestConstructors extends JavadocTester {
+ "<a href=\"../pkg1/Outer.html#Outer-int-\"><code>Outer(int)</code></a>, "
+ "<a href=\"../pkg1/Outer.Inner.NestedInner.html#NestedInner-int-\"><code>"
+ "NestedInner(int)</code></a>",
"<a href=\"../pkg1/Outer.html#Outer--\">Outer</a></span>&#8203;()",
"<a href=\"../pkg1/Outer.html#Outer--\">Outer</a></span>()",
"<a name=\"Outer--\">",
"<a href=\"../pkg1/Outer.html#Outer-int-\">Outer</a></span>&#8203;(int&nbsp;i)",
"<a name=\"Outer-int-\">");
checkOutput("pkg1/Outer.Inner.html", true,
"<a href=\"../pkg1/Outer.Inner.html#Inner--\">Inner</a></span>&#8203;()",
"<a href=\"../pkg1/Outer.Inner.html#Inner--\">Inner</a></span>()",
"<a name=\"Inner--\">",
"<a href=\"../pkg1/Outer.Inner.html#Inner-int-\">Inner</a></span>&#8203;(int&nbsp;i)",
"<a name=\"Inner-int-\">");
checkOutput("pkg1/Outer.Inner.NestedInner.html", true,
"<a href=\"../pkg1/Outer.Inner.NestedInner.html#NestedInner--\">NestedInner</a></span>&#8203;()",
"<a href=\"../pkg1/Outer.Inner.NestedInner.html#NestedInner--\">NestedInner</a></span>()",
"<a name=\"NestedInner--\">",
"<a href=\"../pkg1/Outer.Inner.NestedInner.html#NestedInner-int-\">NestedInner</a></span>&#8203;(int&nbsp;i)",
"<a name=\"NestedInner-int-\">");

8
test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java
View File

@ -23,7 +23,7 @@
/*
* @test
* @bug 4927552 8026567 8071982 8162674 8175200 8175218 8183511
* @bug 4927552 8026567 8071982 8162674 8175200 8175218 8183511 8186332
* @summary <DESC>
* @author jamieh
* @library ../lib
@ -83,10 +83,10 @@ public class TestDeprecatedDocs extends JavadocTester {
+ "public&nbsp;int field</pre>\n"
+ "<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated, for removal: This API element is subject to removal in a future version.</span>&nbsp;</div>",
"<pre>@Deprecated(forRemoval=true)\n"
+ "public&nbsp;DeprecatedClassByAnnotation&#8203;()</pre>\n"
+ "public&nbsp;DeprecatedClassByAnnotation()</pre>\n"
+ "<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated, for removal: This API element is subject to removal in a future version.</span>&nbsp;</div>",
"<pre>@Deprecated\n"
+ "public&nbsp;void&nbsp;method&#8203;()</pre>\n"
+ "public&nbsp;void&nbsp;method()</pre>\n"
+ "<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated.</span>&nbsp;</div>");
checkOutput("pkg/TestAnnotationType.html", true,
@ -117,7 +117,7 @@ public class TestDeprecatedDocs extends JavadocTester {
+ "<div class=\"block\"><span class=\"deprecationComment\">class_test1 passes.</span></div>\n"
+ "</div>",
"<pre>@Deprecated(forRemoval=true)\n"
+ "public&nbsp;TestClass&#8203;()</pre>\n"
+ "public&nbsp;TestClass()</pre>\n"
+ "<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated, for removal: This API element is subject to removal in a future version.</span>&nbsp;"
+ "<span class=\"deprecationComment\">class_test3 passes.</span></div>");

6
test/langtools/jdk/javadoc/doclet/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java
View File

@ -23,7 +23,7 @@
/*
* @test
* @bug 6786690 6820360 8025633 8026567 8175200 8183511
* @bug 6786690 6820360 8025633 8026567 8175200 8183511 8186332
* @summary This test verifies the nesting of definition list tags.
* @author Bhavesh Patel
* @library ../lib
@ -367,12 +367,12 @@ public class TestHtmlDefinitionListTag extends JavadocTester {
// Test with -nocomment and -nodeprecated options. The ClassDocs whould
// not display definition lists for any member details.
checkOutput("pkg1/C1.html", expectFound,
"<pre>public&nbsp;void&nbsp;readObject&#8203;()\n" +
"<pre>public&nbsp;void&nbsp;readObject()\n" +
" throws java.io.IOException</pre>\n" +
"</li>");
checkOutput("pkg1/C2.html", expectFound,
"<pre>public&nbsp;C2&#8203;()</pre>\n" +
"<pre>public&nbsp;C2()</pre>\n" +
"</li>");
checkOutput("pkg1/C1.ModalExclusionType.html", expectFound,

6
test/langtools/jdk/javadoc/doclet/testInterface/TestInterface.java
View File

@ -23,7 +23,7 @@
/*
* @test
* @bug 4682448 4947464 5029946 8025633 8026567 8035473 8139101 8175200
* @bug 4682448 4947464 5029946 8025633 8026567 8035473 8139101 8175200 8186332
* @summary Verify that the public modifier does not show up in the
* documentation for public methods, as recommended by the JLS.
* If A implements I and B extends A, B should be in the list of
@ -64,7 +64,7 @@ public class TestInterface extends JavadocTester {
checkExit(Exit.OK);
checkOutput("pkg/Interface.html", true,
"<pre>int&nbsp;method&#8203;()</pre>",
"<pre>int&nbsp;method()</pre>",
"<pre>static final&nbsp;int field</pre>",
// Make sure known implementing class list is correct and omits type parameters.
"<dl>\n"
@ -119,7 +119,7 @@ public class TestInterface extends JavadocTester {
+ "</dl>");
checkOutput("pkg/Interface.html", false,
"public int&nbsp;method&#8203;()",
"public int&nbsp;method()",
"public static final&nbsp;int field");
checkOutput("pkg/ClassWithStaticMethod.html", false,

18
test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java
View File

@ -24,7 +24,7 @@
/*
* @test
* @bug 7112427 8012295 8025633 8026567 8061305 8081854 8150130 8162363
* 8167967 8172528 8175200 8178830 8182257
* 8167967 8172528 8175200 8178830 8182257 8186332
* @summary Test of the JavaFX doclet features.
* @author jvalenta
* @library ../lib
@ -58,7 +58,7 @@ public class TestJavaFX extends JavadocTester {
+ "<div class=\"block\">Sets the value of the property rate.</div>\n"
+ "<dl>\n"
+ "<dt><span class=\"simpleTagLabel\">Property description:</span></dt>",
"<pre>public final&nbsp;double&nbsp;getRate&#8203;()</pre>\n"
"<pre>public final&nbsp;double&nbsp;getRate()</pre>\n"
+ "<div class=\"block\">Gets the value of the property rate.</div>\n"
+ "<dl>\n"
+ "<dt><span class=\"simpleTagLabel\">Property description:</span></dt>",
@ -78,7 +78,7 @@ public class TestJavaFX extends JavadocTester {
"<span class=\"simpleTagLabel\">Property description:</span>",
"<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">"
+ "<a href=\"../pkg1/C.html#setTestMethodProperty--\">"
+ "setTestMethodProperty</a></span>&#8203;()</code></th>",
+ "setTestMethodProperty</a></span>()</code></th>",
"<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">"
+ "<a href=\"../pkg1/C.html#pausedProperty\">paused</a></span></code></th>\n"
+ "<td class=\"colLast\">\n"
@ -88,7 +88,7 @@ public class TestJavaFX extends JavadocTester {
+ "title=\"class in pkg1\">C.BooleanProperty</a> pausedProperty</pre>\n"
+ "<div class=\"block\">Defines if paused. The second line.</div>",
"<h4>isPaused</h4>\n"
+ "<pre>public final&nbsp;double&nbsp;isPaused&#8203;()</pre>\n"
+ "<pre>public final&nbsp;double&nbsp;isPaused()</pre>\n"
+ "<div class=\"block\">Gets the value of the property paused.</div>",
"<h4>setPaused</h4>\n"
+ "<pre>public final&nbsp;void&nbsp;setPaused&#8203;(boolean&nbsp;value)</pre>\n"
@ -99,7 +99,7 @@ public class TestJavaFX extends JavadocTester {
+ "<dt><span class=\"simpleTagLabel\">Default value:</span></dt>\n"
+ "<dd>false</dd>",
"<h4>isPaused</h4>\n"
+ "<pre>public final&nbsp;double&nbsp;isPaused&#8203;()</pre>\n"
+ "<pre>public final&nbsp;double&nbsp;isPaused()</pre>\n"
+ "<div class=\"block\">Gets the value of the property paused.</div>\n"
+ "<dl>\n"
+ "<dt><span class=\"simpleTagLabel\">Property description:</span></dt>\n"
@ -124,7 +124,7 @@ public class TestJavaFX extends JavadocTester {
+ "<dt><span class=\"simpleTagLabel\">Since:</span></dt>\n"
+ "<dd>JavaFX 8.0</dd>",
"<h4>getRate</h4>\n"
+ "<pre>public final&nbsp;double&nbsp;getRate&#8203;()</pre>\n"
+ "<pre>public final&nbsp;double&nbsp;getRate()</pre>\n"
+ "<div class=\"block\">Gets the value of the property rate.</div>\n"
+ "<dl>\n"
+ "<dt><span class=\"simpleTagLabel\">Property description:</span></dt>\n"
@ -253,20 +253,20 @@ public class TestJavaFX extends JavadocTester {
+ "<tr id=\"i1\" class=\"rowColor\">\n"
+ "<td class=\"colFirst\"><code>java.lang.Object</code></td>\n"
+ "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">"
+ "<a href=\"../pkg2/Test.html#betaProperty--\">betaProperty</a></span>&#8203;()</code></th>\n"
+ "<a href=\"../pkg2/Test.html#betaProperty--\">betaProperty</a></span>()</code></th>\n"
+ "<td class=\"colLast\">&nbsp;</td>\n"
+ "</tr>\n"
+ "<tr id=\"i2\" class=\"altColor\">\n"
+ "<td class=\"colFirst\"><code>java.util.List&lt;java.util.Set&lt;? super java.lang.Object&gt;&gt;"
+ "</code></td>\n"
+ "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">"
+ "<a href=\"../pkg2/Test.html#deltaProperty--\">deltaProperty</a></span>&#8203;()</code></th>\n"
+ "<a href=\"../pkg2/Test.html#deltaProperty--\">deltaProperty</a></span>()</code></th>\n"
+ "<td class=\"colLast\">&nbsp;</td>\n"
+ "</tr>\n"
+ "<tr id=\"i3\" class=\"rowColor\">\n"
+ "<td class=\"colFirst\"><code>java.util.List&lt;java.lang.String&gt;</code></td>\n"
+ "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">"
+ "<a href=\"../pkg2/Test.html#gammaProperty--\">gammaProperty</a></span>&#8203;()</code></th>\n"
+ "<a href=\"../pkg2/Test.html#gammaProperty--\">gammaProperty</a></span>()</code></th>\n"
+ "<td class=\"colLast\">&nbsp;</td>"
);
}

6
test/langtools/jdk/javadoc/doclet/testLambdaFeature/TestLambdaFeature.java
View File

@ -23,7 +23,7 @@
/*
* @test
* @bug 8004893 8022738 8029143 8175200
* @bug 8004893 8022738 8029143 8175200 8186332
* @summary Make sure that the lambda feature changes work fine in
* javadoc.
* @author bpatel
@ -55,7 +55,7 @@ public class TestLambdaFeature extends JavadocTester {
checkOutput("pkg/A.html", true,
"<td class=\"colFirst\"><code>default void</code></td>",
"<pre>default&nbsp;void&nbsp;defaultMethod&#8203;()</pre>",
"<pre>default&nbsp;void&nbsp;defaultMethod()</pre>",
"<caption><span id=\"t0\" class=\"activeTableTab\"><span>"
+ "All Methods</span><span class=\"tabEnd\">&nbsp;</span></span>"
+ "<span id=\"t2\" class=\"tableTab\"><span>"
@ -83,7 +83,7 @@ public class TestLambdaFeature extends JavadocTester {
checkOutput("pkg/A.html", false,
"<td class=\"colFirst\"><code>default default void</code></td>",
"<pre>default&nbsp;default&nbsp;void&nbsp;defaultMethod&#8203;()</pre>");
"<pre>default&nbsp;default&nbsp;void&nbsp;defaultMethod()</pre>");
checkOutput("pkg/B.html", false,
"<td class=\"colFirst\"><code>default void</code></td>",

22
test/langtools/jdk/javadoc/doclet/testLiteralCodeInPre/TestLiteralCodeInPre.java
View File

@ -23,7 +23,7 @@
/*
* @test
* @bug 8002387 8014636 8078320 8175200
* @bug 8002387 8014636 8078320 8175200 8186332
* @summary Improve rendered HTML formatting for {@code}
* @library ../lib
* @modules jdk.javadoc/jdk.javadoc.internal.tool
@ -47,19 +47,19 @@ public class TestLiteralCodeInPre extends JavadocTester {
checkExit(Exit.OK);
checkOutput("pkg/Test.html", true,
"no_pre&#8203;()</pre>\n"
"no_pre()</pre>\n"
+ "<div class=\"block\">abc<code>def</code>ghi</div>",
"no_pre_extra_whitespace&#8203;()</pre>\n"
"no_pre_extra_whitespace()</pre>\n"
+ "<div class=\"block\">abc<code> def </code>ghi</div>",
"in_pre&#8203;()</pre>\n"
"in_pre()</pre>\n"
+ "<div class=\"block\"><pre> abc<code> def </code>ghi</pre></div>",
"pre_after_text&#8203;()</pre>\n"
"pre_after_text()</pre>\n"
+ "<div class=\"block\">xyz <pre> abc<code> def </code>ghi</pre></div>",
"after_pre&#8203;()</pre>\n"
"after_pre()</pre>\n"
+ "<div class=\"block\">xyz <pre> pqr </pre> abc<code> def </code>ghi</div>",
"back_in_pre&#8203;()</pre>\n"
"back_in_pre()</pre>\n"
+ "<div class=\"block\">xyz <pre> pqr </pre> mno <pre> abc<code> def </code>ghi</pre></div>",
"typical_usage_code&#8203;()</pre>\n"
"typical_usage_code()</pre>\n"
+ "<div class=\"block\">Lorem ipsum dolor sit amet, consectetur adipiscing elit.\n"
+ " Example: <pre><code>\n"
+ " line 0 @Override\n"
@ -68,7 +68,7 @@ public class TestLiteralCodeInPre extends JavadocTester {
+ " line 3 }\n"
+ " </code></pre>\n"
+ " and so it goes.</div>",
"typical_usage_literal&#8203;()</pre>\n"
"typical_usage_literal()</pre>\n"
+ "<div class=\"block\">Lorem ipsum dolor sit amet, consectetur adipiscing elit.\n"
+ " Example: <pre>\n"
+ " line 0 @Override\n"
@ -77,7 +77,7 @@ public class TestLiteralCodeInPre extends JavadocTester {
+ " line 3 }\n"
+ " </pre>\n"
+ " and so it goes.</div>",
"recommended_usage_literal&#8203;()</pre>\n"
"recommended_usage_literal()</pre>\n"
+ "<div class=\"block\">Lorem ipsum dolor sit amet, consectetur adipiscing elit.\n"
+ " Example: <pre>\n"
+ " line 0 @Override\n"
@ -89,7 +89,7 @@ public class TestLiteralCodeInPre extends JavadocTester {
+ " <PRE>\n"
+ " <b>id </b>\n"
+ " </PRE></div>",
"<pre>public&nbsp;void&nbsp;htmlAttrInPre1&#8203;()</pre>\n"
"<pre>public&nbsp;void&nbsp;htmlAttrInPre1()</pre>\n"
+ "<div class=\"block\">More html tag outliers.\n"
+ " <pre>\n"
+ " @Override\n"

8
test/langtools/jdk/javadoc/doclet/testMemberSummary/TestMemberSummary.java
View File

@ -23,7 +23,7 @@
/*
* @test
* @bug 4951228 6290760 8025633 8026567 8081854 8162363 8175200 8177417
* @bug 4951228 6290760 8025633 8026567 8081854 8162363 8175200 8177417 8186332
* @summary Test the case where the overriden method returns a different
* type than the method in the child class. Make sure the
* documentation is inherited but the return type isn't.
@ -52,12 +52,12 @@ public class TestMemberSummary extends JavadocTester {
// Check return type in member summary.
"<code><a href=\"../pkg/PublicChild.html\" title=\"class in pkg\">PublicChild</a></code></td>\n"
+ "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\"><a href=\"../pkg/PublicChild.html#returnTypeTest--\">"
+ "returnTypeTest</a></span>&#8203;()</code>",
+ "returnTypeTest</a></span>()</code>",
// Check return type in member detail.
"<pre>public&nbsp;<a href=\"../pkg/PublicChild.html\" title=\"class in pkg\">"
+ "PublicChild</a>&nbsp;returnTypeTest&#8203;()</pre>",
+ "PublicChild</a>&nbsp;returnTypeTest()</pre>",
"<th class=\"colConstructorName\" scope=\"row\"><code><span class=\"memberNameLink\">"
+ "<a href=\"../pkg/PublicChild.html#PublicChild--\">PublicChild</a></span>&#8203;()</code></th>");
+ "<a href=\"../pkg/PublicChild.html#PublicChild--\">PublicChild</a></span>()</code></th>");
checkOutput("pkg/PrivateParent.html", true,
"<td class=\"colFirst\"><code>private </code></td>\n"

10
test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/TestNewLanguageFeatures.java
View File

@ -24,7 +24,7 @@
/*
* @test
* @bug 4789689 4905985 4927164 4827184 4993906 5004549 7025314 7010344 8025633 8026567 8162363
* 8175200
* 8175200 8186332
* @summary Run Javadoc on a set of source files that demonstrate new
* language features. Check the output to ensure that the new
* language features are properly documented.
@ -549,7 +549,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
+ "=\"Constructor Annotation\",\n"
+ " <a href=\"../pkg/AnnotationType.html#required--\">"
+ "required</a>=1994)\n"
+ "public&nbsp;AnnotationTypeUsage&#8203;()</pre>",
+ "public&nbsp;AnnotationTypeUsage()</pre>",
// METHOD
"<pre><a href=\"../pkg/AnnotationType.html\" "
+ "title=\"annotation in pkg\">@AnnotationType</a>("
@ -557,7 +557,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
+ "=\"Method Annotation\",\n"
+ " <a href=\"../pkg/AnnotationType.html#required--\">"
+ "required</a>=1994)\n"
+ "public&nbsp;void&nbsp;method&#8203;()</pre>",
+ "public&nbsp;void&nbsp;method()</pre>",
// METHOD PARAMS
"<pre>public&nbsp;void&nbsp;methodWithParams&#8203;("
+ "<a href=\"../pkg/AnnotationType.html\" title=\"annotation in pkg\">"
@ -630,11 +630,11 @@ public class TestNewLanguageFeatures extends JavadocTester {
// CONSTRUCTOR
"<a href=\"../pkg/AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</a>(<a href=\"../pkg/AnnotationType.html#optional\">optional</a>=\"Constructor Annotation\",\n"
+ " <a href=\"../pkg/AnnotationType.html#required\">required</a>=1994)\n"
+ "public <span class=\"typeNameLabel\">AnnotationTypeUsage</span>&#8203;()",
+ "public <span class=\"typeNameLabel\">AnnotationTypeUsage</span>()",
// METHOD
"<a href=\"../pkg/AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</a>(<a href=\"../pkg/AnnotationType.html#optional\">optional</a>=\"Method Annotation\",\n"
+ " <a href=\"../pkg/AnnotationType.html#required\">required</a>=1994)\n"
+ "public void <span class=\"memberNameLabel\">method</span>&#8203;()");
+ "public void <span class=\"memberNameLabel\">method</span>()");
//=================================
// Make sure annotation types do not

8
test/langtools/jdk/javadoc/doclet/testOptions/TestOptions.java
View File

@ -23,7 +23,7 @@
/*
* @test
* @bug 4749567 8071982 8175200
* @bug 4749567 8071982 8175200 8186332
* @summary Test the output for -header, -footer, -nooverview, -nodeprecatedlist, -nonavbar, -notree, -stylesheetfile options.
* @author Bhavesh Patel
* @library ../lib
@ -148,7 +148,7 @@ public class TestOptions extends JavadocTester {
"<pre>public&nbsp;java.lang.Object <a href="
+ "\"../src-html/linksource/Properties.html#line.31\">someProperty</a></pre>",
"<pre>public&nbsp;java.lang.Object&nbsp;<a href="
+ "\"../src-html/linksource/Properties.html#line.31\">someProperty</a>&#8203;()</pre>");
+ "\"../src-html/linksource/Properties.html#line.31\">someProperty</a>()</pre>");
checkOutput("src-html/linksource/Properties.html", true,
"<title>Source code</title>",
@ -161,9 +161,9 @@ public class TestOptions extends JavadocTester {
"<pre>public&nbsp;int <a href=\"../src-html/linksource/SomeClass.html#line.31\">"
+ "field</a></pre>",
"<pre>public&nbsp;<a href=\"../src-html/linksource/SomeClass.html#line.33\">"
+ "SomeClass</a>&#8203;()</pre>",
+ "SomeClass</a>()</pre>",
"<pre>public&nbsp;int&nbsp;<a href=\"../src-html/linksource/SomeClass.html#line.36\">"
+ "method</a>&#8203;()</pre>");
+ "method</a>()</pre>");
checkOutput("src-html/linksource/SomeClass.html", true,
"<title>Source code</title>",

4
test/langtools/jdk/javadoc/doclet/testOverridenMethods/TestBadOverride.java
View File

@ -23,7 +23,7 @@
/*
* @test
* @bug 8174839 8175200
* @bug 8174839 8175200 8186332
* @summary Bad overriding method should not crash
* @library ../lib
* @modules jdk.javadoc/jdk.javadoc.internal.tool
@ -52,7 +52,7 @@ public class TestBadOverride extends JavadocTester {
checkOutput("pkg4/Foo.html", true,
"<li class=\"blockList\">\n"
+ "<h4>toString</h4>\n"
+ "<pre>public&nbsp;void&nbsp;toString&#8203;()</pre>\n"
+ "<pre>public&nbsp;void&nbsp;toString()</pre>\n"
+ "<div class=\"block\">Why can't I do this ?</div>\n"
+ "</li>");
}

4
test/langtools/jdk/javadoc/doclet/testSummaryTag/TestSummaryTag.java
View File

@ -25,7 +25,7 @@
/*
* @test
* @bug 8173425
* @bug 8173425 8186332
* @summary tests for the summary tag behavior
* @library ../lib
* @modules jdk.javadoc/jdk.javadoc.internal.tool
@ -87,7 +87,7 @@ public class TestSummaryTag extends JavadocTester {
checkOutput("p1/A.html", true,
"<li class=\"blockList\">\n"
+ "<h4>m3</h4>\n"
+ "<pre>public&nbsp;void&nbsp;m3&#8203;()</pre>\n"
+ "<pre>public&nbsp;void&nbsp;m3()</pre>\n"
+ "<div class=\"block\">First sentence some text maybe second sentence.</div>\n"
+ "</li>\n"
);

54
test/langtools/jdk/javadoc/doclet/testTypeAnnotations/TestTypeAnnotations.java
View File

@ -23,7 +23,7 @@
/*
* @test
* @bug 8005091 8009686 8025633 8026567 6469562 8071982 8071984 8162363 8175200
* @bug 8005091 8009686 8025633 8026567 6469562 8071982 8071984 8162363 8175200 8186332
* @summary Make sure that type annotations are displayed correctly
* @author Bhavesh Patel
* @library ../lib
@ -155,17 +155,17 @@ public class TestTypeAnnotations extends JavadocTester {
checkOutput("typeannos/MtdDefaultScope.html", true,
"<pre>public&nbsp;&lt;T&gt;&nbsp;<a href=\"../typeannos/MRtnA.html\" "
+ "title=\"annotation in typeannos\">@MRtnA</a> java.lang.String"
+ "&nbsp;method&#8203;()</pre>",
+ "&nbsp;method()</pre>",
// When JDK-8068737 is fixed, we should change the order
"<pre><a href=\"../typeannos/MRtnA.html\" title=\"annotation in typeannos\">"
+ "@MRtnA</a> java.lang.String "
+ "<a href=\"../typeannos/MRtnB.html\" title=\"annotation in typeannos\">@MRtnB</a> [] "
+ "<a href=\"../typeannos/MRtnA.html\" title=\"annotation in typeannos\">@MRtnA</a> []"
+ "&nbsp;array2Deep&#8203;()</pre>",
+ "&nbsp;array2Deep()</pre>",
"<pre><a href=\"../typeannos/MRtnA.html\" title=\"annotation in "
+ "typeannos\">@MRtnA</a> java.lang.String[][]&nbsp;array2&#8203;()</pre>");
+ "typeannos\">@MRtnA</a> java.lang.String[][]&nbsp;array2()</pre>");
checkOutput("typeannos/MtdModifiedScoped.html", true,
"<pre>public final&nbsp;<a href=\"../typeannos/MtdParameterized.html\" "
@ -177,25 +177,25 @@ public class TestTypeAnnotations extends JavadocTester {
+ "String,<a href=\"../typeannos/MRtnB.html\" title=\"annotation in "
+ "typeannos\">@MRtnB</a> java.lang.String&gt;,<a href=\"../typeannos/"
+ "MRtnB.html\" title=\"annotation in typeannos\">@MRtnB</a> java."
+ "lang.String&gt;&nbsp;nestedMtdParameterized&#8203;()</pre>");
+ "lang.String&gt;&nbsp;nestedMtdParameterized()</pre>");
// Test for type annotations on method type parameters (MethodTypeParameters.java).
checkOutput("typeannos/UnscopedUnmodified.html", true,
"<pre>&lt;K extends <a href=\"../typeannos/MTyParamA.html\" title=\""
+ "annotation in typeannos\">@MTyParamA</a> java.lang.String&gt;"
+ "&nbsp;void&nbsp;methodExtends&#8203;()</pre>",
+ "&nbsp;void&nbsp;methodExtends()</pre>",
"<pre>&lt;K extends <a href=\"../typeannos/MTyParamA.html\" title=\""
+ "annotation in typeannos\">@MTyParamA</a> <a href=\"../typeannos/"
+ "MtdTyParameterized.html\" title=\"class in typeannos\">"
+ "MtdTyParameterized</a>&lt;<a href=\"../typeannos/MTyParamB.html\" "
+ "title=\"annotation in typeannos\">@MTyParamB</a> java.lang.String"
+ "&gt;&gt;&nbsp;void&nbsp;nestedExtends&#8203;()</pre>");
+ "&gt;&gt;&nbsp;void&nbsp;nestedExtends()</pre>");
checkOutput("typeannos/PublicModifiedMethods.html", true,
"<pre>public final&nbsp;&lt;K extends <a href=\"../typeannos/"
+ "MTyParamA.html\" title=\"annotation in typeannos\">@MTyParamA</a> "
+ "java.lang.String&gt;&nbsp;void&nbsp;methodExtends&#8203;()</pre>",
+ "java.lang.String&gt;&nbsp;void&nbsp;methodExtends()</pre>",
"<pre>public final&nbsp;&lt;K extends <a href=\"../typeannos/"
+ "MTyParamA.html\" title=\"annotation in typeannos\">@MTyParamA</a> "
@ -204,7 +204,7 @@ public class TestTypeAnnotations extends JavadocTester {
+ "typeannos/MtdTyParameterized.html\" title=\"class in typeannos\">"
+ "MtdTyParameterized</a>&lt;<a href=\"../typeannos/MTyParamB.html\" "
+ "title=\"annotation in typeannos\">@MTyParamB</a> java.lang.String"
+ "&gt;&gt;&nbsp;void&nbsp;dual&#8203;()</pre>");
+ "&gt;&gt;&nbsp;void&nbsp;dual()</pre>");
// Test for type annotations on parameters (Parameters.java).
checkOutput("typeannos/Parameters.html", true,
@ -236,11 +236,11 @@ public class TestTypeAnnotations extends JavadocTester {
// Test for type annotations on throws (Throws.java).
checkOutput("typeannos/ThrDefaultUnmodified.html", true,
"<pre>void&nbsp;oneException&#8203;()\n"
"<pre>void&nbsp;oneException()\n"
+ " throws <a href=\"../typeannos/ThrA.html\" title=\""
+ "annotation in typeannos\">@ThrA</a> java.lang.Exception</pre>",
"<pre>void&nbsp;twoExceptions&#8203;()\n"
"<pre>void&nbsp;twoExceptions()\n"
+ " throws <a href=\"../typeannos/ThrA.html\" title=\""
+ "annotation in typeannos\">@ThrA</a> java.lang.RuntimeException,\n"
+ " <a href=\"../typeannos/ThrA.html\" title=\""
@ -258,12 +258,12 @@ public class TestTypeAnnotations extends JavadocTester {
+ "title=\"annotation in typeannos\">@ThrA</a> java.lang.Exception</pre>");
checkOutput("typeannos/ThrWithValue.html", true,
"<pre>void&nbsp;oneException&#8203;()\n"
"<pre>void&nbsp;oneException()\n"
+ " throws <a href=\"../typeannos/ThrB.html\" title=\""
+ "annotation in typeannos\">@ThrB</a>("
+ "\"m\") java.lang.Exception</pre>",
"<pre>void&nbsp;twoExceptions&#8203;()\n"
"<pre>void&nbsp;twoExceptions()\n"
+ " throws <a href=\"../typeannos/ThrB.html\" title=\""
+ "annotation in typeannos\">@ThrB</a>("
+ "\"m\") java.lang.RuntimeException,\n"
@ -275,7 +275,7 @@ public class TestTypeAnnotations extends JavadocTester {
"<pre>&lt;K,<a href=\"../typeannos/TyParaA.html\" title=\"annotation in typeannos\">"
+ "@TyParaA</a> V extends <a href=\"../typeannos/TyParaA.html\" "
+ "title=\"annotation in typeannos\">@TyParaA</a> "
+ "java.lang.String&gt;&nbsp;void&nbsp;secondAnnotated&#8203;()</pre>"
+ "java.lang.String&gt;&nbsp;void&nbsp;secondAnnotated()</pre>"
);
// Test for type annotations on wildcard type (Wildcards.java).
@ -288,7 +288,7 @@ public class TestTypeAnnotations extends JavadocTester {
"<pre><a href=\"../typeannos/MyList.html\" title=\"class in "
+ "typeannos\">MyList</a>&lt;? super <a href=\"../typeannos/WldA.html\" "
+ "title=\"annotation in typeannos\">@WldA</a> java.lang.String&gt;"
+ "&nbsp;returnWcSuper&#8203;()</pre>");
+ "&nbsp;returnWcSuper()</pre>");
checkOutput("typeannos/BoundWithValue.html", true,
"<pre>void&nbsp;wcSuper&#8203;(<a href=\"../typeannos/MyList.html\" title=\""
@ -301,7 +301,7 @@ public class TestTypeAnnotations extends JavadocTester {
+ "typeannos\">MyList</a>&lt;? extends <a href=\"../typeannos/WldB."
+ "html\" title=\"annotation in typeannos\">@WldB</a>("
+ "\"m\") java.lang.String"
+ "&gt;&nbsp;returnWcExtends&#8203;()</pre>");
+ "&gt;&nbsp;returnWcExtends()</pre>");
// Test for receiver annotations (Receivers.java).
checkOutput("typeannos/DefaultUnmodified.html", true,
@ -396,7 +396,7 @@ public class TestTypeAnnotations extends JavadocTester {
+ "\"../typeannos/RepConstructorB.html\" title=\"annotation in typeannos"
+ "\">@RepConstructorB</a> <a href=\"../typeannos/RepConstructorB.html"
+ "\" title=\"annotation in typeannos\">@RepConstructorB</a>\n"
+ "RepeatingOnConstructor&#8203;()</pre>",
+ "RepeatingOnConstructor()</pre>",
"<pre><a href=\"../typeannos/RepConstructorA.html\" title=\"annotation in typeannos"
+ "\">@RepConstructorA</a> <a href=\"../typeannos/RepConstructorA.html"
@ -574,7 +574,7 @@ public class TestTypeAnnotations extends JavadocTester {
checkOutput("typeannos/RepeatingOnMethod.html", true,
"<code>(package private) java.lang.String</code></td>\n<th class=\"colSecond\" scope=\"row\">"
+ "<code><span class=\"memberNameLink\"><a href="
+ "\"../typeannos/RepeatingOnMethod.html#test1--\">test1</a></span>&#8203;()</code>",
+ "\"../typeannos/RepeatingOnMethod.html#test1--\">test1</a></span>()</code>",
"<code>(package private) <a href=\"../typeannos/RepTypeUseA.html\" "
+ "title=\"annotation in typeannos\">@RepTypeUseA</a> <a href="
@ -584,7 +584,7 @@ public class TestTypeAnnotations extends JavadocTester {
+ "\" title=\"annotation in typeannos\">@RepTypeUseB</a> java.lang.String</code>"
+ "</td>\n<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">"
+ "<a href=\"../typeannos/RepeatingOnMethod.html#test2--\">test2</a>"
+ "</span>&#8203;()</code>",
+ "</span>()</code>",
"<code>(package private) <a href=\"../typeannos/RepTypeUseA.html\" "
+ "title=\"annotation in typeannos\">@RepTypeUseA</a> <a href="
@ -594,7 +594,7 @@ public class TestTypeAnnotations extends JavadocTester {
+ "title=\"annotation in typeannos\">@RepTypeUseB</a> java.lang.String</code>"
+ "</td>\n<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">"
+ "<a href=\"../typeannos/RepeatingOnMethod.html#test3--\">test3</a>"
+ "</span>&#8203;()</code>",
+ "</span>()</code>",
"<code>(package private) <a href=\"../typeannos/RepAllContextsA.html\" "
+ "title=\"annotation in typeannos\">@RepAllContextsA</a> <a href="
@ -604,7 +604,7 @@ public class TestTypeAnnotations extends JavadocTester {
+ "\"../typeannos/RepAllContextsB.html\" title=\"annotation in typeannos\">"
+ "@RepAllContextsB</a> java.lang.String</code></td>\n<th class=\"colSecond\" scope=\"row\">"
+ "<code><span class=\"memberNameLink\"><a href=\"../typeannos/RepeatingOnMethod.html"
+ "#test4--\">test4</a></span>&#8203;()</code>",
+ "#test4--\">test4</a></span>()</code>",
"<code><span class=\"memberNameLink\"><a href=\"../typeannos/RepeatingOnMethod.html"
+ "#test5-java.lang.String-java.lang.String...-\">test5</a></span>"
@ -621,13 +621,13 @@ public class TestTypeAnnotations extends JavadocTester {
+ "\"annotation in typeannos\">@RepMethodA</a>\n<a href=\"../typeannos/RepMethodB.html\""
+ " title=\"annotation in typeannos\">@RepMethodB</a> <a href="
+ "\"../typeannos/RepMethodB.html\" title=\"annotation in typeannos\">"
+ "@RepMethodB</a>\njava.lang.String&nbsp;test1&#8203;()",
+ "@RepMethodB</a>\njava.lang.String&nbsp;test1()",
"<a href=\"../typeannos/RepTypeUseA.html\" title=\"annotation in typeannos\">"
+ "@RepTypeUseA</a> <a href=\"../typeannos/RepTypeUseA.html\" title="
+ "\"annotation in typeannos\">@RepTypeUseA</a> <a href=\"../typeannos/RepTypeUseB.html\" "
+ "title=\"annotation in typeannos\">@RepTypeUseB</a> <a href=\"../typeannos/RepTypeUseB.html\" "
+ "title=\"annotation in typeannos\">@RepTypeUseB</a> java.lang.String&nbsp;test2&#8203;()",
+ "title=\"annotation in typeannos\">@RepTypeUseB</a> java.lang.String&nbsp;test2()",
"<a href=\"../typeannos/RepMethodA.html\" title=\"annotation in typeannos\">"
+ "@RepMethodA</a> <a href=\"../typeannos/RepMethodA.html\" title="
@ -639,7 +639,7 @@ public class TestTypeAnnotations extends JavadocTester {
+ "title=\"annotation in typeannos\">@RepTypeUseA</a> <a href="
+ "\"../typeannos/RepTypeUseB.html\" title=\"annotation in typeannos\">"
+ "@RepTypeUseB</a> <a href=\"../typeannos/RepTypeUseB.html\" title="
+ "\"annotation in typeannos\">@RepTypeUseB</a> java.lang.String&nbsp;test3&#8203;()",
+ "\"annotation in typeannos\">@RepTypeUseB</a> java.lang.String&nbsp;test3()",
"<a href=\"../typeannos/RepAllContextsA.html\" title=\"annotation in typeannos\">"
+ "@RepAllContextsA</a> <a href=\"../typeannos/RepAllContextsA.html\" "
@ -652,7 +652,7 @@ public class TestTypeAnnotations extends JavadocTester {
+ "title=\"annotation in typeannos\">@RepAllContextsA</a> <a href="
+ "\"../typeannos/RepAllContextsB.html\" title=\"annotation in typeannos\">"
+ "@RepAllContextsB</a> <a href=\"../typeannos/RepAllContextsB.html\" "
+ "title=\"annotation in typeannos\">@RepAllContextsB</a> java.lang.String&nbsp;test4&#8203;()",
+ "title=\"annotation in typeannos\">@RepAllContextsB</a> java.lang.String&nbsp;test4()",
"java.lang.String&nbsp;test5&#8203;(<a href=\"../typeannos/RepTypeUseA.html\" "
+ "title=\"annotation in typeannos\">@RepTypeUseA</a> <a href="
@ -697,7 +697,7 @@ public class TestTypeAnnotations extends JavadocTester {
"<code>(package private) java.lang.String</code></td>\n<th class=\"colSecond\" scope=\"row\"><code>"
+ "<span class=\"memberNameLink\"><a href=\"../typeannos/RepeatingOnTypeParametersBoundsTypeArgumentsOnMethod.html#"
+ "test--\">test</a></span>&#8203;()</code>",
+ "test--\">test</a></span>()</code>",
"java.lang.String&nbsp;test&#8203;(<a href=\"../typeannos/RepTypeUseA.html\" "
+ "title=\"annotation in typeannos\">@RepTypeUseA</a> <a href="
@ -718,6 +718,6 @@ public class TestTypeAnnotations extends JavadocTester {
+ "\"annotation in typeannos\">@RepMethodA</a>\n<a href=\"../typeannos/RepMethodB.html"
+ "\" title=\"annotation in typeannos\">@RepMethodB</a> <a href="
+ "\"../typeannos/RepMethodB.html\" title=\"annotation in typeannos\">"
+ "@RepMethodB</a>\nvoid&nbsp;test&#8203;()");
+ "@RepMethodB</a>\nvoid&nbsp;test()");
}
}

4
test/langtools/jdk/javadoc/doclet/testUseOption/TestUseOption.java
View File

@ -23,7 +23,7 @@
/*
* @test
* @bug 4496290 4985072 7006178 7068595 8016328 8050031 8048351 8081854 8071982 8162363 8175200
* @bug 4496290 4985072 7006178 7068595 8016328 8050031 8048351 8081854 8071982 8162363 8175200 8186332
* @summary A simple test to ensure class-use files are correct.
* @author jamieh
* @library ../lib
@ -134,7 +134,7 @@ public class TestUseOption extends JavadocTester {
"<td class=\"colFirst\"><code>void</code></td>\n<th class=\"colSecond\" scope=\"row\"><span class="
+ "\"typeNameLabel\">C1.</span><code><span class=\"memberNameLink\">"
+ "<a href=\"../../pkg1/C1.html#methodInC1ThrowsThrowable--\">methodInC1ThrowsThrowable"
+ "</a></span>&#8203;()</code></th>"
+ "</a></span>()</code></th>"
);
}