< prev index next >

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

Print this page

        

*** 48,59 **** private final static Map<String, Bundle> bundles = new HashMap<>(); private final static String[] NUMBER_PATTERN_KEYS = { "NumberPatterns/decimal", "NumberPatterns/currency", ! "NumberPatterns/percent", ! "NumberPatterns/accounting" }; private final static String[] COMPACT_NUMBER_PATTERN_KEYS = { "short.CompactNumberPatterns", "long.CompactNumberPatterns"}; --- 48,58 ---- private final static Map<String, Bundle> bundles = new HashMap<>(); private final static String[] NUMBER_PATTERN_KEYS = { "NumberPatterns/decimal", "NumberPatterns/currency", ! "NumberPatterns/percent" }; private final static String[] COMPACT_NUMBER_PATTERN_KEYS = { "short.CompactNumberPatterns", "long.CompactNumberPatterns"};
*** 221,236 **** String key = NUMBER_PATTERN_KEYS[i]; String value = (String) myMap.remove(key); if (value == null) { value = (String) parentsMap.remove(key); } ! if (value == null || value.isEmpty()) { ! 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; --- 220,231 ---- String key = NUMBER_PATTERN_KEYS[i]; String value = (String) myMap.remove(key); if (value == null) { value = (String) parentsMap.remove(key); } ! if (value.length() == 0) { ! CLDRConverter.warning("empty pattern for " + key); } numberPatterns[i] = value; } myMap.put("NumberPatterns", numberPatterns); break;
< prev index next >