equal
deleted
inserted
replaced
2203 ERA_MASK|MONTH_MASK|DAY_OF_WEEK_MASK|AM_PM_MASK)) { |
2203 ERA_MASK|MONTH_MASK|DAY_OF_WEEK_MASK|AM_PM_MASK)) { |
2204 return null; |
2204 return null; |
2205 } |
2205 } |
2206 |
2206 |
2207 String calendarType = getCalendarType(); |
2207 String calendarType = getCalendarType(); |
2208 if (style == ALL_STYLES || isStandaloneStyle(style) || isNarrowFormatStyle(style)) { |
2208 if (style == ALL_STYLES || isStandaloneStyle(style) || isNarrowFormatStyle(style) || |
|
2209 field == ERA && (style & SHORT) == SHORT) { |
2209 Map<String, Integer> map; |
2210 Map<String, Integer> map; |
2210 map = CalendarDataUtility.retrieveFieldValueNames(calendarType, field, style, locale); |
2211 map = CalendarDataUtility.retrieveFieldValueNames(calendarType, field, style, locale); |
2211 |
2212 |
2212 // Perform fallback here to follow the CLDR rules |
2213 // Perform fallback here to follow the CLDR rules |
2213 if (map == null) { |
2214 if (map == null) { |