# HG changeset patch # User jjg # Date 1471041707 25200 # Node ID 52f8470ce3e4b0c18a5214ca8041016d7cb8784c # Parent a85f92c9a8abbfc0e6d3410b0b47b904a997c234 8163524: doclet resources doclet.usage.NAME.name are redundant Reviewed-by: ksrini diff -r a85f92c9a8ab -r 52f8470ce3e4 langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties Fri Aug 12 11:49:18 2016 +0530 +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties Fri Aug 12 15:41:47 2016 -0700 @@ -191,180 +191,136 @@ doclet.exception_encountered=Exception encountered while processing {1}\n{0} # option specifiers -doclet.usage.d.name=d doclet.usage.d.parameters= doclet.usage.d.description=Destination directory for output files -doclet.usage.use.name=use doclet.usage.use.description=Create class and package usage pages -doclet.usage.version.name=version doclet.usage.version.description=Include @version paragraphs -doclet.usage.author.name=author doclet.usage.author.description=Include @author paragraphs -doclet.usage.docfilessubdirs.name=docfilessubdirs doclet.usage.docfilessubdirs.description=Recursively copy doc-file subdirectories -doclet.usage.splitindex.name=splitindex doclet.usage.splitindex.description=Split index into one file per letter -doclet.usage.windowtitle.name=windowtitle -doclet.usage.windotitle.parameters= +doclet.usage.windowtitle.parameters= doclet.usage.windowtitle.description=Browser window title for the documentation -doclet.usage.doctitle.name=doctitle doclet.usage.doctitle.parameters= doclet.usage.doctitle.description=Include title for the overview page -doclet.usage.header.name=header doclet.usage.header.parameters= doclet.usage.header.description=Include header text for each page -doclet.usage.html4.name=html4 doclet.usage.html4.description=Generate HTML 4.01 output -doclet.usage.html5.name=html5 doclet.usage.html5.description=Generate HTML 5 output -doclet.usage.footer.name=footer doclet.usage.footer.parameters= doclet.usage.footer.description=Include footer text for each page -doclet.usage.top.name=top doclet.usage.top.parameters= doclet.usage.top.description=Include top text for each page -doclet.usage.bottom.name=bottom doclet.usage.bottom.parameters= doclet.usage.bottom.description=Include bottom text for each page -doclet.usage.link.name=link doclet.usage.link.parameters= doclet.usage.link.description=Create links to javadoc output at -doclet.usage.linkoffline.name=linkoffline doclet.usage.linkoffline.parameters= doclet.usage.linkoffline.description=Link to docs at using package list\n\ -\ at +\ at -doclet.usage.excludedocfilessubdir.name=excludedocfilessubdir doclet.usage.excludedocfilessubdir.parameters=:.. doclet.usage.excludedocfilessubdir.description=\n\ -\ Exclude any doc-files subdirectories with\n\ -\ given name +\ Exclude any doc-files subdirectories with\n\ +\ given name -doclet.usage.group.name=group doclet.usage.group.parameters= :.. doclet.usage.group.description=Group specified packages together\n\ -\ in overview page +\ in overview page -doclet.usage.nocomment.name=nocomment doclet.usage.nocomment.description=Suppress description and tags, generate\n\ -\ only declarations +\ only declarations -doclet.usage.nodeprecated.name=nodeprecated doclet.usage.nodeprecated.description=Do not include @deprecated information -doclet.usage.noqualifier.name=noqualifier doclet.usage.noqualifier.parameters=::.. doclet.usage.noqualifier.description=Exclude the list of qualifiers from the output -doclet.usage.nosince.name=nosince doclet.usage.nosince.description=Do not include @since information -doclet.usage.notimestamp.name=notimestamp doclet.usage.notimestamp.description=Do not include hidden time stamp -doclet.usage.nodeprecatedlist.name=nodeprecatedlist doclet.usage.nodeprecatedlist.description=Do not generate deprecated list -doclet.usage.notree.name=notree doclet.usage.notree.description=Do not generate class hierarchy -doclet.usage.noindex.name=noindex doclet.usage.noindex.description=Do not generate index -doclet.usage.nohelp.name=nohelp doclet.usage.nohelp.description=Do not generate help link -doclet.usage.nonavbar.name=nonavbar doclet.usage.nonavbar.description=Do not generate navigation bar -doclet.usage.nooverview.name=nooverview doclet.usage.nooverview.description=Do not generate overview pages -doclet.usage.serialwarn.name=serialwarn doclet.usage.serialwarn.description=Generate warning about @serial tag -doclet.usage.tag.name=tag doclet.usage.tag.parameters=::
doclet.usage.tag.description=\n\ -\ Specify single argument custom tags +\ Specify single argument custom tags -doclet.usage.taglet.name=taglet doclet.usage.taglet.description=The fully qualified name of Taglet to register -doclet.usage.tagletpath.name=tagletpath doclet.usage.tagletpath.description=The path to Taglets -doclet.usage.charset.name=charset doclet.usage.charset.parameters= doclet.usage.charset.description=Charset for cross-platform viewing of\n\ -\ generated documentation +\ generated documentation -doclet.usage.helpfile.name=helpfile doclet.usage.helpfile.parameters= doclet.usage.helpfile.description=Include file that help link links to -doclet.usage.linksource.name=linksource doclet.usage.linksource.description=Generate source in HTML -doclet.usage.sourcetab.name=sourcetab doclet.usage.sourcetab.parameters= doclet.usage.sourcetab.description=Specify the number of spaces each tab\n\ -\ takes up in the source +\ takes up in the source -doclet.usage.keywords.name=keywords doclet.usage.keywords.description=Include HTML meta tags with package,\n\ -\ class and member info +\ class and member info -doclet.usage.stylesheetfile.name=stylesheetfile doclet.usage.stylesheetfile.parameters= doclet.usage.stylesheetfile.description=File to change style of the generated\n\ -\ documentation +\ documentation -doclet.usage.docencoding.name=docencoding doclet.usage.docencoding.parameters= doclet.usage.docencoding.description=Specify the character encoding for the output -doclet.xusage.xdocrootparent.name=Xdocrootparent doclet.xusage.xdocrootparent.parameters= doclet.xusage.xdocrootparent.description=Replaces all @docRoot followed by /..\n\ -\ in doc comments with +\ in doc comments with -doclet.xusage.xdoclint.name=Xdoclint doclet.xusage.xdoclint.description=Enable recommended checks for problems in\n\ -\ javadoc comments +\ javadoc comments -doclet.xusage.xdoclint-extended.name=Xdoclint: doclet.xusage.xdoclint-extended.parameters=(all|none|[-]) # L10N: do not localize these words: all none accessibility html missing reference syntax doclet.xusage.xdoclint-extended.description=Enable or disable specific checks\n\ -\ for problems in javadoc comments, where \n\ -\ is one of accessibility, html,\n\ -\ missing, reference, or syntax.\n +\ for problems in javadoc comments, where \n\ +\ is one of accessibility, html,\n\ +\ missing, reference, or syntax.\n -doclet.xusage.xdoclint-package.name=Xdoclint/package: doclet.xusage.xdoclint-package.parameters=([-]) doclet.xusage.xdoclint-package.description=\n\ -\ Enable or disable checks in specific\n\ -\ packages. is a comma separated\n\ -\ list of package specifiers. Package\n\ -\ specifier is either a qualified name of a\n\ -\ package or a package name prefix followed\n\ -\ by .*, which expands to all sub-packages\n\ -\ of the given package. Prefix the package\n\ -\ specifier with - to disable checks for\n\ -\ the specified packages.\n +\ Enable or disable checks in specific\n\ +\ packages. is a comma separated\n\ +\ list of package specifiers. Package\n\ +\ specifier is either a qualified name of a\n\ +\ package or a package name prefix followed\n\ +\ by .*, which expands to all sub-packages\n\ +\ of the given package. Prefix the package\n\ +\ specifier with - to disable checks for\n\ +\ the specified packages.\n diff -r a85f92c9a8ab -r 52f8470ce3e4 langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/Configuration.java --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/Configuration.java Fri Aug 12 11:49:18 2016 +0530 +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/Configuration.java Fri Aug 12 15:41:47 2016 -0700 @@ -1017,14 +1017,13 @@ protected Option(Configuration config, String keyName, String name, int argCount) { c = config; this.name = name; - String key = keyName + "name"; - String oname = getOptionsMessage(key); - if (oname.isEmpty()) { + String desc = getOptionsMessage(keyName + "description"); + if (desc.isEmpty()) { + this.description = ""; this.parameters = ""; - this.description = ""; } else { + this.description = desc; this.parameters = getOptionsMessage(keyName + "parameters"); - this.description = getOptionsMessage(keyName + "description"); } this.argCount = argCount; } @@ -1076,10 +1075,8 @@ @Override public String toString() { String opt = name + (name.endsWith(":") ? "" : " ") + parameters; - int optlen = opt.length(); - int spaces = 32 - optlen; - StringBuffer sb = new StringBuffer(" ").append(opt); - for (int i = 0; i < spaces; i++) { + StringBuffer sb = new StringBuffer(" ").append(opt).append(" "); + for (int i = opt.length(); i < 32; i++) { sb.append(" "); } sb.append(description);