archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8240916: Convert to using hyphenated naming for CSS classes

Browse source 
Reviewed-by: hannesw
This commit is contained in:
Jonathan Gibbons 2020-03-13 10:57:41 -07:00
parent 2b465b1ebf
commit afa54b7ed5
85 changed files with 2076 additions and 2052 deletions
Download patch file Download diff file Expand all files Collapse all files

2
make/jdk/src/classes/build/tools/taglet/ModuleGraph.java
View file

@ -75,7 +75,7 @@ public class ModuleGraph implements Taglet {
} }
return "<dt>Module Graph:</dt>" return "<dt>Module Graph:</dt>"
+ "<dd>" + "<dd>"
+ "<a class=moduleGraph href=\"" + imageFile + "\">" + "<a class=\"module-graph\" href=\"" + imageFile + "\">"
+ getImage(moduleName, imageFile, thumbnailHeight, false) + getImage(moduleName, imageFile, thumbnailHeight, false)
+ hoverImage + hoverImage
+ "</a>" + "</a>"

2
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SourceToHTMLConverter.java
View file

@ -287,7 +287,7 @@ public class SourceToHTMLConverter {
* @return the header content for the HTML file * @return the header content for the HTML file
*/ */
private static Content getHeader() { private static Content getHeader() {
return new HtmlTree(HtmlTag.BODY).put(HtmlAttr.CLASS, "source"); return new HtmlTree(HtmlTag.BODY).setStyle(HtmlStyle.source);
} }
/** /**

28
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlStyle.java
View file

@ -25,8 +25,11 @@
package jdk.javadoc.internal.doclets.formats.html.markup; package jdk.javadoc.internal.doclets.formats.html.markup;
import java.util.Locale;
import java.util.regex.Pattern;
/** /**
* Enum representing HTML styles. The name map to values in the CSS file. * Enum representing HTML styles, with associated entries in the stylesheet files.
* *
* <p><b>This is NOT part of any supported API. * <p><b>This is NOT part of any supported API.
* If you write code that depends on this, you do so at your own risk. * If you write code that depends on this, you do so at your own risk.
@ -118,6 +121,7 @@ public enum HtmlStyle {
serializedClassDetails, serializedClassDetails,
servicesSummary, servicesSummary,
skipNav, skipNav,
source,
sourceContainer, sourceContainer,
sourceLineNo, sourceLineNo,
subNav, subNav,
@ -136,5 +140,25 @@ public enum HtmlStyle {
typeSummary, typeSummary,
useSummary, useSummary,
usesSummary, usesSummary,
verticalSeparator verticalSeparator;
private final String cssName;
HtmlStyle() {
cssName = Pattern.compile("\\p{Upper}")
.matcher(toString())
.replaceAll(mr -> "-" + mr.group().toLowerCase(Locale.US));
}
HtmlStyle(String cssName) {
this.cssName = cssName;
}
/**
* Returns the CSS class name associated with this style.
* @return the CSS class name
*/
public String cssName() {
return cssName;
}
} }

2
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlTree.java
View file

@ -147,7 +147,7 @@ public class HtmlTree extends Content {
* @return this object * @return this object
*/ */
public HtmlTree setStyle(HtmlStyle style) { public HtmlTree setStyle(HtmlStyle style) {
return put(HtmlAttr.CLASS, style.toString()); return put(HtmlAttr.CLASS, style.cssName());
} }
/** /**

8
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Table.java
View file

@ -357,7 +357,7 @@ public class Table extends Content {
if (stripedStyles != null) { if (stripedStyles != null) {
int rowIndex = bodyRows.size(); int rowIndex = bodyRows.size();
row.put(HtmlAttr.CLASS, stripedStyles.get(rowIndex % 2).name()); row.setStyle(stripedStyles.get(rowIndex % 2));
} }
int colIndex = 0; int colIndex = 0;
for (Content c : contents) { for (Content c : contents) {
@ -444,7 +444,7 @@ public class Table extends Content {
} }
} }
HtmlTree tabpanel = new HtmlTree(HtmlTag.DIV) HtmlTree tabpanel = new HtmlTree(HtmlTag.DIV)
.put(HtmlAttr.ID, tableStyle + "_tabpanel") .put(HtmlAttr.ID, tableStyle.cssName() + "_tabpanel")
.put(HtmlAttr.ROLE, "tabpanel"); .put(HtmlAttr.ROLE, "tabpanel");
table.add(getTableBody()); table.add(getTableBody());
tabpanel.add(table); tabpanel.add(table);
@ -458,7 +458,7 @@ public class Table extends Content {
HtmlTree tab = new HtmlTree(HtmlTag.BUTTON) HtmlTree tab = new HtmlTree(HtmlTag.BUTTON)
.put(HtmlAttr.ROLE, "tab") .put(HtmlAttr.ROLE, "tab")
.put(HtmlAttr.ARIA_SELECTED, defaultTab ? "true" : "false") .put(HtmlAttr.ARIA_SELECTED, defaultTab ? "true" : "false")
.put(HtmlAttr.ARIA_CONTROLS, tableStyle + "_tabpanel") .put(HtmlAttr.ARIA_CONTROLS, tableStyle.cssName() + "_tabpanel")
.put(HtmlAttr.TABINDEX, defaultTab ? "0" : "-1") .put(HtmlAttr.TABINDEX, defaultTab ? "0" : "-1")
.put(HtmlAttr.ONKEYDOWN, "switchTab(event)") .put(HtmlAttr.ONKEYDOWN, "switchTab(event)")
.put(HtmlAttr.ID, tabId) .put(HtmlAttr.ID, tabId)
@ -543,7 +543,7 @@ public class Table extends Content {
private void appendStyleInfo(StringBuilder sb, HtmlStyle... styles) { private void appendStyleInfo(StringBuilder sb, HtmlStyle... styles) {
for (HtmlStyle style : styles) { for (HtmlStyle style : styles) {
sb.append("var ").append(style).append(" = \"").append(style).append("\";\n"); sb.append("var ").append(style.name()).append(" = \"").append(style.cssName()).append("\";\n");
} }
} }

260
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/stylesheet.css
View file

@ -104,14 +104,14 @@ button {
height:0px; height:0px;
overflow:hidden; overflow:hidden;
} }
.aboutLanguage { .about-language {
float:right; float:right;
padding:0px 21px; padding:0px 21px;
font-size:11px; font-size:11px;
z-index:200; z-index:200;
margin-top:-9px; margin-top:-9px;
} }
.legalCopy { .legal-copy {
margin-left:.5em; margin-left:.5em;
} }
.tab { .tab {
@ -125,22 +125,22 @@ button {
* Styles for navigation bar. * Styles for navigation bar.
*/ */
@media screen { @media screen {
.flexBox { .flex-box {
position:fixed; position:fixed;
display:flex; display:flex;
flex-direction:column; flex-direction:column;
height: 100%; height: 100%;
width: 100%; width: 100%;
} }
.flexHeader { .flex-header {
flex: 0 0 auto; flex: 0 0 auto;
} }
.flexContent { .flex-content {
flex: 1 1 auto; flex: 1 1 auto;
overflow-y: auto; overflow-y: auto;
} }
} }
.topNav { .top-nav {
background-color:#4D7A97; background-color:#4D7A97;
color:#FFFFFF; color:#FFFFFF;
float:left; float:left;
@ -152,7 +152,7 @@ button {
overflow:hidden; overflow:hidden;
font-size:12px; font-size:12px;
} }
.bottomNav { .bottom-nav {
margin-top:10px; margin-top:10px;
background-color:#4D7A97; background-color:#4D7A97;
color:#FFFFFF; color:#FFFFFF;
@ -165,64 +165,64 @@ button {
overflow:hidden; overflow:hidden;
font-size:12px; font-size:12px;
} }
.subNav { .sub-nav {
background-color:#dee3e9; background-color:#dee3e9;
float:left; float:left;
width:100%; width:100%;
overflow:hidden; overflow:hidden;
font-size:12px; font-size:12px;
} }
.subNav div { .sub-nav div {
clear:left; clear:left;
float:left; float:left;
padding:0 0 5px 6px; padding:0 0 5px 6px;
text-transform:uppercase; text-transform:uppercase;
} }
.subNav .navList { .sub-nav .nav-list {
padding-top:5px; padding-top:5px;
} }
ul.navList, ul.subNavList { ul.nav-list, ul.sub-nav-list {
float:left; float:left;
margin:0 25px 0 0; margin:0 25px 0 0;
padding:0; padding:0;
} }
ul.navList li{ ul.nav-list li{
list-style:none; list-style:none;
float:left; float:left;
padding: 5px 6px; padding: 5px 6px;
text-transform:uppercase; text-transform:uppercase;
} }
.subNav .navListSearch { .sub-nav .nav-list-search {
float:right; float:right;
margin:0 0 0 0; margin:0 0 0 0;
padding:5px 6px; padding:5px 6px;
clear:none; clear:none;
} }
.navListSearch label { .nav-list-search label {
position:relative; position:relative;
right:-16px; right:-16px;
} }
ul.subNavList li { ul.sub-nav-list li {
list-style:none; list-style:none;
float:left; float:left;
padding-top:10px; padding-top:10px;
} }
.topNav a:link, .topNav a:active, .topNav a:visited, .bottomNav a:link, .bottomNav a:active, .bottomNav a:visited { .top-nav a:link, .top-nav a:active, .top-nav a:visited, .bottom-nav a:link, .bottom-nav a:active, .bottom-nav a:visited {
color:#FFFFFF; color:#FFFFFF;
text-decoration:none; text-decoration:none;
text-transform:uppercase; text-transform:uppercase;
} }
.topNav a:hover, .bottomNav a:hover { .top-nav a:hover, .bottom-nav a:hover {
text-decoration:none; text-decoration:none;
color:#bb7a2a; color:#bb7a2a;
text-transform:uppercase; text-transform:uppercase;
} }
.navBarCell1Rev { .nav-bar-cell1-rev {
background-color:#F8981D; background-color:#F8981D;
color:#253441; color:#253441;
margin: auto 5px; margin: auto 5px;
} }
.skipNav { .skip-nav {
position:absolute; position:absolute;
top:auto; top:auto;
left:-9999px; left:-9999px;
@ -232,7 +232,7 @@ ul.subNavList li {
* Hide navigation links and search box in print layout * Hide navigation links and search box in print layout
*/ */
@media print { @media print {
ul.navList, div.subNav { ul.nav-list, div.sub-nav {
display:none; display:none;
} }
} }
@ -243,7 +243,7 @@ ul.subNavList li {
color:#2c4557; color:#2c4557;
margin:10px 0; margin:10px 0;
} }
.subTitle { .sub-title {
margin:5px 0 0 0; margin:5px 0 0 0;
} }
.header ul { .header ul {
@ -260,14 +260,14 @@ ul.subNavList li {
body.class-declaration .summary h2, body.class-declaration .summary h2,
body.class-declaration .details h2, body.class-declaration .details h2,
body.class-use h2, body.class-use h2,
body.module-declaration .blockList h2 { body.module-declaration .block-list h2 {
font-style: italic; font-style: italic;
padding:0; padding:0;
margin:15px 0; margin:15px 0;
} }
body.class-declaration .summary h3, body.class-declaration .summary h3,
body.class-declaration .details h3, body.class-declaration .details h3,
body.class-declaration .summary .inheritedList h2 { body.class-declaration .summary .inherited-list h2 {
background-color:#dee3e9; background-color:#dee3e9;
border:1px solid #d0d9e0; border:1px solid #d0d9e0;
margin:0 0 6px -8px; margin:0 0 6px -8px;
@ -293,13 +293,13 @@ dl.notes > dd {
font-size:14px; font-size:14px;
font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif; font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif;
} }
dl.nameValue > dt { dl.name-value > dt {
margin-left:1px; margin-left:1px;
font-size:1.1em; font-size:1.1em;
display:inline; display:inline;
font-weight:bold; font-weight:bold;
} }
dl.nameValue > dd { dl.name-value > dd {
margin:0 0 0 1px; margin:0 0 0 1px;
font-size:1.1em; font-size:1.1em;
display:inline; display:inline;
@ -321,11 +321,11 @@ div.inheritance {
div.inheritance div.inheritance { div.inheritance div.inheritance {
margin-left:2em; margin-left:2em;
} }
ul.blockList { ul.block-list {
margin:10px 0 10px 0; margin:10px 0 10px 0;
padding:0; padding:0;
} }
ul.blockList li.blockList { ul.block-list li.block-list {
list-style:none; list-style:none;
margin-bottom:15px; margin-bottom:15px;
line-height:1.4; line-height:1.4;
@ -337,22 +337,22 @@ table tr td dl, table tr td dl dt, table tr td dl dd {
/* /*
* Styles for tables. * Styles for tables.
*/ */
.overviewSummary table, .memberSummary table, .typeSummary table, .useSummary table, .constantsSummary table, .deprecatedSummary table, .overview-summary table, .member-summary table, .type-summary table, .use-summary table, .constants-summary table, .deprecated-summary table,
.requiresSummary table, .packagesSummary table, .providesSummary table, .usesSummary table, .systemPropertiesSummary table { .requires-summary table, .packages-summary table, .provides-summary table, .uses-summary table, .system-properties-summary table {
width:100%; width:100%;
border-spacing:0; border-spacing:0;
border-left:1px solid #EEE; border-left:1px solid #EEE;
border-right:1px solid #EEE; border-right:1px solid #EEE;
border-bottom:1px solid #EEE; border-bottom:1px solid #EEE;
} }
.overviewSummary table, .memberSummary table, .requiresSummary table, .packagesSummary table, .overview-summary table, .member-summary table, .requires-summary table, .packages-summary table,
.providesSummary table, .usesSummary table, .systemPropertiesSummary table { .provides-summary table, .uses-summary table, .system-properties-summary table {
padding:0px; padding:0px;
} }
.overviewSummary caption, .memberSummary caption, .typeSummary caption, .overview-summary caption, .member-summary caption, .type-summary caption,
.useSummary caption, .constantsSummary caption, .deprecatedSummary caption, .use-summary caption, .constants-summary caption, .deprecated-summary caption,
.requiresSummary caption, .packagesSummary caption, .providesSummary caption, .requires-summary caption, .packages-summary caption, .provides-summary caption,
.usesSummary caption, .systemPropertiesSummary caption { .uses-summary caption, .system-properties-summary caption {
position:relative; position:relative;
text-align:left; text-align:left;
background-repeat:no-repeat; background-repeat:no-repeat;
@ -366,32 +366,32 @@ table tr td dl, table tr td dl dt, table tr td dl dd {
margin:0px; margin:0px;
white-space:pre; white-space:pre;
} }
.constantsSummary caption a:link, .constantsSummary caption a:visited, .constants-summary caption a:link, .constants-summary caption a:visited,
.useSummary caption a:link, .useSummary caption a:visited { .use-summary caption a:link, .use-summary caption a:visited {
color:#1f389c; color:#1f389c;
} }
.overviewSummary caption a:link, .memberSummary caption a:link, .typeSummary caption a:link, .overview-summary caption a:link, .member-summary caption a:link, .type-summary caption a:link,
.deprecatedSummary caption a:link, .deprecated-summary caption a:link,
.requiresSummary caption a:link, .packagesSummary caption a:link, .providesSummary caption a:link, .requires-summary caption a:link, .packages-summary caption a:link, .provides-summary caption a:link,
.usesSummary caption a:link, .uses-summary caption a:link,
.overviewSummary caption a:hover, .memberSummary caption a:hover, .typeSummary caption a:hover, .overview-summary caption a:hover, .member-summary caption a:hover, .type-summary caption a:hover,
.useSummary caption a:hover, .constantsSummary caption a:hover, .deprecatedSummary caption a:hover, .use-summary caption a:hover, .constants-summary caption a:hover, .deprecated-summary caption a:hover,
.requiresSummary caption a:hover, .packagesSummary caption a:hover, .providesSummary caption a:hover, .requires-summary caption a:hover, .packages-summary caption a:hover, .provides-summary caption a:hover,
.usesSummary caption a:hover, .uses-summary caption a:hover,
.overviewSummary caption a:active, .memberSummary caption a:active, .typeSummary caption a:active, .overview-summary caption a:active, .member-summary caption a:active, .type-summary caption a:active,
.useSummary caption a:active, .constantsSummary caption a:active, .deprecatedSummary caption a:active, .use-summary caption a:active, .constants-summary caption a:active, .deprecated-summary caption a:active,
.requiresSummary caption a:active, .packagesSummary caption a:active, .providesSummary caption a:active, .requires-summary caption a:active, .packages-summary caption a:active, .provides-summary caption a:active,
.usesSummary caption a:active, .uses-summary caption a:active,
.overviewSummary caption a:visited, .memberSummary caption a:visited, .typeSummary caption a:visited, .overview-summary caption a:visited, .member-summary caption a:visited, .type-summary caption a:visited,
.deprecatedSummary caption a:visited, .deprecated-summary caption a:visited,
.requiresSummary caption a:visited, .packagesSummary caption a:visited, .providesSummary caption a:visited, .requires-summary caption a:visited, .packages-summary caption a:visited, .provides-summary caption a:visited,
.usesSummary caption a:visited { .uses-summary caption a:visited {
color:#FFFFFF; color:#FFFFFF;
} }
.overviewSummary caption span, .memberSummary caption span, .typeSummary caption span, .overview-summary caption span, .member-summary caption span, .type-summary caption span,
.useSummary caption span, .constantsSummary caption span, .deprecatedSummary caption span, .use-summary caption span, .constants-summary caption span, .deprecated-summary caption span,
.requiresSummary caption span, .packagesSummary caption span, .providesSummary caption span, .requires-summary caption span, .packages-summary caption span, .provides-summary caption span,
.usesSummary caption span, .systemPropertiesSummary caption span { .uses-summary caption span, .system-properties-summary caption span {
white-space:nowrap; white-space:nowrap;
padding-top:5px; padding-top:5px;
padding-left:12px; padding-left:12px;
@ -403,102 +403,102 @@ table tr td dl, table tr td dl dt, table tr td dl dd {
border: none; border: none;
height:16px; height:16px;
} }
.overviewSummary .tabEnd, .memberSummary .tabEnd, .typeSummary .tabEnd, .overview-summary .tab-end, .member-summary .tab-end, .type-summary .tab-end,
.useSummary .tabEnd, .constantsSummary .tabEnd, .deprecatedSummary .tabEnd, .use-summary .tab-end, .constants-summary .tab-end, .deprecated-summary .tab-end,
.requiresSummary .tabEnd, .packagesSummary .tabEnd, .providesSummary .tabEnd, .usesSummary .tabEnd { .requires-summary .tab-end, .packages-summary .tab-end, .provides-summary .tab-end, .uses-summary .tab-end {
display:none; display:none;
width:5px; width:5px;
position:relative; position:relative;
float:left; float:left;
background-color:#F8981D; background-color:#F8981D;
} }
.overviewSummary [role=tablist] button, .memberSummary [role=tablist] button, .overview-summary [role=tablist] button, .member-summary [role=tablist] button,
.typeSummary [role=tablist] button, .packagesSummary [role=tablist] button { .type-summary [role=tablist] button, .packages-summary [role=tablist] button {
border: none; border: none;
cursor: pointer; cursor: pointer;
padding: 5px 12px 7px 12px; padding: 5px 12px 7px 12px;
font-weight: bold; font-weight: bold;
margin-right: 3px; margin-right: 3px;
} }
.overviewSummary [role=tablist] .activeTableTab, .memberSummary [role=tablist] .activeTableTab, .overview-summary [role=tablist] .active-table-tab, .member-summary [role=tablist] .active-table-tab,
.typeSummary [role=tablist] .activeTableTab, .packagesSummary [role=tablist] .activeTableTab { .type-summary [role=tablist] .active-table-tab, .packages-summary [role=tablist] .active-table-tab {
background: #F8981D; background: #F8981D;
color: #253441; color: #253441;
} }
.overviewSummary [role=tablist] .tableTab, .memberSummary [role=tablist] .tableTab, .overview-summary [role=tablist] .table-tab, .member-summary [role=tablist] .table-tab,
.typeSummary [role=tablist] .tableTab, .packagesSummary [role=tablist] .tableTab { .type-summary [role=tablist] .table-tab, .packages-summary [role=tablist] .table-tab {
background: #4D7A97; background: #4D7A97;
color: #FFFFFF; color: #FFFFFF;
} }
.rowColor th, .altColor th { .row-color th, .alt-color th {
font-weight:normal; font-weight:normal;
} }
.overviewSummary td, .memberSummary td, .typeSummary td, .overview-summary td, .member-summary td, .type-summary td,
.useSummary td, .constantsSummary td, .deprecatedSummary td, .use-summary td, .constants-summary td, .deprecated-summary td,
.requiresSummary td, .packagesSummary td, .providesSummary td, .requires-summary td, .packages-summary td, .provides-summary td,
.usesSummary td, .systemPropertiesSummary td { .uses-summary td, .system-properties-summary td {
text-align:left; text-align:left;
padding:0px 0px 12px 10px; padding:0px 0px 12px 10px;
} }
th.colFirst, th.colSecond, th.colLast, th.colConstructorName, th.colDeprecatedItemName, .useSummary th, th.col-first, th.col-second, th.col-last, th.col-constructor-name, th.col-deprecated-item-name, .use-summary th,
.constantsSummary th, .packagesSummary th, td.colFirst, td.colSecond, td.colLast, .useSummary td, .constants-summary th, .packages-summary th, td.col-first, td.col-second, td.col-last, .use-summary td,
.constantsSummary td, .systemPropertiesSummary th { .constants-summary td, .system-properties-summary th {
vertical-align:top; vertical-align:top;
padding-right:0px; padding-right:0px;
padding-top:8px; padding-top:8px;
padding-bottom:3px; padding-bottom:3px;
} }
th.colFirst, th.colSecond, th.colLast, th.colConstructorName, th.colDeprecatedItemName, .constantsSummary th, th.col-first, th.col-second, th.col-last, th.col-constructor-name, th.col-deprecated-item-name, .constants-summary th,
.packagesSummary th { .packages-summary th {
background:#dee3e9; background:#dee3e9;
text-align:left; text-align:left;
padding:8px 3px 3px 7px; padding:8px 3px 3px 7px;
} }
td.colFirst, th.colFirst { td.col-first, th.col-first {
font-size:13px; font-size:13px;
} }
td.colSecond, th.colSecond, td.colLast, th.colConstructorName, th.colDeprecatedItemName, th.colLast { td.col-second, th.col-second, td.col-last, th.col-constructor-name, th.col-deprecated-item-name, th.col-last {
font-size:13px; font-size:13px;
} }
.constantsSummary th, .packagesSummary th { .constants-summary th, .packages-summary th {
font-size:13px; font-size:13px;
} }
.providesSummary th.colFirst, .providesSummary th.colLast, .providesSummary td.colFirst, .provides-summary th.col-first, .provides-summary th.col-last, .provides-summary td.col-first,
.providesSummary td.colLast { .provides-summary td.col-last {
white-space:normal; white-space:normal;
font-size:13px; font-size:13px;
} }
.overviewSummary td.colFirst, .overviewSummary th.colFirst, .overview-summary td.col-first, .overview-summary th.col-first,
.requiresSummary td.colFirst, .requiresSummary th.colFirst, .requires-summary td.col-first, .requires-summary th.col-first,
.packagesSummary td.colFirst, .packagesSummary td.colSecond, .packagesSummary th.colFirst, .packagesSummary th, .packages-summary td.col-first, .packages-summary td.col-second, .packages-summary th.col-first, .packages-summary th,
.usesSummary td.colFirst, .usesSummary th.colFirst, .uses-summary td.col-first, .uses-summary th.col-first,
.providesSummary td.colFirst, .providesSummary th.colFirst, .provides-summary td.col-first, .provides-summary th.col-first,
.memberSummary td.colFirst, .memberSummary th.colFirst, .member-summary td.col-first, .member-summary th.col-first,
.memberSummary td.colSecond, .memberSummary th.colSecond, .memberSummary th.colConstructorName, .member-summary td.col-second, .member-summary th.col-second, .member-summary th.col-constructor-name,
.typeSummary td.colFirst, .typeSummary th.colFirst { .type-summary td.col-first, .type-summary th.col-first {
vertical-align:top; vertical-align:top;
} }
.packagesSummary th.colLast, .packagesSummary td.colLast { .packages-summary th.col-last, .packages-summary td.col-last {
white-space:normal; white-space:normal;
} }
td.colFirst a:link, td.colFirst a:visited, td.col-first a:link, td.col-first a:visited,
td.colSecond a:link, td.colSecond a:visited, td.col-second a:link, td.col-second a:visited,
th.colFirst a:link, th.colFirst a:visited, th.col-first a:link, th.col-first a:visited,
th.colSecond a:link, th.colSecond a:visited, th.col-second a:link, th.col-second a:visited,
th.colConstructorName a:link, th.colConstructorName a:visited, th.col-constructor-name a:link, th.col-constructor-name a:visited,
th.colDeprecatedItemName a:link, th.colDeprecatedItemName a:visited, th.col-deprecated-item-name a:link, th.col-deprecated-item-name a:visited,
.constantValuesContainer td a:link, .constantValuesContainer td a:visited, .constant-values-container td a:link, .constant-values-container td a:visited,
.allClassesContainer td a:link, .allClassesContainer td a:visited, .all-classes-container td a:link, .all-classes-container td a:visited,
.allPackagesContainer td a:link, .allPackagesContainer td a:visited { .all-packages-container td a:link, .all-packages-container td a:visited {
font-weight:bold; font-weight:bold;
} }
.tableSubHeadingColor { .table-sub-heading-color {
background-color:#EEEEFF; background-color:#EEEEFF;
} }
.altColor, .altColor th { .alt-color, .alt-color th {
background-color:#FFFFFF; background-color:#FFFFFF;
} }
.rowColor, .rowColor th { .row-color, .row-color th {
background-color:#EEEEEF; background-color:#EEEEEF;
} }
/* /*
@ -507,7 +507,7 @@ th.colDeprecatedItemName a:link, th.colDeprecatedItemName a:visited,
.description pre { .description pre {
margin-top:0; margin-top:0;
} }
.deprecatedContent { .deprecated-content {
margin:0; margin:0;
padding:10px 0; padding:10px 0;
} }
@ -515,35 +515,35 @@ div.block {
font-size:14px; font-size:14px;
font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif; font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif;
} }
td.colLast div { td.col-last div {
padding-top:0px; padding-top:0px;
} }
td.colLast a { td.col-last a {
padding-bottom:3px; padding-bottom:3px;
} }
div.memberSignature { div.member-signature {
font-family:'DejaVu Sans Mono', monospace; font-family:'DejaVu Sans Mono', monospace;
font-size:14px; font-size:14px;
margin:14px 0; margin:14px 0;
white-space: pre-wrap; white-space: pre-wrap;
} }
div.memberSignature span.annotations { div.member-signature span.annotations {
white-space: pre-wrap; white-space: pre-wrap;
} }
div.memberSignature span.typeParametersLong, div.member-signature span.type-parameters-long,
div.memberSignature span.arguments, div.member-signature span.arguments,
div.memberSignature span.exceptions { div.member-signature span.exceptions {
display: inline-block; display: inline-block;
vertical-align: top; vertical-align: top;
white-space: pre; white-space: pre;
} }
div.memberSignature span.typeParameters { div.member-signature span.type-parameters {
white-space: normal; white-space: normal;
} }
/* /*
* Styles for formatting effect. * Styles for formatting effect.
*/ */
.sourceLineNo { .source-line-no {
color:green; color:green;
padding:0 30px 0 0; padding:0 30px 0 0;
} }
@ -557,15 +557,15 @@ h1.hidden {
margin:0 10px 5px 0; margin:0 10px 5px 0;
color:#474747; color:#474747;
} }
.deprecatedLabel, .descfrmTypeLabel, .implementationLabel, .memberNameLabel, .memberNameLink, .deprecated-label, .descfrm-type-label, .implementation-label, .member-name-label, .member-name-link,
.moduleLabelInPackage, .moduleLabelInType, .overrideSpecifyLabel, .packageLabelInType, .module-label-in-package, .module-label-in-type, .override-specify-label, .package-label-in-type,
.packageHierarchyLabel, .typeNameLabel, .typeNameLink, .searchTagLink { .package-hierarchy-label, .type-name-label, .type-name-link, .search-tag-link {
font-weight:bold; font-weight:bold;
} }
.deprecationComment, .emphasizedPhrase, .interfaceName { .deprecation-comment, .emphasized-phrase, .interface-name {
font-style:italic; font-style:italic;
} }
.deprecationBlock { .deprecation-block {
font-size:14px; font-size:14px;
font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif; font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif;
border-style:solid; border-style:solid;
@ -576,8 +576,8 @@ h1.hidden {
margin-right:10px; margin-right:10px;
display:inline-block; display:inline-block;
} }
div.block div.deprecationComment, div.block div.block span.emphasizedPhrase, div.block div.deprecation-comment, div.block div.block span.emphasized-phrase,
div.block div.block span.interfaceName { div.block div.block span.interface-name {
font-style:normal; font-style:normal;
} }
/* /*
@ -596,7 +596,7 @@ main, nav, header, footer, section {
background-color:#4D7A97; background-color:#4D7A97;
color:#FFFFFF; color:#FFFFFF;
} }
.resultItem { .result-item {
font-size:13px; font-size:13px;
} }
.ui-autocomplete { .ui-autocomplete {
@ -616,7 +616,7 @@ ul.ui-autocomplete li {
clear:both; clear:both;
width:100%; width:100%;
} }
.resultHighlight { .result-highlight {
font-weight:bold; font-weight:bold;
} }
#search { #search {
@ -646,44 +646,44 @@ ul.ui-autocomplete li {
.watermark { .watermark {
color:#545454; color:#545454;
} }
.searchTagDescResult { .search-tag-desc-result {
font-style:italic; font-style:italic;
font-size:11px; font-size:11px;
} }
.searchTagHolderResult { .search-tag-holder-result {
font-style:italic; font-style:italic;
font-size:12px; font-size:12px;
} }
.searchTagResult:target { .search-tag-result:target {
background-color:yellow; background-color:yellow;
} }
.moduleGraph span { .module-graph span {
display:none; display:none;
position:absolute; position:absolute;
} }
.moduleGraph:hover span { .module-graph:hover span {
display:block; display:block;
margin: -100px 0 0 100px; margin: -100px 0 0 100px;
z-index: 1; z-index: 1;
} }
.inheritedList { .inherited-list {
margin: 10px 0 10px 0; margin: 10px 0 10px 0;
} }
section.description { section.description {
line-height: 1.4; line-height: 1.4;
} }
.summary section[class$="Summary"], .details section[class$="Details"], .summary section[class$="Summary"], .details section[class$="Details"],
.classUses .detail, .serializedClassDetails { .class-uses .detail, .serialized-class-details {
padding: 0px 20px 5px 10px; padding: 0px 20px 5px 10px;
border: 1px solid #ededed; border: 1px solid #ededed;
background-color: #f8f8f8; background-color: #f8f8f8;
} }
.inheritedList, section[class$="Details"] .detail { .inherited-list, section[class$="Details"] .detail {
padding:0 0 5px 8px; padding:0 0 5px 8px;
background-color:#ffffff; background-color:#ffffff;
border:none; border:none;
} }
.verticalSeparator { .vertical-separator {
padding: 0 5px; padding: 0 5px;
} }
/* /*

6
test/langtools/jdk/javadoc/doclet/AccessSkipNav/AccessSkipNav.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -52,13 +52,13 @@ public class AccessSkipNav extends JavadocTester {
// Top navbar <a href> // Top navbar <a href>
"<a href=\"#skip.navbar.top\" title=\"Skip navigation links\">Skip navigation links</a>", "<a href=\"#skip.navbar.top\" title=\"Skip navigation links\">Skip navigation links</a>",
// Top navbar <span id> // Top navbar <span id>
"<span class=\"skipNav\" id=\"skip.navbar.top\">\n" "<span class=\"skip-nav\" id=\"skip.navbar.top\">\n"
+ "<!-- -->\n" + "<!-- -->\n"
+ "</span>", + "</span>",
// Bottom navbar <a href> // Bottom navbar <a href>
"<a href=\"#skip.navbar.bottom\" title=\"Skip navigation links\">Skip navigation links</a>", "<a href=\"#skip.navbar.bottom\" title=\"Skip navigation links\">Skip navigation links</a>",
// Bottom navbar <span id> // Bottom navbar <span id>
"<span class=\"skipNav\" id=\"skip.navbar.bottom\">\n" "<span class=\"skip-nav\" id=\"skip.navbar.bottom\">\n"
+ "<!-- -->\n" + "<!-- -->\n"
+ "</span>"); + "</span>");
} }

26
test/langtools/jdk/javadoc/doclet/constantValues/TestConstantValuesDriver.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -54,30 +54,30 @@ public class TestConstantValuesDriver extends JavadocTester {
"TEST4PASSES", "TEST4PASSES",
"<code>\"&lt;Hello World&gt;\"</code>", "<code>\"&lt;Hello World&gt;\"</code>",
"<code id=\"TestConstantValues.BYTE_MAX_VALUE\">public&nbsp;static&nbsp;final&nbsp;byte</code></td>\n" + "<code id=\"TestConstantValues.BYTE_MAX_VALUE\">public&nbsp;static&nbsp;final&nbsp;byte</code></td>\n" +
"<th class=\"colSecond\" scope=\"row\"><code><a href=\"TestConstantValues.html#BYTE_MAX_VALUE\">" + "<th class=\"col-second\" scope=\"row\"><code><a href=\"TestConstantValues.html#BYTE_MAX_VALUE\">" +
"BYTE_MAX_VALUE</a></code></th>\n" + "BYTE_MAX_VALUE</a></code></th>\n" +
"<td class=\"colLast\"><code>127</code></td>", "<td class=\"col-last\"><code>127</code></td>",
"<code id=\"TestConstantValues.BYTE_MIN_VALUE\">public&nbsp;static&nbsp;final&nbsp;byte</code></td>\n" + "<code id=\"TestConstantValues.BYTE_MIN_VALUE\">public&nbsp;static&nbsp;final&nbsp;byte</code></td>\n" +
"<th class=\"colSecond\" scope=\"row\"><code><a href=\"TestConstantValues.html#BYTE_MIN_VALUE\">" + "<th class=\"col-second\" scope=\"row\"><code><a href=\"TestConstantValues.html#BYTE_MIN_VALUE\">" +
"BYTE_MIN_VALUE</a></code></th>\n" + "BYTE_MIN_VALUE</a></code></th>\n" +
"<td class=\"colLast\"><code>-127</code></td>", "<td class=\"col-last\"><code>-127</code></td>",
"<code id=\"TestConstantValues.CHAR_MAX_VALUE\">public&nbsp;static&nbsp;final&nbsp;char</code></td>\n" + "<code id=\"TestConstantValues.CHAR_MAX_VALUE\">public&nbsp;static&nbsp;final&nbsp;char</code></td>\n" +
"<th class=\"colSecond\" scope=\"row\"><code><a href=\"TestConstantValues.html#CHAR_MAX_VALUE\">" + "<th class=\"col-second\" scope=\"row\"><code><a href=\"TestConstantValues.html#CHAR_MAX_VALUE\">" +
"CHAR_MAX_VALUE</a></code></th>\n" + "CHAR_MAX_VALUE</a></code></th>\n" +
"<td class=\"colLast\"><code>65535</code></td>", "<td class=\"col-last\"><code>65535</code></td>",
"<code id=\"TestConstantValues.DOUBLE_MAX_VALUE\">public&nbsp;static&nbsp;final&nbsp;double</code></td>", "<code id=\"TestConstantValues.DOUBLE_MAX_VALUE\">public&nbsp;static&nbsp;final&nbsp;double</code></td>",
"<th class=\"colSecond\" scope=\"row\"><code><a href=\"TestConstantValues.html#DOUBLE_MAX_VALUE\">" + "<th class=\"col-second\" scope=\"row\"><code><a href=\"TestConstantValues.html#DOUBLE_MAX_VALUE\">" +
"DOUBLE_MAX_VALUE</a></code></th>\n" + "DOUBLE_MAX_VALUE</a></code></th>\n" +
"<td class=\"colLast\"><code>1.7976931348623157E308</code></td>", "<td class=\"col-last\"><code>1.7976931348623157E308</code></td>",
"<code id=\"TestConstantValues.DOUBLE_MIN_VALUE\">public&nbsp;static&nbsp;final&nbsp;double</code></td>\n" + "<code id=\"TestConstantValues.DOUBLE_MIN_VALUE\">public&nbsp;static&nbsp;final&nbsp;double</code></td>\n" +
"<th class=\"colSecond\" scope=\"row\"><code><a href=\"TestConstantValues.html#DOUBLE_MIN_VALUE\">" + "<th class=\"col-second\" scope=\"row\"><code><a href=\"TestConstantValues.html#DOUBLE_MIN_VALUE\">" +
"DOUBLE_MIN_VALUE</a></code></th>", "DOUBLE_MIN_VALUE</a></code></th>",
"<code id=\"TestConstantValues.GOODBYE\">public&nbsp;static&nbsp;final&nbsp;boolean</code></td>\n" + "<code id=\"TestConstantValues.GOODBYE\">public&nbsp;static&nbsp;final&nbsp;boolean</code></td>\n" +
"<th class=\"colSecond\" scope=\"row\"><code><a href=\"TestConstantValues.html#GOODBYE\">" + "<th class=\"col-second\" scope=\"row\"><code><a href=\"TestConstantValues.html#GOODBYE\">" +
"GOODBYE</a></code></th>", "GOODBYE</a></code></th>",
"<code id=\"TestConstantValues.HELLO\">public&nbsp;static&nbsp;final&nbsp;boolean</code></td>\n" + "<code id=\"TestConstantValues.HELLO\">public&nbsp;static&nbsp;final&nbsp;boolean</code></td>\n" +
"<th class=\"colSecond\" scope=\"row\"><code><a href=\"TestConstantValues.html#HELLO\">HELLO</a></code></th>\n" + "<th class=\"col-second\" scope=\"row\"><code><a href=\"TestConstantValues.html#HELLO\">HELLO</a></code></th>\n" +
"<td class=\"colLast\"><code>true</code></td>" "<td class=\"col-last\"><code>true</code></td>"
); );
} }
} }

64
test/langtools/jdk/javadoc/doclet/testAbstractMethod/TestAbstractMethod.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -49,62 +49,62 @@ public class TestAbstractMethod extends JavadocTester {
checkExit(Exit.OK); checkExit(Exit.OK);
checkOutput("pkg/A.html", true, checkOutput("pkg/A.html", true,
"<td class=\"colFirst\"><code>default void</code></td>", "<td class=\"col-first\"><code>default void</code></td>",
"<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\" " "<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\" "
+ "aria-selected=\"true\" aria-controls=\"memberSummary_tabpanel\" tabindex=\"0\"" + "aria-selected=\"true\" aria-controls=\"member-summary_tabpanel\" tabindex=\"0\""
+ " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"activeTableTab\">All Methods" + " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"active-table-tab\">All Methods"
+ "</button><button role=\"tab\" aria-selected=\"false\"" + "</button><button role=\"tab\" aria-selected=\"false\""
+ " aria-controls=\"memberSummary_tabpanel\" tabindex=\"-1\" " + " aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\" "
+ "onkeydown=\"switchTab(event)\" id=\"t2\" class=\"tableTab\"" + "onkeydown=\"switchTab(event)\" id=\"t2\" class=\"table-tab\""
+ " onclick=\"show(2);\">Instance Methods</button><button role=\"tab\"" + " onclick=\"show(2);\">Instance Methods</button><button role=\"tab\""
+ " aria-selected=\"false\" aria-controls=\"memberSummary_tabpanel\" tabindex=\"-1\"" + " aria-selected=\"false\" aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\""
+ " onkeydown=\"switchTab(event)\" id=\"t3\" class=\"tableTab\" onclick=\"show(4);\">" + " onkeydown=\"switchTab(event)\" id=\"t3\" class=\"table-tab\" onclick=\"show(4);\">"
+ "Abstract Methods</button><button role=\"tab\" aria-selected=\"false\"" + "Abstract Methods</button><button role=\"tab\" aria-selected=\"false\""
+ " aria-controls=\"memberSummary_tabpanel\" tabindex=\"-1\"" + " aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\""
+ " onkeydown=\"switchTab(event)\" id=\"t5\" class=\"tableTab\" onclick=\"show(16);\">" + " onkeydown=\"switchTab(event)\" id=\"t5\" class=\"table-tab\" onclick=\"show(16);\">"
+ "Default Methods</button></div>"); + "Default Methods</button></div>");
checkOutput("pkg/B.html", true, checkOutput("pkg/B.html", true,
"<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\"" "<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
+ " aria-selected=\"true\" aria-controls=\"memberSummary_tabpanel\" tabindex=\"0\"" + " aria-selected=\"true\" aria-controls=\"member-summary_tabpanel\" tabindex=\"0\""
+ " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"activeTableTab\">All Methods" + " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"active-table-tab\">All Methods"
+ "</button><button role=\"tab\" aria-selected=\"false\"" + "</button><button role=\"tab\" aria-selected=\"false\""
+ " aria-controls=\"memberSummary_tabpanel\" tabindex=\"-1\"" + " aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\""
+ " onkeydown=\"switchTab(event)\" id=\"t2\" class=\"tableTab\" onclick=\"show(2);\">" + " onkeydown=\"switchTab(event)\" id=\"t2\" class=\"table-tab\" onclick=\"show(2);\">"
+ "Instance Methods</button><button role=\"tab\" aria-selected=\"false\"" + "Instance Methods</button><button role=\"tab\" aria-selected=\"false\""
+ " aria-controls=\"memberSummary_tabpanel\" tabindex=\"-1\"" + " aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\""
+ " onkeydown=\"switchTab(event)\" id=\"t3\" class=\"tableTab\" onclick=\"show(4);\">" + " onkeydown=\"switchTab(event)\" id=\"t3\" class=\"table-tab\" onclick=\"show(4);\">"
+ "Abstract Methods</button><button role=\"tab\" aria-selected=\"false\"" + "Abstract Methods</button><button role=\"tab\" aria-selected=\"false\""
+ " aria-controls=\"memberSummary_tabpanel\" tabindex=\"-1\"" + " aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\""
+ " onkeydown=\"switchTab(event)\" id=\"t4\" class=\"tableTab\"" + " onkeydown=\"switchTab(event)\" id=\"t4\" class=\"table-tab\""
+ " onclick=\"show(8);\">Concrete Methods</button></div>", + " onclick=\"show(8);\">Concrete Methods</button></div>",
"<td class=\"colFirst\"><code>abstract void</code></td>"); "<td class=\"col-first\"><code>abstract void</code></td>");
checkOutput("pkg/C.html", true, checkOutput("pkg/C.html", true,
"<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\"" "<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
+ " aria-selected=\"true\" aria-controls=\"memberSummary_tabpanel\" tabindex=\"0\"" + " aria-selected=\"true\" aria-controls=\"member-summary_tabpanel\" tabindex=\"0\""
+ " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"activeTableTab\">All Methods" + " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"active-table-tab\">All Methods"
+ "</button><button role=\"tab\" aria-selected=\"false\"" + "</button><button role=\"tab\" aria-selected=\"false\""
+ " aria-controls=\"memberSummary_tabpanel\" tabindex=\"-1\"" + " aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\""
+ " onkeydown=\"switchTab(event)\" id=\"t2\" class=\"tableTab\" onclick=\"show(2);\">" + " onkeydown=\"switchTab(event)\" id=\"t2\" class=\"table-tab\" onclick=\"show(2);\">"
+ "Instance Methods</button><button role=\"tab\" aria-selected=\"false\"" + "Instance Methods</button><button role=\"tab\" aria-selected=\"false\""
+ " aria-controls=\"memberSummary_tabpanel\" tabindex=\"-1\"" + " aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\""
+ " onkeydown=\"switchTab(event)\" id=\"t5\" class=\"tableTab\" onclick=\"show(16);\">" + " onkeydown=\"switchTab(event)\" id=\"t5\" class=\"table-tab\" onclick=\"show(16);\">"
+ "Default Methods</button></div>"); + "Default Methods</button></div>");
checkOutput("pkg/A.html", false, checkOutput("pkg/A.html", false,
"<td class=\"colFirst\"><code>abstract void</code></td>"); "<td class=\"col-first\"><code>abstract void</code></td>");
checkOutput("pkg/B.html", false, checkOutput("pkg/B.html", false,
"<button role=\"tab\" aria-selected=\"false\" aria-controls=\"memberSummary_tabpanel\"" "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"member-summary_tabpanel\""
+ " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t5\" class=\"tableTab\"" + " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t5\" class=\"table-tab\""
+ " onclick=\"show(16);\">Default Methods</button>", + " onclick=\"show(16);\">Default Methods</button>",
"<td class=\"colFirst\"><code>default void</code></td>"); "<td class=\"col-first\"><code>default void</code></td>");
checkOutput("pkg/C.html", false, checkOutput("pkg/C.html", false,
"<button role=\"tab\" aria-selected=\"false\" aria-controls=\"memberSummary_tabpanel\"" "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"member-summary_tabpanel\""
+ " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t3\" class=\"tableTab\"" + " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t3\" class=\"table-tab\""
+ " onclick=\"show(4);\">Abstract Methods</button>" + " onclick=\"show(4);\">Abstract Methods</button>"
+ "<span class=\"tabEnd\">&nbsp;</span>"); + "<span class=\"tab-end\">&nbsp;</span>");
} }
} }

14
test/langtools/jdk/javadoc/doclet/testAnchorNames/TestAnchorNames.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -61,18 +61,18 @@ public class TestAnchorNames extends JavadocTester {
// Test some section markers and links to these markers // Test some section markers and links to these markers
checkOutput("pkg1/RegClass.html", true, checkOutput("pkg1/RegClass.html", true,
"<span class=\"skipNav\" id=\"skip.navbar.top\">", "<span class=\"skip-nav\" id=\"skip.navbar.top\">",
"<a href=\"#skip.navbar.top\" title=\"Skip navigation links\">", "<a href=\"#skip.navbar.top\" title=\"Skip navigation links\">",
"<section class=\"nestedClassSummary\" id=\"nested.class.summary\">\n" "<section class=\"nested-class-summary\" id=\"nested.class.summary\">\n"
+ "<h2>Nested Class Summary</h2>", + "<h2>Nested Class Summary</h2>",
"<a href=\"#nested.class.summary\">", "<a href=\"#nested.class.summary\">",
"<section class=\"methodSummary\" id=\"method.summary\">\n" "<section class=\"method-summary\" id=\"method.summary\">\n"
+ "<h2>Method Summary</h2>", + "<h2>Method Summary</h2>",
"<a href=\"#method.summary\">", "<a href=\"#method.summary\">",
"<section class=\"fieldDetails\" id=\"field.detail\">\n" "<section class=\"field-details\" id=\"field.detail\">\n"
+ "<h2>Field Details</h2>", + "<h2>Field Details</h2>",
"<a href=\"#field.detail\">", "<a href=\"#field.detail\">",
"<section class=\"constructorDetails\" id=\"constructor.detail\">\n" "<section class=\"constructor-details\" id=\"constructor.detail\">\n"
+ "<h2>Constructor Details</h2>", + "<h2>Constructor Details</h2>",
"<a href=\"#constructor.detail\">"); "<a href=\"#constructor.detail\">");
@ -155,7 +155,7 @@ public class TestAnchorNames extends JavadocTester {
// Test serialized form page // Test serialized form page
checkOutput("serialized-form.html", true, checkOutput("serialized-form.html", true,
//This is the marker for the link that appears in the pkg1.RegClass.html page //This is the marker for the link that appears in the pkg1.RegClass.html page
"<section class=\"serializedClassDetails\" id=\"pkg1.RegClass\">"); "<section class=\"serialized-class-details\" id=\"pkg1.RegClass\">");
// Test member name index page // Test member name index page
checkOutput("index-all.html", true, checkOutput("index-all.html", true,

22
test/langtools/jdk/javadoc/doclet/testAnnotationTypes/TestAnnotationTypes.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2004, 2019, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2004, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -57,14 +57,14 @@ public class TestAnnotationTypes extends JavadocTester {
+ "field.detail\">Field</a>&nbsp;|&nbsp;</li>", + "field.detail\">Field</a>&nbsp;|&nbsp;</li>",
"<!-- =========== ANNOTATION TYPE FIELD SUMMARY =========== -->", "<!-- =========== ANNOTATION TYPE FIELD SUMMARY =========== -->",
"<h2>Field Summary</h2>", "<h2>Field Summary</h2>",
"<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\"><a href=\"#DEFAULT_NAME\">DEFAULT_NAME</a></span>" "<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\"><a href=\"#DEFAULT_NAME\">DEFAULT_NAME</a></span>"
+ "</code></th>", + "</code></th>",
"<!-- ============ ANNOTATION TYPE FIELD DETAIL =========== -->", "<!-- ============ ANNOTATION TYPE FIELD DETAIL =========== -->",
"<section class=\"detail\" id=\"DEFAULT_NAME\">\n" "<section class=\"detail\" id=\"DEFAULT_NAME\">\n"
+ "<h3>DEFAULT_NAME</h3>\n" + "<h3>DEFAULT_NAME</h3>\n"
+ "<div class=\"memberSignature\"><span class=\"modifiers\">static final</span>&nbsp;" + "<div class=\"member-signature\"><span class=\"modifiers\">static final</span>&nbsp;"
+ "<span class=\"returnType\">java.lang.String</span>&nbsp;" + "<span class=\"return-type\">java.lang.String</span>&nbsp;"
+ "<span class=\"memberName\">DEFAULT_NAME</span></div>\n"); + "<span class=\"member-name\">DEFAULT_NAME</span></div>\n");
checkOutput("pkg/AnnotationType.html", true, checkOutput("pkg/AnnotationType.html", true,
"<li>Summary:&nbsp;</li>\n" "<li>Summary:&nbsp;</li>\n"
@ -74,18 +74,18 @@ public class TestAnnotationTypes extends JavadocTester {
checkOutput("pkg/AnnotationType.html", true, checkOutput("pkg/AnnotationType.html", true,
"<!-- ============ ANNOTATION TYPE MEMBER DETAIL =========== -->", "<!-- ============ ANNOTATION TYPE MEMBER DETAIL =========== -->",
"<ul class=\"blockList\">", "<ul class=\"block-list\">",
"<li class=\"blockList\">", "<li class=\"block-list\">",
"<section class=\"details\" id=\"annotation.type.element.detail\">", "<section class=\"details\" id=\"annotation.type.element.detail\">",
"<h2>Element Details</h2>", "<h2>Element Details</h2>",
"<!-- -->", "<!-- -->",
"</a>", "</a>",
"<ul class=\"blockList\">", "<ul class=\"block-list\">",
"<li class=\"blockList\">", "<li class=\"block-list\">",
"<section class=\"detail\" id=\"value()\">", "<section class=\"detail\" id=\"value()\">",
"<h3>value</h3>\n", "<h3>value</h3>\n",
"<div class=\"memberSignature\"><span class=\"returnType\">int</span>" "<div class=\"member-signature\"><span class=\"return-type\">int</span>"
+ "&nbsp;<span class=\"memberName\">value</span></div>"); + "&nbsp;<span class=\"member-name\">value</span></div>");
checkOutput("pkg/AnnotationType.html", false, checkOutput("pkg/AnnotationType.html", false,
"<HR>\n\n" "<HR>\n\n"

10
test/langtools/jdk/javadoc/doclet/testClassCrossReferences/TestClassCrossReferences.java
View file

@ -54,16 +54,16 @@ public class TestClassCrossReferences extends JavadocTester {
checkExit(Exit.OK); checkExit(Exit.OK);
checkOutput("C.html", true, checkOutput("C.html", true,
"<a href=\"" + uri + "java/math/package-summary.html\" class=\"externalLink\">" "<a href=\"" + uri + "java/math/package-summary.html\" class=\"external-link\">"
+ "<code>Link to math package</code></a>", + "<code>Link to math package</code></a>",
"<a href=\"" + uri + "javax/swing/text/AbstractDocument.AttributeContext.html\" " "<a href=\"" + uri + "javax/swing/text/AbstractDocument.AttributeContext.html\" "
+ "title=\"class or interface in javax.swing.text\" class=\"externalLink\"><code>Link to AttributeContext innerclass</code></a>", + "title=\"class or interface in javax.swing.text\" class=\"external-link\"><code>Link to AttributeContext innerclass</code></a>",
"<a href=\"" + uri + "java/math/BigDecimal.html\" " "<a href=\"" + uri + "java/math/BigDecimal.html\" "
+ "title=\"class or interface in java.math\" class=\"externalLink\"><code>Link to external class BigDecimal</code></a>", + "title=\"class or interface in java.math\" class=\"external-link\"><code>Link to external class BigDecimal</code></a>",
"<a href=\"" + uri + "java/math/BigInteger.html#gcd(java.math.BigInteger)\" " "<a href=\"" + uri + "java/math/BigInteger.html#gcd(java.math.BigInteger)\" "
+ "title=\"class or interface in java.math\" class=\"externalLink\"><code>Link to external member gcd</code></a>", + "title=\"class or interface in java.math\" class=\"external-link\"><code>Link to external member gcd</code></a>",
"<a href=\"" + uri + "javax/tools/SimpleJavaFileObject.html#uri\" " "<a href=\"" + uri + "javax/tools/SimpleJavaFileObject.html#uri\" "
+ "title=\"class or interface in javax.tools\" class=\"externalLink\"><code>Link to external member URI</code></a>", + "title=\"class or interface in javax.tools\" class=\"external-link\"><code>Link to external member URI</code></a>",
"<dl class=\"notes\">\n" "<dl class=\"notes\">\n"
+ "<dt>Overrides:</dt>\n" + "<dt>Overrides:</dt>\n"
+ "<dd><code>toString</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>\n" + "<dd><code>toString</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>\n"

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

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -53,11 +53,11 @@ public class TestClassLinks extends JavadocTester {
checkOutput("p/C1.html", true, checkOutput("p/C1.html", true,
"<code><a href=\"C2.html\" title=\"class in p\">C2</a></code>", "<code><a href=\"C2.html\" title=\"class in p\">C2</a></code>",
"<code><span class=\"memberNameLink\"><a href=\"#%3Cinit%3E()\">C1</a></span>()</code>"); "<code><span class=\"member-name-link\"><a href=\"#%3Cinit%3E()\">C1</a></span>()</code>");
checkOutput("p/C2.html", true, checkOutput("p/C2.html", true,
"<code><a href=\"C3.html\" title=\"class in p\">C3</a></code>", "<code><a href=\"C3.html\" title=\"class in p\">C3</a></code>",
"<code><span class=\"memberNameLink\"><a href=\"#%3Cinit%3E()\">C2</a></span>()</code>"); "<code><span class=\"member-name-link\"><a href=\"#%3Cinit%3E()\">C2</a></span>()</code>");
checkOutput("p/C3.html", true, checkOutput("p/C3.html", true,
"<code><a href=\"I1.html\" title=\"interface in p\">I1</a></code>, " "<code><a href=\"I1.html\" title=\"interface in p\">I1</a></code>, "
@ -65,7 +65,7 @@ public class TestClassLinks extends JavadocTester {
+ "<code><a href=\"I2.html\" title=\"interface in p\">I2</a></code>, " + "<code><a href=\"I2.html\" title=\"interface in p\">I2</a></code>, "
+ "<code><a href=\"IT1.html\" title=\"interface in p\">IT1</a>&lt;T&gt;</code>, " + "<code><a href=\"IT1.html\" title=\"interface in p\">IT1</a>&lt;T&gt;</code>, "
+ "<code><a href=\"IT2.html\" title=\"interface in p\">IT2</a>&lt;java.lang.String&gt;</code>", + "<code><a href=\"IT2.html\" title=\"interface in p\">IT2</a>&lt;java.lang.String&gt;</code>",
"<code><span class=\"memberNameLink\"><a href=\"#%3Cinit%3E()\">C3</a></span>()</code>"); "<code><span class=\"member-name-link\"><a href=\"#%3Cinit%3E()\">C3</a></span>()</code>");
checkOutput("p/I1.html", true, checkOutput("p/I1.html", true,
"<code><a href=\"C3.html\" title=\"class in p\">C3</a></code>", "<code><a href=\"C3.html\" title=\"class in p\">C3</a></code>",

10
test/langtools/jdk/javadoc/doclet/testClassTree/TestClassTree.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2004, 2019, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2004, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -53,11 +53,11 @@ public class TestClassTree extends JavadocTester {
checkOutput("pkg/package-tree.html", true, checkOutput("pkg/package-tree.html", true,
"<ul>\n" "<ul>\n"
+ "<li class=\"circle\">pkg.<a href=\"ParentClass.html\" " + "<li class=\"circle\">pkg.<a href=\"ParentClass.html\" "
+ "title=\"class in pkg\"><span class=\"typeNameLink\">ParentClass</span></a>", + "title=\"class in pkg\"><span class=\"type-name-link\">ParentClass</span></a>",
"<h2 title=\"Annotation Type Hierarchy\">Annotation Type Hierarchy</h2>\n" "<h2 title=\"Annotation Type Hierarchy\">Annotation Type Hierarchy</h2>\n"
+ "<ul>\n" + "<ul>\n"
+ "<li class=\"circle\">pkg.<a href=\"AnnotationType.html\" " + "<li class=\"circle\">pkg.<a href=\"AnnotationType.html\" "
+ "title=\"annotation in pkg\"><span class=\"typeNameLink\">AnnotationType</span></a> " + "title=\"annotation in pkg\"><span class=\"type-name-link\">AnnotationType</span></a> "
+ "(implements java.lang.annotation.Annotation)</li>\n" + "(implements java.lang.annotation.Annotation)</li>\n"
+ "</ul>", + "</ul>",
"<h2 title=\"Enum Hierarchy\">Enum Hierarchy</h2>\n" "<h2 title=\"Enum Hierarchy\">Enum Hierarchy</h2>\n"
@ -67,7 +67,7 @@ public class TestClassTree extends JavadocTester {
+ "<li class=\"circle\">java.lang.Enum&lt;E&gt; (implements java.lang.Comparable&lt;T&gt;, java.lang.constant.Constable, java.io.Serializable)\n" + "<li class=\"circle\">java.lang.Enum&lt;E&gt; (implements java.lang.Comparable&lt;T&gt;, java.lang.constant.Constable, java.io.Serializable)\n"
+ "<ul>\n" + "<ul>\n"
+ "<li class=\"circle\">pkg.<a href=\"Coin.html\" " + "<li class=\"circle\">pkg.<a href=\"Coin.html\" "
+ "title=\"enum in pkg\"><span class=\"typeNameLink\">Coin</span></a></li>\n" + "title=\"enum in pkg\"><span class=\"type-name-link\">Coin</span></a></li>\n"
+ "</ul>\n" + "</ul>\n"
+ "</li>\n" + "</li>\n"
+ "</ul>\n" + "</ul>\n"
@ -76,6 +76,6 @@ public class TestClassTree extends JavadocTester {
checkOutput("pkg/package-tree.html", false, checkOutput("pkg/package-tree.html", false,
"<li class=\"circle\">class pkg.<a href=\".ParentClass.html\" " "<li class=\"circle\">class pkg.<a href=\".ParentClass.html\" "
+ "title=\"class in pkg\"><span class=\"typeNameLink\">ParentClass</span></a></li>"); + "title=\"class in pkg\"><span class=\"type-name-link\">ParentClass</span></a></li>");
} }
} }

222
test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -79,125 +79,125 @@ public class TestDeprecatedDocs extends JavadocTester {
checkOutput("pkg/DeprecatedClassByAnnotation.html", true, checkOutput("pkg/DeprecatedClassByAnnotation.html", true,
"<pre>@Deprecated\n" "<pre>@Deprecated\n"
+ "public class <span class=\"typeNameLabel\">DeprecatedClassByAnnotation</span>\n" + "public class <span class=\"type-name-label\">DeprecatedClassByAnnotation</span>\n"
+ "extends java.lang.Object</pre>", + "extends java.lang.Object</pre>",
"<div class=\"memberSignature\"><span class=\"annotations\">@Deprecated(forRemoval=true)\n" "<div class=\"member-signature\"><span class=\"annotations\">@Deprecated(forRemoval=true)\n"
+ "</span><span class=\"modifiers\">public</span>&nbsp;<span class=\"returnType\">int</span>" + "</span><span class=\"modifiers\">public</span>&nbsp;<span class=\"return-type\">int</span>"
+ "&nbsp;<span class=\"memberName\">field</span></div>\n" + "&nbsp;<span class=\"member-name\">field</span></div>\n"
+ "<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated, for removal: This API element is subject to removal in a future version.</span></div>", + "<div class=\"deprecation-block\"><span class=\"deprecated-label\">Deprecated, for removal: This API element is subject to removal in a future version.</span></div>",
"<div class=\"memberSignature\"><span class=\"annotations\">@Deprecated(forRemoval=true)\n" "<div class=\"member-signature\"><span class=\"annotations\">@Deprecated(forRemoval=true)\n"
+ "</span><span class=\"modifiers\">public</span>&nbsp;<span class=\"memberName\">DeprecatedClassByAnnotation</span>()</div>\n" + "</span><span class=\"modifiers\">public</span>&nbsp;<span class=\"member-name\">DeprecatedClassByAnnotation</span>()</div>\n"
+ "<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated, for removal: This API element is subject to removal in a future version.</span></div>", + "<div class=\"deprecation-block\"><span class=\"deprecated-label\">Deprecated, for removal: This API element is subject to removal in a future version.</span></div>",
"<div class=\"memberSignature\"><span class=\"annotations\">@Deprecated\n" "<div class=\"member-signature\"><span class=\"annotations\">@Deprecated\n"
+ "</span><span class=\"modifiers\">public</span>&nbsp;<span class=\"returnType\">" + "</span><span class=\"modifiers\">public</span>&nbsp;<span class=\"return-type\">"
+ "void</span>&nbsp;<span class=\"memberName\">method</span>()</div>\n" + "void</span>&nbsp;<span class=\"member-name\">method</span>()</div>\n"
+ "<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated.</span></div>"); + "<div class=\"deprecation-block\"><span class=\"deprecated-label\">Deprecated.</span></div>");
checkOutput("pkg/TestAnnotationType.html", true, checkOutput("pkg/TestAnnotationType.html", true,
"<hr>\n" "<hr>\n"
+ "<pre>@Deprecated(forRemoval=true)\n" + "<pre>@Deprecated(forRemoval=true)\n"
+ "@Documented\n" + "@Documented\n"
+ "public @interface <span class=\"memberNameLabel\">TestAnnotationType</span></pre>\n" + "public @interface <span class=\"member-name-label\">TestAnnotationType</span></pre>\n"
+ "<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated, for removal: This API element is subject to removal in a future version.</span>\n" + "<div class=\"deprecation-block\"><span class=\"deprecated-label\">Deprecated, for removal: This API element is subject to removal in a future version.</span>\n"
+ "<div class=\"deprecationComment\">annotation_test1 passes.</div>\n" + "<div class=\"deprecation-comment\">annotation_test1 passes.</div>\n"
+ "</div>", + "</div>",
"<div class=\"memberSignature\"><span class=\"annotations\">@Deprecated(forRemoval=true)\n" + "<div class=\"member-signature\"><span class=\"annotations\">@Deprecated(forRemoval=true)\n" +
"</span><span class=\"modifiers\">static final</span>&nbsp;<span class=\"returnType\">int</span>&nbsp;<span class=\"memberName\">field</span></div>\n" "</span><span class=\"modifiers\">static final</span>&nbsp;<span class=\"return-type\">int</span>&nbsp;<span class=\"member-name\">field</span></div>\n"
+ "<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated, for removal: This " + "<div class=\"deprecation-block\"><span class=\"deprecated-label\">Deprecated, for removal: This "
+ "API element is subject to removal in a future version.</span>\n" + "API element is subject to removal in a future version.</span>\n"
+ "<div class=\"deprecationComment\">annotation_test4 passes.</div>\n" + "<div class=\"deprecation-comment\">annotation_test4 passes.</div>\n"
+ "</div>", + "</div>",
"<div class=\"memberSignature\"><span class=\"annotations\">@Deprecated(forRemoval=true)\n" "<div class=\"member-signature\"><span class=\"annotations\">@Deprecated(forRemoval=true)\n"
+ "</span><span class=\"returnType\">int</span>&nbsp;<span class=\"memberName\">required</span></div>\n" + "</span><span class=\"return-type\">int</span>&nbsp;<span class=\"member-name\">required</span></div>\n"
+ "<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated, for removal: This API element is subject to removal in a future version.</span>\n" + "<div class=\"deprecation-block\"><span class=\"deprecated-label\">Deprecated, for removal: This API element is subject to removal in a future version.</span>\n"
+ "<div class=\"deprecationComment\">annotation_test3 passes.</div>\n" + "<div class=\"deprecation-comment\">annotation_test3 passes.</div>\n"
+ "</div>", + "</div>",
"<div class=\"memberSignature\"><span class=\"returnType\">java.lang.String</span>" "<div class=\"member-signature\"><span class=\"return-type\">java.lang.String</span>"
+ "&nbsp;<span class=\"memberName\">optional</span></div>\n" + "&nbsp;<span class=\"member-name\">optional</span></div>\n"
+ "<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated.</span>\n" + "<div class=\"deprecation-block\"><span class=\"deprecated-label\">Deprecated.</span>\n"
+ "<div class=\"deprecationComment\">annotation_test2 passes.</div>\n" + "<div class=\"deprecation-comment\">annotation_test2 passes.</div>\n"
+ "</div>"); + "</div>");
checkOutput("pkg/TestClass.html", true, checkOutput("pkg/TestClass.html", true,
"<hr>\n" "<hr>\n"
+ "<pre>@Deprecated(forRemoval=true)\n" + "<pre>@Deprecated(forRemoval=true)\n"
+ "public class <span class=\"typeNameLabel\">TestClass</span>\n" + "public class <span class=\"type-name-label\">TestClass</span>\n"
+ "extends java.lang.Object</pre>\n" + "extends java.lang.Object</pre>\n"
+ "<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated, for removal: This API element is subject to removal in a future version.</span>\n" + "<div class=\"deprecation-block\"><span class=\"deprecated-label\">Deprecated, for removal: This API element is subject to removal in a future version.</span>\n"
+ "<div class=\"deprecationComment\">class_test1 passes.</div>\n" + "<div class=\"deprecation-comment\">class_test1 passes.</div>\n"
+ "</div>", + "</div>",
"<div class=\"memberSignature\"><span class=\"annotations\">@Deprecated(forRemoval=true)\n" "<div class=\"member-signature\"><span class=\"annotations\">@Deprecated(forRemoval=true)\n"
+ "</span><span class=\"modifiers\">public</span>&nbsp;<span class=\"memberName\">TestClass</span>()</div>\n" + "</span><span class=\"modifiers\">public</span>&nbsp;<span class=\"member-name\">TestClass</span>()</div>\n"
+ "<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated, for removal: This API element is subject to removal in a future version.</span>\n" + "<div class=\"deprecation-block\"><span class=\"deprecated-label\">Deprecated, for removal: This API element is subject to removal in a future version.</span>\n"
+ "<div class=\"deprecationComment\">class_test3 passes. This is the second sentence of deprecated description for a constructor.</div>\n" + "<div class=\"deprecation-comment\">class_test3 passes. This is the second sentence of deprecated description for a constructor.</div>\n"
+ "</div>", + "</div>",
"<td class=\"colLast\">\n" "<td class=\"col-last\">\n"
+ "<div class=\"block\"><span class=\"deprecatedLabel\">Deprecated.</span>\n" + "<div class=\"block\"><span class=\"deprecated-label\">Deprecated.</span>\n"
+ "<div class=\"deprecationComment\">class_test2 passes.</div>\n" + "<div class=\"deprecation-comment\">class_test2 passes.</div>\n"
+ "</div>\n" + "</div>\n"
+ "</td>", + "</td>",
"<td class=\"colLast\">\n" "<td class=\"col-last\">\n"
+ "<div class=\"block\"><span class=\"deprecatedLabel\">Deprecated, for removal: This API element is subject to removal in a future version.</span>\n" + "<div class=\"block\"><span class=\"deprecated-label\">Deprecated, for removal: This API element is subject to removal in a future version.</span>\n"
+ "<div class=\"deprecationComment\">class_test3 passes.</div>\n" + "<div class=\"deprecation-comment\">class_test3 passes.</div>\n"
+ "</div>\n" + "</div>\n"
+ "</td>", + "</td>",
"<td class=\"colLast\">\n" "<td class=\"col-last\">\n"
+ "<div class=\"block\"><span class=\"deprecatedLabel\">Deprecated.</span>\n" + "<div class=\"block\"><span class=\"deprecated-label\">Deprecated.</span>\n"
+ "<div class=\"deprecationComment\">class_test4 passes.</div>\n" + "<div class=\"deprecation-comment\">class_test4 passes.</div>\n"
+ "</div>\n" + "</div>\n"
+ "</td>"); + "</td>");
checkOutput("pkg/TestClass.html", false, checkOutput("pkg/TestClass.html", false,
"<div class=\"deprecationComment\">class_test2 passes. This is the second sentence of deprecated description for a field.</div>\n" "<div class=\"deprecation-comment\">class_test2 passes. This is the second sentence of deprecated description for a field.</div>\n"
+ "</div>\n" + "</div>\n"
+ "</td>", + "</td>",
"<div class=\"deprecationComment\">class_test3 passes. This is the second sentence of deprecated description for a constructor.</div>\n" "<div class=\"deprecation-comment\">class_test3 passes. This is the second sentence of deprecated description for a constructor.</div>\n"
+ "</div>\n" + "</div>\n"
+ "</td>", + "</td>",
"<div class=\"deprecationComment\">class_test4 passes. This is the second sentence of deprecated description for a method.</div>\n" "<div class=\"deprecation-comment\">class_test4 passes. This is the second sentence of deprecated description for a method.</div>\n"
+ "</div>\n" + "</div>\n"
+ "</td>"); + "</td>");
checkOutput("pkg/TestEnum.html", true, checkOutput("pkg/TestEnum.html", true,
"<hr>\n" "<hr>\n"
+ "<pre>@Deprecated(forRemoval=true)\n" + "<pre>@Deprecated(forRemoval=true)\n"
+ "public enum <span class=\"typeNameLabel\">TestEnum</span>\n" + "public enum <span class=\"type-name-label\">TestEnum</span>\n"
+ "extends java.lang.Enum&lt;<a href=\"TestEnum.html\" title=\"enum in pkg\">TestEnum</a>&gt;</pre>\n" + "extends java.lang.Enum&lt;<a href=\"TestEnum.html\" title=\"enum in pkg\">TestEnum</a>&gt;</pre>\n"
+ "<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated, for removal: This API element is subject to removal in a future version.</span>\n" + "<div class=\"deprecation-block\"><span class=\"deprecated-label\">Deprecated, for removal: This API element is subject to removal in a future version.</span>\n"
+ "<div class=\"deprecationComment\">enum_test1 passes.</div>\n" + "<div class=\"deprecation-comment\">enum_test1 passes.</div>\n"
+ "</div>", + "</div>",
"<div class=\"memberSignature\"><span class=\"annotations\">@Deprecated(forRemoval=true)\n" "<div class=\"member-signature\"><span class=\"annotations\">@Deprecated(forRemoval=true)\n"
+ "</span><span class=\"modifiers\">public static final</span>&nbsp;<span class=\"returnType\">" + "</span><span class=\"modifiers\">public static final</span>&nbsp;<span class=\"return-type\">"
+ "<a href=\"TestEnum.html\" title=\"enum in pkg\">TestEnum</a></span>&nbsp;<span class=\"memberName\">FOR_REMOVAL</span></div>\n" + "<a href=\"TestEnum.html\" title=\"enum in pkg\">TestEnum</a></span>&nbsp;<span class=\"member-name\">FOR_REMOVAL</span></div>\n"
+ "<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated, for removal: This API element is subject to removal in a future version.</span>\n" + "<div class=\"deprecation-block\"><span class=\"deprecated-label\">Deprecated, for removal: This API element is subject to removal in a future version.</span>\n"
+ "<div class=\"deprecationComment\">enum_test3 passes.</div>\n" + "<div class=\"deprecation-comment\">enum_test3 passes.</div>\n"
+ "</div>"); + "</div>");
checkOutput("pkg/TestError.html", true, checkOutput("pkg/TestError.html", true,
"<hr>\n" "<hr>\n"
+ "<pre>@Deprecated(forRemoval=true)\n" + "<pre>@Deprecated(forRemoval=true)\n"
+ "public class <span class=\"typeNameLabel\">TestError</span>\n" + "public class <span class=\"type-name-label\">TestError</span>\n"
+ "extends java.lang.Error</pre>\n" + "extends java.lang.Error</pre>\n"
+ "<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated, for removal: This API element is subject to removal in a future version.</span>\n" + "<div class=\"deprecation-block\"><span class=\"deprecated-label\">Deprecated, for removal: This API element is subject to removal in a future version.</span>\n"
+ "<div class=\"deprecationComment\">error_test1 passes.</div>\n" + "<div class=\"deprecation-comment\">error_test1 passes.</div>\n"
+ "</div>"); + "</div>");
checkOutput("pkg/TestException.html", true, checkOutput("pkg/TestException.html", true,
"<hr>\n" "<hr>\n"
+ "<pre>@Deprecated(forRemoval=true)\n" + "<pre>@Deprecated(forRemoval=true)\n"
+ "public class <span class=\"typeNameLabel\">TestException</span>\n" + "public class <span class=\"type-name-label\">TestException</span>\n"
+ "extends java.lang.Exception</pre>\n" + "extends java.lang.Exception</pre>\n"
+ "<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated, for removal: This API element is subject to removal in a future version.</span>\n" + "<div class=\"deprecation-block\"><span class=\"deprecated-label\">Deprecated, for removal: This API element is subject to removal in a future version.</span>\n"
+ "<div class=\"deprecationComment\">exception_test1 passes.</div>\n" + "<div class=\"deprecation-comment\">exception_test1 passes.</div>\n"
+ "</div>"); + "</div>");
checkOutput("pkg/TestInterface.html", true, checkOutput("pkg/TestInterface.html", true,
"<hr>\n" "<hr>\n"
+ "<pre>@Deprecated(forRemoval=true)\n" + "<pre>@Deprecated(forRemoval=true)\n"
+ "public class <span class=\"typeNameLabel\">TestInterface</span>\n" + "public class <span class=\"type-name-label\">TestInterface</span>\n"
+ "extends java.lang.Object</pre>\n" + "extends java.lang.Object</pre>\n"
+ "<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated, for removal: This API element is subject to removal in a future version.</span>\n" + "<div class=\"deprecation-block\"><span class=\"deprecated-label\">Deprecated, for removal: This API element is subject to removal in a future version.</span>\n"
+ "<div class=\"deprecationComment\">interface_test1 passes.</div>\n" + "<div class=\"deprecation-comment\">interface_test1 passes.</div>\n"
+ "</div>"); + "</div>");
checkOutput("deprecated-list.html", true, checkOutput("deprecated-list.html", true,
@ -214,95 +214,95 @@ public class TestDeprecatedDocs extends JavadocTester {
+ "<li><a href=\"#enum.constant\">Enum Constants</a></li>\n" + "<li><a href=\"#enum.constant\">Enum Constants</a></li>\n"
+ "<li><a href=\"#annotation.type.member\">Annotation Type Elements</a></li>\n" + "<li><a href=\"#annotation.type.member\">Annotation Type Elements</a></li>\n"
+ "</ul>", + "</ul>",
"<div class=\"deprecatedSummary\" id=\"forRemoval\">\n" "<div class=\"deprecated-summary\" id=\"forRemoval\">\n"
+ "<table>\n" + "<table>\n"
+ "<caption><span>For Removal</span><span class=\"tabEnd\">&nbsp;</span></caption>\n" + "<caption><span>For Removal</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
+ "<thead>\n" + "<thead>\n"
+ "<tr>\n" + "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Element</th>\n" + "<th class=\"col-first\" scope=\"col\">Element</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n" + "<th class=\"col-last\" scope=\"col\">Description</th>\n"
+ "</tr>\n" + "</tr>\n"
+ "</thead>", + "</thead>",
"<div class=\"deprecatedSummary\" id=\"enum\">\n" "<div class=\"deprecated-summary\" id=\"enum\">\n"
+ "<table>\n" + "<table>\n"
+ "<caption><span>Enums</span><span class=\"tabEnd\">&nbsp;</span></caption>\n" + "<caption><span>Enums</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
+ "<thead>\n" + "<thead>\n"
+ "<tr>\n" + "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Enum</th>\n" + "<th class=\"col-first\" scope=\"col\">Enum</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n" + "<th class=\"col-last\" scope=\"col\">Description</th>\n"
+ "</tr>\n" + "</tr>\n"
+ "</thead>\n" + "</thead>\n"
+ "<tbody>\n" + "<tbody>\n"
+ "<tr class=\"altColor\">\n" + "<tr class=\"alt-color\">\n"
+ "<th class=\"colDeprecatedItemName\" scope=\"row\"><a href=\"pkg/TestEnum.html\" title=\"enum in pkg\">pkg.TestEnum</a></th>\n" + "<th class=\"col-deprecated-item-name\" scope=\"row\"><a href=\"pkg/TestEnum.html\" title=\"enum in pkg\">pkg.TestEnum</a></th>\n"
+ "<td class=\"colLast\">\n" + "<td class=\"col-last\">\n"
+ "<div class=\"deprecationComment\">enum_test1 passes.</div>\n" + "<div class=\"deprecation-comment\">enum_test1 passes.</div>\n"
+ "</td>\n" + "</td>\n"
+ "</tr>\n" + "</tr>\n"
+ "</tbody>\n" + "</tbody>\n"
+ "</table>\n" + "</table>\n"
+ "</div>", + "</div>",
"<div class=\"deprecatedSummary\" id=\"exception\">\n" "<div class=\"deprecated-summary\" id=\"exception\">\n"
+ "<table>\n" + "<table>\n"
+ "<caption><span>Exceptions</span><span class=\"tabEnd\">&nbsp;</span></caption>\n" + "<caption><span>Exceptions</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
+ "<thead>\n" + "<thead>\n"
+ "<tr>\n" + "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Exceptions</th>\n" + "<th class=\"col-first\" scope=\"col\">Exceptions</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n" + "<th class=\"col-last\" scope=\"col\">Description</th>\n"
+ "</tr>\n" + "</tr>\n"
+ "</thead>\n" + "</thead>\n"
+ "<tbody>\n" + "<tbody>\n"
+ "<tr class=\"altColor\">\n" + "<tr class=\"alt-color\">\n"
+ "<th class=\"colDeprecatedItemName\" scope=\"row\"><a href=\"pkg/TestException.html\" title=\"class in pkg\">pkg.TestException</a></th>\n" + "<th class=\"col-deprecated-item-name\" scope=\"row\"><a href=\"pkg/TestException.html\" title=\"class in pkg\">pkg.TestException</a></th>\n"
+ "<td class=\"colLast\">\n" + "<td class=\"col-last\">\n"
+ "<div class=\"deprecationComment\">exception_test1 passes.</div>\n" + "<div class=\"deprecation-comment\">exception_test1 passes.</div>\n"
+ "</td>\n" + "</td>\n"
+ "</tr>\n" + "</tr>\n"
+ "</tbody>\n" + "</tbody>\n"
+ "</table>\n" + "</table>\n"
+ "</div>", + "</div>",
"<div class=\"deprecatedSummary\" id=\"field\">\n" "<div class=\"deprecated-summary\" id=\"field\">\n"
+ "<table>\n" + "<table>\n"
+ "<caption><span>Fields</span><span class=\"tabEnd\">&nbsp;</span></caption>\n" + "<caption><span>Fields</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
+ "<thead>\n" + "<thead>\n"
+ "<tr>\n" + "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Field</th>\n" + "<th class=\"col-first\" scope=\"col\">Field</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n" + "<th class=\"col-last\" scope=\"col\">Description</th>\n"
+ "</tr>\n" + "</tr>\n"
+ "</thead>\n" + "</thead>\n"
+ "<tbody>\n" + "<tbody>\n"
+ "<tr class=\"altColor\">\n" + "<tr class=\"alt-color\">\n"
+ "<th class=\"colDeprecatedItemName\" scope=\"row\"><a href=\"pkg/DeprecatedClassByAnnotation.html#field\">pkg.DeprecatedClassByAnnotation.field</a></th>\n" + "<th class=\"col-deprecated-item-name\" scope=\"row\"><a href=\"pkg/DeprecatedClassByAnnotation.html#field\">pkg.DeprecatedClassByAnnotation.field</a></th>\n"
+ "<td class=\"colLast\"></td>\n" + "<td class=\"col-last\"></td>\n"
+ "</tr>\n" + "</tr>\n"
+ "<tr class=\"rowColor\">\n" + "<tr class=\"row-color\">\n"
+ "<th class=\"colDeprecatedItemName\" scope=\"row\"><a href=\"pkg/TestAnnotationType.html#field\">pkg.TestAnnotationType.field</a></th>\n" + "<th class=\"col-deprecated-item-name\" scope=\"row\"><a href=\"pkg/TestAnnotationType.html#field\">pkg.TestAnnotationType.field</a></th>\n"
+ "<td class=\"colLast\">\n" + "<td class=\"col-last\">\n"
+ "<div class=\"deprecationComment\">annotation_test4 passes.</div>\n" + "<div class=\"deprecation-comment\">annotation_test4 passes.</div>\n"
+ "</td>\n" + "</td>\n"
+ "</tr>\n" + "</tr>\n"
+ "<tr class=\"altColor\">\n" + "<tr class=\"alt-color\">\n"
+ "<th class=\"colDeprecatedItemName\" scope=\"row\"><a href=\"pkg/TestClass.html#field\">pkg.TestClass.field</a></th>\n" + "<th class=\"col-deprecated-item-name\" scope=\"row\"><a href=\"pkg/TestClass.html#field\">pkg.TestClass.field</a></th>\n"
+ "<td class=\"colLast\">\n" + "<td class=\"col-last\">\n"
+ "<div class=\"deprecationComment\">class_test2 passes. This is the second sentence of deprecated description for a field.</div>\n" + "<div class=\"deprecation-comment\">class_test2 passes. This is the second sentence of deprecated description for a field.</div>\n"
+ "</td>\n" + "</td>\n"
+ "</tr>\n" + "</tr>\n"
+ "<tr class=\"rowColor\">\n" + "<tr class=\"row-color\">\n"
+ "<th class=\"colDeprecatedItemName\" scope=\"row\"><a href=\"pkg/TestError.html#field\">pkg.TestError.field</a></th>\n" + "<th class=\"col-deprecated-item-name\" scope=\"row\"><a href=\"pkg/TestError.html#field\">pkg.TestError.field</a></th>\n"
+ "<td class=\"colLast\">\n" + "<td class=\"col-last\">\n"
+ "<div class=\"deprecationComment\">error_test2 passes.</div>\n" + "<div class=\"deprecation-comment\">error_test2 passes.</div>\n"
+ "</td>\n" + "</td>\n"
+ "</tr>\n" + "</tr>\n"
+ "<tr class=\"altColor\">\n" + "<tr class=\"alt-color\">\n"
+ "<th class=\"colDeprecatedItemName\" scope=\"row\"><a href=\"pkg/TestException.html#field\">pkg.TestException.field</a></th>\n" + "<th class=\"col-deprecated-item-name\" scope=\"row\"><a href=\"pkg/TestException.html#field\">pkg.TestException.field</a></th>\n"
+ "<td class=\"colLast\">\n" + "<td class=\"col-last\">\n"
+ "<div class=\"deprecationComment\">exception_test2 passes.</div>\n" + "<div class=\"deprecation-comment\">exception_test2 passes.</div>\n"
+ "</td>\n" + "</td>\n"
+ "</tr>\n" + "</tr>\n"
+ "<tr class=\"rowColor\">\n" + "<tr class=\"row-color\">\n"
+ "<th class=\"colDeprecatedItemName\" scope=\"row\"><a href=\"pkg/TestInterface.html#field\">pkg.TestInterface.field</a></th>\n" + "<th class=\"col-deprecated-item-name\" scope=\"row\"><a href=\"pkg/TestInterface.html#field\">pkg.TestInterface.field</a></th>\n"
+ "<td class=\"colLast\">\n" + "<td class=\"col-last\">\n"
+ "<div class=\"deprecationComment\">interface_test2 passes.</div>\n" + "<div class=\"deprecation-comment\">interface_test2 passes.</div>\n"
+ "</td>\n" + "</td>\n"
+ "</tr>\n" + "</tr>\n"
+ "</tbody>\n" + "</tbody>\n"

4
test/langtools/jdk/javadoc/doclet/testDocRootInlineTag/TestDocRootInlineTag.java
View file

@ -56,10 +56,10 @@ public class TestDocRootInlineTag extends JavadocTester {
checkOutput("TestDocRootTag.html", true, checkOutput("TestDocRootTag.html", true,
"<a href=\"" + uri + "/java/io/File.html\" " "<a href=\"" + uri + "/java/io/File.html\" "
+ "title=\"class or interface in java.io\" class=\"externalLink\"><code>File</code></a>", + "title=\"class or interface in java.io\" class=\"external-link\"><code>File</code></a>",
"<a href=\"./index-all.html\">index</a>", "<a href=\"./index-all.html\">index</a>",
"<a href=\"" + uri + "/java/io/File.html\" " "<a href=\"" + uri + "/java/io/File.html\" "
+ "title=\"class or interface in java.io\" class=\"externalLink\"><code>Second File Link</code></a>", + "title=\"class or interface in java.io\" class=\"external-link\"><code>Second File Link</code></a>",
"The value of @docRoot is \"./\""); "The value of @docRoot is \"./\"");
checkOutput("index-all.html", true, checkOutput("index-all.html", true,

8
test/langtools/jdk/javadoc/doclet/testExternalOverriddenMethod/TestExternalOverriddenMethod.java
View file

@ -55,14 +55,14 @@ public class TestExternalOverriddenMethod extends JavadocTester {
checkOutput("pkg/XReader.html", true, checkOutput("pkg/XReader.html", true,
"<dt>Overrides:</dt>\n" "<dt>Overrides:</dt>\n"
+ "<dd><code><a href=\"" + uri + "/java/io/FilterReader.html#read()\" " + "<dd><code><a href=\"" + uri + "/java/io/FilterReader.html#read()\" "
+ "title=\"class or interface in java.io\" class=\"externalLink\">read</a></code>&nbsp;in class&nbsp;<code>" + "title=\"class or interface in java.io\" class=\"external-link\">read</a></code>&nbsp;in class&nbsp;<code>"
+ "<a href=\"" + uri + "/java/io/FilterReader.html\" " + "<a href=\"" + uri + "/java/io/FilterReader.html\" "
+ "title=\"class or interface in java.io\" class=\"externalLink\">FilterReader</a></code></dd>", + "title=\"class or interface in java.io\" class=\"external-link\">FilterReader</a></code></dd>",
"<dt>Specified by:</dt>\n" "<dt>Specified by:</dt>\n"
+ "<dd><code><a href=\"" + uri + "/java/io/DataInput.html#readInt()\" " + "<dd><code><a href=\"" + uri + "/java/io/DataInput.html#readInt()\" "
+ "title=\"class or interface in java.io\" class=\"externalLink\">readInt</a></code>&nbsp;in interface&nbsp;<code>" + "title=\"class or interface in java.io\" class=\"external-link\">readInt</a></code>&nbsp;in interface&nbsp;<code>"
+ "<a href=\"" + uri + "/java/io/DataInput.html\" " + "<a href=\"" + uri + "/java/io/DataInput.html\" "
+ "title=\"class or interface in java.io\" class=\"externalLink\">DataInput</a></code></dd>" + "title=\"class or interface in java.io\" class=\"external-link\">DataInput</a></code></dd>"
); );
} }
} }

10
test/langtools/jdk/javadoc/doclet/testGroupName/TestGroupName.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -65,8 +65,8 @@ public class TestGroupName extends JavadocTester {
checkExit(Exit.OK); checkExit(Exit.OK);
checkOutput("index.html", true, checkOutput("index.html", true,
"<button role=\"tab\" aria-selected=\"false\" aria-controls=\"overviewSummary_tabpanel\"" "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"overview-summary_tabpanel\""
+ " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t1\" class=\"tableTab\"" + " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t1\" class=\"table-tab\""
+ " onclick=\"show(1);\">abc &lt; &amp; &gt; def</button>", + " onclick=\"show(1);\">abc &lt; &amp; &gt; def</button>",
",\"abc < & > def\"],"); ",\"abc < & > def\"],");
} }
@ -100,8 +100,8 @@ public class TestGroupName extends JavadocTester {
checkExit(Exit.OK); checkExit(Exit.OK);
checkOutput("index.html", true, checkOutput("index.html", true,
"<button role=\"tab\" aria-selected=\"false\" aria-controls=\"overviewSummary_tabpanel\"" "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"overview-summary_tabpanel\""
+ " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t2\" class=\"tableTab\"" + " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t2\" class=\"table-tab\""
+ " onclick=\"show(2);\">Other Modules</button>", + " onclick=\"show(2);\">Other Modules</button>",
",\"abc < & > def\"],"); ",\"abc < & > def\"],");
} }

32
test/langtools/jdk/javadoc/doclet/testHeadings/TestHeadings.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -52,38 +52,38 @@ public class TestHeadings extends JavadocTester {
//Package summary //Package summary
checkOutput("pkg1/package-summary.html", true, checkOutput("pkg1/package-summary.html", true,
"<th class=\"colFirst\" scope=\"col\">" "<th class=\"col-first\" scope=\"col\">"
+ "Class</th>\n" + "Class</th>\n"
+ "<th class=\"colLast\" scope=\"col\"" + "<th class=\"col-last\" scope=\"col\""
+ ">Description</th>"); + ">Description</th>");
// Class documentation // Class documentation
checkOutput("pkg1/C1.html", true, checkOutput("pkg1/C1.html", true,
"<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n" "<th class=\"col-first\" scope=\"col\">Modifier and Type</th>\n"
+ "<th class=\"colSecond\" scope=\"col\">Field</th>\n" + "<th class=\"col-second\" scope=\"col\">Field</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>", + "<th class=\"col-last\" scope=\"col\">Description</th>",
"<h3 id=\"methods.inherited.from.class.java.lang.Object\">" "<h3 id=\"methods.inherited.from.class.java.lang.Object\">"
+ "Methods inherited from class&nbsp;java.lang.Object</h3>"); + "Methods inherited from class&nbsp;java.lang.Object</h3>");
// Class use documentation // Class use documentation
checkOutput("pkg1/class-use/C1.html", true, checkOutput("pkg1/class-use/C1.html", true,
"<th class=\"colFirst\" scope=\"col\">Package</th>\n" "<th class=\"col-first\" scope=\"col\">Package</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>", + "<th class=\"col-last\" scope=\"col\">Description</th>",
"<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n" "<th class=\"col-first\" scope=\"col\">Modifier and Type</th>\n"
+ "<th class=\"colSecond\" scope=\"col\">Field</th>\n" + "<th class=\"col-second\" scope=\"col\">Field</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>"); + "<th class=\"col-last\" scope=\"col\">Description</th>");
// Deprecated // Deprecated
checkOutput("deprecated-list.html", true, checkOutput("deprecated-list.html", true,
"<th class=\"colFirst\" scope=\"col\">Method</th>\n" "<th class=\"col-first\" scope=\"col\">Method</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>"); + "<th class=\"col-last\" scope=\"col\">Description</th>");
// Constant values // Constant values
checkOutput("constant-values.html", true, checkOutput("constant-values.html", true,
"<th class=\"colFirst\" scope=\"col\">" "<th class=\"col-first\" scope=\"col\">"
+ "Modifier and Type</th>\n" + "Modifier and Type</th>\n"
+ "<th class=\"colSecond\" scope=\"col\">Constant Field</th>\n" + "<th class=\"col-second\" scope=\"col\">Constant Field</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Value</th>"); + "<th class=\"col-last\" scope=\"col\">Value</th>");
// Serialized Form // Serialized Form
checkOutput("serialized-form.html", true, checkOutput("serialized-form.html", true,

4
test/langtools/jdk/javadoc/doclet/testHiddenTag/TestHiddenTag.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -79,7 +79,7 @@ public class TestHiddenTag extends JavadocTester {
"<a id=\"inVisibleMethod()\">"); "<a id=\"inVisibleMethod()\">");
checkOutput("pkg1/A.VisibleInnerExtendsInvisibleInner.html", true, checkOutput("pkg1/A.VisibleInnerExtendsInvisibleInner.html", true,
"<pre>public static class <span class=\"typeNameLabel\">" + "<pre>public static class <span class=\"type-name-label\">" +
"A.VisibleInnerExtendsInvisibleInner</span>\n" + "A.VisibleInnerExtendsInvisibleInner</span>\n" +
"extends <a href=\"A.html\" title=\"class in pkg1\">A</a></pre>", "extends <a href=\"A.html\" title=\"class in pkg1\">A</a></pre>",
"<code><a href=\"A.html#visibleField\">visibleField</a></code>", "<code><a href=\"A.html#visibleField\">visibleField</a></code>",

2
test/langtools/jdk/javadoc/doclet/testHref/TestHref.java
View file

@ -70,7 +70,7 @@ public class TestHref extends JavadocTester {
//Header does not link to the page itself. //Header does not link to the page itself.
"Class C4&lt;E extends C4&lt;E&gt;&gt;</h1>", "Class C4&lt;E extends C4&lt;E&gt;&gt;</h1>",
//Signature does not link to the page itself. //Signature does not link to the page itself.
"public abstract class <span class=\"typeNameLabel\">C4&lt;E extends C4&lt;E&gt;&gt;</span>" "public abstract class <span class=\"type-name-label\">C4&lt;E extends C4&lt;E&gt;&gt;</span>"
); );
checkOutput(Output.OUT, false, checkOutput(Output.OUT, false,

44
test/langtools/jdk/javadoc/doclet/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java
View file

@ -101,7 +101,7 @@ public class TestHtmlDefinitionListTag extends JavadocTester {
// Optional Element should print properly nested definition list tags // Optional Element should print properly nested definition list tags
// for default value. // for default value.
checkOutput("pkg1/C1.html", true, checkOutput("pkg1/C1.html", true,
"<pre>public class <span class=\"typeNameLabel\">C1</span>\n" + "<pre>public class <span class=\"type-name-label\">C1</span>\n" +
"extends java.lang.Object\n" + "extends java.lang.Object\n" +
"implements java.io.Serializable</pre>"); "implements java.io.Serializable</pre>");
checkOutput("pkg1/C4.html", true, checkOutput("pkg1/C4.html", true,
@ -214,8 +214,8 @@ public class TestHtmlDefinitionListTag extends JavadocTester {
+ "<dd><a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + "<dd><a href=\"pkg1/C1.html#setUndecorated(boolean)\">"
+ "<code>C1.setUndecorated(boolean)</code></a></dd>\n" + "<code>C1.setUndecorated(boolean)</code></a></dd>\n"
+ "</dl>", + "</dl>",
"<span class=\"deprecatedLabel\">Deprecated.</span>\n" "<span class=\"deprecated-label\">Deprecated.</span>\n"
+ "<div class=\"deprecationComment\">As of JDK version 1.5, replaced by\n" + "<div class=\"deprecation-comment\">As of JDK version 1.5, replaced by\n"
+ " <a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + " <a href=\"pkg1/C1.html#setUndecorated(boolean)\">"
+ "<code>setUndecorated(boolean)</code></a>.</div>\n" + "<code>setUndecorated(boolean)</code></a>.</div>\n"
+ "</div>\n" + "</div>\n"
@ -229,8 +229,8 @@ public class TestHtmlDefinitionListTag extends JavadocTester {
+ "<dd><a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + "<dd><a href=\"pkg1/C1.html#setUndecorated(boolean)\">"
+ "<code>C1.setUndecorated(boolean)</code></a></dd>\n" + "<code>C1.setUndecorated(boolean)</code></a></dd>\n"
+ "</dl>", + "</dl>",
"<span class=\"deprecatedLabel\">Deprecated.</span>\n" "<span class=\"deprecated-label\">Deprecated.</span>\n"
+ "<div class=\"deprecationComment\">As of JDK version 1.5, replaced by\n" + "<div class=\"deprecation-comment\">As of JDK version 1.5, replaced by\n"
+ " <a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + " <a href=\"pkg1/C1.html#setUndecorated(boolean)\">"
+ "<code>setUndecorated(boolean)</code></a>.</div>\n" + "<code>setUndecorated(boolean)</code></a>.</div>\n"
+ "</div>\n" + "</div>\n"
@ -239,7 +239,7 @@ public class TestHtmlDefinitionListTag extends JavadocTester {
+ "<dt>Throws:</dt>\n" + "<dt>Throws:</dt>\n"
+ "<dd><code>java.io.IOException</code></dd>\n" + "<dd><code>java.io.IOException</code></dd>\n"
+ "</dl>", + "</dl>",
"<span class=\"deprecatedLabel\">Deprecated.</span>" "<span class=\"deprecated-label\">Deprecated.</span>"
+ "</div>\n" + "</div>\n"
+ "<div class=\"block\">The name for this class.</div>"); + "<div class=\"block\">The name for this class.</div>");
} }
@ -312,8 +312,8 @@ public class TestHtmlDefinitionListTag extends JavadocTester {
+ "<dd><a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + "<dd><a href=\"pkg1/C1.html#setUndecorated(boolean)\">"
+ "<code>C1.setUndecorated(boolean)</code></a></dd>\n" + "<code>C1.setUndecorated(boolean)</code></a></dd>\n"
+ "</dl>", + "</dl>",
"<span class=\"deprecatedLabel\">Deprecated.</span>\n" "<span class=\"deprecated-label\">Deprecated.</span>\n"
+ "<div class=\"deprecationComment\">As of JDK version 1.5, replaced by\n" + "<div class=\"deprecation-comment\">As of JDK version 1.5, replaced by\n"
+ " <a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + " <a href=\"pkg1/C1.html#setUndecorated(boolean)\">"
+ "<code>setUndecorated(boolean)</code></a>.</div>\n" + "<code>setUndecorated(boolean)</code></a>.</div>\n"
+ "</div>\n" + "</div>\n"
@ -327,8 +327,8 @@ public class TestHtmlDefinitionListTag extends JavadocTester {
+ "<dd><a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + "<dd><a href=\"pkg1/C1.html#setUndecorated(boolean)\">"
+ "<code>C1.setUndecorated(boolean)</code></a></dd>\n" + "<code>C1.setUndecorated(boolean)</code></a></dd>\n"
+ "</dl>", + "</dl>",
"<span class=\"deprecatedLabel\">Deprecated.</span>\n" "<span class=\"deprecated-label\">Deprecated.</span>\n"
+ "<div class=\"deprecationComment\">As of JDK version 1.5, replaced by\n" + "<div class=\"deprecation-comment\">As of JDK version 1.5, replaced by\n"
+ " <a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + " <a href=\"pkg1/C1.html#setUndecorated(boolean)\">"
+ "<code>setUndecorated(boolean)</code></a>.</div>\n" + "<code>setUndecorated(boolean)</code></a>.</div>\n"
+ "</div>\n" + "</div>\n"
@ -337,7 +337,7 @@ public class TestHtmlDefinitionListTag extends JavadocTester {
+ "<dt>Throws:</dt>\n" + "<dt>Throws:</dt>\n"
+ "<dd><code>java.io.IOException</code></dd>\n" + "<dd><code>java.io.IOException</code></dd>\n"
+ "</dl>", + "</dl>",
"<span class=\"deprecatedLabel\">Deprecated.</span>" "<span class=\"deprecated-label\">Deprecated.</span>"
+ "</div>\n" + "</div>\n"
+ "<div class=\"block\">" + "<div class=\"block\">"
+ "The name for this class.</div>"); + "The name for this class.</div>");
@ -347,39 +347,39 @@ public class TestHtmlDefinitionListTag extends JavadocTester {
// Test with -nocomment and -nodeprecated options. The ClassDocs whould // Test with -nocomment and -nodeprecated options. The ClassDocs whould
// not display definition lists for any member details. // not display definition lists for any member details.
checkOutput("pkg1/C1.html", expectFound, checkOutput("pkg1/C1.html", expectFound,
"<div class=\"memberSignature\"><span class=\"modifiers\">public</span>&nbsp;" + "<div class=\"member-signature\"><span class=\"modifiers\">public</span>&nbsp;" +
"<span class=\"returnType\">void</span>&nbsp;<span class=\"memberName\">readObject</span>()\n" + "<span class=\"return-type\">void</span>&nbsp;<span class=\"member-name\">readObject</span>()\n" +
" throws <span class=\"exceptions\">java.io.IOException</span></div>\n" + " throws <span class=\"exceptions\">java.io.IOException</span></div>\n" +
"</section>\n" + "</section>\n" +
"</li>"); "</li>");
checkOutput("pkg1/C2.html", expectFound, checkOutput("pkg1/C2.html", expectFound,
"<div class=\"memberSignature\"><span class=\"modifiers\">public</span>" + "<div class=\"member-signature\"><span class=\"modifiers\">public</span>" +
"&nbsp;<span class=\"memberName\">C2</span>()</div>\n" + "&nbsp;<span class=\"member-name\">C2</span>()</div>\n" +
"</section>\n" + "</section>\n" +
"</li>"); "</li>");
checkOutput("pkg1/C1.ModalExclusionType.html", expectFound, checkOutput("pkg1/C1.ModalExclusionType.html", expectFound,
"<div class=\"memberSignature\"><span class=\"modifiers\">public static final</span>&nbsp;" + "<div class=\"member-signature\"><span class=\"modifiers\">public static final</span>&nbsp;" +
"<span class=\"returnType\"><a href=\"C1.ModalExclusionType.html\" title=\"enum in pkg1\">" + "<span class=\"return-type\"><a href=\"C1.ModalExclusionType.html\" title=\"enum in pkg1\">" +
"C1.ModalExclusionType</a></span>&nbsp;<span class=\"memberName\">APPLICATION_EXCLUDE</span></div>\n" + "C1.ModalExclusionType</a></span>&nbsp;<span class=\"member-name\">APPLICATION_EXCLUDE</span></div>\n" +
"</section>\n" + "</section>\n" +
"</li>"); "</li>");
checkOutput("serialized-form.html", expectFound, checkOutput("serialized-form.html", expectFound,
"<pre>boolean " + "<pre>boolean " +
"undecorated</pre>\n" + "undecorated</pre>\n" +
"<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">" + "<div class=\"deprecation-block\"><span class=\"deprecated-label\">" +
"Deprecated.</span>\n" "Deprecated.</span>\n"
+ "<div class=\"deprecationComment\">As of JDK version 1.5, replaced by\n" + "<div class=\"deprecation-comment\">As of JDK version 1.5, replaced by\n"
+ " <a href=\"pkg1/C1.html#setUndecorated(boolean)\"><code>" + " <a href=\"pkg1/C1.html#setUndecorated(boolean)\"><code>"
+ "setUndecorated(boolean)</code></a>.</div>\n" + "setUndecorated(boolean)</code></a>.</div>\n"
+ "</div>\n" + "</div>\n"
+ +
"</li>", "</li>",
"<span class=\"deprecatedLabel\">" "<span class=\"deprecated-label\">"
+ "Deprecated.</span>\n" + "Deprecated.</span>\n"
+ "<div class=\"deprecationComment\">As of JDK version" + "<div class=\"deprecation-comment\">As of JDK version"
+ " 1.5, replaced by\n" + " 1.5, replaced by\n"
+ " <a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + " <a href=\"pkg1/C1.html#setUndecorated(boolean)\">"
+ "<code>setUndecorated(boolean)</code></a>.</div>\n" + "<code>setUndecorated(boolean)</code></a>.</div>\n"

6
test/langtools/jdk/javadoc/doclet/testHtmlLandmarkRegions/TestHtmlLandmarkRegions.java
View file

@ -74,7 +74,7 @@ public class TestHtmlLandmarkRegions extends JavadocTester {
checkExit(Exit.OK); checkExit(Exit.OK);
checkOrder("index.html", checkOrder("index.html",
"<header role=\"banner\" class=\"flexHeader\">\n" "<header role=\"banner\" class=\"flex-header\">\n"
+ "<nav role=\"navigation\">", + "<nav role=\"navigation\">",
"<main role=\"main\">\n" "<main role=\"main\">\n"
+ "<div class=\"header\">\n" + "<div class=\"header\">\n"
@ -98,7 +98,7 @@ public class TestHtmlLandmarkRegions extends JavadocTester {
checkExit(Exit.OK); checkExit(Exit.OK);
checkOrder("index.html", checkOrder("index.html",
"<header role=\"banner\" class=\"flexHeader\">\n" "<header role=\"banner\" class=\"flex-header\">\n"
+ "<nav role=\"navigation\">", + "<nav role=\"navigation\">",
"<main role=\"main\">\n" "<main role=\"main\">\n"
+ "<div class=\"header\">\n" + "<div class=\"header\">\n"
@ -130,7 +130,7 @@ public class TestHtmlLandmarkRegions extends JavadocTester {
checkExit(Exit.OK); checkExit(Exit.OK);
checkOrder("pkg1/doc-files/s.html", checkOrder("pkg1/doc-files/s.html",
"<header role=\"banner\" class=\"flexHeader\">\n" "<header role=\"banner\" class=\"flex-header\">\n"
+ "<nav role=\"navigation\">\n", + "<nav role=\"navigation\">\n",
"<main role=\"main\">" "<main role=\"main\">"
+ "A sample doc file", + "A sample doc file",

18
test/langtools/jdk/javadoc/doclet/testHtmlTableStyles/TestHtmlTableStyles.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -56,23 +56,23 @@ public class TestHtmlTableStyles extends JavadocTester {
checkOutput("pkg1/TestTable.html", true, checkOutput("pkg1/TestTable.html", true,
"<table summary=\"Summary\" border cellpadding=3 cellspacing=1>", "<table summary=\"Summary\" border cellpadding=3 cellspacing=1>",
"<div class=\"memberSummary\">\n<table>", "<div class=\"member-summary\">\n<table>",
"<div class=\"memberSummary\">\n<table>", "<div class=\"member-summary\">\n<table>",
"<div class=\"memberSummary\">\n<table>"); "<div class=\"member-summary\">\n<table>");
checkOutput("pkg1/package-summary.html", true, checkOutput("pkg1/package-summary.html", true,
"<div class=\"typeSummary\">\n<table>"); "<div class=\"type-summary\">\n<table>");
checkOutput("pkg1/class-use/TestTable.html", true, checkOutput("pkg1/class-use/TestTable.html", true,
"<div class=\"useSummary\">\n<table>"); "<div class=\"use-summary\">\n<table>");
checkOutput("index.html", true, checkOutput("index.html", true,
"<div class=\"overviewSummary\">\n<table>"); "<div class=\"overview-summary\">\n<table>");
checkOutput("deprecated-list.html", true, checkOutput("deprecated-list.html", true,
"<div class=\"deprecatedSummary\" id=\"method\">\n<table>"); "<div class=\"deprecated-summary\" id=\"method\">\n<table>");
checkOutput("constant-values.html", true, checkOutput("constant-values.html", true,
"<div class=\"constantsSummary\">\n<table>"); "<div class=\"constants-summary\">\n<table>");
} }
} }

296
test/langtools/jdk/javadoc/doclet/testHtmlTableTags/TestHtmlTableTags.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2009, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -65,70 +65,70 @@ public class TestHtmlTableTags extends JavadocTester {
void checkHtmlTableTag() { void checkHtmlTableTag() {
//Package summary //Package summary
checkOutput("pkg1/package-summary.html", true, checkOutput("pkg1/package-summary.html", true,
"<div class=\"typeSummary\">\n<table>", "<div class=\"type-summary\">\n<table>",
"<div class=\"typeSummary\">\n<table>"); "<div class=\"type-summary\">\n<table>");
checkOutput("pkg2/package-summary.html", true, checkOutput("pkg2/package-summary.html", true,
"<div class=\"typeSummary\">\n<table>", "<div class=\"type-summary\">\n<table>",
"<div class=\"typeSummary\">\n<table>"); "<div class=\"type-summary\">\n<table>");
// Class documentation // Class documentation
checkOutput("pkg1/C1.html", true, checkOutput("pkg1/C1.html", true,
"<div class=\"memberSummary\">\n<table>", "<div class=\"member-summary\">\n<table>",
"<div class=\"memberSummary\">\n<table>"); "<div class=\"member-summary\">\n<table>");
checkOutput("pkg2/C2.html", true, checkOutput("pkg2/C2.html", true,
"<div class=\"memberSummary\">\n<table>", "<div class=\"member-summary\">\n<table>",
"<div class=\"memberSummary\">\n<table>"); "<div class=\"member-summary\">\n<table>");
checkOutput("pkg2/C2.ModalExclusionType.html", true, checkOutput("pkg2/C2.ModalExclusionType.html", true,
"<div class=\"memberSummary\">\n<table>"); "<div class=\"member-summary\">\n<table>");
checkOutput("pkg2/C3.html", true, checkOutput("pkg2/C3.html", true,
"<div class=\"memberSummary\">\n<table>"); "<div class=\"member-summary\">\n<table>");
checkOutput("pkg2/C4.html", true, checkOutput("pkg2/C4.html", true,
"<div class=\"memberSummary\">\n<table>"); "<div class=\"member-summary\">\n<table>");
// Class use documentation // Class use documentation
checkOutput("pkg1/class-use/I1.html", true, checkOutput("pkg1/class-use/I1.html", true,
"<div class=\"useSummary\">\n<table>"); "<div class=\"use-summary\">\n<table>");
checkOutput("pkg1/class-use/C1.html", true, checkOutput("pkg1/class-use/C1.html", true,
"<div class=\"useSummary\">\n<table>", "<div class=\"use-summary\">\n<table>",
"<div class=\"useSummary\">\n<table>"); "<div class=\"use-summary\">\n<table>");
checkOutput("pkg2/class-use/C2.html", true, checkOutput("pkg2/class-use/C2.html", true,
"<div class=\"useSummary\">\n<table>", "<div class=\"use-summary\">\n<table>",
"<div class=\"useSummary\">\n<table>"); "<div class=\"use-summary\">\n<table>");
checkOutput("pkg2/class-use/C2.ModalExclusionType.html", true, checkOutput("pkg2/class-use/C2.ModalExclusionType.html", true,
"<div class=\"useSummary\">\n<table>"); "<div class=\"use-summary\">\n<table>");
checkOutput("pkg2/class-use/C2.ModalExclusionType.html", true, checkOutput("pkg2/class-use/C2.ModalExclusionType.html", true,
"<div class=\"useSummary\">\n<table>"); "<div class=\"use-summary\">\n<table>");
// Package use documentation // Package use documentation
checkOutput("pkg1/package-use.html", true, checkOutput("pkg1/package-use.html", true,
"<div class=\"useSummary\">\n<table>", "<div class=\"use-summary\">\n<table>",
"<div class=\"useSummary\">\n<table>"); "<div class=\"use-summary\">\n<table>");
checkOutput("pkg2/package-use.html", true, checkOutput("pkg2/package-use.html", true,
"<div class=\"useSummary\">\n<table>", "<div class=\"use-summary\">\n<table>",
"<div class=\"useSummary\">\n<table>"); "<div class=\"use-summary\">\n<table>");
// Deprecated // Deprecated
checkOutput("deprecated-list.html", true, checkOutput("deprecated-list.html", true,
"<div class=\"deprecatedSummary\" id=\"field\">\n<table>", "<div class=\"deprecated-summary\" id=\"field\">\n<table>",
"<div class=\"deprecatedSummary\" id=\"method\">\n<table>"); "<div class=\"deprecated-summary\" id=\"method\">\n<table>");
// Constant values // Constant values
checkOutput("constant-values.html", true, checkOutput("constant-values.html", true,
"<div class=\"constantsSummary\">\n<table>"); "<div class=\"constants-summary\">\n<table>");
// Overview Summary // Overview Summary
checkOutput("index.html", true, checkOutput("index.html", true,
"<div class=\"overviewSummary\">\n<table>"); "<div class=\"overview-summary\">\n<table>");
} }
/* /*
@ -137,109 +137,109 @@ public class TestHtmlTableTags extends JavadocTester {
void checkHtmlTableSummaries() { void checkHtmlTableSummaries() {
//Package summary //Package summary
checkOutput("pkg1/package-summary.html", true, checkOutput("pkg1/package-summary.html", true,
"<div class=\"typeSummary\">\n" "<div class=\"type-summary\">\n"
+ "<table summary=\"Class Summary table, " + "<table summary=\"Class Summary table, "
+ "listing classes, and an explanation\">", + "listing classes, and an explanation\">",
"<div class=\"typeSummary\">\n" "<div class=\"type-summary\">\n"
+ "<table summary=\"Interface Summary table, " + "<table summary=\"Interface Summary table, "
+ "listing interfaces, and an explanation\">"); + "listing interfaces, and an explanation\">");
checkOutput("pkg2/package-summary.html", true, checkOutput("pkg2/package-summary.html", true,
"<div class=\"typeSummary\">\n" "<div class=\"type-summary\">\n"
+ "<table summary=\"Enum Summary table, " + "<table summary=\"Enum Summary table, "
+ "listing enums, and an explanation\">", + "listing enums, and an explanation\">",
"<div class=\"typeSummary\">\n" "<div class=\"type-summary\">\n"
+ "<table summary=\"Annotation Types Summary table, " + "<table summary=\"Annotation Types Summary table, "
+ "listing annotation types, and an explanation\">"); + "listing annotation types, and an explanation\">");
// Class documentation // Class documentation
checkOutput("pkg1/C1.html", true, checkOutput("pkg1/C1.html", true,
"<div class=\"memberSummary\">\n" "<div class=\"member-summary\">\n"
+ "<table summary=\"Field Summary table, listing fields, " + "<table summary=\"Field Summary table, listing fields, "
+ "and an explanation\">", + "and an explanation\">",
"<div class=\"memberSummary\">\n", "<div class=\"member-summary\">\n",
"<table summary=\"Method Summary table, listing methods, " "<table summary=\"Method Summary table, listing methods, "
+ "and an explanation\" aria-labelledby=\"t0\">"); + "and an explanation\" aria-labelledby=\"t0\">");
checkOutput("pkg2/C2.html", true, checkOutput("pkg2/C2.html", true,
"<div class=\"memberSummary\">\n" "<div class=\"member-summary\">\n"
+ "<table summary=\"Nested Class Summary table, listing " + "<table summary=\"Nested Class Summary table, listing "
+ "nested classes, and an explanation\">", + "nested classes, and an explanation\">",
"<div class=\"memberSummary\">\n" "<div class=\"member-summary\">\n"
+ "<table summary=\"Constructor Summary table, listing " + "<table summary=\"Constructor Summary table, listing "
+ "constructors, and an explanation\">"); + "constructors, and an explanation\">");
checkOutput("pkg2/C2.ModalExclusionType.html", true, checkOutput("pkg2/C2.ModalExclusionType.html", true,
"<div class=\"memberSummary\">\n" "<div class=\"member-summary\">\n"
+ "<table summary=\"Enum Constant Summary table, listing " + "<table summary=\"Enum Constant Summary table, listing "
+ "enum constants, and an explanation\">"); + "enum constants, and an explanation\">");
checkOutput("pkg2/C3.html", true, checkOutput("pkg2/C3.html", true,
"<div class=\"memberSummary\">\n" "<div class=\"member-summary\">\n"
+ "<table summary=\"Required Element Summary table, " + "<table summary=\"Required Element Summary table, "
+ "listing required elements, and an explanation\">"); + "listing required elements, and an explanation\">");
checkOutput("pkg2/C4.html", true, checkOutput("pkg2/C4.html", true,
"<div class=\"memberSummary\">\n" "<div class=\"member-summary\">\n"
+ "<table summary=\"Optional Element Summary table, " + "<table summary=\"Optional Element Summary table, "
+ "listing optional elements, and an explanation\">"); + "listing optional elements, and an explanation\">");
// Class use documentation // Class use documentation
checkOutput("pkg1/class-use/I1.html", true, checkOutput("pkg1/class-use/I1.html", true,
"<div class=\"useSummary\">\n" "<div class=\"use-summary\">\n"
+ "<table summary=\"Use table, listing packages, and an explanation\">"); + "<table summary=\"Use table, listing packages, and an explanation\">");
checkOutput("pkg1/class-use/C1.html", true, checkOutput("pkg1/class-use/C1.html", true,
"<div class=\"useSummary\">\n" "<div class=\"use-summary\">\n"
+ "<table summary=\"Use table, listing fields, and an explanation\">", + "<table summary=\"Use table, listing fields, and an explanation\">",
"<div class=\"useSummary\">\n" "<div class=\"use-summary\">\n"
+ "<table summary=\"Use table, listing methods, and an explanation\">"); + "<table summary=\"Use table, listing methods, and an explanation\">");
checkOutput("pkg2/class-use/C2.html", true, checkOutput("pkg2/class-use/C2.html", true,
"<div class=\"useSummary\">\n" "<div class=\"use-summary\">\n"
+ "<table summary=\"Use table, listing fields, and an explanation\">", + "<table summary=\"Use table, listing fields, and an explanation\">",
"<div class=\"useSummary\">\n" "<div class=\"use-summary\">\n"
+ "<table summary=\"Use table, listing methods, and an explanation\">"); + "<table summary=\"Use table, listing methods, and an explanation\">");
checkOutput("pkg2/class-use/C2.ModalExclusionType.html", true, checkOutput("pkg2/class-use/C2.ModalExclusionType.html", true,
"<div class=\"useSummary\">\n" "<div class=\"use-summary\">\n"
+ "<table summary=\"Use table, listing packages, and an explanation\">"); + "<table summary=\"Use table, listing packages, and an explanation\">");
checkOutput("pkg2/class-use/C2.ModalExclusionType.html", true, checkOutput("pkg2/class-use/C2.ModalExclusionType.html", true,
"<div class=\"useSummary\">\n" "<div class=\"use-summary\">\n"
+ "<table summary=\"Use table, listing methods, and an explanation\">"); + "<table summary=\"Use table, listing methods, and an explanation\">");
// Package use documentation // Package use documentation
checkOutput("pkg1/package-use.html", true, checkOutput("pkg1/package-use.html", true,
"<div class=\"useSummary\">\n" "<div class=\"use-summary\">\n"
+ "<table summary=\"Use table, listing packages, and an explanation\">", + "<table summary=\"Use table, listing packages, and an explanation\">",
"<div class=\"useSummary\">\n" "<div class=\"use-summary\">\n"
+ "<table summary=\"Use table, listing classes, and an explanation\">"); + "<table summary=\"Use table, listing classes, and an explanation\">");
checkOutput("pkg2/package-use.html", true, checkOutput("pkg2/package-use.html", true,
"<div class=\"useSummary\">\n" "<div class=\"use-summary\">\n"
+ "<table summary=\"Use table, listing packages, and an explanation\">", + "<table summary=\"Use table, listing packages, and an explanation\">",
"<div class=\"useSummary\">\n" "<div class=\"use-summary\">\n"
+ "<table summary=\"Use table, listing classes, and an explanation\">"); + "<table summary=\"Use table, listing classes, and an explanation\">");
// Deprecated // Deprecated
checkOutput("deprecated-list.html", true, checkOutput("deprecated-list.html", true,
"<div class=\"deprecatedSummary\" id=\"field\">\n" "<div class=\"deprecated-summary\" id=\"field\">\n"
+ "<table summary=\"Fields table, listing fields, " + "<table summary=\"Fields table, listing fields, "
+ "and an explanation\">", + "and an explanation\">",
"<div class=\"deprecatedSummary\" id=\"method\">\n" "<div class=\"deprecated-summary\" id=\"method\">\n"
+ "<table summary=\"Methods table, listing methods, " + "<table summary=\"Methods table, listing methods, "
+ "and an explanation\">"); + "and an explanation\">");
// Constant values // Constant values
checkOutput("constant-values.html", true, checkOutput("constant-values.html", true,
"<div class=\"constantsSummary\">\n" "<div class=\"constants-summary\">\n"
+ "<table summary=\"Constant Field Values table, listing " + "<table summary=\"Constant Field Values table, listing "
+ "constant fields, and values\">"); + "constant fields, and values\">");
// Overview Summary // Overview Summary
checkOutput("index.html", true, checkOutput("index.html", true,
"<div class=\"overviewSummary\">\n" "<div class=\"overview-summary\">\n"
+ "<table summary=\"Package Summary table, listing packages, and an explanation\">"); + "<table summary=\"Package Summary table, listing packages, and an explanation\">");
} }
@ -249,110 +249,110 @@ public class TestHtmlTableTags extends JavadocTester {
void checkHtmlTableCaptions() { void checkHtmlTableCaptions() {
//Package summary //Package summary
checkOutput("pkg1/package-summary.html", true, checkOutput("pkg1/package-summary.html", true,
"<caption><span>Class Summary</span><span class=\"tabEnd\">" "<caption><span>Class Summary</span><span class=\"tab-end\">"
+ "&nbsp;</span></caption>", + "&nbsp;</span></caption>",
"<caption><span>Interface Summary</span><span class=\"tabEnd\">" "<caption><span>Interface Summary</span><span class=\"tab-end\">"
+ "&nbsp;</span></caption>"); + "&nbsp;</span></caption>");
checkOutput("pkg2/package-summary.html", true, checkOutput("pkg2/package-summary.html", true,
"<caption><span>Enum Summary</span><span class=\"tabEnd\">" "<caption><span>Enum Summary</span><span class=\"tab-end\">"
+ "&nbsp;</span></caption>", + "&nbsp;</span></caption>",
"<caption><span>Annotation Types Summary</span><span class=\"tabEnd\">" "<caption><span>Annotation Types Summary</span><span class=\"tab-end\">"
+ "&nbsp;</span></caption>"); + "&nbsp;</span></caption>");
// Class documentation // Class documentation
checkOutput("pkg1/C1.html", true, checkOutput("pkg1/C1.html", true,
"<caption><span>Fields</span><span class=\"tabEnd\">&nbsp;</span></caption>", "<caption><span>Fields</span><span class=\"tab-end\">&nbsp;</span></caption>",
"<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\"" "<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
+ " aria-selected=\"true\" aria-controls=\"memberSummary_tabpanel\" tabindex=\"0\"" + " aria-selected=\"true\" aria-controls=\"member-summary_tabpanel\" tabindex=\"0\""
+ " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"activeTableTab\">All Methods" + " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"active-table-tab\">All Methods"
+ "</button><button role=\"tab\" aria-selected=\"false\"" + "</button><button role=\"tab\" aria-selected=\"false\""
+ " aria-controls=\"memberSummary_tabpanel\" tabindex=\"-1\"" + " aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\""
+ " onkeydown=\"switchTab(event)\" id=\"t2\" class=\"tableTab\" onclick=\"show(2);\">" + " onkeydown=\"switchTab(event)\" id=\"t2\" class=\"table-tab\" onclick=\"show(2);\">"
+ "Instance Methods</button><button role=\"tab\" aria-selected=\"false\"" + "Instance Methods</button><button role=\"tab\" aria-selected=\"false\""
+ " aria-controls=\"memberSummary_tabpanel\" tabindex=\"-1\"" + " aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\""
+ " onkeydown=\"switchTab(event)\" id=\"t4\" class=\"tableTab\" onclick=\"show(8);\">" + " onkeydown=\"switchTab(event)\" id=\"t4\" class=\"table-tab\" onclick=\"show(8);\">"
+ "Concrete Methods</button><button role=\"tab\" aria-selected=\"false\"" + "Concrete Methods</button><button role=\"tab\" aria-selected=\"false\""
+ " aria-controls=\"memberSummary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\"" + " aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
+ " id=\"t6\" class=\"tableTab\" onclick=\"show(32);\">Deprecated Methods</button></div>\n"); + " id=\"t6\" class=\"table-tab\" onclick=\"show(32);\">Deprecated Methods</button></div>\n");
checkOutput("pkg2/C2.html", true, checkOutput("pkg2/C2.html", true,
"<caption><span>Nested Classes</span><span class=\"tabEnd\">&nbsp;</span></caption>", "<caption><span>Nested Classes</span><span class=\"tab-end\">&nbsp;</span></caption>",
"<caption><span>Constructors</span><span class=\"tabEnd\">&nbsp;</span></caption>"); "<caption><span>Constructors</span><span class=\"tab-end\">&nbsp;</span></caption>");
checkOutput("pkg2/C2.ModalExclusionType.html", true, checkOutput("pkg2/C2.ModalExclusionType.html", true,
"<caption><span>Enum Constants</span><span class=\"tabEnd\">&nbsp;</span></caption>"); "<caption><span>Enum Constants</span><span class=\"tab-end\">&nbsp;</span></caption>");
checkOutput("pkg2/C3.html", true, checkOutput("pkg2/C3.html", true,
"<caption><span>Required Elements</span><span class=\"tabEnd\">&nbsp;" "<caption><span>Required Elements</span><span class=\"tab-end\">&nbsp;"
+ "</span></caption>"); + "</span></caption>");
checkOutput("pkg2/C4.html", true, checkOutput("pkg2/C4.html", true,
"<caption><span>Optional Elements</span><span class=\"tabEnd\">&nbsp;" "<caption><span>Optional Elements</span><span class=\"tab-end\">&nbsp;"
+ "</span></caption>"); + "</span></caption>");
// Class use documentation // Class use documentation
checkOutput("pkg1/class-use/I1.html", true, checkOutput("pkg1/class-use/I1.html", true,
"<caption><span>Packages that use <a href=\"../I1.html\" " "<caption><span>Packages that use <a href=\"../I1.html\" "
+ "title=\"interface in pkg1\">I1</a></span><span class=\"tabEnd\">" + "title=\"interface in pkg1\">I1</a></span><span class=\"tab-end\">"
+ "&nbsp;</span></caption>"); + "&nbsp;</span></caption>");
checkOutput("pkg1/class-use/C1.html", true, checkOutput("pkg1/class-use/C1.html", true,
"<caption><span>Fields in <a href=\"../../pkg2/package-summary.html\">" "<caption><span>Fields in <a href=\"../../pkg2/package-summary.html\">"
+ "pkg2</a> declared as <a href=\"../C1.html\" " + "pkg2</a> declared as <a href=\"../C1.html\" "
+ "title=\"class in pkg1\">C1</a></span><span class=\"tabEnd\">&nbsp;" + "title=\"class in pkg1\">C1</a></span><span class=\"tab-end\">&nbsp;"
+ "</span></caption>", + "</span></caption>",
"<caption><span>Methods in <a href=\"../../pkg2/package-summary.html\">" "<caption><span>Methods in <a href=\"../../pkg2/package-summary.html\">"
+ "pkg2</a> that return <a href=\"../C1.html\" " + "pkg2</a> that return <a href=\"../C1.html\" "
+ "title=\"class in pkg1\">C1</a></span><span class=\"tabEnd\">" + "title=\"class in pkg1\">C1</a></span><span class=\"tab-end\">"
+ "&nbsp;</span></caption>"); + "&nbsp;</span></caption>");
checkOutput("pkg2/class-use/C2.html", true, checkOutput("pkg2/class-use/C2.html", true,
"<caption><span>Fields in <a href=\"../../pkg1/package-summary.html\">" "<caption><span>Fields in <a href=\"../../pkg1/package-summary.html\">"
+ "pkg1</a> declared as <a href=\"../C2.html\" " + "pkg1</a> declared as <a href=\"../C2.html\" "
+ "title=\"class in pkg2\">C2</a></span><span class=\"tabEnd\">" + "title=\"class in pkg2\">C2</a></span><span class=\"tab-end\">"
+ "&nbsp;</span></caption>", + "&nbsp;</span></caption>",
"<caption><span>Methods in <a href=\"../../pkg1/package-summary.html\">" "<caption><span>Methods in <a href=\"../../pkg1/package-summary.html\">"
+ "pkg1</a> that return <a href=\"../C2.html\" " + "pkg1</a> that return <a href=\"../C2.html\" "
+ "title=\"class in pkg2\">C2</a></span><span class=\"tabEnd\">" + "title=\"class in pkg2\">C2</a></span><span class=\"tab-end\">"
+ "&nbsp;</span></caption>"); + "&nbsp;</span></caption>");
checkOutput("pkg2/class-use/C2.ModalExclusionType.html", true, checkOutput("pkg2/class-use/C2.ModalExclusionType.html", true,
"<caption><span>Methods in <a href=\"../package-summary.html\">" "<caption><span>Methods in <a href=\"../package-summary.html\">"
+ "pkg2</a> that return <a href=\"../C2.ModalExclusionType.html\" " + "pkg2</a> that return <a href=\"../C2.ModalExclusionType.html\" "
+ "title=\"enum in pkg2\">C2.ModalExclusionType</a></span>" + "title=\"enum in pkg2\">C2.ModalExclusionType</a></span>"
+ "<span class=\"tabEnd\">&nbsp;</span></caption>"); + "<span class=\"tab-end\">&nbsp;</span></caption>");
// Package use documentation // Package use documentation
checkOutput("pkg1/package-use.html", true, checkOutput("pkg1/package-use.html", true,
"<caption><span>Packages that use <a href=\"package-summary.html\">" "<caption><span>Packages that use <a href=\"package-summary.html\">"
+ "pkg1</a></span><span class=\"tabEnd\">&nbsp;</span></caption>", + "pkg1</a></span><span class=\"tab-end\">&nbsp;</span></caption>",
"<caption><span>Classes in <a href=\"package-summary.html\">" "<caption><span>Classes in <a href=\"package-summary.html\">"
+ "pkg1</a> used by <a href=\"package-summary.html\">pkg1</a>" + "pkg1</a> used by <a href=\"package-summary.html\">pkg1</a>"
+ "</span><span class=\"tabEnd\">&nbsp;</span></caption>"); + "</span><span class=\"tab-end\">&nbsp;</span></caption>");
checkOutput("pkg2/package-use.html", true, checkOutput("pkg2/package-use.html", true,
"<caption><span>Packages that use <a href=\"package-summary.html\">" "<caption><span>Packages that use <a href=\"package-summary.html\">"
+ "pkg2</a></span><span class=\"tabEnd\">&nbsp;</span></caption>", + "pkg2</a></span><span class=\"tab-end\">&nbsp;</span></caption>",
"<caption><span>Classes in <a href=\"package-summary.html\">" "<caption><span>Classes in <a href=\"package-summary.html\">"
+ "pkg2</a> used by <a href=\"../pkg1/package-summary.html\">pkg1</a>" + "pkg2</a> used by <a href=\"../pkg1/package-summary.html\">pkg1</a>"
+ "</span><span class=\"tabEnd\">&nbsp;</span></caption>"); + "</span><span class=\"tab-end\">&nbsp;</span></caption>");
// Deprecated // Deprecated
checkOutput("deprecated-list.html", true, checkOutput("deprecated-list.html", true,
"<caption><span>Fields</span><span class=\"tabEnd\">" "<caption><span>Fields</span><span class=\"tab-end\">"
+ "&nbsp;</span></caption>", + "&nbsp;</span></caption>",
"<caption><span>Methods</span><span class=\"tabEnd\">" "<caption><span>Methods</span><span class=\"tab-end\">"
+ "&nbsp;</span></caption>"); + "&nbsp;</span></caption>");
// Constant values // Constant values
checkOutput("constant-values.html", true, checkOutput("constant-values.html", true,
"<caption><span>pkg1.<a href=\"pkg1/C1.html\" title=\"class in pkg1\">" "<caption><span>pkg1.<a href=\"pkg1/C1.html\" title=\"class in pkg1\">"
+ "C1</a></span><span class=\"tabEnd\">&nbsp;</span></caption>"); + "C1</a></span><span class=\"tab-end\">&nbsp;</span></caption>");
// Overview Summary // Overview Summary
checkOutput("index.html", true, checkOutput("index.html", true,
"<caption><span>Packages</span><span class=\"tabEnd\">&nbsp;</span></caption>"); "<caption><span>Packages</span><span class=\"tab-end\">&nbsp;</span></caption>");
} }
/* /*
@ -361,116 +361,116 @@ public class TestHtmlTableTags extends JavadocTester {
void checkHtmlTableHeaders() { void checkHtmlTableHeaders() {
//Package summary //Package summary
checkOutput("pkg1/package-summary.html", true, checkOutput("pkg1/package-summary.html", true,
"<th class=\"colFirst\" scope=\"col\">" "<th class=\"col-first\" scope=\"col\">"
+ "Class</th>\n" + "Class</th>\n"
+ "<th class=\"colLast\" scope=\"col\"" + "<th class=\"col-last\" scope=\"col\""
+ ">Description</th>", + ">Description</th>",
"<th class=\"colFirst\" scope=\"col\">" "<th class=\"col-first\" scope=\"col\">"
+ "Interface</th>\n" + "Interface</th>\n"
+ "<th class=\"colLast\" scope=\"col\"" + "<th class=\"col-last\" scope=\"col\""
+ ">Description</th>"); + ">Description</th>");
checkOutput("pkg2/package-summary.html", true, checkOutput("pkg2/package-summary.html", true,
"<th class=\"colFirst\" scope=\"col\">" "<th class=\"col-first\" scope=\"col\">"
+ "Enum</th>\n" + "Enum</th>\n"
+ "<th class=\"colLast\" scope=\"col\"" + "<th class=\"col-last\" scope=\"col\""
+ ">Description</th>", + ">Description</th>",
"<th class=\"colFirst\" scope=\"col\">" "<th class=\"col-first\" scope=\"col\">"
+ "Annotation Type</th>\n" + "Annotation Type</th>\n"
+ "<th class=\"colLast\"" + "<th class=\"col-last\""
+ " scope=\"col\">Description</th>"); + " scope=\"col\">Description</th>");
// Class documentation // Class documentation
checkOutput("pkg1/C1.html", true, checkOutput("pkg1/C1.html", true,
"<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n" "<th class=\"col-first\" scope=\"col\">Modifier and Type</th>\n"
+ "<th class=\"colSecond\" scope=\"col\">Field</th>\n" + "<th class=\"col-second\" scope=\"col\">Field</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>", + "<th class=\"col-last\" scope=\"col\">Description</th>",
"<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n" "<th class=\"col-first\" scope=\"col\">Modifier and Type</th>\n"
+ "<th class=\"colSecond\" scope=\"col\">Method</th>\n" + "<th class=\"col-second\" scope=\"col\">Method</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>"); + "<th class=\"col-last\" scope=\"col\">Description</th>");
checkOutput("pkg2/C2.html", true, checkOutput("pkg2/C2.html", true,
"<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n" "<th class=\"col-first\" scope=\"col\">Modifier and Type</th>\n"
+ "<th class=\"colSecond\" scope=\"col\">Class</th>\n" + "<th class=\"col-second\" scope=\"col\">Class</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>", + "<th class=\"col-last\" scope=\"col\">Description</th>",
"<th class=\"colFirst\" scope=\"col\">Constructor</th>\n" "<th class=\"col-first\" scope=\"col\">Constructor</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>"); + "<th class=\"col-last\" scope=\"col\">Description</th>");
checkOutput("pkg2/C2.ModalExclusionType.html", true, checkOutput("pkg2/C2.ModalExclusionType.html", true,
"<th class=\"colFirst\" scope=\"col\">Enum Constant</th>\n" "<th class=\"col-first\" scope=\"col\">Enum Constant</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>"); + "<th class=\"col-last\" scope=\"col\">Description</th>");
checkOutput("pkg2/C3.html", true, checkOutput("pkg2/C3.html", true,
"<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n" "<th class=\"col-first\" scope=\"col\">Modifier and Type</th>\n"
+ "<th class=\"colSecond\" scope=\"col\">Required Element</th>\n" + "<th class=\"col-second\" scope=\"col\">Required Element</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>"); + "<th class=\"col-last\" scope=\"col\">Description</th>");
checkOutput("pkg2/C4.html", true, checkOutput("pkg2/C4.html", true,
"<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n" "<th class=\"col-first\" scope=\"col\">Modifier and Type</th>\n"
+ "<th class=\"colSecond\" scope=\"col\">Optional Element</th>\n" + "<th class=\"col-second\" scope=\"col\">Optional Element</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>"); + "<th class=\"col-last\" scope=\"col\">Description</th>");
// Class use documentation // Class use documentation
checkOutput("pkg1/class-use/I1.html", true, checkOutput("pkg1/class-use/I1.html", true,
"<th class=\"colFirst\" scope=\"col\">Package</th>\n" "<th class=\"col-first\" scope=\"col\">Package</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>"); + "<th class=\"col-last\" scope=\"col\">Description</th>");
checkOutput("pkg1/class-use/C1.html", true, checkOutput("pkg1/class-use/C1.html", true,
"<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n" "<th class=\"col-first\" scope=\"col\">Modifier and Type</th>\n"
+ "<th class=\"colSecond\" scope=\"col\">Field</th>\n" + "<th class=\"col-second\" scope=\"col\">Field</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>", + "<th class=\"col-last\" scope=\"col\">Description</th>",
"<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n" "<th class=\"col-first\" scope=\"col\">Modifier and Type</th>\n"
+ "<th class=\"colSecond\" scope=\"col\">Method</th>\n" + "<th class=\"col-second\" scope=\"col\">Method</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>"); + "<th class=\"col-last\" scope=\"col\">Description</th>");
checkOutput("pkg2/class-use/C2.html", true, checkOutput("pkg2/class-use/C2.html", true,
"<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n" "<th class=\"col-first\" scope=\"col\">Modifier and Type</th>\n"
+ "<th class=\"colSecond\" scope=\"col\">Field</th>\n" + "<th class=\"col-second\" scope=\"col\">Field</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>", + "<th class=\"col-last\" scope=\"col\">Description</th>",
"<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n" "<th class=\"col-first\" scope=\"col\">Modifier and Type</th>\n"
+ "<th class=\"colSecond\" scope=\"col\">Method</th>\n" + "<th class=\"col-second\" scope=\"col\">Method</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>"); + "<th class=\"col-last\" scope=\"col\">Description</th>");
checkOutput("pkg2/class-use/C2.ModalExclusionType.html", true, checkOutput("pkg2/class-use/C2.ModalExclusionType.html", true,
"<th class=\"colFirst\" scope=\"col\">Package</th>\n" "<th class=\"col-first\" scope=\"col\">Package</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>", + "<th class=\"col-last\" scope=\"col\">Description</th>",
"<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n" "<th class=\"col-first\" scope=\"col\">Modifier and Type</th>\n"
+ "<th class=\"colSecond\" scope=\"col\">Method</th>\n" + "<th class=\"col-second\" scope=\"col\">Method</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>"); + "<th class=\"col-last\" scope=\"col\">Description</th>");
// Package use documentation // Package use documentation
checkOutput("pkg1/package-use.html", true, checkOutput("pkg1/package-use.html", true,
"<th class=\"colFirst\" scope=\"col\">Package</th>\n" "<th class=\"col-first\" scope=\"col\">Package</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>", + "<th class=\"col-last\" scope=\"col\">Description</th>",
"<th class=\"colFirst\" scope=\"col\">Class</th>\n" "<th class=\"col-first\" scope=\"col\">Class</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>"); + "<th class=\"col-last\" scope=\"col\">Description</th>");
checkOutput("pkg2/package-use.html", true, checkOutput("pkg2/package-use.html", true,
"<th class=\"colFirst\" scope=\"col\">Package</th>\n" "<th class=\"col-first\" scope=\"col\">Package</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>", + "<th class=\"col-last\" scope=\"col\">Description</th>",
"<th class=\"colFirst\" scope=\"col\">Class</th>\n" "<th class=\"col-first\" scope=\"col\">Class</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>"); + "<th class=\"col-last\" scope=\"col\">Description</th>");
// Deprecated // Deprecated
checkOutput("deprecated-list.html", true, checkOutput("deprecated-list.html", true,
"<th class=\"colFirst\" scope=\"col\">Field</th>\n" "<th class=\"col-first\" scope=\"col\">Field</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>", + "<th class=\"col-last\" scope=\"col\">Description</th>",
"<th class=\"colFirst\" scope=\"col\">Method</th>\n" "<th class=\"col-first\" scope=\"col\">Method</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>"); + "<th class=\"col-last\" scope=\"col\">Description</th>");
// Constant values // Constant values
checkOutput("constant-values.html", true, checkOutput("constant-values.html", true,
"<th class=\"colFirst\" scope=\"col\">" "<th class=\"col-first\" scope=\"col\">"
+ "Modifier and Type</th>\n" + "Modifier and Type</th>\n"
+ "<th class=\"colSecond\"" + "<th class=\"col-second\""
+ " scope=\"col\">Constant Field</th>\n" + " scope=\"col\">Constant Field</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Value</th>"); + "<th class=\"col-last\" scope=\"col\">Value</th>");
// Overview Summary // Overview Summary
checkOutput("index.html", true, checkOutput("index.html", true,
"<th class=\"colFirst\" scope=\"col\">" "<th class=\"col-first\" scope=\"col\">"
+ "Package</th>\n" + "Package</th>\n"
+ "<th class=\"colLast\" scope=\"col\"" + "<th class=\"col-last\" scope=\"col\""
+ ">Description</th>"); + ">Description</th>");
} }
} }

6
test/langtools/jdk/javadoc/doclet/testHtmlTag/TestHtmlTag.java
View file

@ -107,7 +107,7 @@ public class TestHtmlTag extends JavadocTester {
checkExit(Exit.OK); checkExit(Exit.OK);
checkOutput("pkg3/package-summary.html", true, checkOutput("pkg3/package-summary.html", true,
"<section class=\"packageDescription\" id=\"package.description\">\n" "<section class=\"package-description\" id=\"package.description\">\n"
+ "<div class=\"block\"><p>This is the first line. Note the newlines before the &lt;p&gt; is relevant.</div>\n" + "<div class=\"block\"><p>This is the first line. Note the newlines before the &lt;p&gt; is relevant.</div>\n"
+ "</section>"); + "</section>");
@ -154,7 +154,7 @@ public class TestHtmlTag extends JavadocTester {
+ " </ol></div>"); + " </ol></div>");
checkOutput("pkg3/A.ActivationDesc.html", true, checkOutput("pkg3/A.ActivationDesc.html", true,
"<pre>public class <span class=\"typeNameLabel\">A.ActivationDesc</span>\n" "<pre>public class <span class=\"type-name-label\">A.ActivationDesc</span>\n"
+ "extends java.lang.Object\n" + "extends java.lang.Object\n"
+ "implements java.io.Serializable</pre>\n" + "implements java.io.Serializable</pre>\n"
+ "<div class=\"block\">An activation descriptor contains the information necessary to activate\n" + "<div class=\"block\">An activation descriptor contains the information necessary to activate\n"
@ -175,7 +175,7 @@ public class TestHtmlTag extends JavadocTester {
+ " during reinitialization/activation.</div>"); + " during reinitialization/activation.</div>");
checkOutput("pkg3/A.ActivationGroupID.html", true, checkOutput("pkg3/A.ActivationGroupID.html", true,
"<pre>public class <span class=\"typeNameLabel\">A.ActivationGroupID</span>\n" "<pre>public class <span class=\"type-name-label\">A.ActivationGroupID</span>\n"
+ "extends java.lang.Object\n" + "extends java.lang.Object\n"
+ "implements java.io.Serializable</pre>\n" + "implements java.io.Serializable</pre>\n"
+ "<div class=\"block\">The identifier for a registered activation group serves several purposes:\n" + "<div class=\"block\">The identifier for a registered activation group serves several purposes:\n"

318
test/langtools/jdk/javadoc/doclet/testHtmlVersion/TestHtmlVersion.java
View file

@ -71,11 +71,11 @@ public class TestHtmlVersion extends JavadocTester {
checkOutput("index.html", true, checkOutput("index.html", true,
"<!DOCTYPE HTML>", "<!DOCTYPE HTML>",
"<meta name=\"dc.created\"", "<meta name=\"dc.created\"",
"<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n", "<ul id=\"navbar.top.firstrow\" class=\"nav-list\" title=\"Navigation\">\n",
"<div class=\"overviewSummary\">\n" "<div class=\"overview-summary\">\n"
+ "<table>\n" + "<table>\n"
+ "<caption>", + "<caption>",
"<header role=\"banner\" class=\"flexHeader\">\n" "<header role=\"banner\" class=\"flex-header\">\n"
+ "<nav role=\"navigation\">\n" + "<nav role=\"navigation\">\n"
+ "<!-- ========= START OF TOP NAVBAR ======= -->", + "<!-- ========= START OF TOP NAVBAR ======= -->",
"<footer role=\"contentinfo\">\n" "<footer role=\"contentinfo\">\n"
@ -86,14 +86,14 @@ public class TestHtmlVersion extends JavadocTester {
checkOutput("pkg/package-summary.html", true, checkOutput("pkg/package-summary.html", true,
"<!DOCTYPE HTML>", "<!DOCTYPE HTML>",
"<meta name=\"dc.created\"", "<meta name=\"dc.created\"",
"<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n", "<ul id=\"navbar.top.firstrow\" class=\"nav-list\" title=\"Navigation\">\n",
"<div class=\"typeSummary\">\n<table>", "<div class=\"type-summary\">\n<table>",
"<header role=\"banner\" class=\"flexHeader\">\n" "<header role=\"banner\" class=\"flex-header\">\n"
+ "<nav role=\"navigation\">\n" + "<nav role=\"navigation\">\n"
+ "<!-- ========= START OF TOP NAVBAR ======= -->", + "<!-- ========= START OF TOP NAVBAR ======= -->",
"<main role=\"main\">\n" "<main role=\"main\">\n"
+ "<div class=\"header\">", + "<div class=\"header\">",
"<section class=\"packageDescription\" id=\"package.description\">\n" "<section class=\"package-description\" id=\"package.description\">\n"
+ "<div class=\"block\">Test package.</div>", + "<div class=\"block\">Test package.</div>",
"<footer role=\"contentinfo\">\n" "<footer role=\"contentinfo\">\n"
+ "<nav role=\"navigation\">\n" + "<nav role=\"navigation\">\n"
@ -101,18 +101,18 @@ public class TestHtmlVersion extends JavadocTester {
// No package description // No package description
checkOutput("pkg1/package-summary.html", true, checkOutput("pkg1/package-summary.html", true,
"<section class=\"summary\">\n" "<section class=\"summary\">\n"
+ "<ul class=\"blockList\">\n" + "<ul class=\"block-list\">\n"
+ "<li class=\"blockList\">\n" + "<li class=\"block-list\">\n"
+ "<div class=\"typeSummary\">\n<table>\n" + "<div class=\"type-summary\">\n<table>\n"
+ "<caption><span>Class Summary</span><span class=\"tabEnd\">&nbsp;</span></caption>"); + "<caption><span>Class Summary</span><span class=\"tab-end\">&nbsp;</span></caption>");
// Test for package-tree page // Test for package-tree page
checkOutput("pkg/package-tree.html", true, checkOutput("pkg/package-tree.html", true,
"<!DOCTYPE HTML>", "<!DOCTYPE HTML>",
"<meta name=\"dc.created\"", "<meta name=\"dc.created\"",
"<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n", "<ul id=\"navbar.top.firstrow\" class=\"nav-list\" title=\"Navigation\">\n",
"<li class=\"circle\">", "<li class=\"circle\">",
"<header role=\"banner\" class=\"flexHeader\">\n" "<header role=\"banner\" class=\"flex-header\">\n"
+ "<nav role=\"navigation\">\n" + "<nav role=\"navigation\">\n"
+ "<!-- ========= START OF TOP NAVBAR ======= -->", + "<!-- ========= START OF TOP NAVBAR ======= -->",
"<main role=\"main\">\n" "<main role=\"main\">\n"
@ -133,9 +133,9 @@ public class TestHtmlVersion extends JavadocTester {
checkOutput("pkg1/package-use.html", true, checkOutput("pkg1/package-use.html", true,
"<!DOCTYPE HTML>", "<!DOCTYPE HTML>",
"<meta name=\"dc.created\"", "<meta name=\"dc.created\"",
"<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n", "<ul id=\"navbar.top.firstrow\" class=\"nav-list\" title=\"Navigation\">\n",
"<div class=\"useSummary\">\n<table>", "<div class=\"use-summary\">\n<table>",
"<header role=\"banner\" class=\"flexHeader\">\n" "<header role=\"banner\" class=\"flex-header\">\n"
+ "<nav role=\"navigation\">\n" + "<nav role=\"navigation\">\n"
+ "<!-- ========= START OF TOP NAVBAR ======= -->", + "<!-- ========= START OF TOP NAVBAR ======= -->",
"<main role=\"main\">\n" "<main role=\"main\">\n"
@ -148,16 +148,16 @@ public class TestHtmlVersion extends JavadocTester {
checkOutput("constant-values.html", true, checkOutput("constant-values.html", true,
"<!DOCTYPE HTML>", "<!DOCTYPE HTML>",
"<meta name=\"dc.created\"", "<meta name=\"dc.created\"",
"<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n", "<ul id=\"navbar.top.firstrow\" class=\"nav-list\" title=\"Navigation\">\n",
"<div class=\"constantsSummary\">\n<table>", "<div class=\"constants-summary\">\n<table>",
"<header role=\"banner\" class=\"flexHeader\">\n" "<header role=\"banner\" class=\"flex-header\">\n"
+ "<nav role=\"navigation\">\n" + "<nav role=\"navigation\">\n"
+ "<!-- ========= START OF TOP NAVBAR ======= -->", + "<!-- ========= START OF TOP NAVBAR ======= -->",
"<main role=\"main\">\n" "<main role=\"main\">\n"
+ "<div class=\"header\">", + "<div class=\"header\">",
"<section class=\"packages\">\n" "<section class=\"packages\">\n"
+ "<h2 title=\"Contents\">Contents</h2>\n", + "<h2 title=\"Contents\">Contents</h2>\n",
"<section class=\"constantsSummary\" id=\"pkg\">\n" "<section class=\"constants-summary\" id=\"pkg\">\n"
+ "<h2 title=\"pkg\">pkg.*</h2>\n", + "<h2 title=\"pkg\">pkg.*</h2>\n",
"<footer role=\"contentinfo\">\n" "<footer role=\"contentinfo\">\n"
+ "<nav role=\"navigation\">\n" + "<nav role=\"navigation\">\n"
@ -167,9 +167,9 @@ public class TestHtmlVersion extends JavadocTester {
checkOutput("deprecated-list.html", true, checkOutput("deprecated-list.html", true,
"<!DOCTYPE HTML>", "<!DOCTYPE HTML>",
"<meta name=\"dc.created\"", "<meta name=\"dc.created\"",
"<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n", "<ul id=\"navbar.top.firstrow\" class=\"nav-list\" title=\"Navigation\">\n",
"<div class=\"deprecatedSummary\" id=\"class\">\n<table>", "<div class=\"deprecated-summary\" id=\"class\">\n<table>",
"<header role=\"banner\" class=\"flexHeader\">\n" "<header role=\"banner\" class=\"flex-header\">\n"
+ "<nav role=\"navigation\">\n" + "<nav role=\"navigation\">\n"
+ "<!-- ========= START OF TOP NAVBAR ======= -->", + "<!-- ========= START OF TOP NAVBAR ======= -->",
"<main role=\"main\">\n" "<main role=\"main\">\n"
@ -182,13 +182,13 @@ public class TestHtmlVersion extends JavadocTester {
checkOutput("serialized-form.html", true, checkOutput("serialized-form.html", true,
"<!DOCTYPE HTML>", "<!DOCTYPE HTML>",
"<meta name=\"dc.created\"", "<meta name=\"dc.created\"",
"<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n", "<ul id=\"navbar.top.firstrow\" class=\"nav-list\" title=\"Navigation\">\n",
"<header role=\"banner\" class=\"flexHeader\">\n" "<header role=\"banner\" class=\"flex-header\">\n"
+ "<nav role=\"navigation\">\n" + "<nav role=\"navigation\">\n"
+ "<!-- ========= START OF TOP NAVBAR ======= -->", + "<!-- ========= START OF TOP NAVBAR ======= -->",
"<main role=\"main\">\n" "<main role=\"main\">\n"
+ "<div class=\"header\">", + "<div class=\"header\">",
"<section class=\"serializedPackageContainer\">\n" "<section class=\"serialized-package-container\">\n"
+ "<h2 title=\"Package\">Package&nbsp;pkg</h2>\n", + "<h2 title=\"Package\">Package&nbsp;pkg</h2>\n",
"<footer role=\"contentinfo\">\n" "<footer role=\"contentinfo\">\n"
+ "<nav role=\"navigation\">\n" + "<nav role=\"navigation\">\n"
@ -198,9 +198,9 @@ public class TestHtmlVersion extends JavadocTester {
checkOutput("overview-tree.html", true, checkOutput("overview-tree.html", true,
"<!DOCTYPE HTML>", "<!DOCTYPE HTML>",
"<meta name=\"dc.created\"", "<meta name=\"dc.created\"",
"<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n", "<ul id=\"navbar.top.firstrow\" class=\"nav-list\" title=\"Navigation\">\n",
"<li class=\"circle\">", "<li class=\"circle\">",
"<header role=\"banner\" class=\"flexHeader\">\n" "<header role=\"banner\" class=\"flex-header\">\n"
+ "<nav role=\"navigation\">\n" + "<nav role=\"navigation\">\n"
+ "<!-- ========= START OF TOP NAVBAR ======= -->", + "<!-- ========= START OF TOP NAVBAR ======= -->",
"<main role=\"main\">\n" "<main role=\"main\">\n"
@ -221,12 +221,12 @@ public class TestHtmlVersion extends JavadocTester {
checkOutput("index-all.html", true, checkOutput("index-all.html", true,
"<!DOCTYPE HTML>", "<!DOCTYPE HTML>",
"<meta name=\"dc.created\"", "<meta name=\"dc.created\"",
"<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n", "<ul id=\"navbar.top.firstrow\" class=\"nav-list\" title=\"Navigation\">\n",
"<header role=\"banner\" class=\"flexHeader\">\n" "<header role=\"banner\" class=\"flex-header\">\n"
+ "<nav role=\"navigation\">\n" + "<nav role=\"navigation\">\n"
+ "<!-- ========= START OF TOP NAVBAR ======= -->", + "<!-- ========= START OF TOP NAVBAR ======= -->",
"</header>\n" "</header>\n"
+ "<div class=\"flexContent\">\n" + "<div class=\"flex-content\">\n"
+ "<main role=\"main\">", + "<main role=\"main\">",
"<footer role=\"contentinfo\">\n" "<footer role=\"contentinfo\">\n"
+ "<nav role=\"navigation\">\n" + "<nav role=\"navigation\">\n"
@ -236,23 +236,23 @@ public class TestHtmlVersion extends JavadocTester {
checkOutput("src-html/pkg/AnotherClass.html", true, checkOutput("src-html/pkg/AnotherClass.html", true,
"<!DOCTYPE HTML>", "<!DOCTYPE HTML>",
"<main role=\"main\">\n" "<main role=\"main\">\n"
+ "<div class=\"sourceContainer\">"); + "<div class=\"source-container\">");
// Test for help-doc page // Test for help-doc page
checkOutput("help-doc.html", true, checkOutput("help-doc.html", true,
"<!DOCTYPE HTML>", "<!DOCTYPE HTML>",
"<meta name=\"dc.created\"", "<meta name=\"dc.created\"",
"<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n", "<ul id=\"navbar.top.firstrow\" class=\"nav-list\" title=\"Navigation\">\n",
"<header role=\"banner\" class=\"flexHeader\">\n" "<header role=\"banner\" class=\"flex-header\">\n"
+ "<nav role=\"navigation\">\n" + "<nav role=\"navigation\">\n"
+ "<!-- ========= START OF TOP NAVBAR ======= -->", + "<!-- ========= START OF TOP NAVBAR ======= -->",
"<main role=\"main\">\n" "<main role=\"main\">\n"
+ "<div class=\"header\">", + "<div class=\"header\">",
"<section class=\"helpSection\">\n" "<section class=\"help-section\">\n"
+ "<h2>Overview</h2>\n", + "<h2>Overview</h2>\n",
"<section class=\"helpSection\">\n" "<section class=\"help-section\">\n"
+ "<h2>Package</h2>\n", + "<h2>Package</h2>\n",
"<section class=\"helpSection\">\n" "<section class=\"help-section\">\n"
+ "<h2>Class or Interface</h2>\n", + "<h2>Class or Interface</h2>\n",
"<footer role=\"contentinfo\">\n" "<footer role=\"contentinfo\">\n"
+ "<nav role=\"navigation\">\n" + "<nav role=\"navigation\">\n"
@ -262,29 +262,29 @@ public class TestHtmlVersion extends JavadocTester {
checkOutput("pkg/AnotherClass.html", true, checkOutput("pkg/AnotherClass.html", true,
"<!DOCTYPE HTML>", "<!DOCTYPE HTML>",
"<meta name=\"dc.created\"", "<meta name=\"dc.created\"",
"<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n", "<ul id=\"navbar.top.firstrow\" class=\"nav-list\" title=\"Navigation\">\n",
"<header role=\"banner\" class=\"flexHeader\">\n" "<header role=\"banner\" class=\"flex-header\">\n"
+ "<nav role=\"navigation\">\n" + "<nav role=\"navigation\">\n"
+ "<!-- ========= START OF TOP NAVBAR ======= -->", + "<!-- ========= START OF TOP NAVBAR ======= -->",
"<main role=\"main\">\n" "<main role=\"main\">\n"
+ "<!-- ======== START OF CLASS DATA ======== -->\n" + "<!-- ======== START OF CLASS DATA ======== -->\n"
+ "<div class=\"header\">", + "<div class=\"header\">",
"<section class=\"nestedClassSummary\" id=\"nested.class.summary\">\n" "<section class=\"nested-class-summary\" id=\"nested.class.summary\">\n"
+ "<h2>Nested Class Summary</h2>\n" + "<h2>Nested Class Summary</h2>\n"
+ "<div class=\"memberSummary\">\n<table>", + "<div class=\"member-summary\">\n<table>",
"<section class=\"fieldSummary\" id=\"field.summary\">\n" "<section class=\"field-summary\" id=\"field.summary\">\n"
+ "<h2>Field Summary</h2>\n" + "<h2>Field Summary</h2>\n"
+ "<div class=\"memberSummary\">\n<table>", + "<div class=\"member-summary\">\n<table>",
"<section class=\"constructorSummary\" id=\"constructor.summary\">\n" "<section class=\"constructor-summary\" id=\"constructor.summary\">\n"
+ "<h2>Constructor Summary</h2>\n" + "<h2>Constructor Summary</h2>\n"
+ "<div class=\"memberSummary\">\n<table>", + "<div class=\"member-summary\">\n<table>",
"<section class=\"methodSummary\" id=\"method.summary\">\n" "<section class=\"method-summary\" id=\"method.summary\">\n"
+ "<h2>Method Summary</h2>", + "<h2>Method Summary</h2>",
"<section class=\"fieldDetails\" id=\"field.detail\">\n" "<section class=\"field-details\" id=\"field.detail\">\n"
+ "<h2>Field Details</h2>\n", + "<h2>Field Details</h2>\n",
"<section class=\"constructorDetails\" id=\"constructor.detail\">\n" "<section class=\"constructor-details\" id=\"constructor.detail\">\n"
+ "<h2>Constructor Details</h2>\n", + "<h2>Constructor Details</h2>\n",
"<section class=\"methodDetails\" id=\"method.detail\">\n" "<section class=\"method-details\" id=\"method.detail\">\n"
+ "<h2>Method Details</h2>\n", + "<h2>Method Details</h2>\n",
"<footer role=\"contentinfo\">\n" "<footer role=\"contentinfo\">\n"
+ "<nav role=\"navigation\">\n" + "<nav role=\"navigation\">\n"
@ -294,24 +294,24 @@ public class TestHtmlVersion extends JavadocTester {
checkOutput("pkg/AnotherClass.ModalExclusionType.html", true, checkOutput("pkg/AnotherClass.ModalExclusionType.html", true,
"<!DOCTYPE HTML>", "<!DOCTYPE HTML>",
"<meta name=\"dc.created\"", "<meta name=\"dc.created\"",
"<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n", "<ul id=\"navbar.top.firstrow\" class=\"nav-list\" title=\"Navigation\">\n",
"<header role=\"banner\" class=\"flexHeader\">\n" "<header role=\"banner\" class=\"flex-header\">\n"
+ "<nav role=\"navigation\">\n" + "<nav role=\"navigation\">\n"
+ "<!-- ========= START OF TOP NAVBAR ======= -->", + "<!-- ========= START OF TOP NAVBAR ======= -->",
"<main role=\"main\">\n" "<main role=\"main\">\n"
+ "<!-- ======== START OF CLASS DATA ======== -->\n" + "<!-- ======== START OF CLASS DATA ======== -->\n"
+ "<div class=\"header\">", + "<div class=\"header\">",
"<section class=\"constantsSummary\" id=\"enum.constant.summary\">\n" "<section class=\"constants-summary\" id=\"enum.constant.summary\">\n"
+ "<h2>Enum Constant Summary</h2>\n" + "<h2>Enum Constant Summary</h2>\n"
+ "<div class=\"memberSummary\">\n", + "<div class=\"member-summary\">\n",
"<table aria-labelledby=\"t0\">\n", "<table aria-labelledby=\"t0\">\n",
"<section class=\"methodSummary\" id=\"method.summary\">\n" "<section class=\"method-summary\" id=\"method.summary\">\n"
+ "<h2>Method Summary</h2>\n" + "<h2>Method Summary</h2>\n"
+ "<div class=\"memberSummary\">\n", + "<div class=\"member-summary\">\n",
"<table aria-labelledby=\"t0\">", "<table aria-labelledby=\"t0\">",
"<section class=\"constantDetails\" id=\"enum.constant.detail\">\n" "<section class=\"constant-details\" id=\"enum.constant.detail\">\n"
+ "<h2>Enum Constant Details</h2>\n", + "<h2>Enum Constant Details</h2>\n",
"<section class=\"methodDetails\" id=\"method.detail\">\n" "<section class=\"method-details\" id=\"method.detail\">\n"
+ "<h2>Method Details</h2>\n", + "<h2>Method Details</h2>\n",
"<footer role=\"contentinfo\">\n" "<footer role=\"contentinfo\">\n"
+ "<nav role=\"navigation\">\n" + "<nav role=\"navigation\">\n"
@ -321,18 +321,18 @@ public class TestHtmlVersion extends JavadocTester {
checkOutput("pkg2/Interface.html", true, checkOutput("pkg2/Interface.html", true,
"<!DOCTYPE HTML>", "<!DOCTYPE HTML>",
"<meta name=\"dc.created\"", "<meta name=\"dc.created\"",
"<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n", "<ul id=\"navbar.top.firstrow\" class=\"nav-list\" title=\"Navigation\">\n",
"<header role=\"banner\" class=\"flexHeader\">\n" "<header role=\"banner\" class=\"flex-header\">\n"
+ "<nav role=\"navigation\">\n" + "<nav role=\"navigation\">\n"
+ "<!-- ========= START OF TOP NAVBAR ======= -->", + "<!-- ========= START OF TOP NAVBAR ======= -->",
"<main role=\"main\">\n" "<main role=\"main\">\n"
+ "<!-- ======== START OF CLASS DATA ======== -->\n" + "<!-- ======== START OF CLASS DATA ======== -->\n"
+ "<div class=\"header\">", + "<div class=\"header\">",
"<section class=\"methodSummary\" id=\"method.summary\">\n" "<section class=\"method-summary\" id=\"method.summary\">\n"
+ "<h2>Method Summary</h2>\n" + "<h2>Method Summary</h2>\n"
+ "<div class=\"memberSummary\">\n", + "<div class=\"member-summary\">\n",
"<table aria-labelledby=\"t0\">\n", "<table aria-labelledby=\"t0\">\n",
"<section class=\"methodDetails\" id=\"method.detail\">\n" "<section class=\"method-details\" id=\"method.detail\">\n"
+ "<h2>Method Details</h2>\n", + "<h2>Method Details</h2>\n",
"<footer role=\"contentinfo\">\n" "<footer role=\"contentinfo\">\n"
+ "<nav role=\"navigation\">\n" + "<nav role=\"navigation\">\n"
@ -342,16 +342,16 @@ public class TestHtmlVersion extends JavadocTester {
checkOutput("pkg/TestError.html", true, checkOutput("pkg/TestError.html", true,
"<!DOCTYPE HTML>", "<!DOCTYPE HTML>",
"<meta name=\"dc.created\"", "<meta name=\"dc.created\"",
"<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n", "<ul id=\"navbar.top.firstrow\" class=\"nav-list\" title=\"Navigation\">\n",
"<header role=\"banner\" class=\"flexHeader\">\n" "<header role=\"banner\" class=\"flex-header\">\n"
+ "<nav role=\"navigation\">\n" + "<nav role=\"navigation\">\n"
+ "<!-- ========= START OF TOP NAVBAR ======= -->", + "<!-- ========= START OF TOP NAVBAR ======= -->",
"<main role=\"main\">\n" "<main role=\"main\">\n"
+ "<!-- ======== START OF CLASS DATA ======== -->\n" + "<!-- ======== START OF CLASS DATA ======== -->\n"
+ "<div class=\"header\">", + "<div class=\"header\">",
"<section class=\"constructorSummary\" id=\"constructor.summary\">\n" "<section class=\"constructor-summary\" id=\"constructor.summary\">\n"
+ "<h2>Constructor Summary</h2>", + "<h2>Constructor Summary</h2>",
"<section class=\"constructorDetails\" id=\"constructor.detail\">\n" "<section class=\"constructor-details\" id=\"constructor.detail\">\n"
+ "<h2>Constructor Details</h2>\n", + "<h2>Constructor Details</h2>\n",
"<footer role=\"contentinfo\">\n" "<footer role=\"contentinfo\">\n"
+ "<nav role=\"navigation\">\n" + "<nav role=\"navigation\">\n"
@ -361,16 +361,16 @@ public class TestHtmlVersion extends JavadocTester {
checkOutput("pkg/TestException.html", true, checkOutput("pkg/TestException.html", true,
"<!DOCTYPE HTML>", "<!DOCTYPE HTML>",
"<meta name=\"dc.created\"", "<meta name=\"dc.created\"",
"<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n", "<ul id=\"navbar.top.firstrow\" class=\"nav-list\" title=\"Navigation\">\n",
"<header role=\"banner\" class=\"flexHeader\">\n" "<header role=\"banner\" class=\"flex-header\">\n"
+ "<nav role=\"navigation\">\n" + "<nav role=\"navigation\">\n"
+ "<!-- ========= START OF TOP NAVBAR ======= -->", + "<!-- ========= START OF TOP NAVBAR ======= -->",
"<main role=\"main\">\n" "<main role=\"main\">\n"
+ "<!-- ======== START OF CLASS DATA ======== -->\n" + "<!-- ======== START OF CLASS DATA ======== -->\n"
+ "<div class=\"header\">", + "<div class=\"header\">",
"<section class=\"constructorSummary\" id=\"constructor.summary\">\n" "<section class=\"constructor-summary\" id=\"constructor.summary\">\n"
+ "<h2>Constructor Summary</h2>", + "<h2>Constructor Summary</h2>",
"<section class=\"constructorDetails\" id=\"constructor.detail\">\n" "<section class=\"constructor-details\" id=\"constructor.detail\">\n"
+ "<h2>Constructor Details</h2>\n", + "<h2>Constructor Details</h2>\n",
"<footer role=\"contentinfo\">\n" "<footer role=\"contentinfo\">\n"
+ "<nav role=\"navigation\">\n" + "<nav role=\"navigation\">\n"
@ -380,24 +380,24 @@ public class TestHtmlVersion extends JavadocTester {
checkOutput("pkg2/TestAnnotationType.html", true, checkOutput("pkg2/TestAnnotationType.html", true,
"<!DOCTYPE HTML>", "<!DOCTYPE HTML>",
"<meta name=\"dc.created\"", "<meta name=\"dc.created\"",
"<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n", "<ul id=\"navbar.top.firstrow\" class=\"nav-list\" title=\"Navigation\">\n",
"<header role=\"banner\" class=\"flexHeader\">\n" "<header role=\"banner\" class=\"flex-header\">\n"
+ "<nav role=\"navigation\">\n" + "<nav role=\"navigation\">\n"
+ "<!-- ========= START OF TOP NAVBAR ======= -->", + "<!-- ========= START OF TOP NAVBAR ======= -->",
"<main role=\"main\">\n" "<main role=\"main\">\n"
+ "<!-- ======== START OF CLASS DATA ======== -->\n" + "<!-- ======== START OF CLASS DATA ======== -->\n"
+ "<div class=\"header\">", + "<div class=\"header\">",
"<section class=\"memberSummary\" id=\"annotation.type.required.element.summary\">\n" "<section class=\"member-summary\" id=\"annotation.type.required.element.summary\">\n"
+ "<h2>Required Element Summary</h2>\n" + "<h2>Required Element Summary</h2>\n"
+ "<div class=\"memberSummary\">\n<table>", + "<div class=\"member-summary\">\n<table>",
"<section class=\"memberSummary\" id=\"annotation.type.optional.element.summary\">\n" "<section class=\"member-summary\" id=\"annotation.type.optional.element.summary\">\n"
+ "<h2>Optional Element Summary</h2>\n" + "<h2>Optional Element Summary</h2>\n"
+ "<div class=\"memberSummary\">\n<table>", + "<div class=\"member-summary\">\n<table>",
"<section class=\"details\" id=\"annotation.type.element.detail\">\n" "<section class=\"details\" id=\"annotation.type.element.detail\">\n"
+ "<ul class=\"blockList\">\n" + "<ul class=\"block-list\">\n"
+ "<!-- ============ ANNOTATION TYPE MEMBER DETAIL =========== -->\n" + "<!-- ============ ANNOTATION TYPE MEMBER DETAIL =========== -->\n"
+ "<li class=\"blockList\">\n" + "<li class=\"block-list\">\n"
+ "<section class=\"memberDetails\">\n" + "<section class=\"member-details\">\n"
+ "<h2>Element Details</h2>\n", + "<h2>Element Details</h2>\n",
"<footer role=\"contentinfo\">\n" "<footer role=\"contentinfo\">\n"
+ "<nav role=\"navigation\">\n" + "<nav role=\"navigation\">\n"
@ -407,16 +407,16 @@ public class TestHtmlVersion extends JavadocTester {
checkOutput("pkg1/class-use/RegClass.html", true, checkOutput("pkg1/class-use/RegClass.html", true,
"<!DOCTYPE HTML>", "<!DOCTYPE HTML>",
"<meta name=\"dc.created\"", "<meta name=\"dc.created\"",
"<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n", "<ul id=\"navbar.top.firstrow\" class=\"nav-list\" title=\"Navigation\">\n",
"<header role=\"banner\" class=\"flexHeader\">\n" "<header role=\"banner\" class=\"flex-header\">\n"
+ "<nav role=\"navigation\">\n" + "<nav role=\"navigation\">\n"
+ "<!-- ========= START OF TOP NAVBAR ======= -->", + "<!-- ========= START OF TOP NAVBAR ======= -->",
"<main role=\"main\">\n" "<main role=\"main\">\n"
+ "<div class=\"header\">", + "<div class=\"header\">",
"<div class=\"useSummary\">\n<table>", "<div class=\"use-summary\">\n<table>",
"<section class=\"detail\" id=\"pkg\">\n" "<section class=\"detail\" id=\"pkg\">\n"
+ "<h2>Uses of <a href=\"../RegClass.html\" title=\"class in pkg1\">RegClass</a> in <a href=\"../../pkg/package-summary.html\">pkg</a></h2>\n" + "<h2>Uses of <a href=\"../RegClass.html\" title=\"class in pkg1\">RegClass</a> in <a href=\"../../pkg/package-summary.html\">pkg</a></h2>\n"
+ "<div class=\"useSummary\">\n<table>", + "<div class=\"use-summary\">\n<table>",
"<footer role=\"contentinfo\">\n" "<footer role=\"contentinfo\">\n"
+ "<nav role=\"navigation\">\n" + "<nav role=\"navigation\">\n"
+ "<!-- ======= START OF BOTTOM NAVBAR ====== -->"); + "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
@ -444,12 +444,12 @@ public class TestHtmlVersion extends JavadocTester {
+ "</a>", + "</a>",
"<section>\n" "<section>\n"
+ "<h2 title=\"PackagAnotherClass.ModalExclusionType.htmle pkg Description\">Package pkg Description</h2>\n", + "<h2 title=\"PackagAnotherClass.ModalExclusionType.htmle pkg Description\">Package pkg Description</h2>\n",
"<div class=\"typeSummary\">\n<table summary=\"Interface Summary table, listing interfaces, and an explanation\">", "<div class=\"type-summary\">\n<table summary=\"Interface Summary table, listing interfaces, and an explanation\">",
"<div class=\"typeSummary\">\n<table summary=\"Class Summary table, listing classes, and an explanation\">", "<div class=\"type-summary\">\n<table summary=\"Class Summary table, listing classes, and an explanation\">",
"<div class=\"typeSummary\">\n<table summary=\"Enum Summary table, listing enums, and an explanation\">", "<div class=\"type-summary\">\n<table summary=\"Enum Summary table, listing enums, and an explanation\">",
"<div class=\"typeSummary\">\n<table summary=\"Exception Summary table, listing exceptions, and an explanation\">", "<div class=\"type-summary\">\n<table summary=\"Exception Summary table, listing exceptions, and an explanation\">",
"<div class=\"typeSummary\">\n<table summary=\"Error Summary table, listing errors, and an explanation\">", "<div class=\"type-summary\">\n<table summary=\"Error Summary table, listing errors, and an explanation\">",
"<div class=\"typeSummary\">\n<table summary=\"Annotation Types Summary table, listing annotation types, and an explanation\">"); "<div class=\"type-summary\">\n<table summary=\"Annotation Types Summary table, listing annotation types, and an explanation\">");
// Negated test for package-tree page // Negated test for package-tree page
checkOutput("pkg/package-tree.html", false, checkOutput("pkg/package-tree.html", false,
@ -466,7 +466,7 @@ public class TestHtmlVersion extends JavadocTester {
"<a name=\"navbar.top.firstrow\">\n" "<a name=\"navbar.top.firstrow\">\n"
+ "<!-- -->\n" + "<!-- -->\n"
+ "</a>", + "</a>",
"<div class=\"useSummary\">\n" "<div class=\"use-summary\">\n"
+ "<table summary=\"Use table, listing packages, and an explanation\">"); + "<table summary=\"Use table, listing packages, and an explanation\">");
// Negated test for constant-values page // Negated test for constant-values page
@ -479,7 +479,7 @@ public class TestHtmlVersion extends JavadocTester {
"<!-- ========= END OF TOP NAVBAR ========= -->\n" "<!-- ========= END OF TOP NAVBAR ========= -->\n"
+ "</div>\n" + "</div>\n"
+ "<div class=\"header\">", + "<div class=\"header\">",
"<div class=\"constantsSummary\">\n" "<div class=\"constants-summary\">\n"
+ "<table summary=\"Constant Field Values table, listing constant fields, and values\">"); + "<table summary=\"Constant Field Values table, listing constant fields, and values\">");
// Negated test for deprecated-list page // Negated test for deprecated-list page
@ -494,16 +494,16 @@ public class TestHtmlVersion extends JavadocTester {
+ "<div class=\"header\">\n" + "<div class=\"header\">\n"
+ "<h1 title=\"Deprecated API\" class=\"title\">Deprecated API</h1>\n" + "<h1 title=\"Deprecated API\" class=\"title\">Deprecated API</h1>\n"
+ "<h2 title=\"Contents\">Contents</h2>", + "<h2 title=\"Contents\">Contents</h2>",
"<div class=\"deprecatedSummary\">\n<table summary=\"Classes table, listing classes, and an explanation\">", "<div class=\"deprecated-summary\">\n<table summary=\"Classes table, listing classes, and an explanation\">",
"<div class=\"deprecatedSummary\">\n<table summary=\"Enums table, listing enums, and an explanation\">", "<div class=\"deprecated-summary\">\n<table summary=\"Enums table, listing enums, and an explanation\">",
"<div class=\"deprecatedSummary\">\n<table summary=\"Exceptions table, listing exceptions, and an explanation\">", "<div class=\"deprecated-summary\">\n<table summary=\"Exceptions table, listing exceptions, and an explanation\">",
"<div class=\"deprecatedSummary\">\n<table summary=\"Errors table, listing errors, and an explanation\">", "<div class=\"deprecated-summary\">\n<table summary=\"Errors table, listing errors, and an explanation\">",
"<div class=\"deprecatedSummary\">\n<table summary=\"Annotation Types table, listing annotation types, and an explanation\">", "<div class=\"deprecated-summary\">\n<table summary=\"Annotation Types table, listing annotation types, and an explanation\">",
"<div class=\"deprecatedSummary\">\n<table summary=\"Fields table, listing fields, and an explanation\">", "<div class=\"deprecated-summary\">\n<table summary=\"Fields table, listing fields, and an explanation\">",
"<div class=\"deprecatedSummary\">\n<table summary=\"Methods table, listing methods, and an explanation\">", "<div class=\"deprecated-summary\">\n<table summary=\"Methods table, listing methods, and an explanation\">",
"<div class=\"deprecatedSummary\">\n<table summary=\"Constructors table, listing constructors, and an explanation\">", "<div class=\"deprecated-summary\">\n<table summary=\"Constructors table, listing constructors, and an explanation\">",
"<div class=\"deprecatedSummary\">\n<table summary=\"Enum Constants table, listing enum constants, and an explanation\">", "<div class=\"deprecated-summary\">\n<table summary=\"Enum Constants table, listing enum constants, and an explanation\">",
"<div class=\"deprecatedSummary\">\n<table summary=\"Annotation Type Elements table, listing annotation type elements, and an explanation\">"); "<div class=\"deprecated-summary\">\n<table summary=\"Annotation Type Elements table, listing annotation type elements, and an explanation\">");
// Negated test for serialized-form page // Negated test for serialized-form page
checkOutput("serialized-form.html", false, checkOutput("serialized-form.html", false,
@ -515,7 +515,7 @@ public class TestHtmlVersion extends JavadocTester {
"<!-- ========= END OF TOP NAVBAR ========= -->\n" "<!-- ========= END OF TOP NAVBAR ========= -->\n"
+ "</div>\n" + "</div>\n"
+ "<div class=\"header\">", + "<div class=\"header\">",
"<li class=\"blockList\">\n" "<li class=\"block-list\">\n"
+ "<h2 title=\"Package\">Package&nbsp;pkg</h2>"); + "<h2 title=\"Package\">Package&nbsp;pkg</h2>");
// Negated test for overview-tree page // Negated test for overview-tree page
@ -550,7 +550,7 @@ public class TestHtmlVersion extends JavadocTester {
checkOutput("src-html/pkg/AnotherClass.html", false, checkOutput("src-html/pkg/AnotherClass.html", false,
"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
"<body>\n" "<body>\n"
+ "<div class=\"sourceContainer\">"); + "<div class=\"source-container\">");
// Negated test for help-doc page // Negated test for help-doc page
checkOutput("help-doc.html", false, checkOutput("help-doc.html", false,
@ -562,12 +562,12 @@ public class TestHtmlVersion extends JavadocTester {
"<!-- ========= END OF TOP NAVBAR ========= -->\n" "<!-- ========= END OF TOP NAVBAR ========= -->\n"
+ "</div>\n" + "</div>\n"
+ "<div class=\"header\">", + "<div class=\"header\">",
"<ul class=\"blockList\">\n" "<ul class=\"block-list\">\n"
+ "<li class=\"blockList\">\n" + "<li class=\"block-list\">\n"
+ "<h2>Overview</h2>", + "<h2>Overview</h2>",
"<li class=\"blockList\">\n" "<li class=\"block-list\">\n"
+ "<h2>Package</h2>", + "<h2>Package</h2>",
"<li class=\"blockList\">\n" "<li class=\"block-list\">\n"
+ "<h2>Class/Interface</h2>"); + "<h2>Class/Interface</h2>");
// Negated test for a regular class page and members (nested class, field, constructore and method) // Negated test for a regular class page and members (nested class, field, constructore and method)
@ -578,52 +578,52 @@ public class TestHtmlVersion extends JavadocTester {
+ "<!-- -->\n" + "<!-- -->\n"
+ "</a>", + "</a>",
"<!-- ======== NESTED CLASS SUMMARY ======== -->\n" "<!-- ======== NESTED CLASS SUMMARY ======== -->\n"
+ "<ul class=\"blockList\">\n" + "<ul class=\"block-list\">\n"
+ "<li class=\"blockList\"><a name=\"nested.class.summary\">\n" + "<li class=\"block-list\"><a name=\"nested.class.summary\">\n"
+ "<!-- -->\n" + "<!-- -->\n"
+ "</a>\n" + "</a>\n"
+ "<h2>Nested Class Summary</h2>\n" + "<h2>Nested Class Summary</h2>\n"
+ "<div class=\"memberSummary\">\n" + "<div class=\"member-summary\">\n"
+ "<table summary=\"Nested Class Summary table, listing nested classes, and an explanation\">", + "<table summary=\"Nested Class Summary table, listing nested classes, and an explanation\">",
"<!-- =========== FIELD SUMMARY =========== -->\n" "<!-- =========== FIELD SUMMARY =========== -->\n"
+ "<ul class=\"blockList\">\n" + "<ul class=\"block-list\">\n"
+ "<li class=\"blockList\"><a name=\"field.summary\">\n" + "<li class=\"block-list\"><a name=\"field.summary\">\n"
+ "<!-- -->\n" + "<!-- -->\n"
+ "</a>\n" + "</a>\n"
+ "<h2>Field Summary</h2>\n" + "<h2>Field Summary</h2>\n"
+ "<div class=\"memberSummary\">\n" + "<div class=\"member-summary\">\n"
+ "<table summary=\"Field Summary table, listing fields, and an explanation\">", + "<table summary=\"Field Summary table, listing fields, and an explanation\">",
"<!-- ======== CONSTRUCTOR SUMMARY ======== -->\n" "<!-- ======== CONSTRUCTOR SUMMARY ======== -->\n"
+ "<ul class=\"blockList\">\n" + "<ul class=\"block-list\">\n"
+ "<li class=\"blockList\"><a name=\"constructor.summary\">\n" + "<li class=\"block-list\"><a name=\"constructor.summary\">\n"
+ "<!-- -->\n" + "<!-- -->\n"
+ "</a>\n" + "</a>\n"
+ "<h2>Constructor Summary</h2>\n" + "<h2>Constructor Summary</h2>\n"
+ "<div class=\"memberSummary\">\n" + "<div class=\"member-summary\">\n"
+ "<table summary=\"Constructor Summary table, listing constructors, and an explanation\">", + "<table summary=\"Constructor Summary table, listing constructors, and an explanation\">",
"<!-- ========== METHOD SUMMARY =========== -->\n" "<!-- ========== METHOD SUMMARY =========== -->\n"
+ "<ul class=\"blockList\">\n" + "<ul class=\"block-list\">\n"
+ "<li class=\"blockList\"><a name=\"method.summary\">\n" + "<li class=\"block-list\"><a name=\"method.summary\">\n"
+ "<!-- -->\n" + "<!-- -->\n"
+ "</a>\n" + "</a>\n"
+ "<h2>Method Summary</h2>\n" + "<h2>Method Summary</h2>\n"
+ "<div class=\"memberSummary\">\n" + "<div class=\"member-summary\">\n"
+ "<table summary=\"Method Summary table, listing methods, and an explanation\">", + "<table summary=\"Method Summary table, listing methods, and an explanation\">",
"<!-- ============ FIELD DETAIL =========== -->\n" "<!-- ============ FIELD DETAIL =========== -->\n"
+ "<ul class=\"blockList\">\n" + "<ul class=\"block-list\">\n"
+ "<li class=\"blockList\"><a name=\"field.detail\">\n" + "<li class=\"block-list\"><a name=\"field.detail\">\n"
+ "<!-- -->\n" + "<!-- -->\n"
+ "</a>\n" + "</a>\n"
+ "<h2>Field Details</h2>", + "<h2>Field Details</h2>",
"<!-- ========= CONSTRUCTOR DETAIL ======== -->\n" "<!-- ========= CONSTRUCTOR DETAIL ======== -->\n"
+ "<ul class=\"blockList\">\n" + "<ul class=\"block-list\">\n"
+ "<li class=\"blockList\"><a name=\"constructor.detail\">\n" + "<li class=\"block-list\"><a name=\"constructor.detail\">\n"
+ "<!-- -->\n" + "<!-- -->\n"
+ "</a>\n" + "</a>\n"
+ "<h2>Constructor Details</h2>", + "<h2>Constructor Details</h2>",
"<!-- ============ METHOD DETAIL ========== -->\n" "<!-- ============ METHOD DETAIL ========== -->\n"
+ "<ul class=\"blockList\">\n" + "<ul class=\"block-list\">\n"
+ "<li class=\"blockList\"><a name=\"method.detail\">\n" + "<li class=\"block-list\"><a name=\"method.detail\">\n"
+ "<!-- -->\n" + "<!-- -->\n"
+ "</a>\n" + "</a>\n"
+ "<h2>Method Details</h2>"); + "<h2>Method Details</h2>");
@ -636,30 +636,30 @@ public class TestHtmlVersion extends JavadocTester {
+ "<!-- -->\n" + "<!-- -->\n"
+ "</a>", + "</a>",
"<!-- =========== ENUM CONSTANT SUMMARY =========== -->\n" "<!-- =========== ENUM CONSTANT SUMMARY =========== -->\n"
+ "<ul class=\"blockList\">\n" + "<ul class=\"block-list\">\n"
+ "<li class=\"blockList\"><a name=\"enum.constant.summary\">\n" + "<li class=\"block-list\"><a name=\"enum.constant.summary\">\n"
+ "<!-- -->\n" + "<!-- -->\n"
+ "</a>\n" + "</a>\n"
+ "<h2>Enum Constant Summary</h2>\n" + "<h2>Enum Constant Summary</h2>\n"
+ "<div class=\"memberSummary\">\n" + "<div class=\"member-summary\">\n"
+ "<table summary=\"Enum Constant Summary table, listing enum constants, and an explanation\">", + "<table summary=\"Enum Constant Summary table, listing enum constants, and an explanation\">",
"<!-- ========== METHOD SUMMARY =========== -->\n" "<!-- ========== METHOD SUMMARY =========== -->\n"
+ "<ul class=\"blockList\">\n" + "<ul class=\"block-list\">\n"
+ "<li class=\"blockList\"><a name=\"method.summary\">\n" + "<li class=\"block-list\"><a name=\"method.summary\">\n"
+ "<!-- -->\n" + "<!-- -->\n"
+ "</a>\n" + "</a>\n"
+ "<h2>Method Summary</h2>\n" + "<h2>Method Summary</h2>\n"
+ "<div class=\"memberSummary\">\n" + "<div class=\"member-summary\">\n"
+ "<table summary=\"Method Summary table, listing methods, and an explanation\">", + "<table summary=\"Method Summary table, listing methods, and an explanation\">",
"<!-- ============ ENUM CONSTANT DETAIL =========== -->\n" "<!-- ============ ENUM CONSTANT DETAIL =========== -->\n"
+ "<ul class=\"blockList\">\n" + "<ul class=\"block-list\">\n"
+ "<li class=\"blockList\"><a name=\"enum.constant.detail\">\n" + "<li class=\"block-list\"><a name=\"enum.constant.detail\">\n"
+ "<!-- -->\n" + "<!-- -->\n"
+ "</a>\n" + "</a>\n"
+ "<h2>Enum Constant Details</h2>", + "<h2>Enum Constant Details</h2>",
"<!-- ============ METHOD DETAIL ========== -->\n" "<!-- ============ METHOD DETAIL ========== -->\n"
+ "<ul class=\"blockList\">\n" + "<ul class=\"block-list\">\n"
+ "<li class=\"blockList\"><a name=\"method.detail\">\n" + "<li class=\"block-list\"><a name=\"method.detail\">\n"
+ "<!-- -->\n" + "<!-- -->\n"
+ "</a>\n" + "</a>\n"
+ "<h2>Method Details</h2>"); + "<h2>Method Details</h2>");
@ -672,16 +672,16 @@ public class TestHtmlVersion extends JavadocTester {
+ "<!-- -->\n" + "<!-- -->\n"
+ "</a>", + "</a>",
"<!-- ========== METHOD SUMMARY =========== -->\n" "<!-- ========== METHOD SUMMARY =========== -->\n"
+ "<ul class=\"blockList\">\n" + "<ul class=\"block-list\">\n"
+ "<li class=\"blockList\"><a name=\"method.summary\">\n" + "<li class=\"block-list\"><a name=\"method.summary\">\n"
+ "<!-- -->\n" + "<!-- -->\n"
+ "</a>\n" + "</a>\n"
+ "<h2>Method Summary</h2>\n" + "<h2>Method Summary</h2>\n"
+ "<div class=\"memberSummary\">\n" + "<div class=\"member-summary\">\n"
+ "<table summary=\"Method Summary table, listing methods, and an explanation\">", + "<table summary=\"Method Summary table, listing methods, and an explanation\">",
"<!-- ============ METHOD DETAIL ========== -->\n" "<!-- ============ METHOD DETAIL ========== -->\n"
+ "<ul class=\"blockList\">\n" + "<ul class=\"block-list\">\n"
+ "<li class=\"blockList\"><a name=\"method.detail\">\n" + "<li class=\"block-list\"><a name=\"method.detail\">\n"
+ "<!-- -->\n" + "<!-- -->\n"
+ "</a>\n" + "</a>\n"
+ "<h2>Method Details</h2>"); + "<h2>Method Details</h2>");
@ -694,14 +694,14 @@ public class TestHtmlVersion extends JavadocTester {
+ "<!-- -->\n" + "<!-- -->\n"
+ "</a>", + "</a>",
"<!-- ======== CONSTRUCTOR SUMMARY ======== -->\n" "<!-- ======== CONSTRUCTOR SUMMARY ======== -->\n"
+ "<ul class=\"blockList\">\n" + "<ul class=\"block-list\">\n"
+ "<li class=\"blockList\"><a name=\"constructor.summary\">\n" + "<li class=\"block-list\"><a name=\"constructor.summary\">\n"
+ "<!-- -->\n" + "<!-- -->\n"
+ "</a>\n" + "</a>\n"
+ "<h2>Constructor Summary</h2>", + "<h2>Constructor Summary</h2>",
"<!-- ========= CONSTRUCTOR DETAIL ======== -->\n" "<!-- ========= CONSTRUCTOR DETAIL ======== -->\n"
+ "<ul class=\"blockList\">\n" + "<ul class=\"block-list\">\n"
+ "<li class=\"blockList\"><a name=\"constructor.detail\">\n" + "<li class=\"block-list\"><a name=\"constructor.detail\">\n"
+ "<!-- -->\n" + "<!-- -->\n"
+ "</a>\n" + "</a>\n"
+ "<h2>Constructor Details</h2>"); + "<h2>Constructor Details</h2>");
@ -714,14 +714,14 @@ public class TestHtmlVersion extends JavadocTester {
+ "<!-- -->\n" + "<!-- -->\n"
+ "</a>", + "</a>",
"<!-- ======== CONSTRUCTOR SUMMARY ======== -->\n" "<!-- ======== CONSTRUCTOR SUMMARY ======== -->\n"
+ "<ul class=\"blockList\">\n" + "<ul class=\"block-list\">\n"
+ "<li class=\"blockList\"><a name=\"constructor.summary\">\n" + "<li class=\"block-list\"><a name=\"constructor.summary\">\n"
+ "<!-- -->\n" + "<!-- -->\n"
+ "</a>\n" + "</a>\n"
+ "<h2>Constructor Summary</h2>", + "<h2>Constructor Summary</h2>",
"<!-- ========= CONSTRUCTOR DETAIL ======== -->\n" "<!-- ========= CONSTRUCTOR DETAIL ======== -->\n"
+ "<ul class=\"blockList\">\n" + "<ul class=\"block-list\">\n"
+ "<li class=\"blockList\"><a name=\"constructor.detail\">\n" + "<li class=\"block-list\"><a name=\"constructor.detail\">\n"
+ "<!-- -->\n" + "<!-- -->\n"
+ "</a>\n" + "</a>\n"
+ "<h2>Constructor Details</h2>"); + "<h2>Constructor Details</h2>");
@ -734,24 +734,24 @@ public class TestHtmlVersion extends JavadocTester {
+ "<!-- -->\n" + "<!-- -->\n"
+ "</a>", + "</a>",
"<!-- =========== ANNOTATION TYPE REQUIRED MEMBER SUMMARY =========== -->\n" "<!-- =========== ANNOTATION TYPE REQUIRED MEMBER SUMMARY =========== -->\n"
+ "<ul class=\"blockList\">\n" + "<ul class=\"block-list\">\n"
+ "<li class=\"blockList\"><a name=\"annotation.type.required.element.summary\">\n" + "<li class=\"block-list\"><a name=\"annotation.type.required.element.summary\">\n"
+ "<!-- -->\n" + "<!-- -->\n"
+ "</a>\n" + "</a>\n"
+ "<h2>Required Element Summary</h2>\n" + "<h2>Required Element Summary</h2>\n"
+ "<div class=\"memberSummary\">\n" + "<div class=\"member-summary\">\n"
+ "<table summary=\"Required Element Summary table, listing required elements, and an explanation\">", + "<table summary=\"Required Element Summary table, listing required elements, and an explanation\">",
"<!-- =========== ANNOTATION TYPE OPTIONAL MEMBER SUMMARY =========== -->\n" "<!-- =========== ANNOTATION TYPE OPTIONAL MEMBER SUMMARY =========== -->\n"
+ "<ul class=\"blockList\">\n" + "<ul class=\"block-list\">\n"
+ "<li class=\"blockList\"><a name=\"annotation.type.optional.element.summary\">\n" + "<li class=\"block-list\"><a name=\"annotation.type.optional.element.summary\">\n"
+ "<!-- -->\n" + "<!-- -->\n"
+ "</a>\n" + "</a>\n"
+ "<h2>Optional Element Summary</h2>\n" + "<h2>Optional Element Summary</h2>\n"
+ "<div class=\"memberSummary\">\n" + "<div class=\"member-summary\">\n"
+ "<table summary=\"Optional Element Summary table, listing optional elements, and an explanation\">", + "<table summary=\"Optional Element Summary table, listing optional elements, and an explanation\">",
"<!-- ============ ANNOTATION TYPE MEMBER DETAIL =========== -->\n" "<!-- ============ ANNOTATION TYPE MEMBER DETAIL =========== -->\n"
+ "<ul class=\"blockList\">\n" + "<ul class=\"block-list\">\n"
+ "<li class=\"blockList\"><a name=\"annotation.type.element.detail\">\n" + "<li class=\"block-list\"><a name=\"annotation.type.element.detail\">\n"
+ "<!-- -->\n" + "<!-- -->\n"
+ "</a>\n" + "</a>\n"
+ "<h2>Element Details</h2>"); + "<h2>Element Details</h2>");
@ -766,13 +766,13 @@ public class TestHtmlVersion extends JavadocTester {
"<!-- ========= END OF TOP NAVBAR ========= -->\n" "<!-- ========= END OF TOP NAVBAR ========= -->\n"
+ "</div>\n" + "</div>\n"
+ "<div class=\"header\">", + "<div class=\"header\">",
"<div class=\"useSummary\">\n" "<div class=\"use-summary\">\n"
+ "<table summary=\"Use table, listing packages, and an explanation\">", + "<table summary=\"Use table, listing packages, and an explanation\">",
"<li class=\"blockList\"><a name=\"pkg\">\n" "<li class=\"block-list\"><a name=\"pkg\">\n"
+ "<!-- -->\n" + "<!-- -->\n"
+ "</a>\n" + "</a>\n"
+ "<h2>Uses of <a href=\"../RegClass.html\" title=\"class in pkg1\">RegClass</a> in <a href=\"../../pkg/package-summary.html\">pkg</a></h2>\n" + "<h2>Uses of <a href=\"../RegClass.html\" title=\"class in pkg1\">RegClass</a> in <a href=\"../../pkg/package-summary.html\">pkg</a></h2>\n"
+ "<div class=\"useSummary\">\n<table summary=\"Use table, listing fields, and an explanation\">"); + "<div class=\"use-summary\">\n<table summary=\"Use table, listing fields, and an explanation\">");
// Negated test for main index page // Negated test for main index page
checkOutput("index.html", false, checkOutput("index.html", false,

8
test/langtools/jdk/javadoc/doclet/testIndentation/TestIndentation.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -48,9 +48,9 @@ public class TestIndentation extends JavadocTester {
checkExit(Exit.OK); checkExit(Exit.OK);
checkOutput("p/Indent.html", true, checkOutput("p/Indent.html", true,
"<div class=\"memberSignature\"><span class=\"modifiers\">public</span>&nbsp;" "<div class=\"member-signature\"><span class=\"modifiers\">public</span>&nbsp;"
+ "<span class=\"typeParameters\">&lt;T&gt;</span>&nbsp;" + "<span class=\"type-parameters\">&lt;T&gt;</span>&nbsp;"
+ "<span class=\"returnType\">void</span>&nbsp;<span class=\"memberName\">m</span>" + "<span class=\"return-type\">void</span>&nbsp;<span class=\"member-name\">m</span>"
+ "&#8203;(<span class=\"arguments\">T&nbsp;t1,\n" + "&#8203;(<span class=\"arguments\">T&nbsp;t1,\n"
+ "T&nbsp;t2)</span>\n" + "T&nbsp;t2)</span>\n"
+ " throws <span class=\"exceptions\">java.lang.Exception</span></div>"); + " throws <span class=\"exceptions\">java.lang.Exception</span></div>");

14
test/langtools/jdk/javadoc/doclet/testIndex/TestIndex.java
View file

@ -51,29 +51,29 @@ public class TestIndex extends JavadocTester {
//Test index-all.html //Test index-all.html
checkOutput("index-all.html", true, checkOutput("index-all.html", true,
"<a href=\"pkg/C.html\" title=\"class in pkg\"><span class=\"typeNameLink\">C</span></a>" "<a href=\"pkg/C.html\" title=\"class in pkg\"><span class=\"type-name-link\">C</span></a>"
+ " - Class in <a href=\"pkg/package-summary.html\">pkg</a>", + " - Class in <a href=\"pkg/package-summary.html\">pkg</a>",
"<a href=\"pkg/Interface.html\" title=\"interface in pkg\">" "<a href=\"pkg/Interface.html\" title=\"interface in pkg\">"
+ "<span class=\"typeNameLink\">Interface</span></a> - Interface in " + "<span class=\"type-name-link\">Interface</span></a> - Interface in "
+ "<a href=\"pkg/package-summary.html\">pkg</a>", + "<a href=\"pkg/package-summary.html\">pkg</a>",
"<a href=\"pkg/AnnotationType.html\" title=\"annotation in pkg\">" "<a href=\"pkg/AnnotationType.html\" title=\"annotation in pkg\">"
+ "<span class=\"typeNameLink\">AnnotationType</span></a> - Annotation Type in " + "<span class=\"type-name-link\">AnnotationType</span></a> - Annotation Type in "
+ "<a href=\"pkg/package-summary.html\">pkg</a>", + "<a href=\"pkg/package-summary.html\">pkg</a>",
"<a href=\"pkg/Coin.html\" title=\"enum in pkg\">" "<a href=\"pkg/Coin.html\" title=\"enum in pkg\">"
+ "<span class=\"typeNameLink\">Coin</span></a> - Enum in " + "<span class=\"type-name-link\">Coin</span></a> - Enum in "
+ "<a href=\"pkg/package-summary.html\">pkg</a>", + "<a href=\"pkg/package-summary.html\">pkg</a>",
"Class in <a href=\"package-summary.html\">&lt;Unnamed&gt;</a>", "Class in <a href=\"package-summary.html\">&lt;Unnamed&gt;</a>",
"<dl class=\"index\">\n" "<dl class=\"index\">\n"
+ "<dt><span class=\"memberNameLink\"><a href=\"pkg/C.html#Java\">" + "<dt><span class=\"member-name-link\"><a href=\"pkg/C.html#Java\">"
+ "Java</a></span> - Static variable in class pkg.<a href=\"pkg/C.html\" " + "Java</a></span> - Static variable in class pkg.<a href=\"pkg/C.html\" "
+ "title=\"class in pkg\">C</a></dt>\n" + "title=\"class in pkg\">C</a></dt>\n"
+ "<dd>&nbsp;</dd>\n" + "<dd>&nbsp;</dd>\n"
+ "<dt><span class=\"memberNameLink\"><a href=\"pkg/C.html#JDK\">JDK</a></span> " + "<dt><span class=\"member-name-link\"><a href=\"pkg/C.html#JDK\">JDK</a></span> "
+ "- Static variable in class pkg.<a href=\"pkg/C.html\" title=\"class in pkg\">" + "- Static variable in class pkg.<a href=\"pkg/C.html\" title=\"class in pkg\">"
+ "C</a></dt>\n" + "C</a></dt>\n"
+ "<dd>&nbsp;</dd>\n" + "<dd>&nbsp;</dd>\n"
+ "</dl>", + "</dl>",
"<dt><span class=\"searchTagLink\"><a href=\"pkg/Coin.html#Enum\">Enum</a>" "<dt><span class=\"search-tag-link\"><a href=\"pkg/Coin.html#Enum\">Enum</a>"
+ "</span> - Search tag in enum pkg.Coin</dt>"); + "</span> - Search tag in enum pkg.Coin</dt>");
} }
} }

18
test/langtools/jdk/javadoc/doclet/testIndexInDocFiles/TestIndexInDocFiles.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -96,12 +96,12 @@ public class TestIndexInDocFiles extends JavadocTester {
checkOutput("doc-files/top-level-file.html", true, checkOutput("doc-files/top-level-file.html", true,
"<h1>Package HTML file</h1>\n" "<h1>Package HTML file</h1>\n"
+ "<span id=\"top-level-index\" class=\"searchTagResult\">top-level-index</span>\n" + "<span id=\"top-level-index\" class=\"search-tag-result\">top-level-index</span>\n"
+ "<code><span id=\"top.level.property\" class=\"searchTagResult\">top.level.property</span></code>\n"); + "<code><span id=\"top.level.property\" class=\"search-tag-result\">top.level.property</span></code>\n");
checkOutput("p/q/doc-files/package-file.html", true, checkOutput("p/q/doc-files/package-file.html", true,
"<h1>Package HTML file</h1>\n" "<h1>Package HTML file</h1>\n"
+ "<span id=\"package-index\" class=\"searchTagResult\">package-index</span>\n" + "<span id=\"package-index\" class=\"search-tag-result\">package-index</span>\n"
+ "<code><span id=\"package.property\" class=\"searchTagResult\">package.property</span></code>\n"); + "<code><span id=\"package.property\" class=\"search-tag-result\">package.property</span></code>\n");
checkOutput("tag-search-index.js", true, checkOutput("tag-search-index.js", true,
"{\"l\":\"package-index\",\"h\":\"package p.q\",\"d\":\"additional info\"," "{\"l\":\"package-index\",\"h\":\"package p.q\",\"d\":\"additional info\","
+ "\"u\":\"p/q/doc-files/package-file.html#package-index\"}", + "\"u\":\"p/q/doc-files/package-file.html#package-index\"}",
@ -157,12 +157,12 @@ public class TestIndexInDocFiles extends JavadocTester {
checkOutput("m.n/doc-files/module-file.html", true, checkOutput("m.n/doc-files/module-file.html", true,
"<h1>Module HTML file</h1>\n" "<h1>Module HTML file</h1>\n"
+ "<span id=\"module-index\" class=\"searchTagResult\">module-index</span>\n" + "<span id=\"module-index\" class=\"search-tag-result\">module-index</span>\n"
+ "<code><span id=\"module.property\" class=\"searchTagResult\">module.property</span></code>\n"); + "<code><span id=\"module.property\" class=\"search-tag-result\">module.property</span></code>\n");
checkOutput("m.n/p/q/doc-files/package-file.html", true, checkOutput("m.n/p/q/doc-files/package-file.html", true,
"<h1>Package HTML file</h1>\n" "<h1>Package HTML file</h1>\n"
+ "<span id=\"package-index\" class=\"searchTagResult\">package-index</span>\n" + "<span id=\"package-index\" class=\"search-tag-result\">package-index</span>\n"
+ "<code><span id=\"package.property\" class=\"searchTagResult\">package.property</span></code>\n"); + "<code><span id=\"package.property\" class=\"search-tag-result\">package.property</span></code>\n");
checkOutput("tag-search-index.js", true, checkOutput("tag-search-index.js", true,
"{\"l\":\"module-index\",\"h\":\"module m.n\",\"d\":\"additional info\"," "{\"l\":\"module-index\",\"h\":\"module m.n\",\"d\":\"additional info\","
+ "\"u\":\"m.n/doc-files/module-file.html#module-index\"}", + "\"u\":\"m.n/doc-files/module-file.html#module-index\"}",

22
test/langtools/jdk/javadoc/doclet/testIndexInPackageFiles/TestIndexInPackageFiles.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -88,22 +88,22 @@ public class TestIndexInPackageFiles extends JavadocTester {
// to match the A-Z index files checked here. // to match the A-Z index files checked here.
checkOutput("p/q/package-summary.html", true, checkOutput("p/q/package-summary.html", true,
"<span id=\"test.name.1\" class=\"searchTagResult\">test.name.1</span>", "<span id=\"test.name.1\" class=\"search-tag-result\">test.name.1</span>",
"<span id=\"test.property.1\" class=\"searchTagResult\">test.property.1</span>"); "<span id=\"test.property.1\" class=\"search-tag-result\">test.property.1</span>");
checkOutput("p/q/doc-files/extra.html", true, checkOutput("p/q/doc-files/extra.html", true,
"<span id=\"test.name.2\" class=\"searchTagResult\">test.name.2</span>", "<span id=\"test.name.2\" class=\"search-tag-result\">test.name.2</span>",
"<span id=\"test.property.2\" class=\"searchTagResult\">test.property.2</span>"); "<span id=\"test.property.2\" class=\"search-tag-result\">test.property.2</span>");
checkOutput("index.html", true, checkOutput("index.html", true,
"<span id=\"test.name.3\" class=\"searchTagResult\">test.name.3</span>"); "<span id=\"test.name.3\" class=\"search-tag-result\">test.name.3</span>");
checkOutput("index-all.html", true, checkOutput("index-all.html", true,
"<span class=\"searchTagLink\"><a href=\"p/q/package-summary.html#test.name.1\">test.name.1</a></span>", "<span class=\"search-tag-link\"><a href=\"p/q/package-summary.html#test.name.1\">test.name.1</a></span>",
"<span class=\"searchTagLink\"><a href=\"p/q/doc-files/extra.html#test.name.2\">test.name.2</a></span>", "<span class=\"search-tag-link\"><a href=\"p/q/doc-files/extra.html#test.name.2\">test.name.2</a></span>",
"<span class=\"searchTagLink\"><a href=\"index.html#test.name.3\">test.name.3</a></span> - Search tag in Overview</dt>", "<span class=\"search-tag-link\"><a href=\"index.html#test.name.3\">test.name.3</a></span> - Search tag in Overview</dt>",
"<span class=\"searchTagLink\"><a href=\"p/q/package-summary.html#test.property.1\">test.property.1</a></span>", "<span class=\"search-tag-link\"><a href=\"p/q/package-summary.html#test.property.1\">test.property.1</a></span>",
"<span class=\"searchTagLink\"><a href=\"p/q/doc-files/extra.html#test.property.2\">test.property.2</a></span>"); "<span class=\"search-tag-link\"><a href=\"p/q/doc-files/extra.html#test.property.2\">test.property.2</a></span>");
} }
} }

8
test/langtools/jdk/javadoc/doclet/testIndexTaglet/TestIndexTaglet.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -77,7 +77,7 @@ public class TestIndexTaglet extends JavadocTester {
checkOrder("pkg/A.html", checkOrder("pkg/A.html",
"<h2>Method Details</h2>\n", "<h2>Method Details</h2>\n",
"<div class=\"block\">test description with <span id=\"search_phrase_a\" " "<div class=\"block\">test description with <span id=\"search_phrase_a\" "
+ "class=\"searchTagResult\">search_phrase_a</span></div>"); + "class=\"search-tag-result\">search_phrase_a</span></div>");
checkOrder("pkg/A.html", checkOrder("pkg/A.html",
"<h2>Method Summary</h2>\n", "<h2>Method Summary</h2>\n",
@ -124,7 +124,7 @@ public class TestIndexTaglet extends JavadocTester {
checkExit(Exit.OK); checkExit(Exit.OK);
checkOutput("pkg/A.html", true, checkOutput("pkg/A.html", true,
"This is a class. Here is <span id=\"foo\" class=\"searchTagResult\">foo</span>.", "This is a class. Here is <span id=\"foo\" class=\"search-tag-result\">foo</span>.",
"This is a method. Here is <span id=\"foo-1\" class=\"searchTagResult\">foo</span>."); "This is a method. Here is <span id=\"foo-1\" class=\"search-tag-result\">foo</span>.");
} }
} }

26
test/langtools/jdk/javadoc/doclet/testInterface/TestInterface.java
View file

@ -66,10 +66,10 @@ public class TestInterface extends JavadocTester {
checkExit(Exit.OK); checkExit(Exit.OK);
checkOutput("pkg/Interface.html", true, checkOutput("pkg/Interface.html", true,
"<div class=\"memberSignature\"><span class=\"returnType\">int</span>&nbsp;" "<div class=\"member-signature\"><span class=\"return-type\">int</span>&nbsp;"
+ "<span class=\"memberName\">method</span>()</div>", + "<span class=\"member-name\">method</span>()</div>",
"<div class=\"memberSignature\"><span class=\"modifiers\">static final</span>&nbsp;" "<div class=\"member-signature\"><span class=\"modifiers\">static final</span>&nbsp;"
+ "<span class=\"returnType\">int</span>&nbsp;<span class=\"memberName\">field</span></div>", + "<span class=\"return-type\">int</span>&nbsp;<span class=\"member-name\">field</span></div>",
// Make sure known implementing class list is correct and omits type parameters. // Make sure known implementing class list is correct and omits type parameters.
"<dl class=\"notes\">\n" "<dl class=\"notes\">\n"
+ "<dt>All Known Implementing Classes:</dt>\n" + "<dt>All Known Implementing Classes:</dt>\n"
@ -125,29 +125,29 @@ public class TestInterface extends JavadocTester {
checkOutput("pkg/ClassWithStaticMembers.html", true, checkOutput("pkg/ClassWithStaticMembers.html", true,
"<section class=\"detail\" id=\"f\">\n" "<section class=\"detail\" id=\"f\">\n"
+ "<h3>f</h3>\n" + "<h3>f</h3>\n"
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public static</span>&nbsp;" + "<div class=\"member-signature\"><span class=\"modifiers\">public static</span>&nbsp;"
+ "<span class=\"returnType\">int</span>&nbsp;<span class=\"memberName\">f</span></div>\n" + "<span class=\"return-type\">int</span>&nbsp;<span class=\"member-name\">f</span></div>\n"
+ "<div class=\"block\">A hider field</div>", + "<div class=\"block\">A hider field</div>",
"<td class=\"colFirst\"><code>static void</code></td>\n" "<td class=\"col-first\"><code>static void</code></td>\n"
+ "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">" + "<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\">"
+ "<a href=\"#m()\">m</a></span>()</code></th>\n" + "<a href=\"#m()\">m</a></span>()</code></th>\n"
+ "<td class=\"colLast\">\n" + "<td class=\"col-last\">\n"
+ "<div class=\"block\">A hider method</div>\n" + "<div class=\"block\">A hider method</div>\n"
+ "</td>\n", + "</td>\n",
"<section class=\"detail\" id=\"staticMethod()\">\n" "<section class=\"detail\" id=\"staticMethod()\">\n"
+ "<h3>staticMethod</h3>\n" + "<h3>staticMethod</h3>\n"
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public static</span>&nbsp;" + "<div class=\"member-signature\"><span class=\"modifiers\">public static</span>&nbsp;"
+ "<span class=\"returnType\">void</span>&nbsp;<span class=\"memberName\">staticMethod</span>()</div>\n" + "<span class=\"return-type\">void</span>&nbsp;<span class=\"member-name\">staticMethod</span>()</div>\n"
+ "<div class=\"block\"><span class=\"descfrmTypeLabel\">" + "<div class=\"block\"><span class=\"descfrm-type-label\">"
+ "Description copied from interface:&nbsp;<code>" + "Description copied from interface:&nbsp;<code>"
+ "<a href=\"InterfaceWithStaticMembers.html#staticMethod()\">" + "<a href=\"InterfaceWithStaticMembers.html#staticMethod()\">"
+ "InterfaceWithStaticMembers</a></code></span></div>\n" + "InterfaceWithStaticMembers</a></code></span></div>\n"
+ "<div class=\"block\">A static method</div>\n"); + "<div class=\"block\">A static method</div>\n");
checkOutput("pkg/ClassWithStaticMembers.InnerClass.html", true, checkOutput("pkg/ClassWithStaticMembers.InnerClass.html", true,
"<pre>public static class <span class=\"typeNameLabel\">" "<pre>public static class <span class=\"type-name-label\">"
+ "ClassWithStaticMembers.InnerClass</span>\n" + "ClassWithStaticMembers.InnerClass</span>\n"
+ "extends java.lang.Object</pre>\n" + "extends java.lang.Object</pre>\n"
+ "<div class=\"block\">A hider inner class</div>"); + "<div class=\"block\">A hider inner class</div>");

174
test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java
View file

@ -56,22 +56,22 @@ public class TestJavaFX extends JavadocTester {
"<dt>See Also:</dt>\n" "<dt>See Also:</dt>\n"
+ "<dd><a href=\"#getRate()\"><code>getRate()</code></a>, \n" + "<dd><a href=\"#getRate()\"><code>getRate()</code></a>, \n"
+ "<a href=\"#setRate(double)\"><code>setRate(double)</code></a></dd>", + "<a href=\"#setRate(double)\"><code>setRate(double)</code></a></dd>",
"<div class=\"memberSignature\"><span class=\"modifiers\">public final</span>&nbsp;" "<div class=\"member-signature\"><span class=\"modifiers\">public final</span>&nbsp;"
+ "<span class=\"returnType\">void</span>&nbsp;<span class=\"memberName\">setRate</span>&#8203;" + "<span class=\"return-type\">void</span>&nbsp;<span class=\"member-name\">setRate</span>&#8203;"
+ "(<span class=\"arguments\">double&nbsp;value)</span></div>\n" + "(<span class=\"arguments\">double&nbsp;value)</span></div>\n"
+ "<div class=\"block\">Sets the value of the property rate.</div>\n" + "<div class=\"block\">Sets the value of the property rate.</div>\n"
+ "<dl class=\"notes\">\n" + "<dl class=\"notes\">\n"
+ "<dt>Property description:</dt>", + "<dt>Property description:</dt>",
"<div class=\"memberSignature\"><span class=\"modifiers\">public final</span>&nbsp;" "<div class=\"member-signature\"><span class=\"modifiers\">public final</span>&nbsp;"
+ "<span class=\"returnType\">double</span>&nbsp;<span class=\"memberName\">getRate</span>()</div>\n" + "<span class=\"return-type\">double</span>&nbsp;<span class=\"member-name\">getRate</span>()</div>\n"
+ "<div class=\"block\">Gets the value of the property rate.</div>\n" + "<div class=\"block\">Gets the value of the property rate.</div>\n"
+ "<dl class=\"notes\">\n" + "<dl class=\"notes\">\n"
+ "<dt>Property description:</dt>", + "<dt>Property description:</dt>",
"<td class=\"colFirst\"><code><a href=\"C.DoubleProperty.html\" " "<td class=\"col-first\"><code><a href=\"C.DoubleProperty.html\" "
+ "title=\"class in pkg1\">C.DoubleProperty</a></code></td>\n" + "title=\"class in pkg1\">C.DoubleProperty</a></code></td>\n"
+ "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">" + "<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\">"
+ "<a href=\"#rateProperty\">rate</a></span></code></th>\n" + "<a href=\"#rateProperty\">rate</a></span></code></th>\n"
+ "<td class=\"colLast\">\n" + "<td class=\"col-last\">\n"
+ "<div class=\"block\">Defines the direction/speed at which the " + "<div class=\"block\">Defines the direction/speed at which the "
+ "<code>Timeline</code> is expected to\n" + "<code>Timeline</code> is expected to\n"
+ " be played.</div>\n</td>", + " be played.</div>\n</td>",
@ -81,28 +81,28 @@ public class TestJavaFX extends JavadocTester {
"<p>Sets the value of the property <code>Property</code>", "<p>Sets the value of the property <code>Property</code>",
"<p>Gets the value of the property <code>Property</code>", "<p>Gets the value of the property <code>Property</code>",
"<dt>Property description:</dt>", "<dt>Property description:</dt>",
"<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">" "<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\">"
+ "<a href=\"#setTestMethodProperty()\">" + "<a href=\"#setTestMethodProperty()\">"
+ "setTestMethodProperty</a></span>()</code></th>", + "setTestMethodProperty</a></span>()</code></th>",
"<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">" "<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\">"
+ "<a href=\"#pausedProperty\">paused</a></span></code></th>\n" + "<a href=\"#pausedProperty\">paused</a></span></code></th>\n"
+ "<td class=\"colLast\">\n" + "<td class=\"col-last\">\n"
+ "<div class=\"block\">Defines if paused.</div>", + "<div class=\"block\">Defines if paused.</div>",
"<section class=\"detail\" id=\"pausedProperty\">\n" "<section class=\"detail\" id=\"pausedProperty\">\n"
+ "<h3>paused</h3>\n" + "<h3>paused</h3>\n"
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span>&nbsp;" + "<div class=\"member-signature\"><span class=\"modifiers\">public final</span>&nbsp;"
+ "<span class=\"returnType\"><a href=\"C.BooleanProperty.html\" title=\"class in pkg1\">" + "<span class=\"return-type\"><a href=\"C.BooleanProperty.html\" title=\"class in pkg1\">"
+ "C.BooleanProperty</a></span>&nbsp;<span class=\"memberName\">pausedProperty</span></div>\n" + "C.BooleanProperty</a></span>&nbsp;<span class=\"member-name\">pausedProperty</span></div>\n"
+ "<div class=\"block\">Defines if paused. The second line.</div>", + "<div class=\"block\">Defines if paused. The second line.</div>",
"<section class=\"detail\" id=\"isPaused()\">\n" "<section class=\"detail\" id=\"isPaused()\">\n"
+ "<h3>isPaused</h3>\n" + "<h3>isPaused</h3>\n"
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span>&nbsp;" + "<div class=\"member-signature\"><span class=\"modifiers\">public final</span>&nbsp;"
+ "<span class=\"returnType\">double</span>&nbsp;<span class=\"memberName\">isPaused</span>()</div>\n" + "<span class=\"return-type\">double</span>&nbsp;<span class=\"member-name\">isPaused</span>()</div>\n"
+ "<div class=\"block\">Gets the value of the property paused.</div>", + "<div class=\"block\">Gets the value of the property paused.</div>",
"<section class=\"detail\" id=\"setPaused(boolean)\">\n" "<section class=\"detail\" id=\"setPaused(boolean)\">\n"
+ "<h3>setPaused</h3>\n" + "<h3>setPaused</h3>\n"
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span>&nbsp;" + "<div class=\"member-signature\"><span class=\"modifiers\">public final</span>&nbsp;"
+ "<span class=\"returnType\">void</span>&nbsp;<span class=\"memberName\">setPaused</span>&#8203;" + "<span class=\"return-type\">void</span>&nbsp;<span class=\"member-name\">setPaused</span>&#8203;"
+ "(<span class=\"arguments\">boolean&nbsp;value)</span></div>\n" + "(<span class=\"arguments\">boolean&nbsp;value)</span></div>\n"
+ "<div class=\"block\">Sets the value of the property paused.</div>\n" + "<div class=\"block\">Sets the value of the property paused.</div>\n"
+ "<dl class=\"notes\">\n" + "<dl class=\"notes\">\n"
@ -112,8 +112,8 @@ public class TestJavaFX extends JavadocTester {
+ "<dd>false</dd>", + "<dd>false</dd>",
"<section class=\"detail\" id=\"isPaused()\">\n" "<section class=\"detail\" id=\"isPaused()\">\n"
+ "<h3>isPaused</h3>\n" + "<h3>isPaused</h3>\n"
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span>&nbsp;" + "<div class=\"member-signature\"><span class=\"modifiers\">public final</span>&nbsp;"
+ "<span class=\"returnType\">double</span>&nbsp;<span class=\"memberName\">isPaused</span>()</div>\n" + "<span class=\"return-type\">double</span>&nbsp;<span class=\"member-name\">isPaused</span>()</div>\n"
+ "<div class=\"block\">Gets the value of the property paused.</div>\n" + "<div class=\"block\">Gets the value of the property paused.</div>\n"
+ "<dl class=\"notes\">\n" + "<dl class=\"notes\">\n"
+ "<dt>Property description:</dt>\n" + "<dt>Property description:</dt>\n"
@ -122,16 +122,16 @@ public class TestJavaFX extends JavadocTester {
+ "<dd>false</dd>", + "<dd>false</dd>",
"<section class=\"detail\" id=\"rateProperty\">\n" "<section class=\"detail\" id=\"rateProperty\">\n"
+ "<h3>rate</h3>\n" + "<h3>rate</h3>\n"
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span>&nbsp;" + "<div class=\"member-signature\"><span class=\"modifiers\">public final</span>&nbsp;"
+ "<span class=\"returnType\"><a href=\"C.DoubleProperty.html\" title=\"class in pkg1\">" + "<span class=\"return-type\"><a href=\"C.DoubleProperty.html\" title=\"class in pkg1\">"
+ "C.DoubleProperty</a></span>&nbsp;<span class=\"memberName\">rateProperty</span></div>\n" + "C.DoubleProperty</a></span>&nbsp;<span class=\"member-name\">rateProperty</span></div>\n"
+ "<div class=\"block\">Defines the direction/speed at which the " + "<div class=\"block\">Defines the direction/speed at which the "
+ "<code>Timeline</code> is expected to\n" + "<code>Timeline</code> is expected to\n"
+ " be played. This is the second line.</div>", + " be played. This is the second line.</div>",
"<section class=\"detail\" id=\"setRate(double)\">\n" "<section class=\"detail\" id=\"setRate(double)\">\n"
+ "<h3>setRate</h3>\n" + "<h3>setRate</h3>\n"
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span>&nbsp;" + "<div class=\"member-signature\"><span class=\"modifiers\">public final</span>&nbsp;"
+ "<span class=\"returnType\">void</span>&nbsp;<span class=\"memberName\">setRate</span>&#8203;" + "<span class=\"return-type\">void</span>&nbsp;<span class=\"member-name\">setRate</span>&#8203;"
+ "(<span class=\"arguments\">double&nbsp;value)</span></div>\n" + "(<span class=\"arguments\">double&nbsp;value)</span></div>\n"
+ "<div class=\"block\">Sets the value of the property rate.</div>\n" + "<div class=\"block\">Sets the value of the property rate.</div>\n"
+ "<dl class=\"notes\">\n" + "<dl class=\"notes\">\n"
@ -144,8 +144,8 @@ public class TestJavaFX extends JavadocTester {
+ "<dd>JavaFX 8.0</dd>", + "<dd>JavaFX 8.0</dd>",
"<section class=\"detail\" id=\"getRate()\">\n" "<section class=\"detail\" id=\"getRate()\">\n"
+ "<h3>getRate</h3>\n" + "<h3>getRate</h3>\n"
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span>&nbsp;" + "<div class=\"member-signature\"><span class=\"modifiers\">public final</span>&nbsp;"
+ "<span class=\"returnType\">double</span>&nbsp;<span class=\"memberName\">getRate</span>()</div>\n" + "<span class=\"return-type\">double</span>&nbsp;<span class=\"member-name\">getRate</span>()</div>\n"
+ "<div class=\"block\">Gets the value of the property rate.</div>\n" + "<div class=\"block\">Gets the value of the property rate.</div>\n"
+ "<dl class=\"notes\">\n" + "<dl class=\"notes\">\n"
+ "<dt>Property description:</dt>\n" + "<dt>Property description:</dt>\n"
@ -155,32 +155,32 @@ public class TestJavaFX extends JavadocTester {
+ "<dd>11</dd>\n" + "<dd>11</dd>\n"
+ "<dt>Since:</dt>\n" + "<dt>Since:</dt>\n"
+ "<dd>JavaFX 8.0</dd>", + "<dd>JavaFX 8.0</dd>",
"<section class=\"propertySummary\" id=\"property.summary\">\n" "<section class=\"property-summary\" id=\"property.summary\">\n"
+ "<h2>Property Summary</h2>\n" + "<h2>Property Summary</h2>\n"
+ "<div class=\"memberSummary\">\n<table>\n" + "<div class=\"member-summary\">\n<table>\n"
+ "<caption><span>Properties</span><span class=\"tabEnd\">&nbsp;</span></caption>", + "<caption><span>Properties</span><span class=\"tab-end\">&nbsp;</span></caption>",
"<tr class=\"altColor\">\n" "<tr class=\"alt-color\">\n"
+ "<td class=\"colFirst\"><code><a href=\"C.BooleanProperty.html\" title=\"class in pkg1\">C.BooleanProperty</a></code></td>\n", + "<td class=\"col-first\"><code><a href=\"C.BooleanProperty.html\" title=\"class in pkg1\">C.BooleanProperty</a></code></td>\n",
"<tr class=\"rowColor\">\n" "<tr class=\"row-color\">\n"
+ "<td class=\"colFirst\"><code><a href=\"C.DoubleProperty.html\" title=\"class in pkg1\">C.DoubleProperty</a></code></td>\n"); + "<td class=\"col-first\"><code><a href=\"C.DoubleProperty.html\" title=\"class in pkg1\">C.DoubleProperty</a></code></td>\n");
checkOutput("pkg1/C.html", false, checkOutput("pkg1/C.html", false,
"A()", "A()",
"<h2 id=\"property.summary\">Property Summary</h2>\n" "<h2 id=\"property.summary\">Property Summary</h2>\n"
+ "<div class=\"memberSummary\">\n" + "<div class=\"member-summary\">\n"
+ "<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\"" + "<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
+ " aria-selected=\"true\" aria-controls=\"memberSummary_tabpanel\" tabindex=\"0\"" + " aria-selected=\"true\" aria-controls=\"member-summary_tabpanel\" tabindex=\"0\""
+ " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"activeTableTab\">All Methods" + " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"active-table-tab\">All Methods"
+ "</button><button role=\"tab\" aria-selected=\"false\"" + "</button><button role=\"tab\" aria-selected=\"false\""
+ " aria-controls=\"memberSummary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\"" + " aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
+ " id=\"t2\" class=\"tableTab\" onclick=\"show(2);\">Instance Methods</button>" + " id=\"t2\" class=\"table-tab\" onclick=\"show(2);\">Instance Methods</button>"
+ "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"memberSummary_tabpanel\"" + "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"member-summary_tabpanel\""
+ " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t4\" class=\"tableTab\"" + " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t4\" class=\"table-tab\""
+ " onclick=\"show(8);\">Concrete Methods</button></div>", + " onclick=\"show(8);\">Concrete Methods</button></div>",
"<tr id=\"i0\" class=\"altColor\">\n" "<tr id=\"i0\" class=\"alt-color\">\n"
+ "<td class=\"colFirst\"><code><a href=\"C.BooleanProperty.html\" title=\"class in pkg1\">C.BooleanProperty</a></code></td>\n", + "<td class=\"col-first\"><code><a href=\"C.BooleanProperty.html\" title=\"class in pkg1\">C.BooleanProperty</a></code></td>\n",
"<tr id=\"i1\" class=\"rowColor\">\n" "<tr id=\"i1\" class=\"row-color\">\n"
+ "<td class=\"colFirst\"><code><a href=\"C.DoubleProperty.html\" title=\"class in pkg1\">C.DoubleProperty</a></code></td>\n"); + "<td class=\"col-first\"><code><a href=\"C.DoubleProperty.html\" title=\"class in pkg1\">C.DoubleProperty</a></code></td>\n");
checkOutput("index-all.html", true, checkOutput("index-all.html", true,
"<div class=\"block\">Gets the value of the property paused.</div>", "<div class=\"block\">Gets the value of the property paused.</div>",
@ -209,51 +209,51 @@ public class TestJavaFX extends JavadocTester {
"pkg2"); "pkg2");
checkExit(Exit.OK); checkExit(Exit.OK);
checkOutput("pkg2/Test.html", true, checkOutput("pkg2/Test.html", true,
"<section class=\"propertyDetails\" id=\"property.detail\">\n" "<section class=\"property-details\" id=\"property.detail\">\n"
+ "<h2>Property Details</h2>\n" + "<h2>Property Details</h2>\n"
+ "<ul class=\"blockList\">\n" + "<ul class=\"block-list\">\n"
+ "<li class=\"blockList\">\n" + "<li class=\"block-list\">\n"
+ "<section class=\"detail\" id=\"betaProperty\">\n" + "<section class=\"detail\" id=\"betaProperty\">\n"
+ "<h3>beta</h3>\n" + "<h3>beta</h3>\n"
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public</span>&nbsp;" + "<div class=\"member-signature\"><span class=\"modifiers\">public</span>&nbsp;"
+ "<span class=\"returnType\">java.lang.Object</span>" + "<span class=\"return-type\">java.lang.Object</span>"
+ "&nbsp;<span class=\"memberName\">betaProperty</span></div>\n" + "&nbsp;<span class=\"member-name\">betaProperty</span></div>\n"
+ "</section>\n" + "</section>\n"
+ "</li>\n" + "</li>\n"
+ "<li class=\"blockList\">\n" + "<li class=\"block-list\">\n"
+ "<section class=\"detail\" id=\"gammaProperty\">\n" + "<section class=\"detail\" id=\"gammaProperty\">\n"
+ "<h3>gamma</h3>\n" + "<h3>gamma</h3>\n"
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span>&nbsp;" + "<div class=\"member-signature\"><span class=\"modifiers\">public final</span>&nbsp;"
+ "<span class=\"returnType\">java.util.List&lt;java.lang.String&gt;</span>" + "<span class=\"return-type\">java.util.List&lt;java.lang.String&gt;</span>"
+ "&nbsp;<span class=\"memberName\">gammaProperty</span></div>\n" + "&nbsp;<span class=\"member-name\">gammaProperty</span></div>\n"
+ "</section>\n" + "</section>\n"
+ "</li>\n" + "</li>\n"
+ "<li class=\"blockList\">\n" + "<li class=\"block-list\">\n"
+ "<section class=\"detail\" id=\"deltaProperty\">\n" + "<section class=\"detail\" id=\"deltaProperty\">\n"
+ "<h3>delta</h3>\n" + "<h3>delta</h3>\n"
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span>&nbsp;" + "<div class=\"member-signature\"><span class=\"modifiers\">public final</span>&nbsp;"
+ "<span class=\"returnType\">java.util.List&lt;java.util.Set&lt;? super java.lang.Object&gt;&gt;" + "<span class=\"return-type\">java.util.List&lt;java.util.Set&lt;? super java.lang.Object&gt;&gt;"
+ "</span>&nbsp;<span class=\"memberName\">deltaProperty</span></div>\n" + "</span>&nbsp;<span class=\"member-name\">deltaProperty</span></div>\n"
+ "</section>\n" + "</section>\n"
+ "</li>\n" + "</li>\n"
+ "</ul>\n" + "</ul>\n"
+ "</section>", + "</section>",
"<section class=\"propertySummary\" id=\"property.summary\">\n" "<section class=\"property-summary\" id=\"property.summary\">\n"
+ "<h2>Property Summary</h2>\n" + "<h2>Property Summary</h2>\n"
+ "<div class=\"memberSummary\">\n<table>\n" + "<div class=\"member-summary\">\n<table>\n"
+ "<caption><span>Properties</span><span class=\"tabEnd\">&nbsp;</span></caption>"); + "<caption><span>Properties</span><span class=\"tab-end\">&nbsp;</span></caption>");
checkOutput("pkg2/Test.html", false, checkOutput("pkg2/Test.html", false,
"<h2>Property Summary</h2>\n" "<h2>Property Summary</h2>\n"
+ "<div class=\"memberSummary\">\n" + "<div class=\"member-summary\">\n"
+ "<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\"" + "<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
+ " aria-selected=\"true\" aria-controls=\"memberSummary_tabpanel\" tabindex=\"0\"" + " aria-selected=\"true\" aria-controls=\"member-summary_tabpanel\" tabindex=\"0\""
+ " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"activeTableTab\">All Methods" + " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"active-table-tab\">All Methods"
+ "</button><button role=\"tab\" aria-selected=\"false\"" + "</button><button role=\"tab\" aria-selected=\"false\""
+ " aria-controls=\"memberSummary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\"" + " aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
+ " id=\"t2\" class=\"tableTab\" onclick=\"show(2);\">Instance Methods</button>" + " id=\"t2\" class=\"table-tab\" onclick=\"show(2);\">Instance Methods</button>"
+ "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"memberSummary_tabpanel\"" + "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"member-summary_tabpanel\""
+ " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t4\" class=\"tableTab\"" + " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t4\" class=\"table-tab\""
+ " onclick=\"show(8);\">Concrete Methods</button></div>"); + " onclick=\"show(8);\">Concrete Methods</button></div>");
} }
@ -272,37 +272,37 @@ public class TestJavaFX extends JavadocTester {
checkOutput("pkg2/Test.html", true, checkOutput("pkg2/Test.html", true,
"<thead>\n" "<thead>\n"
+ "<tr>\n" + "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n" + "<th class=\"col-first\" scope=\"col\">Modifier and Type</th>\n"
+ "<th class=\"colSecond\" scope=\"col\">Method</th>\n" + "<th class=\"col-second\" scope=\"col\">Method</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n" + "<th class=\"col-last\" scope=\"col\">Description</th>\n"
+ "</tr>\n" + "</tr>\n"
+ "</thead>\n" + "</thead>\n"
+ "<tbody>\n" + "<tbody>\n"
+ "<tr class=\"altColor\" id=\"i0\">\n" + "<tr class=\"alt-color\" id=\"i0\">\n"
+ "<td class=\"colFirst\"><code>&lt;T&gt;&nbsp;java.lang.Object</code></td>\n" + "<td class=\"col-first\"><code>&lt;T&gt;&nbsp;java.lang.Object</code></td>\n"
+ "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">" + "<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\">"
+ "<a href=\"#alphaProperty(java.util.List)\">alphaProperty</a>" + "<a href=\"#alphaProperty(java.util.List)\">alphaProperty</a>"
+ "</span>&#8203;(java.util.List&lt;T&gt;&nbsp;foo)</code></th>\n" + "</span>&#8203;(java.util.List&lt;T&gt;&nbsp;foo)</code></th>\n"
+ "<td class=\"colLast\">&nbsp;</td>\n" + "<td class=\"col-last\">&nbsp;</td>\n"
+ "</tr>\n" + "</tr>\n"
+ "<tr class=\"rowColor\" id=\"i1\">\n" + "<tr class=\"row-color\" id=\"i1\">\n"
+ "<td class=\"colFirst\"><code>java.lang.Object</code></td>\n" + "<td class=\"col-first\"><code>java.lang.Object</code></td>\n"
+ "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">" + "<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\">"
+ "<a href=\"#betaProperty()\">betaProperty</a></span>()</code></th>\n" + "<a href=\"#betaProperty()\">betaProperty</a></span>()</code></th>\n"
+ "<td class=\"colLast\">&nbsp;</td>\n" + "<td class=\"col-last\">&nbsp;</td>\n"
+ "</tr>\n" + "</tr>\n"
+ "<tr class=\"altColor\" id=\"i2\">\n" + "<tr class=\"alt-color\" id=\"i2\">\n"
+ "<td class=\"colFirst\"><code>java.util.List&lt;java.util.Set&lt;? super java.lang.Object&gt;&gt;" + "<td class=\"col-first\"><code>java.util.List&lt;java.util.Set&lt;? super java.lang.Object&gt;&gt;"
+ "</code></td>\n" + "</code></td>\n"
+ "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">" + "<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\">"
+ "<a href=\"#deltaProperty()\">deltaProperty</a></span>()</code></th>\n" + "<a href=\"#deltaProperty()\">deltaProperty</a></span>()</code></th>\n"
+ "<td class=\"colLast\">&nbsp;</td>\n" + "<td class=\"col-last\">&nbsp;</td>\n"
+ "</tr>\n" + "</tr>\n"
+ "<tr class=\"rowColor\" id=\"i3\">\n" + "<tr class=\"row-color\" id=\"i3\">\n"
+ "<td class=\"colFirst\"><code>java.util.List&lt;java.lang.String&gt;</code></td>\n" + "<td class=\"col-first\"><code>java.util.List&lt;java.lang.String&gt;</code></td>\n"
+ "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">" + "<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\">"
+ "<a href=\"#gammaProperty()\">gammaProperty</a></span>()</code></th>\n" + "<a href=\"#gammaProperty()\">gammaProperty</a></span>()</code></th>\n"
+ "<td class=\"colLast\">&nbsp;</td>" + "<td class=\"col-last\">&nbsp;</td>"
); );
} }

26
test/langtools/jdk/javadoc/doclet/testLambdaFeature/TestLambdaFeature.java
View file

@ -55,20 +55,20 @@ public class TestLambdaFeature extends JavadocTester {
checkExit(Exit.OK); checkExit(Exit.OK);
checkOutput("pkg/A.html", true, checkOutput("pkg/A.html", true,
"<td class=\"colFirst\"><code>default void</code></td>", "<td class=\"col-first\"><code>default void</code></td>",
"<div class=\"memberSignature\"><span class=\"modifiers\">default</span>&nbsp;" "<div class=\"member-signature\"><span class=\"modifiers\">default</span>&nbsp;"
+ "<span class=\"returnType\">void</span>&nbsp;<span class=\"memberName\">defaultMethod</span>()</div>\n", + "<span class=\"return-type\">void</span>&nbsp;<span class=\"member-name\">defaultMethod</span>()</div>\n",
"<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\"" "<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
+ " aria-selected=\"true\" aria-controls=\"memberSummary_tabpanel\" tabindex=\"0\"" + " aria-selected=\"true\" aria-controls=\"member-summary_tabpanel\" tabindex=\"0\""
+ " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"activeTableTab\">All Methods" + " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"active-table-tab\">All Methods"
+ "</button><button role=\"tab\" aria-selected=\"false\"" + "</button><button role=\"tab\" aria-selected=\"false\""
+ " aria-controls=\"memberSummary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\"" + " aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
+ " id=\"t2\" class=\"tableTab\" onclick=\"show(2);\">Instance Methods</button>" + " id=\"t2\" class=\"table-tab\" onclick=\"show(2);\">Instance Methods</button>"
+ "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"memberSummary_tabpanel\"" + "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"member-summary_tabpanel\""
+ " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t3\" class=\"tableTab\"" + " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t3\" class=\"table-tab\""
+ " onclick=\"show(4);\">Abstract Methods</button><button role=\"tab\" aria-selected=\"false\"" + " onclick=\"show(4);\">Abstract Methods</button><button role=\"tab\" aria-selected=\"false\""
+ " aria-controls=\"memberSummary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\"" + " aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
+ " id=\"t5\" class=\"tableTab\" onclick=\"show(16);\">Default Methods</button></div>", + " id=\"t5\" class=\"table-tab\" onclick=\"show(16);\">Default Methods</button></div>",
"<dl class=\"notes\">\n" "<dl class=\"notes\">\n"
+ "<dt>Functional Interface:</dt>\n" + "<dt>Functional Interface:</dt>\n"
+ "<dd>This is a functional interface and can therefore be used as " + "<dd>This is a functional interface and can therefore be used as "
@ -85,11 +85,11 @@ public class TestLambdaFeature extends JavadocTester {
+ "</dl>"); + "</dl>");
checkOutput("pkg/A.html", false, checkOutput("pkg/A.html", false,
"<td class=\"colFirst\"><code>default default void</code></td>", "<td class=\"col-first\"><code>default default void</code></td>",
"<pre>default&nbsp;default&nbsp;void&nbsp;defaultMethod()</pre>"); "<pre>default&nbsp;default&nbsp;void&nbsp;defaultMethod()</pre>");
checkOutput("pkg/B.html", false, checkOutput("pkg/B.html", false,
"<td class=\"colFirst\"><code>default void</code></td>", "<td class=\"col-first\"><code>default void</code></td>",
"<dl class=\"notes\">\n" "<dl class=\"notes\">\n"
+ "<dt>Functional Interface:</dt>"); + "<dt>Functional Interface:</dt>");

26
test/langtools/jdk/javadoc/doclet/testLinkOption/TestLinkOption.java
View file

@ -72,26 +72,26 @@ public class TestLinkOption extends JavadocTester {
checkOutput("pkg/C.html", true, checkOutput("pkg/C.html", true,
"<a href=\"" + url + "java/lang/String.html\" " "<a href=\"" + url + "java/lang/String.html\" "
+ "title=\"class or interface in java.lang\" class=\"externalLink\"><code>Link to String Class</code></a>", + "title=\"class or interface in java.lang\" class=\"external-link\"><code>Link to String Class</code></a>",
//Make sure the parameters are formatted properly when the -link option is used. //Make sure the parameters are formatted properly when the -link option is used.
"(int&nbsp;p1,\n" "(int&nbsp;p1,\n"
+ "int&nbsp;p2,\n" + "int&nbsp;p2,\n"
+ "int&nbsp;p3)", + "int&nbsp;p3)",
"(int&nbsp;p1,\n" "(int&nbsp;p1,\n"
+ "int&nbsp;p2,\n" + "int&nbsp;p2,\n"
+ "<a href=\"" + url + "java/lang/Object.html\" title=\"class or interface in java.lang\" class=\"externalLink\">" + "<a href=\"" + url + "java/lang/Object.html\" title=\"class or interface in java.lang\" class=\"external-link\">"
+ "Object</a>&nbsp;p3)"); + "Object</a>&nbsp;p3)");
checkOutput("pkg/B.html", true, checkOutput("pkg/B.html", true,
"<div class=\"block\">A method with html tag the method " "<div class=\"block\">A method with html tag the method "
+ "<a href=\"" + url + "java/lang/ClassLoader.html#getSystemClassLoader()\"" + "<a href=\"" + url + "java/lang/ClassLoader.html#getSystemClassLoader()\""
+ " title=\"class or interface in java.lang\" class=\"externalLink\"><code><b>getSystemClassLoader()</b>" + " title=\"class or interface in java.lang\" class=\"external-link\"><code><b>getSystemClassLoader()</b>"
+ "</code></a> as the parent class loader.</div>", + "</code></a> as the parent class loader.</div>",
"<div class=\"block\">is equivalent to invoking <code>" "<div class=\"block\">is equivalent to invoking <code>"
+ "<a href=\"#createTempFile(java.lang.String,java.lang.String,java.io.File)\">" + "<a href=\"#createTempFile(java.lang.String,java.lang.String,java.io.File)\">"
+ "<code>createTempFile(prefix,&nbsp;suffix,&nbsp;null)</code></a></code>.</div>", + "<code>createTempFile(prefix,&nbsp;suffix,&nbsp;null)</code></a></code>.</div>",
"<a href=\"" + url + "java/lang/String.html\" " "<a href=\"" + url + "java/lang/String.html\" "
+ "title=\"class or interface in java.lang\" class=\"externalLink\">Link-Plain to String Class</a>", + "title=\"class or interface in java.lang\" class=\"external-link\">Link-Plain to String Class</a>",
"<code><b>getSystemClassLoader()</b></code>", "<code><b>getSystemClassLoader()</b></code>",
"<code>createTempFile(prefix,&nbsp;suffix,&nbsp;null)</code>", "<code>createTempFile(prefix,&nbsp;suffix,&nbsp;null)</code>",
"<dd><a href=\"http://www.ietf.org/rfc/rfc2279.txt\"><i>RFC&nbsp;2279: UTF-8, a\n" + "<dd><a href=\"http://www.ietf.org/rfc/rfc2279.txt\"><i>RFC&nbsp;2279: UTF-8, a\n" +
@ -106,9 +106,9 @@ public class TestLinkOption extends JavadocTester {
"</dl>"); "</dl>");
checkOutput("mylib/lang/StringBuilderChild.html", true, checkOutput("mylib/lang/StringBuilderChild.html", true,
"<pre>public abstract class <span class=\"typeNameLabel\">StringBuilderChild</span>\n" "<pre>public abstract class <span class=\"type-name-label\">StringBuilderChild</span>\n"
+ "extends <a href=\"" + url + "java/lang/Object.html\" " + "extends <a href=\"" + url + "java/lang/Object.html\" "
+ "title=\"class or interface in java.lang\" class=\"externalLink\">Object</a></pre>" + "title=\"class or interface in java.lang\" class=\"external-link\">Object</a></pre>"
); );
// Generate the documentation using -linkoffline and a relative path as the first parameter. // Generate the documentation using -linkoffline and a relative path as the first parameter.
@ -122,7 +122,7 @@ public class TestLinkOption extends JavadocTester {
checkExit(Exit.OK); checkExit(Exit.OK);
checkOutput("pkg2/C2.html", true, checkOutput("pkg2/C2.html", true,
"This is a link to <a href=\"../../" + out1 + "/pkg/C.html\" " + "This is a link to <a href=\"../../" + out1 + "/pkg/C.html\" " +
"title=\"class or interface in pkg\" class=\"externalLink\"><code>Class C</code></a>." "title=\"class or interface in pkg\" class=\"external-link\"><code>Class C</code></a>."
); );
String out3 = "out3"; String out3 = "out3";
@ -146,15 +146,15 @@ public class TestLinkOption extends JavadocTester {
"pkg3"); "pkg3");
checkExit(Exit.OK); checkExit(Exit.OK);
checkOutput("pkg3/A.html", true, checkOutput("pkg3/A.html", true,
"<pre>public class <span class=\"typeNameLabel\">A</span>\n" "<pre>public class <span class=\"type-name-label\">A</span>\n"
+ "extends java.lang.Object</pre>\n" + "extends java.lang.Object</pre>\n"
+ "<div class=\"block\">Test links.\n" + "<div class=\"block\">Test links.\n"
+ " <br>\n" + " <br>\n"
+ " <a href=\"../../out2/pkg2/C2.html\" " + " <a href=\"../../out2/pkg2/C2.html\" "
+ "title=\"class or interface in pkg2\" class=\"externalLink\"><code>link to pkg2.C2</code></a>\n" + "title=\"class or interface in pkg2\" class=\"external-link\"><code>link to pkg2.C2</code></a>\n"
+ " <br>\n" + " <br>\n"
+ " <a href=\"../../out1/mylib/lang/StringBuilderChild.html\" " + " <a href=\"../../out1/mylib/lang/StringBuilderChild.html\" "
+ "title=\"class or interface in mylib.lang\" class=\"externalLink\">" + "title=\"class or interface in mylib.lang\" class=\"external-link\">"
+ "<code>link to mylib.lang.StringBuilderChild</code></a>.</div>\n" + "<code>link to mylib.lang.StringBuilderChild</code></a>.</div>\n"
); );
@ -167,15 +167,15 @@ public class TestLinkOption extends JavadocTester {
"pkg3"); "pkg3");
checkExit(Exit.OK); checkExit(Exit.OK);
checkOutput("pkg3/A.html", true, checkOutput("pkg3/A.html", true,
"<pre>public class <span class=\"typeNameLabel\">A</span>\n" "<pre>public class <span class=\"type-name-label\">A</span>\n"
+ "extends java.lang.Object</pre>\n" + "extends java.lang.Object</pre>\n"
+ "<div class=\"block\">Test links.\n" + "<div class=\"block\">Test links.\n"
+ " <br>\n" + " <br>\n"
+ " <a href=\"../../copy/out2/pkg2/C2.html\" " + " <a href=\"../../copy/out2/pkg2/C2.html\" "
+ "title=\"class or interface in pkg2\" class=\"externalLink\"><code>link to pkg2.C2</code></a>\n" + "title=\"class or interface in pkg2\" class=\"external-link\"><code>link to pkg2.C2</code></a>\n"
+ " <br>\n" + " <br>\n"
+ " <a href=\"../../copy/out1/mylib/lang/StringBuilderChild.html\" " + " <a href=\"../../copy/out1/mylib/lang/StringBuilderChild.html\" "
+ "title=\"class or interface in mylib.lang\" class=\"externalLink\">" + "title=\"class or interface in mylib.lang\" class=\"external-link\">"
+ "<code>link to mylib.lang.StringBuilderChild</code></a>.</div>\n" + "<code>link to mylib.lang.StringBuilderChild</code></a>.</div>\n"
); );

6
test/langtools/jdk/javadoc/doclet/testLinkOption/TestLinkOptionWithAutomaticModule.java
View file

@ -104,7 +104,7 @@ public class TestLinkOptionWithAutomaticModule extends JavadocTester {
checkExit(Exit.OK); checkExit(Exit.OK);
checkOutput("p/MyClass.html", true, checkOutput("p/MyClass.html", true,
"extends <a href=\"http://myWebsite/lib/LibClass.html\" " "extends <a href=\"http://myWebsite/lib/LibClass.html\" "
+ "title=\"class or interface in lib\" class=\"externalLink\">LibClass</a>"); + "title=\"class or interface in lib\" class=\"external-link\">LibClass</a>");
} }
@Test @Test
@ -128,7 +128,7 @@ public class TestLinkOptionWithAutomaticModule extends JavadocTester {
checkExit(Exit.OK); checkExit(Exit.OK);
checkOutput("my.module/p/MyClass.html", true, checkOutput("my.module/p/MyClass.html", true,
"extends <a href=\"http://myWebsite/lib/LibClass.html\" " "extends <a href=\"http://myWebsite/lib/LibClass.html\" "
+ "title=\"class or interface in lib\" class=\"externalLink\">LibClass</a>"); + "title=\"class or interface in lib\" class=\"external-link\">LibClass</a>");
} }
@Test @Test
@ -152,6 +152,6 @@ public class TestLinkOptionWithAutomaticModule extends JavadocTester {
checkExit(Exit.OK); checkExit(Exit.OK);
checkOutput("my.module/p/MyClass.html", true, checkOutput("my.module/p/MyClass.html", true,
"extends <a href=\"http://myWebsite/lib/LibClass.html\" " "extends <a href=\"http://myWebsite/lib/LibClass.html\" "
+ "title=\"class or interface in lib\" class=\"externalLink\">LibClass</a>"); + "title=\"class or interface in lib\" class=\"external-link\">LibClass</a>");
} }
} }

4
test/langtools/jdk/javadoc/doclet/testLinkOption/TestLinkOptionWithModule.java
View file

@ -77,7 +77,7 @@ public class TestLinkOptionWithModule extends JavadocTester {
checkExit(Exit.OK); checkExit(Exit.OK);
checkOutput("com.ex2/com/ex2/B.html", true, checkOutput("com.ex2/com/ex2/B.html", true,
"<a href=\"../../../../out1a/com.ex1/com/ex1/A.html\" " "<a href=\"../../../../out1a/com.ex1/com/ex1/A.html\" "
+ "title=\"class or interface in com.ex1\" class=\"externalLink\">A</a>"); + "title=\"class or interface in com.ex1\" class=\"external-link\">A</a>");
} }
@Test @Test
@ -96,7 +96,7 @@ public class TestLinkOptionWithModule extends JavadocTester {
checkExit(Exit.OK); checkExit(Exit.OK);
checkOutput("com/ex2/B.html", true, checkOutput("com/ex2/B.html", true,
"<a href=\"../../../out2a/com/ex1/A.html\" title=\"class or interface in com.ex1\" " "<a href=\"../../../out2a/com/ex1/A.html\" title=\"class or interface in com.ex1\" "
+ "class=\"externalLink\">A</a>"); + "class=\"external-link\">A</a>");
} }
@Test @Test

4
test/langtools/jdk/javadoc/doclet/testLinkOption/TestOptionOrder.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -116,7 +116,7 @@ public class TestOptionOrder extends JavadocTester {
// Instance in See Also // Instance in See Also
"<dd><a href=\"http://example.com/" + first + "/lib/LibClass.html", "<dd><a href=\"http://example.com/" + first + "/lib/LibClass.html",
// Instance in Field declaration // Instance in Field declaration
"<td class=\"colFirst\"><code><a href=\"http://example.com/" + first + "/lib/LibClass.html" "<td class=\"col-first\"><code><a href=\"http://example.com/" + first + "/lib/LibClass.html"
); );
} }

8
test/langtools/jdk/javadoc/doclet/testLinkOption/TestRedirectLinks.java
View file

@ -123,10 +123,10 @@ public class TestRedirectLinks extends JavadocTester {
checkExit(Exit.OK); checkExit(Exit.OK);
checkOutput("pkg/B.html", true, checkOutput("pkg/B.html", true,
"<a href=\"" + apiURL + "/java.base/java/lang/String.html\" " "<a href=\"" + apiURL + "/java.base/java/lang/String.html\" "
+ "title=\"class or interface in java.lang\" class=\"externalLink\">Link-Plain to String Class</a>"); + "title=\"class or interface in java.lang\" class=\"external-link\">Link-Plain to String Class</a>");
checkOutput("pkg/C.html", true, checkOutput("pkg/C.html", true,
"<a href=\"" + apiURL + "/java.base/java/lang/Object.html\" " "<a href=\"" + apiURL + "/java.base/java/lang/Object.html\" "
+ "title=\"class or interface in java.lang\" class=\"externalLink\">Object</a>"); + "title=\"class or interface in java.lang\" class=\"external-link\">Object</a>");
} }
private Path libApi = Path.of("libApi"); private Path libApi = Path.of("libApi");
@ -217,10 +217,10 @@ public class TestRedirectLinks extends JavadocTester {
"javadoc: warning - URL " + oldURL + "/element-list was redirected to " + newURL + "/element-list"); "javadoc: warning - URL " + oldURL + "/element-list was redirected to " + newURL + "/element-list");
checkOutput("mC/p5/C5.html", true, checkOutput("mC/p5/C5.html", true,
"extends <a href=\"" + oldURL + "/mA/p1/C1.html\" " + "extends <a href=\"" + oldURL + "/mA/p1/C1.html\" " +
"title=\"class or interface in p1\" class=\"externalLink\">C1</a>"); "title=\"class or interface in p1\" class=\"external-link\">C1</a>");
checkOutput("mC/p6/C6.html", true, checkOutput("mC/p6/C6.html", true,
"<a href=\"" + oldURL + "/mB/p4/C4.html\" " + "<a href=\"" + oldURL + "/mB/p4/C4.html\" " +
"title=\"class or interface in p4\" class=\"externalLink\">C4</a>"); "title=\"class or interface in p4\" class=\"external-link\">C4</a>");
} finally { } finally {
if (oldServer != null) { if (oldServer != null) {
out.println("Stopping old server on " + oldServer.getAddress()); out.println("Stopping old server on " + oldServer.getAddress());

4
test/langtools/jdk/javadoc/doclet/testLinkToSerialForm/TestLinkToSerialForm.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -49,7 +49,7 @@ public class TestLinkToSerialForm extends JavadocTester {
checkExit(Exit.OK); checkExit(Exit.OK);
checkOutput("serialized-form.html", true, checkOutput("serialized-form.html", true,
"<section class=\"serializedClassDetails\" id=\"pkg.C\">"); "<section class=\"serialized-class-details\" id=\"pkg.C\">");
checkOutput("pkg/C.html", true, checkOutput("pkg/C.html", true,
"<a href=\"../serialized-form.html#pkg.C\">"); "<a href=\"../serialized-form.html#pkg.C\">");
} }

10
test/langtools/jdk/javadoc/doclet/testLinksWithNoDeprecatedOption/TestLinksWithNoDeprecatedOption.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -73,20 +73,20 @@ public class TestLinksWithNoDeprecatedOption extends JavadocTester {
checkExit(Exit.OK); checkExit(Exit.OK);
checkOutput("pkg/class-use/A.html", true, checkOutput("pkg/class-use/A.html", true,
"<span class=\"memberNameLink\">" "<span class=\"member-name-link\">"
+ "<a href=\"../B.html#a2\">a2</a></span>"); + "<a href=\"../B.html#a2\">a2</a></span>");
//links for deprecated items will not be found //links for deprecated items will not be found
checkOutput("pkg/class-use/A.html", false, checkOutput("pkg/class-use/A.html", false,
"<span class=\"memberNameLink\">" "<span class=\"member-name-link\">"
+ "<a href=\"../B.html#deprecatedField\">deprecatedField</a></span>"); + "<a href=\"../B.html#deprecatedField\">deprecatedField</a></span>");
checkOutput("pkg/class-use/A.html", false, checkOutput("pkg/class-use/A.html", false,
"<span class=\"memberNameLink\">" "<span class=\"member-name-link\">"
+ "<a href=\"../B.html#deprecatedMethod(pkg.A)\">deprecatedMethod</a></span>"); + "<a href=\"../B.html#deprecatedMethod(pkg.A)\">deprecatedMethod</a></span>");
checkOutput("pkg/class-use/A.html",false, checkOutput("pkg/class-use/A.html",false,
"<span class=\"memberNameLink\">" "<span class=\"member-name-link\">"
+ "<a href=\"../B.html#%3Cinit%3E(pkg.A)\">B</a></span>"); + "<a href=\"../B.html#%3Cinit%3E(pkg.A)\">B</a></span>");
} }

6
test/langtools/jdk/javadoc/doclet/testLiteralCodeInPre/TestLiteralCodeInPre.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -91,8 +91,8 @@ public class TestLiteralCodeInPre extends JavadocTester {
+ " <PRE>\n" + " <PRE>\n"
+ " <b>id </b>\n" + " <b>id </b>\n"
+ " </PRE></div>", + " </PRE></div>",
"<div class=\"memberSignature\"><span class=\"modifiers\">public</span>&nbsp;" "<div class=\"member-signature\"><span class=\"modifiers\">public</span>&nbsp;"
+ "<span class=\"returnType\">void</span>&nbsp;<span class=\"memberName\">htmlAttrInPre1</span>()</div>\n" + "<span class=\"return-type\">void</span>&nbsp;<span class=\"member-name\">htmlAttrInPre1</span>()</div>\n"
+ "<div class=\"block\">More html tag outliers.\n" + "<div class=\"block\">More html tag outliers.\n"
+ " <pre>\n" + " <pre>\n"
+ " @Override\n" + " @Override\n"

38
test/langtools/jdk/javadoc/doclet/testMemberInheritance/TestMemberInheritance.java
View file

@ -91,8 +91,8 @@ public class TestMemberInheritance extends JavadocTester {
checkOutput("pkg1/Implementer.html", true, checkOutput("pkg1/Implementer.html", true,
// ensure the method makes it // ensure the method makes it
"<td class=\"colFirst\"><code>static java.time.Period</code></td>\n" "<td class=\"col-first\"><code>static java.time.Period</code></td>\n"
+ "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">" + "<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\">"
+ "<a href=\"#between(java.time.LocalDate,java.time.LocalDate)\">" + "<a href=\"#between(java.time.LocalDate,java.time.LocalDate)\">"
+ "between</a></span>&#8203;(java.time.LocalDate&nbsp;startDateInclusive,\n" + "between</a></span>&#8203;(java.time.LocalDate&nbsp;startDateInclusive,\n"
+ "java.time.LocalDate&nbsp;endDateExclusive)</code></th>"); + "java.time.LocalDate&nbsp;endDateExclusive)</code></th>");
@ -106,25 +106,25 @@ public class TestMemberInheritance extends JavadocTester {
checkOutput("pkg2/DocumentedNonGenericChild.html", true, checkOutput("pkg2/DocumentedNonGenericChild.html", true,
"<section class=\"description\">\n<hr>\n" "<section class=\"description\">\n<hr>\n"
+ "<pre>public abstract class <span class=\"typeNameLabel\">" + "<pre>public abstract class <span class=\"type-name-label\">"
+ "DocumentedNonGenericChild</span>\n" + "DocumentedNonGenericChild</span>\n"
+ "extends java.lang.Object</pre>\n" + "extends java.lang.Object</pre>\n"
+ "</section>"); + "</section>");
checkOutput("pkg2/DocumentedNonGenericChild.html", true, checkOutput("pkg2/DocumentedNonGenericChild.html", true,
"<td class=\"colFirst\"><code>protected abstract java.lang.String</code></td>\n" "<td class=\"col-first\"><code>protected abstract java.lang.String</code></td>\n"
+ "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">" + "<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\">"
+ "<a href=\"#parentMethod(T)\">parentMethod</a></span>&#8203;(java.lang.String&nbsp;t)</code></th>\n" + "<a href=\"#parentMethod(T)\">parentMethod</a></span>&#8203;(java.lang.String&nbsp;t)</code></th>\n"
+ "<td class=\"colLast\">\n" + "<td class=\"col-last\">\n"
+ "<div class=\"block\">Returns some value.</div>\n" + "<div class=\"block\">Returns some value.</div>\n"
+ "</td>\n"); + "</td>\n");
checkOutput("pkg2/DocumentedNonGenericChild.html", true, checkOutput("pkg2/DocumentedNonGenericChild.html", true,
"<section class=\"detail\" id=\"parentMethod(T)\">\n" "<section class=\"detail\" id=\"parentMethod(T)\">\n"
+ "<h3 id=\"parentMethod(java.lang.Object)\">parentMethod</h3>\n" + "<h3 id=\"parentMethod(java.lang.Object)\">parentMethod</h3>\n"
+ "<div class=\"memberSignature\"><span class=\"modifiers\">protected abstract</span>" + "<div class=\"member-signature\"><span class=\"modifiers\">protected abstract</span>"
+ "&nbsp;<span class=\"returnType\">java.lang.String</span>&nbsp;" + "&nbsp;<span class=\"return-type\">java.lang.String</span>&nbsp;"
+ "<span class=\"memberName\">parentMethod</span>&#8203;" + "<span class=\"member-name\">parentMethod</span>&#8203;"
+ "(<span class=\"arguments\">java.lang.String&nbsp;t)</span>\n" + "(<span class=\"arguments\">java.lang.String&nbsp;t)</span>\n"
+ " " + " "
+ "throws <span class=\"exceptions\">java.lang.IllegalArgumentException,\n" + "throws <span class=\"exceptions\">java.lang.IllegalArgumentException,\n"
@ -138,27 +138,27 @@ public class TestMemberInheritance extends JavadocTester {
+ "<dd><code>java.lang.IllegalArgumentException</code></dd>"); + "<dd><code>java.lang.IllegalArgumentException</code></dd>");
checkOutput("pkg2/DocumentedNonGenericChild.html", true, checkOutput("pkg2/DocumentedNonGenericChild.html", true,
"<td class=\"colFirst\"><code>java.lang.String</code></td>\n" "<td class=\"col-first\"><code>java.lang.String</code></td>\n"
+ "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">" + "<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\">"
+ "<a href=\"#f\">f</a></span></code></th>\n" + "<a href=\"#f\">f</a></span></code></th>\n"
+ "<td class=\"colLast\">\n" + "<td class=\"col-last\">\n"
+ "<div class=\"block\">A field.</div>", + "<div class=\"block\">A field.</div>",
"<section class=\"detail\" id=\"f\">\n" "<section class=\"detail\" id=\"f\">\n"
+ "<h3>f</h3>\n" + "<h3>f</h3>\n"
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public</span>&nbsp;" + "<div class=\"member-signature\"><span class=\"modifiers\">public</span>&nbsp;"
+ "<span class=\"returnType\">java.lang.String</span>&nbsp;<span class=\"memberName\">f</span></div>\n" + "<span class=\"return-type\">java.lang.String</span>&nbsp;<span class=\"member-name\">f</span></div>\n"
+ "<div class=\"block\">A field.</div>\n" + "<div class=\"block\">A field.</div>\n"
+ "</section>"); + "</section>");
checkOutput("pkg3/PrivateGenericParent.PublicChild.html", true, checkOutput("pkg3/PrivateGenericParent.PublicChild.html", true,
"<td class=\"colFirst\"><code>java.lang.String</code></td>\n" "<td class=\"col-first\"><code>java.lang.String</code></td>\n"
+ "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">" + "<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\">"
+ "<a href=\"#method(T)\">method</a></span>&#8203;(java.lang.String&nbsp;t)</code></th>", + "<a href=\"#method(T)\">method</a></span>&#8203;(java.lang.String&nbsp;t)</code></th>",
"<section class=\"detail\" id=\"method(T)\">\n" "<section class=\"detail\" id=\"method(T)\">\n"
+ "<h3 id=\"method(java.lang.Object)\">method</h3>\n" + "<h3 id=\"method(java.lang.Object)\">method</h3>\n"
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public</span>" + "<div class=\"member-signature\"><span class=\"modifiers\">public</span>"
+ "&nbsp;<span class=\"returnType\">java.lang.String</span>&nbsp;" + "&nbsp;<span class=\"return-type\">java.lang.String</span>&nbsp;"
+ "<span class=\"memberName\">method</span>&#8203;(<span class=\"arguments\">" + "<span class=\"member-name\">method</span>&#8203;(<span class=\"arguments\">"
+ "java.lang.String&nbsp;t)</span></div>\n" + "java.lang.String&nbsp;t)</span></div>\n"
+ "</section>"); + "</section>");
} }

14
test/langtools/jdk/javadoc/doclet/testMemberSummary/TestMemberSummary.java
View file

@ -53,18 +53,18 @@ public class TestMemberSummary extends JavadocTester {
checkOutput("pkg/PublicChild.html", true, checkOutput("pkg/PublicChild.html", true,
// Check return type in member summary. // Check return type in member summary.
"<code><a href=\"PublicChild.html\" title=\"class in pkg\">PublicChild</a></code></td>\n" "<code><a href=\"PublicChild.html\" title=\"class in pkg\">PublicChild</a></code></td>\n"
+ "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\"><a href=\"#returnTypeTest()\">" + "<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\"><a href=\"#returnTypeTest()\">"
+ "returnTypeTest</a></span>()</code>", + "returnTypeTest</a></span>()</code>",
// Check return type in member detail. // Check return type in member detail.
"<div class=\"memberSignature\"><span class=\"modifiers\">public</span>&nbsp;" "<div class=\"member-signature\"><span class=\"modifiers\">public</span>&nbsp;"
+ "<span class=\"returnType\"><a href=\"PublicChild.html\" title=\"class in pkg\">" + "<span class=\"return-type\"><a href=\"PublicChild.html\" title=\"class in pkg\">"
+ "PublicChild</a></span>&nbsp;<span class=\"memberName\">returnTypeTest</span>()</div>", + "PublicChild</a></span>&nbsp;<span class=\"member-name\">returnTypeTest</span>()</div>",
"<th class=\"colConstructorName\" scope=\"row\"><code><span class=\"memberNameLink\">" "<th class=\"col-constructor-name\" scope=\"row\"><code><span class=\"member-name-link\">"
+ "<a href=\"#%3Cinit%3E()\">PublicChild</a></span>()</code></th>"); + "<a href=\"#%3Cinit%3E()\">PublicChild</a></span>()</code></th>");
checkOutput("pkg/PrivateParent.html", true, checkOutput("pkg/PrivateParent.html", true,
"<td class=\"colFirst\"><code>private </code></td>\n" "<td class=\"col-first\"><code>private </code></td>\n"
+ "<th class=\"colConstructorName\" scope=\"row\"><code><span class=\"memberNameLink\">" + "<th class=\"col-constructor-name\" scope=\"row\"><code><span class=\"member-name-link\">"
+ "<a href=\"#%3Cinit%3E(int)\">PrivateParent</a></span>&#8203;(int&nbsp;i)</code>" + "<a href=\"#%3Cinit%3E(int)\">PrivateParent</a></span>&#8203;(int&nbsp;i)</code>"
+ "</th>"); + "</th>");

30
test/langtools/jdk/javadoc/doclet/testMethodSignature/TestMethodSignature.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -48,26 +48,26 @@ public class TestMethodSignature extends JavadocTester {
checkExit(Exit.OK); checkExit(Exit.OK);
checkOutput("pkg/C.html", true, checkOutput("pkg/C.html", true,
"<div class=\"memberSignature\"><span class=\"annotations\">" "<div class=\"member-signature\"><span class=\"annotations\">"
+ "@Generated(\"GeneratedConstructor\")\n" + "@Generated(\"GeneratedConstructor\")\n"
+ "</span><span class=\"modifiers\">public</span>&nbsp;" + "</span><span class=\"modifiers\">public</span>&nbsp;"
+ "<span class=\"memberName\">C</span>()</div>", + "<span class=\"member-name\">C</span>()</div>",
"<div class=\"memberSignature\"><span class=\"modifiers\">public static</span>" "<div class=\"member-signature\"><span class=\"modifiers\">public static</span>"
+ "&nbsp;<span class=\"returnType\">void</span>&nbsp;<span class=\"memberName\">" + "&nbsp;<span class=\"return-type\">void</span>&nbsp;<span class=\"member-name\">"
+ "simpleMethod</span>&#8203;(<span class=\"arguments\">int&nbsp;i,\n" + "simpleMethod</span>&#8203;(<span class=\"arguments\">int&nbsp;i,\n"
+ "java.lang.String&nbsp;s,\nboolean&nbsp;b)</span></div>", + "java.lang.String&nbsp;s,\nboolean&nbsp;b)</span></div>",
"<div class=\"memberSignature\"><span class=\"annotations\">@Generated" "<div class=\"member-signature\"><span class=\"annotations\">@Generated"
+ "(value=\"SomeGeneratedName\",\n date=\"a date\",\n" + "(value=\"SomeGeneratedName\",\n date=\"a date\",\n"
+ " comments=\"some comment about the method below\")\n" + " comments=\"some comment about the method below\")\n"
+ "</span><span class=\"modifiers\">public static</span>&nbsp;<span " + "</span><span class=\"modifiers\">public static</span>&nbsp;<span "
+ "class=\"returnType\">void</span>&nbsp;<span class=\"memberName\">annotatedMethod" + "class=\"return-type\">void</span>&nbsp;<span class=\"member-name\">annotatedMethod"
+ "</span>&#8203;(<span class=\"arguments\">int&nbsp;i,\n" + "</span>&#8203;(<span class=\"arguments\">int&nbsp;i,\n"
+ "java.lang.String&nbsp;s,\nboolean&nbsp;b)</span></div>", + "java.lang.String&nbsp;s,\nboolean&nbsp;b)</span></div>",
"<div class=\"memberSignature\"><span class=\"modifiers\">public static</span>" "<div class=\"member-signature\"><span class=\"modifiers\">public static</span>"
+ "&nbsp;<span class=\"typeParametersLong\">&lt;T1 extends java.lang.AutoCloseable,&#8203;\n" + "&nbsp;<span class=\"type-parameters-long\">&lt;T1 extends java.lang.AutoCloseable,&#8203;\n"
+ "T2 extends java.lang.AutoCloseable,&#8203;\n" + "T2 extends java.lang.AutoCloseable,&#8203;\n"
+ "T3 extends java.lang.AutoCloseable,&#8203;\n" + "T3 extends java.lang.AutoCloseable,&#8203;\n"
+ "T4 extends java.lang.AutoCloseable,&#8203;\n" + "T4 extends java.lang.AutoCloseable,&#8203;\n"
@ -75,10 +75,10 @@ public class TestMethodSignature extends JavadocTester {
+ "T6 extends java.lang.AutoCloseable,&#8203;\n" + "T6 extends java.lang.AutoCloseable,&#8203;\n"
+ "T7 extends java.lang.AutoCloseable,&#8203;\n" + "T7 extends java.lang.AutoCloseable,&#8203;\n"
+ "T8 extends java.lang.AutoCloseable&gt;</span>\n" + "T8 extends java.lang.AutoCloseable&gt;</span>\n"
+ "<span class=\"returnType\"><a href=\"C.With8Types.html\" " + "<span class=\"return-type\"><a href=\"C.With8Types.html\" "
+ "title=\"class in pkg\">C.With8Types</a>&lt;T1,&#8203;T2,&#8203;T3," + "title=\"class in pkg\">C.With8Types</a>&lt;T1,&#8203;T2,&#8203;T3,"
+ "&#8203;T4,&#8203;T5,&#8203;T6,&#8203;T7,&#8203;T8&gt;</span>&nbsp;" + "&#8203;T4,&#8203;T5,&#8203;T6,&#8203;T7,&#8203;T8&gt;</span>&nbsp;"
+ "<span class=\"memberName\">bigGenericMethod</span>&#8203;(" + "<span class=\"member-name\">bigGenericMethod</span>&#8203;("
+ "<span class=\"arguments\"><a href=\"C.F0.html\" " + "<span class=\"arguments\"><a href=\"C.F0.html\" "
+ "title=\"interface in pkg\">C.F0</a>&lt;? extends T1&gt;&nbsp;t1,\n" + "title=\"interface in pkg\">C.F0</a>&lt;? extends T1&gt;&nbsp;t1,\n"
+ "<a href=\"C.F0.html\" title=\"interface in pkg\">" + "<a href=\"C.F0.html\" title=\"interface in pkg\">"
@ -99,12 +99,12 @@ public class TestMethodSignature extends JavadocTester {
+ "throws <span class=\"exceptions\">java.lang.IllegalArgumentException,\n" + "throws <span class=\"exceptions\">java.lang.IllegalArgumentException,\n"
+ "java.lang.IllegalStateException</span></div>", + "java.lang.IllegalStateException</span></div>",
"<div class=\"memberSignature\"><span class=\"annotations\">" "<div class=\"member-signature\"><span class=\"annotations\">"
+ "@Generated(value=\"SomeGeneratedName\",\n" + "@Generated(value=\"SomeGeneratedName\",\n"
+ " date=\"a date\",\n" + " date=\"a date\",\n"
+ " comments=\"some comment about the method below\")\n" + " comments=\"some comment about the method below\")\n"
+ "</span><span class=\"modifiers\">public static</span>&nbsp;" + "</span><span class=\"modifiers\">public static</span>&nbsp;"
+ "<span class=\"typeParametersLong\">" + "<span class=\"type-parameters-long\">"
+ "&lt;T1 extends java.lang.AutoCloseable,&#8203;\n" + "&lt;T1 extends java.lang.AutoCloseable,&#8203;\n"
+ "T2 extends java.lang.AutoCloseable,&#8203;\n" + "T2 extends java.lang.AutoCloseable,&#8203;\n"
+ "T3 extends java.lang.AutoCloseable,&#8203;\n" + "T3 extends java.lang.AutoCloseable,&#8203;\n"
@ -113,10 +113,10 @@ public class TestMethodSignature extends JavadocTester {
+ "T6 extends java.lang.AutoCloseable,&#8203;\n" + "T6 extends java.lang.AutoCloseable,&#8203;\n"
+ "T7 extends java.lang.AutoCloseable,&#8203;\n" + "T7 extends java.lang.AutoCloseable,&#8203;\n"
+ "T8 extends java.lang.AutoCloseable&gt;</span>\n" + "T8 extends java.lang.AutoCloseable&gt;</span>\n"
+ "<span class=\"returnType\"><a href=\"C.With8Types.html\" " + "<span class=\"return-type\"><a href=\"C.With8Types.html\" "
+ "title=\"class in pkg\">C.With8Types</a>&lt;T1,&#8203;T2,&#8203;T3," + "title=\"class in pkg\">C.With8Types</a>&lt;T1,&#8203;T2,&#8203;T3,"
+ "&#8203;T4,&#8203;T5,&#8203;T6,&#8203;T7,&#8203;T8&gt;</span>&nbsp;" + "&#8203;T4,&#8203;T5,&#8203;T6,&#8203;T7,&#8203;T8&gt;</span>&nbsp;"
+ "<span class=\"memberName\">bigGenericAnnotatedMethod</span>&#8203;(" + "<span class=\"member-name\">bigGenericAnnotatedMethod</span>&#8203;("
+ "<span class=\"arguments\"><a href=\"C.F0.html\" " + "<span class=\"arguments\"><a href=\"C.F0.html\" "
+ "title=\"interface in pkg\">C.F0</a>&lt;? extends T1&gt;&nbsp;t1,\n" + "title=\"interface in pkg\">C.F0</a>&lt;? extends T1&gt;&nbsp;t1,\n"
+ "<a href=\"C.F0.html\" title=\"interface in pkg\">" + "<a href=\"C.F0.html\" title=\"interface in pkg\">"

72
test/langtools/jdk/javadoc/doclet/testMethodTypes/TestMethodTypes.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -50,67 +50,67 @@ public class TestMethodTypes extends JavadocTester {
checkOutput("pkg1/A.html", true, checkOutput("pkg1/A.html", true,
"var data = {", "var data = {",
"<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\"" "<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
+ " aria-selected=\"true\" aria-controls=\"memberSummary_tabpanel\" tabindex=\"0\"" + " aria-selected=\"true\" aria-controls=\"member-summary_tabpanel\" tabindex=\"0\""
+ " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"activeTableTab\">All Methods</button>" + " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"active-table-tab\">All Methods</button>"
+ "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"memberSummary_tabpanel\"" + "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"member-summary_tabpanel\""
+ " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t1\" class=\"tableTab\"" + " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t1\" class=\"table-tab\""
+ " onclick=\"show(1);\">Static Methods</button><button role=\"tab\" aria-selected=\"false\"" + " onclick=\"show(1);\">Static Methods</button><button role=\"tab\" aria-selected=\"false\""
+ " aria-controls=\"memberSummary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\"" + " aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
+ " id=\"t2\" class=\"tableTab\" onclick=\"show(2);\">Instance Methods</button>" + " id=\"t2\" class=\"table-tab\" onclick=\"show(2);\">Instance Methods</button>"
+ "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"memberSummary_tabpanel\"" + "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"member-summary_tabpanel\""
+ " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t4\" class=\"tableTab\"" + " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t4\" class=\"table-tab\""
+ " onclick=\"show(8);\">Concrete Methods</button><button role=\"tab\"" + " onclick=\"show(8);\">Concrete Methods</button><button role=\"tab\""
+ " aria-selected=\"false\" aria-controls=\"memberSummary_tabpanel\" tabindex=\"-1\"" + " aria-selected=\"false\" aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\""
+ " onkeydown=\"switchTab(event)\" id=\"t6\" class=\"tableTab\" onclick=\"show(32);\">" + " onkeydown=\"switchTab(event)\" id=\"t6\" class=\"table-tab\" onclick=\"show(32);\">"
+ "Deprecated Methods</button></div>", + "Deprecated Methods</button></div>",
"<tr class=\"altColor\" id=\"i0\">"); "<tr class=\"alt-color\" id=\"i0\">");
checkOutput("pkg1/B.html", true, checkOutput("pkg1/B.html", true,
"var data = {\"i0\":6,\"i1\":18,\"i2\":18,\"i3\":1,\"i4\":1," "var data = {\"i0\":6,\"i1\":18,\"i2\":18,\"i3\":1,\"i4\":1,"
+ "\"i5\":6,\"i6\":6,\"i7\":6,\"i8\":6};\n", + "\"i5\":6,\"i6\":6,\"i7\":6,\"i8\":6};\n",
"<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\"" "<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
+ " aria-selected=\"true\" aria-controls=\"memberSummary_tabpanel\" tabindex=\"0\"" + " aria-selected=\"true\" aria-controls=\"member-summary_tabpanel\" tabindex=\"0\""
+ " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"activeTableTab\">All Methods" + " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"active-table-tab\">All Methods"
+ "</button><button role=\"tab\" aria-selected=\"false\"" + "</button><button role=\"tab\" aria-selected=\"false\""
+ " aria-controls=\"memberSummary_tabpanel\" tabindex=\"-1\"" + " aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\""
+ " onkeydown=\"switchTab(event)\" id=\"t1\" class=\"tableTab\" onclick=\"show(1);\">" + " onkeydown=\"switchTab(event)\" id=\"t1\" class=\"table-tab\" onclick=\"show(1);\">"
+ "Static Methods</button><button role=\"tab\" aria-selected=\"false\"" + "Static Methods</button><button role=\"tab\" aria-selected=\"false\""
+ " aria-controls=\"memberSummary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\"" + " aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
+ " id=\"t2\" class=\"tableTab\" onclick=\"show(2);\">Instance Methods</button>" + " id=\"t2\" class=\"table-tab\" onclick=\"show(2);\">Instance Methods</button>"
+ "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"memberSummary_tabpanel\"" + "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"member-summary_tabpanel\""
+ " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t3\" class=\"tableTab\"" + " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t3\" class=\"table-tab\""
+ " onclick=\"show(4);\">Abstract Methods</button><button role=\"tab\"" + " onclick=\"show(4);\">Abstract Methods</button><button role=\"tab\""
+ " aria-selected=\"false\" aria-controls=\"memberSummary_tabpanel\" tabindex=\"-1\"" + " aria-selected=\"false\" aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\""
+ " onkeydown=\"switchTab(event)\" id=\"t5\" class=\"tableTab\" onclick=\"show(16);\">" + " onkeydown=\"switchTab(event)\" id=\"t5\" class=\"table-tab\" onclick=\"show(16);\">"
+ "Default Methods</button></div>"); + "Default Methods</button></div>");
checkOutput("pkg1/D.html", true, checkOutput("pkg1/D.html", true,
"var data = {", "var data = {",
"<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\"" "<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
+ " aria-selected=\"true\" aria-controls=\"memberSummary_tabpanel\" tabindex=\"0\"" + " aria-selected=\"true\" aria-controls=\"member-summary_tabpanel\" tabindex=\"0\""
+ " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"activeTableTab\">All Methods</button>" + " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"active-table-tab\">All Methods</button>"
+ "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"memberSummary_tabpanel\"" + "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"member-summary_tabpanel\""
+ " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t2\" class=\"tableTab\"" + " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t2\" class=\"table-tab\""
+ " onclick=\"show(2);\">Instance Methods</button><button role=\"tab\" aria-selected=\"false\"" + " onclick=\"show(2);\">Instance Methods</button><button role=\"tab\" aria-selected=\"false\""
+ " aria-controls=\"memberSummary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\"" + " aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
+ " id=\"t3\" class=\"tableTab\" onclick=\"show(4);\">Abstract Methods</button>" + " id=\"t3\" class=\"table-tab\" onclick=\"show(4);\">Abstract Methods</button>"
+ "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"memberSummary_tabpanel\"" + "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"member-summary_tabpanel\""
+ " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t4\" class=\"tableTab\"" + " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t4\" class=\"table-tab\""
+ " onclick=\"show(8);\">Concrete Methods</button><button role=\"tab\" aria-selected=\"false\"" + " onclick=\"show(8);\">Concrete Methods</button><button role=\"tab\" aria-selected=\"false\""
+ " aria-controls=\"memberSummary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\"" + " aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
+ " id=\"t6\" class=\"tableTab\" onclick=\"show(32);\">Deprecated Methods</button></div>", + " id=\"t6\" class=\"table-tab\" onclick=\"show(32);\">Deprecated Methods</button></div>",
"<tr class=\"altColor\" id=\"i0\">"); "<tr class=\"alt-color\" id=\"i0\">");
checkOutput("pkg1/A.html", false, checkOutput("pkg1/A.html", false,
"<caption><span>Methods</span><span class=\"tabEnd\">&nbsp;</span>" "<caption><span>Methods</span><span class=\"tab-end\">&nbsp;</span>"
+ "</caption>"); + "</caption>");
checkOutput("pkg1/B.html", false, checkOutput("pkg1/B.html", false,
"<caption><span>Methods</span><span class=\"tabEnd\">&nbsp;</span>" "<caption><span>Methods</span><span class=\"tab-end\">&nbsp;</span>"
+ "</caption>"); + "</caption>");
checkOutput("pkg1/D.html", false, checkOutput("pkg1/D.html", false,
"<caption><span>Methods</span><span class=\"tabEnd\">&nbsp;</span>" "<caption><span>Methods</span><span class=\"tab-end\">&nbsp;</span>"
+ "</caption>"); + "</caption>");
} }
} }

12
test/langtools/jdk/javadoc/doclet/testModifierEx/TestModifierEx.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -46,15 +46,15 @@ public class TestModifierEx extends JavadocTester {
"-package", "pkg1"); "-package", "pkg1");
checkExit(Exit.OK); checkExit(Exit.OK);
checkOutput("pkg1/Abstract.html", true, checkOutput("pkg1/Abstract.html", true,
"<pre>public abstract class <span class=\"typeNameLabel\">Abstract</span>"); "<pre>public abstract class <span class=\"type-name-label\">Abstract</span>");
checkOutput("pkg1/Interface.html", true, checkOutput("pkg1/Interface.html", true,
"<pre>interface <span class=\"typeNameLabel\">Interface</span></pre>"); "<pre>interface <span class=\"type-name-label\">Interface</span></pre>");
checkOutput("pkg1/Interface.Kind.html", true, checkOutput("pkg1/Interface.Kind.html", true,
"<pre>public static interface <span class=\"typeNameLabel\">Interface.Kind</span></pre>"); "<pre>public static interface <span class=\"type-name-label\">Interface.Kind</span></pre>");
checkOutput("pkg1/Enum.html", true, checkOutput("pkg1/Enum.html", true,
"<pre>public enum <span class=\"typeNameLabel\">Enum</span>"); "<pre>public enum <span class=\"type-name-label\">Enum</span>");
checkOutput("pkg1/Klass.StaticEnum.html", true, checkOutput("pkg1/Klass.StaticEnum.html", true,
"<pre>public static enum <span class=\"typeNameLabel\">Klass.StaticEnum</span>"); "<pre>public static enum <span class=\"type-name-label\">Klass.StaticEnum</span>");
} }
} }

24
test/langtools/jdk/javadoc/doclet/testModules/TestIndirectExportsOpens.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -160,14 +160,14 @@ public class TestIndirectExportsOpens extends JavadocTester {
// check for minimal expected strings. // check for minimal expected strings.
checkOutput("a/module-summary.html", true, checkOutput("a/module-summary.html", true,
"Indirect Exports", "Indirect Exports",
"<th class=\"colFirst\" scope=\"row\"><a href=\"../m/module-summary.html\">m</a></th>\n" "<th class=\"col-first\" scope=\"row\"><a href=\"../m/module-summary.html\">m</a></th>\n"
+ "<td class=\"colLast\"><a href=\"../m/exportsto/package-summary.html\">exportsto</a></td>\n" + "<td class=\"col-last\"><a href=\"../m/exportsto/package-summary.html\">exportsto</a></td>\n"
+ "</tr>\n"); + "</tr>\n");
checkOutput("a/module-summary.html", true, checkOutput("a/module-summary.html", true,
"Indirect Opens", "Indirect Opens",
"<th class=\"colFirst\" scope=\"row\"><a href=\"../m/module-summary.html\">m</a></th>\n" "<th class=\"col-first\" scope=\"row\"><a href=\"../m/module-summary.html\">m</a></th>\n"
+ "<td class=\"colLast\">opensto</td>\n" + "<td class=\"col-last\">opensto</td>\n"
+ "</tr>\n"); + "</tr>\n");
} }
@ -190,19 +190,19 @@ public class TestIndirectExportsOpens extends JavadocTester {
} }
checkOutput("a/module-summary.html", present, checkOutput("a/module-summary.html", present,
"<div class=\"packagesSummary\">\n" "<div class=\"packages-summary\">\n"
+ "<table>\n" + "<table>\n"
+ "<caption><span>" + typeString + "</span><span class=\"tabEnd\">&nbsp;</span></caption>\n" + "<caption><span>" + typeString + "</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
+ "<thead>\n" + "<thead>\n"
+ "<tr>\n" + "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">From</th>\n" + "<th class=\"col-first\" scope=\"col\">From</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Packages</th>\n" + "<th class=\"col-last\" scope=\"col\">Packages</th>\n"
+ "</tr>\n" + "</tr>\n"
+ "</thead>\n" + "</thead>\n"
+ "<tbody>\n" + "<tbody>\n"
+ "<tr class=\"altColor\">\n" + "<tr class=\"alt-color\">\n"
+ "<th class=\"colFirst\" scope=\"row\"><a href=\"../m/module-summary.html\">m</a></th>\n" + "<th class=\"col-first\" scope=\"row\"><a href=\"../m/module-summary.html\">m</a></th>\n"
+ "<td class=\"colLast\"><a href=\"../m/pm/package-summary.html\">pm</a></td>\n" + "<td class=\"col-last\"><a href=\"../m/pm/package-summary.html\">pm</a></td>\n"
+ "</tr>\n" + "</tr>\n"
+ "</tbody>\n" + "</tbody>\n"
+ "</table>\n" + "</table>\n"

40
test/langtools/jdk/javadoc/doclet/testModules/TestModulePackages.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -73,7 +73,7 @@ public class TestModulePackages extends JavadocTester {
checkExit(Exit.OK); checkExit(Exit.OK);
checkOutput("m/module-summary.html", false, checkOutput("m/module-summary.html", false,
"<h3>Packages</h3>\n" "<h3>Packages</h3>\n"
+ "<table class=\"packagesSummary\" summary=\"Packages table, " + "<table class=\"packages-summary\" summary=\"Packages table, "
+ "listing packages, and an explanation\">"); + "listing packages, and an explanation\">");
} }
@ -416,25 +416,25 @@ public class TestModulePackages extends JavadocTester {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
sb.append("<div role=\"tablist\" aria-orientation=\"horizontal\">" sb.append("<div role=\"tablist\" aria-orientation=\"horizontal\">"
+ "<button role=\"tab\" aria-selected=\"true\"" + "<button role=\"tab\" aria-selected=\"true\""
+ " aria-controls=\"packagesSummary_tabpanel\" tabindex=\"0\"" + " aria-controls=\"packages-summary_tabpanel\" tabindex=\"0\""
+ " onkeydown=\"switchTab(event)\"" + " onkeydown=\"switchTab(event)\""
+ " id=\"t0\" class=\"activeTableTab\">All Packages</button>"); + " id=\"t0\" class=\"active-table-tab\">All Packages</button>");
if (kindSet.contains(TabKind.EXPORTS)) { if (kindSet.contains(TabKind.EXPORTS)) {
sb.append("<button role=\"tab\" aria-selected=\"false\"" sb.append("<button role=\"tab\" aria-selected=\"false\""
+ " aria-controls=\"packagesSummary_tabpanel\" tabindex=\"-1\"" + " aria-controls=\"packages-summary_tabpanel\" tabindex=\"-1\""
+ " onkeydown=\"switchTab(event)\" id=\"t1\" class=\"tableTab\"" + " onkeydown=\"switchTab(event)\" id=\"t1\" class=\"table-tab\""
+ " onclick=\"show(1);\">Exports</button>"); + " onclick=\"show(1);\">Exports</button>");
} }
if (kindSet.contains(TabKind.OPENS)) { if (kindSet.contains(TabKind.OPENS)) {
sb.append("<button role=\"tab\" aria-selected=\"false\"" sb.append("<button role=\"tab\" aria-selected=\"false\""
+ " aria-controls=\"packagesSummary_tabpanel\" tabindex=\"-1\"" + " aria-controls=\"packages-summary_tabpanel\" tabindex=\"-1\""
+ " onkeydown=\"switchTab(event)\" id=\"t2\" class=\"tableTab\"" + " onkeydown=\"switchTab(event)\" id=\"t2\" class=\"table-tab\""
+ " onclick=\"show(2);\">Opens</button>"); + " onclick=\"show(2);\">Opens</button>");
} }
if (kindSet.contains(TabKind.CONCEALED)) { if (kindSet.contains(TabKind.CONCEALED)) {
sb.append("<button role=\"tab\" aria-selected=\"false\"" sb.append("<button role=\"tab\" aria-selected=\"false\""
+ " aria-controls=\"packagesSummary_tabpanel\" tabindex=\"-1\" " + " aria-controls=\"packages-summary_tabpanel\" tabindex=\"-1\" "
+ "onkeydown=\"switchTab(event)\" id=\"t3\" class=\"tableTab\" " + "onkeydown=\"switchTab(event)\" id=\"t3\" class=\"table-tab\" "
+ "onclick=\"show(4);\">Concealed</button>"); + "onclick=\"show(4);\">Concealed</button>");
} }
sb.append("</div>"); sb.append("</div>");
@ -444,7 +444,7 @@ public class TestModulePackages extends JavadocTester {
String name = k.toString().charAt(0) + k.toString().substring(1).toLowerCase(); String name = k.toString().charAt(0) + k.toString().substring(1).toLowerCase();
expect = "<caption>" expect = "<caption>"
+ "<span>" + name + "</span>" + "<span>" + name + "</span>"
+ "<span class=\"tabEnd\">&nbsp;</span>" + "<span class=\"tab-end\">&nbsp;</span>"
+ "</caption>"; + "</caption>";
} }
@ -456,14 +456,14 @@ public class TestModulePackages extends JavadocTester {
Set<ColKind> kindSet = Set.of(kinds); Set<ColKind> kindSet = Set.of(kinds);
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
sb.append("<tr>\n" sb.append("<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Package</th>\n"); + "<th class=\"col-first\" scope=\"col\">Package</th>\n");
if (kindSet.contains(ColKind.EXPORTED_TO)) { if (kindSet.contains(ColKind.EXPORTED_TO)) {
sb.append("<th class=\"colSecond\" scope=\"col\">Exported To Modules</th>\n"); sb.append("<th class=\"col-second\" scope=\"col\">Exported To Modules</th>\n");
} }
if (kindSet.contains(ColKind.OPENED_TO)) { if (kindSet.contains(ColKind.OPENED_TO)) {
sb.append("<th class=\"colSecond\" scope=\"col\">Opened To Modules</th>\n"); sb.append("<th class=\"col-second\" scope=\"col\">Opened To Modules</th>\n");
} }
sb.append("<th class=\"colLast\" scope=\"col\">Description</th>\n" sb.append("<th class=\"col-last\" scope=\"col\">Description</th>\n"
+ "</tr>"); + "</tr>");
checkOutput(moduleName + "/module-summary.html", true, sb.toString()); checkOutput(moduleName + "/module-summary.html", true, sb.toString());
@ -473,18 +473,18 @@ public class TestModulePackages extends JavadocTester {
String id, String exportedTo, String openedTo, String desc) { String id, String exportedTo, String openedTo, String desc) {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
int idNum = Integer.parseInt(id.substring(1)); int idNum = Integer.parseInt(id.substring(1));
String color = (idNum % 2 == 1 ? "rowColor" : "altColor"); String color = (idNum % 2 == 1 ? "row-color" : "alt-color");
sb.append("<tr class=\"" + color + "\" id=\"" + id + "\">\n" sb.append("<tr class=\"" + color + "\" id=\"" + id + "\">\n"
+ "<th class=\"colFirst\" scope=\"row\">" + "<th class=\"col-first\" scope=\"row\">"
+ "<a href=\"" + packageName.replace('.', '/') + "/package-summary.html\">" + "<a href=\"" + packageName.replace('.', '/') + "/package-summary.html\">"
+ packageName + "</a></th>\n"); + packageName + "</a></th>\n");
if (exportedTo != null) { if (exportedTo != null) {
sb.append("<td class=\"colSecond\">" + exportedTo + "</td>\n"); sb.append("<td class=\"col-second\">" + exportedTo + "</td>\n");
} }
if (openedTo != null) { if (openedTo != null) {
sb.append("<td class=\"colSecond\">" + openedTo + "</td>\n"); sb.append("<td class=\"col-second\">" + openedTo + "</td>\n");
} }
sb.append("<td class=\"colLast\">" + desc + "</td>"); sb.append("<td class=\"col-last\">" + desc + "</td>");
checkOutput(moduleName + "/module-summary.html", true, sb.toString()); checkOutput(moduleName + "/module-summary.html", true, sb.toString());
} }

116
test/langtools/jdk/javadoc/doclet/testModules/TestModuleServices.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -128,24 +128,24 @@ public class TestModuleServices extends JavadocTester {
checkExit(Exit.OK); checkExit(Exit.OK);
checkOutput("moduleServiceProvider/module-summary.html", true, checkOutput("moduleServiceProvider/module-summary.html", true,
"<tr class=\"altColor\">\n" "<tr class=\"alt-color\">\n"
+ "<th class=\"colFirst\" scope=\"row\"><a href=\"../moduleService/pkgService/Service.html\" " + "<th class=\"col-first\" scope=\"row\"><a href=\"../moduleService/pkgService/Service.html\" "
+ "title=\"interface in pkgService\">Service</a></th>\n" + "title=\"interface in pkgService\">Service</a></th>\n"
+ "<td class=\"colLast\">\n" + "<td class=\"col-last\">\n"
+ "<div class=\"block\">Provides a service whose name is ServiceProvider.</div>\n" + "<div class=\"block\">Provides a service whose name is ServiceProvider.</div>\n"
+ "</td>\n" + "</td>\n"
+ "</tr>"); + "</tr>");
checkOutput("moduleServiceUser/module-summary.html", true, checkOutput("moduleServiceUser/module-summary.html", true,
"<tr class=\"altColor\">\n" "<tr class=\"alt-color\">\n"
+ "<th class=\"colFirst\" scope=\"row\"><a href=\"../moduleService/pkgService/Service.html\" title=\"interface in pkgService\">Service</a></th>\n" + "<th class=\"col-first\" scope=\"row\"><a href=\"../moduleService/pkgService/Service.html\" title=\"interface in pkgService\">Service</a></th>\n"
+ "<td class=\"colLast\">\n" + "<td class=\"col-last\">\n"
+ "<div class=\"block\">If no other provider is found, a default internal implementation will be used.</div>\n" + "<div class=\"block\">If no other provider is found, a default internal implementation will be used.</div>\n"
+ "</td>\n" + "</td>\n"
+ "</tr>"); + "</tr>");
checkOutput("moduleServiceUserNoDescription/module-summary.html", true, checkOutput("moduleServiceUserNoDescription/module-summary.html", true,
"<tr class=\"altColor\">\n" "<tr class=\"alt-color\">\n"
+ "<th class=\"colFirst\" scope=\"row\"><a href=\"../moduleService/pkgService/Service.html\" title=\"interface in pkgService\">Service</a></th>\n" + "<th class=\"col-first\" scope=\"row\"><a href=\"../moduleService/pkgService/Service.html\" title=\"interface in pkgService\">Service</a></th>\n"
+ "<td class=\"colLast\">\n" + "<td class=\"col-last\">\n"
+ "<div class=\"block\">A service Interface for service providers.</div>\n" + "<div class=\"block\">A service Interface for service providers.</div>\n"
+ "</td>\n" + "</td>\n"
+ "</tr>"); + "</tr>");
@ -197,22 +197,22 @@ public class TestModuleServices extends JavadocTester {
"<h2>Services</h2>"); "<h2>Services</h2>");
checkOutput("m/module-summary.html", true, checkOutput("m/module-summary.html", true,
"<div class=\"usesSummary\">\n<table>\n" + "<div class=\"uses-summary\">\n<table>\n" +
"<caption><span>Uses</span><span class=\"tabEnd\">&nbsp;</span></caption>\n" + "<caption><span>Uses</span><span class=\"tab-end\">&nbsp;</span></caption>\n" +
"<thead>\n" + "<thead>\n" +
"<tr>\n" + "<tr>\n" +
"<th class=\"colFirst\" scope=\"col\">Type</th>\n" + "<th class=\"col-first\" scope=\"col\">Type</th>\n" +
"<th class=\"colLast\" scope=\"col\">Description</th>\n" + "<th class=\"col-last\" scope=\"col\">Description</th>\n" +
"</tr>\n" + "</tr>\n" +
"</thead>\n" + "</thead>\n" +
"<tbody>\n" + "<tbody>\n" +
"<tr class=\"altColor\">\n" + "<tr class=\"alt-color\">\n" +
"<th class=\"colFirst\" scope=\"row\"><a href=\"p1/A.html\" title=\"class in p1\">A</a></th>\n" + "<th class=\"col-first\" scope=\"row\"><a href=\"p1/A.html\" title=\"class in p1\">A</a></th>\n" +
"<td class=\"colLast\">&nbsp;</td>\n" + "<td class=\"col-last\">&nbsp;</td>\n" +
"</tr>\n" + "</tr>\n" +
"<tr class=\"rowColor\">\n" + "<tr class=\"row-color\">\n" +
"<th class=\"colFirst\" scope=\"row\"><a href=\"p1/B.html\" title=\"class in p1\">B</a></th>\n" + "<th class=\"col-first\" scope=\"row\"><a href=\"p1/B.html\" title=\"class in p1\">B</a></th>\n" +
"<td class=\"colLast\">&nbsp;</td>\n" + "<td class=\"col-last\">&nbsp;</td>\n" +
"</tr>\n" + "</tr>\n" +
"</tbody>\n" + "</tbody>\n" +
"</table>\n"); "</table>\n");
@ -240,18 +240,18 @@ public class TestModuleServices extends JavadocTester {
"<h2>Services</h2>"); "<h2>Services</h2>");
checkOutput("m/module-summary.html", true, checkOutput("m/module-summary.html", true,
"<div class=\"usesSummary\">\n<table>\n" + "<div class=\"uses-summary\">\n<table>\n" +
"<caption><span>Uses</span><span class=\"tabEnd\">&nbsp;</span></caption>\n" + "<caption><span>Uses</span><span class=\"tab-end\">&nbsp;</span></caption>\n" +
"<thead>\n" + "<thead>\n" +
"<tr>\n" + "<tr>\n" +
"<th class=\"colFirst\" scope=\"col\">Type</th>\n" + "<th class=\"col-first\" scope=\"col\">Type</th>\n" +
"<th class=\"colLast\" scope=\"col\">Description</th>\n" + "<th class=\"col-last\" scope=\"col\">Description</th>\n" +
"</tr>\n" + "</tr>\n" +
"</thead>\n" + "</thead>\n" +
"<tbody>\n" + "<tbody>\n" +
"<tr class=\"altColor\">\n" + "<tr class=\"alt-color\">\n" +
"<th class=\"colFirst\" scope=\"row\"><a href=\"p1/A.html\" title=\"class in p1\">A</a></th>\n" + "<th class=\"col-first\" scope=\"row\"><a href=\"p1/A.html\" title=\"class in p1\">A</a></th>\n" +
"<td class=\"colLast\">&nbsp;</td>\n" + "<td class=\"col-last\">&nbsp;</td>\n" +
"</tr>\n" + "</tr>\n" +
"</tbody>\n" + "</tbody>\n" +
"</table>\n"); "</table>\n");
@ -309,22 +309,22 @@ public class TestModuleServices extends JavadocTester {
"<h2>Services</h2>"); "<h2>Services</h2>");
checkOutput("m/module-summary.html", true, checkOutput("m/module-summary.html", true,
"<div class=\"providesSummary\">\n<table>\n" + "<div class=\"provides-summary\">\n<table>\n" +
"<caption><span>Provides</span><span class=\"tabEnd\">&nbsp;</span></caption>\n" + "<caption><span>Provides</span><span class=\"tab-end\">&nbsp;</span></caption>\n" +
"<thead>\n" + "<thead>\n" +
"<tr>\n" + "<tr>\n" +
"<th class=\"colFirst\" scope=\"col\">Type</th>\n" + "<th class=\"col-first\" scope=\"col\">Type</th>\n" +
"<th class=\"colLast\" scope=\"col\">Description</th>\n" + "<th class=\"col-last\" scope=\"col\">Description</th>\n" +
"</tr>\n" + "</tr>\n" +
"</thead>\n" + "</thead>\n" +
"<tbody>\n" + "<tbody>\n" +
"<tr class=\"altColor\">\n" + "<tr class=\"alt-color\">\n" +
"<th class=\"colFirst\" scope=\"row\"><a href=\"p1/A.html\" title=\"interface in p1\">A</a></th>\n" + "<th class=\"col-first\" scope=\"row\"><a href=\"p1/A.html\" title=\"interface in p1\">A</a></th>\n" +
"<td class=\"colLast\">&nbsp;<br>(<span class=\"implementationLabel\">Implementation(s):</span>&nbsp;<a href=\"p1/B.html\" title=\"class in p1\">B</a>)</td>\n" + "<td class=\"col-last\">&nbsp;<br>(<span class=\"implementation-label\">Implementation(s):</span>&nbsp;<a href=\"p1/B.html\" title=\"class in p1\">B</a>)</td>\n" +
"</tr>\n" + "</tr>\n" +
"<tr class=\"rowColor\">\n" + "<tr class=\"row-color\">\n" +
"<th class=\"colFirst\" scope=\"row\"><a href=\"p2/A.html\" title=\"interface in p2\">A</a></th>\n" + "<th class=\"col-first\" scope=\"row\"><a href=\"p2/A.html\" title=\"interface in p2\">A</a></th>\n" +
"<td class=\"colLast\">&nbsp;<br>(<span class=\"implementationLabel\">Implementation(s):</span>&nbsp;<a href=\"p2/B.html\" title=\"class in p2\">B</a>)</td>\n" + "<td class=\"col-last\">&nbsp;<br>(<span class=\"implementation-label\">Implementation(s):</span>&nbsp;<a href=\"p2/B.html\" title=\"class in p2\">B</a>)</td>\n" +
"</tr>\n" + "</tr>\n" +
"</tbody>\n"); "</tbody>\n");
@ -355,18 +355,18 @@ public class TestModuleServices extends JavadocTester {
"<h2>Services</h2>"); "<h2>Services</h2>");
checkOutput("m/module-summary.html", true, checkOutput("m/module-summary.html", true,
"<div class=\"providesSummary\">\n<table>\n" + "<div class=\"provides-summary\">\n<table>\n" +
"<caption><span>Provides</span><span class=\"tabEnd\">&nbsp;</span></caption>\n" + "<caption><span>Provides</span><span class=\"tab-end\">&nbsp;</span></caption>\n" +
"<thead>\n" + "<thead>\n" +
"<tr>\n" + "<tr>\n" +
"<th class=\"colFirst\" scope=\"col\">Type</th>\n" + "<th class=\"col-first\" scope=\"col\">Type</th>\n" +
"<th class=\"colLast\" scope=\"col\">Description</th>\n" + "<th class=\"col-last\" scope=\"col\">Description</th>\n" +
"</tr>\n" + "</tr>\n" +
"</thead>\n" + "</thead>\n" +
"<tbody>\n" + "<tbody>\n" +
"<tr class=\"altColor\">\n" + "<tr class=\"alt-color\">\n" +
"<th class=\"colFirst\" scope=\"row\"><a href=\"p1/A.html\" title=\"interface in p1\">A</a></th>\n" + "<th class=\"col-first\" scope=\"row\"><a href=\"p1/A.html\" title=\"interface in p1\">A</a></th>\n" +
"<td class=\"colLast\">\n" + "<td class=\"col-last\">\n" +
"<div class=\"block\">abc</div>\n</td>\n" + "<div class=\"block\">abc</div>\n</td>\n" +
"</tr>\n" + "</tr>\n" +
"</tbody>\n" + "</tbody>\n" +
@ -400,34 +400,34 @@ public class TestModuleServices extends JavadocTester {
"<h2>Services</h2>"); "<h2>Services</h2>");
checkOutput("m/module-summary.html", true, checkOutput("m/module-summary.html", true,
"<div class=\"providesSummary\">\n<table>\n" + "<div class=\"provides-summary\">\n<table>\n" +
"<caption><span>Provides</span><span class=\"tabEnd\">&nbsp;</span></caption>\n" + "<caption><span>Provides</span><span class=\"tab-end\">&nbsp;</span></caption>\n" +
"<thead>\n" + "<thead>\n" +
"<tr>\n" + "<tr>\n" +
"<th class=\"colFirst\" scope=\"col\">Type</th>\n" + "<th class=\"col-first\" scope=\"col\">Type</th>\n" +
"<th class=\"colLast\" scope=\"col\">Description</th>\n" + "<th class=\"col-last\" scope=\"col\">Description</th>\n" +
"</tr>\n" + "</tr>\n" +
"</thead>\n" + "</thead>\n" +
"<tbody>\n" + "<tbody>\n" +
"<tr class=\"altColor\">\n" + "<tr class=\"alt-color\">\n" +
"<th class=\"colFirst\" scope=\"row\"><a href=\"p1/A.html\" title=\"interface in p1\">A</a></th>\n" + "<th class=\"col-first\" scope=\"row\"><a href=\"p1/A.html\" title=\"interface in p1\">A</a></th>\n" +
"<td class=\"colLast\">\n" + "<td class=\"col-last\">\n" +
"<div class=\"block\">abc</div>\n</td>\n" + "<div class=\"block\">abc</div>\n</td>\n" +
"</tr>\n" + "</tr>\n" +
"</tbody>\n" + "</tbody>\n" +
"</table>", "</table>",
"<div class=\"usesSummary\">\n<table>\n" + "<div class=\"uses-summary\">\n<table>\n" +
"<caption><span>Uses</span><span class=\"tabEnd\">&nbsp;</span></caption>\n" + "<caption><span>Uses</span><span class=\"tab-end\">&nbsp;</span></caption>\n" +
"<thead>\n" + "<thead>\n" +
"<tr>\n" + "<tr>\n" +
"<th class=\"colFirst\" scope=\"col\">Type</th>\n" + "<th class=\"col-first\" scope=\"col\">Type</th>\n" +
"<th class=\"colLast\" scope=\"col\">Description</th>\n" + "<th class=\"col-last\" scope=\"col\">Description</th>\n" +
"</tr>\n" + "</tr>\n" +
"</thead>\n" + "</thead>\n" +
"<tbody>\n" + "<tbody>\n" +
"<tr class=\"altColor\">\n" + "<tr class=\"alt-color\">\n" +
"<th class=\"colFirst\" scope=\"row\"><a href=\"p2/B.html\" title=\"class in p2\">B</a></th>\n" + "<th class=\"col-first\" scope=\"row\"><a href=\"p2/B.html\" title=\"class in p2\">B</a></th>\n" +
"<td class=\"colLast\">\n" + "<td class=\"col-last\">\n" +
"<div class=\"block\">def</div>\n</td>\n" + "<div class=\"block\">def</div>\n</td>\n" +
"</tr>\n" + "</tr>\n" +
"</tbody>\n" + "</tbody>\n" +

626
test/langtools/jdk/javadoc/doclet/testModules/TestModules.java
View file

File diff suppressed because it is too large Load diff

30
test/langtools/jdk/javadoc/doclet/testNavigation/TestNavigation.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -62,41 +62,41 @@ public class TestNavigation extends JavadocTester {
checkSubNav(); checkSubNav();
checkOutput("pkg/A.html", true, checkOutput("pkg/A.html", true,
"<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n" + "<ul id=\"navbar.top.firstrow\" class=\"nav-list\" title=\"Navigation\">\n" +
"<li><a href=\"../index.html\">Overview</a></li>"); "<li><a href=\"../index.html\">Overview</a></li>");
checkOutput("pkg/C.html", true, checkOutput("pkg/C.html", true,
"<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n" + "<ul id=\"navbar.top.firstrow\" class=\"nav-list\" title=\"Navigation\">\n" +
"<li><a href=\"../index.html\">Overview</a></li>"); "<li><a href=\"../index.html\">Overview</a></li>");
checkOutput("pkg/E.html", true, checkOutput("pkg/E.html", true,
"<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n" + "<ul id=\"navbar.top.firstrow\" class=\"nav-list\" title=\"Navigation\">\n" +
"<li><a href=\"../index.html\">Overview</a></li>"); "<li><a href=\"../index.html\">Overview</a></li>");
checkOutput("pkg/I.html", true, checkOutput("pkg/I.html", true,
// Test for 4664607 // Test for 4664607
"<div class=\"skipNav\"><a href=\"#skip.navbar.top\" title=\"Skip navigation links\">Skip navigation links</a></div>\n" "<div class=\"skip-nav\"><a href=\"#skip.navbar.top\" title=\"Skip navigation links\">Skip navigation links</a></div>\n"
+ "<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n", + "<ul id=\"navbar.top.firstrow\" class=\"nav-list\" title=\"Navigation\">\n",
"<li><a href=\"../index.html\">Overview</a></li>"); "<li><a href=\"../index.html\">Overview</a></li>");
// Remaining tests check for additional padding to offset the fixed navigation bar. // Remaining tests check for additional padding to offset the fixed navigation bar.
checkOutput("pkg/A.html", true, checkOutput("pkg/A.html", true,
"<!-- ========= END OF TOP NAVBAR ========= -->\n" "<!-- ========= END OF TOP NAVBAR ========= -->\n"
+ "<span class=\"skipNav\" id=\"skip.navbar.top\">\n" + "<span class=\"skip-nav\" id=\"skip.navbar.top\">\n"
+ "<!-- -->\n" + "<!-- -->\n"
+ "</span></nav>\n" + "</span></nav>\n"
+ "</header>\n" + "</header>\n"
+ "<div class=\"flexContent\">\n" + "<div class=\"flex-content\">\n"
+ "<main role=\"main\">\n" + "<main role=\"main\">\n"
+ "<!-- ======== START OF CLASS DATA ======== -->"); + "<!-- ======== START OF CLASS DATA ======== -->");
checkOutput("pkg/package-summary.html", true, checkOutput("pkg/package-summary.html", true,
"<!-- ========= END OF TOP NAVBAR ========= -->\n" "<!-- ========= END OF TOP NAVBAR ========= -->\n"
+ "<span class=\"skipNav\" id=\"skip.navbar.top\">\n" + "<span class=\"skip-nav\" id=\"skip.navbar.top\">\n"
+ "<!-- -->\n" + "<!-- -->\n"
+ "</span></nav>\n" + "</span></nav>\n"
+ "</header>\n" + "</header>\n"
+ "<div class=\"flexContent\">\n" + "<div class=\"flex-content\">\n"
+ "<main role=\"main\">\n" + "<main role=\"main\">\n"
+ "<div class=\"header\">"); + "<div class=\"header\">");
} }
@ -113,17 +113,17 @@ public class TestNavigation extends JavadocTester {
checkOutput("pkg/A.html", true, checkOutput("pkg/A.html", true,
"<!-- ========= END OF TOP NAVBAR ========= -->\n" "<!-- ========= END OF TOP NAVBAR ========= -->\n"
+ "<span class=\"skipNav\" id=\"skip.navbar.top\">\n" + "<span class=\"skip-nav\" id=\"skip.navbar.top\">\n"
+ "<!-- -->\n" + "<!-- -->\n"
+ "</span></nav>\n" + "</span></nav>\n"
+ "</header>\n" + "</header>\n"
+ "<div class=\"flexContent\">\n" + "<div class=\"flex-content\">\n"
+ "<main role=\"main\">\n" + "<main role=\"main\">\n"
+ "<!-- ======== START OF CLASS DATA ======== -->"); + "<!-- ======== START OF CLASS DATA ======== -->");
checkOutput("pkg/package-summary.html", true, checkOutput("pkg/package-summary.html", true,
"<!-- ========= END OF TOP NAVBAR ========= -->\n" "<!-- ========= END OF TOP NAVBAR ========= -->\n"
+ "<span class=\"skipNav\" id=\"skip.navbar.top\">\n" + "<span class=\"skip-nav\" id=\"skip.navbar.top\">\n"
+ "<!-- -->\n" + "<!-- -->\n"
+ "</span></nav>\n"); + "</span></nav>\n");
} }
@ -141,7 +141,7 @@ public class TestNavigation extends JavadocTester {
checkOutput("pkg/A.html", false, checkOutput("pkg/A.html", false,
"<!-- ========= END OF TOP NAVBAR ========= -->\n" "<!-- ========= END OF TOP NAVBAR ========= -->\n"
+ "</div>\n" + "</div>\n"
+ "<div class=\"skipNav\"><a id=\"skip.navbar.top\">\n" + "<div class=\"skip-nav\"><a id=\"skip.navbar.top\">\n"
+ "<!-- -->\n" + "<!-- -->\n"
+ "</a></div>\n" + "</a></div>\n"
+ "</nav>\n" + "</nav>\n"
@ -151,7 +151,7 @@ public class TestNavigation extends JavadocTester {
checkOutput("pkg/package-summary.html", false, checkOutput("pkg/package-summary.html", false,
"<!-- ========= END OF TOP NAVBAR ========= -->\n" "<!-- ========= END OF TOP NAVBAR ========= -->\n"
+ "</div>\n" + "</div>\n"
+ "<div class=\"skipNav\"><a id=\"skip.navbar.top\">\n" + "<div class=\"skip-nav\"><a id=\"skip.navbar.top\">\n"
+ "<!-- -->\n" + "<!-- -->\n"
+ "</a></div>\n" + "</a></div>\n"
+ "</nav>"); + "</nav>");

204
test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/TestNewLanguageFeatures.java
View file

@ -67,22 +67,22 @@ public class TestNewLanguageFeatures extends JavadocTester {
"Enum Coin</h1>", "Enum Coin</h1>",
// Make sure enum signature is correct. // Make sure enum signature is correct.
"<pre>public enum " "<pre>public enum "
+ "<span class=\"typeNameLabel\">Coin</span>\n" + "<span class=\"type-name-label\">Coin</span>\n"
+ "extends java.lang.Enum&lt;<a href=\"Coin.html\" " + "extends java.lang.Enum&lt;<a href=\"Coin.html\" "
+ "title=\"enum in pkg\">Coin</a>&gt;</pre>", + "title=\"enum in pkg\">Coin</a>&gt;</pre>",
// Check for enum constant section // Check for enum constant section
"<caption><span>Enum Constants" "<caption><span>Enum Constants"
+ "</span><span class=\"tabEnd\">&nbsp;</span></caption>", + "</span><span class=\"tab-end\">&nbsp;</span></caption>",
// Detail for enum constant // Detail for enum constant
"<span class=\"memberNameLink\"><a href=\"#Dime\">Dime</a></span>", "<span class=\"member-name-link\"><a href=\"#Dime\">Dime</a></span>",
// Automatically insert documentation for values() and valueOf(). // Automatically insert documentation for values() and valueOf().
"Returns an array containing the constants of this enum type,", "Returns an array containing the constants of this enum type,",
"Returns the enum constant of this type with the specified name", "Returns the enum constant of this type with the specified name",
"Overloaded valueOf() method has correct documentation.", "Overloaded valueOf() method has correct documentation.",
"Overloaded values method has correct documentation.", "Overloaded values method has correct documentation.",
"<div class=\"memberSignature\"><span class=\"modifiers\">public static</span>&nbsp;" "<div class=\"member-signature\"><span class=\"modifiers\">public static</span>&nbsp;"
+ "<span class=\"returnType\"><a href=\"Coin.html\" title=\"enum in pkg\">Coin</a></span>&nbsp;" + "<span class=\"return-type\"><a href=\"Coin.html\" title=\"enum in pkg\">Coin</a></span>&nbsp;"
+ "<span class=\"memberName\">valueOf</span>&#8203;(" + "<span class=\"member-name\">valueOf</span>&#8203;("
+ "<span class=\"arguments\">java.lang.String&nbsp;name)</span></div>\n" + + "<span class=\"arguments\">java.lang.String&nbsp;name)</span></div>\n" +
"<div class=\"block\">Returns the enum constant of this type with the specified name.\n" + "<div class=\"block\">Returns the enum constant of this type with the specified name.\n" +
"The string must match <i>exactly</i> an identifier used to declare an\n" + "The string must match <i>exactly</i> an identifier used to declare an\n" +
@ -132,34 +132,34 @@ public class TestNewLanguageFeatures extends JavadocTester {
+ "<dd><code>V</code> - This is the second type " + "<dd><code>V</code> - This is the second type "
+ "parameter.", + "parameter.",
// Signature of method with type parameters // Signature of method with type parameters
"<div class=\"memberSignature\"><span class=\"modifiers\">public</span>&nbsp;" "<div class=\"member-signature\"><span class=\"modifiers\">public</span>&nbsp;"
+ "<span class=\"typeParameters\">&lt;T extends java.util.List,&#8203;\nV&gt;</span>\n" + "<span class=\"type-parameters\">&lt;T extends java.util.List,&#8203;\nV&gt;</span>\n"
+ "<span class=\"returnType\">java.lang.String[]</span>&nbsp;<span class=\"memberName\">" + "<span class=\"return-type\">java.lang.String[]</span>&nbsp;<span class=\"member-name\">"
+ "methodThatHasTypeParameters</span>&#8203;(<span class=\"arguments\">T&nbsp;param1,\n" + "methodThatHasTypeParameters</span>&#8203;(<span class=\"arguments\">T&nbsp;param1,\n"
+ "V&nbsp;param2)</span></div>", + "V&nbsp;param2)</span></div>",
// Method that returns TypeParameters // Method that returns TypeParameters
"<td class=\"colFirst\"><code><a href=\"TypeParameters.html\" " "<td class=\"col-first\"><code><a href=\"TypeParameters.html\" "
+ "title=\"type parameter in TypeParameters\">E</a>[]</code></td>\n" + "title=\"type parameter in TypeParameters\">E</a>[]</code></td>\n"
+ "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">" + "<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\">"
+ "<a href=\"#methodThatReturnsTypeParameterA(E%5B%5D)\">" + "<a href=\"#methodThatReturnsTypeParameterA(E%5B%5D)\">"
+ "methodThatReturnsTypeParameterA</a></span>&#8203;(<a href=\"TypeParameters.html\" " + "methodThatReturnsTypeParameterA</a></span>&#8203;(<a href=\"TypeParameters.html\" "
+ "title=\"type parameter in TypeParameters\">E</a>[]&nbsp;e)</code>", + "title=\"type parameter in TypeParameters\">E</a>[]&nbsp;e)</code>",
"<div class=\"memberSignature\"><span class=\"modifiers\">public</span>&nbsp;<span " "<div class=\"member-signature\"><span class=\"modifiers\">public</span>&nbsp;<span "
+ "class=\"returnType\"><a href=\"TypeParameters.html\" title=\"type parameter in TypeParameters\">" + "class=\"return-type\"><a href=\"TypeParameters.html\" title=\"type parameter in TypeParameters\">"
+ "E</a>[]</span>&nbsp;<span class=\"memberName\">methodThatReturnsTypeParameterA</span>&#8203;(" + "E</a>[]</span>&nbsp;<span class=\"member-name\">methodThatReturnsTypeParameterA</span>&#8203;("
+ "<span class=\"arguments\"><a href=\"TypeParameters.html\" title=\"type parameter in TypeParameters\">" + "<span class=\"arguments\"><a href=\"TypeParameters.html\" title=\"type parameter in TypeParameters\">"
+ "E</a>[]&nbsp;e)</span></div>\n", + "E</a>[]&nbsp;e)</span></div>\n",
"<td class=\"colFirst\"><code>&lt;T extends java.lang.Object &amp; java.lang.Comparable&lt;? super T&gt;&gt;" "<td class=\"col-first\"><code>&lt;T extends java.lang.Object &amp; java.lang.Comparable&lt;? super T&gt;&gt;"
+ "<br>T</code></td>\n" + "<br>T</code></td>\n"
+ "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">" + "<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\">"
+ "<a href=\"#methodtThatReturnsTypeParametersB(java.util.Collection)\">" + "<a href=\"#methodtThatReturnsTypeParametersB(java.util.Collection)\">"
+ "methodtThatReturnsTypeParametersB</a></span>&#8203;(java.util.Collection&lt;? extends T&gt;&nbsp;coll)</code>", + "methodtThatReturnsTypeParametersB</a></span>&#8203;(java.util.Collection&lt;? extends T&gt;&nbsp;coll)</code>",
"<div class=\"block\">Returns TypeParameters</div>\n", "<div class=\"block\">Returns TypeParameters</div>\n",
// Method takes a TypeVariable // Method takes a TypeVariable
"<td class=\"colFirst\"><code>&lt;X extends java.lang.Throwable&gt;<br>" "<td class=\"col-first\"><code>&lt;X extends java.lang.Throwable&gt;<br>"
+ "<a href=\"TypeParameters.html\" title=\"type parameter in TypeParameters\">E</a>" + "<a href=\"TypeParameters.html\" title=\"type parameter in TypeParameters\">E</a>"
+ "</code></td>\n" + "</code></td>\n"
+ "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">" + "<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\">"
+ "<a href=\"#orElseThrow(java.util.function.Supplier)\">" + "<a href=\"#orElseThrow(java.util.function.Supplier)\">"
+ "orElseThrow</a></span>&#8203;(java.util.function.Supplier&lt;? extends X&gt;&nbsp;exceptionSupplier)</code>" + "orElseThrow</a></span>&#8203;(java.util.function.Supplier&lt;? extends X&gt;&nbsp;exceptionSupplier)</code>"
); );
@ -182,7 +182,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
// Signature of subclass that has type parameters. // Signature of subclass that has type parameters.
checkOutput("pkg/TypeParameterSubClass.html", true, checkOutput("pkg/TypeParameterSubClass.html", true,
"<pre>public class <span class=\"typeNameLabel\">TypeParameterSubClass&lt;T extends " "<pre>public class <span class=\"type-name-label\">TypeParameterSubClass&lt;T extends "
+ "java.lang.String&gt;</span>\n" + "java.lang.String&gt;</span>\n"
+ "extends " + "extends "
+ "<a href=\"TypeParameterSuperClass.html\" title=\"class in pkg\">" + "<a href=\"TypeParameterSuperClass.html\" title=\"class in pkg\">"
@ -215,9 +215,9 @@ public class TestNewLanguageFeatures extends JavadocTester {
// Handle multiple bounds. // Handle multiple bounds.
//============================================================== //==============================================================
checkOutput("pkg/MultiTypeParameters.html", true, checkOutput("pkg/MultiTypeParameters.html", true,
"<div class=\"memberSignature\"><span class=\"modifiers\">public</span>&nbsp;" "<div class=\"member-signature\"><span class=\"modifiers\">public</span>&nbsp;"
+ "<span class=\"typeParameters\">&lt;T extends java.lang.Number &amp; java.lang.Runnable&gt;</span>\n" + "<span class=\"type-parameters\">&lt;T extends java.lang.Number &amp; java.lang.Runnable&gt;</span>\n"
+ "<span class=\"returnType\">T</span>&nbsp;<span class=\"memberName\">foo</span>&#8203;" + "<span class=\"return-type\">T</span>&nbsp;<span class=\"member-name\">foo</span>&#8203;"
+ "(<span class=\"arguments\">T&nbsp;t)</span></div>"); + "(<span class=\"arguments\">T&nbsp;t)</span></div>");
//============================================================== //==============================================================
@ -228,8 +228,8 @@ public class TestNewLanguageFeatures extends JavadocTester {
"<caption><span>Classes in <a href=\"../" "<caption><span>Classes in <a href=\"../"
+ "package-summary.html\">pkg2</a> with type parameters of " + "package-summary.html\">pkg2</a> with type parameters of "
+ "type <a href=\"../Foo.html\" title=\"class in pkg2\">" + "type <a href=\"../Foo.html\" title=\"class in pkg2\">"
+ "Foo</a></span><span class=\"tabEnd\">&nbsp;</span></caption>", + "Foo</a></span><span class=\"tab-end\">&nbsp;</span></caption>",
"<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\"><a href=\"../ClassUseTest1.html\" " "<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\"><a href=\"../ClassUseTest1.html\" "
+ "title=\"class in pkg2\">ClassUseTest1</a>&lt;T extends " + "title=\"class in pkg2\">ClassUseTest1</a>&lt;T extends "
+ "<a href=\"../Foo.html\" title=\"class in pkg2\">Foo" + "<a href=\"../Foo.html\" title=\"class in pkg2\">Foo"
+ "</a> &amp; <a href=\"../Foo2.html\" title=\"interface in pkg2\">" + "</a> &amp; <a href=\"../Foo2.html\" title=\"interface in pkg2\">"
@ -237,16 +237,16 @@ public class TestNewLanguageFeatures extends JavadocTester {
"<caption><span>Methods in <a href=\"../" "<caption><span>Methods in <a href=\"../"
+ "package-summary.html\">pkg2</a> with type parameters of " + "package-summary.html\">pkg2</a> with type parameters of "
+ "type <a href=\"../Foo.html\" title=\"class in " + "type <a href=\"../Foo.html\" title=\"class in "
+ "pkg2\">Foo</a></span><span class=\"tabEnd\">&nbsp;</span></caption>", + "pkg2\">Foo</a></span><span class=\"tab-end\">&nbsp;</span></caption>",
"<th class=\"colSecond\" scope=\"row\"><span class=\"typeNameLabel\">ClassUseTest1." "<th class=\"col-second\" scope=\"row\"><span class=\"type-name-label\">ClassUseTest1."
+ "</span><code><span class=\"memberNameLink\"><a href=\"../" + "</span><code><span class=\"member-name-link\"><a href=\"../"
+ "ClassUseTest1.html#method(T)\">method</a></span>" + "ClassUseTest1.html#method(T)\">method</a></span>"
+ "&#8203;(T&nbsp;t)</code></th>", + "&#8203;(T&nbsp;t)</code></th>",
"<caption><span>Fields in <a href=\"../" "<caption><span>Fields in <a href=\"../"
+ "package-summary.html\">pkg2</a> with type parameters of " + "package-summary.html\">pkg2</a> with type parameters of "
+ "type <a href=\"../Foo.html\" title=\"class in pkg2\">" + "type <a href=\"../Foo.html\" title=\"class in pkg2\">"
+ "Foo</a></span><span class=\"tabEnd\">&nbsp;</span></caption>", + "Foo</a></span><span class=\"tab-end\">&nbsp;</span></caption>",
"td class=\"colFirst\"><code><a href=\"../" "td class=\"col-first\"><code><a href=\"../"
+ "ParamTest.html\" title=\"class in pkg2\">ParamTest</a>" + "ParamTest.html\" title=\"class in pkg2\">ParamTest</a>"
+ "&lt;<a href=\"../Foo.html\" title=\"class in pkg2\"" + "&lt;<a href=\"../Foo.html\" title=\"class in pkg2\""
+ ">Foo</a>&gt;</code></td>" + ">Foo</a>&gt;</code></td>"
@ -256,8 +256,8 @@ public class TestNewLanguageFeatures extends JavadocTester {
"<caption><span>Fields in <a href=\"../" "<caption><span>Fields in <a href=\"../"
+ "package-summary.html\">pkg2</a> declared as <a href=\"../" + "package-summary.html\">pkg2</a> declared as <a href=\"../"
+ "ParamTest.html\" title=\"class in pkg2\">ParamTest" + "ParamTest.html\" title=\"class in pkg2\">ParamTest"
+ "</a></span><span class=\"tabEnd\">&nbsp;</span></caption>", + "</a></span><span class=\"tab-end\">&nbsp;</span></caption>",
"<td class=\"colFirst\"><code><a href=\"../" "<td class=\"col-first\"><code><a href=\"../"
+ "ParamTest.html\" title=\"class in pkg2\">ParamTest</a>&lt;<a " + "ParamTest.html\" title=\"class in pkg2\">ParamTest</a>&lt;<a "
+ "href=\"../Foo.html\" title=\"class in pkg2\">Foo</a" + "href=\"../Foo.html\" title=\"class in pkg2\">Foo</a"
+ ">&gt;</code></td>" + ">&gt;</code></td>"
@ -267,9 +267,9 @@ public class TestNewLanguageFeatures extends JavadocTester {
"<caption><span>Classes in <a href=\"../" "<caption><span>Classes in <a href=\"../"
+ "package-summary.html\">pkg2</a> with type parameters of " + "package-summary.html\">pkg2</a> with type parameters of "
+ "type <a href=\"../Foo2.html\" title=\"interface " + "type <a href=\"../Foo2.html\" title=\"interface "
+ "in pkg2\">Foo2</a></span><span class=\"tabEnd\">&nbsp;" + "in pkg2\">Foo2</a></span><span class=\"tab-end\">&nbsp;"
+ "</span></caption>", + "</span></caption>",
"<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\"><a href=\"../ClassUseTest1.html\" " "<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\"><a href=\"../ClassUseTest1.html\" "
+ "title=\"class in pkg2\">ClassUseTest1</a>&lt;T extends " + "title=\"class in pkg2\">ClassUseTest1</a>&lt;T extends "
+ "<a href=\"../Foo.html\" title=\"class in pkg2\">Foo" + "<a href=\"../Foo.html\" title=\"class in pkg2\">Foo"
+ "</a> &amp; <a href=\"../Foo2.html\" title=\"interface in pkg2\">" + "</a> &amp; <a href=\"../Foo2.html\" title=\"interface in pkg2\">"
@ -277,10 +277,10 @@ public class TestNewLanguageFeatures extends JavadocTester {
"<caption><span>Methods in <a href=\"../" "<caption><span>Methods in <a href=\"../"
+ "package-summary.html\">pkg2</a> with type parameters of " + "package-summary.html\">pkg2</a> with type parameters of "
+ "type <a href=\"../Foo2.html\" title=\"interface " + "type <a href=\"../Foo2.html\" title=\"interface "
+ "in pkg2\">Foo2</a></span><span class=\"tabEnd\">&nbsp;" + "in pkg2\">Foo2</a></span><span class=\"tab-end\">&nbsp;"
+ "</span></caption>", + "</span></caption>",
"<th class=\"colSecond\" scope=\"row\"><span class=\"typeNameLabel\">" "<th class=\"col-second\" scope=\"row\"><span class=\"type-name-label\">"
+ "ClassUseTest1.</span><code><span class=\"memberNameLink\"><a href=\"../" + "ClassUseTest1.</span><code><span class=\"member-name-link\"><a href=\"../"
+ "ClassUseTest1.html#method(T)\">method</a></span>" + "ClassUseTest1.html#method(T)\">method</a></span>"
+ "&#8203;(T&nbsp;t)</code></th>" + "&#8203;(T&nbsp;t)</code></th>"
); );
@ -290,9 +290,9 @@ public class TestNewLanguageFeatures extends JavadocTester {
"<caption><span>Classes in <a href=\"../" "<caption><span>Classes in <a href=\"../"
+ "package-summary.html\">pkg2</a> with type parameters of " + "package-summary.html\">pkg2</a> with type parameters of "
+ "type <a href=\"../ParamTest.html\" title=\"class " + "type <a href=\"../ParamTest.html\" title=\"class "
+ "in pkg2\">ParamTest</a></span><span class=\"tabEnd\">" + "in pkg2\">ParamTest</a></span><span class=\"tab-end\">"
+ "&nbsp;</span></caption>", + "&nbsp;</span></caption>",
"<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\"><a href=\"../ClassUseTest2.html\" " "<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\"><a href=\"../ClassUseTest2.html\" "
+ "title=\"class in pkg2\">ClassUseTest2</a>&lt;T extends " + "title=\"class in pkg2\">ClassUseTest2</a>&lt;T extends "
+ "<a href=\"../ParamTest.html\" title=\"class in pkg2\">" + "<a href=\"../ParamTest.html\" title=\"class in pkg2\">"
+ "ParamTest</a>&lt;<a href=\"../Foo3.html\" title=\"class in pkg2\">" + "ParamTest</a>&lt;<a href=\"../Foo3.html\" title=\"class in pkg2\">"
@ -300,26 +300,26 @@ public class TestNewLanguageFeatures extends JavadocTester {
"<caption><span>Methods in <a href=\"../" "<caption><span>Methods in <a href=\"../"
+ "package-summary.html\">pkg2</a> with type parameters of " + "package-summary.html\">pkg2</a> with type parameters of "
+ "type <a href=\"../ParamTest.html\" title=\"class " + "type <a href=\"../ParamTest.html\" title=\"class "
+ "in pkg2\">ParamTest</a></span><span class=\"tabEnd\">" + "in pkg2\">ParamTest</a></span><span class=\"tab-end\">"
+ "&nbsp;</span></caption>", + "&nbsp;</span></caption>",
"<th class=\"colSecond\" scope=\"row\"><span class=\"typeNameLabel\">ClassUseTest2." "<th class=\"col-second\" scope=\"row\"><span class=\"type-name-label\">ClassUseTest2."
+ "</span><code><span class=\"memberNameLink\"><a href=\"../" + "</span><code><span class=\"member-name-link\"><a href=\"../"
+ "ClassUseTest2.html#method(T)\">method</a></span>" + "ClassUseTest2.html#method(T)\">method</a></span>"
+ "&#8203;(T&nbsp;t)</code></th>", + "&#8203;(T&nbsp;t)</code></th>",
"<caption><span>Fields in <a href=\"../" "<caption><span>Fields in <a href=\"../"
+ "package-summary.html\">pkg2</a> declared as <a href=\"../" + "package-summary.html\">pkg2</a> declared as <a href=\"../"
+ "ParamTest.html\" title=\"class in pkg2\">ParamTest" + "ParamTest.html\" title=\"class in pkg2\">ParamTest"
+ "</a></span><span class=\"tabEnd\">&nbsp;</span></caption>", + "</a></span><span class=\"tab-end\">&nbsp;</span></caption>",
"<td class=\"colFirst\"><code><a href=\"../" "<td class=\"col-first\"><code><a href=\"../"
+ "ParamTest.html\" title=\"class in pkg2\">ParamTest</a>" + "ParamTest.html\" title=\"class in pkg2\">ParamTest</a>"
+ "&lt;<a href=\"../Foo.html\" title=\"class in pkg2\">" + "&lt;<a href=\"../Foo.html\" title=\"class in pkg2\">"
+ "Foo</a>&gt;</code></td>", + "Foo</a>&gt;</code></td>",
"<caption><span>Methods in <a href=\"../" "<caption><span>Methods in <a href=\"../"
+ "package-summary.html\">pkg2</a> with type parameters of " + "package-summary.html\">pkg2</a> with type parameters of "
+ "type <a href=\"../ParamTest.html\" title=\"class " + "type <a href=\"../ParamTest.html\" title=\"class "
+ "in pkg2\">ParamTest</a></span><span class=\"tabEnd\">" + "in pkg2\">ParamTest</a></span><span class=\"tab-end\">"
+ "&nbsp;</span></caption>", + "&nbsp;</span></caption>",
"<td class=\"colFirst\"><code>&lt;T extends <a href=\"../" "<td class=\"col-first\"><code>&lt;T extends <a href=\"../"
+ "ParamTest.html\" title=\"class in pkg2\">ParamTest" + "ParamTest.html\" title=\"class in pkg2\">ParamTest"
+ "</a>&lt;<a href=\"../Foo3.html\" title=\"class in " + "</a>&lt;<a href=\"../Foo3.html\" title=\"class in "
+ "pkg2\">Foo3</a>&gt;&gt;<br><a href=\"../" + "pkg2\">Foo3</a>&gt;&gt;<br><a href=\"../"
@ -332,8 +332,8 @@ public class TestNewLanguageFeatures extends JavadocTester {
"<caption><span>Classes in <a href=\"../" "<caption><span>Classes in <a href=\"../"
+ "package-summary.html\">pkg2</a> with type parameters of " + "package-summary.html\">pkg2</a> with type parameters of "
+ "type <a href=\"../Foo3.html\" title=\"class in pkg2\">" + "type <a href=\"../Foo3.html\" title=\"class in pkg2\">"
+ "Foo3</a></span><span class=\"tabEnd\">&nbsp;</span></caption>", + "Foo3</a></span><span class=\"tab-end\">&nbsp;</span></caption>",
"<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\"><a href=\"../ClassUseTest2.html\" " "<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\"><a href=\"../ClassUseTest2.html\" "
+ "title=\"class in pkg2\">ClassUseTest2</a>&lt;T extends " + "title=\"class in pkg2\">ClassUseTest2</a>&lt;T extends "
+ "<a href=\"../ParamTest.html\" title=\"class in pkg2\">" + "<a href=\"../ParamTest.html\" title=\"class in pkg2\">"
+ "ParamTest</a>&lt;<a href=\"../Foo3.html\" title=\"class in pkg2\">" + "ParamTest</a>&lt;<a href=\"../Foo3.html\" title=\"class in pkg2\">"
@ -341,18 +341,18 @@ public class TestNewLanguageFeatures extends JavadocTester {
"<caption><span>Methods in <a href=\"../" "<caption><span>Methods in <a href=\"../"
+ "package-summary.html\">pkg2</a> with type parameters of " + "package-summary.html\">pkg2</a> with type parameters of "
+ "type <a href=\"../Foo3.html\" title=\"class in " + "type <a href=\"../Foo3.html\" title=\"class in "
+ "pkg2\">Foo3</a></span><span class=\"tabEnd\">&nbsp;" + "pkg2\">Foo3</a></span><span class=\"tab-end\">&nbsp;"
+ "</span></caption>", + "</span></caption>",
"<th class=\"colSecond\" scope=\"row\"><span class=\"typeNameLabel\">ClassUseTest2." "<th class=\"col-second\" scope=\"row\"><span class=\"type-name-label\">ClassUseTest2."
+ "</span><code><span class=\"memberNameLink\"><a href=\"../" + "</span><code><span class=\"member-name-link\"><a href=\"../"
+ "ClassUseTest2.html#method(T)\">method</a></span>" + "ClassUseTest2.html#method(T)\">method</a></span>"
+ "&#8203;(T&nbsp;t)</code></th>", + "&#8203;(T&nbsp;t)</code></th>",
"<caption><span>Methods in <a href=\"../" "<caption><span>Methods in <a href=\"../"
+ "package-summary.html\">pkg2</a> that return types with " + "package-summary.html\">pkg2</a> that return types with "
+ "arguments of type <a href=\"../Foo3.html\" title" + "arguments of type <a href=\"../Foo3.html\" title"
+ "=\"class in pkg2\">Foo3</a></span><span class=\"tabEnd\">" + "=\"class in pkg2\">Foo3</a></span><span class=\"tab-end\">"
+ "&nbsp;</span></caption>", + "&nbsp;</span></caption>",
"<td class=\"colFirst\"><code>&lt;T extends <a href=\"../" "<td class=\"col-first\"><code>&lt;T extends <a href=\"../"
+ "ParamTest.html\" title=\"class in pkg2\">ParamTest</a>&lt;" + "ParamTest.html\" title=\"class in pkg2\">ParamTest</a>&lt;"
+ "<a href=\"../Foo3.html\" title=\"class in pkg2\">Foo3" + "<a href=\"../Foo3.html\" title=\"class in pkg2\">Foo3"
+ "</a>&gt;&gt;<br><a href=\"../ParamTest.html\" " + "</a>&gt;&gt;<br><a href=\"../ParamTest.html\" "
@ -365,9 +365,9 @@ public class TestNewLanguageFeatures extends JavadocTester {
"<caption><span>Classes in <a href=\"../" "<caption><span>Classes in <a href=\"../"
+ "package-summary.html\">pkg2</a> with type parameters of " + "package-summary.html\">pkg2</a> with type parameters of "
+ "type <a href=\"../ParamTest2.html\" title=\"class " + "type <a href=\"../ParamTest2.html\" title=\"class "
+ "in pkg2\">ParamTest2</a></span><span class=\"tabEnd\">" + "in pkg2\">ParamTest2</a></span><span class=\"tab-end\">"
+ "&nbsp;</span></caption>", + "&nbsp;</span></caption>",
"<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\"><a href=\"../ClassUseTest3.html\" " "<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\"><a href=\"../ClassUseTest3.html\" "
+ "title=\"class in pkg2\">ClassUseTest3</a>&lt;T extends " + "title=\"class in pkg2\">ClassUseTest3</a>&lt;T extends "
+ "<a href=\"../ParamTest2.html\" title=\"class in pkg2\">" + "<a href=\"../ParamTest2.html\" title=\"class in pkg2\">"
+ "ParamTest2</a>&lt;java.util.List&lt;? extends " + "ParamTest2</a>&lt;java.util.List&lt;? extends "
@ -376,12 +376,12 @@ public class TestNewLanguageFeatures extends JavadocTester {
"<caption><span>Methods in <a href=\"../" "<caption><span>Methods in <a href=\"../"
+ "package-summary.html\">pkg2</a> with type parameters of " + "package-summary.html\">pkg2</a> with type parameters of "
+ "type <a href=\"../ParamTest2.html\" title=\"class " + "type <a href=\"../ParamTest2.html\" title=\"class "
+ "in pkg2\">ParamTest2</a></span><span class=\"tabEnd\">" + "in pkg2\">ParamTest2</a></span><span class=\"tab-end\">"
+ "&nbsp;</span></caption>", + "&nbsp;</span></caption>",
"<th class=\"colSecond\" scope=\"row\"><span class=\"typeNameLabel\">ClassUseTest3" "<th class=\"col-second\" scope=\"row\"><span class=\"type-name-label\">ClassUseTest3"
+ ".</span><code><span class=\"memberNameLink\"><a href=\"../ClassUseTest3." + ".</span><code><span class=\"member-name-link\"><a href=\"../ClassUseTest3."
+ "html#method(T)\">method</a></span>&#8203;(T&nbsp;t)</code></th>", + "html#method(T)\">method</a></span>&#8203;(T&nbsp;t)</code></th>",
"<td class=\"colFirst\"><code>&lt;T extends <a href=\"../" "<td class=\"col-first\"><code>&lt;T extends <a href=\"../"
+ "ParamTest2.html\" title=\"class in pkg2\">" + "ParamTest2.html\" title=\"class in pkg2\">"
+ "ParamTest2</a>&lt;java.util.List&lt;? extends <a href=\".." + "ParamTest2</a>&lt;java.util.List&lt;? extends <a href=\".."
+ "/Foo4.html\" title=\"class in pkg2\">Foo4</a>&gt;" + "/Foo4.html\" title=\"class in pkg2\">Foo4</a>&gt;"
@ -395,9 +395,9 @@ public class TestNewLanguageFeatures extends JavadocTester {
"<caption><span>Classes in <a href=\"../" "<caption><span>Classes in <a href=\"../"
+ "package-summary.html\">pkg2</a> with type parameters of " + "package-summary.html\">pkg2</a> with type parameters of "
+ "type <a href=\"../Foo4.html\" title=\"class in " + "type <a href=\"../Foo4.html\" title=\"class in "
+ "pkg2\">Foo4</a></span><span class=\"tabEnd\">&nbsp;" + "pkg2\">Foo4</a></span><span class=\"tab-end\">&nbsp;"
+ "</span></caption>", + "</span></caption>",
"<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\"><a href=\"../ClassUseTest3.html\" " "<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\"><a href=\"../ClassUseTest3.html\" "
+ "title=\"class in pkg2\">ClassUseTest3</a>&lt;T extends " + "title=\"class in pkg2\">ClassUseTest3</a>&lt;T extends "
+ "<a href=\"../ParamTest2.html\" title=\"class in pkg2\">" + "<a href=\"../ParamTest2.html\" title=\"class in pkg2\">"
+ "ParamTest2</a>&lt;java.util.List&lt;? extends " + "ParamTest2</a>&lt;java.util.List&lt;? extends "
@ -406,17 +406,17 @@ public class TestNewLanguageFeatures extends JavadocTester {
"<caption><span>Methods in <a href=\"../" "<caption><span>Methods in <a href=\"../"
+ "package-summary.html\">pkg2</a> with type parameters of " + "package-summary.html\">pkg2</a> with type parameters of "
+ "type <a href=\"../Foo4.html\" title=\"class in " + "type <a href=\"../Foo4.html\" title=\"class in "
+ "pkg2\">Foo4</a></span><span class=\"tabEnd\">&nbsp;</span></caption>", + "pkg2\">Foo4</a></span><span class=\"tab-end\">&nbsp;</span></caption>",
"<th class=\"colSecond\" scope=\"row\"><span class=\"typeNameLabel\">ClassUseTest3." "<th class=\"col-second\" scope=\"row\"><span class=\"type-name-label\">ClassUseTest3."
+ "</span><code><span class=\"memberNameLink\"><a href=\"../ClassUseTest3." + "</span><code><span class=\"member-name-link\"><a href=\"../ClassUseTest3."
+ "html#method(T)\">method</a></span>&#8203;(T&nbsp;t)</code>" + "html#method(T)\">method</a></span>&#8203;(T&nbsp;t)</code>"
+ "</th>", + "</th>",
"<caption><span>Methods in <a href=\"../" "<caption><span>Methods in <a href=\"../"
+ "package-summary.html\">pkg2</a> that return types with " + "package-summary.html\">pkg2</a> that return types with "
+ "arguments of type <a href=\"../Foo4.html\" " + "arguments of type <a href=\"../Foo4.html\" "
+ "title=\"class in pkg2\">Foo4</a></span><span class=\"" + "title=\"class in pkg2\">Foo4</a></span><span class=\""
+ "tabEnd\">&nbsp;</span></caption>", + "tab-end\">&nbsp;</span></caption>",
"<td class=\"colFirst\"><code>&lt;T extends <a href=\"../" "<td class=\"col-first\"><code>&lt;T extends <a href=\"../"
+ "ParamTest2.html\" title=\"class in pkg2\">" + "ParamTest2.html\" title=\"class in pkg2\">"
+ "ParamTest2</a>&lt;java.util.List&lt;? extends <a href=\".." + "ParamTest2</a>&lt;java.util.List&lt;? extends <a href=\".."
+ "/Foo4.html\" title=\"class in pkg2\">Foo4</a>&gt;" + "/Foo4.html\" title=\"class in pkg2\">Foo4</a>&gt;"
@ -431,27 +431,27 @@ public class TestNewLanguageFeatures extends JavadocTester {
"<caption><span>Method parameters in <a href=\"../" "<caption><span>Method parameters in <a href=\"../"
+ "package-summary.html\">pkg2</a> with type arguments of " + "package-summary.html\">pkg2</a> with type arguments of "
+ "type <a href=\"../Foo4.html\" title=\"class in " + "type <a href=\"../Foo4.html\" title=\"class in "
+ "pkg2\">Foo4</a></span><span class=\"tabEnd\">&nbsp;" + "pkg2\">Foo4</a></span><span class=\"tab-end\">&nbsp;"
+ "</span></caption>\n" + "</span></caption>\n"
+ "<thead>\n" + "<thead>\n"
+ "<tr>\n" + "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n" + "<th class=\"col-first\" scope=\"col\">Modifier and Type</th>\n"
+ "<th class=\"colSecond\" scope=\"col\">Method</th>\n" + "<th class=\"col-second\" scope=\"col\">Method</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n" + "<th class=\"col-last\" scope=\"col\">Description</th>\n"
+ "</tr>\n" + "</tr>\n"
+ "</thead>\n" + "</thead>\n"
+ "<tbody>\n" + "<tbody>\n"
+ "<tr class=\"altColor\">\n" + "<tr class=\"alt-color\">\n"
+ "<td class=\"colFirst\"><code>void</code></td>\n" + "<td class=\"col-first\"><code>void</code></td>\n"
+ "<th class=\"colSecond\" scope=\"row\"><span class=\"typeNameLabel\">ClassUseTest3." + "<th class=\"col-second\" scope=\"row\"><span class=\"type-name-label\">ClassUseTest3."
+ "</span><code><span class=\"memberNameLink\"><a href=\"../ClassUseTest3." + "</span><code><span class=\"member-name-link\"><a href=\"../ClassUseTest3."
+ "html#method(java.util.Set)\">method</a></span>&#8203;(java." + "html#method(java.util.Set)\">method</a></span>&#8203;(java."
+ "util.Set&lt;<a href=\"../Foo4.html\" title=\"" + "util.Set&lt;<a href=\"../Foo4.html\" title=\""
+ "class in pkg2\">Foo4</a>&gt;&nbsp;p)</code></th>", + "class in pkg2\">Foo4</a>&gt;&nbsp;p)</code></th>",
"<caption><span>Constructor parameters in <a href=\"../" "<caption><span>Constructor parameters in <a href=\"../"
+ "package-summary.html\">pkg2</a> with type arguments " + "package-summary.html\">pkg2</a> with type arguments "
+ "of type <a href=\"../Foo4.html\" title=\"class in " + "of type <a href=\"../Foo4.html\" title=\"class in "
+ "pkg2\">Foo4</a></span><span class=\"tabEnd\">&nbsp;" + "pkg2\">Foo4</a></span><span class=\"tab-end\">&nbsp;"
+ "</span></caption>" + "</span></caption>"
); );
@ -459,7 +459,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
// TYPE PARAMETER IN INDEX // TYPE PARAMETER IN INDEX
//================================= //=================================
checkOutput("index-all.html", true, checkOutput("index-all.html", true,
"<span class=\"memberNameLink\"><a href=\"pkg2/Foo.html#method(java.util.Vector)\">" "<span class=\"member-name-link\"><a href=\"pkg2/Foo.html#method(java.util.Vector)\">"
+ "method(Vector&lt;Object&gt;)</a></span>" + "method(Vector&lt;Object&gt;)</a></span>"
); );
@ -468,7 +468,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
// TYPE PARAMETER IN INDEX // TYPE PARAMETER IN INDEX
//================================= //=================================
checkOutput("index-all.html", true, checkOutput("index-all.html", true,
"<span class=\"memberNameLink\"><a href=\"pkg2/Foo.html#method(java.util.Vector)\">" "<span class=\"member-name-link\"><a href=\"pkg2/Foo.html#method(java.util.Vector)\">"
+ "method(Vector&lt;Object&gt;)</a></span>" + "method(Vector&lt;Object&gt;)</a></span>"
); );
@ -505,7 +505,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
// Make sure the heading is correct. // Make sure the heading is correct.
"Annotation Type AnnotationType</h2>", "Annotation Type AnnotationType</h2>",
// Make sure the signature is correct. // Make sure the signature is correct.
"public @interface <span class=\"memberNameLabel\">AnnotationType</span>", "public @interface <span class=\"member-name-label\">AnnotationType</span>",
// Make sure member summary headings are correct. // Make sure member summary headings are correct.
"<h3>Required Element Summary</h3>", "<h3>Required Element Summary</h3>",
"<h3>Optional Element Summary</h3>", "<h3>Optional Element Summary</h3>",
@ -535,41 +535,41 @@ public class TestNewLanguageFeatures extends JavadocTester {
+ "=\"Class Annotation\",\n" + "=\"Class Annotation\",\n"
+ " <a href=\"AnnotationType.html#required()\">" + " <a href=\"AnnotationType.html#required()\">"
+ "required</a>=1994)\n" + "required</a>=1994)\n"
+ "public class <span class=\"typeNameLabel\">" + "public class <span class=\"type-name-label\">"
+ "AnnotationTypeUsage</span>\n" + "AnnotationTypeUsage</span>\n"
+ "extends java.lang.Object</pre>", + "extends java.lang.Object</pre>",
// FIELD // FIELD
"<div class=\"memberSignature\"><span class=\"annotations\"><a href=\"AnnotationType.html\" " "<div class=\"member-signature\"><span class=\"annotations\"><a href=\"AnnotationType.html\" "
+ "title=\"annotation in pkg\">@AnnotationType</a>(<a href=\"AnnotationType.html#optional()\">" + "title=\"annotation in pkg\">@AnnotationType</a>(<a href=\"AnnotationType.html#optional()\">"
+ "optional</a>=\"Field Annotation\",\n" + "optional</a>=\"Field Annotation\",\n"
+ " <a href=\"AnnotationType.html#required()\">required</a>=1994)\n" + " <a href=\"AnnotationType.html#required()\">required</a>=1994)\n"
+ "</span><span class=\"modifiers\">public</span>&nbsp;<span class=\"returnType\">int</span>" + "</span><span class=\"modifiers\">public</span>&nbsp;<span class=\"return-type\">int</span>"
+ "&nbsp;<span class=\"memberName\">field</span></div>", + "&nbsp;<span class=\"member-name\">field</span></div>",
// CONSTRUCTOR // CONSTRUCTOR
"<div class=\"memberSignature\"><span class=\"annotations\"><a href=\"AnnotationType.html\" " "<div class=\"member-signature\"><span class=\"annotations\"><a href=\"AnnotationType.html\" "
+ "title=\"annotation in pkg\">@AnnotationType</a>(<a href=\"AnnotationType.html#optional()\">" + "title=\"annotation in pkg\">@AnnotationType</a>(<a href=\"AnnotationType.html#optional()\">"
+ "optional</a>=\"Constructor Annotation\",\n" + "optional</a>=\"Constructor Annotation\",\n"
+ " <a href=\"AnnotationType.html#required()\">required</a>=1994)\n" + " <a href=\"AnnotationType.html#required()\">required</a>=1994)\n"
+ "</span><span class=\"modifiers\">public</span>&nbsp;" + "</span><span class=\"modifiers\">public</span>&nbsp;"
+ "<span class=\"memberName\">AnnotationTypeUsage</span>()</div>", + "<span class=\"member-name\">AnnotationTypeUsage</span>()</div>",
// METHOD // METHOD
"<div class=\"memberSignature\"><span class=\"annotations\"><a href=\"AnnotationType.html\" " "<div class=\"member-signature\"><span class=\"annotations\"><a href=\"AnnotationType.html\" "
+ "title=\"annotation in pkg\">@AnnotationType</a>(<a href=\"AnnotationType.html#optional()\">" + "title=\"annotation in pkg\">@AnnotationType</a>(<a href=\"AnnotationType.html#optional()\">"
+ "optional</a>=\"Method Annotation\",\n" + "optional</a>=\"Method Annotation\",\n"
+ " <a href=\"AnnotationType.html#required()\">required</a>=1994)\n" + " <a href=\"AnnotationType.html#required()\">required</a>=1994)\n"
+ "</span><span class=\"modifiers\">public</span>&nbsp;<span class=\"returnType\">" + "</span><span class=\"modifiers\">public</span>&nbsp;<span class=\"return-type\">"
+ "void</span>&nbsp;<span class=\"memberName\">method</span>()</div>", + "void</span>&nbsp;<span class=\"member-name\">method</span>()</div>",
// METHOD PARAMS // METHOD PARAMS
"<div class=\"memberSignature\"><span class=\"modifiers\">public</span>&nbsp;<span " "<div class=\"member-signature\"><span class=\"modifiers\">public</span>&nbsp;<span "
+ "class=\"returnType\">void</span>&nbsp;<span class=\"memberName\">methodWithParams</span>" + "class=\"return-type\">void</span>&nbsp;<span class=\"member-name\">methodWithParams</span>"
+ "&#8203;(<span class=\"arguments\"><a href=\"AnnotationType.html\" title=\"annotation in pkg\">" + "&#8203;(<span class=\"arguments\"><a href=\"AnnotationType.html\" title=\"annotation in pkg\">"
+ "@AnnotationType</a>(<a href=\"AnnotationType.html#optional()\">optional</a>" + "@AnnotationType</a>(<a href=\"AnnotationType.html#optional()\">optional</a>"
+ "=\"Parameter Annotation\",<a href=\"AnnotationType.html#required()\">required</a>=1994)\n" + "=\"Parameter Annotation\",<a href=\"AnnotationType.html#required()\">required</a>=1994)\n"
+ "int&nbsp;documented,\n" + "int&nbsp;documented,\n"
+ "int&nbsp;undocmented)</span></div>", + "int&nbsp;undocmented)</span></div>",
// CONSTRUCTOR PARAMS // CONSTRUCTOR PARAMS
"<div class=\"memberSignature\"><span class=\"modifiers\">public</span>&nbsp;" "<div class=\"member-signature\"><span class=\"modifiers\">public</span>&nbsp;"
+ "<span class=\"memberName\">AnnotationTypeUsage</span>&#8203;(<span class=\"arguments\">" + "<span class=\"member-name\">AnnotationTypeUsage</span>&#8203;(<span class=\"arguments\">"
+ "<a href=\"AnnotationType.html\" title=\"annotation in pkg\">@AnnotationType</a>(" + "<a href=\"AnnotationType.html\" title=\"annotation in pkg\">@AnnotationType</a>("
+ "<a href=\"AnnotationType.html#optional()\">optional</a>=\"Constructor Param Annotation\"," + "<a href=\"AnnotationType.html#optional()\">optional</a>=\"Constructor Param Annotation\","
+ "<a href=\"AnnotationType.html#required()\">required</a>=1994)\n" + "<a href=\"AnnotationType.html#required()\">required</a>=1994)\n"
@ -582,38 +582,38 @@ public class TestNewLanguageFeatures extends JavadocTester {
checkOutput("pkg/class-use/AnnotationType.html", true, checkOutput("pkg/class-use/AnnotationType.html", true,
"<caption><span>Packages with annotations of type <a href=\"" "<caption><span>Packages with annotations of type <a href=\""
+ "../AnnotationType.html\" title=\"annotation in pkg\">" + "../AnnotationType.html\" title=\"annotation in pkg\">"
+ "AnnotationType</a></span><span class=\"tabEnd\">&nbsp;" + "AnnotationType</a></span><span class=\"tab-end\">&nbsp;"
+ "</span></caption>", + "</span></caption>",
"<caption><span>Classes in <a href=\"../" "<caption><span>Classes in <a href=\"../"
+ "package-summary.html\">pkg</a> with annotations of type " + "package-summary.html\">pkg</a> with annotations of type "
+ "<a href=\"../AnnotationType.html\" title=\"" + "<a href=\"../AnnotationType.html\" title=\""
+ "annotation in pkg\">AnnotationType</a></span><span class" + "annotation in pkg\">AnnotationType</a></span><span class"
+ "=\"tabEnd\">&nbsp;</span></caption>", + "=\"tab-end\">&nbsp;</span></caption>",
"<caption><span>Fields in <a href=\"../" "<caption><span>Fields in <a href=\"../"
+ "package-summary.html\">pkg</a> with annotations of type " + "package-summary.html\">pkg</a> with annotations of type "
+ "<a href=\"../AnnotationType.html\" title=\"annotation " + "<a href=\"../AnnotationType.html\" title=\"annotation "
+ "in pkg\">AnnotationType</a></span><span class=\"tabEnd\">" + "in pkg\">AnnotationType</a></span><span class=\"tab-end\">"
+ "&nbsp;</span></caption>", + "&nbsp;</span></caption>",
"<caption><span>Methods in <a href=\"../" "<caption><span>Methods in <a href=\"../"
+ "package-summary.html\">pkg</a> with annotations of type " + "package-summary.html\">pkg</a> with annotations of type "
+ "<a href=\"../AnnotationType.html\" title=\"annotation " + "<a href=\"../AnnotationType.html\" title=\"annotation "
+ "in pkg\">AnnotationType</a></span><span class=\"tabEnd\">" + "in pkg\">AnnotationType</a></span><span class=\"tab-end\">"
+ "&nbsp;</span></caption>", + "&nbsp;</span></caption>",
"<caption><span>Method parameters in <a href=\"../" "<caption><span>Method parameters in <a href=\"../"
+ "package-summary.html\">pkg</a> with annotations of type " + "package-summary.html\">pkg</a> with annotations of type "
+ "<a href=\"../AnnotationType.html\" title=\"annotation " + "<a href=\"../AnnotationType.html\" title=\"annotation "
+ "in pkg\">AnnotationType</a></span><span class=\"tabEnd\">" + "in pkg\">AnnotationType</a></span><span class=\"tab-end\">"
+ "&nbsp;</span></caption>", + "&nbsp;</span></caption>",
"<caption><span>Constructors in <a href=\"../" "<caption><span>Constructors in <a href=\"../"
+ "package-summary.html\">pkg</a> with annotations of type " + "package-summary.html\">pkg</a> with annotations of type "
+ "<a href=\"../AnnotationType.html\" title=\"annotation " + "<a href=\"../AnnotationType.html\" title=\"annotation "
+ "in pkg\">AnnotationType</a></span><span class=\"tabEnd\">" + "in pkg\">AnnotationType</a></span><span class=\"tab-end\">"
+ "&nbsp;</span></caption>", + "&nbsp;</span></caption>",
"<caption><span>Constructor parameters in <a href=\"../" "<caption><span>Constructor parameters in <a href=\"../"
+ "package-summary.html\">pkg</a> with annotations of " + "package-summary.html\">pkg</a> with annotations of "
+ "type <a href=\"../AnnotationType.html\" title=\"" + "type <a href=\"../AnnotationType.html\" title=\""
+ "annotation in pkg\">AnnotationType</a></span><span class=\"" + "annotation in pkg\">AnnotationType</a></span><span class=\""
+ "tabEnd\">&nbsp;</span></caption>" + "tab-end\">&nbsp;</span></caption>"
); );
//============================================================== //==============================================================
@ -623,19 +623,19 @@ public class TestNewLanguageFeatures extends JavadocTester {
// CLASS // CLASS
"<a href=\"AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</a>(<a href=\"AnnotationType.html#optional\">optional</a>=\"Class Annotation\",\n" "<a href=\"AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</a>(<a href=\"AnnotationType.html#optional\">optional</a>=\"Class Annotation\",\n"
+ " <a href=\"AnnotationType.html#required\">required</a>=1994)\n" + " <a href=\"AnnotationType.html#required\">required</a>=1994)\n"
+ "public class <span class=\"typeNameLabel\">AnnotationTypeUsage</span></dt><dt>extends java.lang.Object</dt>", + "public class <span class=\"type-name-label\">AnnotationTypeUsage</span></dt><dt>extends java.lang.Object</dt>",
// FIELD // FIELD
"<a href=\"AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</a>(<a href=\"AnnotationType.html#optional\">optional</a>=\"Field Annotation\",\n" "<a href=\"AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</a>(<a href=\"AnnotationType.html#optional\">optional</a>=\"Field Annotation\",\n"
+ " <a href=\"AnnotationType.html#required\">required</a>=1994)\n" + " <a href=\"AnnotationType.html#required\">required</a>=1994)\n"
+ "public int <span class=\"memberNameLabel\">field</span>", + "public int <span class=\"member-name-label\">field</span>",
// CONSTRUCTOR // CONSTRUCTOR
"<a href=\"AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</a>(<a href=\"AnnotationType.html#optional\">optional</a>=\"Constructor Annotation\",\n" "<a href=\"AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</a>(<a href=\"AnnotationType.html#optional\">optional</a>=\"Constructor Annotation\",\n"
+ " <a href=\"AnnotationType.html#required\">required</a>=1994)\n" + " <a href=\"AnnotationType.html#required\">required</a>=1994)\n"
+ "public <span class=\"typeNameLabel\">AnnotationTypeUsage</span>()", + "public <span class=\"type-name-label\">AnnotationTypeUsage</span>()",
// METHOD // METHOD
"<a href=\"AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</a>(<a href=\"AnnotationType.html#optional\">optional</a>=\"Method Annotation\",\n" "<a href=\"AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</a>(<a href=\"AnnotationType.html#optional\">optional</a>=\"Method Annotation\",\n"
+ " <a href=\"AnnotationType.html#required\">required</a>=1994)\n" + " <a href=\"AnnotationType.html#required\">required</a>=1994)\n"
+ "public void <span class=\"memberNameLabel\">method</span>()"); + "public void <span class=\"member-name-label\">method</span>()");
//================================= //=================================
// Make sure annotation types do not // Make sure annotation types do not
@ -674,7 +674,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
// Make sure that annotations are surrounded by <pre> and </pre> // Make sure that annotations are surrounded by <pre> and </pre>
checkOutput("pkg1/B.html", true, checkOutput("pkg1/B.html", true,
"<pre><a href=\"A.html\" title=\"annotation in pkg1\">@A</a>", "<pre><a href=\"A.html\" title=\"annotation in pkg1\">@A</a>",
"public interface <span class=\"typeNameLabel\">B</span></pre>"); "public interface <span class=\"type-name-label\">B</span></pre>");
} }
} }

58
test/langtools/jdk/javadoc/doclet/testOptions/TestOptions.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -53,8 +53,8 @@ public class TestOptions extends JavadocTester {
checkExit(Exit.OK); checkExit(Exit.OK);
checkOutput("pkg/package-summary.html", true, checkOutput("pkg/package-summary.html", true,
"<div class=\"aboutLanguage\">Test header</div>", "<div class=\"about-language\">Test header</div>",
"<div class=\"aboutLanguage\">Test footer</div>"); "<div class=\"about-language\">Test footer</div>");
} }
@Test @Test
@ -194,69 +194,69 @@ public class TestOptions extends JavadocTester {
+ "AnnotationTypeField</a></pre>", + "AnnotationTypeField</a></pre>",
"<section class=\"detail\" id=\"DEFAULT_NAME\">\n" "<section class=\"detail\" id=\"DEFAULT_NAME\">\n"
+ "<h3>DEFAULT_NAME</h3>\n" + "<h3>DEFAULT_NAME</h3>\n"
+ "<div class=\"memberSignature\"><span class=\"modifiers\">static final</span>&nbsp;" + "<div class=\"member-signature\"><span class=\"modifiers\">static final</span>&nbsp;"
+ "<span class=\"returnType\">java.lang.String</span>&nbsp;<span class=\"memberName\">" + "<span class=\"return-type\">java.lang.String</span>&nbsp;<span class=\"member-name\">"
+ "<a href=\"../src-html/linksource/AnnotationTypeField.html#line.32\">DEFAULT_NAME</a></span></div>", + "<a href=\"../src-html/linksource/AnnotationTypeField.html#line.32\">DEFAULT_NAME</a></span></div>",
"<section class=\"detail\" id=\"name()\">\n" "<section class=\"detail\" id=\"name()\">\n"
+ "<h3>name</h3>\n" + "<h3>name</h3>\n"
+ "<div class=\"memberSignature\"><span class=\"returnType\">java.lang.String</span>&nbsp;" + "<div class=\"member-signature\"><span class=\"return-type\">java.lang.String</span>&nbsp;"
+ "<span class=\"memberName\"><a href=\"../src-html/linksource/AnnotationTypeField.html#line.34\">" + "<span class=\"member-name\"><a href=\"../src-html/linksource/AnnotationTypeField.html#line.34\">"
+ "name</a></span></div>"); + "name</a></span></div>");
checkOutput("src-html/linksource/AnnotationTypeField.html", true, checkOutput("src-html/linksource/AnnotationTypeField.html", true,
"<title>Source code</title>", "<title>Source code</title>",
"<span class=\"sourceLineNo\">031</span><span id=\"line.31\">" "<span class=\"source-line-no\">031</span><span id=\"line.31\">"
+ "@Documented public @interface AnnotationTypeField {</span>"); + "@Documented public @interface AnnotationTypeField {</span>");
checkOutput("linksource/Properties.html", true, checkOutput("linksource/Properties.html", true,
"<pre>public class <a href=\"../src-html/linksource/Properties.html#line.29\">" "<pre>public class <a href=\"../src-html/linksource/Properties.html#line.29\">"
+ "Properties</a>", + "Properties</a>",
"<div class=\"memberSignature\"><span class=\"modifiers\">public</span>&nbsp;" "<div class=\"member-signature\"><span class=\"modifiers\">public</span>&nbsp;"
+ "<span class=\"returnType\">java.lang.Object</span>&nbsp;<span class=\"memberName\">" + "<span class=\"return-type\">java.lang.Object</span>&nbsp;<span class=\"member-name\">"
+ "<a href=\"../src-html/linksource/Properties.html#line.31\">someProperty</a></span></div>"); + "<a href=\"../src-html/linksource/Properties.html#line.31\">someProperty</a></span></div>");
checkOutput("src-html/linksource/Properties.html", true, checkOutput("src-html/linksource/Properties.html", true,
"<title>Source code</title>", "<title>Source code</title>",
"<span class=\"sourceLineNo\">031</span><span id=\"line.31\"> " "<span class=\"source-line-no\">031</span><span id=\"line.31\"> "
+ "public Object someProperty() {</span>"); + "public Object someProperty() {</span>");
checkOutput("linksource/SomeClass.html", true, checkOutput("linksource/SomeClass.html", true,
"<pre>public class <a href=\"../src-html/linksource/SomeClass.html#line.29\">" "<pre>public class <a href=\"../src-html/linksource/SomeClass.html#line.29\">"
+ "SomeClass</a>\nextends java.lang.Object</pre>", + "SomeClass</a>\nextends java.lang.Object</pre>",
"<div class=\"memberSignature\"><span class=\"modifiers\">public</span>&nbsp;" "<div class=\"member-signature\"><span class=\"modifiers\">public</span>&nbsp;"
+ "<span class=\"returnType\">int</span>&nbsp;<span class=\"memberName\">" + "<span class=\"return-type\">int</span>&nbsp;<span class=\"member-name\">"
+ "<a href=\"../src-html/linksource/SomeClass.html#line.31\">field</a></span></div>", + "<a href=\"../src-html/linksource/SomeClass.html#line.31\">field</a></span></div>",
"<div class=\"memberSignature\"><span class=\"modifiers\">public</span>&nbsp;" "<div class=\"member-signature\"><span class=\"modifiers\">public</span>&nbsp;"
+ "<span class=\"memberName\"><a href=\"../src-html/linksource/SomeClass.html#line.33\">" + "<span class=\"member-name\"><a href=\"../src-html/linksource/SomeClass.html#line.33\">"
+ "SomeClass</a></span>()</div>", + "SomeClass</a></span>()</div>",
"<div class=\"memberSignature\"><span class=\"modifiers\">public</span>&nbsp;" "<div class=\"member-signature\"><span class=\"modifiers\">public</span>&nbsp;"
+ "<span class=\"returnType\">int</span>&nbsp;<span class=\"memberName\">" + "<span class=\"return-type\">int</span>&nbsp;<span class=\"member-name\">"
+ "<a href=\"../src-html/linksource/SomeClass.html#line.36\">method</a></span>()</div>"); + "<a href=\"../src-html/linksource/SomeClass.html#line.36\">method</a></span>()</div>");
checkOutput("src-html/linksource/SomeClass.html", true, checkOutput("src-html/linksource/SomeClass.html", true,
"<title>Source code</title>", "<title>Source code</title>",
"<span class=\"sourceLineNo\">029</span><span id=\"line.29\">" "<span class=\"source-line-no\">029</span><span id=\"line.29\">"
+ "public class SomeClass {</span>", + "public class SomeClass {</span>",
"<span class=\"sourceLineNo\">031</span><span id=\"line.31\"> " "<span class=\"source-line-no\">031</span><span id=\"line.31\"> "
+ "public int field;</span>", + "public int field;</span>",
"<span class=\"sourceLineNo\">033</span><span id=\"line.33\"> " "<span class=\"source-line-no\">033</span><span id=\"line.33\"> "
+ "public SomeClass() {</span>", + "public SomeClass() {</span>",
"<span class=\"sourceLineNo\">036</span><span id=\"line.36\"> " "<span class=\"source-line-no\">036</span><span id=\"line.36\"> "
+ "public int method() {</span>"); + "public int method() {</span>");
checkOutput("linksource/SomeEnum.html", true, checkOutput("linksource/SomeEnum.html", true,
"<div class=\"memberSignature\"><span class=\"modifiers\">public static final</span>&nbsp;" "<div class=\"member-signature\"><span class=\"modifiers\">public static final</span>&nbsp;"
+ "<span class=\"returnType\"><a href=\"SomeEnum.html\" title=\"enum in linksource\">" + "<span class=\"return-type\"><a href=\"SomeEnum.html\" title=\"enum in linksource\">"
+ "SomeEnum</a></span>&nbsp;<span class=\"memberName\">" + "SomeEnum</a></span>&nbsp;<span class=\"member-name\">"
+ "<a href=\"../src-html/linksource/SomeEnum.html#line.29\">VALUE1</a></span></div>", + "<a href=\"../src-html/linksource/SomeEnum.html#line.29\">VALUE1</a></span></div>",
"<div class=\"memberSignature\"><span class=\"modifiers\">public static final</span>&nbsp;" "<div class=\"member-signature\"><span class=\"modifiers\">public static final</span>&nbsp;"
+ "<span class=\"returnType\"><a href=\"SomeEnum.html\" title=\"enum in linksource\">" + "<span class=\"return-type\"><a href=\"SomeEnum.html\" title=\"enum in linksource\">"
+ "SomeEnum</a></span>&nbsp;<span class=\"memberName\">" + "SomeEnum</a></span>&nbsp;<span class=\"member-name\">"
+ "<a href=\"../src-html/linksource/SomeEnum.html#line.30\">VALUE2</a></span></div>"); + "<a href=\"../src-html/linksource/SomeEnum.html#line.30\">VALUE2</a></span></div>");
checkOutput("src-html/linksource/SomeEnum.html", true, checkOutput("src-html/linksource/SomeEnum.html", true,
"<span class=\"sourceLineNo\">029</span><span id=\"line.29\"> VALUE1,</span>", "<span class=\"source-line-no\">029</span><span id=\"line.29\"> VALUE1,</span>",
"<span class=\"sourceLineNo\">030</span><span id=\"line.30\"> VALUE2</span>"); "<span class=\"source-line-no\">030</span><span id=\"line.30\"> VALUE2</span>");
} }
@Test @Test

18
test/langtools/jdk/javadoc/doclet/testOrdering/TestOrdering.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -516,14 +516,14 @@ public class TestOrdering extends JavadocTester {
checkOrder("pkg5/AnnoFieldTest.html", checkOrder("pkg5/AnnoFieldTest.html",
"<h2>Field Details</h2>", "<h2>Field Details</h2>",
"<div class=\"memberSignature\"><span class=\"modifiers\">static final</span>&nbsp;" "<div class=\"member-signature\"><span class=\"modifiers\">static final</span>&nbsp;"
+ "<span class=\"returnType\">int</span>&nbsp;<span class=\"memberName\">one</span></div>", + "<span class=\"return-type\">int</span>&nbsp;<span class=\"member-name\">one</span></div>",
"<div class=\"memberSignature\"><span class=\"modifiers\">static final</span>&nbsp;" "<div class=\"member-signature\"><span class=\"modifiers\">static final</span>&nbsp;"
+ "<span class=\"returnType\">int</span>&nbsp;<span class=\"memberName\">two</span></div>", + "<span class=\"return-type\">int</span>&nbsp;<span class=\"member-name\">two</span></div>",
"<div class=\"memberSignature\"><span class=\"modifiers\">static final</span>&nbsp;" "<div class=\"member-signature\"><span class=\"modifiers\">static final</span>&nbsp;"
+ "<span class=\"returnType\">int</span>&nbsp;<span class=\"memberName\">three</span></div>", + "<span class=\"return-type\">int</span>&nbsp;<span class=\"member-name\">three</span></div>",
"<div class=\"memberSignature\"><span class=\"modifiers\">static final</span>&nbsp;" "<div class=\"member-signature\"><span class=\"modifiers\">static final</span>&nbsp;"
+ "<span class=\"returnType\">int</span>&nbsp;<span class=\"memberName\">four</span></div>"); + "<span class=\"return-type\">int</span>&nbsp;<span class=\"member-name\">four</span></div>");
checkOrder("pkg5/AnnoOptionalTest.html", checkOrder("pkg5/AnnoOptionalTest.html",
"<h2>Optional Element Summary</h2>", "<h2>Optional Element Summary</h2>",

6
test/langtools/jdk/javadoc/doclet/testOverriddenMethods/TestBadOverride.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -54,8 +54,8 @@ public class TestBadOverride extends JavadocTester {
checkOutput("pkg4/Foo.html", true, checkOutput("pkg4/Foo.html", true,
"<section class=\"detail\" id=\"toString()\">\n" "<section class=\"detail\" id=\"toString()\">\n"
+ "<h3>toString</h3>\n" + "<h3>toString</h3>\n"
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public</span>&nbsp;" + "<div class=\"member-signature\"><span class=\"modifiers\">public</span>&nbsp;"
+ "<span class=\"returnType\">void</span>&nbsp;<span class=\"memberName\">toString</span>()</div>\n" + "<span class=\"return-type\">void</span>&nbsp;<span class=\"member-name\">toString</span>()</div>\n"
+ "<div class=\"block\">Why can't I do this ?</div>\n" + "<div class=\"block\">Why can't I do this ?</div>\n"
+ "</section>"); + "</section>");
} }

10
test/langtools/jdk/javadoc/doclet/testOverriddenMethods/TestOverriddenDeprecatedMethods.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -58,11 +58,11 @@ public class TestOverriddenDeprecatedMethods extends JavadocTester {
checkOrder("pkg1/SubClass.html", checkOrder("pkg1/SubClass.html",
"Method Detail", "Method Detail",
"<span class=\"annotations\">@Deprecated\n</span><span class=\"modifiers\">public</span>&nbsp;" "<span class=\"annotations\">@Deprecated\n</span><span class=\"modifiers\">public</span>&nbsp;"
+ "<span class=\"returnType\">void</span>&nbsp;<span class=\"memberName\">func1</span>()", + "<span class=\"return-type\">void</span>&nbsp;<span class=\"member-name\">func1</span>()",
"<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated.</span></div>", "<div class=\"deprecation-block\"><span class=\"deprecated-label\">Deprecated.</span></div>",
"<span class=\"annotations\">@Deprecated\n</span><span class=\"modifiers\">public</span>&nbsp;" "<span class=\"annotations\">@Deprecated\n</span><span class=\"modifiers\">public</span>&nbsp;"
+ "<span class=\"returnType\">void</span>&nbsp;<span class=\"memberName\">func2</span>()", + "<span class=\"return-type\">void</span>&nbsp;<span class=\"member-name\">func2</span>()",
"<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated.</span></div>", "<div class=\"deprecation-block\"><span class=\"deprecated-label\">Deprecated.</span></div>",
"<div class=\"block\">deprecated with comments</div>"); "<div class=\"block\">deprecated with comments</div>");
} }
} }

2
test/langtools/jdk/javadoc/doclet/testOverriddenMethods/TestOverriddenMethodDocCopy.java
View file

@ -53,7 +53,7 @@ public class TestOverriddenMethodDocCopy extends JavadocTester {
checkExit(Exit.OK); checkExit(Exit.OK);
checkOutput("pkg1/SubClass.html", true, checkOutput("pkg1/SubClass.html", true,
"<span class=\"descfrmTypeLabel\">Description copied from class:&nbsp;<code>" "<span class=\"descfrm-type-label\">Description copied from class:&nbsp;<code>"
+ "<a href=\"BaseClass.html#overriddenMethodWithDocsToCopy()\">" + "<a href=\"BaseClass.html#overriddenMethodWithDocsToCopy()\">"
+ "BaseClass</a></code></span>"); + "BaseClass</a></code></span>");
} }

16
test/langtools/jdk/javadoc/doclet/testOverriddenMethods/TestOverrideMethods.java
View file

@ -263,22 +263,22 @@ public class TestOverrideMethods extends JavadocTester {
"<table aria-labelledby=\"t0\">\n" "<table aria-labelledby=\"t0\">\n"
+ "<thead>\n" + "<thead>\n"
+ "<tr>\n" + "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n" + "<th class=\"col-first\" scope=\"col\">Modifier and Type</th>\n"
+ "<th class=\"colSecond\" scope=\"col\">Method</th>\n" + "<th class=\"col-second\" scope=\"col\">Method</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n" + "<th class=\"col-last\" scope=\"col\">Description</th>\n"
+ "</tr>\n" + "</tr>\n"
+ "</thead>\n" + "</thead>\n"
+ "<tbody>\n" + "<tbody>\n"
+ "<tr class=\"altColor\" id=\"i0\">\n" + "<tr class=\"alt-color\" id=\"i0\">\n"
+ "<td class=\"colFirst\"><code>java.lang.String</code></td>\n" + "<td class=\"col-first\"><code>java.lang.String</code></td>\n"
+ "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\"><a href=\"#m2()\">m2</a></span>()</code></th>\n" + "<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\"><a href=\"#m2()\">m2</a></span>()</code></th>\n"
+ "<td class=\"colLast\">\n" + "<td class=\"col-last\">\n"
+ "<div class=\"block\">This is Base::m2.</div>\n" + "<div class=\"block\">This is Base::m2.</div>\n"
+ "</td>\n" + "</td>\n"
+ "</tr>\n" + "</tr>\n"
+ "</tbody>\n" + "</tbody>\n"
+ "</table>\n", + "</table>\n",
"<div class=\"inheritedList\">\n" "<div class=\"inherited-list\">\n"
+ "<h3 id=\"methods.inherited.from.class.pkg6.Base\">Methods declared in class&nbsp;pkg6." + "<h3 id=\"methods.inherited.from.class.pkg6.Base\">Methods declared in class&nbsp;pkg6."
+ "<a href=\"Base.html\" title=\"class in pkg6\">Base</a></h3>\n" + "<a href=\"Base.html\" title=\"class in pkg6\">Base</a></h3>\n"
+ "<code><a href=\"Base.html#m1()\">m1</a>, <a href=\"Base.html#m3()\">m3</a></code></div>\n"); + "<code><a href=\"Base.html#m1()\">m1</a>, <a href=\"Base.html#m3()\">m3</a></code></div>\n");

6
test/langtools/jdk/javadoc/doclet/testPackageAnnotation/TestPackageAnnotation.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -63,8 +63,8 @@ public class TestPackageAnnotation extends JavadocTester {
"pkg2"); "pkg2");
checkExit(Exit.OK); checkExit(Exit.OK);
checkOutput("pkg2/package-summary.html", true, checkOutput("pkg2/package-summary.html", true,
"<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated.</span>\n" "<div class=\"deprecation-block\"><span class=\"deprecated-label\">Deprecated.</span>\n"
+ "<div class=\"deprecationComment\">This package is deprecated.</div>\n" + "<div class=\"deprecation-comment\">This package is deprecated.</div>\n"
+ "</div>\n" + "</div>\n"
+ "<div class=\"block\">This is the description of package pkg2.</div>\n" + "<div class=\"block\">This is the description of package pkg2.</div>\n"
+ "</section>"); + "</section>");

8
test/langtools/jdk/javadoc/doclet/testPackageDeprecation/TestPackageDeprecation.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -49,8 +49,8 @@ public class TestPackageDeprecation extends JavadocTester {
checkExit(Exit.OK); checkExit(Exit.OK);
checkOutput("pkg1/package-summary.html", true, checkOutput("pkg1/package-summary.html", true,
"<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated.</span>\n" "<div class=\"deprecation-block\"><span class=\"deprecated-label\">Deprecated.</span>\n"
+ "<div class=\"deprecationComment\">This package is Deprecated.</div>" + "<div class=\"deprecation-comment\">This package is Deprecated.</div>"
); );
checkOutput("deprecated-list.html", true, checkOutput("deprecated-list.html", true,
@ -70,7 +70,7 @@ public class TestPackageDeprecation extends JavadocTester {
checkOutput("index.html", false, checkOutput("index.html", false,
"pkg1"); "pkg1");
checkOutput("class-use/C2.ModalExclusionType.html", true, checkOutput("class-use/C2.ModalExclusionType.html", true,
"<th class=\"colFirst\" scope=\"row\"><a href=\"#unnamed.package\">&lt;Unnamed&gt;</a></th>"); "<th class=\"col-first\" scope=\"row\"><a href=\"#unnamed.package\">&lt;Unnamed&gt;</a></th>");
checkFiles(false, checkFiles(false,
"pkg1/package-summary.html", "pkg1/package-summary.html",

4
test/langtools/jdk/javadoc/doclet/testPackageDescription/TestPackageDescription.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -48,7 +48,7 @@ public class TestPackageDescription extends JavadocTester {
checkExit(Exit.OK); checkExit(Exit.OK);
checkOutput("pkg/package-summary.html", true, checkOutput("pkg/package-summary.html", true,
"<section class=\"packageDescription\" id=\"package.description\">\n" "<section class=\"package-description\" id=\"package.description\">\n"
+ "<div class=\"block\">package description</div>\n"); + "<div class=\"block\">package description</div>\n");
} }
} }

18
test/langtools/jdk/javadoc/doclet/testPackagePage/TestPackagePage.java
View file

@ -84,21 +84,21 @@ public class TestPackagePage extends JavadocTester {
checkOutput("help-doc.html", true, checkOutput("help-doc.html", true,
"<li>Package</li>"); "<li>Package</li>");
checkOutput("allclasses-index.html", true, checkOutput("allclasses-index.html", true,
"<div class=\"typeSummary\">\n<table>\n" "<div class=\"type-summary\">\n<table>\n"
+ "<caption><span>Class Summary</span><span class=\"tabEnd\">&nbsp;</span></caption>\n" + "<caption><span>Class Summary</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
+ "<thead>\n" + "<thead>\n"
+ "<tr>\n" + "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Class</th>\n" + "<th class=\"col-first\" scope=\"col\">Class</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n" + "<th class=\"col-last\" scope=\"col\">Description</th>\n"
+ "</tr>\n" + "</tr>\n"
+ "</thead>\n"); + "</thead>\n");
checkOutput("allpackages-index.html", true, checkOutput("allpackages-index.html", true,
"<div class=\"packagesSummary\">\n<table>\n" "<div class=\"packages-summary\">\n<table>\n"
+ "<caption><span>Package Summary</span><span class=\"tabEnd\">&nbsp;</span></caption>\n" + "<caption><span>Package Summary</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
+ "<thead>\n" + "<thead>\n"
+ "<tr>\n" + "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Package</th>\n" + "<th class=\"col-first\" scope=\"col\">Package</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n" + "<th class=\"col-last\" scope=\"col\">Description</th>\n"
+ "</tr>\n" + "</tr>\n"
+ "</thead>\n"); + "</thead>\n");
checkOutput("type-search-index.js", true, checkOutput("type-search-index.js", true,
@ -107,7 +107,7 @@ public class TestPackagePage extends JavadocTester {
"{\"l\":\"All Packages\",\"u\":\"allpackages-index.html\"}"); "{\"l\":\"All Packages\",\"u\":\"allpackages-index.html\"}");
checkOutput("index-all.html", true, checkOutput("index-all.html", true,
"<br><a href=\"allclasses-index.html\">All&nbsp;Classes</a>" "<br><a href=\"allclasses-index.html\">All&nbsp;Classes</a>"
+ "<span class=\"verticalSeparator\">|</span>" + "<span class=\"vertical-separator\">|</span>"
+ "<a href=\"allpackages-index.html\">All&nbsp;Packages</a>"); + "<a href=\"allpackages-index.html\">All&nbsp;Packages</a>");
} }
} }

32
test/langtools/jdk/javadoc/doclet/testPackageSummary/TestPackageSummary.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -50,25 +50,25 @@ public class TestPackageSummary extends JavadocTester {
checkOutput("pkg/package-summary.html", true, checkOutput("pkg/package-summary.html", true,
"<tbody>\n" "<tbody>\n"
+ "<tr class=\"altColor\">\n" + "<tr class=\"alt-color\">\n"
+ "<th class=\"colFirst\" scope=\"row\"><a href=\"C0.html\" title=\"class in pkg\">C0</a></th>\n" + "<th class=\"col-first\" scope=\"row\"><a href=\"C0.html\" title=\"class in pkg\">C0</a></th>\n"
+ "<td class=\"colLast\">&nbsp;</td>\n" + "<td class=\"col-last\">&nbsp;</td>\n"
+ "</tr>\n" + "</tr>\n"
+ "<tr class=\"rowColor\">\n" + "<tr class=\"row-color\">\n"
+ "<th class=\"colFirst\" scope=\"row\"><a href=\"C1.html\" title=\"class in pkg\">C1</a></th>\n" + "<th class=\"col-first\" scope=\"row\"><a href=\"C1.html\" title=\"class in pkg\">C1</a></th>\n"
+ "<td class=\"colLast\">&nbsp;</td>\n" + "<td class=\"col-last\">&nbsp;</td>\n"
+ "</tr>\n" + "</tr>\n"
+ "<tr class=\"altColor\">\n" + "<tr class=\"alt-color\">\n"
+ "<th class=\"colFirst\" scope=\"row\"><a href=\"C2.html\" title=\"class in pkg\">C2</a></th>\n" + "<th class=\"col-first\" scope=\"row\"><a href=\"C2.html\" title=\"class in pkg\">C2</a></th>\n"
+ "<td class=\"colLast\">&nbsp;</td>\n" + "<td class=\"col-last\">&nbsp;</td>\n"
+ "</tr>\n" + "</tr>\n"
+ "<tr class=\"rowColor\">\n" + "<tr class=\"row-color\">\n"
+ "<th class=\"colFirst\" scope=\"row\"><a href=\"C3.html\" title=\"class in pkg\">C3</a></th>\n" + "<th class=\"col-first\" scope=\"row\"><a href=\"C3.html\" title=\"class in pkg\">C3</a></th>\n"
+ "<td class=\"colLast\">&nbsp;</td>\n" + "<td class=\"col-last\">&nbsp;</td>\n"
+ "</tr>\n" + "</tr>\n"
+ "<tr class=\"altColor\">\n" + "<tr class=\"alt-color\">\n"
+ "<th class=\"colFirst\" scope=\"row\"><a href=\"C4.html\" title=\"class in pkg\">C4</a></th>\n" + "<th class=\"col-first\" scope=\"row\"><a href=\"C4.html\" title=\"class in pkg\">C4</a></th>\n"
+ "<td class=\"colLast\">&nbsp;</td>\n" + "<td class=\"col-last\">&nbsp;</td>\n"
+ "</tr>\n" + "</tr>\n"
+ "</tbody>\n" + "</tbody>\n"
); );

18
test/langtools/jdk/javadoc/doclet/testPrivateClasses/TestPrivateClasses.java
View file

@ -69,8 +69,8 @@ public class TestPrivateClasses extends JavadocTester {
+ "<div class=\"inheritance\">pkg.PublicChild</div>\n" + "<div class=\"inheritance\">pkg.PublicChild</div>\n"
+ "</div>", + "</div>",
// Method is documented as though it is declared in the inheriting method. // Method is documented as though it is declared in the inheriting method.
"<div class=\"memberSignature\"><span class=\"modifiers\">public</span>&nbsp;" "<div class=\"member-signature\"><span class=\"modifiers\">public</span>&nbsp;"
+ "<span class=\"returnType\">void</span>&nbsp;<span class=\"memberName\">" + "<span class=\"return-type\">void</span>&nbsp;<span class=\"member-name\">"
+ "methodInheritedFromParent</span>&#8203;(<span class=\"arguments\">int&nbsp;p1)</span>\n" + "methodInheritedFromParent</span>&#8203;(<span class=\"arguments\">int&nbsp;p1)</span>\n"
+ " throws <span class=\"exceptions\">java.lang.Exception</span></div>", + " throws <span class=\"exceptions\">java.lang.Exception</span></div>",
"<dl class=\"notes\">\n" "<dl class=\"notes\">\n"
@ -92,12 +92,12 @@ public class TestPrivateClasses extends JavadocTester {
checkOutput("pkg/PublicChild.html", false, checkOutput("pkg/PublicChild.html", false,
// Should not document comments from private inherited interfaces // Should not document comments from private inherited interfaces
"<td class=\"colLast\"><code><span class=\"memberNameLink\">" "<td class=\"col-last\"><code><span class=\"member-name-link\">"
+ "<a href=\"#methodInterface(int)\">" + "<a href=\"#methodInterface(int)\">"
+ "methodInterface</a></span>&#8203;(int&nbsp;p1)</code>\n" + "methodInterface</a></span>&#8203;(int&nbsp;p1)</code>\n"
+ "<div class=\"block\">Comment from interface.</div>\n</td>", + "<div class=\"block\">Comment from interface.</div>\n</td>",
// and similarly one more // and similarly one more
"<td class=\"colLast\"><code><span class=\"memberNameLink\">" "<td class=\"col-last\"><code><span class=\"member-name-link\">"
+ "<a href=\"#methodInterface2(int)\">" + "<a href=\"#methodInterface2(int)\">"
+ "methodInterface2</a></span>&#8203;(int&nbsp;p1)</code>\n" + "methodInterface2</a></span>&#8203;(int&nbsp;p1)</code>\n"
+ "<div class=\"block\">Comment from interface.</div>\n</td>" + "<div class=\"block\">Comment from interface.</div>\n</td>"
@ -130,7 +130,7 @@ public class TestPrivateClasses extends JavadocTester {
checkOutput("pkg2/C.html", false, checkOutput("pkg2/C.html", false,
//Do not inherit private interface method with generic parameters. //Do not inherit private interface method with generic parameters.
//This method has been implemented. //This method has been implemented.
"<span class=\"memberNameLink\"><a href=\"I.html#hello(T)\">hello</a></span>"); "<span class=\"member-name-link\"><a href=\"I.html#hello(T)\">hello</a></span>");
checkOutput("constant-values.html", false, checkOutput("constant-values.html", false,
// Make inherited constant are documented correctly. // Make inherited constant are documented correctly.
@ -181,7 +181,7 @@ public class TestPrivateClasses extends JavadocTester {
+ "<code><a href=\"PublicInterface.html\" title=\"interface in pkg\">" + "<code><a href=\"PublicInterface.html\" title=\"interface in pkg\">"
+ "PublicInterface</a></code></dd>\n" + "PublicInterface</a></code></dd>\n"
+ "</dl>", + "</dl>",
"<pre>public class <span class=\"typeNameLabel\">PublicChild</span>"); "<pre>public class <span class=\"type-name-label\">PublicChild</span>");
checkOutput("pkg/PublicInterface.html", true, checkOutput("pkg/PublicInterface.html", true,
// Field inheritence from non-public superinterface. // Field inheritence from non-public superinterface.
@ -214,7 +214,7 @@ public class TestPrivateClasses extends JavadocTester {
checkOutput("pkg2/C.html", true, checkOutput("pkg2/C.html", true,
//Since private flag is used, we can document that private interface method //Since private flag is used, we can document that private interface method
//with generic parameters has been implemented. //with generic parameters has been implemented.
"<span class=\"descfrmTypeLabel\">Description copied from interface:&nbsp;<code>" "<span class=\"descfrm-type-label\">Description copied from interface:&nbsp;<code>"
+ "<a href=\"I.html#hello(T)\">I</a></code></span>", + "<a href=\"I.html#hello(T)\">I</a></code></span>",
"<dt>Specified by:</dt>\n" "<dt>Specified by:</dt>\n"
+ "<dd><code><a href=\"I.html#hello(T)\">hello</a></code>" + "<dd><code><a href=\"I.html#hello(T)\">hello</a></code>"
@ -225,9 +225,9 @@ public class TestPrivateClasses extends JavadocTester {
checkOutput("pkg/PrivateParent.html", true, checkOutput("pkg/PrivateParent.html", true,
//Make sure when no modifier appear in the class signature, the //Make sure when no modifier appear in the class signature, the
//signature is displayed correctly without extra space at the beginning. //signature is displayed correctly without extra space at the beginning.
"<pre>class <span class=\"typeNameLabel\">PrivateParent</span>"); "<pre>class <span class=\"type-name-label\">PrivateParent</span>");
checkOutput("pkg/PrivateParent.html", false, checkOutput("pkg/PrivateParent.html", false,
"<pre> class <span class=\"typeNameLabel\">PrivateParent</span>"); "<pre> class <span class=\"type-name-label\">PrivateParent</span>");
} }
} }

30
test/langtools/jdk/javadoc/doclet/testProperty/TestProperty.java
View file

@ -50,10 +50,10 @@ public class TestProperty extends JavadocTester {
checkExit(Exit.OK); checkExit(Exit.OK);
checkOutput("pkg/MyClass.html", true, checkOutput("pkg/MyClass.html", true,
"<div class=\"memberSignature\"><span class=\"modifiers\">public final</span>&nbsp;" "<div class=\"member-signature\"><span class=\"modifiers\">public final</span>&nbsp;"
+ "<span class=\"returnType\"><a href=\"ObjectProperty.html\" title=\"class in pkg\">" + "<span class=\"return-type\"><a href=\"ObjectProperty.html\" title=\"class in pkg\">"
+ "ObjectProperty</a>&lt;<a href=\"MyObj.html\" title=\"class in pkg\">MyObj</a>&gt;</span>" + "ObjectProperty</a>&lt;<a href=\"MyObj.html\" title=\"class in pkg\">MyObj</a>&gt;</span>"
+ "&nbsp;<span class=\"memberName\">goodProperty</span></div>\n" + "&nbsp;<span class=\"member-name\">goodProperty</span></div>\n"
+ "<div class=\"block\">This is an Object property where the " + "<div class=\"block\">This is an Object property where the "
+ "Object is a single Object.</div>\n" + "Object is a single Object.</div>\n"
+ "<dl class=\"notes\">\n" + "<dl class=\"notes\">\n"
@ -63,10 +63,10 @@ public class TestProperty extends JavadocTester {
+ "<code>setGood(MyObj)</code></a></dd>\n" + "<code>setGood(MyObj)</code></a></dd>\n"
+ "</dl>", + "</dl>",
"<div class=\"memberSignature\"><span class=\"modifiers\">public final</span>&nbsp;" "<div class=\"member-signature\"><span class=\"modifiers\">public final</span>&nbsp;"
+ "<span class=\"returnType\"><a href=\"ObjectProperty.html\" title=\"class in pkg\">" + "<span class=\"return-type\"><a href=\"ObjectProperty.html\" title=\"class in pkg\">"
+ "ObjectProperty</a>&lt;<a href=\"MyObj.html\" title=\"class in pkg\">MyObj</a>[]&gt;</span>" + "ObjectProperty</a>&lt;<a href=\"MyObj.html\" title=\"class in pkg\">MyObj</a>[]&gt;</span>"
+ "&nbsp;<span class=\"memberName\">badProperty</span></div>\n" + "&nbsp;<span class=\"member-name\">badProperty</span></div>\n"
+ "<div class=\"block\">This is an Object property where the " + "<div class=\"block\">This is an Object property where the "
+ "Object is an array.</div>\n" + "Object is an array.</div>\n"
+ "<dl class=\"notes\">\n" + "<dl class=\"notes\">\n"
@ -77,28 +77,28 @@ public class TestProperty extends JavadocTester {
+ "</dl>", + "</dl>",
// id should not be used in the property table // id should not be used in the property table
"<tr class=\"altColor\">\n" "<tr class=\"alt-color\">\n"
+ "<td class=\"colFirst\"><code><a href=\"ObjectProperty.html\" " + "<td class=\"col-first\"><code><a href=\"ObjectProperty.html\" "
+ "title=\"class in pkg\">ObjectProperty</a>&lt;<a href=\"MyObj.html\" " + "title=\"class in pkg\">ObjectProperty</a>&lt;<a href=\"MyObj.html\" "
+ "title=\"class in pkg\">MyObj</a>[]&gt;</code></td>\n" + "title=\"class in pkg\">MyObj</a>[]&gt;</code></td>\n"
+ "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">" + "<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\">"
+ "<a href=\"#badProperty\">bad</a></span></code></th>", + "<a href=\"#badProperty\">bad</a></span></code></th>",
// id should be used in the method table // id should be used in the method table
"<tr class=\"altColor\" id=\"i0\">\n" "<tr class=\"alt-color\" id=\"i0\">\n"
+ "<td class=\"colFirst\"><code><a href=\"ObjectProperty.html\" " + "<td class=\"col-first\"><code><a href=\"ObjectProperty.html\" "
+ "title=\"class in pkg\">ObjectProperty</a>&lt;<a href=\"MyObj.html\" " + "title=\"class in pkg\">ObjectProperty</a>&lt;<a href=\"MyObj.html\" "
+ "title=\"class in pkg\">MyObj</a>[]&gt;</code></td>\n" + "title=\"class in pkg\">MyObj</a>[]&gt;</code></td>\n"
+ "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">" + "<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\">"
+ "<a href=\"#badProperty()\">badProperty</a></span>()</code></th>" + "<a href=\"#badProperty()\">badProperty</a></span>()</code></th>"
); );
checkOutput("pkg/MyClassT.html", true, checkOutput("pkg/MyClassT.html", true,
"<div class=\"memberSignature\"><span class=\"modifiers\">public final</span>&nbsp;" "<div class=\"member-signature\"><span class=\"modifiers\">public final</span>&nbsp;"
+ "<span class=\"returnType\"><a href=\"ObjectProperty.html\" title=\"class in pkg\">" + "<span class=\"return-type\"><a href=\"ObjectProperty.html\" title=\"class in pkg\">"
+ "ObjectProperty</a>&lt;java.util.List&lt;<a href=\"MyClassT.html\" " + "ObjectProperty</a>&lt;java.util.List&lt;<a href=\"MyClassT.html\" "
+ "title=\"type parameter in MyClassT\">T</a>&gt;&gt;</span>&nbsp;" + "title=\"type parameter in MyClassT\">T</a>&gt;&gt;</span>&nbsp;"
+ "<span class=\"memberName\">listProperty</span></div>\n" + "<span class=\"member-name\">listProperty</span></div>\n"
+ "<div class=\"block\">This is an Object property where the " + "<div class=\"block\">This is an Object property where the "
+ "Object is a single <code>List&lt;T&gt;</code>.</div>\n" + "Object is a single <code>List&lt;T&gt;</code>.</div>\n"
+ "<dl class=\"notes\">\n" + "<dl class=\"notes\">\n"

64
test/langtools/jdk/javadoc/doclet/testRecordTypes/TestRecordTypes.java
View file

@ -75,8 +75,8 @@ public class TestRecordTypes extends JavadocTester {
checkOutput("R.html", true, checkOutput("R.html", true,
"<h1 title=\"Record R\" class=\"title\">Record R</h1>", "<h1 title=\"Record R\" class=\"title\">Record R</h1>",
"public record <span class=\"typeNameLabel\">R</span>", "public record <span class=\"type-name-label\">R</span>",
"<code><span class=\"memberNameLink\"><a href=\"#%3Cinit%3E(int)\">R</a></span>&#8203;(int&nbsp;r1)</code>"); "<code><span class=\"member-name-link\"><a href=\"#%3Cinit%3E(int)\">R</a></span>&#8203;(int&nbsp;r1)</code>");
} }
@Test @Test
@ -94,8 +94,8 @@ public class TestRecordTypes extends JavadocTester {
checkOutput("p/R.html", true, checkOutput("p/R.html", true,
"<h1 title=\"Record R\" class=\"title\">Record R</h1>", "<h1 title=\"Record R\" class=\"title\">Record R</h1>",
"public record <span class=\"typeNameLabel\">R</span>", "public record <span class=\"type-name-label\">R</span>",
"<code><span class=\"memberNameLink\"><a href=\"#%3Cinit%3E(int)\">R</a></span>&#8203;(int&nbsp;r1)</code>"); "<code><span class=\"member-name-link\"><a href=\"#%3Cinit%3E(int)\">R</a></span>&#8203;(int&nbsp;r1)</code>");
} }
@Test @Test
@ -113,8 +113,8 @@ public class TestRecordTypes extends JavadocTester {
checkOutput("p/R.html", true, checkOutput("p/R.html", true,
"<h1 title=\"Record R\" class=\"title\">Record R</h1>", "<h1 title=\"Record R\" class=\"title\">Record R</h1>",
"public record <span class=\"typeNameLabel\">R</span>", "public record <span class=\"type-name-label\">R</span>",
"<code><span class=\"memberNameLink\"><a href=\"#%3Cinit%3E()\">R</a></span>()</code>"); "<code><span class=\"member-name-link\"><a href=\"#%3Cinit%3E()\">R</a></span>()</code>");
} }
@Test @Test
@ -135,12 +135,12 @@ public class TestRecordTypes extends JavadocTester {
checkOutput("p/R.html", true, checkOutput("p/R.html", true,
"<h1 title=\"Record R\" class=\"title\">Record R</h1>", "<h1 title=\"Record R\" class=\"title\">Record R</h1>",
"public record <span class=\"typeNameLabel\">R</span>", "public record <span class=\"type-name-label\">R</span>",
"<dl class=\"notes\">\n" "<dl class=\"notes\">\n"
+ "<dt>Record Components:</dt>\n" + "<dt>Record Components:</dt>\n"
+ "<dd><code><span id=\"param-r1\">r1</span></code> - This is a component.</dd>\n" + "<dd><code><span id=\"param-r1\">r1</span></code> - This is a component.</dd>\n"
+ "</dl>", + "</dl>",
"<code><span class=\"memberNameLink\"><a href=\"#%3Cinit%3E(int)\">R</a></span>&#8203;(int&nbsp;r1)</code>"); "<code><span class=\"member-name-link\"><a href=\"#%3Cinit%3E(int)\">R</a></span>&#8203;(int&nbsp;r1)</code>");
} }
@Test @Test
@ -162,14 +162,14 @@ public class TestRecordTypes extends JavadocTester {
checkOutput("p/R.html", true, checkOutput("p/R.html", true,
"<h1 title=\"Record R\" class=\"title\">Record R&lt;T&gt;</h1>", "<h1 title=\"Record R\" class=\"title\">Record R&lt;T&gt;</h1>",
"public record <span class=\"typeNameLabel\">R&lt;T&gt;</span>", "public record <span class=\"type-name-label\">R&lt;T&gt;</span>",
"<dl class=\"notes\">\n" "<dl class=\"notes\">\n"
+ "<dt>Type Parameters:</dt>\n" + "<dt>Type Parameters:</dt>\n"
+ "<dd><code>T</code> - This is a type parameter.</dd>\n" + "<dd><code>T</code> - This is a type parameter.</dd>\n"
+ "<dt>Record Components:</dt>\n" + "<dt>Record Components:</dt>\n"
+ "<dd><code><span id=\"param-r1\">r1</span></code> - This is a component.</dd>\n" + "<dd><code><span id=\"param-r1\">r1</span></code> - This is a component.</dd>\n"
+ "</dl>", + "</dl>",
"<code><span class=\"memberNameLink\"><a href=\"#%3Cinit%3E(int)\">R</a></span>&#8203;(int&nbsp;r1)</code>"); "<code><span class=\"member-name-link\"><a href=\"#%3Cinit%3E(int)\">R</a></span>&#8203;(int&nbsp;r1)</code>");
} }
@Test @Test
@ -192,10 +192,10 @@ public class TestRecordTypes extends JavadocTester {
// in these cases, we want to verify that something non-empty was put into // in these cases, we want to verify that something non-empty was put into
// the documentation for the generated members. // the documentation for the generated members.
checkOrder("p/R.html", checkOrder("p/R.html",
"<section class=\"constructorSummary\" id=\"constructor.summary\">", "<section class=\"constructor-summary\" id=\"constructor.summary\">",
"<a href=\"#%3Cinit%3E(int)\">R</a>", "<a href=\"#%3Cinit%3E(int)\">R</a>",
"Creates an instance of a <code>R</code> record.", "Creates an instance of a <code>R</code> record.",
"<section class=\"methodSummary\" id=\"method.summary\">", "<section class=\"method-summary\" id=\"method.summary\">",
"<a href=\"#equals(java.lang.Object)\">equals</a>", "<a href=\"#equals(java.lang.Object)\">equals</a>",
"Indicates whether some other object is \"equal to\" this one.", "Indicates whether some other object is \"equal to\" this one.",
"<a href=\"#hashCode()\">hashCode</a>", "<a href=\"#hashCode()\">hashCode</a>",
@ -205,19 +205,19 @@ public class TestRecordTypes extends JavadocTester {
"<a href=\"#toString()\">toString</a>", "<a href=\"#toString()\">toString</a>",
"Returns a string representation of this record.", "Returns a string representation of this record.",
"Method Details", "Method Details",
"<span class=\"memberName\">toString</span>", "<span class=\"member-name\">toString</span>",
"Returns a string representation of this record. The representation " "Returns a string representation of this record. The representation "
+ "contains the name of the type, followed by the name and value of " + "contains the name of the type, followed by the name and value of "
+ "each of the record components.", + "each of the record components.",
"<span class=\"memberName\">hashCode</span>", "<span class=\"member-name\">hashCode</span>",
"Returns a hash code value for this object. The value is derived " "Returns a hash code value for this object. The value is derived "
+ "from the hash code of each of the record components.", + "from the hash code of each of the record components.",
"<span class=\"memberName\">equals</span>", "<span class=\"member-name\">equals</span>",
"Indicates whether some other object is \"equal to\" this one. " "Indicates whether some other object is \"equal to\" this one. "
+ "The objects are equal if the other object is of the same class " + "The objects are equal if the other object is of the same class "
+ "and if all the record components are equal. All components " + "and if all the record components are equal. All components "
+ "in this record are compared with '=='.", + "in this record are compared with '=='.",
"<span class=\"memberName\">r1</span>", "<span class=\"member-name\">r1</span>",
"Returns the value of the <a href=\"#param-r1\"><code>r1</code></a> " "Returns the value of the <a href=\"#param-r1\"><code>r1</code></a> "
+ "record component." + "record component."
); );
@ -244,10 +244,10 @@ public class TestRecordTypes extends JavadocTester {
// in these cases, we want to verify that something non-empty was put into // in these cases, we want to verify that something non-empty was put into
// the documentation for the generated members. // the documentation for the generated members.
checkOrder("p/R.html", checkOrder("p/R.html",
"<section class=\"constructorSummary\" id=\"constructor.summary\">", "<section class=\"constructor-summary\" id=\"constructor.summary\">",
"<a href=\"#%3Cinit%3E(int)\">R</a>", "<a href=\"#%3Cinit%3E(int)\">R</a>",
"Creates an instance of a <code>R</code> record.", "Creates an instance of a <code>R</code> record.",
"<section class=\"methodSummary\" id=\"method.summary\">", "<section class=\"method-summary\" id=\"method.summary\">",
"<a href=\"#equals(java.lang.Object)\">equals</a>", "<a href=\"#equals(java.lang.Object)\">equals</a>",
"Indicates whether some other object is \"equal to\" this one.", "Indicates whether some other object is \"equal to\" this one.",
"<a href=\"#hashCode()\">hashCode</a>", "<a href=\"#hashCode()\">hashCode</a>",
@ -257,19 +257,19 @@ public class TestRecordTypes extends JavadocTester {
"<a href=\"#toString()\">toString</a>", "<a href=\"#toString()\">toString</a>",
"Returns a string representation of this record.", "Returns a string representation of this record.",
"Method Details", "Method Details",
"<span class=\"memberName\">toString</span>", "<span class=\"member-name\">toString</span>",
"Returns a string representation of this record. The representation " "Returns a string representation of this record. The representation "
+ "contains the name of the type, followed by the name and value of " + "contains the name of the type, followed by the name and value of "
+ "each of the record components.", + "each of the record components.",
"<span class=\"memberName\">hashCode</span>", "<span class=\"member-name\">hashCode</span>",
"Returns a hash code value for this object. The value is derived " "Returns a hash code value for this object. The value is derived "
+ "from the hash code of each of the record components.", + "from the hash code of each of the record components.",
"<span class=\"memberName\">equals</span>", "<span class=\"member-name\">equals</span>",
"Indicates whether some other object is \"equal to\" this one. " "Indicates whether some other object is \"equal to\" this one. "
+ "The objects are equal if the other object is of the same class " + "The objects are equal if the other object is of the same class "
+ "and if all the record components are equal. All components " + "and if all the record components are equal. All components "
+ "in this record are compared with '=='.", + "in this record are compared with '=='.",
"<span class=\"memberName\">r1</span>", "<span class=\"member-name\">r1</span>",
"Returns the value of the <a href=\"#param-r1\"><code>r1</code></a> " "Returns the value of the <a href=\"#param-r1\"><code>r1</code></a> "
+ "record component." + "record component."
); );
@ -334,10 +334,10 @@ public class TestRecordTypes extends JavadocTester {
checkExit(Exit.OK); checkExit(Exit.OK);
checkOrder("p/R.html", checkOrder("p/R.html",
"<section class=\"constructorSummary\" id=\"constructor.summary\">", "<section class=\"constructor-summary\" id=\"constructor.summary\">",
"<a href=\"#%3Cinit%3E(int)\">R</a>", "<a href=\"#%3Cinit%3E(int)\">R</a>",
"User constructor.", "User constructor.",
"<section class=\"methodSummary\" id=\"method.summary\">", "<section class=\"method-summary\" id=\"method.summary\">",
"<a href=\"#equals(java.lang.Object)\">equals</a>", "<a href=\"#equals(java.lang.Object)\">equals</a>",
"User equals.", "User equals.",
"<a href=\"#hashCode()\">hashCode</a>", "<a href=\"#hashCode()\">hashCode</a>",
@ -427,22 +427,22 @@ public class TestRecordTypes extends JavadocTester {
String mAnno= t.contains(ElementType.METHOD) ? "<span class=\"annotations\">" + anno + "\n</span>" : ""; String mAnno= t.contains(ElementType.METHOD) ? "<span class=\"annotations\">" + anno + "\n</span>" : "";
checkOutput("p/R.html", true, checkOutput("p/R.html", true,
"<pre>public record <span class=\"typeNameLabel\">R</span>(" "<pre>public record <span class=\"type-name-label\">R</span>("
+ rcAnno + rcAnno
+ "int&nbsp;i)\n" + + "int&nbsp;i)\n" +
"extends java.lang.Record</pre>", "extends java.lang.Record</pre>",
"<div class=\"memberSignature\">" "<div class=\"member-signature\">"
+ fAnno + fAnno
+ "<span class=\"modifiers\">private final</span>&nbsp;<span class=\"returnType\">int</span>" + "<span class=\"modifiers\">private final</span>&nbsp;<span class=\"return-type\">int</span>"
+ "&nbsp;<span class=\"memberName\">i</span></div>", + "&nbsp;<span class=\"member-name\">i</span></div>",
"<div class=\"memberSignature\"><span class=\"modifiers\">public</span>&nbsp;<span class=\"memberName\">R</span>" "<div class=\"member-signature\"><span class=\"modifiers\">public</span>&nbsp;<span class=\"member-name\">R</span>"
+ "&#8203;(<span class=\"arguments\">" + "&#8203;(<span class=\"arguments\">"
+ pAnno + pAnno
+ "int&nbsp;i)</span></div>", + "int&nbsp;i)</span></div>",
"<div class=\"memberSignature\">" "<div class=\"member-signature\">"
+ mAnno + mAnno
+ "<span class=\"modifiers\">public</span>&nbsp;<span class=\"returnType\">int</span>" + "<span class=\"modifiers\">public</span>&nbsp;<span class=\"return-type\">int</span>"
+ "&nbsp;<span class=\"memberName\">i</span>()</div>"); + "&nbsp;<span class=\"member-name\">i</span>()</div>");
} }
} }

194
test/langtools/jdk/javadoc/doclet/testSearch/TestSearch.java
View file

@ -385,12 +385,12 @@ public class TestSearch extends JavadocTester {
"<script type=\"text/javascript\" src=\"script-dir/jquery-ui.js\"></script>", "<script type=\"text/javascript\" src=\"script-dir/jquery-ui.js\"></script>",
"var pathtoroot = \"./\";\n" "var pathtoroot = \"./\";\n"
+ "loadScripts(document, 'script');", + "loadScripts(document, 'script');",
"<div class=\"navListSearch\">", "<div class=\"nav-list-search\">",
"<label for=\"search\">SEARCH:</label>\n" "<label for=\"search\">SEARCH:</label>\n"
+ "<input type=\"text\" id=\"search\" value=\"search\" disabled=\"disabled\">\n" + "<input type=\"text\" id=\"search\" value=\"search\" disabled=\"disabled\">\n"
+ "<input type=\"reset\" id=\"reset\" value=\"reset\" disabled=\"disabled\">\n"); + "<input type=\"reset\" id=\"reset\" value=\"reset\" disabled=\"disabled\">\n");
checkOutput(fileName, true, checkOutput(fileName, true,
"<div class=\"flexBox\">"); "<div class=\"flex-box\">");
} }
void checkSingleIndex(boolean expectedOutput, boolean html5) { void checkSingleIndex(boolean expectedOutput, boolean html5) {
@ -398,163 +398,163 @@ public class TestSearch extends JavadocTester {
// Test for search tags markup in index file. // Test for search tags markup in index file.
checkOutput("index-all.html", expectedOutput, checkOutput("index-all.html", expectedOutput,
"<dt><span class=\"searchTagLink\"><a href=\"pkg/package-summary.html#phrasewithspaces\">" "<dt><span class=\"search-tag-link\"><a href=\"pkg/package-summary.html#phrasewithspaces\">"
+ "phrase with spaces</a></span> - Search tag in package pkg</dt>", + "phrase with spaces</a></span> - Search tag in package pkg</dt>",
"<dt><span class=\"searchTagLink\"><a href=\"pkg/package-summary.html#pkg\">" "<dt><span class=\"search-tag-link\"><a href=\"pkg/package-summary.html#pkg\">"
+ "pkg</a></span> - Search tag in package pkg</dt>", + "pkg</a></span> - Search tag in package pkg</dt>",
"<dt><span class=\"searchTagLink\"><a href=\"pkg/package-summary.html#pkg2.5\">" "<dt><span class=\"search-tag-link\"><a href=\"pkg/package-summary.html#pkg2.5\">"
+ "pkg2.5</a></span> - Search tag in package pkg</dt>", + "pkg2.5</a></span> - Search tag in package pkg</dt>",
"<dt><span class=\"searchTagLink\"><a href=\"pkg/package-summary.html#r\">" "<dt><span class=\"search-tag-link\"><a href=\"pkg/package-summary.html#r\">"
+ "r</a></span> - Search tag in package pkg</dt>", + "r</a></span> - Search tag in package pkg</dt>",
"<dt><span class=\"searchTagLink\"><a href=\"pkg1/RegClass.html#searchphrase\">" "<dt><span class=\"search-tag-link\"><a href=\"pkg1/RegClass.html#searchphrase\">"
+ "search phrase</a></span> - Search tag in class pkg1.RegClass</dt>", + "search phrase</a></span> - Search tag in class pkg1.RegClass</dt>",
"<dt><span class=\"searchTagLink\"><a href=\"pkg1/RegClass.html#SearchWordWithDescription\">" "<dt><span class=\"search-tag-link\"><a href=\"pkg1/RegClass.html#SearchWordWithDescription\">"
+ "SearchWordWithDescription</a></span> - Search tag in pkg1.RegClass.CONSTANT_FIELD_1</dt>", + "SearchWordWithDescription</a></span> - Search tag in pkg1.RegClass.CONSTANT_FIELD_1</dt>",
"<dt><span class=\"searchTagLink\"><a href=\"pkg2/TestAnnotationType.html#searchphrasewithdescdeprecated\">" "<dt><span class=\"search-tag-link\"><a href=\"pkg2/TestAnnotationType.html#searchphrasewithdescdeprecated\">"
+ "search phrase with desc deprecated</a></span> - Search tag in annotation type pkg2.TestAnnotationType</dt>", + "search phrase with desc deprecated</a></span> - Search tag in annotation type pkg2.TestAnnotationType</dt>",
"<dt><span class=\"searchTagLink\"><a href=\"pkg2/TestClass.html#SearchTagDeprecatedClass\">" "<dt><span class=\"search-tag-link\"><a href=\"pkg2/TestClass.html#SearchTagDeprecatedClass\">"
+ "SearchTagDeprecatedClass</a></span> - Search tag in class pkg2.TestClass</dt>", + "SearchTagDeprecatedClass</a></span> - Search tag in class pkg2.TestClass</dt>",
"<dt><span class=\"searchTagLink\"><a href=\"pkg2/TestEnum.html#searchphrasedeprecated\">" "<dt><span class=\"search-tag-link\"><a href=\"pkg2/TestEnum.html#searchphrasedeprecated\">"
+ "search phrase deprecated</a></span> - Search tag in pkg2.TestEnum.ONE</dt>", + "search phrase deprecated</a></span> - Search tag in pkg2.TestEnum.ONE</dt>",
"<dt><span class=\"searchTagLink\"><a href=\"pkg2/TestEnum.html#searchphrasedeprecated\">" "<dt><span class=\"search-tag-link\"><a href=\"pkg2/TestEnum.html#searchphrasedeprecated\">"
+ "search phrase deprecated</a></span> - Search tag in pkg2.TestEnum.ONE</dt>", + "search phrase deprecated</a></span> - Search tag in pkg2.TestEnum.ONE</dt>",
"<dt><span class=\"searchTagLink\"><a href=\"pkg2/TestError.html#SearchTagDeprecatedMethod\">" "<dt><span class=\"search-tag-link\"><a href=\"pkg2/TestError.html#SearchTagDeprecatedMethod\">"
+ "SearchTagDeprecatedMethod</a></span> - Search tag in pkg2.TestError.TestError()</dt>", + "SearchTagDeprecatedMethod</a></span> - Search tag in pkg2.TestError.TestError()</dt>",
"<dt><span class=\"searchTagLink\"><a href=\"pkg2/TestError.html#SearchTagDeprecatedMethod\">" "<dt><span class=\"search-tag-link\"><a href=\"pkg2/TestError.html#SearchTagDeprecatedMethod\">"
+ "SearchTagDeprecatedMethod</a></span> - Search tag in pkg2.TestError.TestError()</dt>", + "SearchTagDeprecatedMethod</a></span> - Search tag in pkg2.TestError.TestError()</dt>",
"<dt><span class=\"searchTagLink\"><a href=\"pkg/package-summary.html#SingleWord\">" "<dt><span class=\"search-tag-link\"><a href=\"pkg/package-summary.html#SingleWord\">"
+ "SingleWord</a></span> - Search tag in package pkg</dt>", + "SingleWord</a></span> - Search tag in package pkg</dt>",
"<dt><span class=\"searchTagLink\"><a href=\"pkg/AnotherClass.ModalExclusionType.html" "<dt><span class=\"search-tag-link\"><a href=\"pkg/AnotherClass.ModalExclusionType.html"
+ "#nested%7B@indexnested_tag_test%7D\">nested {@index nested_tag_test}</a></span> - " + "#nested%7B@indexnested_tag_test%7D\">nested {@index nested_tag_test}</a></span> - "
+ "Search tag in pkg.AnotherClass.ModalExclusionType.NO_EXCLUDE</dt>", + "Search tag in pkg.AnotherClass.ModalExclusionType.NO_EXCLUDE</dt>",
"<dt><span class=\"searchTagLink\"><a href=\"pkg/AnotherClass.ModalExclusionType.html" "<dt><span class=\"search-tag-link\"><a href=\"pkg/AnotherClass.ModalExclusionType.html"
+ "#" + html_span_see_span + "\">html &lt;span&gt; see &lt;/span&gt;</a></span> - Search " + "#" + html_span_see_span + "\">html &lt;span&gt; see &lt;/span&gt;</a></span> - Search "
+ "tag in pkg.AnotherClass.ModalExclusionType.APPLICATION_EXCLUDE</dt>", + "tag in pkg.AnotherClass.ModalExclusionType.APPLICATION_EXCLUDE</dt>",
"<dt><span class=\"searchTagLink\"><a href=\"pkg/AnotherClass.html#quoted\">quoted</a>" "<dt><span class=\"search-tag-link\"><a href=\"pkg/AnotherClass.html#quoted\">quoted</a>"
+ "</span> - Search tag in pkg.AnotherClass.CONSTANT1</dt>", + "</span> - Search tag in pkg.AnotherClass.CONSTANT1</dt>",
"<dt><span class=\"memberNameLink\"><a href=\"pkg2/TestEnum.html#ONE\">ONE</a></span> - " "<dt><span class=\"member-name-link\"><a href=\"pkg2/TestEnum.html#ONE\">ONE</a></span> - "
+ "pkg2.<a href=\"pkg2/TestEnum.html\" title=\"enum in pkg2\">TestEnum</a></dt>", + "pkg2.<a href=\"pkg2/TestEnum.html\" title=\"enum in pkg2\">TestEnum</a></dt>",
"<dt><span class=\"memberNameLink\"><a href=\"pkg2/TestEnum.html#THREE\">THREE</a></span> - " "<dt><span class=\"member-name-link\"><a href=\"pkg2/TestEnum.html#THREE\">THREE</a></span> - "
+ "pkg2.<a href=\"pkg2/TestEnum.html\" title=\"enum in pkg2\">TestEnum</a></dt>", + "pkg2.<a href=\"pkg2/TestEnum.html\" title=\"enum in pkg2\">TestEnum</a></dt>",
"<dt><span class=\"memberNameLink\"><a href=\"pkg2/TestEnum.html#TWO\">TWO</a></span> - " "<dt><span class=\"member-name-link\"><a href=\"pkg2/TestEnum.html#TWO\">TWO</a></span> - "
+ "pkg2.<a href=\"pkg2/TestEnum.html\" title=\"enum in pkg2\">TestEnum</a></dt>"); + "pkg2.<a href=\"pkg2/TestEnum.html\" title=\"enum in pkg2\">TestEnum</a></dt>");
checkOutput("index-all.html", true, checkOutput("index-all.html", true,
"<div class=\"deprecationComment\">class_test1 passes. Search tag" "<div class=\"deprecation-comment\">class_test1 passes. Search tag"
+ " <span id=\"SearchTagDeprecatedClass\" class=\"searchTagResult\">SearchTagDeprecatedClass</span></div>", + " <span id=\"SearchTagDeprecatedClass\" class=\"search-tag-result\">SearchTagDeprecatedClass</span></div>",
"<div class=\"deprecationComment\">error_test3 passes. Search tag for\n" "<div class=\"deprecation-comment\">error_test3 passes. Search tag for\n"
+ " method <span id=\"SearchTagDeprecatedMethod\" class=\"searchTagResult\">SearchTagDeprecatedMethod</span></div>"); + " method <span id=\"SearchTagDeprecatedMethod\" class=\"search-tag-result\">SearchTagDeprecatedMethod</span></div>");
} }
void checkSplitIndex() { void checkSplitIndex() {
// Test for search tags markup in split index file. // Test for search tags markup in split index file.
checkOutput("index-files/index-13.html", true, checkOutput("index-files/index-13.html", true,
"<dt><span class=\"searchTagLink\"><a href=\"../pkg1/RegClass.html#searchphrase\">" "<dt><span class=\"search-tag-link\"><a href=\"../pkg1/RegClass.html#searchphrase\">"
+ "search phrase</a></span> - Search tag in class pkg1.RegClass</dt>", + "search phrase</a></span> - Search tag in class pkg1.RegClass</dt>",
"<dt><span class=\"searchTagLink\"><a href=\"../pkg1/RegClass.html#SearchWordWithDescription\">" "<dt><span class=\"search-tag-link\"><a href=\"../pkg1/RegClass.html#SearchWordWithDescription\">"
+ "SearchWordWithDescription</a></span> - Search tag in pkg1.RegClass.CONSTANT_FIELD_1</dt>", + "SearchWordWithDescription</a></span> - Search tag in pkg1.RegClass.CONSTANT_FIELD_1</dt>",
"<dt><span class=\"searchTagLink\"><a href=\"../pkg2/TestAnnotationType.html#searchphrasewithdescdeprecated\">" "<dt><span class=\"search-tag-link\"><a href=\"../pkg2/TestAnnotationType.html#searchphrasewithdescdeprecated\">"
+ "search phrase with desc deprecated</a></span> - Search tag in annotation type pkg2.TestAnnotationType</dt>", + "search phrase with desc deprecated</a></span> - Search tag in annotation type pkg2.TestAnnotationType</dt>",
"<dt><span class=\"searchTagLink\"><a href=\"../pkg2/TestClass.html#SearchTagDeprecatedClass\">" "<dt><span class=\"search-tag-link\"><a href=\"../pkg2/TestClass.html#SearchTagDeprecatedClass\">"
+ "SearchTagDeprecatedClass</a></span> - Search tag in class pkg2.TestClass</dt>", + "SearchTagDeprecatedClass</a></span> - Search tag in class pkg2.TestClass</dt>",
"<dt><span class=\"searchTagLink\"><a href=\"../pkg2/TestEnum.html#searchphrasedeprecated\">" "<dt><span class=\"search-tag-link\"><a href=\"../pkg2/TestEnum.html#searchphrasedeprecated\">"
+ "search phrase deprecated</a></span> - Search tag in pkg2.TestEnum.ONE</dt>", + "search phrase deprecated</a></span> - Search tag in pkg2.TestEnum.ONE</dt>",
"<dt><span class=\"searchTagLink\"><a href=\"../pkg2/TestEnum.html#searchphrasedeprecated\">" "<dt><span class=\"search-tag-link\"><a href=\"../pkg2/TestEnum.html#searchphrasedeprecated\">"
+ "search phrase deprecated</a></span> - Search tag in pkg2.TestEnum.ONE</dt>", + "search phrase deprecated</a></span> - Search tag in pkg2.TestEnum.ONE</dt>",
"<dt><span class=\"searchTagLink\"><a href=\"../pkg2/TestError.html#SearchTagDeprecatedMethod\">" "<dt><span class=\"search-tag-link\"><a href=\"../pkg2/TestError.html#SearchTagDeprecatedMethod\">"
+ "SearchTagDeprecatedMethod</a></span> - Search tag in pkg2.TestError.TestError()</dt>", + "SearchTagDeprecatedMethod</a></span> - Search tag in pkg2.TestError.TestError()</dt>",
"<dt><span class=\"searchTagLink\"><a href=\"../pkg2/TestError.html#SearchTagDeprecatedMethod\">" "<dt><span class=\"search-tag-link\"><a href=\"../pkg2/TestError.html#SearchTagDeprecatedMethod\">"
+ "SearchTagDeprecatedMethod</a></span> - Search tag in pkg2.TestError.TestError()</dt>", + "SearchTagDeprecatedMethod</a></span> - Search tag in pkg2.TestError.TestError()</dt>",
"<dt><span class=\"searchTagLink\"><a href=\"../pkg/package-summary.html#SingleWord\">" "<dt><span class=\"search-tag-link\"><a href=\"../pkg/package-summary.html#SingleWord\">"
+ "SingleWord</a></span> - Search tag in package pkg</dt>", + "SingleWord</a></span> - Search tag in package pkg</dt>",
"<br><a href=\"../allclasses-index.html\">All&nbsp;Classes</a>" "<br><a href=\"../allclasses-index.html\">All&nbsp;Classes</a>"
+ "<span class=\"verticalSeparator\">|</span>" + "<span class=\"vertical-separator\">|</span>"
+ "<a href=\"../allpackages-index.html\">All&nbsp;Packages</a>"); + "<a href=\"../allpackages-index.html\">All&nbsp;Packages</a>");
checkOutput("index-files/index-10.html", true, checkOutput("index-files/index-10.html", true,
"<dt><span class=\"searchTagLink\"><a href=\"../pkg/package-summary.html#phrasewithspaces\">" "<dt><span class=\"search-tag-link\"><a href=\"../pkg/package-summary.html#phrasewithspaces\">"
+ "phrase with spaces</a></span> - Search tag in package pkg</dt>", + "phrase with spaces</a></span> - Search tag in package pkg</dt>",
"<dt><span class=\"searchTagLink\"><a href=\"../pkg/package-summary.html#pkg\">" "<dt><span class=\"search-tag-link\"><a href=\"../pkg/package-summary.html#pkg\">"
+ "pkg</a></span> - Search tag in package pkg</dt>", + "pkg</a></span> - Search tag in package pkg</dt>",
"<dt><span class=\"searchTagLink\"><a href=\"../pkg/package-summary.html#pkg2.5\">" "<dt><span class=\"search-tag-link\"><a href=\"../pkg/package-summary.html#pkg2.5\">"
+ "pkg2.5</a></span> - Search tag in package pkg</dt>"); + "pkg2.5</a></span> - Search tag in package pkg</dt>");
checkOutput("index-files/index-12.html", true, checkOutput("index-files/index-12.html", true,
"<dt><span class=\"searchTagLink\"><a href=\"../pkg/package-summary.html#r\">" "<dt><span class=\"search-tag-link\"><a href=\"../pkg/package-summary.html#r\">"
+ "r</a></span> - Search tag in package pkg</dt>"); + "r</a></span> - Search tag in package pkg</dt>");
checkOutput("index-files/index-8.html", true, checkOutput("index-files/index-8.html", true,
"<dt><span class=\"searchTagLink\"><a href=\"../pkg/AnotherClass.ModalExclusionType.html" "<dt><span class=\"search-tag-link\"><a href=\"../pkg/AnotherClass.ModalExclusionType.html"
+ "#nested%7B@indexnested_tag_test%7D\">nested {@index nested_tag_test}</a></span> - " + "#nested%7B@indexnested_tag_test%7D\">nested {@index nested_tag_test}</a></span> - "
+ "Search tag in pkg.AnotherClass.ModalExclusionType.NO_EXCLUDE</dt>"); + "Search tag in pkg.AnotherClass.ModalExclusionType.NO_EXCLUDE</dt>");
checkOutput("index-files/index-5.html", true, checkOutput("index-files/index-5.html", true,
"<dt><span class=\"searchTagLink\"><a href=\"../pkg/AnotherClass.ModalExclusionType.html" "<dt><span class=\"search-tag-link\"><a href=\"../pkg/AnotherClass.ModalExclusionType.html"
+ "#html%3Cspan%3Esee%3C/span%3E\">html &lt;span&gt; see &lt;/span&gt;</a></span> - Search " + "#html%3Cspan%3Esee%3C/span%3E\">html &lt;span&gt; see &lt;/span&gt;</a></span> - Search "
+ "tag in pkg.AnotherClass.ModalExclusionType.APPLICATION_EXCLUDE</dt>"); + "tag in pkg.AnotherClass.ModalExclusionType.APPLICATION_EXCLUDE</dt>");
checkOutput("index-files/index-11.html", true, checkOutput("index-files/index-11.html", true,
"<dt><span class=\"searchTagLink\"><a href=\"../pkg/AnotherClass.html#quoted\">quoted</a>" "<dt><span class=\"search-tag-link\"><a href=\"../pkg/AnotherClass.html#quoted\">quoted</a>"
+ "</span> - Search tag in pkg.AnotherClass.CONSTANT1</dt>"); + "</span> - Search tag in pkg.AnotherClass.CONSTANT1</dt>");
checkOutput("index-files/index-9.html", true, checkOutput("index-files/index-9.html", true,
"<dt><span class=\"memberNameLink\"><a href=\"../pkg2/TestEnum.html#ONE\">ONE</a>" "<dt><span class=\"member-name-link\"><a href=\"../pkg2/TestEnum.html#ONE\">ONE</a>"
+ "</span> - pkg2.<a href=\"../pkg2/TestEnum.html\" title=\"enum in pkg2\">TestEnum</a></dt>"); + "</span> - pkg2.<a href=\"../pkg2/TestEnum.html\" title=\"enum in pkg2\">TestEnum</a></dt>");
checkOutput("index-files/index-14.html", true, checkOutput("index-files/index-14.html", true,
"<dt><span class=\"memberNameLink\"><a href=\"../pkg2/TestEnum.html#THREE\">THREE</a></span> - " "<dt><span class=\"member-name-link\"><a href=\"../pkg2/TestEnum.html#THREE\">THREE</a></span> - "
+ "pkg2.<a href=\"../pkg2/TestEnum.html\" title=\"enum in pkg2\">TestEnum</a></dt>", + "pkg2.<a href=\"../pkg2/TestEnum.html\" title=\"enum in pkg2\">TestEnum</a></dt>",
"<dt><span class=\"memberNameLink\"><a href=\"../pkg2/TestEnum.html#TWO\">TWO</a></span> - " "<dt><span class=\"member-name-link\"><a href=\"../pkg2/TestEnum.html#TWO\">TWO</a></span> - "
+ "pkg2.<a href=\"../pkg2/TestEnum.html\" title=\"enum in pkg2\">TestEnum</a></dt>"); + "pkg2.<a href=\"../pkg2/TestEnum.html\" title=\"enum in pkg2\">TestEnum</a></dt>");
} }
void checkIndexNoComment() { void checkIndexNoComment() {
// Test for search tags markup in index file when javadoc is executed with -nocomment. // Test for search tags markup in index file when javadoc is executed with -nocomment.
checkOutput("index-all.html", false, checkOutput("index-all.html", false,
"<dt><span class=\"searchTagLink\"><a href=\"pkg/package-summary.html#phrasewithspaces\">" "<dt><span class=\"search-tag-link\"><a href=\"pkg/package-summary.html#phrasewithspaces\">"
+ "phrase with spaces</a></span> - Search tag in package pkg</dt>", + "phrase with spaces</a></span> - Search tag in package pkg</dt>",
"<dt><span class=\"searchTagLink\"><a href=\"pkg/package-summary.html#pkg\">" "<dt><span class=\"search-tag-link\"><a href=\"pkg/package-summary.html#pkg\">"
+ "pkg</a></span> - Search tag in package pkg</dt>", + "pkg</a></span> - Search tag in package pkg</dt>",
"<dt><span class=\"searchTagLink\"><a href=\"pkg/package-summary.html#pkg2.5\">" "<dt><span class=\"search-tag-link\"><a href=\"pkg/package-summary.html#pkg2.5\">"
+ "pkg2.5</a></span> - Search tag in package pkg</dt>", + "pkg2.5</a></span> - Search tag in package pkg</dt>",
"<dt><span class=\"searchTagLink\"><a href=\"pkg/package-summary.html#r\">" "<dt><span class=\"search-tag-link\"><a href=\"pkg/package-summary.html#r\">"
+ "r</a></span> - Search tag in package pkg</dt>", + "r</a></span> - Search tag in package pkg</dt>",
"<dt><span class=\"searchTagLink\"><a href=\"pkg1/RegClass.html#searchphrase\">" "<dt><span class=\"search-tag-link\"><a href=\"pkg1/RegClass.html#searchphrase\">"
+ "search phrase</a></span> - Search tag in class pkg1.RegClass</dt>", + "search phrase</a></span> - Search tag in class pkg1.RegClass</dt>",
"<dt><span class=\"searchTagLink\"><a href=\"pkg1/RegClass.html#SearchWordWithDescription\">" "<dt><span class=\"search-tag-link\"><a href=\"pkg1/RegClass.html#SearchWordWithDescription\">"
+ "SearchWordWithDescription</a></span> - Search tag in pkg1.RegClass.CONSTANT_FIELD_1</dt>", + "SearchWordWithDescription</a></span> - Search tag in pkg1.RegClass.CONSTANT_FIELD_1</dt>",
"<dt><span class=\"searchTagLink\"><a href=\"pkg2/TestAnnotationType.html#searchphrasewithdescdeprecated\">" "<dt><span class=\"search-tag-link\"><a href=\"pkg2/TestAnnotationType.html#searchphrasewithdescdeprecated\">"
+ "search phrase with desc deprecated</a></span> - Search tag in annotation type pkg2.TestAnnotationType</dt>", + "search phrase with desc deprecated</a></span> - Search tag in annotation type pkg2.TestAnnotationType</dt>",
"<dt><span class=\"searchTagLink\"><a href=\"pkg2/TestClass.html#SearchTagDeprecatedClass\">" "<dt><span class=\"search-tag-link\"><a href=\"pkg2/TestClass.html#SearchTagDeprecatedClass\">"
+ "SearchTagDeprecatedClass</a></span> - Search tag in class pkg2.TestClass</dt>", + "SearchTagDeprecatedClass</a></span> - Search tag in class pkg2.TestClass</dt>",
"<dt><span class=\"searchTagLink\"><a href=\"pkg/package-summary.html#SingleWord\">" "<dt><span class=\"search-tag-link\"><a href=\"pkg/package-summary.html#SingleWord\">"
+ "SingleWord</a></span> - Search tag in package pkg</dt>", + "SingleWord</a></span> - Search tag in package pkg</dt>",
"<div class=\"deprecationComment\">class_test1 passes. Search tag" "<div class=\"deprecation-comment\">class_test1 passes. Search tag"
+ " <span id=\"SearchTagDeprecatedClass\">SearchTagDeprecatedClass</span></div>", + " <span id=\"SearchTagDeprecatedClass\">SearchTagDeprecatedClass</span></div>",
"<div class=\"deprecationComment\">error_test3 passes. Search tag for\n" "<div class=\"deprecation-comment\">error_test3 passes. Search tag for\n"
+ " method <span id=\"SearchTagDeprecatedMethod\">SearchTagDeprecatedMethod</span></div>"); + " method <span id=\"SearchTagDeprecatedMethod\">SearchTagDeprecatedMethod</span></div>");
checkOutput("index-all.html", true, checkOutput("index-all.html", true,
"<dt><span class=\"searchTagLink\"><a href=\"pkg2/TestEnum.html#searchphrasedeprecated\">" "<dt><span class=\"search-tag-link\"><a href=\"pkg2/TestEnum.html#searchphrasedeprecated\">"
+ "search phrase deprecated</a></span> - Search tag in pkg2.TestEnum.ONE</dt>", + "search phrase deprecated</a></span> - Search tag in pkg2.TestEnum.ONE</dt>",
"<dt><span class=\"searchTagLink\"><a href=\"pkg2/TestError.html#SearchTagDeprecatedMethod\">" "<dt><span class=\"search-tag-link\"><a href=\"pkg2/TestError.html#SearchTagDeprecatedMethod\">"
+ "SearchTagDeprecatedMethod</a></span> - Search tag in pkg2.TestError.TestError()</dt>"); + "SearchTagDeprecatedMethod</a></span> - Search tag in pkg2.TestError.TestError()</dt>");
} }
void checkIndexNoDeprecated() { void checkIndexNoDeprecated() {
// Test for search tags markup in index file when javadoc is executed using -nodeprecated. // Test for search tags markup in index file when javadoc is executed using -nodeprecated.
checkOutput("index-all.html", true, checkOutput("index-all.html", true,
"<dt><span class=\"searchTagLink\"><a href=\"pkg/package-summary.html#phrasewithspaces\">" "<dt><span class=\"search-tag-link\"><a href=\"pkg/package-summary.html#phrasewithspaces\">"
+ "phrase with spaces</a></span> - Search tag in package pkg</dt>", + "phrase with spaces</a></span> - Search tag in package pkg</dt>",
"<dt><span class=\"searchTagLink\"><a href=\"pkg1/RegClass.html#searchphrase\">" "<dt><span class=\"search-tag-link\"><a href=\"pkg1/RegClass.html#searchphrase\">"
+ "search phrase</a></span> - Search tag in class pkg1.RegClass</dt>", + "search phrase</a></span> - Search tag in class pkg1.RegClass</dt>",
"<dt><span class=\"searchTagLink\"><a href=\"pkg1/RegClass.html#SearchWordWithDescription\">" "<dt><span class=\"search-tag-link\"><a href=\"pkg1/RegClass.html#SearchWordWithDescription\">"
+ "SearchWordWithDescription</a></span> - Search tag in pkg1.RegClass.CONSTANT_FIELD_1</dt>", + "SearchWordWithDescription</a></span> - Search tag in pkg1.RegClass.CONSTANT_FIELD_1</dt>",
"<dt><span class=\"searchTagLink\"><a href=\"pkg/package-summary.html#SingleWord\">" "<dt><span class=\"search-tag-link\"><a href=\"pkg/package-summary.html#SingleWord\">"
+ "SingleWord</a></span> - Search tag in package pkg</dt>"); + "SingleWord</a></span> - Search tag in package pkg</dt>");
checkOutput("index-all.html", false, checkOutput("index-all.html", false,
"<dt><span class=\"searchTagLink\"><a href=\"pkg2/TestAnnotationType.html#searchphrasewithdescdeprecated\">" "<dt><span class=\"search-tag-link\"><a href=\"pkg2/TestAnnotationType.html#searchphrasewithdescdeprecated\">"
+ "search phrase with desc deprecated</a></span> - Search tag in annotation type pkg2.TestAnnotationType</dt>", + "search phrase with desc deprecated</a></span> - Search tag in annotation type pkg2.TestAnnotationType</dt>",
"<dt><span class=\"searchTagLink\"><a href=\"pkg2/TestClass.html#SearchTagDeprecatedClass\">" "<dt><span class=\"search-tag-link\"><a href=\"pkg2/TestClass.html#SearchTagDeprecatedClass\">"
+ "SearchTagDeprecatedClass</a></span> - Search tag in class pkg2.TestClass</dt>", + "SearchTagDeprecatedClass</a></span> - Search tag in class pkg2.TestClass</dt>",
"<dt><span class=\"searchTagLink\"><a href=\"pkg2/TestEnum.html#searchphrasedeprecated\">" "<dt><span class=\"search-tag-link\"><a href=\"pkg2/TestEnum.html#searchphrasedeprecated\">"
+ "search phrase deprecated</a></span> - Search tag in pkg2.TestEnum.ONE</dt>", + "search phrase deprecated</a></span> - Search tag in pkg2.TestEnum.ONE</dt>",
"<dt><span class=\"searchTagLink\"><a href=\"pkg2/TestError.html#SearchTagDeprecatedMethod\">" "<dt><span class=\"search-tag-link\"><a href=\"pkg2/TestError.html#SearchTagDeprecatedMethod\">"
+ "SearchTagDeprecatedMethod</a></span> - Search tag in pkg2.TestError.TestError()</dt>", + "SearchTagDeprecatedMethod</a></span> - Search tag in pkg2.TestError.TestError()</dt>",
"<div class=\"deprecationComment\">class_test1 passes. Search tag" "<div class=\"deprecation-comment\">class_test1 passes. Search tag"
+ " <span id=\"SearchTagDeprecatedClass\">SearchTagDeprecatedClass</span></div>", + " <span id=\"SearchTagDeprecatedClass\">SearchTagDeprecatedClass</span></div>",
"<div class=\"deprecationComment\">error_test3 passes. Search tag for\n" "<div class=\"deprecation-comment\">error_test3 passes. Search tag for\n"
+ " method <span id=\"SearchTagDeprecatedMethod\">SearchTagDeprecatedMethod</span></div>"); + " method <span id=\"SearchTagDeprecatedMethod\">SearchTagDeprecatedMethod</span></div>");
} }
@ -628,14 +628,14 @@ public class TestSearch extends JavadocTester {
void checkSingleIndexSearchTagDuplication() { void checkSingleIndexSearchTagDuplication() {
// Test for search tags duplication in index file. // Test for search tags duplication in index file.
checkOutput("index-all.html", true, checkOutput("index-all.html", true,
"<dt><span class=\"searchTagLink\"><a href=\"pkg2/TestError.html#SearchTagDeprecatedMethod\">" "<dt><span class=\"search-tag-link\"><a href=\"pkg2/TestError.html#SearchTagDeprecatedMethod\">"
+ "SearchTagDeprecatedMethod</a></span> - Search tag in pkg2.TestError.TestError()</dt>\n" + "SearchTagDeprecatedMethod</a></span> - Search tag in pkg2.TestError.TestError()</dt>\n"
+ "<dd>with description</dd>"); + "<dd>with description</dd>");
checkOutput("index-all.html", false, checkOutput("index-all.html", false,
"<dt><span class=\"searchTagLink\"><a href=\"pkg2/TestError.html#SearchTagDeprecatedMethod\">" "<dt><span class=\"search-tag-link\"><a href=\"pkg2/TestError.html#SearchTagDeprecatedMethod\">"
+ "SearchTagDeprecatedMethod</a></span> - Search tag in pkg2.TestError.TestError()</dt>\n" + "SearchTagDeprecatedMethod</a></span> - Search tag in pkg2.TestError.TestError()</dt>\n"
+ "<dd>with description</dd>\n" + "<dd>with description</dd>\n"
+ "<dt><span class=\"searchTagLink\"><a href=\"pkg2/TestError.html#SearchTagDeprecatedMethod\">" + "<dt><span class=\"search-tag-link\"><a href=\"pkg2/TestError.html#SearchTagDeprecatedMethod\">"
+ "SearchTagDeprecatedMethod</a></span> - Search tag in pkg2.TestError.TestError()</dt>\n" + "SearchTagDeprecatedMethod</a></span> - Search tag in pkg2.TestError.TestError()</dt>\n"
+ "<dd>with description</dd>"); + "<dd>with description</dd>");
} }
@ -643,55 +643,55 @@ public class TestSearch extends JavadocTester {
void checkSplitIndexSearchTagDuplication() { void checkSplitIndexSearchTagDuplication() {
// Test for search tags duplication in index file. // Test for search tags duplication in index file.
checkOutput("index-files/index-13.html", true, checkOutput("index-files/index-13.html", true,
"<dt><span class=\"searchTagLink\"><a href=\"../pkg2/TestError.html#SearchTagDeprecatedMethod\">" "<dt><span class=\"search-tag-link\"><a href=\"../pkg2/TestError.html#SearchTagDeprecatedMethod\">"
+ "SearchTagDeprecatedMethod</a></span> - Search tag in pkg2.TestError.TestError()</dt>\n" + "SearchTagDeprecatedMethod</a></span> - Search tag in pkg2.TestError.TestError()</dt>\n"
+ "<dd>with description</dd>"); + "<dd>with description</dd>");
checkOutput("index-files/index-13.html", false, checkOutput("index-files/index-13.html", false,
"<dt><span class=\"searchTagLink\"><a href=\"../pkg2/TestError.html#SearchTagDeprecatedMethod\">" "<dt><span class=\"search-tag-link\"><a href=\"../pkg2/TestError.html#SearchTagDeprecatedMethod\">"
+ "SearchTagDeprecatedMethod</a></span> - Search tag in pkg2.TestError.TestError()</dt>\n" + "SearchTagDeprecatedMethod</a></span> - Search tag in pkg2.TestError.TestError()</dt>\n"
+ "<dd>with description</dd>\n" + "<dd>with description</dd>\n"
+ "<dt><span class=\"searchTagLink\"><a href=\"../pkg2/TestError.html#SearchTagDeprecatedMethod\">" + "<dt><span class=\"search-tag-link\"><a href=\"../pkg2/TestError.html#SearchTagDeprecatedMethod\">"
+ "SearchTagDeprecatedMethod</a></span> - Search tag in pkg2.TestError.TestError()</dt>\n" + "SearchTagDeprecatedMethod</a></span> - Search tag in pkg2.TestError.TestError()</dt>\n"
+ "<dd>with description</dd>"); + "<dd>with description</dd>");
} }
void checkAllPkgsAllClasses() { void checkAllPkgsAllClasses() {
checkOutput("allclasses-index.html", true, checkOutput("allclasses-index.html", true,
"<div class=\"typeSummary\">\n" "<div class=\"type-summary\">\n"
+ "<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\"" + "<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
+ " aria-selected=\"true\" aria-controls=\"typeSummary_tabpanel\" tabindex=\"0\"" + " aria-selected=\"true\" aria-controls=\"type-summary_tabpanel\" tabindex=\"0\""
+ " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"activeTableTab\">All Classes</button>" + " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"active-table-tab\">All Classes</button>"
+ "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"typeSummary_tabpanel\"" + "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"type-summary_tabpanel\""
+ " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t1\" class=\"tableTab\"" + " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t1\" class=\"table-tab\""
+ " onclick=\"show(1);\">Interface Summary</button><button role=\"tab\" aria-selected=\"false\"" + " onclick=\"show(1);\">Interface Summary</button><button role=\"tab\" aria-selected=\"false\""
+ " aria-controls=\"typeSummary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\"" + " aria-controls=\"type-summary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
+ " id=\"t2\" class=\"tableTab\" onclick=\"show(2);\">Class Summary</button><button role=\"tab\"" + " id=\"t2\" class=\"table-tab\" onclick=\"show(2);\">Class Summary</button><button role=\"tab\""
+ " aria-selected=\"false\" aria-controls=\"typeSummary_tabpanel\" tabindex=\"-1\"" + " aria-selected=\"false\" aria-controls=\"type-summary_tabpanel\" tabindex=\"-1\""
+ " onkeydown=\"switchTab(event)\" id=\"t3\" class=\"tableTab\" onclick=\"show(4);\">" + " onkeydown=\"switchTab(event)\" id=\"t3\" class=\"table-tab\" onclick=\"show(4);\">"
+ "Enum Summary</button><button role=\"tab\" aria-selected=\"false\"" + "Enum Summary</button><button role=\"tab\" aria-selected=\"false\""
+ " aria-controls=\"typeSummary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\"" + " aria-controls=\"type-summary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
+ " id=\"t4\" class=\"tableTab\" onclick=\"show(8);\">Exception Summary</button><button role=\"tab\"" + " id=\"t4\" class=\"table-tab\" onclick=\"show(8);\">Exception Summary</button><button role=\"tab\""
+ " aria-selected=\"false\" aria-controls=\"typeSummary_tabpanel\" tabindex=\"-1\"" + " aria-selected=\"false\" aria-controls=\"type-summary_tabpanel\" tabindex=\"-1\""
+ " onkeydown=\"switchTab(event)\" id=\"t5\" class=\"tableTab\" onclick=\"show(16);\">" + " onkeydown=\"switchTab(event)\" id=\"t5\" class=\"table-tab\" onclick=\"show(16);\">"
+ "Error Summary</button><button role=\"tab\" aria-selected=\"false\"" + "Error Summary</button><button role=\"tab\" aria-selected=\"false\""
+ " aria-controls=\"typeSummary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\"" + " aria-controls=\"type-summary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
+ " id=\"t6\" class=\"tableTab\" onclick=\"show(32);\">Annotation Types Summary</button></div>\n" + " id=\"t6\" class=\"table-tab\" onclick=\"show(32);\">Annotation Types Summary</button></div>\n"
+ "<div id=\"typeSummary_tabpanel\" role=\"tabpanel\">\n" + "<div id=\"type-summary_tabpanel\" role=\"tabpanel\">\n"
+ "<table aria-labelledby=\"t0\">\n" + "<table aria-labelledby=\"t0\">\n"
+ "<thead>\n" + "<thead>\n"
+ "<tr>\n" + "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Class</th>\n" + "<th class=\"col-first\" scope=\"col\">Class</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n" + "<th class=\"col-last\" scope=\"col\">Description</th>\n"
+ "</tr>", + "</tr>",
"var data = {\"i0\":32,\"i1\":2,\"i2\":4,\"i3\":2,\"i4\":2,\"i5\":1,\"i6\":2,\"i7\":32," "var data = {\"i0\":32,\"i1\":2,\"i2\":4,\"i3\":2,\"i4\":2,\"i5\":1,\"i6\":2,\"i7\":32,"
+ "\"i8\":2,\"i9\":4,\"i10\":16,\"i11\":16,\"i12\":8,\"i13\":8,\"i14\":1,\"i15\":2};"); + "\"i8\":2,\"i9\":4,\"i10\":16,\"i11\":16,\"i12\":8,\"i13\":8,\"i14\":1,\"i15\":2};");
checkOutput("allpackages-index.html", true, checkOutput("allpackages-index.html", true,
"<div class=\"packagesSummary\">\n<table>\n" "<div class=\"packages-summary\">\n<table>\n"
+ "<caption><span>Package Summary</span><span class=\"tabEnd\">&nbsp;</span></caption>\n" + "<caption><span>Package Summary</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
+ "<thead>\n" + "<thead>\n"
+ "<tr>\n" + "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Package</th>\n" + "<th class=\"col-first\" scope=\"col\">Package</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n" + "<th class=\"col-last\" scope=\"col\">Description</th>\n"
+ "</tr>\n"); + "</tr>\n");
checkOutput("type-search-index.js", true, checkOutput("type-search-index.js", true,
"{\"l\":\"All Classes\",\"u\":\"allclasses-index.html\"}"); "{\"l\":\"All Classes\",\"u\":\"allclasses-index.html\"}");
@ -699,7 +699,7 @@ public class TestSearch extends JavadocTester {
"{\"l\":\"All Packages\",\"u\":\"allpackages-index.html\"}"); "{\"l\":\"All Packages\",\"u\":\"allpackages-index.html\"}");
checkOutput("index-all.html", true, checkOutput("index-all.html", true,
"<br><a href=\"allclasses-index.html\">All&nbsp;Classes</a>" "<br><a href=\"allclasses-index.html\">All&nbsp;Classes</a>"
+ "<span class=\"verticalSeparator\">|</span>" + "<span class=\"vertical-separator\">|</span>"
+ "<a href=\"allpackages-index.html\">All&nbsp;Packages</a>"); + "<a href=\"allpackages-index.html\">All&nbsp;Packages</a>");
} }
} }

20
test/langtools/jdk/javadoc/doclet/testSerializedForm/TestSerializedForm.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2001, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -63,9 +63,9 @@ public class TestSerializedForm extends JavadocTester {
"protected&nbsp;java.lang.Object&nbsp;readResolve()", "protected&nbsp;java.lang.Object&nbsp;readResolve()",
"protected&nbsp;java.lang.Object&nbsp;writeReplace()", "protected&nbsp;java.lang.Object&nbsp;writeReplace()",
"protected&nbsp;java.lang.Object&nbsp;readObjectNoData()", "protected&nbsp;java.lang.Object&nbsp;readObjectNoData()",
"<h3>Serialization Overview</h3>\n<ul class=\"blockList\">\n" "<h3>Serialization Overview</h3>\n<ul class=\"block-list\">\n"
+ "<li class=\"blockList\">\n<div class=\"block\">" + "<li class=\"block-list\">\n<div class=\"block\">"
+ "<span class=\"deprecatedLabel\">Deprecated.</span>&nbsp;</div>\n" + "<span class=\"deprecated-label\">Deprecated.</span>&nbsp;</div>\n"
+ "<dl>\n<dt><span class=\"seeLabel\">See Also:</span></dt>\n" + "<dl>\n<dt><span class=\"seeLabel\">See Also:</span></dt>\n"
+ "<dd><code>TestSerializedForm</code></dd>\n</dl>", + "<dd><code>TestSerializedForm</code></dd>\n</dl>",
"<h3>Class pkg1.NestedInnerClass.InnerClass.ProNestedInnerClass " "<h3>Class pkg1.NestedInnerClass.InnerClass.ProNestedInnerClass "
@ -88,13 +88,13 @@ public class TestSerializedForm extends JavadocTester {
checkOutput("serialized-form.html", true, checkOutput("serialized-form.html", true,
"<h3>Serialized Fields</h3>\n" + "<h3>Serialized Fields</h3>\n" +
"<ul class=\"blockList\">\n" + "<ul class=\"block-list\">\n" +
"<li class=\"blockList\">\n" + "<li class=\"block-list\">\n" +
"<h4>longs</h4>\n" + "<h4>longs</h4>\n" +
"<pre>Long[] longs</pre>\n" + "<pre>Long[] longs</pre>\n" +
"<div class=\"block\">the longs</div>\n" + "<div class=\"block\">the longs</div>\n" +
"</li>\n" + "</li>\n" +
"<li class=\"blockList\">\n" + "<li class=\"block-list\">\n" +
"<h4>name</h4>\n" + "<h4>name</h4>\n" +
"<pre>java.lang.String name</pre>\n" + "<pre>java.lang.String name</pre>\n" +
"<div class=\"block\">a test</div>"); "<div class=\"block\">a test</div>");
@ -132,13 +132,13 @@ public class TestSerializedForm extends JavadocTester {
checkOutput("serialized-form.html", true, checkOutput("serialized-form.html", true,
"<h4>Serialized Fields</h4>\n" + "<h4>Serialized Fields</h4>\n" +
"<ul class=\"blockList\">\n" + "<ul class=\"block-list\">\n" +
"<li class=\"blockList\">\n" + "<li class=\"block-list\">\n" +
"<h5>longs</h5>\n" + "<h5>longs</h5>\n" +
"<pre>Long[] longs</pre>\n" + "<pre>Long[] longs</pre>\n" +
"<div class=\"block\">the longs</div>\n" + "<div class=\"block\">the longs</div>\n" +
"</li>\n" + "</li>\n" +
"<li class=\"blockList\">\n" + "<li class=\"block-list\">\n" +
"<h5>name</h5>\n" + "<h5>name</h5>\n" +
"<pre>java.lang.String name</pre>\n" + "<pre>java.lang.String name</pre>\n" +
"<div class=\"block\">a test</div>"); "<div class=\"block\">a test</div>");

18
test/langtools/jdk/javadoc/doclet/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java
View file

@ -100,8 +100,8 @@ public class TestSerializedFormDeprecationInfo extends JavadocTester {
+ "<dd><a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + "<dd><a href=\"pkg1/C1.html#setUndecorated(boolean)\">"
+ "<code>C1.setUndecorated(boolean)</code></a></dd>\n" + "<code>C1.setUndecorated(boolean)</code></a></dd>\n"
+ "</dl>", + "</dl>",
"<span class=\"deprecatedLabel\">Deprecated.</span>\n" "<span class=\"deprecated-label\">Deprecated.</span>\n"
+ "<div class=\"deprecationComment\">As of JDK version 1.5, replaced by\n" + "<div class=\"deprecation-comment\">As of JDK version 1.5, replaced by\n"
+ " <a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + " <a href=\"pkg1/C1.html#setUndecorated(boolean)\">"
+ "<code>setUndecorated(boolean)</code></a>.</div>\n" + "<code>setUndecorated(boolean)</code></a>.</div>\n"
+ "</div>\n" + "</div>\n"
@ -116,8 +116,8 @@ public class TestSerializedFormDeprecationInfo extends JavadocTester {
+ "<dd><a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + "<dd><a href=\"pkg1/C1.html#setUndecorated(boolean)\">"
+ "<code>C1.setUndecorated(boolean)</code></a></dd>\n" + "<code>C1.setUndecorated(boolean)</code></a></dd>\n"
+ "</dl>", + "</dl>",
"<span class=\"deprecatedLabel\">Deprecated.</span>\n" "<span class=\"deprecated-label\">Deprecated.</span>\n"
+ "<div class=\"deprecationComment\">As of JDK version 1.5, replaced by\n" + "<div class=\"deprecation-comment\">As of JDK version 1.5, replaced by\n"
+ " <a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + " <a href=\"pkg1/C1.html#setUndecorated(boolean)\">"
+ "<code>setUndecorated(boolean)</code></a>.</div>\n" + "<code>setUndecorated(boolean)</code></a>.</div>\n"
+ "</div>\n" + "</div>\n"
@ -126,7 +126,7 @@ public class TestSerializedFormDeprecationInfo extends JavadocTester {
+ "<dt>Throws:</dt>\n" + "<dt>Throws:</dt>\n"
+ "<dd><code>java.io.IOException</code> - on error</dd>\n" + "<dd><code>java.io.IOException</code> - on error</dd>\n"
+ "</dl>", + "</dl>",
"<span class=\"deprecatedLabel\">Deprecated.</span>" "<span class=\"deprecated-label\">Deprecated.</span>"
+ "</div>\n" + "</div>\n"
+ "<div class=\"block\">" + "<div class=\"block\">"
+ "The name for this class.</div>"); + "The name for this class.</div>");
@ -138,16 +138,16 @@ public class TestSerializedFormDeprecationInfo extends JavadocTester {
void checkNoComment(boolean expectFound) { void checkNoComment(boolean expectFound) {
checkOutput("serialized-form.html", expectFound, checkOutput("serialized-form.html", expectFound,
"<pre>boolean undecorated</pre>\n" "<pre>boolean undecorated</pre>\n"
+ "<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated.</span>\n" + "<div class=\"deprecation-block\"><span class=\"deprecated-label\">Deprecated.</span>\n"
+ "<div class=\"deprecationComment\">" + "<div class=\"deprecation-comment\">"
+ "As of JDK version 1.5, replaced by\n" + "As of JDK version 1.5, replaced by\n"
+ " <a href=\"pkg1/C1.html#setUndecorated(boolean)\"><code>" + " <a href=\"pkg1/C1.html#setUndecorated(boolean)\"><code>"
+ "setUndecorated(boolean)</code></a>.</div>\n" + "setUndecorated(boolean)</code></a>.</div>\n"
+ "</div>\n" + "</div>\n"
+ "</li>", + "</li>",
"<span class=\"deprecatedLabel\">" "<span class=\"deprecated-label\">"
+ "Deprecated.</span>\n" + "Deprecated.</span>\n"
+ "<div class=\"deprecationComment\">As of JDK version" + "<div class=\"deprecation-comment\">As of JDK version"
+ " 1.5, replaced by\n" + " 1.5, replaced by\n"
+ " <a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + " <a href=\"pkg1/C1.html#setUndecorated(boolean)\">"
+ "<code>setUndecorated(boolean)</code></a>.</div>\n" + "<code>setUndecorated(boolean)</code></a>.</div>\n"

6
test/langtools/jdk/javadoc/doclet/testSerializedFormWithClassFile/TestSerializedFormWithClassFile.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -73,8 +73,8 @@ public class TestSerializedFormWithClassFile extends JavadocTester {
checkExit(Exit.OK); checkExit(Exit.OK);
checkOutput("serialized-form.html", true, checkOutput("serialized-form.html", true,
"<div class=\"memberSignature\"><span class=\"modifiers\">public</span>&nbsp;" "<div class=\"member-signature\"><span class=\"modifiers\">public</span>&nbsp;"
+ "<span class=\"returnType\">void</span>&nbsp;<span class=\"memberName\">readObject</span>" + "<span class=\"return-type\">void</span>&nbsp;<span class=\"member-name\">readObject</span>"
+ "&#8203;(<span class=\"arguments\">java.io.ObjectInputStream&nbsp;arg0)</span>\n" + "&#8203;(<span class=\"arguments\">java.io.ObjectInputStream&nbsp;arg0)</span>\n"
+ " throws <span class=\"exceptions\">java.lang.ClassNotFoundException,\n" + " throws <span class=\"exceptions\">java.lang.ClassNotFoundException,\n"
+ "java.io.IOException</span></div>\n"); + "java.io.IOException</span></div>\n");

92
test/langtools/jdk/javadoc/doclet/testStylesheet/TestStylesheet.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -75,10 +75,10 @@ public class TestStylesheet extends JavadocTester {
"ul {\n" "ul {\n"
+ " list-style-type:disc;\n" + " list-style-type:disc;\n"
+ "}", + "}",
".overviewSummary caption, .memberSummary caption, .typeSummary caption,\n" ".overview-summary caption, .member-summary caption, .type-summary caption,\n"
+ ".useSummary caption, .constantsSummary caption, .deprecatedSummary caption,\n" + ".use-summary caption, .constants-summary caption, .deprecated-summary caption,\n"
+ ".requiresSummary caption, .packagesSummary caption, .providesSummary caption,\n" + ".requires-summary caption, .packages-summary caption, .provides-summary caption,\n"
+ ".usesSummary caption, .systemPropertiesSummary caption {\n" + ".uses-summary caption, .system-properties-summary caption {\n"
+ " position:relative;\n" + " position:relative;\n"
+ " text-align:left;\n" + " text-align:left;\n"
+ " background-repeat:no-repeat;\n" + " background-repeat:no-repeat;\n"
@ -92,10 +92,10 @@ public class TestStylesheet extends JavadocTester {
+ " margin:0px;\n" + " margin:0px;\n"
+ " white-space:pre;\n" + " white-space:pre;\n"
+ "}", + "}",
".overviewSummary caption span, .memberSummary caption span, .typeSummary caption span,\n" ".overview-summary caption span, .member-summary caption span, .type-summary caption span,\n"
+ ".useSummary caption span, .constantsSummary caption span, .deprecatedSummary caption span,\n" + ".use-summary caption span, .constants-summary caption span, .deprecated-summary caption span,\n"
+ ".requiresSummary caption span, .packagesSummary caption span, .providesSummary caption span,\n" + ".requires-summary caption span, .packages-summary caption span, .provides-summary caption span,\n"
+ ".usesSummary caption span, .systemPropertiesSummary caption span {\n" + ".uses-summary caption span, .system-properties-summary caption span {\n"
+ " white-space:nowrap;\n" + " white-space:nowrap;\n"
+ " padding-top:5px;\n" + " padding-top:5px;\n"
+ " padding-left:12px;\n" + " padding-left:12px;\n"
@ -107,62 +107,62 @@ public class TestStylesheet extends JavadocTester {
+ " border: none;\n" + " border: none;\n"
+ " height:16px;\n" + " height:16px;\n"
+ "}", + "}",
".overviewSummary [role=tablist] button, .memberSummary [role=tablist] button,\n" ".overview-summary [role=tablist] button, .member-summary [role=tablist] button,\n"
+ ".typeSummary [role=tablist] button, .packagesSummary [role=tablist] button {\n" + ".type-summary [role=tablist] button, .packages-summary [role=tablist] button {\n"
+ " border: none;\n" + " border: none;\n"
+ " cursor: pointer;\n" + " cursor: pointer;\n"
+ " padding: 5px 12px 7px 12px;\n" + " padding: 5px 12px 7px 12px;\n"
+ " font-weight: bold;\n" + " font-weight: bold;\n"
+ " margin-right: 3px;\n" + " margin-right: 3px;\n"
+ "}", + "}",
".overviewSummary [role=tablist] .activeTableTab, .memberSummary [role=tablist] .activeTableTab,\n" ".overview-summary [role=tablist] .active-table-tab, .member-summary [role=tablist] .active-table-tab,\n"
+ ".typeSummary [role=tablist] .activeTableTab, .packagesSummary [role=tablist] .activeTableTab {\n" + ".type-summary [role=tablist] .active-table-tab, .packages-summary [role=tablist] .active-table-tab {\n"
+ " background: #F8981D;\n" + " background: #F8981D;\n"
+ " color: #253441;\n" + " color: #253441;\n"
+ "}", + "}",
".overviewSummary [role=tablist] .tableTab, .memberSummary [role=tablist] .tableTab,\n" ".overview-summary [role=tablist] .table-tab, .member-summary [role=tablist] .table-tab,\n"
+ ".typeSummary [role=tablist] .tableTab, .packagesSummary [role=tablist] .tableTab {\n" + ".type-summary [role=tablist] .table-tab, .packages-summary [role=tablist] .table-tab {\n"
+ " background: #4D7A97;\n" + " background: #4D7A97;\n"
+ " color: #FFFFFF;\n" + " color: #FFFFFF;\n"
+ "}", + "}",
// Test the formatting styles for proper content display in use and constant values pages. // Test the formatting styles for proper content display in use and constant values pages.
".overviewSummary td.colFirst, .overviewSummary th.colFirst,\n" ".overview-summary td.col-first, .overview-summary th.col-first,\n"
+ ".requiresSummary td.colFirst, .requiresSummary th.colFirst,\n" + ".requires-summary td.col-first, .requires-summary th.col-first,\n"
+ ".packagesSummary td.colFirst, .packagesSummary td.colSecond, .packagesSummary th.colFirst, .packagesSummary th,\n" + ".packages-summary td.col-first, .packages-summary td.col-second, .packages-summary th.col-first, .packages-summary th,\n"
+ ".usesSummary td.colFirst, .usesSummary th.colFirst,\n" + ".uses-summary td.col-first, .uses-summary th.col-first,\n"
+ ".providesSummary td.colFirst, .providesSummary th.colFirst,\n" + ".provides-summary td.col-first, .provides-summary th.col-first,\n"
+ ".memberSummary td.colFirst, .memberSummary th.colFirst,\n" + ".member-summary td.col-first, .member-summary th.col-first,\n"
+ ".memberSummary td.colSecond, .memberSummary th.colSecond, .memberSummary th.colConstructorName,\n" + ".member-summary td.col-second, .member-summary th.col-second, .member-summary th.col-constructor-name,\n"
+ ".typeSummary td.colFirst, .typeSummary th.colFirst {\n" + ".type-summary td.col-first, .type-summary th.col-first {\n"
+ " vertical-align:top;\n" + " vertical-align:top;\n"
+ "}", + "}",
".overviewSummary td, .memberSummary td, .typeSummary td,\n" ".overview-summary td, .member-summary td, .type-summary td,\n"
+ ".useSummary td, .constantsSummary td, .deprecatedSummary td,\n" + ".use-summary td, .constants-summary td, .deprecated-summary td,\n"
+ ".requiresSummary td, .packagesSummary td, .providesSummary td,\n" + ".requires-summary td, .packages-summary td, .provides-summary td,\n"
+ ".usesSummary td, .systemPropertiesSummary td {\n" + ".uses-summary td, .system-properties-summary td {\n"
+ " text-align:left;\n" + " text-align:left;\n"
+ " padding:0px 0px 12px 10px;\n" + " padding:0px 0px 12px 10px;\n"
+ "}", + "}",
"@import url('resources/fonts/dejavu.css');", "@import url('resources/fonts/dejavu.css');",
".searchTagResult:target {\n" ".search-tag-result:target {\n"
+ " background-color:yellow;\n" + " background-color:yellow;\n"
+ "}", + "}",
"a[href]:hover, a[href]:focus {\n" "a[href]:hover, a[href]:focus {\n"
+ " text-decoration:none;\n" + " text-decoration:none;\n"
+ " color:#bb7a2a;\n" + " color:#bb7a2a;\n"
+ "}", + "}",
"td.colFirst a:link, td.colFirst a:visited,\n" "td.col-first a:link, td.col-first a:visited,\n"
+ "td.colSecond a:link, td.colSecond a:visited,\n" + "td.col-second a:link, td.col-second a:visited,\n"
+ "th.colFirst a:link, th.colFirst a:visited,\n" + "th.col-first a:link, th.col-first a:visited,\n"
+ "th.colSecond a:link, th.colSecond a:visited,\n" + "th.col-second a:link, th.col-second a:visited,\n"
+ "th.colConstructorName a:link, th.colConstructorName a:visited,\n" + "th.col-constructor-name a:link, th.col-constructor-name a:visited,\n"
+ "th.colDeprecatedItemName a:link, th.colDeprecatedItemName a:visited,\n" + "th.col-deprecated-item-name a:link, th.col-deprecated-item-name a:visited,\n"
+ ".constantValuesContainer td a:link, .constantValuesContainer td a:visited,\n" + ".constant-values-container td a:link, .constant-values-container td a:visited,\n"
+ ".allClassesContainer td a:link, .allClassesContainer td a:visited,\n" + ".all-classes-container td a:link, .all-classes-container td a:visited,\n"
+ ".allPackagesContainer td a:link, .allPackagesContainer td a:visited {\n" + ".all-packages-container td a:link, .all-packages-container td a:visited {\n"
+ " font-weight:bold;\n" + " font-weight:bold;\n"
+ "}", + "}",
".deprecationBlock {\n" ".deprecation-block {\n"
+ " font-size:14px;\n" + " font-size:14px;\n"
+ " font-family:'DejaVu Serif', Georgia, \"Times New Roman\", Times, serif;\n" + " font-family:'DejaVu Serif', Georgia, \"Times New Roman\", Times, serif;\n"
+ " border-style:solid;\n" + " border-style:solid;\n"
@ -201,7 +201,7 @@ public class TestStylesheet extends JavadocTester {
+ " an <a id=\"named_anchor1\">anchor_with_id</a>.</div>"); + " an <a id=\"named_anchor1\">anchor_with_id</a>.</div>");
checkOutput("pkg/package-summary.html", true, checkOutput("pkg/package-summary.html", true,
"<td class=\"colLast\">\n" "<td class=\"col-last\">\n"
+ "<div class=\"block\">Test comment for a class which has an <a name=\"named_anchor\">" + "<div class=\"block\">Test comment for a class which has an <a name=\"named_anchor\">"
+ "anchor_with_name</a> and\n" + "anchor_with_name</a> and\n"
+ " an <a id=\"named_anchor1\">anchor_with_id</a>.</div>\n" + " an <a id=\"named_anchor1\">anchor_with_id</a>.</div>\n"
@ -223,13 +223,13 @@ public class TestStylesheet extends JavadocTester {
+ " text-decoration:none;\n" + " text-decoration:none;\n"
+ " color:#353833;\n" + " color:#353833;\n"
+ "}", + "}",
"td.colFirst a:link, td.colFirst a:visited,\n" "td.col-first a:link, td.col-first a:visited,\n"
+ "td.colSecond a:link, td.colSecond a:visited,\n" + "td.col-second a:link, td.col-second a:visited,\n"
+ "th.colFirst a:link, th.colFirst a:visited,\n" + "th.col-first a:link, th.col-first a:visited,\n"
+ "th.colSecond a:link, th.colSecond a:visited,\n" + "th.col-second a:link, th.col-second a:visited,\n"
+ "th.colConstructorName a:link, th.colConstructorName a:visited,\n" + "th.col-constructor-name a:link, th.col-constructor-name a:visited,\n"
+ "td.colLast a:link, td.colLast a:visited,\n" + "td.col-last a:link, td.col-last a:visited,\n"
+ ".constantValuesContainer td a:link, .constantValuesContainer td a:visited {\n" + ".constant-values-container td a:link, .constant-values-container td a:visited {\n"
+ " font-weight:bold;\n" + " font-weight:bold;\n"
+ "}"); + "}");
} }

8
test/langtools/jdk/javadoc/doclet/testSubTitle/TestSubTitle.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -51,16 +51,16 @@ public class TestSubTitle extends JavadocTester {
"<div class=\"block\">This is the description of package pkg.</div>"); "<div class=\"block\">This is the description of package pkg.</div>");
checkOutput("pkg/C.html", true, checkOutput("pkg/C.html", true,
"<div class=\"subTitle\"><span class=\"packageLabelInType\">" + "<div class=\"sub-title\"><span class=\"package-label-in-type\">" +
"Package</span>&nbsp;<a href=\"package-summary.html\">pkg</a></div>"); "Package</span>&nbsp;<a href=\"package-summary.html\">pkg</a></div>");
checkOutput("pkg/package-summary.html", false, checkOutput("pkg/package-summary.html", false,
"<p class=\"subTitle\">\n" + "<p class=\"sub-title\">\n" +
"<div class=\"block\">This is the " + "<div class=\"block\">This is the " +
"description of package pkg.</div>\n" + "description of package pkg.</div>\n" +
"</p>"); "</p>");
checkOutput("pkg/C.html", false, checkOutput("pkg/C.html", false,
"<p class=\"subTitle\">pkg</p>"); "<p class=\"sub-title\">pkg</p>");
} }
} }

16
test/langtools/jdk/javadoc/doclet/testSummaryTag/TestSummaryTag.java
View file

@ -49,32 +49,32 @@ public class TestSummaryTag extends JavadocTester {
checkOutput("index-all.html", true, checkOutput("index-all.html", true,
"<dl class=\"index\">\n" "<dl class=\"index\">\n"
+ "<dt><span class=\"memberNameLink\"><a href=\"p1/A.html#m()\">m()" + "<dt><span class=\"member-name-link\"><a href=\"p1/A.html#m()\">m()"
+ "</a></span> - Method in class p1.<a href=\"p1/A.html\" title=\"class in p1\">A</a></dt>\n" + "</a></span> - Method in class p1.<a href=\"p1/A.html\" title=\"class in p1\">A</a></dt>\n"
+ "<dd>\n" + "<dd>\n"
+ "<div class=\"block\">First sentence</div>\n" + "<div class=\"block\">First sentence</div>\n"
+ "</dd>\n" + "</dd>\n"
+ "<dt><span class=\"memberNameLink\"><a href=\"p1/B.html#m()\">m()" + "<dt><span class=\"member-name-link\"><a href=\"p1/B.html#m()\">m()"
+ "</a></span> - Method in class p1.<a href=\"p1/B.html\" title=\"class in p1\">B</a></dt>\n" + "</a></span> - Method in class p1.<a href=\"p1/B.html\" title=\"class in p1\">B</a></dt>\n"
+ "<dd>\n" + "<dd>\n"
+ "<div class=\"block\">First sentence</div>\n" + "<div class=\"block\">First sentence</div>\n"
+ "</dd>\n" + "</dd>\n"
+ "<dt><span class=\"memberNameLink\"><a href=\"p1/A.html#m1()\">m1()" + "<dt><span class=\"member-name-link\"><a href=\"p1/A.html#m1()\">m1()"
+ "</a></span> - Method in class p1.<a href=\"p1/A.html\" title=\"class in p1\">A</a></dt>\n" + "</a></span> - Method in class p1.<a href=\"p1/A.html\" title=\"class in p1\">A</a></dt>\n"
+ "<dd>\n" + "<dd>\n"
+ "<div class=\"block\"> First sentence </div>\n" + "<div class=\"block\"> First sentence </div>\n"
+ "</dd>\n" + "</dd>\n"
+ "<dt><span class=\"memberNameLink\"><a href=\"p1/A.html#m2()\">m2()" + "<dt><span class=\"member-name-link\"><a href=\"p1/A.html#m2()\">m2()"
+ "</a></span> - Method in class p1.<a href=\"p1/A.html\" title=\"class in p1\">A</a></dt>\n" + "</a></span> - Method in class p1.<a href=\"p1/A.html\" title=\"class in p1\">A</a></dt>\n"
+ "<dd>\n" + "<dd>\n"
+ "<div class=\"block\">Some html &lt;foo&gt; &nbsp; codes</div>\n" + "<div class=\"block\">Some html &lt;foo&gt; &nbsp; codes</div>\n"
+ "</dd>\n" + "</dd>\n"
+ "<dt><span class=\"memberNameLink\"><a href=\"p1/A.html#m3()\">m3()" + "<dt><span class=\"member-name-link\"><a href=\"p1/A.html#m3()\">m3()"
+ "</a></span> - Method in class p1.<a href=\"p1/A.html\" title=\"class in p1\">A</a></dt>\n" + "</a></span> - Method in class p1.<a href=\"p1/A.html\" title=\"class in p1\">A</a></dt>\n"
+ "<dd>\n" + "<dd>\n"
+ "<div class=\"block\">First sentence </div>\n" + "<div class=\"block\">First sentence </div>\n"
+ "</dd>\n" + "</dd>\n"
+ "<dt><span class=\"memberNameLink\"><a href=\"p1/A.html#m4()\">m4()" + "<dt><span class=\"member-name-link\"><a href=\"p1/A.html#m4()\">m4()"
+ "</a></span> - Method in class p1.<a href=\"p1/A.html\" title=\"class in p1\">A</a></dt>\n" + "</a></span> - Method in class p1.<a href=\"p1/A.html\" title=\"class in p1\">A</a></dt>\n"
+ "<dd>\n" + "<dd>\n"
+ "<div class=\"block\">First sentence i.e. the first sentence</div>\n" + "<div class=\"block\">First sentence i.e. the first sentence</div>\n"
@ -87,8 +87,8 @@ public class TestSummaryTag extends JavadocTester {
checkOutput("p1/A.html", true, checkOutput("p1/A.html", true,
"<section class=\"detail\" id=\"m3()\">\n" "<section class=\"detail\" id=\"m3()\">\n"
+ "<h3>m3</h3>\n" + "<h3>m3</h3>\n"
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public</span>&nbsp;" + "<div class=\"member-signature\"><span class=\"modifiers\">public</span>&nbsp;"
+ "<span class=\"returnType\">void</span>&nbsp;<span class=\"memberName\">m3</span>()</div>\n" + "<span class=\"return-type\">void</span>&nbsp;<span class=\"member-name\">m3</span>()</div>\n"
+ "<div class=\"block\">First sentence some text maybe second sentence.</div>\n" + "<div class=\"block\">First sentence some text maybe second sentence.</div>\n"
+ "</section>\n" + "</section>\n"
); );

18
test/langtools/jdk/javadoc/doclet/testSystemPropertyPage/TestSystemPropertyPage.java
View file

@ -66,25 +66,25 @@ public class TestSystemPropertyPage extends JavadocTester {
checkOutput("system-properties.html", true, checkOutput("system-properties.html", true,
"<table>\n" + "<table>\n" +
"<caption><span>System Properties Summary</span><span class=\"tabEnd\">&nbsp;</span></caption>\n" + "<caption><span>System Properties Summary</span><span class=\"tab-end\">&nbsp;</span></caption>\n" +
"<thead>\n" + "<thead>\n" +
"<tr>\n" + "<tr>\n" +
"<th class=\"colFirst\" scope=\"col\">Property</th>\n" + "<th class=\"col-first\" scope=\"col\">Property</th>\n" +
"<th class=\"colLast\" scope=\"col\">Referenced In</th>\n" + "<th class=\"col-last\" scope=\"col\">Referenced In</th>\n" +
"</tr>\n" + "</tr>\n" +
"</thead>\n" + "</thead>\n" +
"<tbody>\n" + "<tbody>\n" +
"<tr class=\"altColor\">\n" + "<tr class=\"alt-color\">\n" +
"<th class=\"colFirst\" scope=\"row\">user.address</th>\n" + "<th class=\"col-first\" scope=\"row\">user.address</th>\n" +
"<td class=\"colLast\">\n" + "<td class=\"col-last\">\n" +
"<div class=\"block\">" + "<div class=\"block\">" +
"<code><a href=\"pkg2/B.html#user.address\">class pkg2.B</a></code>" + "<code><a href=\"pkg2/B.html#user.address\">class pkg2.B</a></code>" +
", <a href=\"pkg1/doc-files/WithTitle.html#user.address\"><code>package pkg1: </code>Example Title</a></div>\n" + ", <a href=\"pkg1/doc-files/WithTitle.html#user.address\"><code>package pkg1: </code>Example Title</a></div>\n" +
"</td>\n" + "</td>\n" +
"</tr>\n" + "</tr>\n" +
"<tr class=\"rowColor\">\n" + "<tr class=\"row-color\">\n" +
"<th class=\"colFirst\" scope=\"row\">user.name</th>\n" + "<th class=\"col-first\" scope=\"row\">user.name</th>\n" +
"<td class=\"colLast\">\n" + "<td class=\"col-last\">\n" +
"<div class=\"block\">" + "<div class=\"block\">" +
"<a href=\"index.html#user.name\">Overview</a>" + "<a href=\"index.html#user.name\">Overview</a>" +
", <code><a href=\"pkg1/A.html#user.name\">class pkg1.A</a></code>" + ", <code><a href=\"pkg1/A.html#user.name\">class pkg1.A</a></code>" +

82
test/langtools/jdk/javadoc/doclet/testSystemPropertyTaglet/TestSystemPropertyTaglet.java
View file

@ -63,108 +63,108 @@ public class TestSystemPropertyTaglet extends JavadocTester {
checkOrder("mymodule/mypackage/MyAnnotation.html", checkOrder("mymodule/mypackage/MyAnnotation.html",
"<h1 title=\"Annotation Type MyAnnotation\" class=\"title\">Annotation Type MyAnnotation</h1>", "<h1 title=\"Annotation Type MyAnnotation\" class=\"title\">Annotation Type MyAnnotation</h1>",
"(annotation) the <code><span id=\"test.property\" class=\"searchTagResult\">test.property</span></code> system property.", "(annotation) the <code><span id=\"test.property\" class=\"search-tag-result\">test.property</span></code> system property.",
"<h2>Element Details</h2>", "<h2>Element Details</h2>",
"(annotation/method) the <code><span id=\"test.property-1\" class=\"searchTagResult\">test.property</span></code> system property.", "(annotation/method) the <code><span id=\"test.property-1\" class=\"search-tag-result\">test.property</span></code> system property.",
""); "");
checkOrder("mymodule/mypackage/MyClass.html", checkOrder("mymodule/mypackage/MyClass.html",
"<h1 title=\"Class MyClass\" class=\"title\">Class MyClass</h1>", "<h1 title=\"Class MyClass\" class=\"title\">Class MyClass</h1>",
"(class) the <code><span id=\"test.property\" class=\"searchTagResult\">test.property</span></code> system property.", "(class) the <code><span id=\"test.property\" class=\"search-tag-result\">test.property</span></code> system property.",
"<h2>Field Details</h2>", "<h2>Field Details</h2>",
"(class/field) the <code><span id=\"test.property-1\" class=\"searchTagResult\">test.property</span></code> system property.", "(class/field) the <code><span id=\"test.property-1\" class=\"search-tag-result\">test.property</span></code> system property.",
"(class/static-field) the <code><span id=\"test.property-2\" class=\"searchTagResult\">test.property</span></code> system property.", "(class/static-field) the <code><span id=\"test.property-2\" class=\"search-tag-result\">test.property</span></code> system property.",
"<h2>Constructor Details</h2>", "<h2>Constructor Details</h2>",
"(class/constructor) the <code><span id=\"test.property-3\" class=\"searchTagResult\">test.property</span></code> system property.", "(class/constructor) the <code><span id=\"test.property-3\" class=\"search-tag-result\">test.property</span></code> system property.",
"<h2>Method Details</h2>", "<h2>Method Details</h2>",
"(class/static-method) the <code><span id=\"test.property-4\" class=\"searchTagResult\">test.property</span></code> system property.", "(class/static-method) the <code><span id=\"test.property-4\" class=\"search-tag-result\">test.property</span></code> system property.",
"(class/method) the <code><span id=\"test.property-5\" class=\"searchTagResult\">test.property</span></code> system property.", "(class/method) the <code><span id=\"test.property-5\" class=\"search-tag-result\">test.property</span></code> system property.",
""); "");
checkOrder("mymodule/mypackage/MyEnum.html", checkOrder("mymodule/mypackage/MyEnum.html",
"<h1 title=\"Enum MyEnum\" class=\"title\">Enum MyEnum</h1>", "<h1 title=\"Enum MyEnum\" class=\"title\">Enum MyEnum</h1>",
"(enum) the <code><span id=\"test.property\" class=\"searchTagResult\">test.property</span></code> system property.", "(enum) the <code><span id=\"test.property\" class=\"search-tag-result\">test.property</span></code> system property.",
"<h2>Enum Constant Details</h2>", "<h2>Enum Constant Details</h2>",
"(enum/constant) the <code><span id=\"test.property-1\" class=\"searchTagResult\">test.property</span></code> system property.", "(enum/constant) the <code><span id=\"test.property-1\" class=\"search-tag-result\">test.property</span></code> system property.",
""); "");
checkOrder("mymodule/mypackage/MyError.html", checkOrder("mymodule/mypackage/MyError.html",
"<h1 title=\"Class MyError\" class=\"title\">Class MyError</h1>", "<h1 title=\"Class MyError\" class=\"title\">Class MyError</h1>",
"(error) the <code><span id=\"test.property\" class=\"searchTagResult\">test.property</span></code> system property.", "(error) the <code><span id=\"test.property\" class=\"search-tag-result\">test.property</span></code> system property.",
"<h2>Constructor Details</h2>", "<h2>Constructor Details</h2>",
"(error/constructor) the <code><span id=\"test.property-1\" class=\"searchTagResult\">test.property</span></code> system property.", "(error/constructor) the <code><span id=\"test.property-1\" class=\"search-tag-result\">test.property</span></code> system property.",
""); "");
checkOrder("mymodule/mypackage/MyException.html", checkOrder("mymodule/mypackage/MyException.html",
"<h1 title=\"Class MyException\" class=\"title\">Class MyException</h1>", "<h1 title=\"Class MyException\" class=\"title\">Class MyException</h1>",
"(exception) the <code><span id=\"test.property\" class=\"searchTagResult\">test.property</span></code> system property.", "(exception) the <code><span id=\"test.property\" class=\"search-tag-result\">test.property</span></code> system property.",
"<h2>Constructor Details</h2>", "<h2>Constructor Details</h2>",
"(exception/constructor) the <code><span id=\"test.property-1\" class=\"searchTagResult\">test.property</span></code>", "(exception/constructor) the <code><span id=\"test.property-1\" class=\"search-tag-result\">test.property</span></code>",
""); "");
checkOrder("mymodule/mypackage/MyInterface.html", checkOrder("mymodule/mypackage/MyInterface.html",
"<h1 title=\"Interface MyInterface\" class=\"title\">Interface MyInterface</h1>", "<h1 title=\"Interface MyInterface\" class=\"title\">Interface MyInterface</h1>",
"(interface) the <code><span id=\"test.property\" class=\"searchTagResult\">test.property</span></code> system property.", "(interface) the <code><span id=\"test.property\" class=\"search-tag-result\">test.property</span></code> system property.",
"<h2>Field Details</h2>", "<h2>Field Details</h2>",
"(interface/constant) the <code><span id=\"test.property-1\" class=\"searchTagResult\">test.property</span></code> system property.", "(interface/constant) the <code><span id=\"test.property-1\" class=\"search-tag-result\">test.property</span></code> system property.",
"<h2>Method Details</h2>", "<h2>Method Details</h2>",
"(interface/method-1) the <code><span id=\"test.property-2\" class=\"searchTagResult\">test.property</span></code> system property.", "(interface/method-1) the <code><span id=\"test.property-2\" class=\"search-tag-result\">test.property</span></code> system property.",
"(interface/method-2) the <code><span id=\"test.property-3\" class=\"searchTagResult\">test.property</span></code> system property.", "(interface/method-2) the <code><span id=\"test.property-3\" class=\"search-tag-result\">test.property</span></code> system property.",
""); "");
checkOrder("mymodule/module-summary.html", checkOrder("mymodule/module-summary.html",
"<h1 title=\"Module\" class=\"title\">Module&nbsp;mymodule</h1>", "<h1 title=\"Module\" class=\"title\">Module&nbsp;mymodule</h1>",
"(module) the <code><span id=\"test.property\" class=\"searchTagResult\">test.property</span></code> system property.", "(module) the <code><span id=\"test.property\" class=\"search-tag-result\">test.property</span></code> system property.",
""); "");
checkOrder("mymodule/mypackage/package-summary.html", checkOrder("mymodule/mypackage/package-summary.html",
"<h1 title=\"Package\" class=\"title\">Package&nbsp;mypackage</h1>", "<h1 title=\"Package\" class=\"title\">Package&nbsp;mypackage</h1>",
"(package) the <code><span id=\"test.property\" class=\"searchTagResult\">test.property</span></code> system property.", "(package) the <code><span id=\"test.property\" class=\"search-tag-result\">test.property</span></code> system property.",
""); "");
checkOrder("index-all.html", checkOrder("index-all.html",
"<h2 class=\"title\" id=\"I:T\">T</h2>", "<h2 class=\"title\" id=\"I:T\">T</h2>",
"<dt><span class=\"searchTagLink\"><a href=\"mymodule/mypackage/MyAnnotation.html#test.property\">test.property</a></span>" + "<dt><span class=\"search-tag-link\"><a href=\"mymodule/mypackage/MyAnnotation.html#test.property\">test.property</a></span>" +
" - Search tag in annotation type mypackage.MyAnnotation</dt>\n<dd>System Property</dd>", " - Search tag in annotation type mypackage.MyAnnotation</dt>\n<dd>System Property</dd>",
"<dt><span class=\"searchTagLink\"><a href=\"mymodule/mypackage/MyClass.html#test.property\">test.property</a></span>" + "<dt><span class=\"search-tag-link\"><a href=\"mymodule/mypackage/MyClass.html#test.property\">test.property</a></span>" +
" - Search tag in class mypackage.MyClass</dt>\n<dd>System Property</dd>", " - Search tag in class mypackage.MyClass</dt>\n<dd>System Property</dd>",
"<dt><span class=\"searchTagLink\"><a href=\"mymodule/mypackage/MyEnum.html#test.property\">test.property</a></span>" + "<dt><span class=\"search-tag-link\"><a href=\"mymodule/mypackage/MyEnum.html#test.property\">test.property</a></span>" +
" - Search tag in enum mypackage.MyEnum</dt>\n<dd>System Property</dd>", " - Search tag in enum mypackage.MyEnum</dt>\n<dd>System Property</dd>",
"<dt><span class=\"searchTagLink\"><a href=\"mymodule/mypackage/MyError.html#test.property\">test.property</a></span>" + "<dt><span class=\"search-tag-link\"><a href=\"mymodule/mypackage/MyError.html#test.property\">test.property</a></span>" +
" - Search tag in error mypackage.MyError</dt>\n<dd>System Property</dd>", " - Search tag in error mypackage.MyError</dt>\n<dd>System Property</dd>",
"<dt><span class=\"searchTagLink\"><a href=\"mymodule/mypackage/MyException.html#test.property\">test.property</a></span>" + "<dt><span class=\"search-tag-link\"><a href=\"mymodule/mypackage/MyException.html#test.property\">test.property</a></span>" +
" - Search tag in exception mypackage.MyException</dt>\n<dd>System Property</dd>", " - Search tag in exception mypackage.MyException</dt>\n<dd>System Property</dd>",
"<dt><span class=\"searchTagLink\"><a href=\"mymodule/mypackage/MyInterface.html#test.property\">test.property</a></span>" + "<dt><span class=\"search-tag-link\"><a href=\"mymodule/mypackage/MyInterface.html#test.property\">test.property</a></span>" +
" - Search tag in interface mypackage.MyInterface</dt>\n<dd>System Property</dd>", " - Search tag in interface mypackage.MyInterface</dt>\n<dd>System Property</dd>",
"<dt><span class=\"searchTagLink\"><a href=\"mymodule/module-summary.html#test.property\">test.property</a></span>" + "<dt><span class=\"search-tag-link\"><a href=\"mymodule/module-summary.html#test.property\">test.property</a></span>" +
" - Search tag in module mymodule</dt>\n<dd>System Property</dd>", " - Search tag in module mymodule</dt>\n<dd>System Property</dd>",
"<dt><span class=\"searchTagLink\"><a href=\"mymodule/mypackage/MyAnnotation.html#test.property-1\">test.property</a></span>" + "<dt><span class=\"search-tag-link\"><a href=\"mymodule/mypackage/MyAnnotation.html#test.property-1\">test.property</a></span>" +
" - Search tag in mypackage.MyAnnotation.value()</dt>\n<dd>System Property</dd>", " - Search tag in mypackage.MyAnnotation.value()</dt>\n<dd>System Property</dd>",
"<dt><span class=\"searchTagLink\"><a href=\"mymodule/mypackage/MyClass.html#test.property-2\">test.property</a></span>" + "<dt><span class=\"search-tag-link\"><a href=\"mymodule/mypackage/MyClass.html#test.property-2\">test.property</a></span>" +
" - Search tag in mypackage.MyClass.INT_CONSTANT</dt>\n<dd>System Property</dd>", " - Search tag in mypackage.MyClass.INT_CONSTANT</dt>\n<dd>System Property</dd>",
"<dt><span class=\"searchTagLink\"><a href=\"mymodule/mypackage/MyClass.html#test.property-3\">test.property</a></span>" + "<dt><span class=\"search-tag-link\"><a href=\"mymodule/mypackage/MyClass.html#test.property-3\">test.property</a></span>" +
" - Search tag in mypackage.MyClass.MyClass()</dt>\n<dd>System Property</dd>", " - Search tag in mypackage.MyClass.MyClass()</dt>\n<dd>System Property</dd>",
"<dt><span class=\"searchTagLink\"><a href=\"mymodule/mypackage/MyClass.html#test.property-1\">test.property</a></span>" + "<dt><span class=\"search-tag-link\"><a href=\"mymodule/mypackage/MyClass.html#test.property-1\">test.property</a></span>" +
" - Search tag in mypackage.MyClass.intField</dt>\n<dd>System Property</dd>", " - Search tag in mypackage.MyClass.intField</dt>\n<dd>System Property</dd>",
"<dt><span class=\"searchTagLink\"><a href=\"mymodule/mypackage/MyClass.html#test.property-5\">test.property</a></span>" + "<dt><span class=\"search-tag-link\"><a href=\"mymodule/mypackage/MyClass.html#test.property-5\">test.property</a></span>" +
" - Search tag in mypackage.MyClass.run()</dt>\n<dd>System Property</dd>", " - Search tag in mypackage.MyClass.run()</dt>\n<dd>System Property</dd>",
"<dt><span class=\"searchTagLink\"><a href=\"mymodule/mypackage/MyClass.html#test.property-4\">test.property</a></span>" + "<dt><span class=\"search-tag-link\"><a href=\"mymodule/mypackage/MyClass.html#test.property-4\">test.property</a></span>" +
" - Search tag in mypackage.MyClass.value()</dt>\n<dd>System Property</dd>", " - Search tag in mypackage.MyClass.value()</dt>\n<dd>System Property</dd>",
"<dt><span class=\"searchTagLink\"><a href=\"mymodule/mypackage/MyEnum.html#test.property-1\">test.property</a></span>" + "<dt><span class=\"search-tag-link\"><a href=\"mymodule/mypackage/MyEnum.html#test.property-1\">test.property</a></span>" +
" - Search tag in mypackage.MyEnum.X</dt>\n<dd>System Property</dd>", " - Search tag in mypackage.MyEnum.X</dt>\n<dd>System Property</dd>",
"<dt><span class=\"searchTagLink\"><a href=\"mymodule/mypackage/MyEnum.html#test.property-2\">test.property</a></span>" + "<dt><span class=\"search-tag-link\"><a href=\"mymodule/mypackage/MyEnum.html#test.property-2\">test.property</a></span>" +
" - Search tag in mypackage.MyEnum.m()</dt>\n<dd>System Property</dd>", " - Search tag in mypackage.MyEnum.m()</dt>\n<dd>System Property</dd>",
"<dt><span class=\"searchTagLink\"><a href=\"mymodule/mypackage/MyError.html#test.property-1\">test.property</a></span>" + "<dt><span class=\"search-tag-link\"><a href=\"mymodule/mypackage/MyError.html#test.property-1\">test.property</a></span>" +
" - Search tag in mypackage.MyError.MyError()</dt>\n<dd>System Property</dd>", " - Search tag in mypackage.MyError.MyError()</dt>\n<dd>System Property</dd>",
"<dt><span class=\"searchTagLink\"><a href=\"mymodule/mypackage/MyException.html#test.property-1\">test.property</a></span>" + "<dt><span class=\"search-tag-link\"><a href=\"mymodule/mypackage/MyException.html#test.property-1\">test.property</a></span>" +
" - Search tag in mypackage.MyException.MyException()</dt>\n<dd>System Property</dd>", " - Search tag in mypackage.MyException.MyException()</dt>\n<dd>System Property</dd>",
"<dt><span class=\"searchTagLink\"><a href=\"mymodule/mypackage/MyInterface.html#test.property-1\">test.property</a></span>" + "<dt><span class=\"search-tag-link\"><a href=\"mymodule/mypackage/MyInterface.html#test.property-1\">test.property</a></span>" +
" - Search tag in mypackage.MyInterface.INT_CONSTANT</dt>\n<dd>System Property</dd>", " - Search tag in mypackage.MyInterface.INT_CONSTANT</dt>\n<dd>System Property</dd>",
"<dt><span class=\"searchTagLink\"><a href=\"mymodule/mypackage/MyInterface.html#test.property-2\">test.property</a></span>" + "<dt><span class=\"search-tag-link\"><a href=\"mymodule/mypackage/MyInterface.html#test.property-2\">test.property</a></span>" +
" - Search tag in mypackage.MyInterface.m()</dt>\n<dd>System Property</dd>", " - Search tag in mypackage.MyInterface.m()</dt>\n<dd>System Property</dd>",
"<dt><span class=\"searchTagLink\"><a href=\"mymodule/mypackage/MyInterface.html#test.property-3\">test.property</a></span>" + "<dt><span class=\"search-tag-link\"><a href=\"mymodule/mypackage/MyInterface.html#test.property-3\">test.property</a></span>" +
" - Search tag in mypackage.MyInterface.m(String...)</dt>\n<dd>System Property</dd>", " - Search tag in mypackage.MyInterface.m(String...)</dt>\n<dd>System Property</dd>",
"<dt><span class=\"searchTagLink\"><a href=\"mymodule/mypackage/package-summary.html#test.property\">test.property</a></span>" + "<dt><span class=\"search-tag-link\"><a href=\"mymodule/mypackage/package-summary.html#test.property\">test.property</a></span>" +
" - Search tag in package mypackage</dt>\n<dd>System Property</dd>", " - Search tag in package mypackage</dt>\n<dd>System Property</dd>",
""); "");

12
test/langtools/jdk/javadoc/doclet/testTagOutput/TestTagOutput.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -48,14 +48,14 @@ public class TestTagOutput extends JavadocTester {
checkExit(Exit.OK); checkExit(Exit.OK);
checkOutput("pkg1/DeprecatedTag.html", true, checkOutput("pkg1/DeprecatedTag.html", true,
"<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated.</span></div>", "<div class=\"deprecation-block\"><span class=\"deprecated-label\">Deprecated.</span></div>",
"<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated.</span>\n" "<div class=\"deprecation-block\"><span class=\"deprecated-label\">Deprecated.</span>\n"
+ "<div class=\"deprecationComment\">Do not use this.</div>\n" + "<div class=\"deprecation-comment\">Do not use this.</div>\n"
+ "</div>"); + "</div>");
checkOutput("pkg1/DeprecatedTag.html", false, checkOutput("pkg1/DeprecatedTag.html", false,
"<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated.</span>\n" "<div class=\"deprecation-block\"><span class=\"deprecated-label\">Deprecated.</span>\n"
+ "<div class=\"deprecationComment\"></div>\n" + "<div class=\"deprecation-comment\"></div>\n"
+ "</div>"); + "</div>");
} }
} }

2
test/langtools/jdk/javadoc/doclet/testTitleInHref/TestTitleInHref.java
View file

@ -57,7 +57,7 @@ public class TestTitleInHref extends JavadocTester {
"<a href=\"Interface.html\" title=\"interface in pkg\">", "<a href=\"Interface.html\" title=\"interface in pkg\">",
//Test to make sure that the title shows up in cross link shows up //Test to make sure that the title shows up in cross link shows up
"<a href=\"" + uri + "/java/io/File.html\" " "<a href=\"" + uri + "/java/io/File.html\" "
+ "title=\"class or interface in java.io\" class=\"externalLink\">" + "title=\"class or interface in java.io\" class=\"external-link\">"
+ "<code>This is a cross link to class File</code></a>"); + "<code>This is a cross link to class File</code></a>");
} }
} }

300
test/langtools/jdk/javadoc/doclet/testTypeAnnotations/TestTypeAnnotations.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -76,12 +76,12 @@ public class TestTypeAnnotations extends JavadocTester {
// Test for type annotations on Class Parameters (ClassParameters.java). // Test for type annotations on Class Parameters (ClassParameters.java).
checkOutput("typeannos/ExtendsBound.html", true, checkOutput("typeannos/ExtendsBound.html", true,
"class <span class=\"typeNameLabel\">ExtendsBound&lt;K extends <a " "class <span class=\"type-name-label\">ExtendsBound&lt;K extends <a "
+ "href=\"ClassParamA.html\" title=\"annotation in " + "href=\"ClassParamA.html\" title=\"annotation in "
+ "typeannos\">@ClassParamA</a> java.lang.String&gt;</span>"); + "typeannos\">@ClassParamA</a> java.lang.String&gt;</span>");
checkOutput("typeannos/ExtendsGeneric.html", true, checkOutput("typeannos/ExtendsGeneric.html", true,
"<pre>class <span class=\"typeNameLabel\">ExtendsGeneric&lt;K extends " "<pre>class <span class=\"type-name-label\">ExtendsGeneric&lt;K extends "
+ "<a href=\"ClassParamA.html\" title=\"annotation in " + "<a href=\"ClassParamA.html\" title=\"annotation in "
+ "typeannos\">@ClassParamA</a> <a href=\"Unannotated.html\" " + "typeannos\">@ClassParamA</a> <a href=\"Unannotated.html\" "
+ "title=\"class in typeannos\">Unannotated</a>&lt;<a href=\"" + "title=\"class in typeannos\">Unannotated</a>&lt;<a href=\""
@ -89,24 +89,24 @@ public class TestTypeAnnotations extends JavadocTester {
+ "@ClassParamB</a> java.lang.String&gt;&gt;</span>"); + "@ClassParamB</a> java.lang.String&gt;&gt;</span>");
checkOutput("typeannos/TwoBounds.html", true, checkOutput("typeannos/TwoBounds.html", true,
"<pre>class <span class=\"typeNameLabel\">TwoBounds&lt;K extends <a href=\"" "<pre>class <span class=\"type-name-label\">TwoBounds&lt;K extends <a href=\""
+ "ClassParamA.html\" title=\"annotation in typeannos\">" + "ClassParamA.html\" title=\"annotation in typeannos\">"
+ "@ClassParamA</a> java.lang.String,&#8203;V extends <a href=\"" + "@ClassParamA</a> java.lang.String,&#8203;V extends <a href=\""
+ "ClassParamB.html\" title=\"annotation in typeannos\">@ClassParamB" + "ClassParamB.html\" title=\"annotation in typeannos\">@ClassParamB"
+ "</a> java.lang.String&gt;</span>"); + "</a> java.lang.String&gt;</span>");
checkOutput("typeannos/Complex1.html", true, checkOutput("typeannos/Complex1.html", true,
"class <span class=\"typeNameLabel\">Complex1&lt;K extends <a href=\"" "class <span class=\"type-name-label\">Complex1&lt;K extends <a href=\""
+ "ClassParamA.html\" title=\"annotation in typeannos\">" + "ClassParamA.html\" title=\"annotation in typeannos\">"
+ "@ClassParamA</a> java.lang.String &amp; java.lang.Runnable&gt;</span>"); + "@ClassParamA</a> java.lang.String &amp; java.lang.Runnable&gt;</span>");
checkOutput("typeannos/Complex2.html", true, checkOutput("typeannos/Complex2.html", true,
"class <span class=\"typeNameLabel\">Complex2&lt;K extends java.lang." "class <span class=\"type-name-label\">Complex2&lt;K extends java.lang."
+ "String &amp; <a href=\"ClassParamB.html\" title=\"" + "String &amp; <a href=\"ClassParamB.html\" title=\""
+ "annotation in typeannos\">@ClassParamB</a> java.lang.Runnable&gt;</span>"); + "annotation in typeannos\">@ClassParamB</a> java.lang.Runnable&gt;</span>");
checkOutput("typeannos/ComplexBoth.html", true, checkOutput("typeannos/ComplexBoth.html", true,
"class <span class=\"typeNameLabel\">ComplexBoth&lt;K extends <a href=\"" "class <span class=\"type-name-label\">ComplexBoth&lt;K extends <a href=\""
+ "ClassParamA.html\" title=\"annotation in typeannos\"" + "ClassParamA.html\" title=\"annotation in typeannos\""
+ ">@ClassParamA</a> java.lang.String &amp; <a href=\"" + ">@ClassParamA</a> java.lang.String &amp; <a href=\""
+ "ClassParamA.html\" title=\"annotation in typeannos\">@ClassParamA" + "ClassParamA.html\" title=\"annotation in typeannos\">@ClassParamA"
@ -114,33 +114,33 @@ public class TestTypeAnnotations extends JavadocTester {
// Test for type annotations on fields (Fields.java). // Test for type annotations on fields (Fields.java).
checkOutput("typeannos/DefaultScope.html", true, checkOutput("typeannos/DefaultScope.html", true,
"<div class=\"memberSignature\"><span class=\"returnType\"><a href=\"Parameterized.html\" " "<div class=\"member-signature\"><span class=\"return-type\"><a href=\"Parameterized.html\" "
+ "title=\"class in typeannos\">Parameterized</a>&lt;<a href=\"FldA.html\" " + "title=\"class in typeannos\">Parameterized</a>&lt;<a href=\"FldA.html\" "
+ "title=\"annotation in typeannos\">@FldA</a> java.lang.String,&#8203;" + "title=\"annotation in typeannos\">@FldA</a> java.lang.String,&#8203;"
+ "<a href=\"FldB.html\" title=\"annotation in typeannos\">@FldB</a> java.lang.String&gt;" + "<a href=\"FldB.html\" title=\"annotation in typeannos\">@FldB</a> java.lang.String&gt;"
+ "</span>&nbsp;<span class=\"memberName\">bothTypeArgs</span></div>", + "</span>&nbsp;<span class=\"member-name\">bothTypeArgs</span></div>",
"<div class=\"memberSignature\"><span class=\"returnType\"><a href=\"FldA.html\" " "<div class=\"member-signature\"><span class=\"return-type\"><a href=\"FldA.html\" "
+ "title=\"annotation in typeannos\">@FldA</a> java.lang.String <a href=\"FldB.html\" " + "title=\"annotation in typeannos\">@FldA</a> java.lang.String <a href=\"FldB.html\" "
+ "title=\"annotation in typeannos\">@FldB</a> []</span>&nbsp;" + "title=\"annotation in typeannos\">@FldB</a> []</span>&nbsp;"
+ "<span class=\"memberName\">array1Deep</span></div>", + "<span class=\"member-name\">array1Deep</span></div>",
"<div class=\"memberSignature\"><span class=\"returnType\">java.lang.String " "<div class=\"member-signature\"><span class=\"return-type\">java.lang.String "
+ "<a href=\"FldB.html\" title=\"annotation in typeannos\">@FldB</a> [][]</span>&nbsp;" + "<a href=\"FldB.html\" title=\"annotation in typeannos\">@FldB</a> [][]</span>&nbsp;"
+ "<span class=\"memberName\">array2SecondOld</span></div>", + "<span class=\"member-name\">array2SecondOld</span></div>",
// When JDK-8068737, we should change the order // When JDK-8068737, we should change the order
"<div class=\"memberSignature\"><span class=\"returnType\"><a href=\"FldD.html\" " "<div class=\"member-signature\"><span class=\"return-type\"><a href=\"FldD.html\" "
+ "title=\"annotation in typeannos\">@FldD</a> java.lang.String <a href=\"FldC.html\" " + "title=\"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 typeannos\">@FldC</a> <a href=\"FldB.html\" "
+ "title=\"annotation in typeannos\">@FldB</a> [] <a href=\"FldC.html\" " + "title=\"annotation in typeannos\">@FldB</a> [] <a href=\"FldC.html\" "
+ "title=\"annotation in typeannos\">@FldC</a> <a href=\"FldA.html\" " + "title=\"annotation in typeannos\">@FldC</a> <a href=\"FldA.html\" "
+ "title=\"annotation in typeannos\">@FldA</a> []</span>&nbsp;" + "title=\"annotation in typeannos\">@FldA</a> []</span>&nbsp;"
+ "<span class=\"memberName\">array2Deep</span></div>"); + "<span class=\"member-name\">array2Deep</span></div>");
checkOutput("typeannos/ModifiedScoped.html", true, checkOutput("typeannos/ModifiedScoped.html", true,
"<div class=\"memberSignature\"><span class=\"modifiers\">public final</span>" "<div class=\"member-signature\"><span class=\"modifiers\">public final</span>"
+ "&nbsp;<span class=\"returnType\"><a href=\"Parameterized.html\" " + "&nbsp;<span class=\"return-type\"><a href=\"Parameterized.html\" "
+ "title=\"class in typeannos\">Parameterized</a>&lt;<a href=\"FldA.html\" " + "title=\"class in typeannos\">Parameterized</a>&lt;<a href=\"FldA.html\" "
+ "title=\"annotation in typeannos\">@FldA</a> <a href=\"Parameterized.html\" " + "title=\"annotation in typeannos\">@FldA</a> <a href=\"Parameterized.html\" "
+ "title=\"class in typeannos\">Parameterized</a>&lt;<a href=\"FldA.html\" " + "title=\"class in typeannos\">Parameterized</a>&lt;<a href=\"FldA.html\" "
@ -148,83 +148,83 @@ public class TestTypeAnnotations extends JavadocTester {
+ "<a href=\"FldB.html\" title=\"annotation in typeannos\">@FldB</a> " + "<a href=\"FldB.html\" title=\"annotation in typeannos\">@FldB</a> "
+ "java.lang.String&gt;,&#8203;<a href=\"FldB.html\" " + "java.lang.String&gt;,&#8203;<a href=\"FldB.html\" "
+ "title=\"annotation in typeannos\">@FldB</a> java.lang.String&gt;" + "title=\"annotation in typeannos\">@FldB</a> java.lang.String&gt;"
+ "</span>&nbsp;<span class=\"memberName\">nestedParameterized</span></div>", + "</span>&nbsp;<span class=\"member-name\">nestedParameterized</span></div>",
"<div class=\"memberSignature\"><span class=\"modifiers\">public final</span>&nbsp;" "<div class=\"member-signature\"><span class=\"modifiers\">public final</span>&nbsp;"
+ "<span class=\"returnType\"><a href=\"FldA.html\" title=\"annotation in typeannos\">" + "<span class=\"return-type\"><a href=\"FldA.html\" title=\"annotation in typeannos\">"
+ "@FldA</a> java.lang.String[][]</span>&nbsp;" + "@FldA</a> java.lang.String[][]</span>&nbsp;"
+ "<span class=\"memberName\">array2</span></div>"); + "<span class=\"member-name\">array2</span></div>");
// Test for type annotations on method return types (MethodReturnType.java). // Test for type annotations on method return types (MethodReturnType.java).
checkOutput("typeannos/MtdDefaultScope.html", true, checkOutput("typeannos/MtdDefaultScope.html", true,
"<div class=\"memberSignature\"><span class=\"modifiers\">public</span>" "<div class=\"member-signature\"><span class=\"modifiers\">public</span>"
+ "&nbsp;<span class=\"typeParameters\">&lt;T&gt;</span>&nbsp;<span " + "&nbsp;<span class=\"type-parameters\">&lt;T&gt;</span>&nbsp;<span "
+ "class=\"returnType\"><a href=\"MRtnA.html\" title=\"annotation in typeannos\">" + "class=\"return-type\"><a href=\"MRtnA.html\" title=\"annotation in typeannos\">"
+ "@MRtnA</a> java.lang.String</span>&nbsp;" + "@MRtnA</a> java.lang.String</span>&nbsp;"
+ "<span class=\"memberName\">method</span>()</div>", + "<span class=\"member-name\">method</span>()</div>",
// When JDK-8068737 is fixed, we should change the order // When JDK-8068737 is fixed, we should change the order
"<div class=\"memberSignature\"><span class=\"returnType\"><a href=\"MRtnA.html\" " "<div class=\"member-signature\"><span class=\"return-type\"><a href=\"MRtnA.html\" "
+ "title=\"annotation in typeannos\">@MRtnA</a> java.lang.String <a href=\"MRtnB.html\" " + "title=\"annotation in typeannos\">@MRtnA</a> java.lang.String <a href=\"MRtnB.html\" "
+ "title=\"annotation in typeannos\">@MRtnB</a> [] <a href=\"MRtnA.html\" " + "title=\"annotation in typeannos\">@MRtnB</a> [] <a href=\"MRtnA.html\" "
+ "title=\"annotation in typeannos\">@MRtnA</a> []</span>&nbsp;<span class=\"memberName\">" + "title=\"annotation in typeannos\">@MRtnA</a> []</span>&nbsp;<span class=\"member-name\">"
+ "array2Deep</span>()</div>", + "array2Deep</span>()</div>",
"<div class=\"memberSignature\"><span class=\"returnType\"><a href=\"MRtnA.html\" " "<div class=\"member-signature\"><span class=\"return-type\"><a href=\"MRtnA.html\" "
+ "title=\"annotation in typeannos\">@MRtnA</a> java.lang.String[][]</span>&nbsp;" + "title=\"annotation in typeannos\">@MRtnA</a> java.lang.String[][]</span>&nbsp;"
+ "<span class=\"memberName\">array2</span>()</div>"); + "<span class=\"member-name\">array2</span>()</div>");
checkOutput("typeannos/MtdModifiedScoped.html", true, checkOutput("typeannos/MtdModifiedScoped.html", true,
"<div class=\"memberSignature\"><span class=\"modifiers\">public final</span>&nbsp;" "<div class=\"member-signature\"><span class=\"modifiers\">public final</span>&nbsp;"
+ "<span class=\"returnType\"><a href=\"MtdParameterized.html\" " + "<span class=\"return-type\"><a href=\"MtdParameterized.html\" "
+ "title=\"class in typeannos\">MtdParameterized</a>&lt;<a href=\"MRtnA.html\" " + "title=\"class in typeannos\">MtdParameterized</a>&lt;<a href=\"MRtnA.html\" "
+ "title=\"annotation in typeannos\">@MRtnA</a> <a href=\"MtdParameterized.html\" " + "title=\"annotation in typeannos\">@MRtnA</a> <a href=\"MtdParameterized.html\" "
+ "title=\"class in typeannos\">MtdParameterized</a>&lt;<a href=\"MRtnA.html\" " + "title=\"class in typeannos\">MtdParameterized</a>&lt;<a href=\"MRtnA.html\" "
+ "title=\"annotation in typeannos\">@MRtnA</a> java.lang.String,&#8203;" + "title=\"annotation in typeannos\">@MRtnA</a> java.lang.String,&#8203;"
+ "<a href=\"MRtnB.html\" title=\"annotation in typeannos\">@MRtnB</a> " + "<a href=\"MRtnB.html\" title=\"annotation in typeannos\">@MRtnB</a> "
+ "java.lang.String&gt;,&#8203;<a href=\"MRtnB.html\" title=\"annotation in typeannos\">" + "java.lang.String&gt;,&#8203;<a href=\"MRtnB.html\" title=\"annotation in typeannos\">"
+ "@MRtnB</a> java.lang.String&gt;</span>&nbsp;<span class=\"memberName\">" + "@MRtnB</a> java.lang.String&gt;</span>&nbsp;<span class=\"member-name\">"
+ "nestedMtdParameterized</span>()</div>"); + "nestedMtdParameterized</span>()</div>");
// Test for type annotations on method type parameters (MethodTypeParameters.java). // Test for type annotations on method type parameters (MethodTypeParameters.java).
checkOutput("typeannos/UnscopedUnmodified.html", true, checkOutput("typeannos/UnscopedUnmodified.html", true,
"<div class=\"memberSignature\"><span class=\"typeParameters\">&lt;K extends " "<div class=\"member-signature\"><span class=\"type-parameters\">&lt;K extends "
+ "<a href=\"MTyParamA.html\" title=\"annotation in typeannos\">@MTyParamA</a> " + "<a href=\"MTyParamA.html\" title=\"annotation in typeannos\">@MTyParamA</a> "
+ "java.lang.String&gt;</span>&nbsp;<span class=\"returnType\">void</span>&nbsp;" + "java.lang.String&gt;</span>&nbsp;<span class=\"return-type\">void</span>&nbsp;"
+ "<span class=\"memberName\">methodExtends</span>()</div>", + "<span class=\"member-name\">methodExtends</span>()</div>",
"<div class=\"memberSignature\"><span class=\"typeParametersLong\">&lt;K extends " "<div class=\"member-signature\"><span class=\"type-parameters-long\">&lt;K extends "
+ "<a href=\"MTyParamA.html\" title=\"annotation in typeannos\">@MTyParamA</a> " + "<a href=\"MTyParamA.html\" title=\"annotation in typeannos\">@MTyParamA</a> "
+ "<a href=\"MtdTyParameterized.html\" title=\"class in typeannos\">MtdTyParameterized</a>" + "<a href=\"MtdTyParameterized.html\" title=\"class in typeannos\">MtdTyParameterized</a>"
+ "&lt;<a href=\"MTyParamB.html\" title=\"annotation in typeannos\">@MTyParamB</a> " + "&lt;<a href=\"MTyParamB.html\" title=\"annotation in typeannos\">@MTyParamB</a> "
+ "java.lang.String&gt;&gt;</span>\n<span class=\"returnType\">void</span>" + "java.lang.String&gt;&gt;</span>\n<span class=\"return-type\">void</span>"
+ "&nbsp;<span class=\"memberName\">nestedExtends</span>()</div>"); + "&nbsp;<span class=\"member-name\">nestedExtends</span>()</div>");
checkOutput("typeannos/PublicModifiedMethods.html", true, checkOutput("typeannos/PublicModifiedMethods.html", true,
"<div class=\"memberSignature\"><span class=\"modifiers\">public final</span>&nbsp;" "<div class=\"member-signature\"><span class=\"modifiers\">public final</span>&nbsp;"
+ "<span class=\"typeParameters\">&lt;K extends <a href=\"MTyParamA.html\" " + "<span class=\"type-parameters\">&lt;K extends <a href=\"MTyParamA.html\" "
+ "title=\"annotation in typeannos\">@MTyParamA</a> java.lang.String&gt;</span>\n" + "title=\"annotation in typeannos\">@MTyParamA</a> java.lang.String&gt;</span>\n"
+ "<span class=\"returnType\">void</span>&nbsp;" + "<span class=\"return-type\">void</span>&nbsp;"
+ "<span class=\"memberName\">methodExtends</span>()</div>", + "<span class=\"member-name\">methodExtends</span>()</div>",
"<div class=\"memberSignature\"><span class=\"modifiers\">public final</span>" "<div class=\"member-signature\"><span class=\"modifiers\">public final</span>"
+ "&nbsp;<span class=\"typeParametersLong\">&lt;K extends <a href=\"MTyParamA.html\" " + "&nbsp;<span class=\"type-parameters-long\">&lt;K extends <a href=\"MTyParamA.html\" "
+ "title=\"annotation in typeannos\">@MTyParamA</a> java.lang.String,&#8203;\n" + "title=\"annotation in typeannos\">@MTyParamA</a> java.lang.String,&#8203;\n"
+ "V extends <a href=\"MTyParamA.html\" title=\"annotation in typeannos\">" + "V extends <a href=\"MTyParamA.html\" title=\"annotation in typeannos\">"
+ "@MTyParamA</a> <a href=\"MtdTyParameterized.html\" title=\"class in typeannos\">" + "@MTyParamA</a> <a href=\"MtdTyParameterized.html\" title=\"class in typeannos\">"
+ "MtdTyParameterized</a>&lt;<a href=\"MTyParamB.html\" title=\"annotation in typeannos\">" + "MtdTyParameterized</a>&lt;<a href=\"MTyParamB.html\" title=\"annotation in typeannos\">"
+ "@MTyParamB</a> java.lang.String&gt;&gt;</span>\n<span class=\"returnType\">void</span>" + "@MTyParamB</a> java.lang.String&gt;&gt;</span>\n<span class=\"return-type\">void</span>"
+ "&nbsp;<span class=\"memberName\">dual</span>()</div>"); + "&nbsp;<span class=\"member-name\">dual</span>()</div>");
// Test for type annotations on parameters (Parameters.java). // Test for type annotations on parameters (Parameters.java).
checkOutput("typeannos/Parameters.html", true, checkOutput("typeannos/Parameters.html", true,
"<div class=\"memberSignature\"><span class=\"returnType\">void</span>&nbsp;" "<div class=\"member-signature\"><span class=\"return-type\">void</span>&nbsp;"
+ "<span class=\"memberName\">unannotated</span>&#8203;(<span class=\"arguments\">" + "<span class=\"member-name\">unannotated</span>&#8203;(<span class=\"arguments\">"
+ "<a href=\"ParaParameterized.html\" title=\"class in typeannos\">ParaParameterized</a>" + "<a href=\"ParaParameterized.html\" title=\"class in typeannos\">ParaParameterized</a>"
+ "&lt;java.lang.String,&#8203;java.lang.String&gt;&nbsp;a)</span></div>", + "&lt;java.lang.String,&#8203;java.lang.String&gt;&nbsp;a)</span></div>",
"<div class=\"memberSignature\"><span class=\"returnType\">void</span>&nbsp;" "<div class=\"member-signature\"><span class=\"return-type\">void</span>&nbsp;"
+ "<span class=\"memberName\">nestedParaParameterized</span>&#8203;" + "<span class=\"member-name\">nestedParaParameterized</span>&#8203;"
+ "(<span class=\"arguments\"><a href=\"ParaParameterized.html\" " + "(<span class=\"arguments\"><a href=\"ParaParameterized.html\" "
+ "title=\"class in typeannos\">ParaParameterized</a>&lt;<a href=\"ParamA.html\" " + "title=\"class in typeannos\">ParaParameterized</a>&lt;<a href=\"ParamA.html\" "
+ "title=\"annotation in typeannos\">@ParamA</a> <a href=\"ParaParameterized.html\" " + "title=\"annotation in typeannos\">@ParamA</a> <a href=\"ParaParameterized.html\" "
@ -235,8 +235,8 @@ public class TestTypeAnnotations extends JavadocTester {
+ "@ParamB</a> java.lang.String&gt;&nbsp;a)</span></div>", + "@ParamB</a> java.lang.String&gt;&nbsp;a)</span></div>",
// When JDK-8068737 is fixed, we should change the order // When JDK-8068737 is fixed, we should change the order
"<div class=\"memberSignature\"><span class=\"returnType\">void</span>&nbsp;" "<div class=\"member-signature\"><span class=\"return-type\">void</span>&nbsp;"
+ "<span class=\"memberName\">array2Deep</span>&#8203;(<span class=\"arguments\">" + "<span class=\"member-name\">array2Deep</span>&#8203;(<span class=\"arguments\">"
+ "<a href=\"ParamA.html\" title=\"annotation in typeannos\">@ParamA</a> " + "<a href=\"ParamA.html\" title=\"annotation in typeannos\">@ParamA</a> "
+ "java.lang.String <a href=\"ParamB.html\" title=\"annotation in typeannos\">" + "java.lang.String <a href=\"ParamB.html\" title=\"annotation in typeannos\">"
+ "@ParamB</a> [] <a href=\"ParamA.html\" title=\"annotation in typeannos\">" + "@ParamB</a> [] <a href=\"ParamA.html\" title=\"annotation in typeannos\">"
@ -244,27 +244,27 @@ public class TestTypeAnnotations extends JavadocTester {
// Test for type annotations on throws (Throws.java). // Test for type annotations on throws (Throws.java).
checkOutput("typeannos/ThrDefaultUnmodified.html", true, checkOutput("typeannos/ThrDefaultUnmodified.html", true,
"<div class=\"memberSignature\"><span class=\"returnType\">void</span>&nbsp;" "<div class=\"member-signature\"><span class=\"return-type\">void</span>&nbsp;"
+ "<span class=\"memberName\">oneException</span>()\n" + "<span class=\"member-name\">oneException</span>()\n"
+ " throws <span class=\"exceptions\"><a href=\"ThrA.html\" " + " throws <span class=\"exceptions\"><a href=\"ThrA.html\" "
+ "title=\"annotation in typeannos\">@ThrA</a> java.lang.Exception</span></div>", + "title=\"annotation in typeannos\">@ThrA</a> java.lang.Exception</span></div>",
"<div class=\"memberSignature\"><span class=\"returnType\">void</span>&nbsp;" "<div class=\"member-signature\"><span class=\"return-type\">void</span>&nbsp;"
+ "<span class=\"memberName\">twoExceptions</span>()\n" + "<span class=\"member-name\">twoExceptions</span>()\n"
+ " throws <span class=\"exceptions\"><a href=\"ThrA.html\" " + " throws <span class=\"exceptions\"><a href=\"ThrA.html\" "
+ "title=\"annotation in typeannos\">@ThrA</a> java.lang.RuntimeException,\n" + "title=\"annotation in typeannos\">@ThrA</a> java.lang.RuntimeException,\n"
+ "<a href=\"ThrA.html\" title=\"annotation in typeannos\">@ThrA</a> " + "<a href=\"ThrA.html\" title=\"annotation in typeannos\">@ThrA</a> "
+ "java.lang.Exception</span></div>"); + "java.lang.Exception</span></div>");
checkOutput("typeannos/ThrPublicModified.html", true, checkOutput("typeannos/ThrPublicModified.html", true,
"<div class=\"memberSignature\"><span class=\"modifiers\">public final</span>&nbsp;" "<div class=\"member-signature\"><span class=\"modifiers\">public final</span>&nbsp;"
+ "<span class=\"returnType\">void</span>&nbsp;<span class=\"memberName\">" + "<span class=\"return-type\">void</span>&nbsp;<span class=\"member-name\">"
+ "oneException</span>&#8203;(<span class=\"arguments\">java.lang.String&nbsp;a)</span>\n" + "oneException</span>&#8203;(<span class=\"arguments\">java.lang.String&nbsp;a)</span>\n"
+ " throws <span class=\"exceptions\"><a href=\"ThrA.html\" " + " throws <span class=\"exceptions\"><a href=\"ThrA.html\" "
+ "title=\"annotation in typeannos\">@ThrA</a> java.lang.Exception</span></div>", + "title=\"annotation in typeannos\">@ThrA</a> java.lang.Exception</span></div>",
"<div class=\"memberSignature\"><span class=\"modifiers\">public final</span>&nbsp;" "<div class=\"member-signature\"><span class=\"modifiers\">public final</span>&nbsp;"
+ "<span class=\"returnType\">void</span>&nbsp;<span class=\"memberName\">" + "<span class=\"return-type\">void</span>&nbsp;<span class=\"member-name\">"
+ "twoExceptions</span>&#8203;(<span class=\"arguments\">java.lang.String&nbsp;a)</span>\n" + "twoExceptions</span>&#8203;(<span class=\"arguments\">java.lang.String&nbsp;a)</span>\n"
+ " throws <span class=\"exceptions\"><a href=\"ThrA.html\" " + " throws <span class=\"exceptions\"><a href=\"ThrA.html\" "
+ "title=\"annotation in typeannos\">@ThrA</a> java.lang.RuntimeException,\n" + "title=\"annotation in typeannos\">@ThrA</a> java.lang.RuntimeException,\n"
@ -272,13 +272,13 @@ public class TestTypeAnnotations extends JavadocTester {
+ "java.lang.Exception</span></div>"); + "java.lang.Exception</span></div>");
checkOutput("typeannos/ThrWithValue.html", true, checkOutput("typeannos/ThrWithValue.html", true,
"<div class=\"memberSignature\"><span class=\"returnType\">void</span>&nbsp;" "<div class=\"member-signature\"><span class=\"return-type\">void</span>&nbsp;"
+ "<span class=\"memberName\">oneException</span>()\n" + "<span class=\"member-name\">oneException</span>()\n"
+ " throws <span class=\"exceptions\"><a href=\"ThrB.html\" " + " throws <span class=\"exceptions\"><a href=\"ThrB.html\" "
+ "title=\"annotation in typeannos\">@ThrB</a>(\"m\") java.lang.Exception</span></div>", + "title=\"annotation in typeannos\">@ThrB</a>(\"m\") java.lang.Exception</span></div>",
"<div class=\"memberSignature\"><span class=\"returnType\">void</span>&nbsp;" "<div class=\"member-signature\"><span class=\"return-type\">void</span>&nbsp;"
+ "<span class=\"memberName\">twoExceptions</span>()\n" + "<span class=\"member-name\">twoExceptions</span>()\n"
+ " throws <span class=\"exceptions\"><a href=\"ThrB.html\" " + " throws <span class=\"exceptions\"><a href=\"ThrB.html\" "
+ "title=\"annotation in typeannos\">@ThrB</a>(\"m\") java.lang.RuntimeException,\n" + "title=\"annotation in typeannos\">@ThrB</a>(\"m\") java.lang.RuntimeException,\n"
+ "<a href=\"ThrA.html\" title=\"annotation in typeannos\">@ThrA</a> " + "<a href=\"ThrA.html\" title=\"annotation in typeannos\">@ThrA</a> "
@ -286,100 +286,100 @@ public class TestTypeAnnotations extends JavadocTester {
// Test for type annotations on type parameters (TypeParameters.java). // Test for type annotations on type parameters (TypeParameters.java).
checkOutput("typeannos/TestMethods.html", true, checkOutput("typeannos/TestMethods.html", true,
"<div class=\"memberSignature\"><span class=\"typeParameters\">&lt;K,&#8203;\n" "<div class=\"member-signature\"><span class=\"type-parameters\">&lt;K,&#8203;\n"
+ "<a href=\"TyParaA.html\" title=\"annotation in typeannos\">@TyParaA</a> V extends " + "<a href=\"TyParaA.html\" title=\"annotation in typeannos\">@TyParaA</a> V extends "
+ "<a href=\"TyParaA.html\" title=\"annotation in typeannos\">@TyParaA</a> " + "<a href=\"TyParaA.html\" title=\"annotation in typeannos\">@TyParaA</a> "
+ "java.lang.String&gt;</span>\n<span class=\"returnType\">void</span>&nbsp;" + "java.lang.String&gt;</span>\n<span class=\"return-type\">void</span>&nbsp;"
+ "<span class=\"memberName\">secondAnnotated</span>()</div>" + "<span class=\"member-name\">secondAnnotated</span>()</div>"
); );
// Test for type annotations on wildcard type (Wildcards.java). // Test for type annotations on wildcard type (Wildcards.java).
checkOutput("typeannos/BoundTest.html", true, checkOutput("typeannos/BoundTest.html", true,
"<div class=\"memberSignature\"><span class=\"returnType\">void</span>&nbsp;" "<div class=\"member-signature\"><span class=\"return-type\">void</span>&nbsp;"
+ "<span class=\"memberName\">wcExtends</span>&#8203;(<span class=\"arguments\">" + "<span class=\"member-name\">wcExtends</span>&#8203;(<span class=\"arguments\">"
+ "<a href=\"MyList.html\" title=\"class in typeannos\">MyList</a>&lt;? extends " + "<a href=\"MyList.html\" title=\"class in typeannos\">MyList</a>&lt;? extends "
+ "<a href=\"WldA.html\" title=\"annotation in typeannos\">@WldA</a> " + "<a href=\"WldA.html\" title=\"annotation in typeannos\">@WldA</a> "
+ "java.lang.String&gt;&nbsp;l)</span></div>", + "java.lang.String&gt;&nbsp;l)</span></div>",
"<div class=\"memberSignature\"><span class=\"returnType\"><a href=\"MyList.html\" " "<div class=\"member-signature\"><span class=\"return-type\"><a href=\"MyList.html\" "
+ "title=\"class in typeannos\">MyList</a>&lt;? super <a href=\"WldA.html\" " + "title=\"class in typeannos\">MyList</a>&lt;? super <a href=\"WldA.html\" "
+ "title=\"annotation in typeannos\">@WldA</a> java.lang.String&gt;</span>&nbsp;" + "title=\"annotation in typeannos\">@WldA</a> java.lang.String&gt;</span>&nbsp;"
+ "<span class=\"memberName\">returnWcSuper</span>()</div>"); + "<span class=\"member-name\">returnWcSuper</span>()</div>");
checkOutput("typeannos/BoundWithValue.html", true, checkOutput("typeannos/BoundWithValue.html", true,
"<div class=\"memberSignature\"><span class=\"returnType\">void</span>&nbsp;" "<div class=\"member-signature\"><span class=\"return-type\">void</span>&nbsp;"
+ "<span class=\"memberName\">wcSuper</span>&#8203;(<span class=\"arguments\">" + "<span class=\"member-name\">wcSuper</span>&#8203;(<span class=\"arguments\">"
+ "<a href=\"MyList.html\" title=\"class in typeannos\">MyList</a>&lt;? super " + "<a href=\"MyList.html\" title=\"class in typeannos\">MyList</a>&lt;? super "
+ "<a href=\"WldB.html\" title=\"annotation in typeannos\">@WldB</a>(\"m\") " + "<a href=\"WldB.html\" title=\"annotation in typeannos\">@WldB</a>(\"m\") "
+ "java.lang.String&gt;&nbsp;l)</span></div>", + "java.lang.String&gt;&nbsp;l)</span></div>",
"<div class=\"memberSignature\"><span class=\"returnType\"><a href=\"MyList.html\" " "<div class=\"member-signature\"><span class=\"return-type\"><a href=\"MyList.html\" "
+ "title=\"class in typeannos\">MyList</a>&lt;? extends <a href=\"WldB.html\" " + "title=\"class in typeannos\">MyList</a>&lt;? extends <a href=\"WldB.html\" "
+ "title=\"annotation in typeannos\">@WldB</a>(\"m\") java.lang.String&gt;</span>" + "title=\"annotation in typeannos\">@WldB</a>(\"m\") java.lang.String&gt;</span>"
+ "&nbsp;<span class=\"memberName\">returnWcExtends</span>()</div>"); + "&nbsp;<span class=\"member-name\">returnWcExtends</span>()</div>");
// Test for receiver annotations (Receivers.java). // Test for receiver annotations (Receivers.java).
checkOutput("typeannos/DefaultUnmodified.html", true, checkOutput("typeannos/DefaultUnmodified.html", true,
"<div class=\"memberSignature\"><span class=\"returnType\">void</span>&nbsp;" "<div class=\"member-signature\"><span class=\"return-type\">void</span>&nbsp;"
+ "<span class=\"memberName\">withException</span>&#8203;(<span class=\"arguments\">" + "<span class=\"member-name\">withException</span>&#8203;(<span class=\"arguments\">"
+ "<a href=\"RcvrA.html\" title=\"annotation in typeannos\">@RcvrA</a>" + "<a href=\"RcvrA.html\" title=\"annotation in typeannos\">@RcvrA</a>"
+ "&nbsp;DefaultUnmodified&nbsp;this)</span>\n" + "&nbsp;DefaultUnmodified&nbsp;this)</span>\n"
+ " throws <span class=\"exceptions\">java.lang.Exception</span></div>", + " throws <span class=\"exceptions\">java.lang.Exception</span></div>",
"<div class=\"memberSignature\"><span class=\"returnType\">java.lang.String</span>&nbsp;" "<div class=\"member-signature\"><span class=\"return-type\">java.lang.String</span>&nbsp;"
+ "<span class=\"memberName\">nonVoid</span>&#8203;(<span class=\"arguments\">" + "<span class=\"member-name\">nonVoid</span>&#8203;(<span class=\"arguments\">"
+ "<a href=\"RcvrA.html\" title=\"annotation in typeannos\">@RcvrA</a> " + "<a href=\"RcvrA.html\" title=\"annotation in typeannos\">@RcvrA</a> "
+ "<a href=\"RcvrB.html\" title=\"annotation in typeannos\">@RcvrB</a>(\"m\")" + "<a href=\"RcvrB.html\" title=\"annotation in typeannos\">@RcvrB</a>(\"m\")"
+ "&nbsp;DefaultUnmodified&nbsp;this)</span></div>", + "&nbsp;DefaultUnmodified&nbsp;this)</span></div>",
"<div class=\"memberSignature\"><span class=\"typeParameters\">&lt;T extends " "<div class=\"member-signature\"><span class=\"type-parameters\">&lt;T extends "
+ "java.lang.Runnable&gt;</span>&nbsp;<span class=\"returnType\">void</span>&nbsp;" + "java.lang.Runnable&gt;</span>&nbsp;<span class=\"return-type\">void</span>&nbsp;"
+ "<span class=\"memberName\">accept</span>&#8203;(<span class=\"arguments\">" + "<span class=\"member-name\">accept</span>&#8203;(<span class=\"arguments\">"
+ "<a href=\"RcvrA.html\" title=\"annotation in typeannos\">@RcvrA</a>&nbsp;" + "<a href=\"RcvrA.html\" title=\"annotation in typeannos\">@RcvrA</a>&nbsp;"
+ "DefaultUnmodified&nbsp;this,\nT&nbsp;r)</span>\n" + "DefaultUnmodified&nbsp;this,\nT&nbsp;r)</span>\n"
+ " throws <span class=\"exceptions\">" + " throws <span class=\"exceptions\">"
+ "java.lang.Exception</span></div>"); + "java.lang.Exception</span></div>");
checkOutput("typeannos/PublicModified.html", true, checkOutput("typeannos/PublicModified.html", true,
"<div class=\"memberSignature\"><span class=\"modifiers\">public final</span>&nbsp;" "<div class=\"member-signature\"><span class=\"modifiers\">public final</span>&nbsp;"
+ "<span class=\"returnType\">java.lang.String</span>&nbsp;<span class=\"memberName\">" + "<span class=\"return-type\">java.lang.String</span>&nbsp;<span class=\"member-name\">"
+ "nonVoid</span>&#8203;(<span class=\"arguments\"><a href=\"RcvrA.html\" " + "nonVoid</span>&#8203;(<span class=\"arguments\"><a href=\"RcvrA.html\" "
+ "title=\"annotation in typeannos\">@RcvrA</a>&nbsp;PublicModified&nbsp;this)" + "title=\"annotation in typeannos\">@RcvrA</a>&nbsp;PublicModified&nbsp;this)"
+ "</span></div>", + "</span></div>",
"<div class=\"memberSignature\"><span class=\"modifiers\">public final</span>&nbsp;" "<div class=\"member-signature\"><span class=\"modifiers\">public final</span>&nbsp;"
+ "<span class=\"typeParameters\">&lt;T extends java.lang.Runnable&gt;</span>&nbsp;" + "<span class=\"type-parameters\">&lt;T extends java.lang.Runnable&gt;</span>&nbsp;"
+ "<span class=\"returnType\">void</span>&nbsp;<span class=\"memberName\">accept" + "<span class=\"return-type\">void</span>&nbsp;<span class=\"member-name\">accept"
+ "</span>&#8203;(<span class=\"arguments\"><a href=\"RcvrA.html\" " + "</span>&#8203;(<span class=\"arguments\"><a href=\"RcvrA.html\" "
+ "title=\"annotation in typeannos\">@RcvrA</a>&nbsp;PublicModified&nbsp;this,\n" + "title=\"annotation in typeannos\">@RcvrA</a>&nbsp;PublicModified&nbsp;this,\n"
+ "T&nbsp;r)</span>\n throws " + "T&nbsp;r)</span>\n throws "
+ "<span class=\"exceptions\">java.lang.Exception</span></div>"); + "<span class=\"exceptions\">java.lang.Exception</span></div>");
checkOutput("typeannos/WithValue.html", true, checkOutput("typeannos/WithValue.html", true,
"<div class=\"memberSignature\"><span class=\"typeParameters\">&lt;T extends " "<div class=\"member-signature\"><span class=\"type-parameters\">&lt;T extends "
+ "java.lang.Runnable&gt;</span>&nbsp;<span class=\"returnType\">void</span>&nbsp;" + "java.lang.Runnable&gt;</span>&nbsp;<span class=\"return-type\">void</span>&nbsp;"
+ "<span class=\"memberName\">accept</span>&#8203;(<span class=\"arguments\">" + "<span class=\"member-name\">accept</span>&#8203;(<span class=\"arguments\">"
+ "<a href=\"RcvrB.html\" title=\"annotation in typeannos\">@RcvrB</a>(\"m\")" + "<a href=\"RcvrB.html\" title=\"annotation in typeannos\">@RcvrB</a>(\"m\")"
+ "&nbsp;WithValue&nbsp;this,\nT&nbsp;r)</span>\n" + "&nbsp;WithValue&nbsp;this,\nT&nbsp;r)</span>\n"
+ " throws <span class=\"exceptions\">" + " throws <span class=\"exceptions\">"
+ "java.lang.Exception</span></div>"); + "java.lang.Exception</span></div>");
checkOutput("typeannos/WithFinal.html", true, checkOutput("typeannos/WithFinal.html", true,
"<div class=\"memberSignature\"><span class=\"returnType\">java.lang.String</span>" "<div class=\"member-signature\"><span class=\"return-type\">java.lang.String</span>"
+ "&nbsp;<span class=\"memberName\">nonVoid</span>&#8203;(<span class=\"arguments\">" + "&nbsp;<span class=\"member-name\">nonVoid</span>&#8203;(<span class=\"arguments\">"
+ "<a href=\"RcvrB.html\" title=\"annotation in typeannos\">@RcvrB</a>(\"m\") " + "<a href=\"RcvrB.html\" title=\"annotation in typeannos\">@RcvrB</a>(\"m\") "
+ "<a href=\"WithFinal.html\" title=\"class in typeannos\">WithFinal</a>" + "<a href=\"WithFinal.html\" title=\"class in typeannos\">WithFinal</a>"
+ "&nbsp;afield)</span></div>"); + "&nbsp;afield)</span></div>");
checkOutput("typeannos/WithBody.html", true, checkOutput("typeannos/WithBody.html", true,
"<div class=\"memberSignature\"><span class=\"returnType\">void</span>&nbsp;" "<div class=\"member-signature\"><span class=\"return-type\">void</span>&nbsp;"
+ "<span class=\"memberName\">field</span>&#8203;(<span class=\"arguments\">" + "<span class=\"member-name\">field</span>&#8203;(<span class=\"arguments\">"
+ "<a href=\"RcvrA.html\" title=\"annotation in typeannos\">@RcvrA</a>" + "<a href=\"RcvrA.html\" title=\"annotation in typeannos\">@RcvrA</a>"
+ "&nbsp;WithBody&nbsp;this)</span></div>"); + "&nbsp;WithBody&nbsp;this)</span></div>");
checkOutput("typeannos/Generic2.html", true, checkOutput("typeannos/Generic2.html", true,
"<div class=\"memberSignature\"><span class=\"returnType\">void</span>&nbsp;" "<div class=\"member-signature\"><span class=\"return-type\">void</span>&nbsp;"
+ "<span class=\"memberName\">test2</span>&#8203;(<span class=\"arguments\">" + "<span class=\"member-name\">test2</span>&#8203;(<span class=\"arguments\">"
+ "<a href=\"RcvrA.html\" title=\"annotation in typeannos\">@RcvrA</a>" + "<a href=\"RcvrA.html\" title=\"annotation in typeannos\">@RcvrA</a>"
+ "&nbsp;Generic2&lt;X&gt;&nbsp;this)</span></div>"); + "&nbsp;Generic2&lt;X&gt;&nbsp;this)</span></div>");
@ -392,7 +392,7 @@ public class TestTypeAnnotations extends JavadocTester {
+ "\"RepTypeB.html\" title=\"annotation in typeannos\">" + "\"RepTypeB.html\" title=\"annotation in typeannos\">"
+ "@RepTypeB</a> <a href=\"RepTypeB.html\" title=" + "@RepTypeB</a> <a href=\"RepTypeB.html\" title="
+ "\"annotation in typeannos\">@RepTypeB</a>\nclass <span class=" + "\"annotation in typeannos\">@RepTypeB</a>\nclass <span class="
+ "\"typeNameLabel\">RepeatingAtClassLevel</span>\nextends " + "\"type-name-label\">RepeatingAtClassLevel</span>\nextends "
+ "java.lang.Object</pre>"); + "java.lang.Object</pre>");
// @ignore 8146008 // @ignore 8146008
@ -403,7 +403,7 @@ public class TestTypeAnnotations extends JavadocTester {
// + "\"RepTypeUseB.html\" title=\"annotation in typeannos" // + "\"RepTypeUseB.html\" title=\"annotation in typeannos"
// + "\">@RepTypeUseB</a> <a href=\"RepTypeUseB.html\" " // + "\">@RepTypeUseB</a> <a href=\"RepTypeUseB.html\" "
// + "title=\"annotation in typeannos\">@RepTypeUseB</a>\nclass <span " // + "title=\"annotation in typeannos\">@RepTypeUseB</a>\nclass <span "
// + "class=\"typeNameLabel\">RepeatingAtClassLevel2</span>\nextends " // + "class=\"type-name-label\">RepeatingAtClassLevel2</span>\nextends "
// + "java.lang.Object</pre>"); // + "java.lang.Object</pre>");
// //
// checkOutput("typeannos/RepeatingAtClassLevel2.html", true, // checkOutput("typeannos/RepeatingAtClassLevel2.html", true,
@ -413,42 +413,42 @@ public class TestTypeAnnotations extends JavadocTester {
// + "\"RepAllContextsB.html\" title=\"annotation in typeannos" // + "\"RepAllContextsB.html\" title=\"annotation in typeannos"
// + "\">@RepAllContextsB</a> <a href=\"RepAllContextsB.html" // + "\">@RepAllContextsB</a> <a href=\"RepAllContextsB.html"
// + "\" title=\"annotation in typeannos\">@RepAllContextsB</a>\n" // + "\" title=\"annotation in typeannos\">@RepAllContextsB</a>\n"
// + "class <span class=\"typeNameLabel\">RepeatingAtClassLevel3</span>\n" // + "class <span class=\"type-name-label\">RepeatingAtClassLevel3</span>\n"
// + "extends java.lang.Object</pre>"); // + "extends java.lang.Object</pre>");
checkOutput("typeannos/RepeatingOnConstructor.html", true, checkOutput("typeannos/RepeatingOnConstructor.html", true,
"<div class=\"memberSignature\"><span class=\"annotations\">" "<div class=\"member-signature\"><span class=\"annotations\">"
+ "<a href=\"RepConstructorA.html\" title=\"annotation in typeannos\">" + "<a href=\"RepConstructorA.html\" title=\"annotation in typeannos\">"
+ "@RepConstructorA</a> <a href=\"RepConstructorA.html\" " + "@RepConstructorA</a> <a href=\"RepConstructorA.html\" "
+ "title=\"annotation in typeannos\">@RepConstructorA</a>\n" + "title=\"annotation in typeannos\">@RepConstructorA</a>\n"
+ "<a href=\"RepConstructorB.html\" title=\"annotation in typeannos\">" + "<a href=\"RepConstructorB.html\" title=\"annotation in typeannos\">"
+ "@RepConstructorB</a> <a href=\"RepConstructorB.html\" " + "@RepConstructorB</a> <a href=\"RepConstructorB.html\" "
+ "title=\"annotation in typeannos\">@RepConstructorB</a>\n" + "title=\"annotation in typeannos\">@RepConstructorB</a>\n"
+ "</span><span class=\"memberName\">RepeatingOnConstructor</span>()</div>", + "</span><span class=\"member-name\">RepeatingOnConstructor</span>()</div>",
"<div class=\"memberSignature\"><span class=\"annotations\">" "<div class=\"member-signature\"><span class=\"annotations\">"
+ "<a href=\"RepConstructorA.html\" title=\"annotation in typeannos\">" + "<a href=\"RepConstructorA.html\" title=\"annotation in typeannos\">"
+ "@RepConstructorA</a> <a href=\"RepConstructorA.html\" " + "@RepConstructorA</a> <a href=\"RepConstructorA.html\" "
+ "title=\"annotation in typeannos\">@RepConstructorA</a>\n" + "title=\"annotation in typeannos\">@RepConstructorA</a>\n"
+ "<a href=\"RepConstructorB.html\" title=\"annotation in typeannos\">" + "<a href=\"RepConstructorB.html\" title=\"annotation in typeannos\">"
+ "@RepConstructorB</a> <a href=\"RepConstructorB.html\" " + "@RepConstructorB</a> <a href=\"RepConstructorB.html\" "
+ "title=\"annotation in typeannos\">@RepConstructorB</a>\n" + "title=\"annotation in typeannos\">@RepConstructorB</a>\n"
+ "</span><span class=\"memberName\">RepeatingOnConstructor</span>" + "</span><span class=\"member-name\">RepeatingOnConstructor</span>"
+ "&#8203;(<span class=\"arguments\">int&nbsp;i,\n" + "&#8203;(<span class=\"arguments\">int&nbsp;i,\n"
+ "int&nbsp;j)</span></div>", + "int&nbsp;j)</span></div>",
"<div class=\"memberSignature\"><span class=\"annotations\">" "<div class=\"member-signature\"><span class=\"annotations\">"
+ "<a href=\"RepAllContextsA.html\" title=\"annotation in typeannos\">" + "<a href=\"RepAllContextsA.html\" title=\"annotation in typeannos\">"
+ "@RepAllContextsA</a> <a href=\"RepAllContextsA.html\" " + "@RepAllContextsA</a> <a href=\"RepAllContextsA.html\" "
+ "title=\"annotation in typeannos\">@RepAllContextsA</a>\n" + "title=\"annotation in typeannos\">@RepAllContextsA</a>\n"
+ "<a href=\"RepAllContextsB.html\" title=\"annotation in typeannos\">" + "<a href=\"RepAllContextsB.html\" title=\"annotation in typeannos\">"
+ "@RepAllContextsB</a> <a href=\"RepAllContextsB.html\" " + "@RepAllContextsB</a> <a href=\"RepAllContextsB.html\" "
+ "title=\"annotation in typeannos\">@RepAllContextsB</a>\n" + "title=\"annotation in typeannos\">@RepAllContextsB</a>\n"
+ "</span><span class=\"memberName\">RepeatingOnConstructor</span>" + "</span><span class=\"member-name\">RepeatingOnConstructor</span>"
+ "&#8203;(<span class=\"arguments\">int&nbsp;i,\n" + "&#8203;(<span class=\"arguments\">int&nbsp;i,\n"
+ "int&nbsp;j,\nint&nbsp;k)</span></div>", + "int&nbsp;j,\nint&nbsp;k)</span></div>",
"<div class=\"memberSignature\"><span class=\"memberName\">RepeatingOnConstructor</span>" "<div class=\"member-signature\"><span class=\"member-name\">RepeatingOnConstructor</span>"
+ "&#8203;(<span class=\"arguments\"><a href=\"RepParameterA.html\" " + "&#8203;(<span class=\"arguments\"><a href=\"RepParameterA.html\" "
+ "title=\"annotation in typeannos\">@RepParameterA</a> " + "title=\"annotation in typeannos\">@RepParameterA</a> "
+ "<a href=\"RepParameterA.html\" title=\"annotation in typeannos\">@RepParameterA</a> " + "<a href=\"RepParameterA.html\" title=\"annotation in typeannos\">@RepParameterA</a> "
@ -467,7 +467,7 @@ public class TestTypeAnnotations extends JavadocTester {
); );
checkOutput("typeannos/RepeatingOnConstructor.Inner.html", true, checkOutput("typeannos/RepeatingOnConstructor.Inner.html", true,
"<code><span class=\"memberNameLink\"><a href=\"#%3Cinit%3E(java.lang.String," "<code><span class=\"member-name-link\"><a href=\"#%3Cinit%3E(java.lang.String,"
+ "java.lang.String...)\">Inner</a></span>&#8203;(java.lang.String&nbsp;parameter,\n" + "java.lang.String...)\">Inner</a></span>&#8203;(java.lang.String&nbsp;parameter,\n"
+ "java.lang.String <a href=\"RepTypeUseA.html\" title=\"annotation in typeannos\">" + "java.lang.String <a href=\"RepTypeUseA.html\" title=\"annotation in typeannos\">"
+ "@RepTypeUseA</a> <a href=\"RepTypeUseA.html\" title=\"annotation in typeannos\">" + "@RepTypeUseA</a> <a href=\"RepTypeUseA.html\" title=\"annotation in typeannos\">"
@ -495,8 +495,8 @@ public class TestTypeAnnotations extends JavadocTester {
+ "@RepTypeUseB</a> ...&nbsp;vararg)</span>"); + "@RepTypeUseB</a> ...&nbsp;vararg)</span>");
checkOutput("typeannos/RepeatingOnField.html", true, checkOutput("typeannos/RepeatingOnField.html", true,
"<code>(package private) java.lang.Integer</code></td>\n<th class=\"colSecond\" scope=\"row\">" "<code>(package private) java.lang.Integer</code></td>\n<th class=\"col-second\" scope=\"row\">"
+ "<code><span class=\"memberNameLink\"><a href=\"#i1" + "<code><span class=\"member-name-link\"><a href=\"#i1"
+ "\">i1</a></span></code>", + "\">i1</a></span></code>",
"<code>(package private) <a href=\"RepTypeUseA.html\" " "<code>(package private) <a href=\"RepTypeUseA.html\" "
@ -505,7 +505,7 @@ public class TestTypeAnnotations extends JavadocTester {
+ "@RepTypeUseA</a> <a href=\"RepTypeUseB.html\" title=" + "@RepTypeUseA</a> <a href=\"RepTypeUseB.html\" title="
+ "\"annotation in typeannos\">@RepTypeUseB</a> <a href=\"RepTypeUseB.html" + "\"annotation in typeannos\">@RepTypeUseB</a> <a href=\"RepTypeUseB.html"
+ "\" title=\"annotation in typeannos\">@RepTypeUseB</a> java.lang.Integer</code></td>\n" + "\" title=\"annotation in typeannos\">@RepTypeUseB</a> java.lang.Integer</code></td>\n"
+ "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\"><a href=" + "<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\"><a href="
+ "\"#i2\">i2</a></span></code>", + "\"#i2\">i2</a></span></code>",
"<code>(package private) <a href=\"RepTypeUseA.html\" title=" "<code>(package private) <a href=\"RepTypeUseA.html\" title="
@ -514,7 +514,7 @@ public class TestTypeAnnotations extends JavadocTester {
+ "\"RepTypeUseB.html\" title=\"annotation in typeannos\">" + "\"RepTypeUseB.html\" title=\"annotation in typeannos\">"
+ "@RepTypeUseB</a> <a href=\"RepTypeUseB.html\" title=" + "@RepTypeUseB</a> <a href=\"RepTypeUseB.html\" title="
+ "\"annotation in typeannos\">@RepTypeUseB</a> java.lang.Integer</code>" + "\"annotation in typeannos\">@RepTypeUseB</a> java.lang.Integer</code>"
+ "</td>\n<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">" + "</td>\n<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\">"
+ "<a href=\"#i3\">i3</a></span></code>", + "<a href=\"#i3\">i3</a></span></code>",
"<code>(package private) <a href=\"RepAllContextsA.html\" title=\"" "<code>(package private) <a href=\"RepAllContextsA.html\" title=\""
@ -523,7 +523,7 @@ public class TestTypeAnnotations extends JavadocTester {
+ "\"RepAllContextsB.html\" title=\"annotation in typeannos\">" + "\"RepAllContextsB.html\" title=\"annotation in typeannos\">"
+ "@RepAllContextsB</a> <a href=\"RepAllContextsB.html\" title=" + "@RepAllContextsB</a> <a href=\"RepAllContextsB.html\" title="
+ "\"annotation in typeannos\">@RepAllContextsB</a> java.lang.Integer</code>" + "\"annotation in typeannos\">@RepAllContextsB</a> java.lang.Integer</code>"
+ "</td>\n<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">" + "</td>\n<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\">"
+ "<a href=\"#i4\">i4</a></span></code>", + "<a href=\"#i4\">i4</a></span></code>",
"<code>(package private) java.lang.String <a href=\"RepTypeUseA.html" "<code>(package private) java.lang.String <a href=\"RepTypeUseA.html"
@ -537,50 +537,50 @@ public class TestTypeAnnotations extends JavadocTester {
+ "\"annotation in typeannos\">@RepTypeUseA</a> <a href=\"RepTypeUseB.html" + "\"annotation in typeannos\">@RepTypeUseA</a> <a href=\"RepTypeUseB.html"
+ "\" title=\"annotation in typeannos\">@RepTypeUseB</a> <a href=" + "\" title=\"annotation in typeannos\">@RepTypeUseB</a> <a href="
+ "\"RepTypeUseB.html\" title=\"annotation in typeannos\">" + "\"RepTypeUseB.html\" title=\"annotation in typeannos\">"
+ "@RepTypeUseB</a> []</code></td>\n<th class=\"colSecond\" scope=\"row\"><code><span class=" + "@RepTypeUseB</a> []</code></td>\n<th class=\"col-second\" scope=\"row\"><code><span class="
+ "\"memberNameLink\"><a href=\"#sa" + "\"member-name-link\"><a href=\"#sa"
+ "\">sa</a></span></code>", + "\">sa</a></span></code>",
"<div class=\"memberSignature\"><span class=\"annotations\">" "<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=\"RepFieldA.html\" title=\"annotation in typeannos\">@RepFieldA</a>\n" + "<a href=\"RepFieldA.html\" title=\"annotation in typeannos\">@RepFieldA</a>\n"
+ "<a href=\"RepFieldB.html\" title=\"annotation in typeannos\">@RepFieldB</a> " + "<a href=\"RepFieldB.html\" title=\"annotation in typeannos\">@RepFieldB</a> "
+ "<a href=\"RepFieldB.html\" title=\"annotation in typeannos\">@RepFieldB</a>\n" + "<a href=\"RepFieldB.html\" title=\"annotation in typeannos\">@RepFieldB</a>\n"
+ "</span><span class=\"returnType\">java.lang.Integer</span>&nbsp;" + "</span><span class=\"return-type\">java.lang.Integer</span>&nbsp;"
+ "<span class=\"memberName\">i1</span></div>", + "<span class=\"member-name\">i1</span></div>",
"<div class=\"memberSignature\"><span class=\"returnType\">" "<div class=\"member-signature\"><span class=\"return-type\">"
+ "<a href=\"RepTypeUseA.html\" title=\"annotation in typeannos\">@RepTypeUseA</a> " + "<a href=\"RepTypeUseA.html\" title=\"annotation in typeannos\">@RepTypeUseA</a> "
+ "<a href=\"RepTypeUseA.html\" title=\"annotation in typeannos\">@RepTypeUseA</a> " + "<a href=\"RepTypeUseA.html\" title=\"annotation in typeannos\">@RepTypeUseA</a> "
+ "<a href=\"RepTypeUseB.html\" title=\"annotation in typeannos\">@RepTypeUseB</a> " + "<a href=\"RepTypeUseB.html\" title=\"annotation in typeannos\">@RepTypeUseB</a> "
+ "<a href=\"RepTypeUseB.html\" title=\"annotation in typeannos\">@RepTypeUseB</a> " + "<a href=\"RepTypeUseB.html\" title=\"annotation in typeannos\">@RepTypeUseB</a> "
+ "java.lang.Integer</span>&nbsp;<span class=\"memberName\">i2</span></div>", + "java.lang.Integer</span>&nbsp;<span class=\"member-name\">i2</span></div>",
"<div class=\"memberSignature\"><span class=\"annotations\">" "<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=\"RepFieldA.html\" title=\"annotation in typeannos\">@RepFieldA</a>\n" + "<a href=\"RepFieldA.html\" title=\"annotation in typeannos\">@RepFieldA</a>\n"
+ "<a href=\"RepFieldB.html\" title=\"annotation in typeannos\">@RepFieldB</a> " + "<a href=\"RepFieldB.html\" title=\"annotation in typeannos\">@RepFieldB</a> "
+ "<a href=\"RepFieldB.html\" title=\"annotation in typeannos\">@RepFieldB</a>\n" + "<a href=\"RepFieldB.html\" title=\"annotation in typeannos\">@RepFieldB</a>\n"
+ "</span><span class=\"returnType\"><a href=\"RepTypeUseA.html\" " + "</span><span class=\"return-type\"><a href=\"RepTypeUseA.html\" "
+ "title=\"annotation in typeannos\">@RepTypeUseA</a> " + "title=\"annotation in typeannos\">@RepTypeUseA</a> "
+ "<a href=\"RepTypeUseA.html\" title=\"annotation in typeannos\">@RepTypeUseA</a> " + "<a href=\"RepTypeUseA.html\" title=\"annotation in typeannos\">@RepTypeUseA</a> "
+ "<a href=\"RepTypeUseB.html\" title=\"annotation in typeannos\">@RepTypeUseB</a> " + "<a href=\"RepTypeUseB.html\" title=\"annotation in typeannos\">@RepTypeUseB</a> "
+ "<a href=\"RepTypeUseB.html\" title=\"annotation in typeannos\">@RepTypeUseB</a> " + "<a href=\"RepTypeUseB.html\" title=\"annotation in typeannos\">@RepTypeUseB</a> "
+ "java.lang.Integer</span>&nbsp;<span class=\"memberName\">i3</span></div>", + "java.lang.Integer</span>&nbsp;<span class=\"member-name\">i3</span></div>",
"<div class=\"memberSignature\"><span class=\"annotations\">" "<div class=\"member-signature\"><span class=\"annotations\">"
+ "<a href=\"RepAllContextsA.html\" title=\"annotation in typeannos\">@RepAllContextsA</a> " + "<a href=\"RepAllContextsA.html\" title=\"annotation in typeannos\">@RepAllContextsA</a> "
+ "<a href=\"RepAllContextsA.html\" title=\"annotation in typeannos\">@RepAllContextsA</a>\n" + "<a href=\"RepAllContextsA.html\" title=\"annotation in typeannos\">@RepAllContextsA</a>\n"
+ "<a href=\"RepAllContextsB.html\" title=\"annotation in typeannos\">@RepAllContextsB</a> " + "<a href=\"RepAllContextsB.html\" title=\"annotation in typeannos\">@RepAllContextsB</a> "
+ "<a href=\"RepAllContextsB.html\" title=\"annotation in typeannos\">@RepAllContextsB</a>\n" + "<a href=\"RepAllContextsB.html\" title=\"annotation in typeannos\">@RepAllContextsB</a>\n"
+ "</span><span class=\"returnType\"><a href=\"RepAllContextsA.html\" " + "</span><span class=\"return-type\"><a href=\"RepAllContextsA.html\" "
+ "title=\"annotation in typeannos\">@RepAllContextsA</a> " + "title=\"annotation in typeannos\">@RepAllContextsA</a> "
+ "<a href=\"RepAllContextsA.html\" title=\"annotation in typeannos\">@RepAllContextsA</a> " + "<a href=\"RepAllContextsA.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\">@RepAllContextsB</a> "
+ "<a href=\"RepAllContextsB.html\" title=\"annotation in typeannos\">@RepAllContextsB</a> " + "<a href=\"RepAllContextsB.html\" title=\"annotation in typeannos\">@RepAllContextsB</a> "
+ "java.lang.Integer</span>&nbsp;<span class=\"memberName\">i4</span></div>", + "java.lang.Integer</span>&nbsp;<span class=\"member-name\">i4</span></div>",
"<div class=\"memberSignature\"><span class=\"returnType\">java.lang.String " "<div class=\"member-signature\"><span class=\"return-type\">java.lang.String "
+ "<a href=\"RepTypeUseA.html\" title=\"annotation in typeannos\">@RepTypeUseA</a> " + "<a href=\"RepTypeUseA.html\" title=\"annotation in typeannos\">@RepTypeUseA</a> "
+ "<a href=\"RepTypeUseA.html\" title=\"annotation in typeannos\">@RepTypeUseA</a> " + "<a href=\"RepTypeUseA.html\" title=\"annotation in typeannos\">@RepTypeUseA</a> "
+ "<a href=\"RepTypeUseB.html\" title=\"annotation in typeannos\">@RepTypeUseB</a> " + "<a href=\"RepTypeUseB.html\" title=\"annotation in typeannos\">@RepTypeUseB</a> "
@ -589,11 +589,11 @@ public class TestTypeAnnotations extends JavadocTester {
+ "<a href=\"RepTypeUseA.html\" title=\"annotation in typeannos\">@RepTypeUseA</a> " + "<a href=\"RepTypeUseA.html\" title=\"annotation in typeannos\">@RepTypeUseA</a> "
+ "<a href=\"RepTypeUseB.html\" title=\"annotation in typeannos\">@RepTypeUseB</a> " + "<a href=\"RepTypeUseB.html\" title=\"annotation in typeannos\">@RepTypeUseB</a> "
+ "<a href=\"RepTypeUseB.html\" title=\"annotation in typeannos\">@RepTypeUseB</a> []" + "<a href=\"RepTypeUseB.html\" title=\"annotation in typeannos\">@RepTypeUseB</a> []"
+ "</span>&nbsp;<span class=\"memberName\">sa</span></div>"); + "</span>&nbsp;<span class=\"member-name\">sa</span></div>");
checkOutput("typeannos/RepeatingOnMethod.html", true, checkOutput("typeannos/RepeatingOnMethod.html", true,
"<code>(package private) java.lang.String</code></td>\n<th class=\"colSecond\" scope=\"row\">" "<code>(package private) java.lang.String</code></td>\n<th class=\"col-second\" scope=\"row\">"
+ "<code><span class=\"memberNameLink\"><a href=" + "<code><span class=\"member-name-link\"><a href="
+ "\"#test1()\">test1</a></span>()</code>", + "\"#test1()\">test1</a></span>()</code>",
"<code>(package private) <a href=\"RepTypeUseA.html\" " "<code>(package private) <a href=\"RepTypeUseA.html\" "
@ -602,7 +602,7 @@ public class TestTypeAnnotations extends JavadocTester {
+ "@RepTypeUseA</a> <a href=\"RepTypeUseB.html\" title=" + "@RepTypeUseA</a> <a href=\"RepTypeUseB.html\" title="
+ "\"annotation in typeannos\">@RepTypeUseB</a> <a href=\"RepTypeUseB.html" + "\"annotation in typeannos\">@RepTypeUseB</a> <a href=\"RepTypeUseB.html"
+ "\" title=\"annotation in typeannos\">@RepTypeUseB</a> java.lang.String</code>" + "\" title=\"annotation in typeannos\">@RepTypeUseB</a> java.lang.String</code>"
+ "</td>\n<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">" + "</td>\n<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\">"
+ "<a href=\"#test2()\">test2</a>" + "<a href=\"#test2()\">test2</a>"
+ "</span>()</code>", + "</span>()</code>",
@ -612,7 +612,7 @@ public class TestTypeAnnotations extends JavadocTester {
+ "@RepTypeUseA</a> <a href=\"RepTypeUseB.html\" title=" + "@RepTypeUseA</a> <a href=\"RepTypeUseB.html\" title="
+ "\"annotation in typeannos\">@RepTypeUseB</a> <a href=\"RepTypeUseB.html\" " + "\"annotation in typeannos\">@RepTypeUseB</a> <a href=\"RepTypeUseB.html\" "
+ "title=\"annotation in typeannos\">@RepTypeUseB</a> java.lang.String</code>" + "title=\"annotation in typeannos\">@RepTypeUseB</a> java.lang.String</code>"
+ "</td>\n<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">" + "</td>\n<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\">"
+ "<a href=\"#test3()\">test3</a>" + "<a href=\"#test3()\">test3</a>"
+ "</span>()</code>", + "</span>()</code>",
@ -622,11 +622,11 @@ public class TestTypeAnnotations extends JavadocTester {
+ "@RepAllContextsA</a> <a href=\"RepAllContextsB.html\" " + "@RepAllContextsA</a> <a href=\"RepAllContextsB.html\" "
+ "title=\"annotation in typeannos\">@RepAllContextsB</a> <a href=" + "title=\"annotation in typeannos\">@RepAllContextsB</a> <a href="
+ "\"RepAllContextsB.html\" title=\"annotation in typeannos\">" + "\"RepAllContextsB.html\" title=\"annotation in typeannos\">"
+ "@RepAllContextsB</a> java.lang.String</code></td>\n<th class=\"colSecond\" scope=\"row\">" + "@RepAllContextsB</a> java.lang.String</code></td>\n<th class=\"col-second\" scope=\"row\">"
+ "<code><span class=\"memberNameLink\"><a href=\"" + "<code><span class=\"member-name-link\"><a href=\""
+ "#test4()\">test4</a></span>()</code>", + "#test4()\">test4</a></span>()</code>",
"<code><span class=\"memberNameLink\"><a href=\"" "<code><span class=\"member-name-link\"><a href=\""
+ "#test5(java.lang.String,java.lang.String...)\">test5</a></span>" + "#test5(java.lang.String,java.lang.String...)\">test5</a></span>"
+ "&#8203;(java.lang.String&nbsp;parameter,\njava.lang.String <a href=" + "&#8203;(java.lang.String&nbsp;parameter,\njava.lang.String <a href="
+ "\"RepTypeUseA.html\" title=\"annotation in typeannos\">" + "\"RepTypeUseA.html\" title=\"annotation in typeannos\">"
@ -640,39 +640,39 @@ public class TestTypeAnnotations extends JavadocTester {
+ "<a href=\"RepMethodA.html\" title=\"annotation in typeannos\">@RepMethodA</a>\n" + "<a href=\"RepMethodA.html\" title=\"annotation in typeannos\">@RepMethodA</a>\n"
+ "<a href=\"RepMethodB.html\" title=\"annotation in typeannos\">@RepMethodB</a> " + "<a href=\"RepMethodB.html\" title=\"annotation in typeannos\">@RepMethodB</a> "
+ "<a href=\"RepMethodB.html\" title=\"annotation in typeannos\">@RepMethodB</a>\n" + "<a href=\"RepMethodB.html\" title=\"annotation in typeannos\">@RepMethodB</a>\n"
+ "</span><span class=\"returnType\">java.lang.String</span>&nbsp;" + "</span><span class=\"return-type\">java.lang.String</span>&nbsp;"
+ "<span class=\"memberName\">test1</span>()", + "<span class=\"member-name\">test1</span>()",
"<a href=\"RepTypeUseA.html\" title=\"annotation in typeannos\">" "<a href=\"RepTypeUseA.html\" title=\"annotation in typeannos\">"
+ "@RepTypeUseA</a> <a href=\"RepTypeUseA.html\" title=" + "@RepTypeUseA</a> <a href=\"RepTypeUseA.html\" title="
+ "\"annotation in typeannos\">@RepTypeUseA</a> <a href=\"RepTypeUseB.html\" " + "\"annotation in typeannos\">@RepTypeUseA</a> <a href=\"RepTypeUseB.html\" "
+ "title=\"annotation in typeannos\">@RepTypeUseB</a> <a href=\"RepTypeUseB.html\" " + "title=\"annotation in typeannos\">@RepTypeUseB</a> <a href=\"RepTypeUseB.html\" "
+ "title=\"annotation in typeannos\">@RepTypeUseB</a> java.lang.String</span>" + "title=\"annotation in typeannos\">@RepTypeUseB</a> java.lang.String</span>"
+ "&nbsp;<span class=\"memberName\">test2</span>()", + "&nbsp;<span class=\"member-name\">test2</span>()",
"<a href=\"RepMethodA.html\" title=\"annotation in typeannos\">@RepMethodA</a> " "<a href=\"RepMethodA.html\" title=\"annotation in typeannos\">@RepMethodA</a> "
+ "<a href=\"RepMethodA.html\" title=\"annotation in typeannos\">@RepMethodA</a>\n" + "<a href=\"RepMethodA.html\" title=\"annotation in typeannos\">@RepMethodA</a>\n"
+ "<a href=\"RepMethodB.html\" title=\"annotation in typeannos\">@RepMethodB</a> " + "<a href=\"RepMethodB.html\" title=\"annotation in typeannos\">@RepMethodB</a> "
+ "<a href=\"RepMethodB.html\" title=\"annotation in typeannos\">@RepMethodB</a>\n" + "<a href=\"RepMethodB.html\" title=\"annotation in typeannos\">@RepMethodB</a>\n"
+ "</span><span class=\"returnType\"><a href=\"RepTypeUseA.html\" " + "</span><span class=\"return-type\"><a href=\"RepTypeUseA.html\" "
+ "title=\"annotation in typeannos\">@RepTypeUseA</a> <a href=\"RepTypeUseA.html\" " + "title=\"annotation in typeannos\">@RepTypeUseA</a> <a href=\"RepTypeUseA.html\" "
+ "title=\"annotation in typeannos\">@RepTypeUseA</a> <a href=\"RepTypeUseB.html\" " + "title=\"annotation in typeannos\">@RepTypeUseA</a> <a href=\"RepTypeUseB.html\" "
+ "title=\"annotation in typeannos\">@RepTypeUseB</a> <a href=\"RepTypeUseB.html\" " + "title=\"annotation in typeannos\">@RepTypeUseB</a> <a href=\"RepTypeUseB.html\" "
+ "title=\"annotation in typeannos\">@RepTypeUseB</a> java.lang.String</span>&nbsp;" + "title=\"annotation in typeannos\">@RepTypeUseB</a> java.lang.String</span>&nbsp;"
+ "<span class=\"memberName\">test3</span>()", + "<span class=\"member-name\">test3</span>()",
"<a href=\"RepAllContextsA.html\" title=\"annotation in typeannos\">@RepAllContextsA</a> " "<a href=\"RepAllContextsA.html\" title=\"annotation in typeannos\">@RepAllContextsA</a> "
+ "<a href=\"RepAllContextsA.html\" title=\"annotation in typeannos\">@RepAllContextsA</a>\n" + "<a href=\"RepAllContextsA.html\" title=\"annotation in typeannos\">@RepAllContextsA</a>\n"
+ "<a href=\"RepAllContextsB.html\" title=\"annotation in typeannos\">@RepAllContextsB</a> " + "<a href=\"RepAllContextsB.html\" title=\"annotation in typeannos\">@RepAllContextsB</a> "
+ "<a href=\"RepAllContextsB.html\" title=\"annotation in typeannos\">@RepAllContextsB</a>\n" + "<a href=\"RepAllContextsB.html\" title=\"annotation in typeannos\">@RepAllContextsB</a>\n"
+ "</span><span class=\"returnType\"><a href=\"RepAllContextsA.html\" " + "</span><span class=\"return-type\"><a href=\"RepAllContextsA.html\" "
+ "title=\"annotation in typeannos\">@RepAllContextsA</a> <a href=\"RepAllContextsA.html\" " + "title=\"annotation in typeannos\">@RepAllContextsA</a> <a href=\"RepAllContextsA.html\" "
+ "title=\"annotation in typeannos\">@RepAllContextsA</a> <a href=\"RepAllContextsB.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\">@RepAllContextsB</a> <a href=\"RepAllContextsB.html\" "
+ "title=\"annotation in typeannos\">@RepAllContextsB</a> java.lang.String</span>&nbsp;" + "title=\"annotation in typeannos\">@RepAllContextsB</a> java.lang.String</span>&nbsp;"
+ "<span class=\"memberName\">test4</span>()", + "<span class=\"member-name\">test4</span>()",
"java.lang.String</span>&nbsp;<span class=\"memberName\">test5</span>&#8203;(" "java.lang.String</span>&nbsp;<span class=\"member-name\">test5</span>&#8203;("
+ "<span class=\"arguments\"><a href=\"RepTypeUseA.html\" " + "<span class=\"arguments\"><a href=\"RepTypeUseA.html\" "
+ "title=\"annotation in typeannos\">@RepTypeUseA</a> " + "title=\"annotation in typeannos\">@RepTypeUseA</a> "
+ "<a href=\"RepTypeUseA.html\" title=\"annotation in typeannos\">@RepTypeUseA</a> " + "<a href=\"RepTypeUseA.html\" title=\"annotation in typeannos\">@RepTypeUseA</a> "
@ -696,12 +696,12 @@ public class TestTypeAnnotations extends JavadocTester {
checkOutput("typeannos/RepeatingOnTypeParametersBoundsTypeArgumentsOnMethod.html", true, checkOutput("typeannos/RepeatingOnTypeParametersBoundsTypeArgumentsOnMethod.html", true,
"<code>(package private) &lt;T&gt;&nbsp;java.lang.String</code></td>\n" "<code>(package private) &lt;T&gt;&nbsp;java.lang.String</code></td>\n"
+ "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\"><a href=" + "<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\"><a href="
+ "\"#" + "\"#"
+ "genericMethod(T)\">genericMethod</a></span>&#8203;(T&nbsp;t)</code>", + "genericMethod(T)\">genericMethod</a></span>&#8203;(T&nbsp;t)</code>",
"<code>(package private) &lt;T&gt;&nbsp;java.lang.String</code></td>\n" "<code>(package private) &lt;T&gt;&nbsp;java.lang.String</code></td>\n"
+ "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\"><a href=" + "<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\"><a href="
+ "\"#" + "\"#"
+ "genericMethod2(T)\">genericMethod2</a></span>&#8203;(<a href=\"RepTypeUseA.html" + "genericMethod2(T)\">genericMethod2</a></span>&#8203;(<a href=\"RepTypeUseA.html"
+ "\" title=\"annotation in typeannos\">@RepTypeUseA</a> <a href=\"RepTypeUseA.html" + "\" title=\"annotation in typeannos\">@RepTypeUseA</a> <a href=\"RepTypeUseA.html"
@ -709,12 +709,12 @@ public class TestTypeAnnotations extends JavadocTester {
+ "\" title=\"annotation in typeannos\">@RepTypeUseB</a> <a href=\"RepTypeUseB.html" + "\" title=\"annotation in typeannos\">@RepTypeUseB</a> <a href=\"RepTypeUseB.html"
+ "\" title=\"annotation in typeannos\">@RepTypeUseB</a> T&nbsp;t)</code>", + "\" title=\"annotation in typeannos\">@RepTypeUseB</a> T&nbsp;t)</code>",
"<code>(package private) java.lang.String</code></td>\n<th class=\"colSecond\" scope=\"row\"><code>" "<code>(package private) java.lang.String</code></td>\n<th class=\"col-second\" scope=\"row\"><code>"
+ "<span class=\"memberNameLink\"><a href=\"#" + "<span class=\"member-name-link\"><a href=\"#"
+ "test()\">test</a></span>()</code>", + "test()\">test</a></span>()</code>",
"<span class=\"returnType\">java.lang.String</span>&nbsp;" "<span class=\"return-type\">java.lang.String</span>&nbsp;"
+ "<span class=\"memberName\">test</span>" + "<span class=\"member-name\">test</span>"
+ "&#8203;(<span class=\"arguments\"><a href=\"RepTypeUseA.html\" " + "&#8203;(<span class=\"arguments\"><a href=\"RepTypeUseA.html\" "
+ "title=\"annotation in typeannos\">@RepTypeUseA</a> <a href=" + "title=\"annotation in typeannos\">@RepTypeUseA</a> <a href="
+ "\"RepTypeUseA.html\" title=\"annotation in typeannos\">" + "\"RepTypeUseA.html\" title=\"annotation in typeannos\">"
@ -733,7 +733,7 @@ public class TestTypeAnnotations extends JavadocTester {
+ "<a href=\"RepMethodA.html\" title=\"annotation in typeannos\">@RepMethodA</a>\n" + "<a href=\"RepMethodA.html\" title=\"annotation in typeannos\">@RepMethodA</a>\n"
+ "<a href=\"RepMethodB.html\" title=\"annotation in typeannos\">@RepMethodB</a> " + "<a href=\"RepMethodB.html\" title=\"annotation in typeannos\">@RepMethodB</a> "
+ "<a href=\"RepMethodB.html\" title=\"annotation in typeannos\">@RepMethodB</a>\n" + "<a href=\"RepMethodB.html\" title=\"annotation in typeannos\">@RepMethodB</a>\n"
+ "</span><span class=\"returnType\">void</span>&nbsp;" + "</span><span class=\"return-type\">void</span>&nbsp;"
+ "<span class=\"memberName\">test</span>()"); + "<span class=\"member-name\">test</span>()");
} }
} }

4
test/langtools/jdk/javadoc/doclet/testTypeParams/TestTypeParameters.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -53,7 +53,7 @@ public class TestTypeParameters extends JavadocTester {
checkExit(Exit.OK); checkExit(Exit.OK);
checkOutput("pkg/C.html", true, checkOutput("pkg/C.html", true,
"<td class=\"colFirst\"><code>&lt;W extends java.lang.String,&#8203;\nV extends " "<td class=\"col-first\"><code>&lt;W extends java.lang.String,&#8203;\nV extends "
+ "java.util.List&gt;<br>java.lang.Object</code></td>", + "java.util.List&gt;<br>java.lang.Object</code></td>",
"<code>&lt;T&gt;&nbsp;java.lang.Object</code>"); "<code>&lt;T&gt;&nbsp;java.lang.Object</code>");

30
test/langtools/jdk/javadoc/doclet/testUnnamedPackage/TestUnnamedPackage.java
View file

@ -66,18 +66,18 @@ public class TestUnnamedPackage extends JavadocTester {
"<a href=\"package-summary.html\">"); "<a href=\"package-summary.html\">");
checkOutput("allclasses-index.html", true, checkOutput("allclasses-index.html", true,
"<div class=\"typeSummary\">\n<table>\n" "<div class=\"type-summary\">\n<table>\n"
+ "<caption><span>Class Summary</span><span class=\"tabEnd\">&nbsp;</span></caption>\n" + "<caption><span>Class Summary</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
+ "<thead>\n" + "<thead>\n"
+ "<tr>\n" + "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Class</th>\n" + "<th class=\"col-first\" scope=\"col\">Class</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n" + "<th class=\"col-last\" scope=\"col\">Description</th>\n"
+ "</tr>\n" + "</tr>\n"
+ "</thead>\n" + "</thead>\n"
+ "<tbody>\n" + "<tbody>\n"
+ "<tr class=\"altColor\" id=\"i0\">\n" + "<tr class=\"alt-color\" id=\"i0\">\n"
+ "<td class=\"colFirst\"><a href=\"C.html\" title=\"class in &lt;Unnamed&gt;\">C</a></td>\n" + "<td class=\"col-first\"><a href=\"C.html\" title=\"class in &lt;Unnamed&gt;\">C</a></td>\n"
+ "<th class=\"colLast\" scope=\"row\">\n" + "<th class=\"col-last\" scope=\"row\">\n"
+ "<div class=\"block\">This is a class in the unnamed package.</div>\n" + "<div class=\"block\">This is a class in the unnamed package.</div>\n"
+ "</th>\n" + "</th>\n"
+ "</tr>\n" + "</tr>\n"
@ -85,18 +85,18 @@ public class TestUnnamedPackage extends JavadocTester {
+ "</table>"); + "</table>");
checkOutput("allpackages-index.html", true, checkOutput("allpackages-index.html", true,
"<div class=\"packagesSummary\">\n<table>\n" "<div class=\"packages-summary\">\n<table>\n"
+ "<caption><span>Package Summary</span><span class=\"tabEnd\">&nbsp;</span></caption>\n" + "<caption><span>Package Summary</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
+ "<thead>\n" + "<thead>\n"
+ "<tr>\n" + "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Package</th>\n" + "<th class=\"col-first\" scope=\"col\">Package</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n" + "<th class=\"col-last\" scope=\"col\">Description</th>\n"
+ "</tr>\n" + "</tr>\n"
+ "</thead>\n" + "</thead>\n"
+ "<tbody>\n" + "<tbody>\n"
+ "<tr class=\"altColor\">\n" + "<tr class=\"alt-color\">\n"
+ "<th class=\"colFirst\" scope=\"row\"><a href=\"package-summary.html\">&lt;Unnamed&gt;</a></th>\n" + "<th class=\"col-first\" scope=\"row\"><a href=\"package-summary.html\">&lt;Unnamed&gt;</a></th>\n"
+ "<td class=\"colLast\">\n" + "<td class=\"col-last\">\n"
+ "<div class=\"block\">This is a package comment for the unnamed package.</div>\n" + "<div class=\"block\">This is a package comment for the unnamed package.</div>\n"
+ "</td>\n" + "</td>\n"
+ "</tr>\n" + "</tr>\n"
@ -111,7 +111,7 @@ public class TestUnnamedPackage extends JavadocTester {
checkOutput("index-all.html", true, checkOutput("index-all.html", true,
"<br><a href=\"allclasses-index.html\">All&nbsp;Classes</a>" "<br><a href=\"allclasses-index.html\">All&nbsp;Classes</a>"
+ "<span class=\"verticalSeparator\">|</span>" + "<span class=\"vertical-separator\">|</span>"
+ "<a href=\"allpackages-index.html\">All&nbsp;Packages</a>"); + "<a href=\"allpackages-index.html\">All&nbsp;Packages</a>");
checkOutput(Output.OUT, false, checkOutput(Output.OUT, false,

18
test/langtools/jdk/javadoc/doclet/testUseOption/TestUseOption.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -122,15 +122,15 @@ public class TestUseOption extends JavadocTester {
checkOutput("pkg1/class-use/UsedInterface.html", true, checkOutput("pkg1/class-use/UsedInterface.html", true,
"Subinterfaces of <a href=\"../UsedInterface.html\" title=\"interface in pkg1\">" "Subinterfaces of <a href=\"../UsedInterface.html\" title=\"interface in pkg1\">"
+ "UsedInterface</a> in <a href=\"../package-summary.html\">pkg1", + "UsedInterface</a> in <a href=\"../package-summary.html\">pkg1",
"<td class=\"colFirst\"><code>interface&nbsp;</code></td>\n<th class=\"colSecond\" scope=\"row\">" "<td class=\"col-first\"><code>interface&nbsp;</code></td>\n<th class=\"col-second\" scope=\"row\">"
+ "<code><span class=\"memberNameLink\"><a href=\"../SubInterface.html\" " + "<code><span class=\"member-name-link\"><a href=\"../SubInterface.html\" "
+ "title=\"interface in pkg1\">SubInterface</a>&lt;T&gt;</span></code></th>" + "title=\"interface in pkg1\">SubInterface</a>&lt;T&gt;</span></code></th>"
); );
checkOutput("pkg1/class-use/UsedThrowable.html", true, checkOutput("pkg1/class-use/UsedThrowable.html", true,
"Methods in <a href=\"../package-summary.html\">pkg1</a> that throw " "Methods in <a href=\"../package-summary.html\">pkg1</a> that throw "
+ "<a href=\"../UsedThrowable.html\" title=\"class in pkg1\">UsedThrowable</a>", + "<a href=\"../UsedThrowable.html\" title=\"class in pkg1\">UsedThrowable</a>",
"<td class=\"colFirst\"><code>void</code></td>\n<th class=\"colSecond\" scope=\"row\"><span class=" "<td class=\"col-first\"><code>void</code></td>\n<th class=\"col-second\" scope=\"row\"><span class="
+ "\"typeNameLabel\">C1.</span><code><span class=\"memberNameLink\">" + "\"type-name-label\">C1.</span><code><span class=\"member-name-link\">"
+ "<a href=\"../C1.html#methodInC1ThrowsThrowable()\">methodInC1ThrowsThrowable" + "<a href=\"../C1.html#methodInC1ThrowsThrowable()\">methodInC1ThrowsThrowable"
+ "</a></span>()</code></th>" + "</a></span>()</code></th>"
); );
@ -149,14 +149,14 @@ public class TestUseOption extends JavadocTester {
+ "UsedInC</a> in <a href=\"../package-summary.html\">&lt;Unnamed&gt;</a>" + "UsedInC</a> in <a href=\"../package-summary.html\">&lt;Unnamed&gt;</a>"
); );
checkOutput("class-use/UsedInC.html", true, checkOutput("class-use/UsedInC.html", true,
"<li class=\"blockList\">\n" "<li class=\"block-list\">\n"
+ "<section class=\"detail\" id=\"unnamed.package\">\n" + "<section class=\"detail\" id=\"unnamed.package\">\n"
); );
checkOutput("package-use.html", true, checkOutput("package-use.html", true,
"<th class=\"colFirst\" scope=\"row\">" "<th class=\"col-first\" scope=\"row\">"
+ "<a href=\"class-use/UsedInC.html#unnamed.package\">UsedInC</a></th>", + "<a href=\"class-use/UsedInC.html#unnamed.package\">UsedInC</a></th>",
"<th class=\"colFirst\" scope=\"row\"><a href=\"#unnamed.package\">&lt;Unnamed&gt;</a></th>\n" "<th class=\"col-first\" scope=\"row\"><a href=\"#unnamed.package\">&lt;Unnamed&gt;</a></th>\n"
+ "<td class=\"colLast\">&nbsp;</td>" + "<td class=\"col-last\">&nbsp;</td>"
); );
} }

4
test/langtools/jdk/javadoc/doclet/testValueTag/TestValueTagInModule.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -68,7 +68,7 @@ public class TestValueTagInModule extends JavadocTester {
checkExit(Exit.OK); checkExit(Exit.OK);
checkOutput("m1/module-summary.html", true, checkOutput("m1/module-summary.html", true,
"<section class=\"moduleDescription\" id=\"module.description\">\n" "<section class=\"module-description\" id=\"module.description\">\n"
+ "<!-- ============ MODULE DESCRIPTION =========== -->\n" + "<!-- ============ MODULE DESCRIPTION =========== -->\n"
+ "<div class=\"block\">value of field CONS : <a href=\"pkg/A.html#CONS\">100</a></div>"); + "<div class=\"block\">value of field CONS : <a href=\"pkg/A.html#CONS\">100</a></div>");
} }

12
test/langtools/jdk/javadoc/tool/testLocaleOption/TestLocaleOption.java
View file

@ -176,15 +176,15 @@ public class TestLocaleOption extends TestRunner {
if (Objects.equals(docLocale, ALLCAPS)) { if (Objects.equals(docLocale, ALLCAPS)) {
checkContains(hw, checkContains(hw,
"<h2>METHOD SUMMARY</h2>", "<h2>METHOD SUMMARY</h2>",
"<th class=\"colFirst\" scope=\"col\">MODIFIER AND TYPE</th>", "<th class=\"col-first\" scope=\"col\">MODIFIER AND TYPE</th>",
"<th class=\"colSecond\" scope=\"col\">METHOD</th>", "<th class=\"col-second\" scope=\"col\">METHOD</th>",
"<th class=\"colLast\" scope=\"col\">DESCRIPTION</th>"); "<th class=\"col-last\" scope=\"col\">DESCRIPTION</th>");
} else { } else {
checkContains(hw, checkContains(hw,
"<h2>Method Summary</h2>", "<h2>Method Summary</h2>",
"<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>", "<th class=\"col-first\" scope=\"col\">Modifier and Type</th>",
"<th class=\"colSecond\" scope=\"col\">Method</th>", "<th class=\"col-second\" scope=\"col\">Method</th>",
"<th class=\"colLast\" scope=\"col\">Description</th>"); "<th class=\"col-last\" scope=\"col\">Description</th>");
} }
} }