Skip to content

Commit b2f0355

Browse files
author
Brent Christian
committed
8253497: Core Libs Terminology Refresh
Reviewed-by: naoto, kcr, rriggs, joehw, bpb, smarks, alanb
1 parent a244b82 commit b2f0355

15 files changed

Lines changed: 82 additions & 81 deletions

File tree

‎make/jdk/src/classes/build/tools/generatelsrequivmaps/EquivMapsGenerator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ private static void processDeprecatedData(String type,
132132
+ " A region/variant subtag \"" + preferred
133133
+ "\" is registered for more than one subtags.");
134134
}
135-
} else { // language, extlang, grandfathered, and redundant
135+
} else { // language, extlang, legacy, and redundant
136136
if (!initialLanguageMap.containsKey(preferred)) {
137137
sb = new StringBuilder(preferred);
138138
sb.append(',');

‎src/java.base/share/classes/java/io/ObjectInputFilter.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -64,7 +64,7 @@
6464
* {@link Status#UNDECIDED UNDECIDED}.
6565
* Filters should be designed for the specific use case and expected types.
6666
* A filter designed for a particular use may be passed a class that is outside
67-
* of the scope of the filter. If the purpose of the filter is to black-list classes
67+
* of the scope of the filter. If the purpose of the filter is to reject classes
6868
* then it can reject a candidate class that matches and report UNDECIDED for others.
6969
* A filter may be called with class equals {@code null}, {@code arrayLength} equal -1,
7070
* the depth, number of references, and stream size and return a status

‎src/java.base/share/classes/java/util/Locale.java‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1645,18 +1645,19 @@ public String toLanguageTag() {
16451645
* </pre></ul>
16461646
*
16471647
* <p>This implements the 'Language-Tag' production of BCP47, and
1648-
* so supports grandfathered (regular and irregular) as well as
1648+
* so supports legacy (regular and irregular, referred to as
1649+
* "Type: grandfathered" in BCP47) as well as
16491650
* private use language tags. Stand alone private use tags are
16501651
* represented as empty language and extension 'x-whatever',
1651-
* and grandfathered tags are converted to their canonical replacements
1652+
* and legacy tags are converted to their canonical replacements
16521653
* where they exist.
16531654
*
1654-
* <p>Grandfathered tags with canonical replacements are as follows:
1655+
* <p>Legacy tags with canonical replacements are as follows:
16551656
*
16561657
* <table class="striped">
1657-
* <caption style="display:none">Grandfathered tags with canonical replacements</caption>
1658+
* <caption style="display:none">Legacy tags with canonical replacements</caption>
16581659
* <thead style="text-align:center">
1659-
* <tr><th scope="col" style="padding: 0 2px">grandfathered tag</th><th scope="col" style="padding: 0 2px">modern replacement</th></tr>
1660+
* <tr><th scope="col" style="padding: 0 2px">legacy tag</th><th scope="col" style="padding: 0 2px">modern replacement</th></tr>
16601661
* </thead>
16611662
* <tbody style="text-align:center">
16621663
* <tr><th scope="row">art-lojban</th><td>jbo</td></tr>
@@ -1682,13 +1683,13 @@ public String toLanguageTag() {
16821683
* </tbody>
16831684
* </table>
16841685
*
1685-
* <p>Grandfathered tags with no modern replacement will be
1686+
* <p>Legacy tags with no modern replacement will be
16861687
* converted as follows:
16871688
*
16881689
* <table class="striped">
1689-
* <caption style="display:none">Grandfathered tags with no modern replacement</caption>
1690+
* <caption style="display:none">Legacy tags with no modern replacement</caption>
16901691
* <thead style="text-align:center">
1691-
* <tr><th scope="col" style="padding: 0 2px">grandfathered tag</th><th scope="col" style="padding: 0 2px">converts to</th></tr>
1692+
* <tr><th scope="col" style="padding: 0 2px">legacy tag</th><th scope="col" style="padding: 0 2px">converts to</th></tr>
16921693
* </thead>
16931694
* <tbody style="text-align:center">
16941695
* <tr><th scope="row">cel-gaulish</th><td>xtg-x-cel-gaulish</td></tr>
@@ -1700,7 +1701,7 @@ public String toLanguageTag() {
17001701
* </tbody>
17011702
* </table>
17021703
*
1703-
* <p>For a list of all grandfathered tags, see the
1704+
* <p>For a list of all legacy tags, see the
17041705
* IANA Language Subtag Registry (search for "Type: grandfathered").
17051706
*
17061707
* <p><b>Note</b>: there is no guarantee that {@code toLanguageTag}
@@ -2586,7 +2587,7 @@ public Builder setLocale(Locale locale) {
25862587
* Resets the Builder to match the provided IETF BCP 47
25872588
* language tag. Discards the existing state. Null and the
25882589
* empty string cause the builder to be reset, like {@link
2589-
* #clear}. Grandfathered tags (see {@link
2590+
* #clear}. Legacy tags (see {@link
25902591
* Locale#forLanguageTag}) are converted to their canonical
25912592
* form before being processed. Otherwise, the language tag
25922593
* must be well-formed (see {@link Locale}) or an exception is
@@ -2838,7 +2839,7 @@ public Builder clearExtensions() {
28382839
* on this builder.
28392840
*
28402841
* <p>This applies the conversions listed in {@link Locale#forLanguageTag}
2841-
* when constructing a Locale. (Grandfathered tags are handled in
2842+
* when constructing a Locale. (Legacy tags are handled in
28422843
* {@link #setLanguageTag}.)
28432844
*
28442845
* @return A Locale.

‎src/java.base/share/classes/jdk/internal/logger/BootstrapLogger.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -847,7 +847,7 @@ public static boolean isBooted() {
847847
else return VM.isBooted();
848848
}
849849

850-
// A bit of black magic. We try to find out the nature of the logging
850+
// A bit of magic. We try to find out the nature of the logging
851851
// backend without actually loading it.
852852
private static enum LoggingBackend {
853853
// There is no LoggerFinder and JUL is not present

‎src/java.base/share/classes/sun/util/locale/LanguageTag.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2010, 2020, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -60,10 +60,10 @@ public class LanguageTag {
6060
private List<String> variants = Collections.emptyList(); // variant subtags
6161
private List<String> extensions = Collections.emptyList(); // extensions
6262

63-
// Map contains grandfathered tags and its preferred mappings from
63+
// Map contains legacy language tags and its preferred mappings from
6464
// http://www.ietf.org/rfc/rfc5646.txt
6565
// Keys are lower-case strings.
66-
private static final Map<String, String[]> GRANDFATHERED = new HashMap<>();
66+
private static final Map<String, String[]> LEGACY = new HashMap<>();
6767

6868
static {
6969
// grandfathered = irregular ; non-redundant tags registered
@@ -127,7 +127,7 @@ public class LanguageTag {
127127
{"zh-xiang", "hsn"},
128128
};
129129
for (String[] e : entries) {
130-
GRANDFATHERED.put(LocaleUtils.toLowerString(e[0]), e);
130+
LEGACY.put(LocaleUtils.toLowerString(e[0]), e);
131131
}
132132
}
133133

@@ -188,8 +188,8 @@ public static LanguageTag parse(String languageTag, ParseStatus sts) {
188188

189189
StringTokenIterator itr;
190190

191-
// Check if the tag is grandfathered
192-
String[] gfmap = GRANDFATHERED.get(LocaleUtils.toLowerString(languageTag));
191+
// Check if the tag is a legacy language tag
192+
String[] gfmap = LEGACY.get(LocaleUtils.toLowerString(languageTag));
193193
if (gfmap != null) {
194194
// use preferred mapping
195195
itr = new StringTokenIterator(gfmap[1], SEP);

‎src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIConnectorServer.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ public class RMIConnectorServer extends JMXConnectorServer {
132132
* the serial form of any deserialized object.
133133
* The pattern must be in same format as used in
134134
* {@link java.io.ObjectInputFilter.Config#createFilter}.
135-
* It may define a white list of permitted classes, a black list of
135+
* It may define an allow-list of permitted classes, a reject-list of
136136
* rejected classes, a maximum depth for the deserialized objects,
137137
* etc.
138138
* <p>
@@ -149,7 +149,7 @@ public class RMIConnectorServer extends JMXConnectorServer {
149149
* classes they use in their serial form.
150150
* <p>
151151
* Care must be taken when defining such a filter, as defining
152-
* a white list too restrictive or a too wide a black list may
152+
* an allow-list that is too narrow or a reject-list that is too wide may
153153
* prevent legitimate clients from interoperating with the
154154
* {@code JMXConnectorServer}.
155155
*/

‎src/java.rmi/share/classes/sun/rmi/registry/RegistryImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@ private static ObjectInputFilter.Status registryFilter(ObjectInputFilter.FilterI
441441
if (registryFilter != null) {
442442
ObjectInputFilter.Status status = registryFilter.checkInput(filterInfo);
443443
if (status != ObjectInputFilter.Status.UNDECIDED) {
444-
// The Registry filter can override the built-in white-list
444+
// The Registry filter can override the built-in allow-list
445445
return status;
446446
}
447447
}

‎src/java.rmi/share/classes/sun/rmi/transport/DGCImpl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1996, 2020, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -382,7 +382,7 @@ private static ObjectInputFilter.Status checkInput(ObjectInputFilter.FilterInfo
382382
if (dgcFilter != null) {
383383
ObjectInputFilter.Status status = dgcFilter.checkInput(filterInfo);
384384
if (status != ObjectInputFilter.Status.UNDECIDED) {
385-
// The DGC filter can override the built-in white-list
385+
// The DGC filter can override the built-in allow-list
386386
return status;
387387
}
388388
}

‎test/jdk/java/lang/ClassLoader/Assert.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -62,7 +62,7 @@ public static void main(String[] args) throws Exception {
6262
int[] switches = new int[7];
6363

6464
int switchSource = 0;
65-
if (args.length == 0) { // This is master version
65+
if (args.length == 0) { // This is the controller
6666

6767
// This code is for an exhaustive test
6868
//while(switchSource < 2187) {
@@ -92,7 +92,7 @@ public static void main(String[] args) throws Exception {
9292
new InputStreamReader(p.getInputStream()));
9393
String outString = blah.readLine();
9494
while (outString != null) {
95-
System.out.println("from slave:"+outString);
95+
System.out.println("from BufferedReader:"+outString);
9696
outString = blah.readLine();
9797
}
9898
}

‎test/jdk/java/lang/management/ClassLoadingMXBean/LoadCounts.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -119,9 +119,9 @@ class SimpleOne {}
119119
class SimpleTwo {}
120120

121121
class Chain {
122-
Slave slave = new Slave();
122+
Worker worker = new Worker();
123123
}
124-
class Slave {}
124+
class Worker {}
125125

126126
class LeftHand extends ClassLoader {
127127
public LeftHand() {

0 commit comments

Comments
 (0)