8223733: "Detail" in headings should be "Details"

Reviewed-by: hannesw
This commit is contained in:
Priya Lakshmi Muthuswamy 2019-05-21 15:02:18 +05:30
parent 0171fba9b8
commit c053e706a9
7 changed files with 38 additions and 38 deletions

View File

@ -160,13 +160,13 @@ doclet.Properties_Inherited_From_Class=Properties inherited from class
doclet.Properties_Inherited_From_Interface=Properties inherited from interface doclet.Properties_Inherited_From_Interface=Properties inherited from interface
doclet.Properties_Declared_In_Class=Properties declared in class doclet.Properties_Declared_In_Class=Properties declared in class
doclet.Properties_Declared_In_Interface=Properties declared in interface doclet.Properties_Declared_In_Interface=Properties declared in interface
doclet.Annotation_Type_Member_Detail=Element Detail doclet.Annotation_Type_Member_Detail=Element Details
doclet.Enum_Constant_Detail=Enum Constant Detail doclet.Enum_Constant_Detail=Enum Constant Details
doclet.Constants_Summary=Constant Field Values doclet.Constants_Summary=Constant Field Values
doclet.Field_Detail=Field Detail doclet.Field_Detail=Field Details
doclet.Property_Detail=Property Detail doclet.Property_Detail=Property Details
doclet.Method_Detail=Method Detail doclet.Method_Detail=Method Details
doclet.Constructor_Detail=Constructor Detail doclet.Constructor_Detail=Constructor Details
doclet.Deprecated=Deprecated. doclet.Deprecated=Deprecated.
doclet.DeprecatedForRemoval=Deprecated, for removal: This API element is subject to removal in a future version. doclet.DeprecatedForRemoval=Deprecated, for removal: This API element is subject to removal in a future version.
doclet.Groupname_already_used=In -group option, groupname already used: {0} doclet.Groupname_already_used=In -group option, groupname already used: {0}

View File

@ -79,7 +79,7 @@ public class TestAnnotationTypes extends JavadocTester {
"<ul class=\"blockList\">", "<ul class=\"blockList\">",
"<li class=\"blockList\">", "<li class=\"blockList\">",
"<section class=\"memberDetails\">", "<section class=\"memberDetails\">",
"<h2>Element Detail</h2>", "<h2>Element Details</h2>",
"<a id=\"annotation.type.element.detail\">", "<a id=\"annotation.type.element.detail\">",
"<!-- -->", "<!-- -->",
"</a>", "</a>",

View File

@ -24,7 +24,7 @@
/* /*
* @test * @test
* @bug 8072945 8081854 8141492 8148985 8150188 4649116 8173707 8151743 8169819 8183037 8182765 8196202 * @bug 8072945 8081854 8141492 8148985 8150188 4649116 8173707 8151743 8169819 8183037 8182765 8196202
* 8202624 8210047 8184205 8221871 * 8202624 8210047 8184205 8221871 8223733
* @summary Test the version of HTML generated by the javadoc tool. * @summary Test the version of HTML generated by the javadoc tool.
* @author bpatel * @author bpatel
* @library ../../lib * @library ../../lib
@ -324,17 +324,17 @@ public class TestHtmlVersion extends JavadocTester {
+ "</a>\n" + "</a>\n"
+ "<h2>Method Summary</h2>", + "<h2>Method Summary</h2>",
"<section class=\"fieldDetails\">\n" "<section class=\"fieldDetails\">\n"
+ "<h2>Field Detail</h2>\n" + "<h2>Field Details</h2>\n"
+ "<a id=\"field.detail\">\n" + "<a id=\"field.detail\">\n"
+ "<!-- -->\n" + "<!-- -->\n"
+ "</a>", + "</a>",
"<section class=\"constructorDetails\">\n" "<section class=\"constructorDetails\">\n"
+ "<h2>Constructor Detail</h2>\n" + "<h2>Constructor Details</h2>\n"
+ "<a id=\"constructor.detail\">\n" + "<a id=\"constructor.detail\">\n"
+ "<!-- -->\n" + "<!-- -->\n"
+ "</a>", + "</a>",
"<section class=\"methodDetails\">\n" "<section class=\"methodDetails\">\n"
+ "<h2>Method Detail</h2>\n" + "<h2>Method Details</h2>\n"
+ "<a id=\"method.detail\">\n" + "<a id=\"method.detail\">\n"
+ "<!-- -->\n" + "<!-- -->\n"
+ "</a>", + "</a>",
@ -368,12 +368,12 @@ public class TestHtmlVersion extends JavadocTester {
+ "<div class=\"memberSummary\">\n", + "<div class=\"memberSummary\">\n",
"<table aria-labelledby=\"t0\">", "<table aria-labelledby=\"t0\">",
"<section class=\"constantDetails\">\n" "<section class=\"constantDetails\">\n"
+ "<h2>Enum Constant Detail</h2>\n" + "<h2>Enum Constant Details</h2>\n"
+ "<a id=\"enum.constant.detail\">\n" + "<a id=\"enum.constant.detail\">\n"
+ "<!-- -->\n" + "<!-- -->\n"
+ "</a>\n", + "</a>\n",
"<section class=\"methodDetails\">\n" "<section class=\"methodDetails\">\n"
+ "<h2>Method Detail</h2>\n" + "<h2>Method Details</h2>\n"
+ "<a id=\"method.detail\">\n" + "<a id=\"method.detail\">\n"
+ "<!-- -->\n" + "<!-- -->\n"
+ "</a>\n", + "</a>\n",
@ -401,7 +401,7 @@ public class TestHtmlVersion extends JavadocTester {
+ "<div class=\"memberSummary\">\n", + "<div class=\"memberSummary\">\n",
"<table aria-labelledby=\"t0\">\n", "<table aria-labelledby=\"t0\">\n",
"<section class=\"methodDetails\">\n" "<section class=\"methodDetails\">\n"
+ "<h2>Method Detail</h2>\n" + "<h2>Method Details</h2>\n"
+ "<a id=\"method.detail\">\n" + "<a id=\"method.detail\">\n"
+ "<!-- -->\n" + "<!-- -->\n"
+ "</a>\n", + "</a>\n",
@ -427,7 +427,7 @@ public class TestHtmlVersion extends JavadocTester {
+ "</a>\n" + "</a>\n"
+ "<h2>Constructor Summary</h2>", + "<h2>Constructor Summary</h2>",
"<section class=\"constructorDetails\">\n" "<section class=\"constructorDetails\">\n"
+ "<h2>Constructor Detail</h2>\n" + "<h2>Constructor Details</h2>\n"
+ "<a id=\"constructor.detail\">\n" + "<a id=\"constructor.detail\">\n"
+ "<!-- -->\n" + "<!-- -->\n"
+ "</a>\n", + "</a>\n",
@ -453,7 +453,7 @@ public class TestHtmlVersion extends JavadocTester {
+ "</a>\n" + "</a>\n"
+ "<h2>Constructor Summary</h2>", + "<h2>Constructor Summary</h2>",
"<section class=\"constructorDetails\">\n" "<section class=\"constructorDetails\">\n"
+ "<h2>Constructor Detail</h2>\n" + "<h2>Constructor Details</h2>\n"
+ "<a id=\"constructor.detail\">\n" + "<a id=\"constructor.detail\">\n"
+ "<!-- -->\n" + "<!-- -->\n"
+ "</a>\n", + "</a>\n",
@ -485,7 +485,7 @@ public class TestHtmlVersion extends JavadocTester {
+ "<h2>Optional Element Summary</h2>\n" + "<h2>Optional Element Summary</h2>\n"
+ "<div class=\"memberSummary\">\n<table>", + "<div class=\"memberSummary\">\n<table>",
"<section class=\"memberDetails\">\n" "<section class=\"memberDetails\">\n"
+ "<h2>Element Detail</h2>\n" + "<h2>Element Details</h2>\n"
+ "<a id=\"annotation.type.element.detail\">\n" + "<a id=\"annotation.type.element.detail\">\n"
+ "<!-- -->\n" + "<!-- -->\n"
+ "</a>\n", + "</a>\n",
@ -742,19 +742,19 @@ public class TestHtmlVersion extends JavadocTester {
+ "<li class=\"blockList\"><a name=\"field.detail\">\n" + "<li class=\"blockList\"><a name=\"field.detail\">\n"
+ "<!-- -->\n" + "<!-- -->\n"
+ "</a>\n" + "</a>\n"
+ "<h2>Field Detail</h2>", + "<h2>Field Details</h2>",
"<!-- ========= CONSTRUCTOR DETAIL ======== -->\n" "<!-- ========= CONSTRUCTOR DETAIL ======== -->\n"
+ "<ul class=\"blockList\">\n" + "<ul class=\"blockList\">\n"
+ "<li class=\"blockList\"><a name=\"constructor.detail\">\n" + "<li class=\"blockList\"><a name=\"constructor.detail\">\n"
+ "<!-- -->\n" + "<!-- -->\n"
+ "</a>\n" + "</a>\n"
+ "<h2>Constructor Detail</h2>", + "<h2>Constructor Details</h2>",
"<!-- ============ METHOD DETAIL ========== -->\n" "<!-- ============ METHOD DETAIL ========== -->\n"
+ "<ul class=\"blockList\">\n" + "<ul class=\"blockList\">\n"
+ "<li class=\"blockList\"><a name=\"method.detail\">\n" + "<li class=\"blockList\"><a name=\"method.detail\">\n"
+ "<!-- -->\n" + "<!-- -->\n"
+ "</a>\n" + "</a>\n"
+ "<h2>Method Detail</h2>"); + "<h2>Method Details</h2>");
// Negated test for enum page // Negated test for enum page
checkOutput("pkg/AnotherClass.ModalExclusionType.html", false, checkOutput("pkg/AnotherClass.ModalExclusionType.html", false,
@ -786,13 +786,13 @@ public class TestHtmlVersion extends JavadocTester {
+ "<li class=\"blockList\"><a name=\"enum.constant.detail\">\n" + "<li class=\"blockList\"><a name=\"enum.constant.detail\">\n"
+ "<!-- -->\n" + "<!-- -->\n"
+ "</a>\n" + "</a>\n"
+ "<h2>Enum Constant Detail</h2>", + "<h2>Enum Constant Details</h2>",
"<!-- ============ METHOD DETAIL ========== -->\n" "<!-- ============ METHOD DETAIL ========== -->\n"
+ "<ul class=\"blockList\">\n" + "<ul class=\"blockList\">\n"
+ "<li class=\"blockList\"><a name=\"method.detail\">\n" + "<li class=\"blockList\"><a name=\"method.detail\">\n"
+ "<!-- -->\n" + "<!-- -->\n"
+ "</a>\n" + "</a>\n"
+ "<h2>Method Detail</h2>"); + "<h2>Method Details</h2>");
// Negated test for interface page // Negated test for interface page
checkOutput("pkg2/Interface.html", false, checkOutput("pkg2/Interface.html", false,
@ -816,7 +816,7 @@ public class TestHtmlVersion extends JavadocTester {
+ "<li class=\"blockList\"><a name=\"method.detail\">\n" + "<li class=\"blockList\"><a name=\"method.detail\">\n"
+ "<!-- -->\n" + "<!-- -->\n"
+ "</a>\n" + "</a>\n"
+ "<h2>Method Detail</h2>"); + "<h2>Method Details</h2>");
// Negated test for error page // Negated test for error page
checkOutput("pkg/TestError.html", false, checkOutput("pkg/TestError.html", false,
@ -838,7 +838,7 @@ public class TestHtmlVersion extends JavadocTester {
+ "<li class=\"blockList\"><a name=\"constructor.detail\">\n" + "<li class=\"blockList\"><a name=\"constructor.detail\">\n"
+ "<!-- -->\n" + "<!-- -->\n"
+ "</a>\n" + "</a>\n"
+ "<h2>Constructor Detail</h2>"); + "<h2>Constructor Details</h2>");
// Negated test for exception page // Negated test for exception page
checkOutput("pkg/TestException.html", false, checkOutput("pkg/TestException.html", false,
@ -860,7 +860,7 @@ public class TestHtmlVersion extends JavadocTester {
+ "<li class=\"blockList\"><a name=\"constructor.detail\">\n" + "<li class=\"blockList\"><a name=\"constructor.detail\">\n"
+ "<!-- -->\n" + "<!-- -->\n"
+ "</a>\n" + "</a>\n"
+ "<h2>Constructor Detail</h2>"); + "<h2>Constructor Details</h2>");
// Negated test for annotation page // Negated test for annotation page
checkOutput("pkg2/TestAnnotationType.html", false, checkOutput("pkg2/TestAnnotationType.html", false,
@ -892,7 +892,7 @@ public class TestHtmlVersion extends JavadocTester {
+ "<li class=\"blockList\"><a name=\"annotation.type.element.detail\">\n" + "<li class=\"blockList\"><a name=\"annotation.type.element.detail\">\n"
+ "<!-- -->\n" + "<!-- -->\n"
+ "</a>\n" + "</a>\n"
+ "<h2>Element Detail</h2>"); + "<h2>Element Details</h2>");
// Negated test for class use page // Negated test for class use page
checkOutput("pkg1/class-use/RegClass.html", false, checkOutput("pkg1/class-use/RegClass.html", false,

View File

@ -75,7 +75,7 @@ public class TestIndexTaglet extends JavadocTester {
checkExit(Exit.OK); checkExit(Exit.OK);
checkOrder("pkg/A.html", checkOrder("pkg/A.html",
"<h2>Method Detail</h2>\n", "<h2>Method Details</h2>\n",
"<div class=\"block\">test description with <a id=\"search_phrase_a\" " "<div class=\"block\">test description with <a id=\"search_phrase_a\" "
+ "class=\"searchTagResult\">search_phrase_a</a></div>"); + "class=\"searchTagResult\">search_phrase_a</a></div>");

View File

@ -213,7 +213,7 @@ public class TestJavaFX extends JavadocTester {
"pkg2"); "pkg2");
checkExit(Exit.OK); checkExit(Exit.OK);
checkOutput("pkg2/Test.html", true, checkOutput("pkg2/Test.html", true,
"<h2>Property Detail</h2>\n" "<h2>Property Details</h2>\n"
+ "<a id=\"property.detail\">\n" + "<a id=\"property.detail\">\n"
+ "<!-- -->\n" + "<!-- -->\n"
+ "</a>\n" + "</a>\n"

View File

@ -515,7 +515,7 @@ public class TestOrdering extends JavadocTester {
checkExit(Exit.OK); checkExit(Exit.OK);
checkOrder("pkg5/AnnoFieldTest.html", checkOrder("pkg5/AnnoFieldTest.html",
"<h2>Field Detail</h2>", "<h2>Field Details</h2>",
"<pre>static final&nbsp;int&nbsp;one</pre>", "<pre>static final&nbsp;int&nbsp;one</pre>",
"<pre>static final&nbsp;int&nbsp;two</pre>", "<pre>static final&nbsp;int&nbsp;two</pre>",
"<pre>static final&nbsp;int&nbsp;three</pre>", "<pre>static final&nbsp;int&nbsp;three</pre>",
@ -527,7 +527,7 @@ public class TestOrdering extends JavadocTester {
"<a href=\"#one()\">one</a>", "<a href=\"#one()\">one</a>",
"<a href=\"#three()\">three</a>", "<a href=\"#three()\">three</a>",
"<a href=\"#two()\">two</a>", "<a href=\"#two()\">two</a>",
"<h2>Element Detail</h2>", "<h2>Element Details</h2>",
"<h3>one</h3>", "<h3>one</h3>",
"<h3>two</h3>", "<h3>two</h3>",
"<h3>three</h3>", "<h3>three</h3>",
@ -539,7 +539,7 @@ public class TestOrdering extends JavadocTester {
"<a href=\"#one()\">one</a>", "<a href=\"#one()\">one</a>",
"<a href=\"#three()\">three</a>", "<a href=\"#three()\">three</a>",
"<a href=\"#two()\">two</a>", "<a href=\"#two()\">two</a>",
"<h2>Element Detail</h2>", "<h2>Element Details</h2>",
"<h3>one</h3>", "<h3>one</h3>",
"<h3>two</h3>", "<h3>two</h3>",
"<h3>three</h3>", "<h3>three</h3>",
@ -551,7 +551,7 @@ public class TestOrdering extends JavadocTester {
"<a href=\"#%3Cinit%3E(int,int)\"", "<a href=\"#%3Cinit%3E(int,int)\"",
"<a href=\"#%3Cinit%3E(int,int,int)\"", "<a href=\"#%3Cinit%3E(int,int,int)\"",
"<a href=\"#%3Cinit%3E(int,int,int,int)\"", "<a href=\"#%3Cinit%3E(int,int,int,int)\"",
"<h2>Constructor Detail</h2>", "<h2>Constructor Details</h2>",
"<a id=\"&lt;init&gt;(int,int,int,int)\">", "<a id=\"&lt;init&gt;(int,int,int,int)\">",
"<a id=\"&lt;init&gt;(int,int,int)\">", "<a id=\"&lt;init&gt;(int,int,int)\">",
"<a id=\"&lt;init&gt;(int,int)\">", "<a id=\"&lt;init&gt;(int,int)\">",
@ -563,7 +563,7 @@ public class TestOrdering extends JavadocTester {
"<a href=\"#ONE\">ONE</a>", "<a href=\"#ONE\">ONE</a>",
"<a href=\"#THREE\">THREE</a>", "<a href=\"#THREE\">THREE</a>",
"<a href=\"#TWO\">TWO</a>", "<a href=\"#TWO\">TWO</a>",
"<h2>Enum Constant Detail</h2>", "<h2>Enum Constant Details</h2>",
"<h3>ONE</h3>", "<h3>ONE</h3>",
"<h3>TWO</h3>", "<h3>TWO</h3>",
"<h3>THREE</h3>", "<h3>THREE</h3>",
@ -575,7 +575,7 @@ public class TestOrdering extends JavadocTester {
"<a href=\"#one\">one</a>", "<a href=\"#one\">one</a>",
"<a href=\"#three\">three</a>", "<a href=\"#three\">three</a>",
"<a href=\"#two\">two</a>", "<a href=\"#two\">two</a>",
"<h2>Field Detail</h2>", "<h2>Field Details</h2>",
"<h3>one</h3>", "<h3>one</h3>",
"<h3>two</h3>", "<h3>two</h3>",
"<h3>three</h3>", "<h3>three</h3>",
@ -587,7 +587,7 @@ public class TestOrdering extends JavadocTester {
"<a href=\"#one()\">one</a>", "<a href=\"#one()\">one</a>",
"<a href=\"#three()\">three</a>", "<a href=\"#three()\">three</a>",
"<a href=\"#two()\">two</a>", "<a href=\"#two()\">two</a>",
"<h2>Method Detail</h2>", "<h2>Method Details</h2>",
"<h3>one</h3>", "<h3>one</h3>",
"<h3>two</h3>", "<h3>two</h3>",
"<h3>three</h3>", "<h3>three</h3>",
@ -599,7 +599,7 @@ public class TestOrdering extends JavadocTester {
"<a href=\"#one()\">one</a>", "<a href=\"#one()\">one</a>",
"<a href=\"#three()\">three</a>", "<a href=\"#three()\">three</a>",
"<a href=\"#two()\">two</a>", "<a href=\"#two()\">two</a>",
"<h2>Method Detail</h2>", "<h2>Method Details</h2>",
"<h3>one</h3>", "<h3>one</h3>",
"<h3>two</h3>", "<h3>two</h3>",
"<h3>three</h3>", "<h3>three</h3>",
@ -611,7 +611,7 @@ public class TestOrdering extends JavadocTester {
"<a href=\"#oneProperty\">one</a>", "<a href=\"#oneProperty\">one</a>",
"<a href=\"#threeProperty\">three</a>", "<a href=\"#threeProperty\">three</a>",
"<a href=\"#twoProperty\">two</a>", "<a href=\"#twoProperty\">two</a>",
"<h2>Property Detail</h2>", "<h2>Property Details</h2>",
"<h3>oneProperty</h3>", "<h3>oneProperty</h3>",
"<h3>twoProperty</h3>", "<h3>twoProperty</h3>",
"<h3>threeProperty</h3>", "<h3>threeProperty</h3>",

View File

@ -78,7 +78,7 @@ public class TestSystemPropertyTaglet extends JavadocTester {
checkOrder("pkg/A.html", checkOrder("pkg/A.html",
"<h1 title=\"Class A\" class=\"title\">Class A</h1>", "<h1 title=\"Class A\" class=\"title\">Class A</h1>",
"test with <code><a id=\"user.name\" class=\"searchTagResult\">user.name</a></code>", "test with <code><a id=\"user.name\" class=\"searchTagResult\">user.name</a></code>",
"<h2>Method Detail</h2>", "<h2>Method Details</h2>",
"test with <code><a id=\"java.version\" class=\"searchTagResult\">java.version</a></code>"); "test with <code><a id=\"java.version\" class=\"searchTagResult\">java.version</a></code>");
checkOrder("index-all.html", checkOrder("index-all.html",