archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 23:04:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8253497: Core Libs Terminology Refresh

Browse source 
Reviewed-by: naoto, kcr, rriggs, joehw, bpb, smarks, alanb
This commit is contained in:
Brent Christian 2020-12-16 23:09:20 +00:00
parent a244b82293
commit b2f035549a
15 changed files with 82 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/java.base/share/classes/java/io/ObjectInputFilter.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -64,7 +64,7 @@ import jdk.internal.util.StaticProperty;
* {@link Status#UNDECIDED UNDECIDED}.
* Filters should be designed for the specific use case and expected types.
* A filter designed for a particular use may be passed a class that is outside
* of the scope of the filter. If the purpose of the filter is to black-list classes
* of the scope of the filter. If the purpose of the filter is to reject classes
* then it can reject a candidate class that matches and report UNDECIDED for others.
* A filter may be called with class equals {@code null}, {@code arrayLength} equal -1,
* the depth, number of references, and stream size and return a status

23
src/java.base/share/classes/java/util/Locale.java
View file

@ -1645,18 +1645,19 @@ public final class Locale implements Cloneable, Serializable {
* </pre></ul>
*
* <p>This implements the 'Language-Tag' production of BCP47, and
* so supports grandfathered (regular and irregular) as well as
* so supports legacy (regular and irregular, referred to as
* "Type: grandfathered" in BCP47) as well as
* private use language tags. Stand alone private use tags are
* represented as empty language and extension 'x-whatever',
* and grandfathered tags are converted to their canonical replacements
* and legacy tags are converted to their canonical replacements
* where they exist.
*
* <p>Grandfathered tags with canonical replacements are as follows:
* <p>Legacy tags with canonical replacements are as follows:
*
* <table class="striped">
* <caption style="display:none">Grandfathered tags with canonical replacements</caption>
* <caption style="display:none">Legacy tags with canonical replacements</caption>
* <thead style="text-align:center">
* <tr><th scope="col" style="padding: 0 2px">grandfathered tag</th><th scope="col" style="padding: 0 2px">modern replacement</th></tr>
* <tr><th scope="col" style="padding: 0 2px">legacy tag</th><th scope="col" style="padding: 0 2px">modern replacement</th></tr>
* </thead>
* <tbody style="text-align:center">
* <tr><th scope="row">art-lojban</th><td>jbo</td></tr>
@ -1682,13 +1683,13 @@ public final class Locale implements Cloneable, Serializable {
* </tbody>
* </table>
*
* <p>Grandfathered tags with no modern replacement will be
* <p>Legacy tags with no modern replacement will be
* converted as follows:
*
* <table class="striped">
* <caption style="display:none">Grandfathered tags with no modern replacement</caption>
* <caption style="display:none">Legacy tags with no modern replacement</caption>
* <thead style="text-align:center">
* <tr><th scope="col" style="padding: 0 2px">grandfathered tag</th><th scope="col" style="padding: 0 2px">converts to</th></tr>
* <tr><th scope="col" style="padding: 0 2px">legacy tag</th><th scope="col" style="padding: 0 2px">converts to</th></tr>
* </thead>
* <tbody style="text-align:center">
* <tr><th scope="row">cel-gaulish</th><td>xtg-x-cel-gaulish</td></tr>
@ -1700,7 +1701,7 @@ public final class Locale implements Cloneable, Serializable {
* </tbody>
* </table>
*
* <p>For a list of all grandfathered tags, see the
* <p>For a list of all legacy tags, see the
* IANA Language Subtag Registry (search for "Type: grandfathered").
*
* <p><b>Note</b>: there is no guarantee that {@code toLanguageTag}
@ -2586,7 +2587,7 @@ public final class Locale implements Cloneable, Serializable {
* Resets the Builder to match the provided IETF BCP 47
* language tag. Discards the existing state. Null and the
* empty string cause the builder to be reset, like {@link
* #clear}. Grandfathered tags (see {@link
* #clear}. Legacy tags (see {@link
* Locale#forLanguageTag}) are converted to their canonical
* form before being processed. Otherwise, the language tag
* must be well-formed (see {@link Locale}) or an exception is
@ -2838,7 +2839,7 @@ public final class Locale implements Cloneable, Serializable {
* on this builder.
*
* <p>This applies the conversions listed in {@link Locale#forLanguageTag}
* when constructing a Locale. (Grandfathered tags are handled in
* when constructing a Locale. (Legacy tags are handled in
* {@link #setLanguageTag}.)
*
* @return A Locale.