--- old/make/jdk/src/classes/build/tools/cldrconverter/Bundle.java 2020-02-07 13:21:04.000000000 -0800 +++ new/make/jdk/src/classes/build/tools/cldrconverter/Bundle.java 2020-02-07 13:21:04.000000000 -0800 @@ -307,10 +307,6 @@ it.remove(); continue; } - - if (id.equals("en")) { - fillInJREs(key, nameMap); - } } } for (Iterator it = myMap.keySet().iterator(); it.hasNext();) { @@ -636,42 +632,6 @@ return null; } - static List jreTimeZoneNames = Arrays.asList(TimeZoneNames.getContents()); - private void fillInJREs(String key, Map map) { - String tzid = null; - - if (key.startsWith(CLDRConverter.METAZONE_ID_PREFIX)) { - // Look for tzid - String meta = key.substring(CLDRConverter.METAZONE_ID_PREFIX.length()); - if (meta.equals("GMT")) { - tzid = meta; - } else { - for (String tz : CLDRConverter.handlerMetaZones.keySet()) { - if (CLDRConverter.handlerMetaZones.get(tz).equals(meta)) { - tzid = tz; - break; - } - } - } - } else { - tzid = key.substring(CLDRConverter.TIMEZONE_ID_PREFIX.length()); - } - - if (tzid != null) { - for (Object[] jreZone : jreTimeZoneNames) { - if (jreZone[0].equals(tzid)) { - for (int i = 0; i < ZONE_NAME_KEYS.length; i++) { - if (map.get(ZONE_NAME_KEYS[i]) == null) { - String[] jreNames = (String[])jreZone[1]; - map.put(ZONE_NAME_KEYS[i], jreNames[i]); - } - } - break; - } - } - } - } - /** * Perform a generic conversion of CLDR date-time format pattern letter based * on the support given by the SimpleDateFormat and the j.t.f.DateTimeFormatter