src/java.base/share/classes/java/text/DecimalFormatSymbols.java

rev 47480 : [mq]: 8176841

*** 1,7 ****
  /*
!  * Copyright (c) 1996, 2013, 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
--- 1,7 ----
  /*
!  * Copyright (c) 1996, 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
*** 42,51 ****
--- 42,52 ----
  import java.io.ObjectInputStream;
  import java.io.Serializable;
  import java.text.spi.DecimalFormatSymbolsProvider;
  import java.util.Currency;
  import java.util.Locale;
+ import sun.util.locale.provider.CalendarDataUtility;
  import sun.util.locale.provider.LocaleProviderAdapter;
  import sun.util.locale.provider.LocaleServiceProviderPool;
  import sun.util.locale.provider.ResourceBundleBasedAdapter;
  
  /**
*** 54,63 ****
--- 55,68 ----
   * to format numbers. <code>DecimalFormat</code> creates for itself an instance of
   * <code>DecimalFormatSymbols</code> from its locale data.  If you need to change any
   * of these symbols, you can get the <code>DecimalFormatSymbols</code> object from
   * your <code>DecimalFormat</code> and modify it.
   *
+  * <p>If the locale contains "rg" (region override)
+  * <a href="../util/Locale.html#def_locale_extension">Unicode extension</a>,
+  * the symbols are overriden for the designated region.
+  *
   * @see          java.util.Locale
   * @see          DecimalFormat
   * @author       Mark Davis
   * @author       Alan Liu
   * @since 1.1
*** 607,623 ****
       * Initializes the symbols from the FormatData resource bundle.
       */
      private void initialize( Locale locale ) {
          this.locale = locale;
  
          // get resource bundle data
!         LocaleProviderAdapter adapter = LocaleProviderAdapter.getAdapter(DecimalFormatSymbolsProvider.class, locale);
          // Avoid potential recursions
          if (!(adapter instanceof ResourceBundleBasedAdapter)) {
              adapter = LocaleProviderAdapter.getResourceBundleBased();
          }
!         Object[] data = adapter.getLocaleResources(locale).getDecimalFormatSymbolsData();
          String[] numberElements = (String[]) data[0];
  
          decimalSeparator = numberElements[0].charAt(0);
          groupingSeparator = numberElements[1].charAt(0);
          patternSeparator = numberElements[2].charAt(0);
--- 612,633 ----
       * Initializes the symbols from the FormatData resource bundle.
       */
      private void initialize( Locale locale ) {
          this.locale = locale;
  
+         // check for region override
+         Locale override = locale.getUnicodeLocaleType("nu") == null ?
+             CalendarDataUtility.findRegionOverride(locale).orElse(locale) :
+             locale;
+ 
          // get resource bundle data
!         LocaleProviderAdapter adapter = LocaleProviderAdapter.getAdapter(DecimalFormatSymbolsProvider.class, override);
          // Avoid potential recursions
          if (!(adapter instanceof ResourceBundleBasedAdapter)) {
              adapter = LocaleProviderAdapter.getResourceBundleBased();
          }
!         Object[] data = adapter.getLocaleResources(override).getDecimalFormatSymbolsData();
          String[] numberElements = (String[]) data[0];
  
          decimalSeparator = numberElements[0].charAt(0);
          groupingSeparator = numberElements[1].charAt(0);
          patternSeparator = numberElements[2].charAt(0);