src/share/classes/sun/util/locale/provider/CollatorProviderImpl.java

rev 6352 : imported patch 7162007

*** 43,54 ****
  import java.text.Collator;
  import java.text.ParseException;
  import java.text.RuleBasedCollator;
  import java.text.spi.CollatorProvider;
  import java.util.Locale;
- import java.util.MissingResourceException;
- import java.util.ResourceBundle;
  import java.util.Set;
  
  /**
   * Concrete implementation of the
   * {@link java.text.spi.CollatorProvider CollatorProvider} class
--- 43,52 ----
*** 100,117 ****
  
          Collator result = null;
  
          // Load the resource of the desired locale from resource
          // manager.
!         String colString = "";
!         try {
!             ResourceBundle resource = LocaleProviderAdapter.forType(type).getLocaleData().getCollationData(locale);
! 
!             colString = resource.getString("Rule");
!         } catch (MissingResourceException e) {
!             // Use default values
!         }
          try
          {
              result = new RuleBasedCollator(CollationRules.DEFAULTRULES +
                                             colString);
          }
--- 98,108 ----
  
          Collator result = null;
  
          // Load the resource of the desired locale from resource
          // manager.
!         String colString = LocaleProviderAdapter.forType(type).getLocaleResources(locale).getCollationData();
          try
          {
              result = new RuleBasedCollator(CollationRules.DEFAULTRULES +
                                             colString);
          }