jdk-sandbox: comparison jdk/src/share/classes/java/util/ResourceBundle.java

equal deleted inserted replaced

-:d331b7996fc3
+:75c0420badef
 /*
-* Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1996, 2011, 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
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.jar.JarEntry;
 import sun.util.locale.BaseLocale;
-import sun.util.locale.LocaleExtensions;
 import sun.util.locale.LocaleObjectCache;
 /**
 *
 *
 * This variable would be better named "cache", but we keep the old
 * name for compatibility with some workarounds for bug 4212439.
 */
 private static final ConcurrentMap<CacheKey, BundleReference> cacheList
-= new ConcurrentHashMap<CacheKey, BundleReference>(INITIAL_CACHE_SIZE);
+= new ConcurrentHashMap<>(INITIAL_CACHE_SIZE);
 /**
 * Queue for reference objects referring to class loaders or bundles.
 */
 private static final ReferenceQueue referenceQueue = new ReferenceQueue();
 * @return a <code>Set</code> of all keys contained in this
 *         <code>ResourceBundle</code> and its parent bundles.
 * @since 1.6
 */
 public Set<String> keySet() {
-Set<String> keys = new HashSet<String>();
+Set<String> keys = new HashSet<>();
 for (ResourceBundle rb = this; rb != null; rb = rb.parent) {
 keys.addAll(rb.handleKeySet());
 }
 return keys;
 }
 */
 protected Set<String> handleKeySet() {
 if (keySet == null) {
 synchronized (this) {
 if (keySet == null) {
-Set<String> keys = new HashSet<String>();
+Set<String> keys = new HashSet<>();
 Enumeration<String> enumKeys = getKeys();
 while (enumKeys.hasMoreElements()) {
 String key = enumKeys.nextElement();
 if (handleGetObject(key) != null) {
 keys.add(key);
 */
 public List<Locale> getCandidateLocales(String baseName, Locale locale) {
 if (baseName == null) {
 throw new NullPointerException();
 }
-return new ArrayList<Locale>(CANDIDATES_CACHE.get(locale.getBaseLocale()));
+return new ArrayList<>(CANDIDATES_CACHE.get(locale.getBaseLocale()));
 }
 private static final CandidateListCache CANDIDATES_CACHE = new CandidateListCache();
 private static class CandidateListCache extends LocaleObjectCache<BaseLocale, List<Locale>> {
 }
 }
 if (language.equals("nb") || isNorwegianBokmal) {
 List<Locale> tmpList = getDefaultList("nb", script, region, variant);
 // Insert a locale replacing "nb" with "no" for every list entry
-List<Locale> bokmalList = new LinkedList<Locale>();
+List<Locale> bokmalList = new LinkedList<>();
 for (Locale l : tmpList) {
 bokmalList.add(l);
 if (l.getLanguage().length() == 0) {
 break;
 }
 bokmalList.add(Locale.getInstance("no", l.getScript(), l.getCountry(),
-l.getVariant(), LocaleExtensions.EMPTY_EXTENSIONS));
+l.getVariant(), null));
 }
 return bokmalList;
 } else if (language.equals("nn") || isNorwegianNynorsk) {
 // Insert no_NO_NY, no_NO, no after nn
 List<Locale> nynorskList = getDefaultList("nn", script, region, variant);
 private static List<Locale> getDefaultList(String language, String script, String region, String variant) {
 List<String> variants = null;
 if (variant.length() > 0) {
-variants = new LinkedList<String>();
+variants = new LinkedList<>();
 int idx = variant.length();
 while (idx != -1) {
 variants.add(variant.substring(0, idx));
 idx = variant.lastIndexOf('_', --idx);
 }
 }
-LinkedList<Locale> list = new LinkedList<Locale>();
+List<Locale> list = new LinkedList<>();
 if (variants != null) {
 for (String v : variants) {
-list.add(Locale.getInstance(language, script, region, v, LocaleExtensions.EMPTY_EXTENSIONS));
+list.add(Locale.getInstance(language, script, region, v, null));
 }
 }
 if (region.length() > 0) {
-list.add(Locale.getInstance(language, script, region, "", LocaleExtensions.EMPTY_EXTENSIONS));
+list.add(Locale.getInstance(language, script, region, "", null));
 }
 if (script.length() > 0) {
-list.add(Locale.getInstance(language, script, "", "", LocaleExtensions.EMPTY_EXTENSIONS));
+list.add(Locale.getInstance(language, script, "", "", null));
 // With script, after truncating variant, region and script,
 // start over without script.
 if (variants != null) {
 for (String v : variants) {
-list.add(Locale.getInstance(language, "", region, v, LocaleExtensions.EMPTY_EXTENSIONS));
+list.add(Locale.getInstance(language, "", region, v, null));
 }
 }
 if (region.length() > 0) {
-list.add(Locale.getInstance(language, "", region, "", LocaleExtensions.EMPTY_EXTENSIONS));
+list.add(Locale.getInstance(language, "", region, "", null));
 }
 }
 if (language.length() > 0) {
-list.add(Locale.getInstance(language, "", "", "", LocaleExtensions.EMPTY_EXTENSIONS));
+list.add(Locale.getInstance(language, "", "", "", null));
 }
 // Add root locale at the end
 list.add(Locale.ROOT);
 return list;

changeset 9224	75c0420badef
parent 6660	7bc303389b4f
child 10419	12c063b39232