8263473: Update annotation terminology (2)
Reviewed-by: hannesw
This commit is contained in:
Jonathan Gibbons
parent
3e751a5a9c
commit
1a13c9ef83
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html
test/langtools/jdk/javadoc/doclet
testClassTree
testHtmlTableTags
testIndex
testModules
testNewLanguageFeatures
testOverriddenMethods
testRecordTypes
testRepeatedAnnotations
testTypeAnnotations
@ -127,6 +127,7 @@ public class HtmlDoclet extends AbstractDoclet {
|
||||
// in standard.properties
|
||||
{ "doclet.Enum_Hierarchy", "doclet.Enum_Class_Hierarchy" },
|
||||
{ "doclet.Annotation_Type_Hierarchy", "doclet.Annotation_Interface_Hierarchy" },
|
||||
{ "doclet.Href_Annotation_Title", "doclet.Href_Annotation_Interface_Title" },
|
||||
{ "doclet.Href_Enum_Title", "doclet.Href_Enum_Class_Title" },
|
||||
{ "doclet.Annotation_Types", "doclet.Annotation_Interfaces" },
|
||||
{ "doclet.Annotation_Type_Members", "doclet.Annotation_Interface_Members" },
|
||||
|
||||
@ -46,6 +46,7 @@ doclet.Annotation_Interface_Hierarchy=Annotation Interface Hierarchy
|
||||
doclet.Href_Class_Title=class in {0}
|
||||
doclet.Href_Interface_Title=interface in {0}
|
||||
doclet.Href_Annotation_Title=annotation in {0}
|
||||
doclet.Href_Annotation_Interface_Title=annotation interface in {0}
|
||||
doclet.Href_Enum_Title=enum in {0}
|
||||
doclet.Href_Enum_Class_Title=enum class in {0}
|
||||
doclet.Href_Type_Param_Title=type parameter in {0}
|
||||
|
||||
@ -60,8 +60,8 @@ public class TestClassTree extends JavadocTester {
|
||||
<h2 title="Annotation Interface Hierarchy">Annotation Interface Hierarchy</h2>
|
||||
<ul>
|
||||
<li class="circle">pkg.<a href="AnnotationType.html" class="type-name-link" titl\
|
||||
e="annotation in pkg">AnnotationType</a> (implements java.lang.annotation.Annota\
|
||||
tion)</li>
|
||||
e="annotation interface in pkg">AnnotationType</a> (implements java.lang.annotat\
|
||||
ion.Annotation)</li>
|
||||
</ul>""",
|
||||
"""
|
||||
<h2 title="Enum Class Hierarchy">Enum Class Hierarchy</h2>
|
||||
|
||||
@ -305,16 +305,21 @@ public class TestHtmlTableTags extends JavadocTester {
|
||||
void checkHtmlTableCaptions() {
|
||||
//Package summary
|
||||
checkOutput("pkg1/package-summary.html", true,
|
||||
"<div class=\"caption\"><span>Class Summary</span></div>",
|
||||
"<div class=\"caption\"><span>Interface Summary</span></div>");
|
||||
"""
|
||||
<div class="caption"><span>Class Summary</span></div>""",
|
||||
"""
|
||||
<div class="caption"><span>Interface Summary</span></div>""");
|
||||
|
||||
checkOutput("pkg2/package-summary.html", true,
|
||||
"<div class=\"caption\"><span>Enum Class Summary</span></div>",
|
||||
"<div class=\"caption\"><span>Annotation Interfaces Summary</span></div>");
|
||||
"""
|
||||
<div class="caption"><span>Enum Class Summary</span></div>""",
|
||||
"""
|
||||
<div class="caption"><span>Annotation Interfaces Summary</span></div>""");
|
||||
|
||||
// Class documentation
|
||||
checkOutput("pkg1/C1.html", true,
|
||||
"<div class=\"caption\"><span>Fields</span></div>",
|
||||
"""
|
||||
<div class="caption"><span>Fields</span></div>""",
|
||||
"""
|
||||
<div class="table-tabs" role="tablist" aria-orientation="horizontal">\
|
||||
<button id="method-summary-table-tab0" role="tab" aria-selected="true" aria-cont\
|
||||
@ -337,17 +342,22 @@ public class TestHtmlTableTags extends JavadocTester {
|
||||
""");
|
||||
|
||||
checkOutput("pkg2/C2.html", true,
|
||||
"<div class=\"caption\"><span>Nested Classes</span></div>",
|
||||
"<div class=\"caption\"><span>Constructors</span></div>");
|
||||
"""
|
||||
<div class="caption"><span>Nested Classes</span></div>""",
|
||||
"""
|
||||
<div class="caption"><span>Constructors</span></div>""");
|
||||
|
||||
checkOutput("pkg2/C2.ModalExclusionType.html", true,
|
||||
"<div class=\"caption\"><span>Enum Constants</span></div>");
|
||||
"""
|
||||
<div class="caption"><span>Enum Constants</span></div>""");
|
||||
|
||||
checkOutput("pkg2/C3.html", true,
|
||||
"<div class=\"caption\"><span>Required Elements</span></div>");
|
||||
"""
|
||||
<div class="caption"><span>Required Elements</span></div>""");
|
||||
|
||||
checkOutput("pkg2/C4.html", true,
|
||||
"<div class=\"caption\"><span>Optional Elements</span></div>");
|
||||
"""
|
||||
<div class="caption"><span>Optional Elements</span></div>""");
|
||||
|
||||
// Class use documentation
|
||||
checkOutput("pkg1/class-use/I1.html", true,
|
||||
@ -393,8 +403,10 @@ public class TestHtmlTableTags extends JavadocTester {
|
||||
|
||||
// Deprecated
|
||||
checkOutput("deprecated-list.html", true,
|
||||
"<div class=\"caption\"><span>Fields</span></div>",
|
||||
"<div class=\"caption\"><span>Methods</span></div>");
|
||||
"""
|
||||
<div class="caption"><span>Fields</span></div>""",
|
||||
"""
|
||||
<div class="caption"><span>Methods</span></div>""");
|
||||
|
||||
// Constant values
|
||||
checkOutput("constant-values.html", true,
|
||||
@ -403,7 +415,8 @@ public class TestHtmlTableTags extends JavadocTester {
|
||||
|
||||
// Overview Summary
|
||||
checkOutput("index.html", true,
|
||||
"<div class=\"caption\"><span>Packages</span></div>");
|
||||
"""
|
||||
<div class="caption"><span>Packages</span></div>""");
|
||||
}
|
||||
|
||||
/*
|
||||
@ -558,12 +571,13 @@ public class TestHtmlTableTags extends JavadocTester {
|
||||
|
||||
checkOutput("pkg2/package-summary.html", true,
|
||||
"""
|
||||
<div class="col-first even-row-color"><a href="C2.ModalExclusionType.html" title="enum class in pkg2">C2.ModalExclusionType</a></div>
|
||||
<div class="col-first even-row-color"><a href="C2.ModalExclusionType.html" title\
|
||||
="enum class in pkg2">C2.ModalExclusionType</a></div>
|
||||
<div class="col-last even-row-color">
|
||||
<div class="block">A sample enum.</div>
|
||||
</div>""",
|
||||
"""
|
||||
<div class="col-first even-row-color"><a href="C3.html" title="annotation in pkg2">C3</a></div>
|
||||
<div class="col-first even-row-color"><a href="C3.html" title="annotation interface in pkg2">C3</a></div>
|
||||
<div class="col-last even-row-color">
|
||||
<div class="block">Test Annotation class.</div>
|
||||
</div>""");
|
||||
@ -677,7 +691,8 @@ public class TestHtmlTableTags extends JavadocTester {
|
||||
<div class="deprecation-comment">don't use this field anymore.</div>
|
||||
</div>""",
|
||||
"""
|
||||
<div class="col-summary-item-name even-row-color"><a href="pkg1/C1.html#deprecatedMethod()">pkg1.C1.deprecatedMethod()</a></div>
|
||||
<div class="col-summary-item-name even-row-color"><a href="pkg1/C1.html#deprecat\
|
||||
edMethod()">pkg1.C1.deprecatedMethod()</a></div>
|
||||
<div class="col-last even-row-color">
|
||||
<div class="deprecation-comment">don't use this anymore.</div>
|
||||
</div>""");
|
||||
@ -685,7 +700,8 @@ public class TestHtmlTableTags extends JavadocTester {
|
||||
// Constant values
|
||||
checkOutput("constant-values.html", true,
|
||||
"""
|
||||
<div class="col-first even-row-color"><code id="pkg1.C1.CONSTANT1">public static final java.lang.String</code></div>
|
||||
<div class="col-first even-row-color"><code id="pkg1.C1.CONSTANT1">public s\
|
||||
tatic final java.lang.String</code></div>
|
||||
<div class="col-second even-row-color"><code><a href="pkg1/C1.html#CONSTANT1">CONSTANT1</a></code></div>
|
||||
<div class="col-last even-row-color"><code>"C1"</code></div>
|
||||
</div>""");
|
||||
@ -715,10 +731,11 @@ public class TestHtmlTableTags extends JavadocTester {
|
||||
|
||||
checkOutput("pkg2/package-summary.html", true,
|
||||
"""
|
||||
<div class="col-first even-row-color"><a href="C2.ModalExclusionType.html" title="enum class in pkg2">C2.ModalExclusionType</a></div>
|
||||
<div class="col-first even-row-color"><a href="C2.ModalExclusionType.html" title\
|
||||
="enum class in pkg2">C2.ModalExclusionType</a></div>
|
||||
<div class="col-last even-row-color"></div>""",
|
||||
"""
|
||||
<div class="col-first even-row-color"><a href="C3.html" title="annotation in pkg2">C3</a></div>
|
||||
<div class="col-first even-row-color"><a href="C3.html" title="annotation interface in pkg2">C3</a></div>
|
||||
<div class="col-last even-row-color"></div>""");
|
||||
|
||||
// Class documentation
|
||||
@ -808,13 +825,15 @@ public class TestHtmlTableTags extends JavadocTester {
|
||||
<div class="col-summary-item-name even-row-color"><a href="pkg2/C2.html#dep_field">pkg2.C2.dep_field</a></div>
|
||||
<div class="col-last even-row-color"></div>""",
|
||||
"""
|
||||
<div class="col-summary-item-name even-row-color"><a href="pkg1/C1.html#deprecatedMethod()">pkg1.C1.deprecatedMethod()</a></div>
|
||||
<div class="col-summary-item-name even-row-color"><a href="pkg1/C1.html#deprecat\
|
||||
edMethod()">pkg1.C1.deprecatedMethod()</a></div>
|
||||
<div class="col-last even-row-color"></div>""");
|
||||
|
||||
// Constant values
|
||||
checkOutput("constant-values.html", true,
|
||||
"""
|
||||
<div class="col-first even-row-color"><code id="pkg1.C1.CONSTANT1">public static final java.lang.String</code></div>
|
||||
<div class="col-first even-row-color"><code id="pkg1.C1.CONSTANT1">public s\
|
||||
tatic final java.lang.String</code></div>
|
||||
<div class="col-second even-row-color"><code><a href="pkg1/C1.html#CONSTANT1">CONSTANT1</a></code></div>
|
||||
<div class="col-last even-row-color"><code>"C1"</code></div>
|
||||
</div>""");
|
||||
|
||||
@ -58,9 +58,9 @@ public class TestIndex extends JavadocTester {
|
||||
<a href="pkg/Interface.html" class="type-name-link" title="interface in pkg">Int\
|
||||
erface</a> - Interface in <a href="pkg/package-summary.html">pkg</a>""",
|
||||
"""
|
||||
<a href="pkg/AnnotationType.html" class="type-name-link" title="annotation in pk\
|
||||
g">AnnotationType</a> - Annotation Interface in <a href="pkg/packag\
|
||||
e-summary.html">pkg</a>""",
|
||||
<a href="pkg/AnnotationType.html" class="type-name-link" title="annotation inter\
|
||||
face in pkg">AnnotationType</a> - Annotation Interface in <a href="pkg/package-s\
|
||||
ummary.html">pkg</a>""",
|
||||
"""
|
||||
<a href="pkg/Coin.html" class="type-name-link" title="enum class in pkg">Coin</a\
|
||||
> - Enum Class in <a href="pkg/package-summary.html">pkg</a>""",
|
||||
|
||||
@ -560,8 +560,9 @@ public class TestModules extends JavadocTester {
|
||||
</div>
|
||||
<hr>
|
||||
<div class="module-signature"><span class="annotations"><a href="testpkgmdlB/Ann\
|
||||
otationType.html" title="annotation in testpkgmdlB">@AnnotationType</a>(<a href=\
|
||||
"testpkgmdlB/AnnotationType.html#optional()">optional</a>="Module Annotation",
|
||||
otationType.html" title="annotation interface in testpkgmdlB">@AnnotationType</a\
|
||||
>(<a href="testpkgmdlB/AnnotationType.html#optional()">optional</a>="Module Anno\
|
||||
tation",
|
||||
<a href="testpkgmdlB/AnnotationType.html#required()">required</a>=2016)
|
||||
</span>module <span class="element-name">moduleB</span></div>
|
||||
<section class="summary">
|
||||
@ -725,7 +726,8 @@ public class TestModules extends JavadocTester {
|
||||
<!-- ============ MODULES SUMMARY =========== -->
|
||||
<h2>Modules</h2>""",
|
||||
"""
|
||||
<div class="col-first even-row-color package-summary-table package-summary-table-tab1"><a href="testpkgmdlA/package-summary.html">testpkgmdlA</a></div>
|
||||
<div class="col-first even-row-color package-summary-table package-summary-table\
|
||||
-tab1"><a href="testpkgmdlA/package-summary.html">testpkgmdlA</a></div>
|
||||
<div class="col-last even-row-color package-summary-table package-summary-table-tab1"> </div>""",
|
||||
"""
|
||||
<section class="packages-summary" id="packages-summary">
|
||||
@ -748,7 +750,8 @@ public class TestModules extends JavadocTester {
|
||||
<!-- ============ PACKAGES SUMMARY =========== -->
|
||||
<h2>Packages</h2>""",
|
||||
"""
|
||||
<div class="col-first even-row-color package-summary-table package-summary-table-tab2"><a href="testpkgmdlB/package-summary.html">testpkgmdlB</a></div>
|
||||
<div class="col-first even-row-color package-summary-table package-summary-table\
|
||||
-tab2"><a href="testpkgmdlB/package-summary.html">testpkgmdlB</a></div>
|
||||
<div class="col-last even-row-color package-summary-table package-summary-table-tab2"> </div>
|
||||
</div>""",
|
||||
"""
|
||||
@ -758,7 +761,8 @@ public class TestModules extends JavadocTester {
|
||||
<!-- ============ SERVICES SUMMARY =========== -->
|
||||
<h2>Services</h2>""",
|
||||
"""
|
||||
<div class="col-first even-row-color"><a href="testpkgmdlB/TestClassInModuleB.html" title="class in testpkgmdlB">TestClassInModuleB</a></div>
|
||||
<div class="col-first even-row-color"><a href="testpkgmdlB/TestClassInModuleB.ht\
|
||||
ml" title="class in testpkgmdlB">TestClassInModuleB</a></div>
|
||||
<div class="col-last even-row-color">
|
||||
<div class="block">With a test description for uses.</div>
|
||||
</div>""",
|
||||
@ -868,19 +872,24 @@ public class TestModules extends JavadocTester {
|
||||
void checkModuleModeCommon() {
|
||||
checkOutput("index.html", true,
|
||||
"""
|
||||
<div class="col-first even-row-color all-modules-table all-modules-table-tab1"><a href="moduleA/module-summary.html">moduleA</a></div>
|
||||
<div class="col-first even-row-color all-modules-table all-modules-table-tab1"><\
|
||||
a href="moduleA/module-summary.html">moduleA</a></div>
|
||||
<div class="col-last even-row-color all-modules-table all-modules-table-tab1">
|
||||
<div class="block">This is a test description for the moduleA module with a Search phrase search phrase.</div>""",
|
||||
"""
|
||||
<div class="col-first odd-row-color all-modules-table all-modules-table-tab1"><a href="moduleB/module-summary.html">moduleB</a></div>
|
||||
<div class="col-first odd-row-color all-modules-table all-modules-table-tab1"><a\
|
||||
href="moduleB/module-summary.html">moduleB</a></div>
|
||||
<div class="col-last odd-row-color all-modules-table all-modules-table-tab1">
|
||||
<div class="block">This is a test description for the moduleB module.</div>""",
|
||||
"""
|
||||
<div class="col-first odd-row-color all-modules-table all-modules-table-tab1"><a href="moduletags/module-summary.html">moduletags</a></div>
|
||||
<div class="col-first odd-row-color all-modules-table all-modules-table-tab1"><a\
|
||||
href="moduletags/module-summary.html">moduletags</a></div>
|
||||
<div class="col-last odd-row-color all-modules-table all-modules-table-tab1">
|
||||
<div class="block">This is a test description for the moduletags module.<br>
|
||||
Type Link: <a href="moduletags/testpkgmdltags/TestClassInModuleTags.html" title="class in testpkgmdltags"><code>TestClassInModuleTags</code></a>.<br>
|
||||
Member Link: <a href="moduletags/testpkgmdltags/TestClassInModuleTags.html#testMethod(java.lang.String)"><code>testMethod(String)</code></a>.<br>
|
||||
Type Link: <a href="moduletags/testpkgmdltags/TestClassInModuleTags.html" title\
|
||||
="class in testpkgmdltags"><code>TestClassInModuleTags</code></a>.<br>
|
||||
Member Link: <a href="moduletags/testpkgmdltags/TestClassInModuleTags.html#test\
|
||||
Method(java.lang.String)"><code>testMethod(String)</code></a>.<br>
|
||||
Package Link: <a href="moduletags/testpkgmdltags/package-summary.html"><code>testpkgmdltags</code></a>.<br></div>
|
||||
</div>""");
|
||||
checkOutput("moduleA/module-summary.html", true,
|
||||
@ -895,7 +904,8 @@ public class TestModules extends JavadocTester {
|
||||
""");
|
||||
checkOutput("moduletags/module-summary.html", true,
|
||||
"""
|
||||
<div class="col-first even-row-color package-summary-table package-summary-table-tab1"><a href="testpkgmdltags/package-summary.html">testpkgmdltags</a></div>
|
||||
<div class="col-first even-row-color package-summary-table package-summary-table\
|
||||
-tab1"><a href="testpkgmdltags/package-summary.html">testpkgmdltags</a></div>
|
||||
<div class="col-last even-row-color package-summary-table package-summary-table-tab1"> </div>""",
|
||||
"""
|
||||
<li><a href="#module-description">Description</a> | </li>
|
||||
@ -940,7 +950,8 @@ public class TestModules extends JavadocTester {
|
||||
void checkModuleModeApi(boolean found) {
|
||||
checkOutput("moduleA/module-summary.html", found,
|
||||
"""
|
||||
<div class="col-first even-row-color package-summary-table package-summary-table-tab1"><a href="testpkgmdlA/package-summary.html">testpkgmdlA</a></div>
|
||||
<div class="col-first even-row-color package-summary-table package-summary-table\
|
||||
-tab1"><a href="testpkgmdlA/package-summary.html">testpkgmdlA</a></div>
|
||||
<div class="col-last even-row-color package-summary-table package-summary-table-tab1"> </div>""");
|
||||
checkOutput("moduleB/module-summary.html", found,
|
||||
"""
|
||||
@ -949,7 +960,8 @@ public class TestModules extends JavadocTester {
|
||||
<li><a href="#packages-summary">Packages</a> | </li>
|
||||
<li><a href="#services-summary">Services</a></li>""",
|
||||
"""
|
||||
<div class="col-first even-row-color package-summary-table package-summary-table-tab2"><a href="testpkgmdlB/package-summary.html">testpkgmdlB</a></div>
|
||||
<div class="col-first even-row-color package-summary-table package-summary-table\
|
||||
-tab2"><a href="testpkgmdlB/package-summary.html">testpkgmdlB</a></div>
|
||||
<div class="col-last even-row-color package-summary-table package-summary-table-tab2"> </div>""",
|
||||
"""
|
||||
<div id="package-summary-table">
|
||||
@ -957,12 +969,14 @@ public class TestModules extends JavadocTester {
|
||||
<div class="summary-table two-column-summary">
|
||||
<div class="table-header col-first">Package</div>
|
||||
<div class="table-header col-last">Description</div>
|
||||
<div class="col-first even-row-color package-summary-table package-summary-table-tab2"><a href="testpkgmdlB/package-summary.html">testpkgmdlB</a></div>
|
||||
<div class="col-first even-row-color package-summary-table package-summary-table\
|
||||
-tab2"><a href="testpkgmdlB/package-summary.html">testpkgmdlB</a></div>
|
||||
<div class="col-last even-row-color package-summary-table package-summary-table-tab2"> </div>
|
||||
</div>
|
||||
</div>""",
|
||||
"""
|
||||
<div class="col-first even-row-color"><a href="testpkgmdlB/TestClassInModuleB.html" title="class in testpkgmdlB">TestClassInModuleB</a></div>
|
||||
<div class="col-first even-row-color"><a href="testpkgmdlB/TestClassInModuleB.ht\
|
||||
ml" title="class in testpkgmdlB">TestClassInModuleB</a></div>
|
||||
<div class="col-last even-row-color">
|
||||
<div class="block">With a test description for uses.</div>
|
||||
""");
|
||||
@ -990,7 +1004,8 @@ public class TestModules extends JavadocTester {
|
||||
<div class="col-first even-row-color"><a href="../moduleC/module-summary.html">moduleC</a></div>
|
||||
<div class="col-last even-row-color"><a href="../moduleC/testpkgmdlC/package-summary.html">testpkgmdlC</a></div>""",
|
||||
"""
|
||||
<div class="col-first odd-row-color package-summary-table package-summary-table-tab1"><a href="testpkgmdlA/package-summary.html">testpkgmdlA</a></div>
|
||||
<div class="col-first odd-row-color package-summary-table package-summary-table-\
|
||||
tab1"><a href="testpkgmdlA/package-summary.html">testpkgmdlA</a></div>
|
||||
<div class="col-second odd-row-color package-summary-table package-summary-table-tab1">All Modules</div>
|
||||
<div class="col-last odd-row-color package-summary-table package-summary-table-tab1"> </div>""",
|
||||
"""
|
||||
@ -1009,7 +1024,9 @@ public class TestModules extends JavadocTester {
|
||||
s="table-tab">Concealed</button>\
|
||||
</div>""",
|
||||
"""
|
||||
<div class="col-first even-row-color package-summary-table package-summary-table-tab3"><a href="concealedpkgmdlA/package-summary.html">concealedpkgmdlA</a></div>
|
||||
<div class="col-first even-row-color package-summary-table package-summary-table\
|
||||
-tab3"><a href="concealedpkgmdlA/package-summary.html">concealedpkgmdlA</a></div\
|
||||
>
|
||||
<div class="col-second even-row-color package-summary-table package-summary-table-tab3">None</div>
|
||||
<div class="col-last even-row-color package-summary-table package-summary-table-tab3"> </div>""");
|
||||
checkOutput("moduleB/module-summary.html", found,
|
||||
@ -1019,7 +1036,8 @@ public class TestModules extends JavadocTester {
|
||||
<li><a href="#packages-summary">Packages</a> | </li>
|
||||
<li><a href="#services-summary">Services</a></li>""",
|
||||
"""
|
||||
<div class="col-first even-row-color package-summary-table package-summary-table-tab2"><a href="testpkgmdlB/package-summary.html">testpkgmdlB</a></div>
|
||||
<div class="col-first even-row-color package-summary-table package-summary-table\
|
||||
-tab2"><a href="testpkgmdlB/package-summary.html">testpkgmdlB</a></div>
|
||||
<div class="col-second even-row-color package-summary-table package-summary-table-tab2">None</div>
|
||||
<div class="col-second even-row-color package-summary-table package-summary-table-tab2">All Modules</div>
|
||||
<div class="col-last even-row-color package-summary-table package-summary-table-tab2"> </div>""",
|
||||
@ -1059,7 +1077,8 @@ public class TestModules extends JavadocTester {
|
||||
s="table-tab">Opens</button>\
|
||||
</div>""",
|
||||
"""
|
||||
<div class="col-first odd-row-color"><a href="testpkgmdlB/TestClassInModuleB.html" title="class in testpkgmdlB">TestClassInModuleB</a></div>
|
||||
<div class="col-first odd-row-color"><a href="testpkgmdlB/TestClassInModuleB.htm\
|
||||
l" title="class in testpkgmdlB">TestClassInModuleB</a></div>
|
||||
<div class="col-last odd-row-color">
|
||||
<div class="block">With a test description for uses.</div>
|
||||
""");
|
||||
@ -1120,9 +1139,9 @@ public class TestModules extends JavadocTester {
|
||||
</div>
|
||||
<hr>
|
||||
<div class="module-signature"><span class="annotations"><a href="testpkgmdlB/Ann\
|
||||
otationType.html" title="annotation in testpkgmdlB">@AnnotationType</a>(<a href=\
|
||||
"testpkgmdlB/AnnotationType.html#optional()">option\
|
||||
al</a>="Module Annotation",
|
||||
otationType.html" title="annotation interface in testpkgmdlB">@AnnotationType</a\
|
||||
>(<a href="testpkgmdlB/AnnotationType.html#optional()">optional</a>="Module Anno\
|
||||
tation",
|
||||
<a href="testpkgmdlB/AnnotationType.html#required()">required</a>=2016)
|
||||
</span>module <span class="element-name">moduleB</span></div>""");
|
||||
checkOutput("moduleB/module-summary.html", false,
|
||||
@ -1134,7 +1153,8 @@ public class TestModules extends JavadocTester {
|
||||
"""
|
||||
<!-- ============ PACKAGES SUMMARY =========== -->
|
||||
<h2>Packages</h2>""",
|
||||
"<div class=\"caption\"><span>Concealed</span></div>");
|
||||
"""
|
||||
<div class="caption"><span>Concealed</span></div>""");
|
||||
}
|
||||
|
||||
void checkGroupOption() {
|
||||
|
||||
@ -73,7 +73,8 @@ public class TestNewLanguageFeatures extends JavadocTester {
|
||||
<span class="extends-implements">extends java.lang.Enum<<a href="Coin.html" ti\
|
||||
tle="enum class in pkg">Coin</a>></span></div>""",
|
||||
// Check for enum constant section
|
||||
"<div class=\"caption\"><span>Enum Constants</span></div>",
|
||||
"""
|
||||
<div class="caption"><span>Enum Constants</span></div>""",
|
||||
// Detail for enum constant
|
||||
"""
|
||||
<a href="#Dime" class="member-name-link">Dime</a>""",
|
||||
@ -421,7 +422,11 @@ public class TestNewLanguageFeatures extends JavadocTester {
|
||||
> that return types with arguments of type <a href="../Foo4.html" title="class\
|
||||
in pkg2">Foo4</a></span></div>""",
|
||||
"""
|
||||
<div class="col-first even-row-color"><code><T extends <a href="../ParamTest2.html" title="class in pkg2">ParamTest2</a><java.util.List<? extends <a href="../Foo4.html" title="class in pkg2">Foo4</a>>>><br><a href="../ParamTest2.html" title="class in pkg2">ParamTest2</a><java.util.List<? extends <a href="../Foo4.html" title="class in pkg2">Foo4</a>>></code></div>"""
|
||||
<div class="col-first even-row-color"><code><T extends <a href="../ParamTest2\
|
||||
.html" title="class in pkg2">ParamTest2</a><java.util.List<? extends <a hr\
|
||||
ef="../Foo4.html" title="class in pkg2">Foo4</a>>>><br><a href="../Para\
|
||||
mTest2.html" title="class in pkg2">ParamTest2</a><java.util.List<? extends\
|
||||
<a href="../Foo4.html" title="class in pkg2">Foo4</a>>></code></div>"""
|
||||
);
|
||||
|
||||
// Type parameters in constructor and method args
|
||||
@ -518,16 +523,16 @@ public class TestNewLanguageFeatures extends JavadocTester {
|
||||
checkOutput("pkg/package-summary.html", true,
|
||||
// PACKAGE
|
||||
"""
|
||||
<a href="AnnotationType.html" title="annotation in pkg">@AnnotationType</a>(<a h\
|
||||
ref="AnnotationType.html#optional()">optional</a>="Package Annotation",
|
||||
<a href="AnnotationType.html" title="annotation interface in pkg">@AnnotationTyp\
|
||||
e</a>(<a href="AnnotationType.html#optional()">optional</a>="Package Annotation",
|
||||
<a href="AnnotationType.html#required()">required</a>=1994)""");
|
||||
|
||||
checkOutput("pkg/AnnotationTypeUsage.html", true,
|
||||
// CLASS
|
||||
"""
|
||||
<div class="type-signature"><span class="annotations"><a href="AnnotationType.ht\
|
||||
ml" title="annotation in pkg">@AnnotationType</a>(<a href="AnnotationType.html#o\
|
||||
ptional()">optional</a>="Class Annotation",
|
||||
ml" title="annotation interface in pkg">@AnnotationType</a>(<a href="AnnotationT\
|
||||
ype.html#optional()">optional</a>="Class Annotation",
|
||||
<a href="AnnotationType.html#required()">required</a>=1994)
|
||||
</span><span class="modifiers">public class </span><span class="element-name type-name-l\
|
||||
abel">AnnotationTypeUsage</span>
|
||||
@ -535,23 +540,23 @@ public class TestNewLanguageFeatures extends JavadocTester {
|
||||
// FIELD
|
||||
"""
|
||||
<div class="member-signature"><span class="annotations"><a href="AnnotationType.\
|
||||
html" title="annotation in pkg">@AnnotationType</a>(<a href="AnnotationType.html\
|
||||
#optional()">optional</a>="Field Annotation",
|
||||
html" title="annotation interface in pkg">@AnnotationType</a>(<a href="Annotatio\
|
||||
nType.html#optional()">optional</a>="Field Annotation",
|
||||
<a href="AnnotationType.html#required()">required</a>=1994)
|
||||
</span><span class="modifiers">public</span> <span class="return-type">int<\
|
||||
/span> <span class="element-name">field</span></div>""",
|
||||
// CONSTRUCTOR
|
||||
"""
|
||||
<div class="member-signature"><span class="annotations"><a href="AnnotationType.\
|
||||
html" title="annotation in pkg">@AnnotationType</a>(<a href="AnnotationType.html\
|
||||
#optional()">optional</a>="Constructor Annotation",
|
||||
html" title="annotation interface in pkg">@AnnotationType</a>(<a href="Annotatio\
|
||||
nType.html#optional()">optional</a>="Constructor Annotation",
|
||||
<a href="AnnotationType.html#required()">required</a>=1994)
|
||||
</span><span class="modifiers">public</span> <span class="element-name">AnnotationTypeUsage</span>()</div>""",
|
||||
// METHOD
|
||||
"""
|
||||
<div class="member-signature"><span class="annotations"><a href="AnnotationType.\
|
||||
html" title="annotation in pkg">@AnnotationType</a>(<a href="AnnotationType.html\
|
||||
#optional()">optional</a>="Method Annotation",
|
||||
html" title="annotation interface in pkg">@AnnotationType</a>(<a href="Annotatio\
|
||||
nType.html#optional()">optional</a>="Method Annotation",
|
||||
<a href="AnnotationType.html#required()">required</a>=1994)
|
||||
</span><span class="modifiers">public</span> <span class="return-type">void\
|
||||
</span> <span class="element-name">method</span>()</div>""",
|
||||
@ -560,18 +565,18 @@ public class TestNewLanguageFeatures extends JavadocTester {
|
||||
<div class="member-signature"><span class="modifiers">public</span> <span c\
|
||||
lass="return-type">void</span> <span class="element-name">methodWithParams</span>&#\
|
||||
8203;<span class="parameters">(<a href="AnnotationType.html" title="annotation i\
|
||||
n pkg">@AnnotationType</a>(<a href="AnnotationType.html#optional()">optional</a>\
|
||||
="Parameter Annotation",<a href="AnnotationType.html#required()">required</a>=19\
|
||||
94)
|
||||
nterface in pkg">@AnnotationType</a>(<a href="AnnotationType.html#optional()">op\
|
||||
tional</a>="Parameter Annotation",<a href="AnnotationType.html#required()">requi\
|
||||
red</a>=1994)
|
||||
int documented,
|
||||
int undocmented)</span></div>""",
|
||||
// CONSTRUCTOR PARAMS
|
||||
"""
|
||||
<div class="member-signature"><span class="modifiers">public</span> <span c\
|
||||
lass="element-name">AnnotationTypeUsage</span>​<span class="parameters">(<\
|
||||
a href="AnnotationType.html" title="annotation in pkg">@AnnotationType</a>(<a hr\
|
||||
ef="AnnotationType.html#optional()">optional</a>="Constructor Param Annotation",\
|
||||
<a href="AnnotationType.html#required()">required</a>=1994)
|
||||
a href="AnnotationType.html" title="annotation interface in pkg">@AnnotationType\
|
||||
</a>(<a href="AnnotationType.html#optional()">optional</a>="Constructor Param An\
|
||||
notation",<a href="AnnotationType.html#required()">required</a>=1994)
|
||||
int documented,
|
||||
int undocmented)</span></div>""");
|
||||
|
||||
@ -581,31 +586,32 @@ public class TestNewLanguageFeatures extends JavadocTester {
|
||||
checkOutput("pkg/class-use/AnnotationType.html", true,
|
||||
"""
|
||||
<div class="caption"><span>Packages with annotations of type <a href="../Annotat\
|
||||
ionType.html" title="annotation in pkg">AnnotationType</a></span></div>""",
|
||||
ionType.html" title="annotation interface in pkg">AnnotationType</a></span></div\
|
||||
>""",
|
||||
"""
|
||||
<div class="caption"><span>Classes in <a href="../package-summary.html">pkg</a>\
|
||||
with annotations of type <a href="../AnnotationType.html" title="annotation in\
|
||||
pkg">AnnotationType</a></span></div>""",
|
||||
with annotations of type <a href="../AnnotationType.html" title="annotation int\
|
||||
erface in pkg">AnnotationType</a></span></div>""",
|
||||
"""
|
||||
<div class="caption"><span>Fields in <a href="../package-summary.html">pkg</a>\
|
||||
with annotations of type <a href="../AnnotationType.html" title="annotation in\
|
||||
pkg">AnnotationType</a></span></div>""",
|
||||
with annotations of type <a href="../AnnotationType.html" title="annotation int\
|
||||
erface in pkg">AnnotationType</a></span></div>""",
|
||||
"""
|
||||
<div class="caption"><span>Methods in <a href="../package-summary.html">pkg</a>\
|
||||
with annotations of type <a href="../AnnotationType.html" title="annotation in\
|
||||
pkg">AnnotationType</a></span></div>""",
|
||||
with annotations of type <a href="../AnnotationType.html" title="annotation int\
|
||||
erface in pkg">AnnotationType</a></span></div>""",
|
||||
"""
|
||||
<div class="caption"><span>Method parameters in <a href="../package-summary.htm\
|
||||
l">pkg</a> with annotations of type <a href="../AnnotationType.html" title="ann\
|
||||
otation in pkg">AnnotationType</a></span></div>""",
|
||||
otation interface in pkg">AnnotationType</a></span></div>""",
|
||||
"""
|
||||
<div class="caption"><span>Constructors in <a href="../package-summary.html">pk\
|
||||
g</a> with annotations of type <a href="../AnnotationType.html" title="annotati\
|
||||
on in pkg">AnnotationType</a></span></div>""",
|
||||
on interface in pkg">AnnotationType</a></span></div>""",
|
||||
"""
|
||||
<div class="caption"><span>Constructor parameters in <a href="../package-summar\
|
||||
y.html">pkg</a> with annotations of type <a href="../AnnotationType.html" title\
|
||||
="annotation in pkg">AnnotationType</a></span></div>"""
|
||||
="annotation interface in pkg">AnnotationType</a></span></div>"""
|
||||
);
|
||||
|
||||
//==============================================================
|
||||
@ -614,30 +620,30 @@ public class TestNewLanguageFeatures extends JavadocTester {
|
||||
checkOutput("pkg/AnnotationTypeUsage.html", false,
|
||||
// CLASS
|
||||
"""
|
||||
<a href="AnnotationTypeUndocumented.html" title="annotation in pkg">@AnnotationT\
|
||||
ypeUndocumented</a>(<a href="AnnotationType.html#optional">optional</a>="Class A\
|
||||
nnotation",
|
||||
<a href="AnnotationTypeUndocumented.html" title="annotation interface in pkg">@A\
|
||||
nnotationTypeUndocumented</a>(<a href="AnnotationType.html#optional">optional</a\
|
||||
>="Class Annotation",
|
||||
<a href="AnnotationType.html#required">required</a>=1994)
|
||||
public class <span class="type-name-label">AnnotationTypeUsage</span></dt><dt>extends java.lang.Object</dt>""",
|
||||
// FIELD
|
||||
"""
|
||||
<a href="AnnotationTypeUndocumented.html" title="annotation in pkg">@AnnotationT\
|
||||
ypeUndocumented</a>(<a href="AnnotationType.html#optional">optional</a>="Field A\
|
||||
nnotation",
|
||||
<a href="AnnotationTypeUndocumented.html" title="annotation interface in pkg">@A\
|
||||
nnotationTypeUndocumented</a>(<a href="AnnotationType.html#optional">optional</a\
|
||||
>="Field Annotation",
|
||||
<a href="AnnotationType.html#required">required</a>=1994)
|
||||
public int <span class="member-name-label">field</span>""",
|
||||
// CONSTRUCTOR
|
||||
"""
|
||||
<a href="AnnotationTypeUndocumented.html" title="annotation in pkg">@AnnotationT\
|
||||
ypeUndocumented</a>(<a href="AnnotationType.html#optional">optional</a>="Constru\
|
||||
ctor Annotation",
|
||||
<a href="AnnotationTypeUndocumented.html" title="annotation interface in pkg">@A\
|
||||
nnotationTypeUndocumented</a>(<a href="AnnotationType.html#optional">optional</a\
|
||||
>="Constructor Annotation",
|
||||
<a href="AnnotationType.html#required">required</a>=1994)
|
||||
public <span class="type-name-label">AnnotationTypeUsage</span>()""",
|
||||
// METHOD
|
||||
"""
|
||||
<a href="AnnotationTypeUndocumented.html" title="annotation in pkg">@AnnotationT\
|
||||
ypeUndocumented</a>(<a href="AnnotationType.html#optional">optional</a>="Method \
|
||||
Annotation",
|
||||
<a href="AnnotationTypeUndocumented.html" title="annotation interface in pkg">@A\
|
||||
nnotationTypeUndocumented</a>(<a href="AnnotationType.html#optional">optional</a\
|
||||
>="Method Annotation",
|
||||
<a href="AnnotationType.html#required">required</a>=1994)
|
||||
public void <span class="member-name-label">method</span>()""");
|
||||
|
||||
@ -674,9 +680,9 @@ public class TestNewLanguageFeatures extends JavadocTester {
|
||||
// Annotation Type
|
||||
"""
|
||||
<a href="A.html#a()">a</a>=<a href="../pkg/AnnotationType.html" title="annotatio\
|
||||
n in pkg">@AnnotationType</a>(<a href="../pkg/AnnotationType.html#optional()">op\
|
||||
tional</a>="foo",<a href="../pkg/AnnotationType.html#required()">required</a>=19\
|
||||
94),""",
|
||||
n interface in pkg">@AnnotationType</a>(<a href="../pkg/AnnotationType.html#opti\
|
||||
onal()">optional</a>="foo",<a href="../pkg/AnnotationType.html#required()">requi\
|
||||
red</a>=1994),""",
|
||||
// String Array
|
||||
"""
|
||||
<a href="A.html#sa()">sa</a>={"up","down"},""",
|
||||
@ -688,9 +694,11 @@ public class TestNewLanguageFeatures extends JavadocTester {
|
||||
//5020899: Incorrect internal representation of class-valued annotation elements
|
||||
checkOutput("pkg1/B.html", true,
|
||||
"""
|
||||
<div class="type-signature"><span class="annotations"><a href="A.html" title="annotation in pkg1">@A</a>""",
|
||||
<div class="type-signature"><span class="annotations"><a href="A.html" title="an\
|
||||
notation interface in pkg1">@A</a>""",
|
||||
"""
|
||||
<span class="modifiers">public interface </span><span class="element-name type-name-label">B</span></div>""");
|
||||
<span class="modifiers">public interface </span><span class="element-name type-n\
|
||||
ame-label">B</span></div>""");
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -406,11 +406,11 @@ public class TestOverrideMethods extends JavadocTester {
|
||||
checkOutput("pkg7/AnnotatedSub2.html", true,
|
||||
"""
|
||||
<div class="member-signature"><span class="annotations"><a href="A.html" title="\
|
||||
annotation in pkg7">@A</a>
|
||||
</span><span class="return-type"><a href="A.html" title="annotation in pkg7">@A<\
|
||||
/a> java.lang.Iterable<java.lang.String></span> <span class="element-\
|
||||
name">m1</span>​<span class="parameters">(java.lang.Class<? extends jav\
|
||||
a.lang.CharSequence> p1,
|
||||
annotation interface in pkg7">@A</a>
|
||||
</span><span class="return-type"><a href="A.html" title="annotation interface in\
|
||||
pkg7">@A</a> java.lang.Iterable<java.lang.String></span> <span class\
|
||||
="element-name">m1</span>​<span class="parameters">(java.lang.Class<? e\
|
||||
xtends java.lang.CharSequence> p1,
|
||||
int[] p2)</span></div>
|
||||
<div class="block"><span class="descfrm-type-label">Description copied from inte\
|
||||
rface: <code><a href="AnnotatedBase.html#m1(java.lang.Class,int%5B%5D)">Ann\
|
||||
@ -431,11 +431,11 @@ public class TestOverrideMethods extends JavadocTester {
|
||||
checkOutput("pkg7/AnnotatedSub3.html", true,
|
||||
"""
|
||||
<div class="member-signature"><span class="annotations"><a href="A.html" title="\
|
||||
annotation in pkg7">@A</a>
|
||||
</span><span class="return-type"><a href="A.html" title="annotation in pkg7">@A<\
|
||||
/a> java.lang.Iterable<java.lang.String></span> <span class="element-\
|
||||
name">m1</span>​<span class="parameters">(java.lang.Class<? extends jav\
|
||||
a.lang.CharSequence> p1,
|
||||
annotation interface in pkg7">@A</a>
|
||||
</span><span class="return-type"><a href="A.html" title="annotation interface in\
|
||||
pkg7">@A</a> java.lang.Iterable<java.lang.String></span> <span class\
|
||||
="element-name">m1</span>​<span class="parameters">(java.lang.Class<? e\
|
||||
xtends java.lang.CharSequence> p1,
|
||||
int[] p2)</span></div>
|
||||
<div class="block"><span class="descfrm-type-label">Description copied from inte\
|
||||
rface: <code><a href="AnnotatedBase.html#m1(java.lang.Class,int%5B%5D)">Ann\
|
||||
@ -456,9 +456,9 @@ public class TestOverrideMethods extends JavadocTester {
|
||||
checkOutput("pkg7/AnnotatedSub4.html", true,
|
||||
"""
|
||||
<div class="member-signature"><span class="return-type">java.lang.Iterable<<a\
|
||||
href="A.html" title="annotation in pkg7">@A</a> java.lang.String></span>&nbs\
|
||||
p;<span class="element-name">m1</span>​<span class="parameters">(java.lang\
|
||||
.Class<? extends java.lang.CharSequence> p1,
|
||||
href="A.html" title="annotation interface in pkg7">@A</a> java.lang.String><\
|
||||
/span> <span class="element-name">m1</span>​<span class="parameters">\
|
||||
(java.lang.Class<? extends java.lang.CharSequence> p1,
|
||||
int[] p2)</span></div>
|
||||
<div class="block"><span class="descfrm-type-label">Description copied from inte\
|
||||
rface: <code><a href="AnnotatedBase.html#m1(java.lang.Class,int%5B%5D)">Ann\
|
||||
@ -480,9 +480,9 @@ public class TestOverrideMethods extends JavadocTester {
|
||||
"""
|
||||
<div class="member-signature"><span class="return-type">java.lang.Iterable<ja\
|
||||
va.lang.String></span> <span class="element-name">m1</span>​<span \
|
||||
class="parameters">(<a href="A.html" title="annotation in pkg7">@A</a>
|
||||
<a href="A.html" title="annotation in pkg7">@A</a> java.lang.Class<? extends\
|
||||
java.lang.CharSequence> p1,
|
||||
class="parameters">(<a href="A.html" title="annotation interface in pkg7">@A</a>
|
||||
<a href="A.html" title="annotation interface in pkg7">@A</a> java.lang.Class<\
|
||||
;? extends java.lang.CharSequence> p1,
|
||||
int[] p2)</span></div>
|
||||
<div class="block"><span class="descfrm-type-label">Description copied from inte\
|
||||
rface: <code><a href="AnnotatedBase.html#m1(java.lang.Class,int%5B%5D)">Ann\
|
||||
@ -504,8 +504,8 @@ public class TestOverrideMethods extends JavadocTester {
|
||||
"""
|
||||
<div class="member-signature"><span class="return-type">java.lang.Iterable<ja\
|
||||
va.lang.String></span> <span class="element-name">m1</span>​<span \
|
||||
class="parameters">(java.lang.Class<<a href="A.html" title="annotation in pkg\
|
||||
7">@A</a> ? extends java.lang.CharSequence> p1,
|
||||
class="parameters">(java.lang.Class<<a href="A.html" title="annotation interf\
|
||||
ace in pkg7">@A</a> ? extends java.lang.CharSequence> p1,
|
||||
int[] p2)</span></div>
|
||||
<div class="block"><span class="descfrm-type-label">Description copied from inte\
|
||||
rface: <code><a href="AnnotatedBase.html#m1(java.lang.Class,int%5B%5D)">Ann\
|
||||
@ -528,7 +528,7 @@ public class TestOverrideMethods extends JavadocTester {
|
||||
<div class="member-signature"><span class="return-type">java.lang.Iterable<ja\
|
||||
va.lang.String></span> <span class="element-name">m1</span>​<span \
|
||||
class="parameters">(java.lang.Class<? extends <a href="A.html" title="annotat\
|
||||
ion in pkg7">@A</a> java.lang.CharSequence> p1,
|
||||
ion interface in pkg7">@A</a> java.lang.CharSequence> p1,
|
||||
int[] p2)</span></div>
|
||||
<div class="block"><span class="descfrm-type-label">Description copied from inte\
|
||||
rface: <code><a href="AnnotatedBase.html#m1(java.lang.Class,int%5B%5D)">Ann\
|
||||
@ -550,8 +550,10 @@ public class TestOverrideMethods extends JavadocTester {
|
||||
"""
|
||||
<div class="member-signature"><span class="return-type">java.lang.Iterable<ja\
|
||||
va.lang.String></span> <span class="element-name">m1</span>​<span \
|
||||
class="parameters">(java.lang.Class<? extends java.lang.CharSequence> p1,
|
||||
int <a href="A.html" title="annotation in pkg7">@A</a> [] p2)</span></div>
|
||||
class="parameters">(java.lang.Class<? extends java.lang.CharSequence> \
|
||||
;p1,
|
||||
int <a href="A.html" title="annotation interface in pkg7">@A</a> [] p2)</s\
|
||||
pan></div>
|
||||
<div class="block"><span class="descfrm-type-label">Description copied from inte\
|
||||
rface: <code><a href="AnnotatedBase.html#m1(java.lang.Class,int%5B%5D)">Ann\
|
||||
otatedBase</a></code></span></div>
|
||||
|
||||
@ -463,7 +463,7 @@ public class TestRecordTypes extends JavadocTester {
|
||||
|
||||
Set<ElementType> t = types.isEmpty() ? EnumSet.allOf(ElementType.class) : types;
|
||||
String anno = """
|
||||
<a href="Anno.html" title="annotation in p">@Anno</a>""";
|
||||
<a href="Anno.html" title="annotation interface in p">@Anno</a>""";
|
||||
String rcAnno = t.contains(ElementType.RECORD_COMPONENT) ? anno + " " : "";
|
||||
String fAnno = t.contains(ElementType.FIELD) ? "<span class=\"annotations\">" + anno + "\n</span>" : "";
|
||||
String pAnno = t.contains(ElementType.PARAMETER) ? anno + "\n " : "";
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
@ -49,74 +49,81 @@ public class TestRepeatedAnnotations extends JavadocTester {
|
||||
|
||||
checkOutput("pkg/C.html", true,
|
||||
"""
|
||||
<a href="ContaineeSynthDoc.html" title="annotation in pkg">@ContaineeSynthDoc</a\
|
||||
> <a href="ContaineeSynthDoc.html" title="annotation in pkg">@ContaineeSynthDoc<\
|
||||
/a>""",
|
||||
<a href="ContaineeSynthDoc.html" title="annotation interface in pkg">@ContaineeS\
|
||||
ynthDoc</a> <a href="ContaineeSynthDoc.html" title="annotation interface in pkg"\
|
||||
>@ContaineeSynthDoc</a>""",
|
||||
"""
|
||||
<a href="ContaineeRegDoc.html" title="annotation in pkg">@ContaineeRegDoc</a> <a\
|
||||
href="ContaineeRegDoc.html" title="annotation in pkg">@ContaineeRegDoc</a>""",
|
||||
<a href="ContaineeRegDoc.html" title="annotation interface in pkg">@ContaineeReg\
|
||||
Doc</a> <a href="ContaineeRegDoc.html" title="annotation interface in pkg">@Cont\
|
||||
aineeRegDoc</a>""",
|
||||
"""
|
||||
<a href="RegContainerDoc.html" title="annotation in pkg">@RegContainerDoc</a>({<\
|
||||
a href="RegContaineeNotDoc.html" title="annotation in pkg">@RegContaineeNotDoc</\
|
||||
a>,<a href="RegContaineeNotDoc.html" title="annotation in pkg">@RegContaineeNotD\
|
||||
oc</a>})""");
|
||||
<a href="RegContainerDoc.html" title="annotation interface in pkg">@RegContainer\
|
||||
Doc</a>({<a href="RegContaineeNotDoc.html" title="annotation interface in pkg">@\
|
||||
RegContaineeNotDoc</a>,<a href="RegContaineeNotDoc.html" title="annotation inter\
|
||||
face in pkg">@RegContaineeNotDoc</a>})""");
|
||||
|
||||
checkOutput("pkg/D.html", true,
|
||||
"""
|
||||
<a href="RegDoc.html" title="annotation in pkg">@RegDoc</a>(<a href="RegDoc.html#x()">x</a>=1)""",
|
||||
<a href="RegDoc.html" title="annotation interface in pkg">@RegDoc</a>(<a href="R\
|
||||
egDoc.html#x()">x</a>=1)""",
|
||||
"""
|
||||
<a href="RegArryDoc.html" title="annotation in pkg">@RegArryDoc</a>(<a href="RegArryDoc.html#y()">y</a>=1)""",
|
||||
<a href="RegArryDoc.html" title="annotation interface in pkg">@RegArryDoc</a>(<a\
|
||||
href="RegArryDoc.html#y()">y</a>=1)""",
|
||||
"""
|
||||
<a href="RegArryDoc.html" title="annotation in pkg">@RegArryDoc</a>(<a href="RegArryDoc.html#y()">y</a>={1,2})""",
|
||||
<a href="RegArryDoc.html" title="annotation interface in pkg">@RegArryDoc</a>(<a\
|
||||
href="RegArryDoc.html#y()">y</a>={1,2})""",
|
||||
"""
|
||||
<a href="NonSynthDocContainer.html" title="annotation in pkg">@NonSynthDocContai\
|
||||
ner</a>(<a href="RegArryDoc.html" title="annotation in pkg">@RegArryDoc</a>(<a h\
|
||||
ref="RegArryDoc.html#y()">y</a>=1))""");
|
||||
<a href="NonSynthDocContainer.html" title="annotation interface in pkg">@NonSynt\
|
||||
hDocContainer</a>(<a href="RegArryDoc.html" title="annotation interface in pkg">\
|
||||
@RegArryDoc</a>(<a href="RegArryDoc.html#y()">y</a>=1))""");
|
||||
|
||||
checkOutput("pkg1/C.html", true,
|
||||
"""
|
||||
<a href="RegContainerValDoc.html" title="annotation in pkg1">@RegContainerValDoc\
|
||||
</a>(<a href="RegContainerValDoc.html#value()">value</a>={<a href="RegContaineeN\
|
||||
otDoc.html" title="annotation in pkg1">@RegContaineeNotDoc</a>,<a href="RegConta\
|
||||
ineeNotDoc.html" title="annotation in pkg1">@RegContaineeNotDoc</a>},<a href="Re\
|
||||
gContainerValDoc.html#y()">y</a>=3)""",
|
||||
<a href="RegContainerValDoc.html" title="annotation interface in pkg1">@RegConta\
|
||||
inerValDoc</a>(<a href="RegContainerValDoc.html#value()">value</a>={<a href="Reg\
|
||||
ContaineeNotDoc.html" title="annotation interface in pkg1">@RegContaineeNotDoc</\
|
||||
a>,<a href="RegContaineeNotDoc.html" title="annotation interface in pkg1">@RegCo\
|
||||
ntaineeNotDoc</a>},<a href="RegContainerValDoc.html#y()">y</a>=3)""",
|
||||
"""
|
||||
<a href="ContainerValDoc.html" title="annotation in pkg1">@ContainerValDoc</a>(<\
|
||||
a href="ContainerValDoc.html#value()">value</a>={<a href="ContaineeNotDoc.html" \
|
||||
title="annotation in pkg1">@ContaineeNotDoc</a>,<a href="ContaineeNotDoc.html" t\
|
||||
itle="annotation in pkg1">@ContaineeNotDoc</a>},<a href="ContainerValDoc.html#x(\
|
||||
<a href="ContainerValDoc.html" title="annotation interface in pkg1">@ContainerVa\
|
||||
lDoc</a>(<a href="ContainerValDoc.html#value()">value</a>={<a href="ContaineeNot\
|
||||
Doc.html" title="annotation interface in pkg1">@ContaineeNotDoc</a>,<a href="Con\
|
||||
taineeNotDoc.html" title="annotation interface in pkg1">@ContaineeNotDoc</a>},<a\
|
||||
href="ContainerValDoc.html#x(\
|
||||
)">x</a>=1)""");
|
||||
|
||||
checkOutput("pkg/C.html", false,
|
||||
"""
|
||||
<a href="RegContaineeDoc.html" title="annotation in pkg">@RegContaineeDoc</a> <a\
|
||||
href="RegContaineeDoc.html" title="annotation in pkg">@RegContaineeDoc</a>""",
|
||||
<a href="RegContaineeDoc.html" title="annotation interface in pkg">@RegContainee\
|
||||
Doc</a> <a href="RegContaineeDoc.html" title="annotation interface in pkg">@RegC\
|
||||
ontaineeDoc</a>""",
|
||||
"""
|
||||
<a href="RegContainerNotDoc.html" title="annotation in pkg">@RegContainerNotDoc<\
|
||||
/a>(<a href="RegContainerNotDoc.html#value()">value</a>={<a href="RegContaineeNo\
|
||||
tDoc.html" title="annotation in pkg">@RegContaineeNotDoc</a>,<a href="RegContain\
|
||||
eeNotDoc.html" title="annotation in pkg">@RegContaineeNotDoc</a>})""");
|
||||
<a href="RegContainerNotDoc.html" title="annotation interface in pkg">@RegContai\
|
||||
nerNotDoc</a>(<a href="RegContainerNotDoc.html#value()">value</a>={<a href="RegC\
|
||||
ontaineeNotDoc.html" title="annotation in pkg">@RegContaineeNotDoc</a>,<a href="\
|
||||
RegContaineeNotDoc.html" title="annotation in pkg">@RegContaineeNotDoc</a>})""");
|
||||
|
||||
checkOutput("pkg1/C.html", false,
|
||||
"""
|
||||
<a href="ContaineeSynthDoc.html" title="annotation in pkg1">@ContaineeSynthDoc</\
|
||||
a> <a href="ContaineeSynthDoc.html" title="annotation in pkg1">@ContaineeSynthDo\
|
||||
c</a>""",
|
||||
<a href="ContaineeSynthDoc.html" title="annotation interface in pkg1">@Containee\
|
||||
SynthDoc</a> <a href="ContaineeSynthDoc.html" title="annotation interface in pkg\
|
||||
1">@ContaineeSynthDoc</a>""",
|
||||
"""
|
||||
<a href="RegContainerValNotDoc.html" title="annotation in pkg1">@RegContainerVal\
|
||||
NotDoc</a>(<a href="RegContainerValNotDoc.html#value()">value</a>={<a href="RegC\
|
||||
ontaineeDoc.html" title="annotation in pkg1">@RegContaineeDoc</a>,<a href="RegCo\
|
||||
ntaineeDoc.html" title="annotation in pkg1">@RegContaineeDoc</a>},<a href="RegCo\
|
||||
ntainerValNotDoc.html#y()">y</a>=4)""",
|
||||
<a href="RegContainerValNotDoc.html" title="annotation interface in pkg1">@RegCo\
|
||||
ntainerValNotDoc</a>(<a href="RegContainerValNotDoc.html#value()">value</a>={<a \
|
||||
href="RegContaineeDoc.html" title="annotation interface in pkg1">@RegContaineeDo\
|
||||
c</a>,<a href="RegContaineeDoc.html" title="annotation interface in pkg1">@RegCo\
|
||||
ntaineeDoc</a>},<a href="RegContainerValNotDoc.html#y()">y</a>=4)""",
|
||||
"""
|
||||
<a href="ContainerValNotDoc.html" title="annotation in pkg1">@ContainerValNotDoc\
|
||||
</a>(<a href="ContainerValNotDoc.html#value()">value</a>={<a href="ContaineeNotD\
|
||||
oc.html" title="annotation in pkg1">@ContaineeNotDoc</a>,<a href="ContaineeNotDo\
|
||||
c.html" title="annotation in pkg1">@ContaineeNotDoc</a>},<a href="ContainerValNo\
|
||||
tDoc.html#x()">x</a>=2)""",
|
||||
<a href="ContainerValNotDoc.html" title="annotation interface in pkg1">@Containe\
|
||||
rValNotDoc</a>(<a href="ContainerValNotDoc.html#value()">value</a>={<a href="Con\
|
||||
taineeNotDoc.html" title="annotation interface in pkg1">@ContaineeNotDoc</a>,<a \
|
||||
href="ContaineeNotDoc.html" title="annotation interface in pkg1">@ContaineeNotDo\
|
||||
c</a>},<a href="ContainerValNotDoc.html#x()">x</a>=2)""",
|
||||
"""
|
||||
<a href="ContainerSynthNotDoc.html" title="annotation in pkg1">@ContainerSynthNo\
|
||||
tDoc</a>(<a href="ContainerSynthNotDoc.html#value()">value</a>=<a href="Containe\
|
||||
eSynthDoc.html" title="annotation in pkg1">@ContaineeSynthDoc</a>)""");
|
||||
<a href="ContainerSynthNotDoc.html" title="annotation interface in pkg1">@Contai\
|
||||
nerSynthNotDoc</a>(<a href="ContainerSynthNotDoc.html#value()">value</a>=<a href\
|
||||
="ContaineeSynthDoc.html" title="annotation interface in pkg1">@ContaineeSynthDo\
|
||||
c</a>)""");
|
||||
}
|
||||
}
|
||||
|
||||
@ -53,66 +53,66 @@ public class TestTypeAnnotations extends JavadocTester {
|
||||
// Test for type annotations on Class Extends (ClassExtends.java).
|
||||
checkOutput("typeannos/MyClass.html", true,
|
||||
"""
|
||||
extends <a href="ClassExtA.html" title="annotation in typeannos">@ClassExtA</a> \
|
||||
extends <a href="ClassExtA.html" title="annotation interface in typeannos">@ClassExtA</a> \
|
||||
<a href="ParameterizedClass.html" title="class in typeannos">ParameterizedClass<\
|
||||
/a><<a href="ClassExtB.html" title="annotation in typeannos">@ClassExtB</a> j\
|
||||
/a><<a href="ClassExtB.html" title="annotation interface in typeannos">@ClassExtB</a> j\
|
||||
ava.lang.String>""",
|
||||
|
||||
"""
|
||||
implements <a href="ClassExtB.html" title="annotation in typeannos">@ClassExtB</\
|
||||
a> java.lang.CharSequence, <a href="ClassExtA.html" title="annotation in typeann\
|
||||
implements <a href="ClassExtB.html" title="annotation interface in typeannos">@ClassExtB</\
|
||||
a> java.lang.CharSequence, <a href="ClassExtA.html" title="annotation interface in typeann\
|
||||
os">@ClassExtA</a> <a href="ParameterizedInterface.html" title="interface in typ\
|
||||
eannos">ParameterizedInterface</a><<a href="ClassExtB.html" title="annotation\
|
||||
eannos">ParameterizedInterface</a><<a href="ClassExtB.html" title="annotation interface\
|
||||
in typeannos">@ClassExtB</a> java.lang.String></span></div>""");
|
||||
|
||||
checkOutput("typeannos/MyInterface.html", true,
|
||||
"""
|
||||
extends <a href="ClassExtA.html" title="annotation in typeannos">@ClassExtA</a> \
|
||||
extends <a href="ClassExtA.html" title="annotation interface in typeannos">@ClassExtA</a> \
|
||||
<a href="ParameterizedInterface.html" title="interface in typeannos">Parameteriz\
|
||||
edInterface</a><<a href="ClassExtA.html" title="annotation in typeannos">@Cla\
|
||||
ssExtA</a> java.lang.String>, <a href="ClassExtB.html" title="annotation in t\
|
||||
edInterface</a><<a href="ClassExtA.html" title="annotation interface in typeannos">@Cla\
|
||||
ssExtA</a> java.lang.String>, <a href="ClassExtB.html" title="annotation interface in t\
|
||||
ypeannos">@ClassExtB</a> java.lang.CharSequence</span></div>""");
|
||||
|
||||
// Test for type annotations on Class Parameters (ClassParameters.java).
|
||||
checkOutput("typeannos/ExtendsBound.html", true,
|
||||
"""
|
||||
class </span><span class="element-name type-name-label">ExtendsBound<K extend\
|
||||
s <a href="ClassParamA.html" title="annotation in typeannos">@ClassParamA</a> ja\
|
||||
s <a href="ClassParamA.html" title="annotation interface in typeannos">@ClassParamA</a> ja\
|
||||
va.lang.String></span>""");
|
||||
|
||||
checkOutput("typeannos/ExtendsGeneric.html", true,
|
||||
"""
|
||||
<div class="type-signature"><span class="modifiers">class </span><span class="el\
|
||||
ement-name type-name-label">ExtendsGeneric<K extends <a href="ClassParamA.htm\
|
||||
l" title="annotation in typeannos">@ClassParamA</a> <a href="Unannotated.html" t\
|
||||
l" title="annotation interface in typeannos">@ClassParamA</a> <a href="Unannotated.html" t\
|
||||
itle="class in typeannos">Unannotated</a><<a href="ClassParamB.html" title="a\
|
||||
nnotation in typeannos">@ClassParamB</a> java.lang.String>></span>""");
|
||||
nnotation interface in typeannos">@ClassParamB</a> java.lang.String>></span>""");
|
||||
|
||||
checkOutput("typeannos/TwoBounds.html", true,
|
||||
"""
|
||||
<div class="type-signature"><span class="modifiers">class </span><span class="el\
|
||||
ement-name type-name-label">TwoBounds<K extends <a href="ClassParamA.html" ti\
|
||||
tle="annotation in typeannos">@ClassParamA</a> java.lang.String,​V extends\
|
||||
<a href="ClassParamB.html" title="annotation in typeannos">@ClassParamB</a> jav\
|
||||
tle="annotation interface in typeannos">@ClassParamA</a> java.lang.String,​V extends\
|
||||
<a href="ClassParamB.html" title="annotation interface in typeannos">@ClassParamB</a> jav\
|
||||
a.lang.String></span>""");
|
||||
|
||||
checkOutput("typeannos/Complex1.html", true,
|
||||
"""
|
||||
class </span><span class="element-name type-name-label">Complex1<K extends <a\
|
||||
href="ClassParamA.html" title="annotation in typeannos">@ClassParamA</a> java.l\
|
||||
href="ClassParamA.html" title="annotation interface in typeannos">@ClassParamA</a> java.l\
|
||||
ang.String & java.lang.Runnable></span>""");
|
||||
|
||||
checkOutput("typeannos/Complex2.html", true,
|
||||
"""
|
||||
class </span><span class="element-name type-name-label">Complex2<K extends ja\
|
||||
va.lang.String & <a href="ClassParamB.html" title="annotation in typeannos">\
|
||||
va.lang.String & <a href="ClassParamB.html" title="annotation interface in typeannos">\
|
||||
@ClassParamB</a> java.lang.Runnable></span>""");
|
||||
|
||||
checkOutput("typeannos/ComplexBoth.html", true,
|
||||
"""
|
||||
class </span><span class="element-name type-name-label">ComplexBoth<K extends\
|
||||
<a href="ClassParamA.html" title="annotation in typeannos">@ClassParamA</a> jav\
|
||||
a.lang.String & <a href="ClassParamA.html" title="annotation in typeannos">@\
|
||||
<a href="ClassParamA.html" title="annotation interface in typeannos">@ClassParamA</a> jav\
|
||||
a.lang.String & <a href="ClassParamA.html" title="annotation interface in typeannos">@\
|
||||
ClassParamA</a> java.lang.Runnable></span>""");
|
||||
|
||||
// Test for type annotations on fields (Fields.java).
|
||||
@ -120,45 +120,45 @@ public class TestTypeAnnotations extends JavadocTester {
|
||||
"""
|
||||
<div class="member-signature"><span class="return-type"><a href="Parameterized.h\
|
||||
tml" title="class in typeannos">Parameterized</a><<a href="FldA.html" title="\
|
||||
annotation in typeannos">@FldA</a> java.lang.String,​<a href="FldB.html" t\
|
||||
itle="annotation in typeannos">@FldB</a> java.lang.String></span> <span \
|
||||
annotation interface in typeannos">@FldA</a> java.lang.String,​<a href="FldB.html" t\
|
||||
itle="annotation interface in typeannos">@FldB</a> java.lang.String></span> <span \
|
||||
class="element-name">bothTypeArgs</span></div>""",
|
||||
|
||||
"""
|
||||
<div class="member-signature"><span class="return-type"><a href="FldA.html" titl\
|
||||
e="annotation in typeannos">@FldA</a> java.lang.String <a href="FldB.html" title\
|
||||
="annotation in typeannos">@FldB</a> []</span> <span class="element-name">a\
|
||||
e="annotation interface in typeannos">@FldA</a> java.lang.String <a href="FldB.html" title\
|
||||
="annotation interface in typeannos">@FldB</a> []</span> <span class="element-name">a\
|
||||
rray1Deep</span></div>""",
|
||||
|
||||
"""
|
||||
<div class="member-signature"><span class="return-type">java.lang.String <a href\
|
||||
="FldB.html" title="annotation in typeannos">@FldB</a> [][]</span> <span cl\
|
||||
="FldB.html" title="annotation interface in typeannos">@FldB</a> [][]</span> <span cl\
|
||||
ass="element-name">array2SecondOld</span></div>""",
|
||||
|
||||
// When JDK-8068737, we should change the order
|
||||
"""
|
||||
<div class="member-signature"><span class="return-type"><a href="FldD.html" titl\
|
||||
e="annotation in typeannos">@FldD</a> java.lang.String <a href="FldC.html" title\
|
||||
="annotation in typeannos">@FldC</a> <a href="FldB.html" title="annotation in ty\
|
||||
peannos">@FldB</a> [] <a href="FldC.html" title="annotation in typeannos">@FldC<\
|
||||
/a> <a href="FldA.html" title="annotation in typeannos">@FldA</a> []</span> \
|
||||
e="annotation interface in typeannos">@FldD</a> java.lang.String <a href="FldC.html" title\
|
||||
="annotation interface in typeannos">@FldC</a> <a href="FldB.html" title="annotation interface in ty\
|
||||
peannos">@FldB</a> [] <a href="FldC.html" title="annotation interface in typeannos">@FldC<\
|
||||
/a> <a href="FldA.html" title="annotation interface in typeannos">@FldA</a> []</span> \
|
||||
;<span class="element-name">array2Deep</span></div>""");
|
||||
|
||||
checkOutput("typeannos/ModifiedScoped.html", true,
|
||||
"""
|
||||
<div class="member-signature"><span class="modifiers">public final</span> <\
|
||||
span class="return-type"><a href="Parameterized.html" title="class in typeannos"\
|
||||
>Parameterized</a><<a href="FldA.html" title="annotation in typeannos">@FldA<\
|
||||
>Parameterized</a><<a href="FldA.html" title="annotation interface in typeannos">@FldA<\
|
||||
/a> <a href="Parameterized.html" title="class in typeannos">Parameterized</a><\
|
||||
;<a href="FldA.html" title="annotation in typeannos">@FldA</a> java.lang.String,\
|
||||
​<a href="FldB.html" title="annotation in typeannos">@FldB</a> java.lang.S\
|
||||
tring>,​<a href="FldB.html" title="annotation in typeannos">@FldB</a> j\
|
||||
;<a href="FldA.html" title="annotation interface in typeannos">@FldA</a> java.lang.String,\
|
||||
​<a href="FldB.html" title="annotation interface in typeannos">@FldB</a> java.lang.S\
|
||||
tring>,​<a href="FldB.html" title="annotation interface in typeannos">@FldB</a> j\
|
||||
ava.lang.String></span> <span class="element-name">nestedParameterized</\
|
||||
span></div>""",
|
||||
|
||||
"""
|
||||
<div class="member-signature"><span class="modifiers">public final</span> <\
|
||||
span class="return-type"><a href="FldA.html" title="annotation in typeannos">@Fl\
|
||||
span class="return-type"><a href="FldA.html" title="annotation interface in typeannos">@Fl\
|
||||
dA</a> java.lang.String[][]</span> <span class="element-name">array2</span>\
|
||||
</div>""");
|
||||
|
||||
@ -167,31 +167,31 @@ public class TestTypeAnnotations extends JavadocTester {
|
||||
"""
|
||||
<div class="member-signature"><span class="modifiers">public</span> <span c\
|
||||
lass="type-parameters"><T></span> <span class="return-type"><a href="\
|
||||
MRtnA.html" title="annotation in typeannos">@MRtnA</a> java.lang.String</span>&n\
|
||||
MRtnA.html" title="annotation interface in typeannos">@MRtnA</a> java.lang.String</span>&n\
|
||||
bsp;<span class="element-name">method</span>()</div>""",
|
||||
|
||||
// When JDK-8068737 is fixed, we should change the order
|
||||
"""
|
||||
<div class="member-signature"><span class="return-type"><a href="MRtnA.html" tit\
|
||||
le="annotation in typeannos">@MRtnA</a> java.lang.String <a href="MRtnB.html" ti\
|
||||
tle="annotation in typeannos">@MRtnB</a> [] <a href="MRtnA.html" title="annotati\
|
||||
on in typeannos">@MRtnA</a> []</span> <span class="element-name">array2Deep\
|
||||
le="annotation interface in typeannos">@MRtnA</a> java.lang.String <a href="MRtnB.html" ti\
|
||||
tle="annotation interface in typeannos">@MRtnB</a> [] <a href="MRtnA.html" title="annotati\
|
||||
on interface in typeannos">@MRtnA</a> []</span> <span class="element-name">array2Deep\
|
||||
</span>()</div>""",
|
||||
|
||||
"""
|
||||
<div class="member-signature"><span class="return-type"><a href="MRtnA.html" tit\
|
||||
le="annotation in typeannos">@MRtnA</a> java.lang.String[][]</span> <span c\
|
||||
le="annotation interface in typeannos">@MRtnA</a> java.lang.String[][]</span> <span c\
|
||||
lass="element-name">array2</span>()</div>""");
|
||||
|
||||
checkOutput("typeannos/MtdModifiedScoped.html", true,
|
||||
"""
|
||||
<div class="member-signature"><span class="modifiers">public final</span> <\
|
||||
span class="return-type"><a href="MtdParameterized.html" title="class in typeann\
|
||||
os">MtdParameterized</a><<a href="MRtnA.html" title="annotation in typeannos"\
|
||||
os">MtdParameterized</a><<a href="MRtnA.html" title="annotation interface in typeannos"\
|
||||
>@MRtnA</a> <a href="MtdParameterized.html" title="class in typeannos">MtdParame\
|
||||
terized</a><<a href="MRtnA.html" title="annotation in typeannos">@MRtnA</a> j\
|
||||
ava.lang.String,​<a href="MRtnB.html" title="annotation in typeannos">@MRt\
|
||||
nB</a> java.lang.String>,​<a href="MRtnB.html" title="annotation in typ\
|
||||
terized</a><<a href="MRtnA.html" title="annotation interface in typeannos">@MRtnA</a> j\
|
||||
ava.lang.String,​<a href="MRtnB.html" title="annotation interface in typeannos">@MRt\
|
||||
nB</a> java.lang.String>,​<a href="MRtnB.html" title="annotation interface in typ\
|
||||
eannos">@MRtnB</a> java.lang.String></span> <span class="element-name">n\
|
||||
estedMtdParameterized</span>()</div>""");
|
||||
|
||||
@ -199,15 +199,15 @@ public class TestTypeAnnotations extends JavadocTester {
|
||||
checkOutput("typeannos/UnscopedUnmodified.html", true,
|
||||
"""
|
||||
<div class="member-signature"><span class="type-parameters"><K extends <a hre\
|
||||
f="MTyParamA.html" title="annotation in typeannos">@MTyParamA</a> java.lang.Stri\
|
||||
f="MTyParamA.html" title="annotation interface in typeannos">@MTyParamA</a> java.lang.Stri\
|
||||
ng></span> <span class="return-type">void</span> <span class="eleme\
|
||||
nt-name">methodExtends</span>()</div>""",
|
||||
|
||||
"""
|
||||
<div class="member-signature"><span class="type-parameters-long"><K extends <\
|
||||
a href="MTyParamA.html" title="annotation in typeannos">@MTyParamA</a> <a href="\
|
||||
a href="MTyParamA.html" title="annotation interface in typeannos">@MTyParamA</a> <a href="\
|
||||
MtdTyParameterized.html" title="class in typeannos">MtdTyParameterized</a><<a\
|
||||
href="MTyParamB.html" title="annotation in typeannos">@MTyParamB</a> java.lang.\
|
||||
href="MTyParamB.html" title="annotation interface in typeannos">@MTyParamB</a> java.lang.\
|
||||
String>></span>
|
||||
<span class="return-type">void</span> <span class="element-name">nestedExtends</span>()</div>""");
|
||||
|
||||
@ -215,16 +215,16 @@ public class TestTypeAnnotations extends JavadocTester {
|
||||
"""
|
||||
<div class="member-signature"><span class="modifiers">public final</span> <\
|
||||
span class="type-parameters"><K extends <a href="MTyParamA.html" title="annot\
|
||||
ation in typeannos">@MTyParamA</a> java.lang.String></span>
|
||||
ation interface in typeannos">@MTyParamA</a> java.lang.String></span>
|
||||
<span class="return-type">void</span> <span class="element-name">methodExtends</span>()</div>""",
|
||||
|
||||
"""
|
||||
<div class="member-signature"><span class="modifiers">public final</span> <\
|
||||
span class="type-parameters-long"><K extends <a href="MTyParamA.html" title="\
|
||||
annotation in typeannos">@MTyParamA</a> java.lang.String,​
|
||||
V extends <a href="MTyParamA.html" title="annotation in typeannos">@MTyParamA</a\
|
||||
annotation interface in typeannos">@MTyParamA</a> java.lang.String,​
|
||||
V extends <a href="MTyParamA.html" title="annotation interface in typeannos">@MTyParamA</a\
|
||||
> <a href="MtdTyParameterized.html" title="class in typeannos">MtdTyParameterize\
|
||||
d</a><<a href="MTyParamB.html" title="annotation in typeannos">@MTyParamB</a>\
|
||||
d</a><<a href="MTyParamB.html" title="annotation interface in typeannos">@MTyParamB</a>\
|
||||
java.lang.String>></span>
|
||||
<span class="return-type">void</span> <span class="element-name">dual</span>()</div>""");
|
||||
|
||||
@ -240,34 +240,35 @@ public class TestTypeAnnotations extends JavadocTester {
|
||||
<div class="member-signature"><span class="return-type">void</span> <span c\
|
||||
lass="element-name">nestedParaParameterized</span>​<span class="parameters\
|
||||
">(<a href="ParaParameterized.html" title="class in typeannos">ParaParameterized\
|
||||
</a><<a href="ParamA.html" title="annotation in typeannos">@ParamA</a> <a hre\
|
||||
</a><<a href="ParamA.html" title="annotation interface in typeannos">@ParamA</a> <a hre\
|
||||
f="ParaParameterized.html" title="class in typeannos">ParaParameterized</a><<\
|
||||
a href="ParamA.html" title="annotation in typeannos">@ParamA</a> java.lang.Strin\
|
||||
g,​<a href="ParamB.html" title="annotation in typeannos">@ParamB</a> java.\
|
||||
lang.String>,​<a href="ParamB.html" title="annotation in typeannos">@Pa\
|
||||
a href="ParamA.html" title="annotation interface in typeannos">@ParamA</a> java.lang.Strin\
|
||||
g,​<a href="ParamB.html" title="annotation interface in typeannos">@ParamB</a> java.\
|
||||
lang.String>,​<a href="ParamB.html" title="annotation interface in typeannos">@Pa\
|
||||
ramB</a> java.lang.String> a)</span></div>""",
|
||||
|
||||
// When JDK-8068737 is fixed, we should change the order
|
||||
"""
|
||||
<div class="member-signature"><span class="return-type">void</span> <span c\
|
||||
lass="element-name">array2Deep</span>​<span class="parameters">(<a href="P\
|
||||
aramA.html" title="annotation in typeannos">@ParamA</a> java.lang.String <a href\
|
||||
="ParamB.html" title="annotation in typeannos">@ParamB</a> [] <a href="ParamA.ht\
|
||||
ml" title="annotation in typeannos">@ParamA</a> [] a)</span></div>""");
|
||||
aramA.html" title="annotation interface in typeannos">@ParamA</a> java.lang.String <a href\
|
||||
="ParamB.html" title="annotation interface in typeannos">@ParamB</a> [] <a href="ParamA.ht\
|
||||
ml" title="annotation interface in typeannos">@ParamA</a> [] a)</span></div>""");
|
||||
|
||||
// Test for type annotations on throws (Throws.java).
|
||||
checkOutput("typeannos/ThrDefaultUnmodified.html", true,
|
||||
"""
|
||||
<div class="member-signature"><span class="return-type">void</span> <span class="element-name">oneException</span>()
|
||||
throws <span class="exceptions"><a href="ThrA.html" title="annotation\
|
||||
<div class="member-signature"><span class="return-type">void</span> <span c\
|
||||
lass="element-name">oneException</span>()
|
||||
throws <span class="exceptions"><a href="ThrA.html" title="annotation interface\
|
||||
in typeannos">@ThrA</a> java.lang.Exception</span></div>""",
|
||||
|
||||
"""
|
||||
<div class="member-signature"><span class="return-type">void</span> <span c\
|
||||
lass="element-name">twoExceptions</span>()
|
||||
throws <span class="exceptions"><a href="ThrA.html" title="annotatio\
|
||||
n in typeannos">@ThrA</a> java.lang.RuntimeException,
|
||||
<a href="ThrA.html" title="annotation in typeannos">@ThrA</a> java.lang.Exception</span></div>""");
|
||||
n interface in typeannos">@ThrA</a> java.lang.RuntimeException,
|
||||
<a href="ThrA.html" title="annotation interface in typeannos">@ThrA</a> java.lang.Exception</span></div>""");
|
||||
|
||||
checkOutput("typeannos/ThrPublicModified.html", true,
|
||||
"""
|
||||
@ -275,35 +276,36 @@ public class TestTypeAnnotations extends JavadocTester {
|
||||
span class="return-type">void</span> <span class="element-name">oneException</span>\
|
||||
​<span class="parameters">(java.lang.String a)</span>
|
||||
throws <span class="exceptions"><a href="ThrA.html" titl\
|
||||
e="annotation in typeannos">@ThrA</a> java.lang.Exception</span></div>""",
|
||||
e="annotation interface 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="element-name">twoExceptions</span\
|
||||
>​<span class="parameters">(java.lang.String a)</span>
|
||||
throws <span class="exceptions"><a href="ThrA.html" tit\
|
||||
le="annotation in typeannos">@ThrA</a> java.lang.RuntimeException,
|
||||
<a href="ThrA.html" title="annotation in typeannos">@ThrA</a> java.lang.Exception</span></div>""");
|
||||
le="annotation interface in typeannos">@ThrA</a> java.lang.RuntimeException,
|
||||
<a href="ThrA.html" title="annotation interface in typeannos">@ThrA</a> java.lang.Exception</span></div>""");
|
||||
|
||||
checkOutput("typeannos/ThrWithValue.html", true,
|
||||
"""
|
||||
<div class="member-signature"><span class="return-type">void</span> <span class="element-name">oneException</span>()
|
||||
throws <span class="exceptions"><a href="ThrB.html" title="annotation\
|
||||
<div class="member-signature"><span class="return-type">void</span> <span c\
|
||||
lass="element-name">oneException</span>()
|
||||
throws <span class="exceptions"><a href="ThrB.html" title="annotation interface\
|
||||
in typeannos">@ThrB</a>("m") java.lang.Exception</span></div>""",
|
||||
|
||||
"""
|
||||
<div class="member-signature"><span class="return-type">void</span> <span c\
|
||||
lass="element-name">twoExceptions</span>()
|
||||
throws <span class="exceptions"><a href="ThrB.html" title="annotatio\
|
||||
n in typeannos">@ThrB</a>("m") java.lang.RuntimeException,
|
||||
<a href="ThrA.html" title="annotation in typeannos">@ThrA</a> java.lang.Exception</span></div>""");
|
||||
n interface in typeannos">@ThrB</a>("m") java.lang.RuntimeException,
|
||||
<a href="ThrA.html" title="annotation interface in typeannos">@ThrA</a> java.lang.Exception</span></div>""");
|
||||
|
||||
// Test for type annotations on type parameters (TypeParameters.java).
|
||||
checkOutput("typeannos/TestMethods.html", true,
|
||||
"""
|
||||
<div class="member-signature"><span class="type-parameters"><K,​
|
||||
<a href="TyParaA.html" title="annotation in typeannos">@TyParaA</a> V extends <a\
|
||||
href="TyParaA.html" title="annotation in typeannos">@TyParaA</a> java.lang.Stri\
|
||||
<a href="TyParaA.html" title="annotation interface in typeannos">@TyParaA</a> V extends <a\
|
||||
href="TyParaA.html" title="annotation interface in typeannos">@TyParaA</a> java.lang.Stri\
|
||||
ng></span>
|
||||
<span class="return-type">void</span> <span class="element-name">secondAnnotated</span>()</div>"""
|
||||
);
|
||||
@ -314,13 +316,13 @@ public class TestTypeAnnotations extends JavadocTester {
|
||||
<div class="member-signature"><span class="return-type">void</span> <span c\
|
||||
lass="element-name">wcExtends</span>​<span class="parameters">(<a href="My\
|
||||
List.html" title="class in typeannos">MyList</a><? extends <a href="WldA.html\
|
||||
" title="annotation in typeannos">@WldA</a> java.lang.String> l)</span><\
|
||||
" title="annotation interface in typeannos">@WldA</a> java.lang.String> l)</span><\
|
||||
/div>""",
|
||||
|
||||
"""
|
||||
<div class="member-signature"><span class="return-type"><a href="MyList.html" ti\
|
||||
tle="class in typeannos">MyList</a><? super <a href="WldA.html" title="annota\
|
||||
tion in typeannos">@WldA</a> java.lang.String></span> <span class="element-name"\
|
||||
tion interface in typeannos">@WldA</a> java.lang.String></span> <span class="element-name"\
|
||||
>returnWcSuper</span>()</div>""");
|
||||
|
||||
checkOutput("typeannos/BoundWithValue.html", true,
|
||||
@ -328,40 +330,40 @@ public class TestTypeAnnotations extends JavadocTester {
|
||||
<div class="member-signature"><span class="return-type">void</span> <span c\
|
||||
lass="element-name">wcSuper</span>​<span class="parameters">(<a href="MyLi\
|
||||
st.html" title="class in typeannos">MyList</a><? super <a href="WldB.html" ti\
|
||||
tle="annotation in typeannos">@WldB</a>("m") java.lang.String> l)</span>\
|
||||
tle="annotation interface in typeannos">@WldB</a>("m") java.lang.String> l)</span>\
|
||||
</div>""",
|
||||
|
||||
"""
|
||||
<div class="member-signature"><span class="return-type"><a href="MyList.html" ti\
|
||||
tle="class in typeannos">MyList</a><? extends <a href="WldB.html" title="anno\
|
||||
tation in typeannos">@WldB</a>("m") java.lang.String></span> <span class\
|
||||
tation interface in typeannos">@WldB</a>("m") java.lang.String></span> <span class\
|
||||
="element-name">returnWcExtends</span>()</div>""");
|
||||
|
||||
checkOutput("typeannos/SelfTest.html", true,
|
||||
"""
|
||||
<div class="member-signature"><span class="return-type"><a href="MyList.html" ti\
|
||||
tle="class in typeannos">MyList</a><<a href="WldA.html" title="annotation in \
|
||||
tle="class in typeannos">MyList</a><<a href="WldA.html" title="annotation interface in \
|
||||
typeannos">@WldA</a> ?></span> <span class="element-name">returnWcExtends</span>\
|
||||
()</div>""",
|
||||
"""
|
||||
<div class="member-signature"><span class="return-type"><a href="MyList.html" ti\
|
||||
tle="class in typeannos">MyList</a><<a href="WldA.html" title="annotation in \
|
||||
typeannos">@WldA</a> ? extends <a href="WldA.html" title="annotation in typeanno\
|
||||
tle="class in typeannos">MyList</a><<a href="WldA.html" title="annotation interface in \
|
||||
typeannos">@WldA</a> ? extends <a href="WldA.html" title="annotation interface in typeanno\
|
||||
s">@WldA</a> <a href="MyList.html" title="class in typeannos">MyList</a><<a h\
|
||||
ref="WldB.html" title="annotation in typeannos">@WldB</a>("m") ?>></span>&\
|
||||
ref="WldB.html" title="annotation interface in typeannos">@WldB</a>("m") ?>></span>&\
|
||||
nbsp;<span class="element-name">complex</span>()</div>""");
|
||||
|
||||
checkOutput("typeannos/SelfWithValue.html", true,
|
||||
"""
|
||||
<div class="member-signature"><span class="return-type"><a href="MyList.html" ti\
|
||||
tle="class in typeannos">MyList</a><<a href="WldB.html" title="annotation in \
|
||||
tle="class in typeannos">MyList</a><<a href="WldB.html" title="annotation interface in \
|
||||
typeannos">@WldB</a>("m") ?></span> <span class="element-name">returnWcExtends</\
|
||||
span>()</div>""",
|
||||
"""
|
||||
<div class="member-signature"><span class="return-type"><a href="MyList.html" ti\
|
||||
tle="class in typeannos">MyList</a><<a href="WldB.html" title="annotation in \
|
||||
tle="class in typeannos">MyList</a><<a href="WldB.html" title="annotation interface in \
|
||||
typeannos">@WldB</a>("m") ? extends <a href="MyList.html" title="class in typean\
|
||||
nos">MyList</a><<a href="WldB.html" title="annotation in typeannos">@WldB</a>\
|
||||
nos">MyList</a><<a href="WldB.html" title="annotation interface in typeannos">@WldB</a>\
|
||||
("m") ? super java.lang.String>></span> <span class="element-name">complex</s\
|
||||
pan>()</div>""");
|
||||
|
||||
@ -371,22 +373,22 @@ public class TestTypeAnnotations extends JavadocTester {
|
||||
"""
|
||||
<div class="member-signature"><span class="return-type">void</span> <span c\
|
||||
lass="element-name">withException</span>​<span class="parameters">(<a href\
|
||||
="RcvrA.html" title="annotation in typeannos">@RcvrA</a> DefaultUnmodified&\
|
||||
="RcvrA.html" title="annotation interface in typeannos">@RcvrA</a> DefaultUnmodified&\
|
||||
nbsp;this)</span>
|
||||
throws <span class="exceptions">java.lang.Exception</span></div>""",
|
||||
|
||||
"""
|
||||
<div class="member-signature"><span class="return-type">java.lang.String</span>&\
|
||||
nbsp;<span class="element-name">nonVoid</span>​<span class="parameters">(<a href="\
|
||||
RcvrA.html" title="annotation in typeannos">@RcvrA</a> <a href="RcvrB.html" titl\
|
||||
e="annotation in typeannos">@RcvrB</a>("m") DefaultUnmodified this)</s\
|
||||
RcvrA.html" title="annotation interface in typeannos">@RcvrA</a> <a href="RcvrB.html" titl\
|
||||
e="annotation interface in typeannos">@RcvrB</a>("m") DefaultUnmodified this)</s\
|
||||
pan></div>""",
|
||||
|
||||
"""
|
||||
<div class="member-signature"><span class="type-parameters"><T extends java.l\
|
||||
ang.Runnable></span> <span class="return-type">void</span> <span cl\
|
||||
ass="element-name">accept</span>​<span class="parameters">(<a href="RcvrA.\
|
||||
html" title="annotation in typeannos">@RcvrA</a> DefaultUnmodified thi\
|
||||
html" title="annotation interface in typeannos">@RcvrA</a> DefaultUnmodified thi\
|
||||
s,
|
||||
T r)</span>
|
||||
throws <span class="exceptions">java.lang.Exception</span></div>""");
|
||||
@ -396,13 +398,13 @@ public class TestTypeAnnotations extends JavadocTester {
|
||||
<div class="member-signature"><span class="modifiers">public final</span> <\
|
||||
span class="return-type">java.lang.String</span> <span class="element-name">nonVoid\
|
||||
</span>​<span class="parameters">(<a href="RcvrA.html" title="annotation i\
|
||||
n typeannos">@RcvrA</a> PublicModified this)</span></div>""",
|
||||
nterface 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> <s\
|
||||
pan class="return-type">void</span> <span class="element-name">accept</span>​\
|
||||
<span class="parameters">(<a href="RcvrA.html" title="annotation in typea\
|
||||
<span class="parameters">(<a href="RcvrA.html" title="annotation interface in typea\
|
||||
nnos">@RcvrA</a> PublicModified this,
|
||||
T r)</span>
|
||||
throws <span class="exceptions">java.lang.Exception</span></div>""");
|
||||
@ -412,7 +414,7 @@ public class TestTypeAnnotations extends JavadocTester {
|
||||
<div class="member-signature"><span class="type-parameters"><T extends java.l\
|
||||
ang.Runnable></span> <span class="return-type">void</span> <span cl\
|
||||
ass="element-name">accept</span>​<span class="parameters">(<a href="RcvrB.\
|
||||
html" title="annotation in typeannos">@RcvrB</a>("m") WithValue this,
|
||||
html" title="annotation interface in typeannos">@RcvrB</a>("m") WithValue this,
|
||||
T r)</span>
|
||||
throws <span class="exceptions">java.lang.Exception</span></div>""");
|
||||
|
||||
@ -420,14 +422,14 @@ public class TestTypeAnnotations extends JavadocTester {
|
||||
"""
|
||||
<div class="member-signature"><span class="return-type">java.lang.String</span>&\
|
||||
nbsp;<span class="element-name">nonVoid</span>​<span class="parameters">(<a href="\
|
||||
RcvrB.html" title="annotation in typeannos">@RcvrB</a>("m") <a href="WithFinal.h\
|
||||
RcvrB.html" title="annotation interface in typeannos">@RcvrB</a>("m") <a href="WithFinal.h\
|
||||
tml" 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 c\
|
||||
lass="element-name">field</span>​<span class="parameters">(<a href="RcvrA.\
|
||||
html" title="annotation in typeannos">@RcvrA</a> WithBody this)</span>\
|
||||
html" title="annotation interface in typeannos">@RcvrA</a> WithBody this)</span>\
|
||||
</div>""");
|
||||
|
||||
checkOutput("typeannos/Generic2.html", true,
|
||||
@ -437,28 +439,28 @@ public class TestTypeAnnotations extends JavadocTester {
|
||||
"""
|
||||
<div class="member-signature"><span class="return-type">void</span> <span c\
|
||||
lass="element-name">test2</span>​<span class="parameters">(<a href="RcvrA.\
|
||||
html" title="annotation in typeannos">@RcvrA</a> Generic2<X> thi\
|
||||
html" title="annotation interface in typeannos">@RcvrA</a> Generic2<X> thi\
|
||||
s)</span></div>""",
|
||||
"""
|
||||
<div class="member-signature"><span class="return-type">void</span> <span c\
|
||||
lass="element-name">test3</span>​<span class="parameters">(Generic2<<a \
|
||||
href="RcvrA.html" title="annotation in typeannos">@RcvrA</a> X> this)</s\
|
||||
href="RcvrA.html" title="annotation interface in typeannos">@RcvrA</a> X> this)</s\
|
||||
pan></div>""",
|
||||
"""
|
||||
<div class="member-signature"><span class="return-type">void</span> <span cl\
|
||||
ass="element-name">test4</span>​<span class="parameters">(<a href="RcvrA.ht\
|
||||
ml" title="annotation in typeannos">@RcvrA</a> Generic2<<a href="RcvrA.html" t\
|
||||
itle="annotation in typeannos">@RcvrA</a> X> this)</span></div>""");
|
||||
<div class="member-signature"><span class="return-type">void</span> <span cl\
|
||||
ass="element-name">test4</span>​<span class="parameters">(<a href="RcvrA.ht\
|
||||
ml" title="annotation interface in typeannos">@RcvrA</a> Generic2<<a href="RcvrA.html" t\
|
||||
itle="annotation interface in typeannos">@RcvrA</a> X> this)</span></div>""");
|
||||
|
||||
|
||||
// Test for repeated type annotations (RepeatedAnnotations.java).
|
||||
checkOutput("typeannos/RepeatingAtClassLevel.html", true,
|
||||
"""
|
||||
<div class="type-signature"><span class="annotations"><a href="RepTypeA.html" ti\
|
||||
tle="annotation in typeannos">@RepTypeA</a> <a href="RepTypeA.html" title="annot\
|
||||
ation in typeannos">@RepTypeA</a>
|
||||
<a href="RepTypeB.html" title="annotation in typeannos">@RepTypeB</a> <a href="R\
|
||||
epTypeB.html" title="annotation in typeannos">@RepTypeB</a>
|
||||
tle="annotation interface in typeannos">@RepTypeA</a> <a href="RepTypeA.html" title="annot\
|
||||
ation interface in typeannos">@RepTypeA</a>
|
||||
<a href="RepTypeB.html" title="annotation interface in typeannos">@RepTypeB</a> <a href="R\
|
||||
epTypeB.html" title="annotation interface in typeannos">@RepTypeB</a>
|
||||
</span><span class="modifiers">class </span><span class="element-name type-name-\
|
||||
label">RepeatingAtClassLevel</span>
|
||||
<span class="extends-implements">extends java.lang.Object</span></div>""");
|
||||
@ -467,49 +469,49 @@ public class TestTypeAnnotations extends JavadocTester {
|
||||
// checkOutput("typeannos/RepeatingAtClassLevel2.html", true,
|
||||
// "<pre><a href=\"RepTypeUseA.html\" title=\"annotation "
|
||||
// + "in typeannos\">@RepTypeUseA</a> <a href=\"RepTypeUseA.html"
|
||||
// + "\" title=\"annotation in typeannos\">@RepTypeUseA</a>\n<a href="
|
||||
// + "\"RepTypeUseB.html\" title=\"annotation in typeannos"
|
||||
// + "\" title=\"annotation interface in typeannos\">@RepTypeUseA</a>\n<a href="
|
||||
// + "\"RepTypeUseB.html\" title=\"annotation interface in typeannos"
|
||||
// + "\">@RepTypeUseB</a> <a href=\"RepTypeUseB.html\" "
|
||||
// + "title=\"annotation in typeannos\">@RepTypeUseB</a>\nclass <span "
|
||||
// + "title=\"annotation interface in typeannos\">@RepTypeUseB</a>\nclass <span "
|
||||
// + "class=\"type-name-label\">RepeatingAtClassLevel2</span>\nextends "
|
||||
// + "java.lang.Object</pre>");
|
||||
//
|
||||
// checkOutput("typeannos/RepeatingAtClassLevel2.html", true,
|
||||
// "<pre><a href=\"RepAllContextsA.html\" title=\"annotation"
|
||||
// + " in typeannos\">@RepAllContextsA</a> <a href=\"RepAllContextsA.html"
|
||||
// + "\" title=\"annotation in typeannos\">@RepAllContextsA</a>\n<a href="
|
||||
// + "\"RepAllContextsB.html\" title=\"annotation in typeannos"
|
||||
// + "\" title=\"annotation interface in typeannos\">@RepAllContextsA</a>\n<a href="
|
||||
// + "\"RepAllContextsB.html\" title=\"annotation interface in typeannos"
|
||||
// + "\">@RepAllContextsB</a> <a href=\"RepAllContextsB.html"
|
||||
// + "\" title=\"annotation in typeannos\">@RepAllContextsB</a>\n"
|
||||
// + "\" title=\"annotation interface in typeannos\">@RepAllContextsB</a>\n"
|
||||
// + "class <span class=\"type-name-label\">RepeatingAtClassLevel3</span>\n"
|
||||
// + "extends java.lang.Object</pre>");
|
||||
|
||||
checkOutput("typeannos/RepeatingOnConstructor.html", true,
|
||||
"""
|
||||
<div class="member-signature"><span class="annotations"><a href="RepConstructorA\
|
||||
.html" title="annotation in typeannos">@RepConstructorA</a> <a href="RepConstruc\
|
||||
torA.html" title="annotation in typeannos">@RepConstructorA</a>
|
||||
<a href="RepConstructorB.html" title="annotation in typeannos">@RepConstructorB<\
|
||||
/a> <a href="RepConstructorB.html" title="annotation in typeannos">@RepConstruct\
|
||||
.html" title="annotation interface in typeannos">@RepConstructorA</a> <a href="RepConstruc\
|
||||
torA.html" title="annotation interface in typeannos">@RepConstructorA</a>
|
||||
<a href="RepConstructorB.html" title="annotation interface in typeannos">@RepConstructorB<\
|
||||
/a> <a href="RepConstructorB.html" title="annotation interface in typeannos">@RepConstruct\
|
||||
orB</a>
|
||||
</span><span class="element-name">RepeatingOnConstructor</span>()</div>""",
|
||||
|
||||
"""
|
||||
<div class="member-signature"><span class="annotations"><a href="RepConstructorA\
|
||||
.html" title="annotation in typeannos">@RepConstructorA</a> <a href="RepConstruc\
|
||||
torA.html" title="annotation in typeannos">@RepConstructorA</a>
|
||||
<a href="RepConstructorB.html" title="annotation in typeannos">@RepConstructorB<\
|
||||
/a> <a href="RepConstructorB.html" title="annotation in typeannos">@RepConstruct\
|
||||
.html" title="annotation interface in typeannos">@RepConstructorA</a> <a href="RepConstruc\
|
||||
torA.html" title="annotation interface in typeannos">@RepConstructorA</a>
|
||||
<a href="RepConstructorB.html" title="annotation interface in typeannos">@RepConstructorB<\
|
||||
/a> <a href="RepConstructorB.html" title="annotation interface in typeannos">@RepConstruct\
|
||||
orB</a>
|
||||
</span><span class="element-name">RepeatingOnConstructor</span>​<span class="parameters">(int i,
|
||||
int j)</span></div>""",
|
||||
|
||||
"""
|
||||
<div class="member-signature"><span class="annotations"><a href="RepAllContextsA\
|
||||
.html" title="annotation in typeannos">@RepAllContextsA</a> <a href="RepAllConte\
|
||||
xtsA.html" title="annotation in typeannos">@RepAllContextsA</a>
|
||||
<a href="RepAllContextsB.html" title="annotation in typeannos">@RepAllContextsB<\
|
||||
/a> <a href="RepAllContextsB.html" title="annotation in typeannos">@RepAllContex\
|
||||
.html" title="annotation interface in typeannos">@RepAllContextsA</a> <a href="RepAllConte\
|
||||
xtsA.html" title="annotation interface in typeannos">@RepAllContextsA</a>
|
||||
<a href="RepAllContextsB.html" title="annotation interface in typeannos">@RepAllContextsB<\
|
||||
/a> <a href="RepAllContextsB.html" title="annotation interface in typeannos">@RepAllContex\
|
||||
tsB</a>
|
||||
</span><span class="element-name">RepeatingOnConstructor</span>​<span class="parameters">(int i,
|
||||
int j,
|
||||
@ -517,20 +519,20 @@ public class TestTypeAnnotations extends JavadocTester {
|
||||
|
||||
"""
|
||||
<div class="member-signature"><span class="element-name">RepeatingOnConstructor</span>&#\
|
||||
8203;<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> <a href="RepParameterB.html" title="annotation in\
|
||||
8203;<span class="parameters">(<a href="RepParameterA.html" title="annotation interface in\
|
||||
typeannos">@RepParameterA</a> <a href="RepParameterA.html" title="annotation interface in\
|
||||
typeannos">@RepParameterA</a> <a href="RepParameterB.html" title="annotation interface in\
|
||||
typeannos">@RepParameterB</a> <a href="RepParameterB.html" title="annotation interface in\
|
||||
typeannos">@RepParameterB</a>
|
||||
java.lang.String parameter,
|
||||
<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> \
|
||||
<a href="RepParameterB.html" title="annotation in typeannos">@RepParameterB</a>
|
||||
java.lang.String <a href="RepTypeUseA.html" title="annotation in typeannos">@Rep\
|
||||
TypeUseA</a> <a href="RepTypeUseA.html" title="annotation in typeannos">@RepType\
|
||||
UseA</a> <a href="RepTypeUseB.html" title="annotation in typeannos">@RepTypeUseB\
|
||||
</a> <a href="RepTypeUseB.html" title="annotation in typeannos">@RepTypeUseB</a>\
|
||||
<a href="RepParameterA.html" title="annotation interface in typeannos">@RepParameterA</a> \
|
||||
<a href="RepParameterA.html" title="annotation interface in typeannos">@RepParameterA</a> \
|
||||
<a href="RepParameterB.html" title="annotation interface in typeannos">@RepParameterB</a> \
|
||||
<a href="RepParameterB.html" title="annotation interface in typeannos">@RepParameterB</a>
|
||||
java.lang.String <a href="RepTypeUseA.html" title="annotation interface in typeannos">@Rep\
|
||||
TypeUseA</a> <a href="RepTypeUseA.html" title="annotation interface in typeannos">@RepType\
|
||||
UseA</a> <a href="RepTypeUseB.html" title="annotation interface in typeannos">@RepTypeUseB\
|
||||
</a> <a href="RepTypeUseB.html" title="annotation interface in typeannos">@RepTypeUseB</a>\
|
||||
... vararg)</span></div>"""
|
||||
);
|
||||
|
||||
@ -538,31 +540,31 @@ public class TestTypeAnnotations extends JavadocTester {
|
||||
"""
|
||||
<code><a href="#%3Cinit%3E(java.lang.String,java.lang.String...)" class="member-\
|
||||
name-link">Inner</a>​(java.lang.String parameter,
|
||||
java.lang.String <a href="RepTypeUseA.html" title="annotation in typeannos">@Rep\
|
||||
TypeUseA</a> <a href="RepTypeUseA.html" title="annotation in typeannos">@RepType\
|
||||
UseA</a> <a href="RepTypeUseB.html" title="annotation in typeannos">@RepTypeUseB\
|
||||
</a> <a href="RepTypeUseB.html" title="annotation in typeannos">@RepTypeUseB</a>\
|
||||
java.lang.String <a href="RepTypeUseA.html" title="annotation interface in typeannos">@Rep\
|
||||
TypeUseA</a> <a href="RepTypeUseA.html" title="annotation interface in typeannos">@RepType\
|
||||
UseA</a> <a href="RepTypeUseB.html" title="annotation interface in typeannos">@RepTypeUseB\
|
||||
</a> <a href="RepTypeUseB.html" title="annotation interface in typeannos">@RepTypeUseB</a>\
|
||||
... vararg)</code>""",
|
||||
"""
|
||||
Inner</span>​<span class="parameters">(<a href="RepTypeUseA.html" title="a\
|
||||
nnotation in typeannos">@RepTypeUseA</a> <a href="RepTypeUseA.html" title="annot\
|
||||
ation in typeannos">@RepTypeUseA</a> <a href="RepTypeUseB.html" title="annotatio\
|
||||
n in typeannos">@RepTypeUseB</a> <a href="RepTypeUseB.html" title="annotation in\
|
||||
nnotation interface in typeannos">@RepTypeUseA</a> <a href="RepTypeUseA.html" title="annot\
|
||||
ation interface in typeannos">@RepTypeUseA</a> <a href="RepTypeUseB.html" title="annotatio\
|
||||
n interface in typeannos">@RepTypeUseB</a> <a href="RepTypeUseB.html" title="annotation interface in\
|
||||
typeannos">@RepTypeUseB</a> <a href="RepeatingOnConstructor.html" title="class \
|
||||
in typeannos">RepeatingOnConstructor</a> RepeatingOnConstructor.this,
|
||||
<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> \
|
||||
<a href="RepParameterB.html" title="annotation in typeannos">@RepParameterB</a>
|
||||
<a href="RepParameterA.html" title="annotation interface in typeannos">@RepParameterA</a> \
|
||||
<a href="RepParameterA.html" title="annotation interface in typeannos">@RepParameterA</a> \
|
||||
<a href="RepParameterB.html" title="annotation interface in typeannos">@RepParameterB</a> \
|
||||
<a href="RepParameterB.html" title="annotation interface in typeannos">@RepParameterB</a>
|
||||
java.lang.String parameter,
|
||||
<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> \
|
||||
<a href="RepParameterB.html" title="annotation in typeannos">@RepParameterB</a>
|
||||
java.lang.String <a href="RepTypeUseA.html" title="annotation in typeannos">@Rep\
|
||||
TypeUseA</a> <a href="RepTypeUseA.html" title="annotation in typeannos">@RepType\
|
||||
UseA</a> <a href="RepTypeUseB.html" title="annotation in typeannos">@RepTypeUseB\
|
||||
</a> <a href="RepTypeUseB.html" title="annotation in typeannos">@RepTypeUseB</a>\
|
||||
<a href="RepParameterA.html" title="annotation interface in typeannos">@RepParameterA</a> \
|
||||
<a href="RepParameterA.html" title="annotation interface in typeannos">@RepParameterA</a> \
|
||||
<a href="RepParameterB.html" title="annotation interface in typeannos">@RepParameterB</a> \
|
||||
<a href="RepParameterB.html" title="annotation interface in typeannos">@RepParameterB</a>
|
||||
java.lang.String <a href="RepTypeUseA.html" title="annotation interface in typeannos">@Rep\
|
||||
TypeUseA</a> <a href="RepTypeUseA.html" title="annotation interface in typeannos">@RepType\
|
||||
UseA</a> <a href="RepTypeUseB.html" title="annotation interface in typeannos">@RepTypeUseB\
|
||||
</a> <a href="RepTypeUseB.html" title="annotation interface in typeannos">@RepTypeUseB</a>\
|
||||
... vararg)</span>""");
|
||||
|
||||
checkOutput("typeannos/RepeatingOnField.html", true,
|
||||
@ -573,100 +575,100 @@ public class TestTypeAnnotations extends JavadocTester {
|
||||
|
||||
"""
|
||||
<div class="col-first odd-row-color"><code>(package private) <a href="RepTypeUseA.ht\
|
||||
ml" title="annotation in typeannos">@RepTypeUseA</a> <a href="RepTypeUseA.html"\
|
||||
title="annotation in typeannos">@RepTypeUseA</a> <a href="RepTypeUseB.html" tit\
|
||||
le="annotation in typeannos">@RepTypeUseB</a> <a href="RepTypeUseB.html" title="\
|
||||
annotation in typeannos">@RepTypeUseB</a> java.lang.Integer</code></div>
|
||||
ml" title="annotation interface in typeannos">@RepTypeUseA</a> <a href="RepTypeUseA.html"\
|
||||
title="annotation interface in typeannos">@RepTypeUseA</a> <a href="RepTypeUseB.html" tit\
|
||||
le="annotation interface in typeannos">@RepTypeUseB</a> <a href="RepTypeUseB.html" title="\
|
||||
annotation interface in typeannos">@RepTypeUseB</a> java.lang.Integer</code></div>
|
||||
<div class="col-second odd-row-color"><code><a href="\
|
||||
#i2" class="member-name-link">i2</a></code></div>
|
||||
<div class="col-last odd-row-color"> </div>""",
|
||||
|
||||
"""
|
||||
<div class="col-first even-row-color"><code>(package private) <a href="RepTypeUseA.ht\
|
||||
ml" title="annotation in typeannos">@RepTypeUseA</a> <a href="RepTypeUseA.html"\
|
||||
title="annotation in typeannos">@RepTypeUseA</a> <a href="RepTypeUseB.html" tit\
|
||||
le="annotation in typeannos">@RepTypeUseB</a> <a href="RepTypeUseB.html" title="\
|
||||
annotation in typeannos">@RepTypeUseB</a> java.lang.Integer</code></div>
|
||||
ml" title="annotation interface in typeannos">@RepTypeUseA</a> <a href="RepTypeUseA.html"\
|
||||
title="annotation interface in typeannos">@RepTypeUseA</a> <a href="RepTypeUseB.html" tit\
|
||||
le="annotation interface in typeannos">@RepTypeUseB</a> <a href="RepTypeUseB.html" title="\
|
||||
annotation interface in typeannos">@RepTypeUseB</a> java.lang.Integer</code></div>
|
||||
<div class="col-second even-row-color"><code><a href="#i3" class="member-name-li\
|
||||
nk">i3</a></code></div>""",
|
||||
|
||||
"""
|
||||
<div class="col-first odd-row-color"><code>(package private) <a href="RepAllContexts\
|
||||
A.html" title="annotation in typeannos">@RepAllContextsA</a> <a href="RepAllCont\
|
||||
extsA.html" title="annotation in typeannos">@RepAllContextsA</a> <a href="RepAll\
|
||||
ContextsB.html" title="annotation in typeannos">@RepAllContextsB</a> <a href="Re\
|
||||
pAllContextsB.html" title="annotation in typeannos">@RepAllContextsB</a> java.la\
|
||||
A.html" title="annotation interface in typeannos">@RepAllContextsA</a> <a href="RepAllCont\
|
||||
extsA.html" title="annotation interface in typeannos">@RepAllContextsA</a> <a href="RepAll\
|
||||
ContextsB.html" title="annotation interface in typeannos">@RepAllContextsB</a> <a href="Re\
|
||||
pAllContextsB.html" title="annotation interface in typeannos">@RepAllContextsB</a> java.la\
|
||||
ng.Integer</code></div>
|
||||
<div class="col-second odd-row-color"><code><a href="#i4" class="member-name-lin\
|
||||
k">i4</a></code></div>""",
|
||||
|
||||
"""
|
||||
<div class="col-first even-row-color"><code>(package private) java.lang.String <a hre\
|
||||
f="RepTypeUseA.html" title="annotation in typeannos">@RepTypeUseA</a> <a href="R\
|
||||
epTypeUseA.html" title="annotation in typeannos">@RepTypeUseA</a> <a href="RepTy\
|
||||
peUseB.html" title="annotation in typeannos">@RepTypeUseB</a> <a href="RepTypeUs\
|
||||
eB.html" title="annotation in typeannos">@RepTypeUseB</a> [] <a href="RepTypeUse\
|
||||
A.html" title="annotation in typeannos">@RepTypeUseA</a> <a href="RepTypeUseA.ht\
|
||||
ml" title="annotation in typeannos">@RepTypeUseA</a> <a href="RepTypeUseB.html"\
|
||||
title="annotation in typeannos">@RepTypeUseB</a> <a href="RepTypeUseB.html" tit\
|
||||
le="annotation in typeannos">@RepTypeUseB</a> []</code></div>
|
||||
f="RepTypeUseA.html" title="annotation interface in typeannos">@RepTypeUseA</a> <a href="R\
|
||||
epTypeUseA.html" title="annotation interface in typeannos">@RepTypeUseA</a> <a href="RepTy\
|
||||
peUseB.html" title="annotation interface in typeannos">@RepTypeUseB</a> <a href="RepTypeUs\
|
||||
eB.html" title="annotation interface in typeannos">@RepTypeUseB</a> [] <a href="RepTypeUse\
|
||||
A.html" title="annotation interface in typeannos">@RepTypeUseA</a> <a href="RepTypeUseA.ht\
|
||||
ml" title="annotation interface in typeannos">@RepTypeUseA</a> <a href="RepTypeUseB.html"\
|
||||
title="annotation interface in typeannos">@RepTypeUseB</a> <a href="RepTypeUseB.html" tit\
|
||||
le="annotation interface in typeannos">@RepTypeUseB</a> []</code></div>
|
||||
<div class="col-second even-row-color"><code><a href="#sa" class="member-name-li\
|
||||
nk">sa</a></code></div>""",
|
||||
|
||||
"""
|
||||
<div class="member-signature"><span class="annotations"><a href="RepFieldA.html"\
|
||||
title="annotation in typeannos">@RepFieldA</a> <a href="RepFieldA.html" title="\
|
||||
annotation in typeannos">@RepFieldA</a>
|
||||
<a href="RepFieldB.html" title="annotation in typeannos">@RepFieldB</a> <a href=\
|
||||
"RepFieldB.html" title="annotation in typeannos">@RepFieldB</a>
|
||||
title="annotation interface in typeannos">@RepFieldA</a> <a href="RepFieldA.html" title="\
|
||||
annotation interface in typeannos">@RepFieldA</a>
|
||||
<a href="RepFieldB.html" title="annotation interface in typeannos">@RepFieldB</a> <a href=\
|
||||
"RepFieldB.html" title="annotation interface in typeannos">@RepFieldB</a>
|
||||
</span><span class="return-type">java.lang.Integer</span> <span class="elem\
|
||||
ent-name">i1</span></div>""",
|
||||
|
||||
"""
|
||||
<div class="member-signature"><span class="return-type"><a href="RepTypeUseA.htm\
|
||||
l" title="annotation in typeannos">@RepTypeUseA</a> <a href="RepTypeUseA.html" t\
|
||||
itle="annotation in typeannos">@RepTypeUseA</a> <a href="RepTypeUseB.html" title\
|
||||
="annotation in typeannos">@RepTypeUseB</a> <a href="RepTypeUseB.html" title="an\
|
||||
notation in typeannos">@RepTypeUseB</a> java.lang.Integer</span> <span clas\
|
||||
l" title="annotation interface in typeannos">@RepTypeUseA</a> <a href="RepTypeUseA.html" t\
|
||||
itle="annotation interface in typeannos">@RepTypeUseA</a> <a href="RepTypeUseB.html" title\
|
||||
="annotation interface in typeannos">@RepTypeUseB</a> <a href="RepTypeUseB.html" title="an\
|
||||
notation interface in typeannos">@RepTypeUseB</a> java.lang.Integer</span> <span clas\
|
||||
s="element-name">i2</span></div>""",
|
||||
|
||||
"""
|
||||
<div class="member-signature"><span class="annotations"><a href="RepFieldA.html"\
|
||||
title="annotation in typeannos">@RepFieldA</a> <a href="RepFieldA.html" title="\
|
||||
annotation in typeannos">@RepFieldA</a>
|
||||
<a href="RepFieldB.html" title="annotation in typeannos">@RepFieldB</a> <a href=\
|
||||
"RepFieldB.html" title="annotation in typeannos">@RepFieldB</a>
|
||||
</span><span class="return-type"><a href="RepTypeUseA.html" title="annotation in\
|
||||
typeannos">@RepTypeUseA</a> <a href="RepTypeUseA.html" title="annotation in typ\
|
||||
eannos">@RepTypeUseA</a> <a href="RepTypeUseB.html" title="annotation in typeann\
|
||||
os">@RepTypeUseB</a> <a href="RepTypeUseB.html" title="annotation in typeannos">\
|
||||
title="annotation interface in typeannos">@RepFieldA</a> <a href="RepFieldA.html" title="\
|
||||
annotation interface in typeannos">@RepFieldA</a>
|
||||
<a href="RepFieldB.html" title="annotation interface in typeannos">@RepFieldB</a> <a href=\
|
||||
"RepFieldB.html" title="annotation interface in typeannos">@RepFieldB</a>
|
||||
</span><span class="return-type"><a href="RepTypeUseA.html" title="annotation interface in\
|
||||
typeannos">@RepTypeUseA</a> <a href="RepTypeUseA.html" title="annotation interface in typ\
|
||||
eannos">@RepTypeUseA</a> <a href="RepTypeUseB.html" title="annotation interface in typeann\
|
||||
os">@RepTypeUseB</a> <a href="RepTypeUseB.html" title="annotation interface in typeannos">\
|
||||
@RepTypeUseB</a> java.lang.Integer</span> <span class="element-name">i3</spa\
|
||||
n></div>""",
|
||||
|
||||
"""
|
||||
<div class="member-signature"><span class="annotations"><a href="RepAllContextsA\
|
||||
.html" title="annotation in typeannos">@RepAllContextsA</a> <a href="RepAllConte\
|
||||
xtsA.html" title="annotation in typeannos">@RepAllContextsA</a>
|
||||
<a href="RepAllContextsB.html" title="annotation in typeannos">@RepAllContextsB<\
|
||||
/a> <a href="RepAllContextsB.html" title="annotation in typeannos">@RepAllContex\
|
||||
.html" title="annotation interface in typeannos">@RepAllContextsA</a> <a href="RepAllConte\
|
||||
xtsA.html" title="annotation interface in typeannos">@RepAllContextsA</a>
|
||||
<a href="RepAllContextsB.html" title="annotation interface in typeannos">@RepAllContextsB<\
|
||||
/a> <a href="RepAllContextsB.html" title="annotation interface in typeannos">@RepAllContex\
|
||||
tsB</a>
|
||||
</span><span class="return-type"><a href="RepAllContextsA.html" title="annotatio\
|
||||
n in typeannos">@RepAllContextsA</a> <a href="RepAllContextsA.html" title="annot\
|
||||
ation in typeannos">@RepAllContextsA</a> <a href="RepAllContextsB.html" title="a\
|
||||
nnotation in typeannos">@RepAllContextsB</a> <a href="RepAllContextsB.html" titl\
|
||||
e="annotation in typeannos">@RepAllContextsB</a> java.lang.Integer</span> <\
|
||||
n interface in typeannos">@RepAllContextsA</a> <a href="RepAllContextsA.html" title="annot\
|
||||
ation interface in typeannos">@RepAllContextsA</a> <a href="RepAllContextsB.html" title="a\
|
||||
nnotation interface in typeannos">@RepAllContextsB</a> <a href="RepAllContextsB.html" titl\
|
||||
e="annotation interface in typeannos">@RepAllContextsB</a> java.lang.Integer</span> <\
|
||||
span class="element-name">i4</span></div>""",
|
||||
|
||||
"""
|
||||
<div class="member-signature"><span class="return-type">java.lang.String <a href\
|
||||
="RepTypeUseA.html" title="annotation in typeannos">@RepTypeUseA</a> <a href="Re\
|
||||
pTypeUseA.html" title="annotation in typeannos">@RepTypeUseA</a> <a href="RepTyp\
|
||||
eUseB.html" title="annotation in typeannos">@RepTypeUseB</a> <a href="RepTypeUse\
|
||||
B.html" title="annotation in typeannos">@RepTypeUseB</a> [] <a href="RepTypeUseA\
|
||||
.html" title="annotation in typeannos">@RepTypeUseA</a> <a href="RepTypeUseA.htm\
|
||||
l" title="annotation in typeannos">@RepTypeUseA</a> <a href="RepTypeUseB.html" t\
|
||||
itle="annotation in typeannos">@RepTypeUseB</a> <a href="RepTypeUseB.html" title\
|
||||
="annotation in typeannos">@RepTypeUseB</a> []</span> <span class="element-\
|
||||
="RepTypeUseA.html" title="annotation interface in typeannos">@RepTypeUseA</a> <a href="Re\
|
||||
pTypeUseA.html" title="annotation interface in typeannos">@RepTypeUseA</a> <a href="RepTyp\
|
||||
eUseB.html" title="annotation interface in typeannos">@RepTypeUseB</a> <a href="RepTypeUse\
|
||||
B.html" title="annotation interface in typeannos">@RepTypeUseB</a> [] <a href="RepTypeUseA\
|
||||
.html" title="annotation interface in typeannos">@RepTypeUseA</a> <a href="RepTypeUseA.htm\
|
||||
l" title="annotation interface in typeannos">@RepTypeUseA</a> <a href="RepTypeUseB.html" t\
|
||||
itle="annotation interface in typeannos">@RepTypeUseB</a> <a href="RepTypeUseB.html" title\
|
||||
="annotation interface in typeannos">@RepTypeUseB</a> []</span> <span class="element-\
|
||||
name">sa</span></div>""");
|
||||
|
||||
checkOutput("typeannos/RepeatingOnMethod.html", true,
|
||||
@ -677,31 +679,31 @@ public class TestTypeAnnotations extends JavadocTester {
|
||||
est1()" class="member-name-link">test1</a>()</code>""",
|
||||
|
||||
"""
|
||||
<code>(package private) <a href="RepTypeUseA.html" title="annotation in typeanno\
|
||||
s">@RepTypeUseA</a> <a href="RepTypeUseA.html" title="annotation in typeannos">@\
|
||||
RepTypeUseA</a> <a href="RepTypeUseB.html" title="annotation in typeannos">@RepT\
|
||||
ypeUseB</a> <a href="RepTypeUseB.html" title="annotation in typeannos">@RepTypeU\
|
||||
<code>(package private) <a href="RepTypeUseA.html" title="annotation interface in typeanno\
|
||||
s">@RepTypeUseA</a> <a href="RepTypeUseA.html" title="annotation interface in typeannos">@\
|
||||
RepTypeUseA</a> <a href="RepTypeUseB.html" title="annotation interface in typeannos">@RepT\
|
||||
ypeUseB</a> <a href="RepTypeUseB.html" title="annotation interface in typeannos">@RepTypeU\
|
||||
seB</a> java.lang.String</code></div>
|
||||
<div class="col-second odd-row-color method-summary-table method-summary-table-t\
|
||||
ab2 method-summary-table-tab4"><code><a href="#te\
|
||||
st2()" class="member-name-link">test2</a>()</code>""",
|
||||
|
||||
"""
|
||||
<code>(package private) <a href="RepTypeUseA.html" title="annotation in typeanno\
|
||||
s">@RepTypeUseA</a> <a href="RepTypeUseA.html" title="annotation in typeannos">@\
|
||||
RepTypeUseA</a> <a href="RepTypeUseB.html" title="annotation in typeannos">@RepT\
|
||||
ypeUseB</a> <a href="RepTypeUseB.html" title="annotation in typeannos">@RepTypeU\
|
||||
<code>(package private) <a href="RepTypeUseA.html" title="annotation interface in typeanno\
|
||||
s">@RepTypeUseA</a> <a href="RepTypeUseA.html" title="annotation interface in typeannos">@\
|
||||
RepTypeUseA</a> <a href="RepTypeUseB.html" title="annotation interface in typeannos">@RepT\
|
||||
ypeUseB</a> <a href="RepTypeUseB.html" title="annotation interface in typeannos">@RepTypeU\
|
||||
seB</a> java.lang.String</code></div>
|
||||
<div class="col-second even-row-color method-summary-table method-summary-table-\
|
||||
tab2 method-summary-table-tab4"><code><a href="#t\
|
||||
est3()" class="member-name-link">test3</a>()</code>""",
|
||||
|
||||
"""
|
||||
<code>(package private) <a href="RepAllContextsA.html" title="annotation in type\
|
||||
annos">@RepAllContextsA</a> <a href="RepAllContextsA.html" title="annotation in\
|
||||
<code>(package private) <a href="RepAllContextsA.html" title="annotation interface in type\
|
||||
annos">@RepAllContextsA</a> <a href="RepAllContextsA.html" title="annotation interface in\
|
||||
typeannos">@RepAllContextsA</a> <a href="RepAllContextsB.html" title="annotatio\
|
||||
n in typeannos">@RepAllContextsB</a> <a href="RepAllContextsB.html" title="annot\
|
||||
ation in typeannos">@RepAllContextsB</a> java.lang.String</code></div>
|
||||
n interface in typeannos">@RepAllContextsB</a> <a href="RepAllContextsB.html" title="annot\
|
||||
ation interface in typeannos">@RepAllContextsB</a> java.lang.String</code></div>
|
||||
<div class="col-second odd-row-color method-summary-table method-summary-table-t\
|
||||
ab2 method-summary-table-tab4"><code><a href="#te\
|
||||
st4()" class="member-name-link">test4</a>()</code>""",
|
||||
@ -709,72 +711,72 @@ public class TestTypeAnnotations extends JavadocTester {
|
||||
"""
|
||||
<code><a href="#test5(java.lang.String,java.lang.\
|
||||
String...)" class="member-name-link">test5</a>​(java.lang.String parameter,
|
||||
java.lang.String <a href="RepTypeUseA.html" title="annotation in typeannos">@Re\
|
||||
pTypeUseA</a> <a href="RepTypeUseA.html" title="annotation in typeannos">@RepTyp\
|
||||
eUseA</a> <a href="RepTypeUseB.html" title="annotation in typeannos">@RepTypeUse\
|
||||
B</a> <a href="RepTypeUseB.html" title="annotation in typeannos">@RepTypeUseB</a\
|
||||
java.lang.String <a href="RepTypeUseA.html" title="annotation interface in typeannos">@Re\
|
||||
pTypeUseA</a> <a href="RepTypeUseA.html" title="annotation interface in typeannos">@RepTyp\
|
||||
eUseA</a> <a href="RepTypeUseB.html" title="annotation interface in typeannos">@RepTypeUse\
|
||||
B</a> <a href="RepTypeUseB.html" title="annotation interface in typeannos">@RepTypeUseB</a\
|
||||
> ... vararg)</code>""",
|
||||
|
||||
"""
|
||||
<a href="RepMethodA.html" title="annotation in typeannos">@RepMethodA</a> <a hre\
|
||||
f="RepMethodA.html" title="annotation in typeannos">@RepMethodA</a>
|
||||
<a href="RepMethodB.html" title="annotation in typeannos">@RepMethodB</a> <a hre\
|
||||
f="RepMethodB.html" title="annotation in typeannos">@RepMethodB</a>
|
||||
<a href="RepMethodA.html" title="annotation interface in typeannos">@RepMethodA</a> <a hre\
|
||||
f="RepMethodA.html" title="annotation interface in typeannos">@RepMethodA</a>
|
||||
<a href="RepMethodB.html" title="annotation interface in typeannos">@RepMethodB</a> <a hre\
|
||||
f="RepMethodB.html" title="annotation interface in typeannos">@RepMethodB</a>
|
||||
</span><span class="return-type">java.lang.String</span> <span class="element-name">test1</span>()""",
|
||||
|
||||
"""
|
||||
<a href="RepTypeUseA.html" title="annotation in typeannos">@RepTypeUseA</a> <a h\
|
||||
ref="RepTypeUseA.html" title="annotation in typeannos">@RepTypeUseA</a> <a href=\
|
||||
"RepTypeUseB.html" title="annotation in typeannos">@RepTypeUseB</a> <a href="Rep\
|
||||
TypeUseB.html" title="annotation in typeannos">@RepTypeUseB</a> java.lang.String\
|
||||
<a href="RepTypeUseA.html" title="annotation interface in typeannos">@RepTypeUseA</a> <a h\
|
||||
ref="RepTypeUseA.html" title="annotation interface in typeannos">@RepTypeUseA</a> <a href=\
|
||||
"RepTypeUseB.html" title="annotation interface in typeannos">@RepTypeUseB</a> <a href="Rep\
|
||||
TypeUseB.html" title="annotation interface in typeannos">@RepTypeUseB</a> java.lang.String\
|
||||
</span> <span class="element-name">test2</span>()""",
|
||||
|
||||
"""
|
||||
<a href="RepMethodA.html" title="annotation in typeannos">@RepMethodA</a> <a hre\
|
||||
f="RepMethodA.html" title="annotation in typeannos">@RepMethodA</a>
|
||||
<a href="RepMethodB.html" title="annotation in typeannos">@RepMethodB</a> <a hre\
|
||||
f="RepMethodB.html" title="annotation in typeannos">@RepMethodB</a>
|
||||
</span><span class="return-type"><a href="RepTypeUseA.html" title="annotation in\
|
||||
typeannos">@RepTypeUseA</a> <a href="RepTypeUseA.html" title="annotation in typ\
|
||||
eannos">@RepTypeUseA</a> <a href="RepTypeUseB.html" title="annotation in typeann\
|
||||
os">@RepTypeUseB</a> <a href="RepTypeUseB.html" title="annotation in typeannos">\
|
||||
<a href="RepMethodA.html" title="annotation interface in typeannos">@RepMethodA</a> <a hre\
|
||||
f="RepMethodA.html" title="annotation interface in typeannos">@RepMethodA</a>
|
||||
<a href="RepMethodB.html" title="annotation interface in typeannos">@RepMethodB</a> <a hre\
|
||||
f="RepMethodB.html" title="annotation interface in typeannos">@RepMethodB</a>
|
||||
</span><span class="return-type"><a href="RepTypeUseA.html" title="annotation interface in\
|
||||
typeannos">@RepTypeUseA</a> <a href="RepTypeUseA.html" title="annotation interface in typ\
|
||||
eannos">@RepTypeUseA</a> <a href="RepTypeUseB.html" title="annotation interface in typeann\
|
||||
os">@RepTypeUseB</a> <a href="RepTypeUseB.html" title="annotation interface in typeannos">\
|
||||
@RepTypeUseB</a> java.lang.String</span> <span class="element-name">test3</s\
|
||||
pan>()""",
|
||||
|
||||
"""
|
||||
<a href="RepAllContextsA.html" title="annotation in typeannos">@RepAllContextsA<\
|
||||
/a> <a href="RepAllContextsA.html" title="annotation in typeannos">@RepAllContex\
|
||||
<a href="RepAllContextsA.html" title="annotation interface in typeannos">@RepAllContextsA<\
|
||||
/a> <a href="RepAllContextsA.html" title="annotation interface in typeannos">@RepAllContex\
|
||||
tsA</a>
|
||||
<a href="RepAllContextsB.html" title="annotation in typeannos">@RepAllContextsB<\
|
||||
/a> <a href="RepAllContextsB.html" title="annotation in typeannos">@RepAllContex\
|
||||
<a href="RepAllContextsB.html" title="annotation interface in typeannos">@RepAllContextsB<\
|
||||
/a> <a href="RepAllContextsB.html" title="annotation interface in typeannos">@RepAllContex\
|
||||
tsB</a>
|
||||
</span><span class="return-type"><a href="RepAllContextsA.html" title="annotatio\
|
||||
n in typeannos">@RepAllContextsA</a> <a href="RepAllContextsA.html" title="annot\
|
||||
ation in typeannos">@RepAllContextsA</a> <a href="RepAllContextsB.html" title="a\
|
||||
nnotation in typeannos">@RepAllContextsB</a> <a href="RepAllContextsB.html" titl\
|
||||
e="annotation in typeannos">@RepAllContextsB</a> java.lang.String</span> <s\
|
||||
n interface in typeannos">@RepAllContextsA</a> <a href="RepAllContextsA.html" title="annot\
|
||||
ation interface in typeannos">@RepAllContextsA</a> <a href="RepAllContextsB.html" title="a\
|
||||
nnotation interface in typeannos">@RepAllContextsB</a> <a href="RepAllContextsB.html" titl\
|
||||
e="annotation interface in typeannos">@RepAllContextsB</a> java.lang.String</span> <s\
|
||||
pan class="element-name">test4</span>()""",
|
||||
|
||||
"""
|
||||
java.lang.String</span> <span class="element-name">test5</span>​<span\
|
||||
class="parameters">(<a href="RepTypeUseA.html" title="annotation in typeannos">@\
|
||||
RepTypeUseA</a> <a href="RepTypeUseA.html" title="annotation in typeannos">@RepT\
|
||||
ypeUseA</a> <a href="RepTypeUseB.html" title="annotation in typeannos">@RepTypeU\
|
||||
seB</a> <a href="RepTypeUseB.html" title="annotation in typeannos">@RepTypeUseB<\
|
||||
class="parameters">(<a href="RepTypeUseA.html" title="annotation interface in typeannos">@\
|
||||
RepTypeUseA</a> <a href="RepTypeUseA.html" title="annotation interface in typeannos">@RepT\
|
||||
ypeUseA</a> <a href="RepTypeUseB.html" title="annotation interface in typeannos">@RepTypeU\
|
||||
seB</a> <a href="RepTypeUseB.html" title="annotation interface in typeannos">@RepTypeUseB<\
|
||||
/a> RepeatingOnMethod this,
|
||||
<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> \
|
||||
<a href="RepParameterB.html" title="annotation in typeannos">@RepParameterB</a>
|
||||
<a href="RepParameterA.html" title="annotation interface in typeannos">@RepParameterA</a> \
|
||||
<a href="RepParameterA.html" title="annotation interface in typeannos">@RepParameterA</a> \
|
||||
<a href="RepParameterB.html" title="annotation interface in typeannos">@RepParameterB</a> \
|
||||
<a href="RepParameterB.html" title="annotation interface in typeannos">@RepParameterB</a>
|
||||
java.lang.String parameter,
|
||||
<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>\
|
||||
<a href="RepParameterB.html" title="annotation in typeannos">@RepParameterB</a>
|
||||
java.lang.String <a href="RepTypeUseA.html" title="annotation in typeannos">@Re\
|
||||
pTypeUseA</a> <a href="RepTypeUseA.html" title="annotation in typeannos">@RepTyp\
|
||||
eUseA</a> <a href="RepTypeUseB.html" title="annotation in typeannos">@RepTypeUse\
|
||||
B</a> <a href="RepTypeUseB.html" title="annotation in typeannos">@RepTypeUseB</a\
|
||||
<a href="RepParameterA.html" title="annotation interface in typeannos">@RepParameterA</a>\
|
||||
<a href="RepParameterA.html" title="annotation interface in typeannos">@RepParameterA</a>\
|
||||
<a href="RepParameterB.html" title="annotation interface in typeannos">@RepParameterB</a>\
|
||||
<a href="RepParameterB.html" title="annotation interface in typeannos">@RepParameterB</a>
|
||||
java.lang.String <a href="RepTypeUseA.html" title="annotation interface in typeannos">@Re\
|
||||
pTypeUseA</a> <a href="RepTypeUseA.html" title="annotation interface in typeannos">@RepTyp\
|
||||
eUseA</a> <a href="RepTypeUseB.html" title="annotation interface in typeannos">@RepTypeUse\
|
||||
B</a> <a href="RepTypeUseB.html" title="annotation interface in typeannos">@RepTypeUseB</a\
|
||||
> ... vararg)</span></div>""");
|
||||
|
||||
checkOutput("typeannos/RepeatingOnTypeParametersBoundsTypeArgumentsOnMethod.html", true,
|
||||
@ -789,10 +791,10 @@ public class TestTypeAnnotations extends JavadocTester {
|
||||
<div class="col-second odd-row-color method-summary-table method-summary-table-t\
|
||||
ab2 method-summary-table-tab4"><code><a href="#genericMethod2(T)" class="member-\
|
||||
name-link">genericMethod2</a>​(<a href="RepTypeUseA.html" title="annotatio\
|
||||
n in typeannos">@RepTypeUseA</a> <a href="RepTypeUseA.html" title="anno\
|
||||
tation in typeannos">@RepTypeUseA</a> <a href="RepTypeUseB.html" title="annotati\
|
||||
on in typeannos">@RepTypeUseB</a> <a href="RepTypeUseB.html" title="annotation i\
|
||||
n typeannos">@RepTypeUseB</a> T t)</code>""",
|
||||
n interface in typeannos">@RepTypeUseA</a> <a href="RepTypeUseA.html" title="anno\
|
||||
tation interface in typeannos">@RepTypeUseA</a> <a href="RepTypeUseB.html" title="annotati\
|
||||
on interface in typeannos">@RepTypeUseB</a> <a href="RepTypeUseB.html" title="annotation i\
|
||||
nterface in typeannos">@RepTypeUseB</a> T t)</code>""",
|
||||
|
||||
"""
|
||||
<code>(package private) java.lang.String</code></div>
|
||||
@ -803,22 +805,22 @@ public class TestTypeAnnotations extends JavadocTester {
|
||||
"""
|
||||
<span class="return-type">java.lang.String</span> <span class="element-name">test</\
|
||||
span>​<span class="parameters">(<a href="RepTypeUseA.html" title="annotati\
|
||||
on in typeannos">@RepTypeUseA</a> <a href="RepTypeUseA.html" title="annotation i\
|
||||
n typeannos">@RepTypeUseA</a> <a href="RepTypeUseB.html" title="annotation in ty\
|
||||
peannos">@RepTypeUseB</a> <a href="RepTypeUseB.html" title="annotation in typean\
|
||||
on interface in typeannos">@RepTypeUseA</a> <a href="RepTypeUseA.html" title="annotation i\
|
||||
nterface in typeannos">@RepTypeUseA</a> <a href="RepTypeUseB.html" title="annotation interface in ty\
|
||||
peannos">@RepTypeUseB</a> <a href="RepTypeUseB.html" title="annotation interface in typean\
|
||||
nos">@RepTypeUseB</a> RepeatingOnTypeParametersBoundsTypeArgumentsOnMethod&\
|
||||
lt;<a href="RepTypeUseA.html" title="annotation in typeannos">@RepTypeUseA</a> <\
|
||||
a href="RepTypeUseA.html" title="annotation in typeannos">@RepTypeUseA</a> <a hr\
|
||||
ef="RepTypeUseB.html" title="annotation in typeannos">@RepTypeUseB</a> <a href="\
|
||||
RepTypeUseB.html" title="annotation in typeannos">@RepTypeUseB</a> T> th\
|
||||
lt;<a href="RepTypeUseA.html" title="annotation interface in typeannos">@RepTypeUseA</a> <\
|
||||
a href="RepTypeUseA.html" title="annotation interface in typeannos">@RepTypeUseA</a> <a hr\
|
||||
ef="RepTypeUseB.html" title="annotation interface in typeannos">@RepTypeUseB</a> <a href="\
|
||||
RepTypeUseB.html" title="annotation interface in typeannos">@RepTypeUseB</a> T> th\
|
||||
is)""");
|
||||
|
||||
checkOutput("typeannos/RepeatingOnVoidMethodDeclaration.html", true,
|
||||
"""
|
||||
<a href="RepMethodA.html" title="annotation in typeannos">@RepMethodA</a> <a hre\
|
||||
f="RepMethodA.html" title="annotation in typeannos">@RepMethodA</a>
|
||||
<a href="RepMethodB.html" title="annotation in typeannos">@RepMethodB</a> <a hre\
|
||||
f="RepMethodB.html" title="annotation in typeannos">@RepMethodB</a>
|
||||
<a href="RepMethodA.html" title="annotation interface in typeannos">@RepMethodA</a> <a hre\
|
||||
f="RepMethodA.html" title="annotation interface in typeannos">@RepMethodA</a>
|
||||
<a href="RepMethodB.html" title="annotation interface in typeannos">@RepMethodB</a> <a hre\
|
||||
f="RepMethodB.html" title="annotation interface in typeannos">@RepMethodB</a>
|
||||
</span><span class="return-type">void</span> <span class="element-name">test</span>()""");
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user