< prev index next >

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

Print this page
rev 55871 : 8215181: Accounting currency format support
Reviewed-by:

@@ -48,11 +48,12 @@
     private final static Map<String, Bundle> bundles = new HashMap<>();
 
     private final static String[] NUMBER_PATTERN_KEYS = {
         "NumberPatterns/decimal",
         "NumberPatterns/currency",
-        "NumberPatterns/percent"
+        "NumberPatterns/percent",
+        "NumberPatterns/accounting"
     };
 
     private final static String[] COMPACT_NUMBER_PATTERN_KEYS = {
             "short.CompactNumberPatterns",
             "long.CompactNumberPatterns"};

@@ -220,13 +221,17 @@
                     String key = NUMBER_PATTERN_KEYS[i];
                     String value = (String) myMap.remove(key);
                     if (value == null) {
                         value = (String) parentsMap.remove(key);
                     }
-                    if (value.length() == 0) {
+                    if (value == null || value.length() == 0) {
+                        if (!key.endsWith("accounting")) {
+                            // print warning unless it is for "accounting",
+                            // which may be missing.
                         CLDRConverter.warning("empty pattern for " + key);
                     }
+                    }
                     numberPatterns[i] = value;
                 }
                 myMap.put("NumberPatterns", numberPatterns);
                 break;
             }
< prev index next >