Skip to content

Commit 4dd0e7e

Browse files
hnshns
committed
8259806: Clean up terminology on the "All Classes" page
Reviewed-by: jjg
1 parent dc6c96b commit 4dd0e7e

10 files changed

Lines changed: 26 additions & 24 deletions

File tree

‎src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllClassesIndexWriter.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ private static void generate(HtmlConfiguration configuration, IndexBuilder index
9292
* Print all the classes in the file.
9393
*/
9494
protected void buildAllClassesFile() throws DocFileIOException {
95-
String label = resources.getText("doclet.All_Classes");
95+
String label = resources.getText("doclet.All_Classes_And_Interfaces");
9696
Content allClassesContent = new ContentBuilder();
9797
addContents(allClassesContent);
9898
Content mainContent = new ContentBuilder();
@@ -131,7 +131,7 @@ protected void addContents(Content content) {
131131
}
132132
}
133133
}
134-
Content titleContent = contents.allClassesLabel;
134+
Content titleContent = contents.allClassesAndInterfacesLabel;
135135
Content pHeading = HtmlTree.HEADING_TITLE(Headings.PAGE_TITLE_HEADING,
136136
HtmlStyle.title, titleContent);
137137
Content headerDiv = HtmlTree.DIV(HtmlStyle.header, pHeading);

‎src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Contents.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
*/
5252
public class Contents {
5353

54-
public final Content allClassesLabel;
5554
public final Content allClassesAndInterfacesLabel;
5655
public final Content allImplementedInterfacesLabel;
5756
public final Content allModulesLabel;
@@ -198,7 +197,6 @@ public class Contents {
198197
Contents(HtmlConfiguration configuration) {
199198
this.resources = configuration.getDocResources();
200199

201-
allClassesLabel = getNonBreakResource("doclet.All_Classes");
202200
this.allClassesAndInterfacesLabel = getContent("doclet.All_Classes_And_Interfaces");
203201
allImplementedInterfacesLabel = getContent("doclet.All_Implemented_Interfaces");
204202
allModulesLabel = getNonBreakResource("doclet.All_Modules");

‎src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HelpWriter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public HelpWriter(HtmlConfiguration configuration,
7777
// yes, INDEX is correct in the following line
7878
overviewLink = links.createLink(DocPaths.INDEX, resources.getText("doclet.Overview"));
7979
allPackagesLink = links.createLink(DocPaths.ALLPACKAGES_INDEX, resources.getText("doclet.All_Packages"));
80-
allClassesLink = links.createLink(DocPaths.ALLCLASSES_INDEX, resources.getText("doclet.All_Classes"));
80+
allClassesLink = links.createLink(DocPaths.ALLCLASSES_INDEX, resources.getText("doclet.All_Classes_And_Interfaces"));
8181
DocPath dp = options.splitIndex()
8282
? DocPaths.INDEX_FILES.resolve(DocPaths.indexN(1))
8383
: DocPaths.INDEX_ALL;

‎src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlIndexBuilder.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ public void createSearchIndexFiles() throws DocFileIOException {
169169
add(item);
170170
}
171171
IndexItem item = IndexItem.of(IndexItem.Category.TYPES,
172-
resources.getText("doclet.All_Classes"),
172+
resources.getText("doclet.All_Classes_And_Interfaces"),
173173
DocPaths.ALLCLASSES_INDEX);
174174
add(item);
175175

‎src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ doclet.help.index.body=\
272272
The {0} contains an alphabetic index of all classes, interfaces, constructors, methods, \
273273
and fields in the documentation, as well as summary pages such as {1}.
274274
doclet.help.all_classes.head=\
275-
All Classes
275+
All Classes and Interfaces
276276
# 0: link to All Classes page
277277
doclet.help.all_classes.body=\
278278
The {0} page contains an alphabetic index of all classes and interfaces contained in the \

‎src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@ doclet.AnnotationInterfaces=Annotation Interfaces
140140
doclet.Exceptions=Exceptions
141141
doclet.Errors=Errors
142142
doclet.Classes=Classes
143-
doclet.All_Classes=All Classes
144143
doclet.All_Classes_And_Interfaces=All Classes and Interfaces
145144
doclet.All_Superinterfaces=All Superinterfaces:
146145
doclet.All_Implemented_Interfaces=All Implemented Interfaces:

‎test/langtools/jdk/javadoc/doclet/testModules/TestModules.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1439,13 +1439,14 @@ void checkAllPkgsAllClasses(boolean found) {
14391439
<table summary="Package Summary table, listing packages, and an explanation">""");
14401440
checkOutput("type-search-index.js", true,
14411441
"""
1442-
{"l":"All Classes","u":"allclasses-index.html"}""");
1442+
{"l":"All Classes and Interfaces","u":"allclasses-index.html"}""");
14431443
checkOutput("package-search-index.js", true,
14441444
"""
14451445
{"l":"All Packages","u":"allpackages-index.html"}""");
14461446
checkOutput("index-all.html", true,
14471447
"""
1448-
<br><a href="allclasses-index.html">All&nbsp;Classes</a><span class="vertical-se\
1449-
parator">|</span><a href="allpackages-index.html">All&nbsp;Packages</a>""");
1448+
<br><a href="allclasses-index.html">All&nbsp;Classes&nbsp;and&nbsp;Interfaces</a\
1449+
><span class="vertical-separator">|</span><a href="allpackages-index.html">All&n\
1450+
bsp;Packages</a>""");
14501451
}
14511452
}

‎test/langtools/jdk/javadoc/doclet/testPackagePage/TestPackagePage.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,13 +101,14 @@ public void testMultiplePackages() {
101101
""");
102102
checkOutput("type-search-index.js", true,
103103
"""
104-
{"l":"All Classes","u":"allclasses-index.html"}""");
104+
{"l":"All Classes and Interfaces","u":"allclasses-index.html"}""");
105105
checkOutput("package-search-index.js", true,
106106
"""
107107
{"l":"All Packages","u":"allpackages-index.html"}""");
108108
checkOutput("index-all.html", true,
109109
"""
110-
<br><a href="allclasses-index.html">All&nbsp;Classes</a><span class="vertical-se\
111-
parator">|</span><a href="allpackages-index.html">All&nbsp;Packages</a>""");
110+
<br><a href="allclasses-index.html">All&nbsp;Classes&nbsp;and&nbsp;Interfaces</a\
111+
><span class="vertical-separator">|</span><a href="allpackages-index.html">All&n\
112+
bsp;Packages</a>""");
112113
}
113114
}

‎test/langtools/jdk/javadoc/doclet/testSearch/TestSearch.java‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -540,8 +540,9 @@ tation interface pkg2.TestAnnotationType</dt>""",
540540
<dt><a href="../pkg/package-summary.html#SingleWord" class="search-tag-link">Sin\
541541
gleWord</a> - Search tag in package pkg</dt>""",
542542
"""
543-
<br><a href="../allclasses-index.html">All&nbsp;Classes</a><span class="vertical\
544-
-separator">|</span><a href="../allpackages-index.html">All&nbsp;Packages</a>""");
543+
<br><a href="../allclasses-index.html">All&nbsp;Classes&nbsp;and&nbsp;Interfaces\
544+
</a><span class="vertical-separator">|</span><a href="../allpackages-index.html"\
545+
>All&nbsp;Packages</a>""");
545546
checkOutput("index-files/index-10.html", true,
546547
"""
547548
<dt><a href="../pkg/package-summary.html#phrasewithspaces" class="search-tag-lin\
@@ -846,13 +847,14 @@ void checkAllPkgsAllClasses() {
846847
""");
847848
checkOutput("type-search-index.js", true,
848849
"""
849-
{"l":"All Classes","u":"allclasses-index.html"}""");
850+
{"l":"All Classes and Interfaces","u":"allclasses-index.html"}""");
850851
checkOutput("package-search-index.js", true,
851852
"""
852853
{"l":"All Packages","u":"allpackages-index.html"}""");
853854
checkOutput("index-all.html", true,
854-
"""
855-
<br><a href="allclasses-index.html">All&nbsp;Classes</a><span class="vertical-se\
856-
parator">|</span><a href="allpackages-index.html">All&nbsp;Packages</a>""");
855+
"""
856+
<br><a href="allclasses-index.html">All&nbsp;Classes&nbsp;and&nbsp;Interface\
857+
s</a><span class="vertical-separator">|</span><a href="allpackages-index.htm\
858+
l">All&nbsp;Packages</a>""");
857859
}
858860
}

‎test/langtools/jdk/javadoc/doclet/testUnnamedPackage/TestUnnamedPackage.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,20 +96,21 @@ public void test() {
9696

9797
checkOutput("type-search-index.js", true,
9898
"""
99-
{"l":"All Classes","u":"allclasses-index.html"}""");
99+
{"l":"All Classes and Interfaces","u":"allclasses-index.html"}""");
100100

101101
checkOutput("package-search-index.js", true,
102102
"""
103103
{"l":"All Packages","u":"allpackages-index.html"}""");
104104

105105
checkOutput("index-all.html", true,
106106
"""
107-
<br><a href="allclasses-index.html">All&nbsp;Classes</a><span class="vertical-se\
108-
parator">|</span><a href="allpackages-index.html">All&nbsp;Packages</a>""");
107+
<br><a href="allclasses-index.html">All&nbsp;Classes&nbsp;and&nbsp;Interfaces</a\
108+
><span class="vertical-separator">|</span><a href="allpackages-index.html">All&n\
109+
bsp;Packages</a>""");
109110

110111
checkOutput("type-search-index.js", true,
111112
"""
112-
{"l":"All Classes","u":"allclasses-index.html"}""",
113+
{"l":"All Classes and Interfaces","u":"allclasses-index.html"}""",
113114
"""
114115
{"p":"<Unnamed>","l":"C"}""");
115116

0 commit comments

Comments
 (0)