Print this page
rev 6057 : imported patch 8001205.8001562

Split Close
Expand all
Collapse all
          --- old/src/share/classes/sun/util/locale/provider/JRELocaleProviderAdapter.java
          +++ new/src/share/classes/sun/util/locale/provider/JRELocaleProviderAdapter.java
↓ open down ↓ 321 lines elided ↑ open up ↑
 322  322              String token = tokens.nextToken();
 323  323              if (token.equals("|")) {
 324  324                  if (isNonUSLangSupported()) {
 325  325                      continue;
 326  326                  }
 327  327                  break;
 328  328              }
 329  329              tagset.add(token);
 330  330          }
 331  331  
 332      -        // ensure en-US is there (mandated by the spec, e.g. Collator.getAvailableLocales())
 333      -        tagset.add("en-US");
 334      -
 335  332          return tagset;
 336  333      }
 337  334  
 338  335      /**
 339  336       * Lazy load available locales.
 340  337       */
 341  338      private static class AvailableJRELocales {
 342  339          private static final Locale[] localeList = createAvailableLocales();
 343  340          private AvailableJRELocales() {
 344  341          }
↓ open down ↓ 83 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX