rev 6116 : imported patch 7199750

          --- old/test/java/util/PluggableLocale/providersrc/CurrencyNameProviderImpl2.java
          +++ new/test/java/util/PluggableLocale/providersrc/CurrencyNameProviderImpl2.java

   1    1  /*
   2    2   * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
   3    3   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   4    4   *
   5    5   * This code is free software; you can redistribute it and/or modify it
   6    6   * under the terms of the GNU General Public License version 2 only, as
   7    7   * published by the Free Software Foundation.
   8    8   *
   9    9   * This code is distributed in the hope that it will be useful, but WITHOUT
  10   10   * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  11   11   * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  12   12   * version 2 for more details (a copy is included in the LICENSE file that
  13   13   * accompanied this code).
  14   14   *
  15   15   * You should have received a copy of the GNU General Public License version
  16   16   * 2 along with this work; if not, write to the Free Software Foundation,
  17   17   * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  18   18   *
  19   19   * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  20   20   * or visit www.oracle.com if you need additional information or have any
  21   21   * questions.
  22   22   */
  23   23  /*
  24   24   *

  25   25   */
  26   26  
  27   27  package com.bar;
  28   28  
  29   29  import java.util.*;
  30   30  import java.util.spi.*;
  31   31  
  32   32  import com.foobar.Utils;
  33   33  
  34   34  public class CurrencyNameProviderImpl2 extends CurrencyNameProvider {
  35      -    static Locale[] avail = {new Locale("ja", "JP", "tokyo")};
       35 +    static Locale[] avail = {new Locale("ja", "JP", "tokyo"),
       36 +                             new Locale("ja", "JP", "osaka"), };
  36   37      public Locale[] getAvailableLocales() {
  37   38          return avail;
  38   39      }
  39   40  
  40   41      @Override
  41   42      public String getSymbol(String c, Locale locale) {
  42   43          if (!Utils.supportsLocale(Arrays.asList(avail), locale)) {
  43   44              throw new IllegalArgumentException("locale is not supported: "+locale);
  44   45          }
  45   46  
  46      -        if (c.equals("JPY") && Utils.supportsLocale(avail[0], locale)) {
  47      -            return "JPY-tokyo";
       47 +        if (c.equals("JPY")) {
       48 +            if (Utils.supportsLocale(avail[0], locale)) {
       49 +                return "JPY-tokyo";
       50 +            } else if (Utils.supportsLocale(avail[1], locale)) {
       51 +                return "JPY-osaka";
       52 +            }
  48   53          }
  49   54          return null;
  50   55      }
  51   56  
  52   57      @Override
  53   58      public String getDisplayName(String c, Locale locale) {
  54   59          if (!Utils.supportsLocale(Arrays.asList(avail), locale)) {
  55   60              throw new IllegalArgumentException("locale is not supported: "+locale);
  56   61          }
  57   62  
  58      -        if (c.equals("JPY") && Utils.supportsLocale(avail[0], locale)) {
  59      -            return "JPY-tokyo";
       63 +        if (c.equals("JPY")) {
       64 +            if (Utils.supportsLocale(avail[0], locale)) {
       65 +                return "JPY-tokyo";
       66 +            } else if (Utils.supportsLocale(avail[1], locale)) {
       67 +                return "JPY-osaka";
       68 +            }
  60   69          }
  61   70          return null;
  62   71      }
  63   72  }
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX