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

Print this page
rev 6352 : imported patch 7162007

@@ -22,14 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
 package sun.util.locale.provider;
 
-import java.util.Calendar;
-import static java.util.Calendar.*;
 import java.util.Locale;
-import java.util.ResourceBundle;
 import java.util.Set;
 import java.util.spi.CalendarDataProvider;
 
 /**
  * Concrete implementation of the  {@link java.util.spi.CalendarDataProvider

@@ -47,16 +44,18 @@
         this.langtags = langtags;
     }
 
     @Override
     public int getFirstDayOfWeek(Locale locale) {
-        return getIntData(CalendarDataUtility.FIRST_DAY_OF_WEEK, locale);
+        return LocaleProviderAdapter.forType(type).getLocaleResources(locale)
+                   .getCalendarData(CalendarDataUtility.FIRST_DAY_OF_WEEK);
     }
 
     @Override
     public int getMinimalDaysInFirstWeek(Locale locale) {
-        return getIntData(CalendarDataUtility.MINIMAL_DAYS_IN_FIRST_WEEK, locale);
+        return LocaleProviderAdapter.forType(type).getLocaleResources(locale)
+                   .getCalendarData(CalendarDataUtility.MINIMAL_DAYS_IN_FIRST_WEEK);
     }
 
     @Override
     public Locale[] getAvailableLocales() {
         return LocaleProviderAdapter.toLocaleArray(langtags);

@@ -64,15 +63,6 @@
 
     @Override
     public Set<String> getAvailableLanguageTags() {
         return langtags;
     }
-
-    private int getIntData(String key, Locale locale) {
-        ResourceBundle rb = LocaleProviderAdapter.forType(type).getLocaleData().getCalendarData(locale);
-        if (rb.containsKey(key)) {
-            String firstday = rb.getString(key);
-            return Integer.parseInt(firstday);
-        }
-        return 0;
-    }
 }