stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8207213: The help-doc.html generated by the doclet is incomplete

Browse Source 
Reviewed-by: hannesw
This commit is contained in:
Jonathan Gibbons 2018-07-13 13:00:36 -07:00
parent 2d0aee2275
commit 93364e9a43
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HelpWriter.java
View File

@ -440,6 +440,21 @@ public class HelpWriter extends HtmlDocletWriter {
ul.addContent(htmlTree); ul.addContent(htmlTree);
} }
// Search
Content searchHead = HtmlTree.HEADING(HtmlConstants.CONTENT_HEADING,
contents.getContent("doclet.help.search.head"));
htmlTree = (configuration.allowTag(HtmlTag.SECTION))
? HtmlTree.SECTION(searchHead)
: HtmlTree.LI(HtmlStyle.blockList, searchHead);
Content searchBody = contents.getContent("doclet.help.search.body");
Content searchPara = HtmlTree.P(searchBody);
htmlTree.addContent(searchPara);
if (configuration.allowTag(HtmlTag.SECTION)) {
ul.addContent(HtmlTree.LI(HtmlStyle.blockList, htmlTree));
} else {
ul.addContent(htmlTree);
}
Content divContent = HtmlTree.DIV(HtmlStyle.contentContainer, ul); Content divContent = HtmlTree.DIV(HtmlStyle.contentContainer, ul);
divContent.addContent(new HtmlTree(HtmlTag.HR)); divContent.addContent(new HtmlTree(HtmlTag.HR));
Content footnote = HtmlTree.SPAN(HtmlStyle.emphasizedPhrase, Content footnote = HtmlTree.SPAN(HtmlStyle.emphasizedPhrase,

4
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties
View File

@ -194,6 +194,10 @@ doclet.help.annotation_type.declaration=\
Annotation Type Declaration Annotation Type Declaration
doclet.help.annotation_type.description=\ doclet.help.annotation_type.description=\
Annotation Type Description Annotation Type Description
doclet.help.search.head=Search
doclet.help.search.body=You can search for definitions of modules, packages, types, fields, methods \
and other terms defined in the API, using some or all of the name. "Camel-case" abbreviations \
are supported: for example, "InpStr" will find "InputStream" and "InputStreamReader".
doclet.ClassUse_Packages.that.use.0=Packages that use {0} doclet.ClassUse_Packages.that.use.0=Packages that use {0}
doclet.ClassUse_Uses.of.0.in.1=Uses of {0} in {1} doclet.ClassUse_Uses.of.0.in.1=Uses of {0} in {1}