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

Print this page
rev 10528 : 8038436: Re-examine the mechanism to determine available localedata and cldrdata
Reviewed-by:

*** 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 --- 1,7 ---- /* ! * Copyright (c) 2012, 2014, 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
*** 35,49 **** * @author Masayoshi Okutsu * @author Naoto Sato */ public class CalendarDataProviderImpl extends CalendarDataProvider implements AvailableLanguageTags { private final LocaleProviderAdapter.Type type; ! private final Set<String> langtags; ! public CalendarDataProviderImpl(LocaleProviderAdapter.Type type, Set<String> langtags) { this.type = type; - this.langtags = langtags; } @Override public int getFirstDayOfWeek(Locale locale) { return LocaleProviderAdapter.forType(type).getLocaleResources(locale) --- 35,48 ---- * @author Masayoshi Okutsu * @author Naoto Sato */ public class CalendarDataProviderImpl extends CalendarDataProvider implements AvailableLanguageTags { private final LocaleProviderAdapter.Type type; ! private Set<String> langtags; ! public CalendarDataProviderImpl(LocaleProviderAdapter.Type type) { this.type = type; } @Override public int getFirstDayOfWeek(Locale locale) { return LocaleProviderAdapter.forType(type).getLocaleResources(locale)
*** 56,68 **** .getCalendarData(CalendarDataUtility.MINIMAL_DAYS_IN_FIRST_WEEK); } @Override public Locale[] getAvailableLocales() { ! return LocaleProviderAdapter.toLocaleArray(langtags); } @Override public Set<String> getAvailableLanguageTags() { return langtags; } } --- 55,74 ---- .getCalendarData(CalendarDataUtility.MINIMAL_DAYS_IN_FIRST_WEEK); } @Override public Locale[] getAvailableLocales() { ! return LocaleProviderAdapter.toLocaleArray(getLangTags()); } @Override public Set<String> getAvailableLanguageTags() { + return getLangTags(); + } + + private Set<String> getLangTags() { + if (langtags == null) { + langtags = ((JRELocaleProviderAdapter)LocaleProviderAdapter.forType(type)).getLanguageTagSet("CalendarData"); + } return langtags; } }