jdk-sandbox: comparison src/java.base/share/classes/java/util/Currency.java

equal deleted inserted replaced

-:739aa297c260
+:57148c79bd75
 /*
-* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2000, 2017, 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
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.  Oracle designates this
 package java.util;
 import java.io.BufferedInputStream;
 import java.io.DataInputStream;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileReader;
 import java.io.InputStream;
 import java.io.IOException;
 import java.io.Serializable;
 import java.security.AccessController;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.regex.Pattern;
 import java.util.regex.Matcher;
 import java.util.spi.CurrencyNameProvider;
+import sun.util.locale.provider.CalendarDataUtility;
 import sun.util.locale.provider.LocaleServiceProviderPool;
 import sun.util.logging.PlatformLogger;
 /**
 * currencies. For example, for the original member countries of the
 * European Monetary Union, the method returns the old national currencies
 * until December 31, 2001, and the Euro from January 1, 2002, local time
 * of the respective countries.
 * <p>
+* If the specified {@code locale} contains "cu" and/or "rg"
+* <a href="./Locale.html#def_locale_extension">Unicode extensions</a>,
+* the instance returned from this method reflects
+* the values specified with those extensions. If both "cu" and "rg" are
+* specified, the currency from the "cu" extension supersedes the implicit one
+* from the "rg" extension.
+* <p>
 * The method returns <code>null</code> for territories that don't
 * have a currency, such as Antarctica.
 *
 * @param locale the locale for whose country a <code>Currency</code>
 * instance is needed
 * is {@code null}
 * @exception IllegalArgumentException if the country of the given {@code locale}
 * is not a supported ISO 3166 country code.
 */
 public static Currency getInstance(Locale locale) {
-String country = locale.getCountry();
+// check for locale overrides
-if (country == null) {
+String override = locale.getUnicodeLocaleType("cu");
-throw new NullPointerException();
+if (override != null) {
-}
+try {
+return getInstance(override.toUpperCase(Locale.ROOT));
-if (country.length() != 2) {
+} catch (IllegalArgumentException iae) {
+// override currency is invalid. Fall through.
+}
+}
+String country = CalendarDataUtility.findRegionOverride(locale).getCountry();
+if (country == null || !country.matches("^[a-zA-Z]{2}$")) {
 throw new IllegalArgumentException();
 }
 char char1 = country.charAt(0);
 char char2 = country.charAt(1);
 * {@link Locale.Category#DISPLAY DISPLAY} locale.
 * For example, for the US Dollar, the symbol is "$" if the default
 * locale is the US, while for other locales it may be "US$". If no
 * symbol can be determined, the ISO 4217 currency code is returned.
 * <p>
+* If the default {@link Locale.Category#DISPLAY DISPLAY} locale
+* contains "rg" (region override)
+* <a href="./Locale.html#def_locale_extension">Unicode extension</a>,
+* the symbol returned from this method reflects
+* the value specified with that extension.
+* <p>
 * This is equivalent to calling
 * {@link #getSymbol(Locale)
 *     getSymbol(Locale.getDefault(Locale.Category.DISPLAY))}.
 *
 * @return the symbol of this currency for the default
 /**
 * Gets the symbol of this currency for the specified locale.
 * For example, for the US Dollar, the symbol is "$" if the specified
 * locale is the US, while for other locales it may be "US$". If no
 * symbol can be determined, the ISO 4217 currency code is returned.
+* <p>
+* If the specified {@code locale} contains "rg" (region override)
+* <a href="./Locale.html#def_locale_extension">Unicode extension</a>,
+* the symbol returned from this method reflects
+* the value specified with that extension.
 *
 * @param locale the locale for which a display name for this currency is
 * needed
 * @return the symbol of this currency for the specified locale
 * @exception NullPointerException if <code>locale</code> is null
 */
 public String getSymbol(Locale locale) {
 LocaleServiceProviderPool pool =
 LocaleServiceProviderPool.getPool(CurrencyNameProvider.class);
+locale = CalendarDataUtility.findRegionOverride(locale);
 String symbol = pool.getLocalizedObject(
 CurrencyNameGetter.INSTANCE,
 locale, currencyCode, SYMBOL);
 if (symbol != null) {
 return symbol;

changeset 48251	57148c79bd75
parent 47216	71c04702a3d5
child 48929	28d8fc8cd3cd