changeset 56469:b948b920e29f

Merge
author jwilhelm
date Wed, 07 Aug 2019 22:43:49 +0200
parents 4e3a26572bb6 5c85b58e2a42
children 314e62bbdb16
files test/lib/jdk/test/lib/containers/cgroup/MetricsTester.java
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/java.base/share/classes/java/util/Locale.java	Wed Aug 07 20:47:43 2019 +0000
+++ b/src/java.base/share/classes/java/util/Locale.java	Wed Aug 07 22:43:49 2019 +0200
@@ -929,7 +929,7 @@
      * if no locale is explicitly specified. It can be changed using the
      * setDefault(Locale.Category, Locale) method.
      *
-     * @param category - the specified category to get the default locale
+     * @param category the specified category to get the default locale
      * @throws NullPointerException if category is null
      * @return the default locale for the specified Category for this instance
      *     of the Java Virtual Machine
@@ -1075,8 +1075,8 @@
      * prepared to reinitialize locale-sensitive code running within the
      * same Java Virtual Machine.
      *
-     * @param category - the specified category to set the default locale
-     * @param newLocale - the new default locale
+     * @param category the specified category to set the default locale
+     * @param newLocale the new default locale
      * @throws SecurityException if a security manager exists and its
      *     checkPermission method doesn't allow the operation.
      * @throws NullPointerException if category and/or newLocale is null