diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeMemberWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeMemberWriter.java index 2b9c441789d..d943a603958 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeMemberWriter.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeMemberWriter.java @@ -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); diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriter.java index 672a6de428e..364619065a5 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriter.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriter.java @@ -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); diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstructorWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstructorWriter.java index ea79ed09e33..643a144b5e5 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstructorWriter.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstructorWriter.java @@ -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); diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/EnumConstantWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/EnumConstantWriter.java index ebe82343ce4..3dc91f05c8f 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/EnumConstantWriter.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/EnumConstantWriter.java @@ -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( diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FieldWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FieldWriter.java index 2cddb68f2b2..9c5dfcb2aad 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FieldWriter.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FieldWriter.java @@ -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); diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java index 9d099deee06..cc02115d247 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java @@ -504,7 +504,7 @@ public abstract class HtmlDocletWriter { * * @return the {@code
} 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
} 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()); } /** diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MethodWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MethodWriter.java index cf7d9c15f47..5f8fdfe1010 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MethodWriter.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MethodWriter.java @@ -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); diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriter.java index de91439cd30..d37e1334eb4 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriter.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriter.java @@ -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)); } diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriter.java index 66a686bea08..e960b2e59ba 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriter.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriter.java @@ -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)); } diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PropertyWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PropertyWriter.java index 26d45d715a2..a78fe0a484c 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PropertyWriter.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PropertyWriter.java @@ -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); diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/BodyContents.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/BodyContents.java index 9f4351d0ef2..b40514b4119 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/BodyContents.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/BodyContents.java @@ -43,20 +43,20 @@ import java.util.Objects; public class BodyContents extends Content { private final List 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); } } diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlStyle.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlStyle.java index 52edd9f8478..58d9204ec6b 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlStyle.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlStyle.java @@ -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, // - // - // - // 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, - // // // @@ -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. diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script.js b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script.js index 91200940c21..cd9ee635e04 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script.js +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script.js @@ -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" + }); }); diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/stylesheet.css b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/stylesheet.css index 713a1b40184..bb5e423ce2b 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/stylesheet.css +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/stylesheet.css @@ -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; } diff --git a/test/langtools/jdk/javadoc/doclet/testAnnotationTypes/TestAnnotationTypes.java b/test/langtools/jdk/javadoc/doclet/testAnnotationTypes/TestAnnotationTypes.java index 84b03b85513..c53c3342bbc 100644 --- a/test/langtools/jdk/javadoc/doclet/testAnnotationTypes/TestAnnotationTypes.java +++ b/test/langtools/jdk/javadoc/doclet/testAnnotationTypes/TestAnnotationTypes.java @@ -66,6 +66,7 @@ public class TestAnnotationTypes extends JavadocTester { """

DEFAULT_NAME

+
static final <\ span class="return-type">java.lang.String DEFAULT_NAME
"""); @@ -132,17 +133,21 @@ public class TestAnnotationTypes extends JavadocTester {

  • value

    +
    int value
    +

  • optional

    +
    java.lang.String optional
    Default:
    ""
    +
    • diff --git a/test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java b/test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java index 1e742d4e412..2bd9da59578 100644 --- a/test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java +++ b/test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java @@ -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 {
    """); - checkOutput("pkg/TestClass.html", false, + checkOutput("pkg/TestClass.html", true, """
    class_test2 passes. This is the second sentence\ of deprecated description for a field.
    @@ -205,7 +205,7 @@ public class TestDeprecatedDocs extends JavadocTester { """, """ -
    class_test4 passes. This is the second sentence\ +
    class_test5 passes. This is the second sentence\ of deprecated description for a method.
    """); diff --git a/test/langtools/jdk/javadoc/doclet/testDirectedInheritance/TestDirectedInheritance.java b/test/langtools/jdk/javadoc/doclet/testDirectedInheritance/TestDirectedInheritance.java index 87586e5deb4..89eb68db1df 100644 --- a/test/langtools/jdk/javadoc/doclet/testDirectedInheritance/TestDirectedInheritance.java +++ b/test/langtools/jdk/javadoc/doclet/testDirectedInheritance/TestDirectedInheritance.java @@ -277,6 +277,7 @@ public class TestDirectedInheritance extends JavadocTester { var m = """

    m

    +
    \ public void\  m()
    @@ -336,6 +337,7 @@ public class TestDirectedInheritance extends JavadocTester { var m = """

    m

    +
    \ public void\  m()
    diff --git a/test/langtools/jdk/javadoc/doclet/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java b/test/langtools/jdk/javadoc/doclet/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java index 38aa793fcee..ac0331ef375 100644 --- a/test/langtools/jdk/javadoc/doclet/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java +++ b/test/langtools/jdk/javadoc/doclet/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java @@ -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 {
    public void readObject() throws java.io.IOException
    +
    """); checkOutput("pkg1/C2.html", expectFound, """
    public C2()
    +
    """); @@ -401,6 +403,7 @@ public class TestHtmlDefinitionListTag extends JavadocTester {  C1.ModalExclusionType APPLICATION_E\ XCLUDE +
    """); diff --git a/test/langtools/jdk/javadoc/doclet/testHtmlLandmarkRegions/TestHtmlLandmarkRegions.java b/test/langtools/jdk/javadoc/doclet/testHtmlLandmarkRegions/TestHtmlLandmarkRegions.java index 8a265cef4f1..a65e474a251 100644 --- a/test/langtools/jdk/javadoc/doclet/testHtmlLandmarkRegions/TestHtmlLandmarkRegions.java +++ b/test/langtools/jdk/javadoc/doclet/testHtmlLandmarkRegions/TestHtmlLandmarkRegions.java @@ -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", """ -