infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-20 21:03:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

8308659: Use CSS scroll-margin instead of flexbox layout in API documentation

Browse Source 
Reviewed-by: jjg
This commit is contained in:
Hannes Wallnöfer 2023-10-16 12:56:41 +00:00
parent 7028fb9d58
commit eb7d972d8a
37 changed files with 221 additions and 186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeMemberWriter.java
View File

@ -94,9 +94,9 @@ public class AnnotationTypeMemberWriter extends AbstractMemberWriter {
for (Element member : members) {
currentMember = member;
Content annotationContent = getAnnotationHeaderContent(currentMember);
buildAnnotationTypeMemberChildren(annotationContent);
Content div = HtmlTree.DIV(HtmlStyle.horizontalScroll);
buildAnnotationTypeMemberChildren(div);
annotationContent.add(div);
memberList.add(writer.getMemberListItem(annotationContent));
}
Content annotationDetails = getAnnotationDetails(annotationDetailsHeader, memberList);

2
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriter.java
View File

@ -158,7 +158,7 @@ public class ClassWriter extends SubWriterHolderWriter {
* @param target the content to which the documentation will be added
*/
protected void buildClassInfo(Content target) {
Content c = new ContentBuilder();
Content c = HtmlTree.DIV(HtmlStyle.horizontalScroll);
buildParamInfo(c);
buildSuperInterfacesInfo(c);
buildImplementedInterfacesInfo(c);

14
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstructorWriter.java
View File

@ -106,13 +106,13 @@ public class ConstructorWriter extends AbstractExecutableMemberWriter {
for (Element constructor : constructors) {
currentConstructor = (ExecutableElement)constructor;
Content constructorContent = getConstructorHeaderContent(currentConstructor);
buildSignature(constructorContent);
buildDeprecationInfo(constructorContent);
buildPreviewInfo(constructorContent);
buildConstructorComments(constructorContent);
buildTagInfo(constructorContent);
Content div = HtmlTree.DIV(HtmlStyle.horizontalScroll);
buildSignature(div);
buildDeprecationInfo(div);
buildPreviewInfo(div);
buildConstructorComments(div);
buildTagInfo(div);
constructorContent.add(div);
memberList.add(getMemberListItem(constructorContent));
}
Content constructorDetails = getConstructorDetails(constructorDetailsHeader, memberList);

14
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/EnumConstantWriter.java
View File

@ -73,13 +73,13 @@ public class EnumConstantWriter extends AbstractMemberWriter {
for (Element enumConstant : enumConstants) {
currentElement = (VariableElement)enumConstant;
Content enumConstantContent = getEnumConstantsHeader(currentElement);
buildSignature(enumConstantContent);
buildDeprecationInfo(enumConstantContent);
buildPreviewInfo(enumConstantContent);
buildEnumConstantComments(enumConstantContent);
buildTagInfo(enumConstantContent);
Content div = HtmlTree.DIV(HtmlStyle.horizontalScroll);
buildSignature(div);
buildDeprecationInfo(div);
buildPreviewInfo(div);
buildEnumConstantComments(div);
buildTagInfo(div);
enumConstantContent.add(div);
memberList.add(getMemberListItem(enumConstantContent));
}
Content enumConstantDetails = getEnumConstantsDetails(

14
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FieldWriter.java
View File

@ -83,13 +83,13 @@ public class FieldWriter extends AbstractMemberWriter {
for (Element element : fields) {
currentElement = (VariableElement)element;
Content fieldContent = getFieldHeaderContent(currentElement);
buildSignature(fieldContent);
buildDeprecationInfo(fieldContent);
buildPreviewInfo(fieldContent);
buildFieldComments(fieldContent);
buildTagInfo(fieldContent);
Content div = HtmlTree.DIV(HtmlStyle.horizontalScroll);
buildSignature(div);
buildDeprecationInfo(div);
buildPreviewInfo(div);
buildFieldComments(div);
buildTagInfo(div);
fieldContent.add(div);
memberList.add(getMemberListItem(fieldContent));
}
Content fieldDetails = getFieldDetails(fieldDetailsHeader, memberList);

8
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java
View File

@ -504,7 +504,7 @@ public abstract class HtmlDocletWriter {
*
* @return the {@code <header>} element
*/
protected HtmlTree getHeader(Navigation.PageMode pageMode) {
protected Content getHeader(Navigation.PageMode pageMode) {
return getHeader(pageMode, null);
}
@ -517,10 +517,10 @@ public abstract class HtmlDocletWriter {
*
* @return the {@code <header>} element
*/
protected HtmlTree getHeader(Navigation.PageMode pageMode, Element element) {
protected Content getHeader(Navigation.PageMode pageMode, Element element) {
return HtmlTree.HEADER()
.add(RawHtml.of(replaceDocRootDir(options.top())))
.add(getNavBar(pageMode, element).getContent());
.add(RawHtml.of(replaceDocRootDir(options.top())))
.add(getNavBar(pageMode, element).getContent());
}
/**

14
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MethodWriter.java
View File

@ -105,13 +105,13 @@ public class MethodWriter extends AbstractExecutableMemberWriter {
for (Element method : methods) {
currentMethod = (ExecutableElement)method;
Content methodContent = getMethodHeader(currentMethod);
buildSignature(methodContent);
buildDeprecationInfo(methodContent);
buildPreviewInfo(methodContent);
buildMethodComments(methodContent);
buildTagInfo(methodContent);
Content div = HtmlTree.DIV(HtmlStyle.horizontalScroll);
buildSignature(div);
buildDeprecationInfo(div);
buildPreviewInfo(div);
buildMethodComments(div);
buildTagInfo(div);
methodContent.add(div);
memberList.add(writer.getMemberListItem(methodContent));
}
Content methodDetails = getMethodDetails(methodDetailsHeader, memberList);

9
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriter.java
View File

@ -191,9 +191,11 @@ public class ModuleWriter extends HtmlDocletWriter {
*/
protected void buildContent() {
Content moduleContent = getContentHeader();
addModuleSignature(moduleContent);
buildModuleDescription(moduleContent);
moduleContent.add(new HtmlTree(TagName.HR));
Content div = HtmlTree.DIV(HtmlStyle.horizontalScroll);
addModuleSignature(div);
buildModuleDescription(div);
moduleContent.add(div);
buildSummary(moduleContent);
addModuleContent(moduleContent);
@ -882,7 +884,6 @@ public class ModuleWriter extends HtmlDocletWriter {
}
protected void addModuleSignature(Content moduleContent) {
moduleContent.add(new HtmlTree(TagName.HR));
moduleContent.add(Signatures.getModuleSignature(mdle, this));
}

23
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriter.java
View File

@ -72,7 +72,7 @@ public class PackageWriter extends HtmlDocletWriter {
/**
* The HTML element for the section tag being written.
*/
private final HtmlTree section = HtmlTree.SECTION(HtmlStyle.packageDescription, new ContentBuilder());
private final HtmlTree section = HtmlTree.SECTION(HtmlStyle.packageDescription);
private final BodyContents bodyContents = new BodyContents();
@ -128,10 +128,12 @@ public class PackageWriter extends HtmlDocletWriter {
*/
protected void buildContent() {
Content packageContent = getContentHeader();
addPackageSignature(packageContent);
buildPackageDescription(packageContent);
buildPackageTags(packageContent);
packageContent.add(new HtmlTree(TagName.HR));
Content div = HtmlTree.DIV(HtmlStyle.horizontalScroll);
addPackageSignature(div);
buildPackageDescription(div);
buildPackageTags(div);
packageContent.add(div);
buildSummary(packageContent);
addPackageContent(packageContent);
@ -177,10 +179,9 @@ public class PackageWriter extends HtmlDocletWriter {
* be added
*/
protected void buildPackageDescription(Content packageContent) {
if (options.noComment()) {
return;
if (!options.noComment()) {
addPackageDescription(packageContent);
}
addPackageDescription(packageContent);
}
/**
@ -189,10 +190,9 @@ public class PackageWriter extends HtmlDocletWriter {
* @param packageContent the content to which the package tags will be added
*/
protected void buildPackageTags(Content packageContent) {
if (options.noComment()) {
return;
if (!options.noComment()) {
addPackageTags(packageContent);
}
addPackageTags(packageContent);
}
protected Content getPackageHeader() {
@ -422,7 +422,6 @@ public class PackageWriter extends HtmlDocletWriter {
}
protected void addPackageSignature(Content packageContent) {
packageContent.add(new HtmlTree(TagName.HR));
packageContent.add(Signatures.getPackageSignature(packageElement, this));
}

14
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PropertyWriter.java
View File

@ -78,13 +78,13 @@ public class PropertyWriter extends AbstractMemberWriter {
for (Element property : properties) {
currentProperty = (ExecutableElement)property;
Content propertyContent = getPropertyHeaderContent(currentProperty);
buildSignature(propertyContent);
buildDeprecationInfo(propertyContent);
buildPreviewInfo(propertyContent);
buildPropertyComments(propertyContent);
buildTagInfo(propertyContent);
Content div = HtmlTree.DIV(HtmlStyle.horizontalScroll);
buildSignature(div);
buildDeprecationInfo(div);
buildPreviewInfo(div);
buildPropertyComments(div);
buildTagInfo(div);
propertyContent.add(div);
memberList.add(getMemberListItem(propertyContent));
}
Content propertyDetails = getPropertyDetails(propertyDetailsHeader, memberList);

17
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/BodyContents.java
View File

@ -43,20 +43,20 @@ import java.util.Objects;
public class BodyContents extends Content {
private final List<Content> mainContents = new ArrayList<>();
private HtmlTree header = null;
private HtmlTree footer = null;
private Content header = null;
private Content footer = null;
public BodyContents addMainContent(Content content) {
mainContents.add(content);
return this;
}
public BodyContents setHeader(HtmlTree header) {
public BodyContents setHeader(Content header) {
this.header = Objects.requireNonNull(header);
return this;
}
public BodyContents setFooter(HtmlTree footer) {
public BodyContents setFooter(Content footer) {
this.footer = footer;
return this;
}
@ -87,14 +87,9 @@ public class BodyContents extends Content {
if (header == null)
throw new NullPointerException();
HtmlTree flexHeader = header.addStyle(HtmlStyle.flexHeader);
var flexContent = HtmlTree.DIV(HtmlStyle.flexContent)
return new ContentBuilder()
.add(header)
.add(HtmlTree.MAIN().add(mainContents))
.add(footer == null ? Text.EMPTY : footer);
return HtmlTree.DIV(HtmlStyle.flexBox)
.add(flexHeader)
.add(flexContent);
}
}

30
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlStyle.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2010, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -563,29 +563,6 @@ public enum HtmlStyle {
notes,
//</editor-fold>
//<editor-fold desc="flex layout">
//
// The following constants are used for the components of the top-level structures for "flex" layout.
/**
* The class of the top-level {@code div} element used to arrange for "flex" layout in
* a browser window. The element should contain two child elements: one with class
* {@link #flexHeader flex-header} and one with class {@link #flexContent flex-content}.
*/
flexBox,
/**
* The class of the {@code header} element within a {@link #flexBox flex-box} container.
* The element is always displayed at the top of the viewport.
*/
flexHeader,
/**
* The class of the {@code div} element within a {@link #flexBox flex-box} container
* This element appears below the header and can be scrolled if too big for the available height.
*/
flexContent,
//</editor-fold>
//<editor-fold desc="signatures">
//
@ -964,6 +941,11 @@ public enum HtmlStyle {
*/
horizontal,
/**
* The class of a {@code div} element that allows its horizontal overflow to be scrolled.
*/
horizontalScroll,
/**
* The class of a {@code span} element containing implementation details of
* a "provides" entry in a module page.

27
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script.js
View File

@ -227,27 +227,10 @@ function switchCopyLabel(button, span) {
}, 100);
}, 1900);
}
// Workaround for scroll position not being included in browser history (8249133)
// Dynamically set scroll margin to accomodate for draft header
document.addEventListener("DOMContentLoaded", function(e) {
var contentDiv = document.querySelector("div.flex-content");
window.addEventListener("popstate", function(e) {
if (e.state !== null) {
contentDiv.scrollTop = e.state;
}
});
window.addEventListener("hashchange", function(e) {
history.replaceState(contentDiv.scrollTop, document.title);
});
var timeoutId;
contentDiv.addEventListener("scroll", function(e) {
if (timeoutId) {
clearTimeout(timeoutId);
}
timeoutId = setTimeout(function() {
history.replaceState(contentDiv.scrollTop, document.title);
}, 100);
});
if (!location.hash) {
history.replaceState(contentDiv.scrollTop, document.title);
}
document.querySelectorAll(':not(input)[id]').forEach(
function(c) {
c.style["scroll-margin-top"] = Math.ceil(document.querySelector("header").offsetHeight) + "px"
});
});

45
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/stylesheet.css
View File

@ -84,6 +84,9 @@ iframe {
overflow-y:scroll;
border:none;
}
:not(input)[id] {
scroll-margin-top: 78px;
}
a:link, a:visited {
text-decoration:none;
color:var(--link-color);
@ -172,19 +175,11 @@ button {
* Styles for navigation bar.
*/
@media screen {
div.flex-box {
position:fixed;
display:flex;
flex-direction:column;
height: 100%;
width: 100%;
}
header.flex-header {
flex: 0 0 auto;
}
div.flex-content {
flex: 1 1 auto;
overflow-y: auto;
header {
position:sticky;
top:0;
z-index:1;
background: var(--body-background-color);
}
}
.top-nav {
@ -305,12 +300,12 @@ body.module-declaration-page .block-list h2 {
margin:15px 0;
}
body.class-declaration-page .summary h3,
body.class-declaration-page .details h3,
body.class-declaration-page .summary .inherited-list h2 {
body.class-declaration-page .details h3 {
background-color:var(--subnav-background-color);
border:1px solid var(--border-color);
margin:0 0 6px -8px;
padding:7px 5px;
overflow-x:auto;
}
/*
* Styles for page layout containers.
@ -320,6 +315,10 @@ main {
padding:10px 20px;
position:relative;
}
section[id$=-description] :is(dl, ol, ul, p, div, blockquote, pre):last-child,
section[id$=-description] :is(dl, ol, ul):last-child > :is(li, dd):last-child {
margin-bottom:4px;
}
dl.notes > dt {
font-family: var(--body-font-family);
font-size:0.856em;
@ -443,8 +442,8 @@ ul.preview-feature-list {
height:16px;
}
div.table-tabs {
padding:10px 0 0 1px;
margin:10px 0 0 0;
padding: 10px 0 0 1px;
margin: 0;
}
div.table-tabs > button {
border: none;
@ -527,7 +526,7 @@ div.checkboxes > label > input {
.summary-table > div, .details-table > div {
text-align:left;
padding: 8px 3px 3px 7px;
overflow-x: auto;
overflow: auto hidden;
scrollbar-width: thin;
}
.col-first, .col-second, .col-last, .col-constructor-name, .col-summary-item-name {
@ -615,7 +614,7 @@ div.block {
.member-signature {
font-family:var(--code-font-family);
font-size:1em;
margin:14px 0;
margin:8px 0 14px 0;
white-space: pre-wrap;
}
.module-signature,
@ -698,6 +697,9 @@ details summary {
main, nav, header, footer, section {
display:block;
}
nav {
overflow:hidden;
}
/*
* Styles for javadoc search.
*/
@ -854,6 +856,9 @@ span#page-search-link {
.inherited-list {
margin: 10px 0 10px 0;
}
.horizontal-scroll {
overflow: auto hidden;
}
section.class-description {
line-height: 1.4;
}
@ -1098,7 +1103,7 @@ table.striped > tbody > tr > th {
* Tweak style for small screens.
*/
@media screen and (max-width: 920px) {
header.flex-header {
header {
max-height: 100vh;
overflow-y: auto;
}

5
test/langtools/jdk/javadoc/doclet/testAnnotationTypes/TestAnnotationTypes.java
View File

@ -66,6 +66,7 @@ public class TestAnnotationTypes extends JavadocTester {
"""
<section class="detail" id="DEFAULT_NAME">
<h3>DEFAULT_NAME</h3>
<div class="horizontal-scroll">
<div class="member-signature"><span class="modifiers">static final</span>&nbsp;<\
span class="return-type">java.lang.String</span>&nbsp;<span class="element-name">DEFAULT_NAME</span></div>
""");
@ -132,17 +133,21 @@ public class TestAnnotationTypes extends JavadocTester {
<li>
<section class="detail" id="value()">
<h3>value</h3>
<div class="horizontal-scroll">
<div class="member-signature"><span class="return-type">int</span>&nbsp;<span class="element-name">value</span></div>
</div>
</section>
</li>
<li>
<section class="detail" id="optional()">
<h3>optional</h3>
<div class="horizontal-scroll">
<div class="member-signature"><span class="return-type">java.lang.String</span>&nbsp;<span class="element-name">optional</span></div>
<dl class="notes">
<dt>Default:</dt>
<dd><code>""</code></dd>
</dl>
</div>
</section>
</li>
</ul>

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

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -193,7 +193,7 @@ public class TestDeprecatedDocs extends JavadocTester {
</div>
</div>""");
checkOutput("pkg/TestClass.html", false,
checkOutput("pkg/TestClass.html", true,
"""
<div class="deprecation-comment">class_test2 passes. This is the second sentence\
of deprecated description for a field.</div>
@ -205,7 +205,7 @@ public class TestDeprecatedDocs extends JavadocTester {
</div>
</div>""",
"""
<div class="deprecation-comment">class_test4 passes. This is the second sentence\
<div class="deprecation-comment">class_test5 passes. This is the second sentence\
of deprecated description for a method.</div>
</div>
</div>""");

2
test/langtools/jdk/javadoc/doclet/testDirectedInheritance/TestDirectedInheritance.java
View File

@ -277,6 +277,7 @@ public class TestDirectedInheritance extends JavadocTester {
var m = """
<section class="detail" id="m()">
<h3>m</h3>
<div class="horizontal-scroll">
<div class="member-signature"><span class="modifiers">\
public</span>&nbsp;<span class="return-type">void</span>\
&nbsp;<span class="element-name">m</span>()</div>
@ -336,6 +337,7 @@ public class TestDirectedInheritance extends JavadocTester {
var m = """
<section class="detail" id="m()">
<h3>m</h3>
<div class="horizontal-scroll">
<div class="member-signature"><span class="modifiers">\
public</span>&nbsp;<span class="return-type">void</span>\
&nbsp;<span class="element-name">m</span>()</div>

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

@ -1,5 +1,5 @@
/*
* Copyright (c) 2009, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2009, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -386,12 +386,14 @@ public class TestHtmlDefinitionListTag extends JavadocTester {
<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span c\
lass="return-type">void</span>&nbsp;<span class="element-name">readObject</span>()
throws <span class="exceptions">java.io.IOException</span></div>
</div>
</section>
</li>""");
checkOutput("pkg1/C2.html", expectFound,
"""
<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name">C2</span>()</div>
</div>
</section>
</li>""");
@ -401,6 +403,7 @@ public class TestHtmlDefinitionListTag extends JavadocTester {
&nbsp;<span class="return-type"><a href="C1.ModalExclusionType.html" title="enum\
class in pkg1">C1.ModalExclusionType</a></span>&nbsp;<span class="element-name">APPLICATION_E\
XCLUDE</span></div>
</div>
</section>
</li>""");

8
test/langtools/jdk/javadoc/doclet/testHtmlLandmarkRegions/TestHtmlLandmarkRegions.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -76,7 +76,7 @@ public class TestHtmlLandmarkRegions extends JavadocTester {
checkOrder("index.html",
"""
<header role="banner" class="flex-header">
<header role="banner">
<nav role="navigation">""",
"""
<main role="main">
@ -106,7 +106,7 @@ public class TestHtmlLandmarkRegions extends JavadocTester {
checkOrder("index.html",
"""
<header role="banner" class="flex-header">
<header role="banner">
<nav role="navigation">""",
"""
<main role="main">
@ -144,7 +144,7 @@ public class TestHtmlLandmarkRegions extends JavadocTester {
checkOrder("pkg1/doc-files/s.html",
"""
<header role="banner" class="flex-header">
<header role="banner">
<nav role="navigation">
""",
"""

35
test/langtools/jdk/javadoc/doclet/testHtmlVersion/TestHtmlVersion.java
View File

@ -81,7 +81,7 @@ public class TestHtmlVersion extends JavadocTester {
<div class="caption"><span>Packages</span></div>
<div class="summary-table two-column-summary">""",
"""
<header role="banner" class="flex-header">
<header role="banner">
<nav role="navigation">
<!-- ========= START OF TOP NAVBAR ======= -->""",
"""
@ -99,7 +99,7 @@ public class TestHtmlVersion extends JavadocTester {
"""
<div class="summary-table two-column-summary" aria-labelledby="class-summary-tab0">""",
"""
<header role="banner" class="flex-header">
<header role="banner">
<nav role="navigation">
<!-- ========= START OF TOP NAVBAR ======= -->""",
"""
@ -131,7 +131,7 @@ public class TestHtmlVersion extends JavadocTester {
""",
"<li class=\"circle\">",
"""
<header role="banner" class="flex-header">
<header role="banner">
<nav role="navigation">
<!-- ========= START OF TOP NAVBAR ======= -->""",
"""
@ -164,7 +164,7 @@ public class TestHtmlVersion extends JavadocTester {
"""
<div class="summary-table two-column-summary">""",
"""
<header role="banner" class="flex-header">
<header role="banner">
<nav role="navigation">
<!-- ========= START OF TOP NAVBAR ======= -->""",
"""
@ -185,7 +185,7 @@ public class TestHtmlVersion extends JavadocTester {
"""
<div class="summary-table three-column-summary">""",
"""
<header role="banner" class="flex-header">
<header role="banner">
<nav role="navigation">
<!-- ========= START OF TOP NAVBAR ======= -->""",
"""
@ -214,7 +214,7 @@ public class TestHtmlVersion extends JavadocTester {
"""
<div class="summary-table two-column-summary">""",
"""
<header role="banner" class="flex-header">
<header role="banner">
<nav role="navigation">
<!-- ========= START OF TOP NAVBAR ======= -->""",
"""
@ -233,7 +233,7 @@ public class TestHtmlVersion extends JavadocTester {
<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
""",
"""
<header role="banner" class="flex-header">
<header role="banner">
<nav role="navigation">
<!-- ========= START OF TOP NAVBAR ======= -->""",
"""
@ -257,7 +257,7 @@ public class TestHtmlVersion extends JavadocTester {
""",
"<li class=\"circle\">",
"""
<header role="banner" class="flex-header">
<header role="banner">
<nav role="navigation">
<!-- ========= START OF TOP NAVBAR ======= -->""",
"""
@ -292,12 +292,11 @@ public class TestHtmlVersion extends JavadocTester {
<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
""",
"""
<header role="banner" class="flex-header">
<header role="banner">
<nav role="navigation">
<!-- ========= START OF TOP NAVBAR ======= -->""",
"""
</header>
<div class="flex-content">
<main role="main">""",
"""
<footer role="contentinfo">""",
@ -319,7 +318,7 @@ public class TestHtmlVersion extends JavadocTester {
<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
""",
"""
<header role="banner" class="flex-header">
<header role="banner">
<nav role="navigation">
<!-- ========= START OF TOP NAVBAR ======= -->""",
"""
@ -350,7 +349,7 @@ public class TestHtmlVersion extends JavadocTester {
<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
""",
"""
<header role="banner" class="flex-header">
<header role="banner">
<nav role="navigation">
<!-- ========= START OF TOP NAVBAR ======= -->""",
"""
@ -400,7 +399,7 @@ public class TestHtmlVersion extends JavadocTester {
<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
""",
"""
<header role="banner" class="flex-header">
<header role="banner">
<nav role="navigation">
<!-- ========= START OF TOP NAVBAR ======= -->""",
"""
@ -441,7 +440,7 @@ public class TestHtmlVersion extends JavadocTester {
<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
""",
"""
<header role="banner" class="flex-header">
<header role="banner">
<nav role="navigation">
<!-- ========= START OF TOP NAVBAR ======= -->""",
"""
@ -473,7 +472,7 @@ public class TestHtmlVersion extends JavadocTester {
<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
""",
"""
<header role="banner" class="flex-header">
<header role="banner">
<nav role="navigation">
<!-- ========= START OF TOP NAVBAR ======= -->""",
"""
@ -500,7 +499,7 @@ public class TestHtmlVersion extends JavadocTester {
<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
""",
"""
<header role="banner" class="flex-header">
<header role="banner">
<nav role="navigation">
<!-- ========= START OF TOP NAVBAR ======= -->""",
"""
@ -527,7 +526,7 @@ public class TestHtmlVersion extends JavadocTester {
<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
""",
"""
<header role="banner" class="flex-header">
<header role="banner">
<nav role="navigation">
<!-- ========= START OF TOP NAVBAR ======= -->""",
"""
@ -565,7 +564,7 @@ public class TestHtmlVersion extends JavadocTester {
<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
""",
"""
<header role="banner" class="flex-header">
<header role="banner">
<nav role="navigation">
<!-- ========= START OF TOP NAVBAR ======= -->""",
"""

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

@ -128,6 +128,7 @@ public class TestInterface extends JavadocTester {
"""
<section class="detail" id="f">
<h3>f</h3>
<div class="horizontal-scroll">
<div class="member-signature"><span class="modifiers">public static</span>&nbsp;\
<span class="return-type">int</span>&nbsp;<span class="element-name">f</span></div>
<div class="block">A hider field</div>""",
@ -147,6 +148,7 @@ public class TestInterface extends JavadocTester {
"""
<section class="detail" id="staticMethod()">
<h3>staticMethod</h3>
<div class="horizontal-scroll">
<div class="member-signature"><span class="modifiers">public static</span>&nbsp;\
<span class="return-type">void</span>&nbsp;<span class="element-name">staticMethod</span\
>()</div>
@ -157,6 +159,7 @@ public class TestInterface extends JavadocTester {
"""
<section class="detail" id="staticMethod()">
<h3>staticMethod</h3>
<div class="horizontal-scroll">
<div class="member-signature"><span class="modifiers">public static</span>&nbsp;\
<span class="return-type">void</span>&nbsp;<span class="element-name">staticMethod</span\
>()</div>
@ -311,17 +314,20 @@ public class TestInterface extends JavadocTester {
<li>
<section class="detail" id="hashCode()">
<h3>hashCode</h3>
<div class="horizontal-scroll">
<div class="member-signature"><span class="return-type">\
int</span>&nbsp;<span class="element-name">hashCode</span>()</div>
<dl class="notes">
<dt>Overrides:</dt>
<dd><code>hashCode</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>
</dl>
</div>
</section>
</li>
<li>
<section class="detail" id="equals(java.lang.Object)">
<h3>equals</h3>
<div class="horizontal-scroll">
<div class="member-signature"><span class="return-type">\
boolean</span>&nbsp;<span class="element-name">equals</span>\
<wbr><span class="parameters">(java.lang.Object&nbsp;obj)</span></div>
@ -329,24 +335,29 @@ public class TestInterface extends JavadocTester {
<dt>Overrides:</dt>
<dd><code>equals</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>
</dl>
</div>
</section>
</li>
<li>
<section class="detail" id="toString()">
<h3>toString</h3>
<div class="horizontal-scroll">
<div class="member-signature"><span class="return-type">\
java.lang.String</span>&nbsp;<span class="element-name">toString</span>()</div>
<dl class="notes">
<dt>Overrides:</dt>
<dd><code>toString</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>
</dl>
</div>
</section>
</li>
<li>
<section class="detail" id="clone()">
<h3>clone</h3>
<div class="horizontal-scroll">
<div class="member-signature"><span class="return-type">\
java.lang.Object</span>&nbsp;<span class="element-name">clone</span>()</div>
</div>
</section>
</li>
""");

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

@ -107,6 +107,7 @@ public class TestJavaFX extends JavadocTester {
"""
<section class="detail" id="pausedProperty">
<h3>paused</h3>
<div class="horizontal-scroll">
<div class="member-signature"><span class="modifiers">public final</span>&nbsp;<\
span class="return-type"><a href="C.BooleanProperty.html" title="class in pkg1">\
C.BooleanProperty</a></span>&nbsp;<span class="element-name">pausedProperty</span></div>
@ -114,6 +115,7 @@ public class TestJavaFX extends JavadocTester {
"""
<section class="detail" id="isPaused()">
<h3>isPaused</h3>
<div class="horizontal-scroll">
<div class="member-signature"><span class="modifiers">public final</span>&nbsp;<\
span class="return-type">double</span>&nbsp;<span class="element-name">isPaused<\
/span>()</div>
@ -121,6 +123,7 @@ public class TestJavaFX extends JavadocTester {
"""
<section class="detail" id="setPaused(boolean)">
<h3>setPaused</h3>
<div class="horizontal-scroll">
<div class="member-signature"><span class="modifiers">public final</span>&nbsp;<\
span class="return-type">void</span>&nbsp;<span class="element-name">setPaused</\
span><wbr><span class="parameters">(boolean&nbsp;value)</span></div>
@ -133,6 +136,7 @@ public class TestJavaFX extends JavadocTester {
"""
<section class="detail" id="isPaused()">
<h3>isPaused</h3>
<div class="horizontal-scroll">
<div class="member-signature"><span class="modifiers">public final</span>&nbsp;<\
span class="return-type">double</span>&nbsp;<span class="element-name">isPaused<\
/span>()</div>
@ -145,6 +149,7 @@ public class TestJavaFX extends JavadocTester {
"""
<section class="detail" id="rateProperty">
<h3>rate</h3>
<div class="horizontal-scroll">
<div class="member-signature"><span class="modifiers">public final</span>&nbsp;<\
span class="return-type"><a href="C.DoubleProperty.html" title="class in pkg1">C\
.DoubleProperty</a></span>&nbsp;<span class="element-name">rateProperty</span></div>
@ -153,6 +158,7 @@ public class TestJavaFX extends JavadocTester {
"""
<section class="detail" id="setRate(double)">
<h3>setRate</h3>
<div class="horizontal-scroll">
<div class="member-signature"><span class="modifiers">public final</span>&nbsp;<\
span class="return-type">void</span>&nbsp;<span class="element-name">setRate</sp\
an><wbr><span class="parameters">(double&nbsp;value)</span></div>
@ -170,6 +176,7 @@ public class TestJavaFX extends JavadocTester {
"""
<section class="detail" id="getRate()">
<h3>getRate</h3>
<div class="horizontal-scroll">
<div class="member-signature"><span class="modifiers">public final</span>&nbsp;<\
span class="return-type">double</span>&nbsp;<span class="element-name">getRate</span>()<\
/div>
@ -262,6 +269,7 @@ public class TestJavaFX extends JavadocTester {
<li>
<section class="detail" id="betaProperty">
<h3>beta</h3>
<div class="horizontal-scroll">
<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span c\
lass="return-type">java.lang.Object</span>&nbsp;<span class="element-name">betaProperty<\
/span></div>
@ -273,11 +281,13 @@ public class TestJavaFX extends JavadocTester {
</ul>
</dd>
</dl>
</div>
</section>
</li>
<li>
<section class="detail" id="gammaProperty">
<h3>gamma</h3>
<div class="horizontal-scroll">
<div class="member-signature"><span class="modifiers">public final</span>&nbsp;<\
span class="return-type">java.util.List&lt;java.lang.String&gt;</span>&nbsp;<spa\
n class="element-name">gammaProperty</span></div>
@ -289,11 +299,13 @@ public class TestJavaFX extends JavadocTester {
</ul>
</dd>
</dl>
</div>
</section>
</li>
<li>
<section class="detail" id="deltaProperty">
<h3>delta</h3>
<div class="horizontal-scroll">
<div class="member-signature"><span class="modifiers">public final</span>&nbsp;<\
span class="return-type">java.util.List&lt;java.util.Set&lt;? super java.lang.Ob\
ject&gt;&gt;</span>&nbsp;<span class="element-name">deltaProperty</span></div>
@ -305,6 +317,7 @@ public class TestJavaFX extends JavadocTester {
</ul>
</dd>
</dl>
</div>
</section>
</li>
</ul>

16
test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFXCombo.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -154,6 +154,7 @@ public class TestJavaFXCombo extends JavadocTester {
"""
<section class="detail" id="getExample()">
<h3>getExample</h3>
<div class="horizontal-scroll">
<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">boolean</span>&nbsp;<span class="element-name">getExample</span>()</div>
<div class="block">Gets the value of the <code>example</code> property.</div>
<dl class="notes">
@ -163,6 +164,7 @@ public class TestJavaFXCombo extends JavadocTester {
<dd>the value of the <code>example</code> property</dd>
#SEE#
</dl>
</div>
</section>
"""
.replace("#DESC#", getPropertyDescription(fk, pk))
@ -176,12 +178,14 @@ public class TestJavaFXCombo extends JavadocTester {
"""
<section class="detail" id="getExample()">
<h3>getExample</h3>
<div class="horizontal-scroll">
<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">boolean</span>&nbsp;<span class="element-name">getExample</span>()</div>
<div class="block">Getter method description. More getter method description.</div>
<dl class="notes">
<dt>Returns:</dt>
<dd>the <code>example</code> property</dd>
</dl>
</div>
</section>
""");
}
@ -199,6 +203,7 @@ public class TestJavaFXCombo extends JavadocTester {
"""
<section class="detail" id="setExample(boolean)">
<h3>setExample</h3>
<div class="horizontal-scroll">
<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name">setExample</span><wbr><span class="parameters">(boolean&nbsp;b)</span></div>
<div class="block">Sets the value of the <code>example</code> property.</div>
<dl class="notes">
@ -208,6 +213,7 @@ public class TestJavaFXCombo extends JavadocTester {
<dd><code>b</code> - the value for the <code>example</code> property</dd>
#SEE#
</dl>
</div>
</section>
"""
.replace("#DESC#", getPropertyDescription(fk, pk))
@ -220,12 +226,14 @@ public class TestJavaFXCombo extends JavadocTester {
"""
<section class="detail" id="setExample(boolean)">
<h3>setExample</h3>
<div class="horizontal-scroll">
<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name">setExample</span><wbr><span class="parameters">(boolean&nbsp;b)</span></div>
<div class="block">Setter method description. More setter method description.</div>
<dl class="notes">
<dt>Parameters:</dt>
<dd><code>b</code> - the new value for the property</dd>
</dl>
</div>
</section>
""");
}
@ -242,6 +250,7 @@ public class TestJavaFXCombo extends JavadocTester {
"""
<section class="detail" id="exampleProperty()">
<h3>exampleProperty</h3>
<div class="horizontal-scroll">
<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="BooleanProperty.html" title="class in p">BooleanProperty</a></span>&nbsp;<span class="element-name">exampleProperty</span>()</div>
#PCOMM#
<dl class="notes">
@ -249,6 +258,7 @@ public class TestJavaFXCombo extends JavadocTester {
<dd>the <code>example</code> property</dd>
#SEE#
</dl>
</div>
</section>
"""
.replace("#PCOMM#", getPropertyMethodComment(fk, pk))
@ -262,6 +272,7 @@ public class TestJavaFXCombo extends JavadocTester {
"""
<section class="detail" id="exampleProperty()">
<h3>exampleProperty</h3>
<div class="horizontal-scroll">
<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="BooleanProperty.html" title="class in p">BooleanProperty</a></span>&nbsp;<span class="element-name">exampleProperty</span>()</div>
<div class="block">Property method description. More property method description.</div>
<dl class="notes">
@ -269,6 +280,7 @@ public class TestJavaFXCombo extends JavadocTester {
<dd>the <code>example</code> property</dd>
#SEE#
</dl>
</div>
</section>
"""
.replace("#SEE#", (fk == Kind.COMMENT ? "" : getSee(null, gk, sk)))
@ -420,4 +432,4 @@ public class TestJavaFXCombo extends JavadocTester {
};
}
}
}

6
test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFXMissingPropComments.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -89,6 +89,7 @@ public class TestJavaFXMissingPropComments extends JavadocTester {
"""
<section class="detail" id="getValue()">
<h3>getValue</h3>
<div class="horizontal-scroll">
<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span c\
lass="return-type">boolean</span>&nbsp;<span class="element-name">getValue</span\
>()</div>
@ -105,6 +106,7 @@ public class TestJavaFXMissingPropComments extends JavadocTester {
</ul>
</dd>
</dl>
</div>
</section>"""
);
}
@ -153,6 +155,7 @@ public class TestJavaFXMissingPropComments extends JavadocTester {
"""
<section class="detail" id="getValue()">
<h3>getValue</h3>
<div class="horizontal-scroll">
<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span c\
lass="return-type">boolean</span>&nbsp;<span class="element-name">getValue</span\
>()</div>
@ -169,6 +172,7 @@ public class TestJavaFXMissingPropComments extends JavadocTester {
</ul>
</dd>
</dl>
</div>
</section>"""
);
}

10
test/langtools/jdk/javadoc/doclet/testMemberInheritance/TestMemberInheritance.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -120,10 +120,12 @@ public class TestMemberInheritance extends JavadocTester {
checkOutput("pkg2/DocumentedNonGenericChild.html", true,
"""
<section class="class-description" id="class-description">
<div class="horizontal-scroll">
<hr>
<div class="type-signature"><span class="modifiers">public abstract class </span\
><span class="element-name type-name-label">DocumentedNonGenericChild</span>
<span class="extends-implements">extends java.lang.Object</span></div>
</div>
</section>""");
checkOutput("pkg2/DocumentedNonGenericChild.html", true,
@ -142,6 +144,7 @@ public class TestMemberInheritance extends JavadocTester {
"""
<section class="detail" id="parentMethod(T)">
<h3 id="parentMethod(java.lang.Object)">parentMethod</h3>
<div class="horizontal-scroll">
<div class="member-signature"><span class="modifiers">protected abstract</span>&\
nbsp;<span class="return-type">java.lang.String</span>&nbsp;<span class="element\
-name">parentMethod</span><wbr><span class="parameters">(java.lang.String&nbsp;t\
@ -169,10 +172,12 @@ public class TestMemberInheritance extends JavadocTester {
"""
<section class="detail" id="parentField">
<h3>parentField</h3>
<div class="horizontal-scroll">
<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span c\
lass="return-type">java.lang.String</span>&nbsp;<span class="element-name">parentField</\
span></div>
<div class="block">A field.</div>
</div>
</section>""");
checkOutput("pkg3/PrivateGenericParent.PublicChild.html", true,
@ -185,9 +190,11 @@ public class TestMemberInheritance extends JavadocTester {
"""
<section class="detail" id="method(T)">
<h3 id="method(java.lang.Object)">method</h3>
<div class="horizontal-scroll">
<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span c\
lass="return-type">java.lang.String</span>&nbsp;<span class="element-name">metho\
d</span><wbr><span class="parameters">(java.lang.String&nbsp;t)</span></div>
</div>
</section>""");
checkOutput("index-all.html", true,
@ -231,6 +238,7 @@ public class TestMemberInheritance extends JavadocTester {
"""
<section class="detail" id="parentMethod(T)">
<h3 id="parentMethod(java.lang.Object)">parentMethod</h3>
<div class="horizontal-scroll">
<div class="member-signature"><span class="modifiers">protected abstract</span>&\
nbsp;<span class="return-type">java.lang.String</span>&nbsp;<span class="element\
-name">parentMethod</span><wbr><span class="parameters">(java.lang.String&nbsp;t\

12
test/langtools/jdk/javadoc/doclet/testModules/TestModules.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -521,7 +521,6 @@ public class TestModules extends JavadocTester {
"""
</nav>
</header>
<div class="flex-content">
<main role="main">
<div class="block">The overview summary page header.</div>
<div id="all-modules-table">
@ -546,8 +545,10 @@ public class TestModules extends JavadocTester {
<h1 title="Module moduleA" class="title">Module moduleA</h1>
</div>
<hr>
<div class="horizontal-scroll">
<div class="module-signature"><span class="annotations">@Deprecated(forRemoval=true)
</span>module <span class="element-name">moduleA</span></div>
</div>
<section class="summary">
<ul class="summary-list">
<li>
@ -559,12 +560,14 @@ public class TestModules extends JavadocTester {
<h1 title="Module moduleB" class="title">Module moduleB</h1>
</div>
<hr>
<div class="horizontal-scroll">
<div class="module-signature"><span class="annotations"><a href="testpkgmdlB/Ann\
otationType.html" title="annotation interface in testpkgmdlB">@AnnotationType</a\
>(<a href="testpkgmdlB/AnnotationType.html#optional()">optional</a>="Module Anno\
tation",
<a href="testpkgmdlB/AnnotationType.html#required()">required</a>=2016)
</span>module <span class="element-name">moduleB</span></div>
</div>
<section class="summary">
<ul class="summary-list">
<li>
@ -707,7 +710,6 @@ public class TestModules extends JavadocTester {
"""
</nav>
</header>
<div class="flex-content">
<main role="main">
<div class="block">The overview summary page header.</div>
<div id="all-packages-table">
@ -1129,6 +1131,7 @@ public class TestModules extends JavadocTester {
<h1 title="Module moduletags" class="title">Module moduletags</h1>
</div>
<hr>
<div class="horizontal-scroll">
<div class="module-signature"><span class="annotations">@Deprecated
</span>module <span class="element-name">moduletags</span></div>""",
"""
@ -1142,6 +1145,7 @@ public class TestModules extends JavadocTester {
<h1 title="Module moduleB" class="title">Module moduleB</h1>
</div>
<hr>
<div class="horizontal-scroll">
<div class="module-signature"><span class="annotations"><a href="testpkgmdlB/Ann\
otationType.html" title="annotation interface in testpkgmdlB">@AnnotationType</a\
>(<a href="testpkgmdlB/AnnotationType.html#optional()">optional</a>="Module Anno\
@ -1354,11 +1358,13 @@ public class TestModules extends JavadocTester {
checkOutput("moduleA/testpkgmdlA/TestClassInModuleA.html", true,
"""
<section class="class-description" id="class-description">
<div class="horizontal-scroll">
<hr>
<div class="type-signature"><span class="modifiers">public class </span><span cl\
ass="element-name"><a href="../../src-html/moduleA/testpkgmdlA/TestClassInModule\
A.html#line-25">TestClassInModuleA</a></span>
<span class="extends-implements">extends java.lang.Object</span></div>
</div>
</section>""");
checkOutput("src-html/moduleA/testpkgmdlA/TestClassInModuleA.html", true,
"""

5
test/langtools/jdk/javadoc/doclet/testNavigation/TestNavigation.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -91,7 +91,6 @@ public class TestNavigation extends JavadocTester {
<!-- ========= END OF TOP NAVBAR ========= -->
<span class="skip-nav" id="skip-navbar-top"></span></nav>
</header>
<div class="flex-content">
<main role="main">
<!-- ======== START OF CLASS DATA ======== -->""");
@ -100,7 +99,6 @@ public class TestNavigation extends JavadocTester {
<!-- ========= END OF TOP NAVBAR ========= -->
<span class="skip-nav" id="skip-navbar-top"></span></nav>
</header>
<div class="flex-content">
<main role="main">
<div class="header">""");
}
@ -120,7 +118,6 @@ public class TestNavigation extends JavadocTester {
<!-- ========= END OF TOP NAVBAR ========= -->
<span class="skip-nav" id="skip-navbar-top"></span></nav>
</header>
<div class="flex-content">
<main role="main">
<!-- ======== START OF CLASS DATA ======== -->""");

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

@ -232,6 +232,7 @@ public class TestOptions extends JavadocTester {
"""
<section class="detail" id="DEFAULT_NAME">
<h3>DEFAULT_NAME</h3>
<div class="horizontal-scroll">
<div class="member-signature"><span class="modifiers">static final</span>&nbsp;<\
span class="return-type">java.lang.String</span>&nbsp;<span class="element-name"><a href\
="../src-html/linksource/AnnotationTypeField.html#line-32">DEFAULT_NAME</a></spa\
@ -239,6 +240,7 @@ public class TestOptions extends JavadocTester {
"""
<section class="detail" id="name()">
<h3>name</h3>
<div class="horizontal-scroll">
<div class="member-signature"><span class="return-type">java.lang.String</span>&\
nbsp;<span class="element-name"><a href="../src-html/linksource/AnnotationTypeField.html\
#line-34">name</a></span></div>""");

4
test/langtools/jdk/javadoc/doclet/testPackageAnnotation/TestPackageAnnotation.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -55,6 +55,7 @@ public class TestPackageAnnotation extends JavadocTester {
<h1 title="Package pkg1" class="title">Package pkg1</h1>
</div>
<hr>
<div class="horizontal-scroll">
<div class="package-signature"><span class="annotations">@Deprecated(since="1&lt;2&gt;3")
</span>package <span class="element-name">pkg1</span></div>
""");
@ -91,6 +92,7 @@ public class TestPackageAnnotation extends JavadocTester {
<h1 title="Package pkg3" class="title">Package pkg3</h1>
</div>
<hr>
<div class="horizontal-scroll">
<div class="package-signature"><span class="annotations">@Deprecated(since="1&lt;2&gt;3")
</span>package <span class="element-name">pkg3</span></div>
""");

3
test/langtools/jdk/javadoc/doclet/testReturnTag/TestReturnTag.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -292,6 +292,7 @@ public class TestReturnTag extends JavadocTester {
checkOutput("C.html", true,
"""
<div class="block">Some text. Returns the result. More text.</div>
</div>
</section>
""");
}

2
test/langtools/jdk/javadoc/doclet/testSearch/TestSearch.java
View File

@ -434,8 +434,6 @@ public class TestSearch extends JavadocTester {
<input type="text" id="search-input" disabled placeholder="Search">
<input type="reset" id="reset-button" disabled value="reset">
""");
checkOutput(fileName, true,
"<div class=\"flex-box\">");
}
void checkSingleIndex() {

2
test/langtools/jdk/javadoc/doclet/testStylesheet/TestStylesheet.java
View File

@ -138,7 +138,7 @@ public class TestStylesheet extends JavadocTester {
.summary-table > div, .details-table > div {
text-align:left;
padding: 8px 3px 3px 7px;
overflow-x: auto;
overflow: auto hidden;
scrollbar-width: thin;
}""",
"@import url('fonts/dejavu.css');",

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

@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -92,9 +92,11 @@ public class TestSummaryTag extends JavadocTester {
"""
<section class="detail" id="m3()">
<h3>m3</h3>
<div class="horizontal-scroll">
<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span c\
lass="return-type">void</span>&nbsp;<span class="element-name">m3</span>()</div>
<div class="block">First sentence some text maybe second sentence.</div>
</div>
</section>
"""
);

6
test/langtools/jdk/javadoc/doclet/testSystemPropertyPage/TestSystemPropertyPage.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -67,11 +67,9 @@ public class TestSystemPropertyPage extends JavadocTester {
checkOutput("system-properties.html", true,
"""
<div class="flex-box">
<header role="banner" class="flex-header">""",
<header role="banner">""",
"""
<div class="flex-content">
<main role="main">
<div class="header">
<h1>System Properties</h1>

4
test/langtools/jdk/javadoc/doclet/testThrowsInheritanceMultiple/TestOneToMany.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -680,6 +680,7 @@ public class TestOneToMany extends JavadocTester {
<dd><code><a href="MyRuntimeException.html" title="class in x">MyRuntimeException</a></code> - grandparent 1</dd>
<dd><code><a href="MyRuntimeException.html" title="class in x">MyRuntimeException</a></code> - grandparent 2</dd>
</dl>
</div>
</section>
""");
}
@ -735,6 +736,7 @@ public class TestOneToMany extends JavadocTester {
<dt>Throws:</dt>
<dd><code><a href="MyRuntimeException.html" title="class in x">MyRuntimeException</a></code> - "'grandparent'"</dd>
</dl>
</div>
</section>
""");
}

4
test/langtools/jdk/javadoc/doclet/testUnicode/TestUnicode.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -107,6 +107,7 @@ public class TestUnicode extends JavadocTester {
"""
<section class="detail" id="set##(int)">
<h3>set##</h3>
<div class="horizontal-scroll">
<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span c\
lass="return-type">void</span>&nbsp;<span class="element-name">set##</span><wbr>\
<span class="parameters">(int&nbsp;##)</span></div>
@ -115,6 +116,7 @@ public class TestUnicode extends JavadocTester {
<dt>Parameters:</dt>
<dd><code>##</code> - the ##</dd>
</dl>
</div>
</section>
""".replaceAll("##", chineseElephant)
);

5
test/langtools/jdk/javadoc/doclet/testValueTag/TestValueFormats.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -80,11 +80,13 @@ public class TestValueFormats extends JavadocTester {
checkOutput("p/C.html", true,
"""
<h3>i65535</h3>
<div class="horizontal-scroll">
<div class="member-signature"><span class="modifiers">public static final</span>&nbsp;<span clas\
s="return-type">int</span>&nbsp;<span class="element-name">i65535</span></div>
<div class="block">The value 65535 is ffff or 0xffff.</div>""",
"""
<h3>pi</h3>
<div class="horizontal-scroll">
<div class="member-signature"><span class="modifiers">public static final</span>&nbsp;<span class="return-type">double</span>&nbsp;<span class="element-name">pi</span></div>
<div class="block">The value 3.1415926525 is %5.2f.</div>""".formatted(3.14));
}
@ -113,6 +115,7 @@ public class TestValueFormats extends JavadocTester {
checkOutput("p/C.html", true,
"""
<h3>i65535</h3>
<div class="horizontal-scroll">
<div class="member-signature"><span class="modifiers">public static final</span>&nbsp;<span class="return-type">int</span>&nbsp;<span class="element-name">i65535</span></div>
<div class="block">The value 65535 is <span class="invalid-tag">invalid format: %a</span>.</div>""");
}