organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-07 22:44:49 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 2

ICU-436 additional constructors and _open functions for resource bundle

Browse source 
X-SVN-Rev: 1724
This commit is contained in:
Vladimir Weinstein 2000-06-30 20:31:39 +00:00
parent d963093f45
commit c31e17a71e
11 changed files with 17 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
icu4c/source/i18n/calendar.cpp
View file

@ -734,13 +734,9 @@ Calendar::setWeekCountData(const Locale& desiredLocale, UErrorCode& status)
// "1" // min days in week
// }
//const UnicodeString *dateTimeElements;
//int32_t count;
if (U_FAILURE(status)) return;
ResourceBundle resource(NULL, desiredLocale, status);
//ResourceBundle resource(Locale::getDataDirectory(), desiredLocale, status);
//resource.open(UnicodeString(""), desiredLocale, status);
ResourceBundle resource((char *)0, desiredLocale, status);
// If the resource data doesn't seem to be present at all, then use last-resort
// hard-coded data.

5
icu4c/source/i18n/datefmt.cpp
View file

@ -242,12 +242,9 @@ DateFormat::getAvailableLocales(int32_t& count)
for (i=0; i<localesCount; ++i)
{
UErrorCode status = U_ZERO_ERROR;
/*ResourceBundle resource(Locale::getDataDirectory(), locales[i], status);*/
ResourceBundle resource(NULL, locales[i], status);
ResourceBundle resource((char *)0, locales[i], status);
//int32_t ignoredCount;
resource.get(SimpleDateFormat::fgDateTimePatternsTag, status);
//resource.getStringArray(SimpleDateFormat::fgDateTimePatternsTag, ignoredCount, status);
if (U_SUCCESS(status))
{
temp[newLocalesCount++] = locales[i];

3
icu4c/source/i18n/dcfmtsym.cpp
View file

@ -99,8 +99,7 @@ DecimalFormatSymbols::initialize(const Locale& locale, UErrorCode& status,
{
if (U_FAILURE(status)) return;
/*ResourceBundle resource(Locale::getDataDirectory(), locale, status);*/
ResourceBundle resource(NULL, locale, status);
ResourceBundle resource((char *)0, locale, status);
if (U_FAILURE(status))
{
// Initializes with last resort data if necessary.

6
icu4c/source/i18n/decimfmt.cpp
View file

@ -198,12 +198,8 @@ DecimalFormat::construct(UErrorCode& status,
// one specified.
if (pattern == NULL)
{
/*ResourceBundle resource(Locale::getDataDirectory(), Locale::getDefault(), status);*/
ResourceBundle resource(NULL, Locale::getDefault(), status);
/*resource.open("", Locale::getDefault(), status);*/
ResourceBundle resource((char *)0, Locale::getDefault(), status);
/*resource.getArrayItem(fgNumberPatterns, 0, str, status);*/
/*str = resource.getArrayStringItem(fgNumberPatterns, 0, status);*/
str = resource.get(fgNumberPatterns, status).getStringEx((int32_t)0, status);
pattern = &str;
}

5
icu4c/source/i18n/dtfmtsym.cpp
View file

@ -442,9 +442,8 @@ DateFormatSymbols::initializeData(const Locale& locale, UErrorCode& status, UBoo
* We cast away const here, but that's okay; we won't delete any of
* these.
*/
/*ResourceBundle resource(Locale::getDataDirectory(), locale, status);*/
ResourceBundle resource(NULL, locale, status);
/*resource.open(UnicodeString(""), locale, status);*/
ResourceBundle resource((char *)0, locale, status);
if (U_FAILURE(status))
{
if (useLastResortData)

3
icu4c/source/i18n/numfmt.cpp
View file

@ -406,8 +406,7 @@ NumberFormat::createInstance(const Locale& desiredLocale,
return NULL;
}
/*ResourceBundle resource(Locale::getDataDirectory(), desiredLocale, status);*/
ResourceBundle resource(NULL, desiredLocale, status);
ResourceBundle resource((char *)0, desiredLocale, status);
if (U_FAILURE(status))
{

10
icu4c/source/i18n/smpdtfmt.cpp
View file

@ -260,14 +260,12 @@ void SimpleDateFormat::construct(EStyle timeStyle,
// load up the DateTimePatters resource from the appropriate locale (throw
// an error if for some weird reason the resource is malformed)
/*ResourceBundle resources(Locale::getDataDirectory(), locale, status);*/
ResourceBundle resources(NULL, locale, status);
/*resources.open("", locale, status);*/
//int32_t dtCount;
//const UnicodeString *dateTimePatterns = resources.getStringArray(fgDateTimePatternsTag, dtCount, status);
ResourceBundle resources((char *)0, locale, status);
ResourceBundle dateTimePatterns = resources.get(fgDateTimePatternsTag, status);
if (U_FAILURE(status)) return;
//if (dtCount <= kDateTime)
if (dateTimePatterns.getSize() <= kDateTime)
{
status = U_INVALID_FORMAT_ERROR;

2
icu4c/source/i18n/tblcoll.cpp
View file

@ -786,7 +786,7 @@ RuleBasedCollator::constructFromBundle(const Locale & name,
isOverIgnore = FALSE;
setStrength(Collator::TERTIARY); // This is the default strength
ResourceBundle rb(0, name, status);
ResourceBundle rb((char *)0, name, status);
if(U_SUCCESS(status)) {
ResourceBundle binary = rb.get("%%Collation", status); //This is the bundle that actually contains the collation data
realName = binary.getName();

9
icu4c/source/i18n/translit.cpp
View file

@ -667,7 +667,7 @@ Transliterator* Transliterator::_createInstance(const UnicodeString& ID,
Locale fakeLocale(ch);
delete [] ch;
ResourceBundle bundle(NULL,
ResourceBundle bundle((char *)0,
fakeLocale, status);
// Call RBT to parse the rules from the resource bundle
@ -895,11 +895,8 @@ void Transliterator::initializeCache(void) {
*/
Locale indexLoc("translit_index");
/*
ResourceBundle bundle(Transliterator::getDataDirectory(),
indexLoc, status);
*/
ResourceBundle bundle(NULL,
ResourceBundle bundle((char *)0,
indexLoc, status);
int32_t rows, cols;

2
icu4c/source/test/intltest/restest.cpp
View file

@ -250,7 +250,7 @@ ResourceBundleTest::TestConstruction()
uprv_strcpy(testdatapath, directory);
uprv_strcat(testdatapath, "testdata");
ResourceBundle test1(testdatapath, err);
ResourceBundle test1((UnicodeString)testdatapath, err);
ResourceBundle test2(testdatapath, locale, err);
//ResourceBundle test1("c:\\icu\\icu\\source\\test\\testdata\\testdata", err);
//ResourceBundle test2("c:\\icu\\icu\\source\\test\\testdata\\testdata", locale, err);

2
icu4c/source/test/intltest/restsnew.cpp
View file

@ -251,7 +251,7 @@ NewResourceBundleTest::TestConstruction()
uprv_strcpy(testdatapath, directory);
uprv_strcat(testdatapath, "testdata");
ResourceBundle test1(testdatapath, err);
ResourceBundle test1((UnicodeString)testdatapath, err);
ResourceBundle test2(testdatapath, locale, err);
UnicodeString result1;