src/share/classes/java/util/TimeZone.java

Print this page
rev 4788 : Fix bunch of generics warnings

*** 424,434 **** private static class DisplayNames { // Cache for managing display names per timezone per locale // The structure is: // Map(key=id, value=SoftReference(Map(key=locale, value=displaynames))) private static final Map<String, SoftReference<Map<Locale, String[]>>> CACHE = ! new ConcurrentHashMap<String, SoftReference<Map<Locale, String[]>>>(); } private static final String[] getDisplayNames(String id, Locale locale) { Map<String, SoftReference<Map<Locale, String[]>>> displayNames = DisplayNames.CACHE; --- 424,434 ---- private static class DisplayNames { // Cache for managing display names per timezone per locale // The structure is: // Map(key=id, value=SoftReference(Map(key=locale, value=displaynames))) private static final Map<String, SoftReference<Map<Locale, String[]>>> CACHE = ! new ConcurrentHashMap<>(); } private static final String[] getDisplayNames(String id, Locale locale) { Map<String, SoftReference<Map<Locale, String[]>>> displayNames = DisplayNames.CACHE;
*** 448,460 **** } } String[] names = TimeZoneNameUtility.retrieveDisplayNames(id, locale); if (names != null) { ! Map<Locale, String[]> perLocale = new ConcurrentHashMap<Locale, String[]>(); perLocale.put(locale, names); ! ref = new SoftReference<Map<Locale, String[]>>(perLocale); displayNames.put(id, ref); } return names; } --- 448,460 ---- } } String[] names = TimeZoneNameUtility.retrieveDisplayNames(id, locale); if (names != null) { ! Map<Locale, String[]> perLocale = new ConcurrentHashMap<>(); perLocale.put(locale, names); ! ref = new SoftReference<>(perLocale); displayNames.put(id, ref); } return names; }
*** 759,769 **** * @serial */ private String ID; private static volatile TimeZone defaultTimeZone; private static final InheritableThreadLocal<TimeZone> defaultZoneTL ! = new InheritableThreadLocal<TimeZone>(); static final String GMT_ID = "GMT"; private static final int GMT_ID_LENGTH = 3; /** --- 759,769 ---- * @serial */ private String ID; private static volatile TimeZone defaultTimeZone; private static final InheritableThreadLocal<TimeZone> defaultZoneTL ! = new InheritableThreadLocal<>(); static final String GMT_ID = "GMT"; private static final int GMT_ID_LENGTH = 3; /**