OpenJDK / jdk / jdk
changeset 58571:f2458462c298
8241470: HtmlStyle: group and document members: description, flex, signature
Reviewed-by: hannesw
line wrap: on
line diff
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java Thu Mar 26 15:13:21 2020 -0700 +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java Thu Mar 26 20:36:56 2020 -0700 @@ -686,7 +686,7 @@ parameters.add(")"); htmltree.add(Entity.ZERO_WIDTH_SPACE); htmltree.add("("); - htmltree.add(HtmlTree.SPAN(HtmlStyle.arguments, parameters)); + htmltree.add(HtmlTree.SPAN(HtmlStyle.parameters, parameters)); } // Exceptions
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlStyle.java Thu Mar 26 15:13:21 2020 -0700 +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlStyle.java Thu Mar 26 20:36:56 2020 -0700 @@ -48,8 +48,6 @@ aboutLanguage, activeTableTab, altColor, - annotations, - arguments, block, blockList, bottomNav, @@ -68,18 +66,13 @@ deprecatedSummary, deprecationBlock, deprecationComment, - description, descfrmTypeLabel, details, detail, emphasizedPhrase, - exceptions, externalLink, fieldDetails, fieldSummary, - flexBox, - flexHeader, - flexContent, header, helpSection, hierarchy, @@ -91,28 +84,21 @@ interfaceName, legalCopy, memberDetails, - memberName, memberNameLabel, memberNameLink, - memberSignature, memberSummary, methodDetails, methodSummary, - modifiers, - moduleDescription, moduleLabelInPackage, moduleLabelInType, - moduleTags, modulesSummary, nameValue, navBarCell1Rev, navList, navListSearch, nestedClassSummary, - notes, overviewSummary, packages, - packageDescription, packageHierarchyLabel, packageLabelInType, packagesSummary, @@ -121,7 +107,6 @@ propertySummary, providesSummary, requiresSummary, - returnType, rowColor, searchTagLink, searchTagResult, @@ -142,13 +127,133 @@ topNav, typeNameLabel, typeNameLink, - typeParameters, - typeParametersLong, typeSummary, useSummary, usesSummary, verticalSeparator, + //<editor-fold desc="documentation comments"> + // The following constants are used for the components used to present the content + // generated from documentation comments. + + /** + * The class of the element used to present the documentation comment for a type or member + * element. + * The content of the block tags will be in a nested element with class {@link #notes}. + */ + description, + + /** + * The class of the element used to present the documentation comment for a module element, + * excluding block tags. + * The content of the block tags will be in a sibling element with class {@link #moduleTags}. + */ + moduleDescription, + + /** + * The class of the {@code dl} element used to present the block tags in the documentation + * comment for a module element. + * Additional (derived) information, such as implementation or inheritance details, may + * also appear in this element. + */ + moduleTags, + + /** + * The class of the element used to present the documentation comment for package element. + * The content of the block tags will be in a nested element with class {@link #notes}. + */ + packageDescription, + + /** + * The class of the {@code dl} element used to present the block tags in the documentation + * comment for a package, type or member element. + * Additional (derived) information, such as implementation or inheritance details, may + * also appear in this element. + */ + notes, + //</editor-fold> + + //<editor-fold desc="flex layout"> + // The following constants are used for the components of the top-level structures for "flex" layout. + + /** + * The class of the top-level {@code div} element used to arrange for "flex" layout in + * a browser window. The element should contain two child elements: one with class + * {@link #flexHeader flex-header} and one with class {@link #flexContent flex-content}. + */ + flexBox, + + /** + * The class of the {@code header} element within a {@link #flexBox flex-box} container. + * The element is always displayed at the top of the viewport. + */ + flexHeader, + + /** + * The class of the {@code div} element within a {@link #flexBox flex-box} container + * This element appears below the header and can be scrolled if too big for the available height. + */ + flexContent, + //</editor-fold> + + //<editor-fold desc="member signature"> + // The following constants are used for the components of a signature of an element + + /** + * The class of a {@code span} element for the signature of an element. + * The signature will contain a member name and, depending on the kind of element, + * it can contain any of the following: + * annotations, type parameters, modifiers, return type, parameters, and exceptions. + */ + memberSignature, + + /** + * The class of a {@code span} element for any annotations in the signature of an element. + */ + annotations, + + /** + * The class of a {@code span} element for any exceptions in a signature of an executable element. + */ + exceptions, + + /** + * The class of a {@code span} for the member name in the signature of an element. + */ + memberName, + + /** + * The class of a {@code span} for any modifiers in the signature of an element. + */ + modifiers, + + /** + * The class of a {@code span} for any parameters in the signature of an executable element. + */ + parameters, + + /** + * The class of a {@code span} for the return type in the signature of an method element. + */ + returnType, + + /** + * The class of a {@code span} for type parameters in the signature of an element, + * used when the type parameters should reasonably be displayed inline. + */ + typeParameters, + + /** + * The class of a {@code span} for type parameters in the signature of an element, + * used when the type parameters are too long to be displayed inline. + * @implNote + * The threshold for choosing between {@code typeParameters} and {@code typeParametersLong} + * is 50 characters. + */ + typeParametersLong, + //</editor-fold> + + //<editor-fold desc="page styles for <body> elements"> // The following constants are used for the class of the {@code <body>} element // for the corresponding pages. @@ -256,6 +361,7 @@ * The class of the {@code body} element for the page for the class hierarchy. */ treePage; + //</editor-fold> private final String cssName;
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/stylesheet.css Thu Mar 26 15:13:21 2020 -0700 +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/stylesheet.css Thu Mar 26 20:36:56 2020 -0700 @@ -531,7 +531,7 @@ white-space: pre-wrap; } div.member-signature span.type-parameters-long, -div.member-signature span.arguments, +div.member-signature span.parameters, div.member-signature span.exceptions { display: inline-block; vertical-align: top;
--- a/test/langtools/jdk/javadoc/doclet/testIndentation/TestIndentation.java Thu Mar 26 15:13:21 2020 -0700 +++ b/test/langtools/jdk/javadoc/doclet/testIndentation/TestIndentation.java Thu Mar 26 20:36:56 2020 -0700 @@ -51,7 +51,7 @@ "<div class=\"member-signature\"><span class=\"modifiers\">public</span> " + "<span class=\"type-parameters\"><T></span> " + "<span class=\"return-type\">void</span> <span class=\"member-name\">m</span>" - + "​(<span class=\"arguments\">T t1,\n" + + "​(<span class=\"parameters\">T t1,\n" + "T t2)</span>\n" + " throws <span class=\"exceptions\">java.lang.Exception</span></div>");
--- a/test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java Thu Mar 26 15:13:21 2020 -0700 +++ b/test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java Thu Mar 26 20:36:56 2020 -0700 @@ -58,7 +58,7 @@ + "<a href=\"#setRate(double)\"><code>setRate(double)</code></a></dd>", "<div class=\"member-signature\"><span class=\"modifiers\">public final</span> " + "<span class=\"return-type\">void</span> <span class=\"member-name\">setRate</span>​" - + "(<span class=\"arguments\">double value)</span></div>\n" + + "(<span class=\"parameters\">double value)</span></div>\n" + "<div class=\"block\">Sets the value of the property rate.</div>\n" + "<dl class=\"notes\">\n" + "<dt>Property description:</dt>", @@ -103,7 +103,7 @@ + "<h3>setPaused</h3>\n" + "<div class=\"member-signature\"><span class=\"modifiers\">public final</span> " + "<span class=\"return-type\">void</span> <span class=\"member-name\">setPaused</span>​" - + "(<span class=\"arguments\">boolean value)</span></div>\n" + + "(<span class=\"parameters\">boolean value)</span></div>\n" + "<div class=\"block\">Sets the value of the property paused.</div>\n" + "<dl class=\"notes\">\n" + "<dt>Property description:</dt>\n" @@ -132,7 +132,7 @@ + "<h3>setRate</h3>\n" + "<div class=\"member-signature\"><span class=\"modifiers\">public final</span> " + "<span class=\"return-type\">void</span> <span class=\"member-name\">setRate</span>​" - + "(<span class=\"arguments\">double value)</span></div>\n" + + "(<span class=\"parameters\">double value)</span></div>\n" + "<div class=\"block\">Sets the value of the property rate.</div>\n" + "<dl class=\"notes\">\n" + "<dt>Property description:</dt>\n"
--- a/test/langtools/jdk/javadoc/doclet/testMemberInheritance/TestMemberInheritance.java Thu Mar 26 15:13:21 2020 -0700 +++ b/test/langtools/jdk/javadoc/doclet/testMemberInheritance/TestMemberInheritance.java Thu Mar 26 20:36:56 2020 -0700 @@ -125,7 +125,7 @@ + "<div class=\"member-signature\"><span class=\"modifiers\">protected abstract</span>" + " <span class=\"return-type\">java.lang.String</span> " + "<span class=\"member-name\">parentMethod</span>​" - + "(<span class=\"arguments\">java.lang.String t)</span>\n" + + "(<span class=\"parameters\">java.lang.String t)</span>\n" + " " + "throws <span class=\"exceptions\">java.lang.IllegalArgumentException,\n" + "java.lang.InterruptedException,\n" @@ -158,7 +158,7 @@ + "<h3 id=\"method(java.lang.Object)\">method</h3>\n" + "<div class=\"member-signature\"><span class=\"modifiers\">public</span>" + " <span class=\"return-type\">java.lang.String</span> " - + "<span class=\"member-name\">method</span>​(<span class=\"arguments\">" + + "<span class=\"member-name\">method</span>​(<span class=\"parameters\">" + "java.lang.String t)</span></div>\n" + "</section>"); }
--- a/test/langtools/jdk/javadoc/doclet/testMethodSignature/TestMethodSignature.java Thu Mar 26 15:13:21 2020 -0700 +++ b/test/langtools/jdk/javadoc/doclet/testMethodSignature/TestMethodSignature.java Thu Mar 26 20:36:56 2020 -0700 @@ -23,7 +23,7 @@ /* * @test - * @bug 8214126 + * @bug 8214126 8241470 * @summary Method signatures not formatted correctly in browser * @library ../../lib/ * @modules jdk.javadoc/jdk.javadoc.internal.tool @@ -55,7 +55,7 @@ "<div class=\"member-signature\"><span class=\"modifiers\">public static</span>" + " <span class=\"return-type\">void</span> <span class=\"member-name\">" - + "simpleMethod</span>​(<span class=\"arguments\">int i,\n" + + "simpleMethod</span>​(<span class=\"parameters\">int i,\n" + "java.lang.String s,\nboolean b)</span></div>", "<div class=\"member-signature\"><span class=\"annotations\">@Generated" @@ -63,7 +63,7 @@ + " comments=\"some comment about the method below\")\n" + "</span><span class=\"modifiers\">public static</span> <span " + "class=\"return-type\">void</span> <span class=\"member-name\">annotatedMethod" - + "</span>​(<span class=\"arguments\">int i,\n" + + "</span>​(<span class=\"parameters\">int i,\n" + "java.lang.String s,\nboolean b)</span></div>", "<div class=\"member-signature\"><span class=\"modifiers\">public static</span>" @@ -79,7 +79,7 @@ + "title=\"class in pkg\">C.With8Types</a><T1,​T2,​T3," + "​T4,​T5,​T6,​T7,​T8></span> " + "<span class=\"member-name\">bigGenericMethod</span>​(" - + "<span class=\"arguments\"><a href=\"C.F0.html\" " + + "<span class=\"parameters\"><a href=\"C.F0.html\" " + "title=\"interface in pkg\">C.F0</a><? extends T1> t1,\n" + "<a href=\"C.F0.html\" title=\"interface in pkg\">" + "C.F0</a><? extends T2> t2,\n" @@ -117,7 +117,7 @@ + "title=\"class in pkg\">C.With8Types</a><T1,​T2,​T3," + "​T4,​T5,​T6,​T7,​T8></span> " + "<span class=\"member-name\">bigGenericAnnotatedMethod</span>​(" - + "<span class=\"arguments\"><a href=\"C.F0.html\" " + + "<span class=\"parameters\"><a href=\"C.F0.html\" " + "title=\"interface in pkg\">C.F0</a><? extends T1> t1,\n" + "<a href=\"C.F0.html\" title=\"interface in pkg\">" + "C.F0</a><? extends T2> t2,\n"
--- a/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/TestNewLanguageFeatures.java Thu Mar 26 15:13:21 2020 -0700 +++ b/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/TestNewLanguageFeatures.java Thu Mar 26 20:36:56 2020 -0700 @@ -83,7 +83,7 @@ "<div class=\"member-signature\"><span class=\"modifiers\">public static</span> " + "<span class=\"return-type\"><a href=\"Coin.html\" title=\"enum in pkg\">Coin</a></span> " + "<span class=\"member-name\">valueOf</span>​(" - + "<span class=\"arguments\">java.lang.String name)</span></div>\n" + + + "<span class=\"parameters\">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" + @@ -135,7 +135,7 @@ "<div class=\"member-signature\"><span class=\"modifiers\">public</span> " + "<span class=\"type-parameters\"><T extends java.util.List,​\nV></span>\n" + "<span class=\"return-type\">java.lang.String[]</span> <span class=\"member-name\">" - + "methodThatHasTypeParameters</span>​(<span class=\"arguments\">T param1,\n" + + "methodThatHasTypeParameters</span>​(<span class=\"parameters\">T param1,\n" + "V param2)</span></div>", // Method that returns TypeParameters "<td class=\"col-first\"><code><a href=\"TypeParameters.html\" " @@ -147,7 +147,7 @@ "<div class=\"member-signature\"><span class=\"modifiers\">public</span> <span " + "class=\"return-type\"><a href=\"TypeParameters.html\" title=\"type parameter in TypeParameters\">" + "E</a>[]</span> <span class=\"member-name\">methodThatReturnsTypeParameterA</span>​(" - + "<span class=\"arguments\"><a href=\"TypeParameters.html\" title=\"type parameter in TypeParameters\">" + + "<span class=\"parameters\"><a href=\"TypeParameters.html\" title=\"type parameter in TypeParameters\">" + "E</a>[] e)</span></div>\n", "<td class=\"col-first\"><code><T extends java.lang.Object & java.lang.Comparable<? super T>>" + "<br>T</code></td>\n" @@ -218,7 +218,7 @@ "<div class=\"member-signature\"><span class=\"modifiers\">public</span> " + "<span class=\"type-parameters\"><T extends java.lang.Number & java.lang.Runnable></span>\n" + "<span class=\"return-type\">T</span> <span class=\"member-name\">foo</span>​" - + "(<span class=\"arguments\">T t)</span></div>"); + + "(<span class=\"parameters\">T t)</span></div>"); //============================================================== // Test Class-Use Documentation for Type Parameters. @@ -562,14 +562,14 @@ // METHOD PARAMS "<div class=\"member-signature\"><span class=\"modifiers\">public</span> <span " + "class=\"return-type\">void</span> <span class=\"member-name\">methodWithParams</span>" - + "​(<span class=\"arguments\"><a href=\"AnnotationType.html\" title=\"annotation in pkg\">" + + "​(<span class=\"parameters\"><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=\"member-signature\"><span class=\"modifiers\">public</span> " - + "<span class=\"member-name\">AnnotationTypeUsage</span>​(<span class=\"arguments\">" + + "<span class=\"member-name\">AnnotationTypeUsage</span>​(<span class=\"parameters\">" + "<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"
--- a/test/langtools/jdk/javadoc/doclet/testPrivateClasses/TestPrivateClasses.java Thu Mar 26 15:13:21 2020 -0700 +++ b/test/langtools/jdk/javadoc/doclet/testPrivateClasses/TestPrivateClasses.java Thu Mar 26 20:36:56 2020 -0700 @@ -71,7 +71,7 @@ // Method is documented as though it is declared in the inheriting method. "<div class=\"member-signature\"><span class=\"modifiers\">public</span> " + "<span class=\"return-type\">void</span> <span class=\"member-name\">" - + "methodInheritedFromParent</span>​(<span class=\"arguments\">int p1)</span>\n" + + "methodInheritedFromParent</span>​(<span class=\"parameters\">int p1)</span>\n" + " throws <span class=\"exceptions\">java.lang.Exception</span></div>", "<dl class=\"notes\">\n" + "<dt>All Implemented Interfaces:</dt>\n"
--- a/test/langtools/jdk/javadoc/doclet/testRecordTypes/TestRecordTypes.java Thu Mar 26 15:13:21 2020 -0700 +++ b/test/langtools/jdk/javadoc/doclet/testRecordTypes/TestRecordTypes.java Thu Mar 26 20:36:56 2020 -0700 @@ -436,7 +436,7 @@ + "<span class=\"modifiers\">private final</span> <span class=\"return-type\">int</span>" + " <span class=\"member-name\">i</span></div>", "<div class=\"member-signature\"><span class=\"modifiers\">public</span> <span class=\"member-name\">R</span>" - + "​(<span class=\"arguments\">" + + "​(<span class=\"parameters\">" + pAnno + "int i)</span></div>", "<div class=\"member-signature\">"
--- a/test/langtools/jdk/javadoc/doclet/testSerializedFormWithClassFile/TestSerializedFormWithClassFile.java Thu Mar 26 15:13:21 2020 -0700 +++ b/test/langtools/jdk/javadoc/doclet/testSerializedFormWithClassFile/TestSerializedFormWithClassFile.java Thu Mar 26 20:36:56 2020 -0700 @@ -75,7 +75,7 @@ checkOutput("serialized-form.html", true, "<div class=\"member-signature\"><span class=\"modifiers\">public</span> " + "<span class=\"return-type\">void</span> <span class=\"member-name\">readObject</span>" - + "​(<span class=\"arguments\">java.io.ObjectInputStream arg0)</span>\n" + + "​(<span class=\"parameters\">java.io.ObjectInputStream arg0)</span>\n" + " throws <span class=\"exceptions\">java.lang.ClassNotFoundException,\n" + "java.io.IOException</span></div>\n"); }
--- a/test/langtools/jdk/javadoc/doclet/testTypeAnnotations/TestTypeAnnotations.java Thu Mar 26 15:13:21 2020 -0700 +++ b/test/langtools/jdk/javadoc/doclet/testTypeAnnotations/TestTypeAnnotations.java Thu Mar 26 20:36:56 2020 -0700 @@ -219,13 +219,13 @@ // Test for type annotations on parameters (Parameters.java). checkOutput("typeannos/Parameters.html", true, "<div class=\"member-signature\"><span class=\"return-type\">void</span> " - + "<span class=\"member-name\">unannotated</span>​(<span class=\"arguments\">" + + "<span class=\"member-name\">unannotated</span>​(<span class=\"parameters\">" + "<a href=\"ParaParameterized.html\" title=\"class in typeannos\">ParaParameterized</a>" + "<java.lang.String,​java.lang.String> a)</span></div>", "<div class=\"member-signature\"><span class=\"return-type\">void</span> " + "<span class=\"member-name\">nestedParaParameterized</span>​" - + "(<span class=\"arguments\"><a href=\"ParaParameterized.html\" " + + "(<span class=\"parameters\"><a href=\"ParaParameterized.html\" " + "title=\"class in typeannos\">ParaParameterized</a><<a href=\"ParamA.html\" " + "title=\"annotation in typeannos\">@ParamA</a> <a href=\"ParaParameterized.html\" " + "title=\"class in typeannos\">ParaParameterized</a><<a href=\"ParamA.html\" " @@ -236,7 +236,7 @@ // When JDK-8068737 is fixed, we should change the order "<div class=\"member-signature\"><span class=\"return-type\">void</span> " - + "<span class=\"member-name\">array2Deep</span>​(<span class=\"arguments\">" + + "<span class=\"member-name\">array2Deep</span>​(<span class=\"parameters\">" + "<a href=\"ParamA.html\" title=\"annotation in typeannos\">@ParamA</a> " + "java.lang.String <a href=\"ParamB.html\" title=\"annotation in typeannos\">" + "@ParamB</a> [] <a href=\"ParamA.html\" title=\"annotation in typeannos\">" @@ -259,13 +259,13 @@ checkOutput("typeannos/ThrPublicModified.html", true, "<div class=\"member-signature\"><span class=\"modifiers\">public final</span> " + "<span class=\"return-type\">void</span> <span class=\"member-name\">" - + "oneException</span>​(<span class=\"arguments\">java.lang.String a)</span>\n" + + "oneException</span>​(<span class=\"parameters\">java.lang.String a)</span>\n" + " throws <span class=\"exceptions\"><a href=\"ThrA.html\" " + "title=\"annotation in typeannos\">@ThrA</a> java.lang.Exception</span></div>", "<div class=\"member-signature\"><span class=\"modifiers\">public final</span> " + "<span class=\"return-type\">void</span> <span class=\"member-name\">" - + "twoExceptions</span>​(<span class=\"arguments\">java.lang.String a)</span>\n" + + "twoExceptions</span>​(<span class=\"parameters\">java.lang.String a)</span>\n" + " throws <span class=\"exceptions\"><a href=\"ThrA.html\" " + "title=\"annotation in typeannos\">@ThrA</a> java.lang.RuntimeException,\n" + "<a href=\"ThrA.html\" title=\"annotation in typeannos\">@ThrA</a> " @@ -296,7 +296,7 @@ // Test for type annotations on wildcard type (Wildcards.java). checkOutput("typeannos/BoundTest.html", true, "<div class=\"member-signature\"><span class=\"return-type\">void</span> " - + "<span class=\"member-name\">wcExtends</span>​(<span class=\"arguments\">" + + "<span class=\"member-name\">wcExtends</span>​(<span class=\"parameters\">" + "<a href=\"MyList.html\" title=\"class in typeannos\">MyList</a><? extends " + "<a href=\"WldA.html\" title=\"annotation in typeannos\">@WldA</a> " + "java.lang.String> l)</span></div>", @@ -308,7 +308,7 @@ checkOutput("typeannos/BoundWithValue.html", true, "<div class=\"member-signature\"><span class=\"return-type\">void</span> " - + "<span class=\"member-name\">wcSuper</span>​(<span class=\"arguments\">" + + "<span class=\"member-name\">wcSuper</span>​(<span class=\"parameters\">" + "<a href=\"MyList.html\" title=\"class in typeannos\">MyList</a><? super " + "<a href=\"WldB.html\" title=\"annotation in typeannos\">@WldB</a>(\"m\") " + "java.lang.String> l)</span></div>", @@ -321,20 +321,20 @@ // Test for receiver annotations (Receivers.java). checkOutput("typeannos/DefaultUnmodified.html", true, "<div class=\"member-signature\"><span class=\"return-type\">void</span> " - + "<span class=\"member-name\">withException</span>​(<span class=\"arguments\">" + + "<span class=\"member-name\">withException</span>​(<span class=\"parameters\">" + "<a href=\"RcvrA.html\" title=\"annotation in typeannos\">@RcvrA</a>" + " DefaultUnmodified this)</span>\n" + " throws <span class=\"exceptions\">java.lang.Exception</span></div>", "<div class=\"member-signature\"><span class=\"return-type\">java.lang.String</span> " - + "<span class=\"member-name\">nonVoid</span>​(<span class=\"arguments\">" + + "<span class=\"member-name\">nonVoid</span>​(<span class=\"parameters\">" + "<a href=\"RcvrA.html\" title=\"annotation in typeannos\">@RcvrA</a> " + "<a href=\"RcvrB.html\" title=\"annotation in typeannos\">@RcvrB</a>(\"m\")" + " DefaultUnmodified this)</span></div>", "<div class=\"member-signature\"><span class=\"type-parameters\"><T extends " + "java.lang.Runnable></span> <span class=\"return-type\">void</span> " - + "<span class=\"member-name\">accept</span>​(<span class=\"arguments\">" + + "<span class=\"member-name\">accept</span>​(<span class=\"parameters\">" + "<a href=\"RcvrA.html\" title=\"annotation in typeannos\">@RcvrA</a> " + "DefaultUnmodified this,\nT r)</span>\n" + " throws <span class=\"exceptions\">" @@ -343,14 +343,14 @@ checkOutput("typeannos/PublicModified.html", true, "<div class=\"member-signature\"><span class=\"modifiers\">public final</span> " + "<span class=\"return-type\">java.lang.String</span> <span class=\"member-name\">" - + "nonVoid</span>​(<span class=\"arguments\"><a href=\"RcvrA.html\" " + + "nonVoid</span>​(<span class=\"parameters\"><a href=\"RcvrA.html\" " + "title=\"annotation in typeannos\">@RcvrA</a> PublicModified this)" + "</span></div>", "<div class=\"member-signature\"><span class=\"modifiers\">public final</span> " + "<span class=\"type-parameters\"><T extends java.lang.Runnable></span> " + "<span class=\"return-type\">void</span> <span class=\"member-name\">accept" - + "</span>​(<span class=\"arguments\"><a href=\"RcvrA.html\" " + + "</span>​(<span class=\"parameters\"><a href=\"RcvrA.html\" " + "title=\"annotation in typeannos\">@RcvrA</a> PublicModified this,\n" + "T r)</span>\n throws " + "<span class=\"exceptions\">java.lang.Exception</span></div>"); @@ -358,7 +358,7 @@ checkOutput("typeannos/WithValue.html", true, "<div class=\"member-signature\"><span class=\"type-parameters\"><T extends " + "java.lang.Runnable></span> <span class=\"return-type\">void</span> " - + "<span class=\"member-name\">accept</span>​(<span class=\"arguments\">" + + "<span class=\"member-name\">accept</span>​(<span class=\"parameters\">" + "<a href=\"RcvrB.html\" title=\"annotation in typeannos\">@RcvrB</a>(\"m\")" + " WithValue this,\nT r)</span>\n" + " throws <span class=\"exceptions\">" @@ -366,20 +366,20 @@ checkOutput("typeannos/WithFinal.html", true, "<div class=\"member-signature\"><span class=\"return-type\">java.lang.String</span>" - + " <span class=\"member-name\">nonVoid</span>​(<span class=\"arguments\">" + + " <span class=\"member-name\">nonVoid</span>​(<span class=\"parameters\">" + "<a href=\"RcvrB.html\" title=\"annotation in typeannos\">@RcvrB</a>(\"m\") " + "<a href=\"WithFinal.html\" title=\"class in typeannos\">WithFinal</a>" + " afield)</span></div>"); checkOutput("typeannos/WithBody.html", true, "<div class=\"member-signature\"><span class=\"return-type\">void</span> " - + "<span class=\"member-name\">field</span>​(<span class=\"arguments\">" + + "<span class=\"member-name\">field</span>​(<span class=\"parameters\">" + "<a href=\"RcvrA.html\" title=\"annotation in typeannos\">@RcvrA</a>" + " WithBody this)</span></div>"); checkOutput("typeannos/Generic2.html", true, "<div class=\"member-signature\"><span class=\"return-type\">void</span> " - + "<span class=\"member-name\">test2</span>​(<span class=\"arguments\">" + + "<span class=\"member-name\">test2</span>​(<span class=\"parameters\">" + "<a href=\"RcvrA.html\" title=\"annotation in typeannos\">@RcvrA</a>" + " Generic2<X> this)</span></div>"); @@ -434,7 +434,7 @@ + "@RepConstructorB</a> <a href=\"RepConstructorB.html\" " + "title=\"annotation in typeannos\">@RepConstructorB</a>\n" + "</span><span class=\"member-name\">RepeatingOnConstructor</span>" - + "​(<span class=\"arguments\">int i,\n" + + "​(<span class=\"parameters\">int i,\n" + "int j)</span></div>", "<div class=\"member-signature\"><span class=\"annotations\">" @@ -445,11 +445,11 @@ + "@RepAllContextsB</a> <a href=\"RepAllContextsB.html\" " + "title=\"annotation in typeannos\">@RepAllContextsB</a>\n" + "</span><span class=\"member-name\">RepeatingOnConstructor</span>" - + "​(<span class=\"arguments\">int i,\n" + + "​(<span class=\"parameters\">int i,\n" + "int j,\nint k)</span></div>", "<div class=\"member-signature\"><span class=\"member-name\">RepeatingOnConstructor</span>" - + "​(<span class=\"arguments\"><a href=\"RepParameterA.html\" " + + "​(<span class=\"parameters\"><a href=\"RepParameterA.html\" " + "title=\"annotation in typeannos\">@RepParameterA</a> " + "<a href=\"RepParameterA.html\" title=\"annotation in typeannos\">@RepParameterA</a> " + "<a href=\"RepParameterB.html\" title=\"annotation in typeannos\">@RepParameterB</a> " @@ -474,7 +474,7 @@ + "@RepTypeUseA</a> <a href=\"RepTypeUseB.html\" title=\"annotation in typeannos\">" + "@RepTypeUseB</a> <a href=\"RepTypeUseB.html\" title=\"annotation in typeannos\">" + "@RepTypeUseB</a> ... vararg)</code>", - "Inner</span>​(<span class=\"arguments\"><a href=\"RepTypeUseA.html\" " + "Inner</span>​(<span class=\"parameters\"><a href=\"RepTypeUseA.html\" " + "title=\"annotation in typeannos\">@RepTypeUseA</a> <a href=\"RepTypeUseA.html\" " + "title=\"annotation in typeannos\">@RepTypeUseA</a> <a href=\"RepTypeUseB.html\" " + "title=\"annotation in typeannos\">@RepTypeUseB</a> <a href=\"RepTypeUseB.html\" " @@ -673,7 +673,7 @@ + "<span class=\"member-name\">test4</span>()", "java.lang.String</span> <span class=\"member-name\">test5</span>​(" - + "<span class=\"arguments\"><a href=\"RepTypeUseA.html\" " + + "<span class=\"parameters\"><a href=\"RepTypeUseA.html\" " + "title=\"annotation in typeannos\">@RepTypeUseA</a> " + "<a href=\"RepTypeUseA.html\" title=\"annotation in typeannos\">@RepTypeUseA</a> " + "<a href=\"RepTypeUseB.html\" title=\"annotation in typeannos\">@RepTypeUseB</a> " @@ -715,7 +715,7 @@ "<span class=\"return-type\">java.lang.String</span> " + "<span class=\"member-name\">test</span>" - + "​(<span class=\"arguments\"><a href=\"RepTypeUseA.html\" " + + "​(<span class=\"parameters\"><a href=\"RepTypeUseA.html\" " + "title=\"annotation in typeannos\">@RepTypeUseA</a> <a href=" + "\"RepTypeUseA.html\" title=\"annotation in typeannos\">" + "@RepTypeUseA</a> <a href=\"RepTypeUseB.html\" title="