Remove fallback functions for timezone and locales.

Change-Id: I77b8e6fa8a97e62e80fd4508302f91c9e4643f25
Signed-off-by: Hokwon Song <hokwon.song@samsung.com>

diff --git a/src/locales/FLcl_LocaleManagerImpl.cpp b/src/locales/FLcl_LocaleManagerImpl.cpp
index d2058e0..427213f 100644 (file)
--- a/src/locales/FLcl_LocaleManagerImpl.cpp
+++ b/src/locales/FLcl_LocaleManagerImpl.cpp
@@ -211,47 +211,6 @@ _LocaleManagerImpl::GetSelectedLanguage(void)
        return language;
 }
 
-// FALLBACk should be removed after checking the SLP change.
-IList*
-_LocaleManagerImpl::GetAvailableLanguagesFallbackN(void)
-{
-       std::unique_ptr<IList> pLocaleList (GetAvailableLocalesN());
-       std::unique_ptr<HashMap> pLanguageMap(new (std::nothrow) HashMap(SingleObjectDeleter));
-       SysTryReturn(NID_LCL, pLanguageMap, null, E_OUT_OF_MEMORY,"[%s] Memory allocation failed", GetErrorMessage(E_OUT_OF_MEMORY));
-
-       pLanguageMap->Construct();
-
-       std::unique_ptr<ArrayList> pAvailableLanguageList(new (std::nothrow) ArrayList(SingleObjectDeleter));
-       SysTryReturn(NID_LCL, pAvailableLanguageList, null, E_OUT_OF_MEMORY,"[%s] Memory allocation failed", GetErrorMessage(E_OUT_OF_MEMORY));
-       pAvailableLanguageList->Construct();
-
-       for (int i = 0; i < pLocaleList->GetCount() ; i++)
-       {
-               Locale* pLocale = (Locale*)pLocaleList->GetAt(i);
-               std::unique_ptr<String> pLanguageCode(new (std::nothrow) String(pLocale->GetLanguageCodeString()));
-               SysTryReturn(NID_LCL, pLanguageCode, null, E_OUT_OF_MEMORY,"[%s] Memory allocation failed", GetErrorMessage(E_OUT_OF_MEMORY));
-
-               if (!pLanguageMap->ContainsKey(*pLanguageCode))
-               {
-                       std::unique_ptr<String> pDummyValue(new (std::nothrow) String());
-                       SysTryReturn(NID_LCL, pDummyValue, null, E_OUT_OF_MEMORY,"[%s] Memory allocation failed", GetErrorMessage(E_OUT_OF_MEMORY));
-
-                       result r = pLanguageMap->Add(pLanguageCode.get(), pDummyValue.get());
-                       SysTryReturn(NID_LCL, !IsFailed(r), null, E_SYSTEM, "It is failed to make a language map.");
-
-                       std::unique_ptr<String> pLangCode(new (std::nothrow) String(*(pLanguageCode.get())));
-                       r = pAvailableLanguageList->Add(pLangCode.get());
-                       SysTryReturn(NID_LCL, !IsFailed(r), null, E_SYSTEM, "It is failed to make a language list.");
-
-                       pLanguageCode.release();
-                       pDummyValue.release();
-                       pLangCode.release();
-               }
-       }
-
-       SetLastResult(E_SUCCESS);
-       return pAvailableLanguageList.release(); 
-}
 IList*
 _LocaleManagerImpl::GetAvailableLanguagesN(void)
 {
@@ -260,12 +219,8 @@ _LocaleManagerImpl::GetAvailableLanguagesN(void)
 
        xmlNodePtr cur = null;
        std::unique_ptr< xmlDoc, FreeXmlDoc > pDoc(xmlParseFile(LANGUAGE_LIST_FILE_PATH));
-       if (pDoc == null)
-       {
-               SysLog(NID_LCL, "[E_FILE_NOT_FOUND] It is failed to get the langlist from the resource.");
-               return GetAvailableLanguagesFallbackN();
-       }
-//     SysTryReturn(NID_LCL, pDoc != null, null, E_FILE_NOT_FOUND, "[E_FILE_NOT_FOUND] It is failed to get the langlist from the resource.");
+
+       SysTryReturn(NID_LCL, pDoc, null, E_FILE_NOT_FOUND, "[E_FILE_NOT_FOUND] It is failed to get the langlist from the resource.");
 
        cur = xmlDocGetRootElement(pDoc.get());
        SysTryReturn(NID_LCL, cur != null, null, E_EMPTY_BODY, "[E_EMPTY_BODY] It is empty document.");
@@ -384,271 +339,6 @@ _LocaleManagerImpl::GetAvailableTimeZonesN(U_ICU_NAMESPACE::StringEnumeration* p
        return pTimeZoneMap.release();
 }
 
-static const int TIMEZONE_MAX = 224;
-static const char* TimeZoneList[TIMEZONE_MAX] =
-{
-       "Africa/Abidjan",
-       "Africa/Accra",
-       "Africa/Addis_Ababa",
-       "Africa/Algiers",
-       "Africa/Asmara",
-       "Africa/Bamako",
-       "Africa/Bangui",
-       "Africa/Bissau",
-       "Africa/Cairo",
-       "Africa/Casablanca",
-       "Africa/Conakry",
-       "Africa/Dakar",
-       "Africa/Dar_es_Salaam",
-       "Africa/Djibouti",
-       "Africa/Douala",
-       "Africa/Freetown",
-       "Africa/Gaborone",
-       "Africa/Harare",
-       "Africa/Johannesburg",
-       "Africa/Kampala",
-       "Africa/Khartoum",
-       "Africa/Kinshasa",
-       "Africa/Lagos",
-       "Africa/Luanda",
-       "Africa/Lubumbashi",
-       "Africa/Lusaka",
-       "Africa/Malabo",
-       "Africa/Maputo",
-       "Africa/Mogadishu",
-       "Africa/Monrovia",
-       "Africa/Nairobi",
-       "Africa/Ndjamena",
-       "Africa/Niamey",
-       "Africa/Nouakchott",
-       "Africa/Ouagadougou",
-       "Africa/Tripoli",
-       "Africa/Tunis",
-       "America/Anchorage",
-       "America/Antigua",
-       "America/Argentina/Buenos_Aires",
-       "America/Asuncion",
-       "America/Barbados",
-       "America/Belize",
-       "America/Bogota",
-       "America/Caracas",
-       "America/Cayenne",
-       "America/Chicago",
-       "America/Costa_Rica",
-       "America/Denver",
-       "America/Detroit",
-       "America/El_Salvador",
-       "America/Godthab",
-       "America/Guadeloupe",
-       "America/Guatemala",
-       "America/Guayaquil",
-       "America/Guyana",
-       "America/Halifax",
-       "America/Havana",
-       "America/Indiana/Indianapolis",
-       "America/Jamaica",
-       "America/Kentucky/Louisville",
-       "America/La_Paz",
-       "America/Lima",
-       "America/Los_Angeles",
-       "America/Managua",
-       "America/Marigot",
-       "America/Martinique",
-       "America/Mazatlan",
-       "America/Mexico_City",
-       "America/Montevideo",
-       "America/Montreal",
-       "America/New_York",
-       "America/Nome",
-       "America/Panama",
-       "America/Paramaribo",
-       "America/Phoenix",
-       "America/Port-au-Prince",
-       "America/Puerto_Rico",
-       "America/Recife",
-       "America/Regina",
-       "America/Santiago",
-       "America/Santo_Domingo",
-       "America/Sao_Paulo",
-       "America/St_Johns",
-       "America/St_Thomas",
-       "America/Tegucigalpa",
-       "America/Tijuana",
-       "America/Toronto",
-       "America/Tortola",
-       "America/Vancouver",
-       "America/Winnipeg",
-       "Asia/Aden",
-       "Asia/Almaty",
-       "Asia/Amman",
-       "Asia/Anadyr",
-       "Asia/Ashgabat",
-       "Asia/Baghdad",
-       "Asia/Bahrain",
-       "Asia/Baku",
-       "Asia/Bangkok",
-       "Asia/Beirut",
-       "Asia/Bishkek",
-       "Asia/Colombo",
-       "Asia/Damascus",
-       "Asia/Dhaka",
-       "Asia/Dubai",
-       "Asia/Dushanbe",
-       "Asia/Ho_Chi_Minh",
-       "Asia/Hong_Kong",
-       "Asia/Hovd",
-       "Asia/Irkutsk",
-       "Asia/Istanbul",
-       "Asia/Jakarta",
-       "Asia/Jayapura",
-       "Asia/Jerusalem",
-       "Asia/Kabul",
-       "Asia/Kamchatka",
-       "Asia/Karachi",
-       "Asia/Kathmandu",
-       "Asia/Kolkata",
-       "Asia/Krasnoyarsk",
-       "Asia/Kuala_Lumpur",
-       "Asia/Kuwait",
-       "Asia/Macau",
-       "Asia/Magadan",
-       "Asia/Makassar",
-       "Asia/Manila",
-       "Asia/Muscat",
-       "Asia/Novokuznetsk",
-       "Asia/Novosibirsk",
-       "Asia/Omsk",
-       "Asia/Phnom_Penh",
-       "Asia/Pyongyang",
-       "Asia/Qatar",
-       "Asia/Rangoon",
-       "Asia/Riyadh",
-       "Asia/Sakhalin",
-       "Asia/Seoul",
-       "Asia/Shanghai",
-       "Asia/Singapore",
-       "Asia/Taipei",
-       "Asia/Tashkent",
-       "Asia/Tbilisi",
-       "Asia/Tehran",
-       "Asia/Tokyo",
-       "Asia/Ulan_Bator",
-       "Asia/Vladivostok",
-       "Asia/Yakutsk",
-       "Asia/Yekaterinburg",
-       "Asia/Yerevan",
-       "Atlantic/Azores",
-       "Atlantic/Canary",
-       "Atlantic/Reykjavik",
-       "Atlantic/South_Georgia",
-       "Australia/Adelaide",
-       "Australia/Brisbane",
-       "Australia/Canberra",
-       "Australia/Darwin",
-       "Australia/Hobart",
-       "Australia/Melbourne",
-       "Australia/Perth",
-       "Australia/Sydney",
-       "CST6CDT",
-       "EST5EDT",
-       "Europe/Amsterdam",
-       "Europe/Athens",
-       "Europe/Belgrade",
-       "Europe/Berlin",
-       "Europe/Bratislava",
-       "Europe/Brussels",
-       "Europe/Bucharest",
-       "Europe/Budapest",
-       "Europe/Chisinau",
-       "Europe/Copenhagen",
-       "Europe/Dublin",
-       "Europe/Helsinki",
-       "Europe/Istanbul",
-       "Europe/Kaliningrad",
-       "Europe/Kiev",
-       "Europe/Lisbon",
-       "Europe/Ljubljana",
-       "Europe/London",
-       "Europe/Luxembourg",
-       "Europe/Madrid",
-       "Europe/Malta",
-       "Europe/Minsk",
-       "Europe/Moscow",
-       "Europe/Paris",
-       "Europe/Podgorica",
-       "Europe/Prague",
-       "Europe/Riga",
-       "Europe/Rome",
-       "Europe/Samara",
-       "Europe/San_Marino",
-       "Europe/Skopje",
-       "Europe/Sofia",
-       "Europe/Stockholm",
-       "Europe/Tallinn",
-       "Europe/Vaduz",
-       "Europe/Vienna",
-       "Europe/Vilnius",
-       "Europe/Volgograd",
-       "Europe/Warsaw",
-       "Europe/Zagreb",
-       "Europe/Zurich",
-       "Indian/Antananarivo",
-       "Indian/Chagos",
-       "Indian/Maldives",
-       "Indian/Mauritius",
-       "Indian/Reunion",
-       "MST7MDT",
-       "Pacific/Auckland",
-       "Pacific/Easter",
-       "Pacific/Fiji",
-       "Pacific/Galapagos",
-       "Pacific/Guam",
-       "Pacific/Honolulu",
-       "Pacific/Midway",
-       "Pacific/Noumea",
-       "Pacific/Pago_Pago",
-       "Pacific/Tahiti",
-       "Pacific/Tarawa",
-       "Pacific/Tongatapu",
-       "PST8PDT"
-}; 
-
-
-IMap*
-_LocaleManagerImpl::GetAvailableTimeZonesFallbackN(void)
-{
-       std::unique_ptr<HashMap> pTimeZoneMap(new (std::nothrow) HashMap(SingleObjectDeleter));
-       SysTryReturn(NID_LCL, pTimeZoneMap, null, E_OUT_OF_MEMORY,
-                       "[%s] Memory allocation failed", GetErrorMessage(E_OUT_OF_MEMORY));
-
-       result r = E_SUCCESS;
-       int index = 0;
-
-       pTimeZoneMap->Construct();
-
-       do
-       {
-               std::unique_ptr< String > pTimeZone(new (std::nothrow) String(TimeZoneList[index++]));
-               SysTryReturn(NID_LCL, pTimeZone, null, E_OUT_OF_MEMORY,
-                               "[%s] Memory allocation failed.", GetErrorMessage(E_OUT_OF_MEMORY));
-
-               if (!pTimeZoneMap->ContainsKey(*(pTimeZone.get())))
-               {
-                       std::unique_ptr< String > pDummyValue (new  (std::nothrow) String());
-                       SysTryReturn(NID_LCL, pDummyValue, null, E_OUT_OF_MEMORY,"[%s] Memory allocation failed.", GetErrorMessage(E_OUT_OF_MEMORY));
-
-                       r = pTimeZoneMap->Add(pTimeZone.get(), pDummyValue.get());
-                       SysTryReturn(NID_LCL, !IsFailed(r), null, E_SYSTEM, "It is failed to make Timezone list.");
-
-                       pTimeZone.release();
-                       pDummyValue.release();
-               }
-       }while (index < TIMEZONE_MAX);
-
-       SetLastResult(E_SUCCESS);
-       return pTimeZoneMap.release();
-}
-
 
 IMap*
 _LocaleManagerImpl::GetAvailableTimeZonesN(void)
@@ -661,12 +351,7 @@ _LocaleManagerImpl::GetAvailableTimeZonesN(void)
        SysTryReturn(NID_LCL, pTimeZoneMap, null, E_OUT_OF_MEMORY,
                        "[%s] Memory allocation failed", GetErrorMessage(E_OUT_OF_MEMORY));
        r = file.Construct(tzFilePath, "r");
-       if (IsFailed(r))
-       {
-               SysLog(NID_LCL,"[E_FILE_NOT_FOUND] It is failed to get the tzlist from the ini file.");
-               return GetAvailableTimeZonesFallbackN();
-       }
-//     SysTryReturn(NID_LCL, r == E_SUCCESS, null,E_FILE_NOT_FOUND, "[E_FILE_NOT_FOUND] It is failed to get the tzlist from the ini file.");
+       SysTryReturn(NID_LCL, r == E_SUCCESS, null, E_FILE_NOT_FOUND, "[E_FILE_NOT_FOUND] It is failed to get the tzlist from the ini file.");
 
        pTimeZoneMap->Construct();
 

diff --git a/src/locales/inc/FLcl_LocaleManagerImpl.h b/src/locales/inc/FLcl_LocaleManagerImpl.h
index ccb6b70..1db0eea 100644 (file)
--- a/src/locales/inc/FLcl_LocaleManagerImpl.h
+++ b/src/locales/inc/FLcl_LocaleManagerImpl.h
@@ -49,12 +49,10 @@ public:
 
        static Tizen::Base::String GetSelectedLanguage(void);
        static Tizen::Base::Collection::IList* GetAvailableLanguagesN(void);
-       static Tizen::Base::Collection::IList* GetAvailableLanguagesFallbackN(void);
        // Get available language locales
        static Tizen::Base::Collection::IList* GetAvailableLanguageLocalesN(void);
 
        static Tizen::Base::Collection::IMap* GetAvailableTimeZonesN(void);
-       static Tizen::Base::Collection::IMap* GetAvailableTimeZonesFallbackN(void);
        static Tizen::Base::Collection::IMap* GetAvailableTimeZonesN(int rawOffset);
        static Tizen::Base::Collection::IMap* GetAvailableTimeZonesN(U_ICU_NAMESPACE::StringEnumeration* pIcuTZStrList);