@@ -2467,7 +2465,7 @@ public final class Locale implements Cloneable, Serializable {
* are exactly "ja", "JP", "JP" or "th", "TH", "TH" and script/extensions
* fields are empty, this method supplies {@code UNICODE_LOCALE_EXTENSION}
* "ca"/"japanese" (calendar type is "japanese") or "nu"/"thai" (number script
- * type is "thai"). See Special Cases
+ * type is "thai"). See {@linkplain ##special_cases_constructor Special Cases}
* for more information.
*
* @return an instance of {@code Locale} equivalent to
@@ -2704,7 +2702,7 @@ public final class Locale implements Cloneable, Serializable {
/**
* Sets the language. If {@code language} is the empty string or
* null, the language in this {@code Builder} is removed. Otherwise,
- * the language must be well-formed
+ * the language must be {@linkplain Locale##def_language well-formed}
* or an exception is thrown.
*
* The typical language value is a two or three-letter language
@@ -2726,7 +2724,7 @@ public final class Locale implements Cloneable, Serializable {
/**
* Sets the script. If {@code script} is null or the empty string,
* the script in this {@code Builder} is removed.
- * Otherwise, the script must be well-formed or an
+ * Otherwise, the script must be {@linkplain Locale##def_script well-formed} or an
* exception is thrown.
*
*
The typical script value is a four-letter script code as defined by ISO 15924.
@@ -2747,7 +2745,7 @@ public final class Locale implements Cloneable, Serializable {
/**
* Sets the region. If region is null or the empty string, the region
* in this {@code Builder} is removed. Otherwise,
- * the region must be well-formed or an
+ * the region must be {@linkplain Locale##def_region well-formed} or an
* exception is thrown.
*
*
The typical region value is a two-letter ISO 3166 code or a
@@ -2772,7 +2770,7 @@ public final class Locale implements Cloneable, Serializable {
/**
* Sets the variant. If variant is null or the empty string, the
* variant in this {@code Builder} is removed. Otherwise, it
- * must consist of one or more well-formed
+ * must consist of one or more {@linkplain Locale##def_variant well-formed}
* subtags, or an exception is thrown.
*
*
Note: This method checks if {@code variant}
@@ -2800,7 +2798,7 @@ public final class Locale implements Cloneable, Serializable {
/**
* Sets the extension for the given key. If the value is null or the
* empty string, the extension is removed. Otherwise, the extension
- * must be well-formed or an exception
+ * must be {@linkplain Locale##def_extensions well-formed} or an exception
* is thrown.
*
*
Note: The key {@link Locale#UNICODE_LOCALE_EXTENSION
@@ -2832,9 +2830,8 @@ public final class Locale implements Cloneable, Serializable {
/**
* Sets the Unicode locale keyword type for the given key. If the type
* is null, the Unicode keyword is removed. Otherwise, the key must be
- * non-null and both key and type must be well-formed or an exception
- * is thrown.
+ * non-null and both key and type must be {@linkplain
+ * Locale##def_locale_extension well-formed} or an exception is thrown.
*
*
Keys and types are converted to lower case.
*
@@ -2861,8 +2858,8 @@ public final class Locale implements Cloneable, Serializable {
/**
* Adds a unicode locale attribute, if not already present, otherwise
- * has no effect. The attribute must not be null and must be well-formed or an exception
+ * has no effect. The attribute must not be null and must be
+ * {@linkplain Locale##def_locale_extension well-formed} or an exception
* is thrown.
*
* @param attribute the attribute
@@ -2882,8 +2879,8 @@ public final class Locale implements Cloneable, Serializable {
/**
* Removes a unicode locale attribute, if present, otherwise has no
- * effect. The attribute must not be null and must be well-formed or an exception
+ * effect. The attribute must not be null and must be
+ * {@linkplain Locale##def_locale_extension well-formed} or an exception
* is thrown.
*
*
Attribute comparison for removal is case-insensitive.
@@ -3088,8 +3085,8 @@ public final class Locale implements Cloneable, Serializable {
* RFC 4647 Matching of
* Language Tags. A language range is an identifier which is used to
* select language tag(s) meeting specific requirements by using the
- * mechanisms described in Locale
- * Matching. A list which represents a user's preferences and consists
+ * mechanisms described in {@linkplain Locale##LocaleMatching Locale
+ * Matching}. A list which represents a user's preferences and consists
* of language ranges is called a Language Priority List.
*
*
There are two types of language ranges: basic and extended. In RFC
@@ -3389,9 +3386,7 @@ public final class Locale implements Cloneable, Serializable {
}
/**
- * Returns a hash code value for the object.
- *
- * @return a hash code value for this object.
+ * {@return a hash code value for this object}
*/
@Override
public int hashCode() {
diff --git a/src/java.base/share/classes/java/util/spi/LocaleServiceProvider.java b/src/java.base/share/classes/java/util/spi/LocaleServiceProvider.java
index 882cbc1c767..fd55a80cd0f 100644
--- a/src/java.base/share/classes/java/util/spi/LocaleServiceProvider.java
+++ b/src/java.base/share/classes/java/util/spi/LocaleServiceProvider.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2023, 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
@@ -86,8 +86,8 @@ import java.util.Locale;
* methods of installed providers for the appropriate interface to find one that
* supports the requested locale. If such a provider is found, its other
* methods are called to obtain the requested object or name. When checking
- * whether a locale is supported, the
- * locale's extensions are ignored by default. (If locale's extensions should
+ * whether a locale is supported, the {@linkplain Locale##def_extensions
+ * locale's extensions} are ignored by default. (If locale's extensions should
* also be checked, the {@code isSupportedLocale} method must be overridden.)
* If neither the Java runtime environment itself nor an installed provider
* supports the requested locale, the methods go through a list of candidate
@@ -175,23 +175,22 @@ public abstract class LocaleServiceProvider {
}
/**
- * Returns an array of all locales for which this locale service provider
- * can provide localized objects or names. This information is used to
- * compose {@code getAvailableLocales()} values of the locale-dependent
- * services, such as {@code DateFormat.getAvailableLocales()}.
+ * {@return an array of all locales for which this locale service provider
+ * can provide localized objects or names}
+ *
+ * This information is used to compose {@code getAvailableLocales()}
+ * values of the locale-dependent services, such as
+ * {@code DateFormat.getAvailableLocales()}.
*
*
The array returned by this method should not include two or more
* {@code Locale} objects only differing in their extensions.
- *
- * @return An array of all locales for which this locale service provider
- * can provide localized objects or names.
*/
public abstract Locale[] getAvailableLocales();
/**
* Returns {@code true} if the given {@code locale} is supported by
* this locale service provider. The given {@code locale} may contain
- * extensions that should be
+ * {@linkplain Locale##def_extensions extensions} that should be
* taken into account for the support determination.
*
*
The default implementation returns {@code true} if the given {@code locale}
diff --git a/src/java.base/share/classes/sun/util/locale/provider/LocaleServiceProviderPool.java b/src/java.base/share/classes/sun/util/locale/provider/LocaleServiceProviderPool.java
index 5a71d5cbbb5..57fbd3a7726 100644
--- a/src/java.base/share/classes/sun/util/locale/provider/LocaleServiceProviderPool.java
+++ b/src/java.base/share/classes/sun/util/locale/provider/LocaleServiceProviderPool.java
@@ -50,7 +50,7 @@ import java.util.stream.Stream;
public final class LocaleServiceProviderPool {
/**
- * A Map that holds singleton instances of this class. Each instance holds a
+ * A Map that holds singleton instances of this class. Each instance holds a
* set of provider implementations of a particular locale sensitive service.
*/
private static final ConcurrentMap, LocaleServiceProviderPool> poolOfPools =
@@ -63,7 +63,7 @@ public final class LocaleServiceProviderPool {
new ConcurrentHashMap<>();
/**
- * Available locales for this locale sensitive service. This also contains
+ * Available locales for this locale sensitive service. This also contains
* JRE's available locales
*/
private Set availableLocales = null;
@@ -148,33 +148,31 @@ public final class LocaleServiceProviderPool {
}
/**
- * Returns a stream of the available locales for all the provider classes.
- * This stream is constructed from all the locales
- * that are provided by each provider, including the JRE.
+ * {@return a stream of the available locales for all the provider classes}
*
- * @return a stream of the available locales for all provider classes
+ * This stream is constructed from all the locales that are provided by each
+ * provider, including the JRE.
*/
public static Stream streamAllAvailableLocales() {
return Arrays.stream(AllAvailableLocales.allAvailableLocales);
}
/**
- * Returns an array of available locales for all the provider classes.
+ * {@return an array of the available locales for all the provider classes}
+ *
* This array is a merged array of all the locales that are provided by each
* provider, including the JRE.
- *
- * @return an array of the available locales for all provider classes
*/
public static Locale[] getAllAvailableLocales() {
return AllAvailableLocales.allAvailableLocales.clone();
}
/**
- * Returns an array of available locales. This array is a
+ * {@return an array of the available locales}
+ *
+ * This array is a
* merged array of all the locales that are provided by each
* provider, including the JRE.
- *
- * @return an array of the available locales
*/
public Locale[] getAvailableLocales() {
Set locList = new HashSet<>();