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

*** 1,7 ****
  /*
!  * Copyright (c) 2012, 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
--- 1,7 ----
  /*
!  * Copyright (c) 2012, 2013, 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
*** 67,77 ****
                  LocaleServiceProviderPool.getPool(CalendarNameProvider.class);
          return pool.getLocalizedObject(CalendarFieldValueNameGetter.INSTANCE, locale, normalizeCalendarType(id),
                                         field, value, style, false);
      }
  
!     public static String retrieveCldrFieldValueName(String id, int field, int value, int style, Locale locale) {
          LocaleServiceProviderPool pool =
                  LocaleServiceProviderPool.getPool(CalendarNameProvider.class);
          String name;
          name = pool.getLocalizedObject(CalendarFieldValueNameGetter.INSTANCE, locale, normalizeCalendarType(id),
                                         field, value, style, true);
--- 67,77 ----
                  LocaleServiceProviderPool.getPool(CalendarNameProvider.class);
          return pool.getLocalizedObject(CalendarFieldValueNameGetter.INSTANCE, locale, normalizeCalendarType(id),
                                         field, value, style, false);
      }
  
!     public static String retrieveJavaTimeFieldValueName(String id, int field, int value, int style, Locale locale) {
          LocaleServiceProviderPool pool =
                  LocaleServiceProviderPool.getPool(CalendarNameProvider.class);
          String name;
          name = pool.getLocalizedObject(CalendarFieldValueNameGetter.INSTANCE, locale, normalizeCalendarType(id),
                                         field, value, style, true);
*** 87,97 ****
              LocaleServiceProviderPool.getPool(CalendarNameProvider.class);
          return pool.getLocalizedObject(CalendarFieldValueNamesMapGetter.INSTANCE, locale,
                                         normalizeCalendarType(id), field, style, false);
      }
  
!     public static Map<String, Integer> retrieveCldrFieldValueNames(String id, int field, int style, Locale locale) {
          LocaleServiceProviderPool pool =
              LocaleServiceProviderPool.getPool(CalendarNameProvider.class);
          Map<String, Integer> map;
          map = pool.getLocalizedObject(CalendarFieldValueNamesMapGetter.INSTANCE, locale,
                                         normalizeCalendarType(id), field, style, true);
--- 87,97 ----
              LocaleServiceProviderPool.getPool(CalendarNameProvider.class);
          return pool.getLocalizedObject(CalendarFieldValueNamesMapGetter.INSTANCE, locale,
                                         normalizeCalendarType(id), field, style, false);
      }
  
!     public static Map<String, Integer> retrieveJavaTimeFieldValueNames(String id, int field, int style, Locale locale) {
          LocaleServiceProviderPool pool =
              LocaleServiceProviderPool.getPool(CalendarNameProvider.class);
          Map<String, Integer> map;
          map = pool.getLocalizedObject(CalendarFieldValueNamesMapGetter.INSTANCE, locale,
                                         normalizeCalendarType(id), field, style, true);
*** 131,148 ****
                                  Object... params) {
              assert params.length == 4;
              int field = (int) params[0];
              int value = (int) params[1];
              int style = (int) params[2];
!             boolean cldr = (boolean) params[3];
  
!             // If cldr is true, resources from CLDR have precedence over JRE
              // native resources.
!             if (cldr && calendarNameProvider instanceof CalendarNameProviderImpl) {
                  String name;
                  name = ((CalendarNameProviderImpl)calendarNameProvider)
!                         .getCldrDisplayName(requestID, field, value, style, locale);
                  return name;
              }
              return calendarNameProvider.getDisplayName(requestID, field, value, style, locale);
          }
      }
--- 131,148 ----
                                  Object... params) {
              assert params.length == 4;
              int field = (int) params[0];
              int value = (int) params[1];
              int style = (int) params[2];
!             boolean javatime = (boolean) params[3];
  
!             // If javatime is true, resources from CLDR have precedence over JRE
              // native resources.
!             if (javatime && calendarNameProvider instanceof CalendarNameProviderImpl) {
                  String name;
                  name = ((CalendarNameProviderImpl)calendarNameProvider)
!                         .getJavaTimeDisplayName(requestID, field, value, style, locale);
                  return name;
              }
              return calendarNameProvider.getDisplayName(requestID, field, value, style, locale);
          }
      }
*** 163,180 ****
                                                String requestID, // calendarType
                                                Object... params) {
              assert params.length == 3;
              int field = (int) params[0];
              int style = (int) params[1];
!             boolean cldr = (boolean) params[2];
  
!             // If cldr is true, resources from CLDR have precedence over JRE
              // native resources.
!             if (cldr && calendarNameProvider instanceof CalendarNameProviderImpl) {
                  Map<String, Integer> map;
                  map = ((CalendarNameProviderImpl)calendarNameProvider)
!                         .getCldrDisplayNames(requestID, field, style, locale);
                  return map;
              }
              return calendarNameProvider.getDisplayNames(requestID, field, style, locale);
          }
      }
--- 163,180 ----
                                                String requestID, // calendarType
                                                Object... params) {
              assert params.length == 3;
              int field = (int) params[0];
              int style = (int) params[1];
!             boolean javatime = (boolean) params[2];
  
!             // If javatime is true, resources from CLDR have precedence over JRE
              // native resources.
!             if (javatime && calendarNameProvider instanceof CalendarNameProviderImpl) {
                  Map<String, Integer> map;
                  map = ((CalendarNameProviderImpl)calendarNameProvider)
!                         .getJavaTimeDisplayNames(requestID, field, style, locale);
                  return map;
              }
              return calendarNameProvider.getDisplayNames(requestID, field, style, locale);
          }
      }