make/jdk/src/classes/build/tools/cldrconverter/Bundle.java

rev 57525 : 8227313: Support monetary grouping separator in DecimalFormat/DecimalFormatSymbols
Reviewed-by: joehw

*** 1,7 ****
  /*
!  * Copyright (c) 2012, 2019, 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) 2012, 2020, 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
*** 70,80 ****
          "NumberElements/pattern",
          "NumberElements/minus",
          "NumberElements/exponential",
          "NumberElements/permille",
          "NumberElements/infinity",
!         "NumberElements/nan"
      };
  
      private final static String[] TIME_PATTERN_KEYS = {
          "DateTimePatterns/full-time",
          "DateTimePatterns/long-time",
--- 70,82 ----
          "NumberElements/pattern",
          "NumberElements/minus",
          "NumberElements/exponential",
          "NumberElements/permille",
          "NumberElements/infinity",
!         "NumberElements/nan",
!         "NumberElements/currencyDecimal",
!         "NumberElements/currencyGroup",
      };
  
      private final static String[] TIME_PATTERN_KEYS = {
          "DateTimePatterns/full-time",
          "DateTimePatterns/long-time",
*** 808,818 ****
                      } else {
                          // NumberElements
                          assert keys == NUMBER_ELEMENT_KEYS;
                          if (key.endsWith("/pattern")) {
                              numArray[idx] = "#";
!                         } else {
                              throw new InternalError("NumberElements: null for " +
                                                      key + ", id: " + id);
                          }
                      }});
          }
--- 810,823 ----
                      } else {
                          // NumberElements
                          assert keys == NUMBER_ELEMENT_KEYS;
                          if (key.endsWith("/pattern")) {
                              numArray[idx] = "#";
!                         } else if (!key.endsWith("currencyDecimal") &&
!                                    !key.endsWith("currencyGroup")) {
!                             // throw error unless it is for "currencyDecimal/Group",
!                             // which may be missing.
                              throw new InternalError("NumberElements: null for " +
                                                      key + ", id: " + id);
                          }
                      }});
          }