X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/b75a7d8f3b4adbae880cab104ce2c6a50eee4db2..ef6cf650f4a75c3f97de06b51fa104f2069b9ea2:/icuSources/common/resbund.cpp?ds=sidebyside

diff --git a/icuSources/common/resbund.cpp b/icuSources/common/resbund.cpp
index 03b0b5a5..a2282e15 100644
--- a/icuSources/common/resbund.cpp
+++ b/icuSources/common/resbund.cpp
@@ -1,6 +1,6 @@
 /*
 **********************************************************************
-*   Copyright (C) 1997-2003, International Business Machines
+*   Copyright (C) 1997-2013, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 *
@@ -49,6 +49,10 @@
 #include "unicode/utypes.h"
 #include "unicode/resbund.h"
 
+#include "mutex.h"
+#include "uassert.h"
+#include "umutex.h"
+
 #include "uresimp.h"
 
 U_NAMESPACE_BEGIN
@@ -167,57 +171,42 @@ U_NAMESPACE_BEGIN
  */
 //-----------------------------------------------------------------------------
 
-const char ResourceBundle::fgClassID=0;
-
-ResourceBundle::ResourceBundle( const UnicodeString&    path,
-                                const Locale&           locale,
-                                UErrorCode&              error)
-                                :UObject(), locName(NULL)
-{
-    constructForLocale(path, locale, error);
-}
+UOBJECT_DEFINE_RTTI_IMPLEMENTATION(ResourceBundle)
 
 ResourceBundle::ResourceBundle(UErrorCode &err)
-                                :UObject(), locName(NULL)
-{
-    resource = ures_open(0, Locale::getDefault().getName(), &err);
-}
-
-ResourceBundle::ResourceBundle( const UnicodeString&    path,
-                                UErrorCode&              error)
-                                :UObject(), locName(NULL)
+                                :UObject(), fLocale(NULL)
 {
-    constructForLocale(path, Locale::getDefault(), error);
+    fResource = ures_open(0, Locale::getDefault().getName(), &err);
 }
 
 ResourceBundle::ResourceBundle(const ResourceBundle &other)
-                              :UObject(other), locName(NULL)
+                              :UObject(other), fLocale(NULL)
 {
     UErrorCode status = U_ZERO_ERROR;
 
-    if (other.resource) {
-        resource = ures_copyResb(0, other.resource, &status);
+    if (other.fResource) {
+        fResource = ures_copyResb(0, other.fResource, &status);
     } else {
         /* Copying a bad resource bundle */
-        resource = NULL;
+        fResource = NULL;
     }
 }
 
 ResourceBundle::ResourceBundle(UResourceBundle *res, UErrorCode& err)
-                               :UObject(), locName(NULL)
+                               :UObject(), fLocale(NULL)
 {
     if (res) {
-        resource = ures_copyResb(0, res, &err);
+        fResource = ures_copyResb(0, res, &err);
     } else {
         /* Copying a bad resource bundle */
-        resource = NULL;
+        fResource = NULL;
     }
 }
 
 ResourceBundle::ResourceBundle(const char* path, const Locale& locale, UErrorCode& err) 
-                               :UObject(), locName(NULL)
+                               :UObject(), fLocale(NULL)
 {
-    resource = ures_open(path, locale.getName(), &err);
+    fResource = ures_open(path, locale.getName(), &err);
 }
 
 
@@ -226,96 +215,90 @@ ResourceBundle& ResourceBundle::operator=(const ResourceBundle& other)
     if(this == &other) {
         return *this;
     }
-    if(resource != 0) {
-        ures_close(resource);
-        resource = NULL;
+    if(fResource != 0) {
+        ures_close(fResource);
+        fResource = NULL;
+    }
+    if (fLocale != NULL) {
+        delete fLocale;
+        fLocale = NULL;
     }
     UErrorCode status = U_ZERO_ERROR;
-    if (other.resource) {
-        resource = ures_copyResb(0, other.resource, &status);
+    if (other.fResource) {
+        fResource = ures_copyResb(0, other.fResource, &status);
     } else {
         /* Copying a bad resource bundle */
-        resource = NULL;
+        fResource = NULL;
     }
     return *this;
 }
 
 ResourceBundle::~ResourceBundle()
 {
-    if(resource != 0) {
-        ures_close(resource);
+    if(fResource != 0) {
+        ures_close(fResource);
     }
-    if(locName != NULL) {
-      delete(locName);
+    if(fLocale != NULL) {
+      delete(fLocale);
     }
 }
 
-void 
-ResourceBundle::constructForLocale(const UnicodeString& path,
-                                   const Locale& locale,
-                                   UErrorCode& error)
-{
-    char name[300];
-
-    if(!path.isEmpty()) {
-        path.extract(name, sizeof(name), 0, error);
-        resource = ures_open(name, locale.getName(), &error);
-    } else {
-        resource = ures_open(0, locale.getName(), &error);
-    }
+ResourceBundle *
+ResourceBundle::clone() const {
+    return new ResourceBundle(*this);
 }
 
 UnicodeString ResourceBundle::getString(UErrorCode& status) const {
     int32_t len = 0;
-    const UChar *r = ures_getString(resource, &len, &status);
+    const UChar *r = ures_getString(fResource, &len, &status);
     return UnicodeString(TRUE, r, len);
 }
 
 const uint8_t *ResourceBundle::getBinary(int32_t& len, UErrorCode& status) const {
-    return ures_getBinary(resource, &len, &status);
+    return ures_getBinary(fResource, &len, &status);
 }
 
 const int32_t *ResourceBundle::getIntVector(int32_t& len, UErrorCode& status) const {
-    return ures_getIntVector(resource, &len, &status);
+    return ures_getIntVector(fResource, &len, &status);
 }
 
 uint32_t ResourceBundle::getUInt(UErrorCode& status) const {
-    return ures_getUInt(resource, &status);
+    return ures_getUInt(fResource, &status);
 }
 
 int32_t ResourceBundle::getInt(UErrorCode& status) const {
-    return ures_getInt(resource, &status);
+    return ures_getInt(fResource, &status);
 }
 
-const char *ResourceBundle::getName(void) {
-    return ures_getName(resource);
+const char *ResourceBundle::getName(void) const {
+    return ures_getName(fResource);
 }
 
-const char *ResourceBundle::getKey(void) {
-    return ures_getKey(resource);
+const char *ResourceBundle::getKey(void) const {
+    return ures_getKey(fResource);
 }
 
-UResType ResourceBundle::getType(void) {
-    return ures_getType(resource);
+UResType ResourceBundle::getType(void) const {
+    return ures_getType(fResource);
 }
 
 int32_t ResourceBundle::getSize(void) const {
-    return ures_getSize(resource);
+    return ures_getSize(fResource);
 }
 
 UBool ResourceBundle::hasNext(void) const {
-    return ures_hasNext(resource);
+    return ures_hasNext(fResource);
 }
 
 void ResourceBundle::resetIterator(void) {
-    ures_resetIterator(resource);
+    ures_resetIterator(fResource);
 }
 
 ResourceBundle ResourceBundle::getNext(UErrorCode& status) {
     UResourceBundle r;
 
     ures_initStackObject(&r);
-    ures_getNextResource(resource, &r, &status);
+    ures_getNextResource(fResource, &r, &status);
     ResourceBundle res(&r, status);
     if (U_SUCCESS(status)) {
         ures_close(&r);
@@ -325,13 +308,13 @@ ResourceBundle ResourceBundle::getNext(UErrorCode& status) {
 
 UnicodeString ResourceBundle::getNextString(UErrorCode& status) {
     int32_t len = 0;
-    const UChar* r = ures_getNextString(resource, &len, 0, &status);
+    const UChar* r = ures_getNextString(fResource, &len, 0, &status);
     return UnicodeString(TRUE, r, len);
 }
 
 UnicodeString ResourceBundle::getNextString(const char ** key, UErrorCode& status) {
     int32_t len = 0;
-    const UChar* r = ures_getNextString(resource, &len, key, &status);
+    const UChar* r = ures_getNextString(fResource, &len, key, &status);
     return UnicodeString(TRUE, r, len);
 }
 
@@ -339,7 +322,7 @@ ResourceBundle ResourceBundle::get(int32_t indexR, UErrorCode& status) const {
     UResourceBundle r;
 
     ures_initStackObject(&r);
-    ures_getByIndex(resource, indexR, &r, &status);
+    ures_getByIndex(fResource, indexR, &r, &status);
     ResourceBundle res(&r, status);
     if (U_SUCCESS(status)) {
         ures_close(&r);
@@ -349,7 +332,7 @@ ResourceBundle ResourceBundle::get(int32_t indexR, UErrorCode& status) const {
 
 UnicodeString ResourceBundle::getStringEx(int32_t indexS, UErrorCode& status) const {
     int32_t len = 0;
-    const UChar* r = ures_getStringByIndex(resource, indexS, &len, &status);
+    const UChar* r = ures_getStringByIndex(fResource, indexS, &len, &status);
     return UnicodeString(TRUE, r, len);
 }
 
@@ -357,7 +340,7 @@ ResourceBundle ResourceBundle::get(const char* key, UErrorCode& status) const {
     UResourceBundle r;
 
     ures_initStackObject(&r);
-    ures_getByKey(resource, key, &r, &status);
+    ures_getByKey(fResource, key, &r, &status);
     ResourceBundle res(&r, status);
     if (U_SUCCESS(status)) {
         ures_close(&r);
@@ -365,32 +348,49 @@ ResourceBundle ResourceBundle::get(const char* key, UErrorCode& status) const {
     return res;
 }
 
+ResourceBundle ResourceBundle::getWithFallback(const char* key, UErrorCode& status){
+    UResourceBundle r;
+    ures_initStackObject(&r);
+    ures_getByKeyWithFallback(fResource, key, &r, &status);
+    ResourceBundle res(&r, status);
+    if(U_SUCCESS(status)){
+        ures_close(&r);
+    }
+    return res;
+}
 UnicodeString ResourceBundle::getStringEx(const char* key, UErrorCode& status) const {
     int32_t len = 0;
-    const UChar* r = ures_getStringByKey(resource, key, &len, &status);
+    const UChar* r = ures_getStringByKey(fResource, key, &len, &status);
     return UnicodeString(TRUE, r, len);
 }
 
 const char*
 ResourceBundle::getVersionNumber()  const
 {
-    return ures_getVersionNumber(resource);
+    return ures_getVersionNumberInternal(fResource);
 }
 
 void ResourceBundle::getVersion(UVersionInfo versionInfo) const {
-    ures_getVersion(resource, versionInfo);
+    ures_getVersion(fResource, versionInfo);
 }
 
-const Locale &ResourceBundle::getLocale(void) const
-{
-  if(locName == NULL) {
+static UMutex gLocaleLock = U_MUTEX_INITIALIZER;
+const Locale &ResourceBundle::getLocale(void) const {
+    Mutex lock(&gLocaleLock);
+    if (fLocale != NULL) {
+        return *fLocale;
+    }
     UErrorCode status = U_ZERO_ERROR;
-    const char *localeName = ures_getLocale(resource, &status);
-    ResourceBundle *me = (ResourceBundle *)this; // semantically const
-    me->locName = new Locale(localeName);
-  }
-  return *locName;
+    const char *localeName = ures_getLocaleInternal(fResource, &status);
+    ResourceBundle *ncThis = const_cast<ResourceBundle *>(this);
+    ncThis->fLocale = new Locale(localeName);
+    return ncThis->fLocale != NULL ? *ncThis->fLocale : Locale::getDefault();
+}
+
+const Locale ResourceBundle::getLocale(ULocDataLocaleType type, UErrorCode &status) const
+{
+  return ures_getLocaleByType(fResource, type, &status);
 }
 
-//eof
 U_NAMESPACE_END
+//eof