Remove dead code in Locales.

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

diff --git a/src/locales/FLcl_IcuCalendarImpl.cpp b/src/locales/FLcl_IcuCalendarImpl.cpp
index 4d9bb89..2c27038 100644 (file)
--- a/src/locales/FLcl_IcuCalendarImpl.cpp
+++ b/src/locales/FLcl_IcuCalendarImpl.cpp
@@ -914,37 +914,6 @@ _IcuCalendarImpl::GetIcuLocale(const Locale& ospLocale, int type) const
        return icuLocale;
 }
 
-SimpleTimeZone*
-_IcuCalendarImpl::GetIcuTimeZone(const TimeZone& ospTimeZone) const
-{
-       String timeZoneId = ospTimeZone.GetId();
-       std::unique_ptr< char [] > pTimezoneStr(_StringConverter::CopyToCharArrayN(timeZoneId));
-       if (pTimezoneStr != null)
-       {
-               int rawOffset = ospTimeZone.GetRawOffset() * 60 * 1000;
-               std::unique_ptr< IcuSimpleTimeZone > pIcuTimeZone(new IcuSimpleTimeZone(rawOffset, pTimezoneStr.get()));
-               if (pIcuTimeZone != null)
-               {
-                       _LocaleData lclData;
-                       result r = lclData.SetStartTimeRule(*pIcuTimeZone, ospTimeZone.GetDstStartingRule());
-                       if (!IsFailed(r))
-                       {
-                               r = lclData.SetEndTimeRule(*pIcuTimeZone, ospTimeZone.GetDstEndingRule());
-//                if (!IsFailed(r))
-//                {
-//                    ClearLastResult();
-//                    return pIcuTimeZone;
-//                }
-                       }
-                       ClearLastResult();
-                       return pIcuTimeZone.release();
-               }
-       }
-
-       SetLastResult(E_SYSTEM);
-       return null;
-}
-
 void
 _IcuCalendarImpl::CheckInputFieldValueForOverFlow(int field, int value)
 {

diff --git a/src/locales/FLcl_IcuCalendarImpl.h b/src/locales/FLcl_IcuCalendarImpl.h
index 18ef919..c5cccc1 100644 (file)
--- a/src/locales/FLcl_IcuCalendarImpl.h
+++ b/src/locales/FLcl_IcuCalendarImpl.h
@@ -92,7 +92,6 @@ public:
        virtual result SetMinDaysInFirstWeek(short value);
 
        virtual result SetTimeZone(const TimeZone& timeZone);
-//     virtual TimeZone GetTimeZone(void) const;
 
        // For Gregorian Calendar
        virtual long long GetGregorianChange(void) const;
@@ -113,11 +112,7 @@ private:
        int ConvertFromOspTimeFieldValue(int field, int value) const;
        int ConvertToOspTimeFieldValue(int field, int value) const;
 
-//    UCalendarDaysOfWeek GetIcuDayOfWeek(DayOfWeek dayOfWeek) const;
-//    DayOfWeek GetOspDayOfWeek(UCalendarDaysOfWeek dayOfWeek) const;
-
        U_ICU_NAMESPACE::Locale GetIcuLocale(const Locale& ospLocale, int type) const;
-       U_ICU_NAMESPACE::SimpleTimeZone* GetIcuTimeZone(const TimeZone& ospTimeZone) const;
 
        void CheckInputFieldValueForOverFlow(int field, int value);
        result ValidateFieldsForOverFlow(void) const;

diff --git a/src/locales/FLcl_LocaleData.cpp b/src/locales/FLcl_LocaleData.cpp
index 705154e..8df7445 100644 (file)
--- a/src/locales/FLcl_LocaleData.cpp
+++ b/src/locales/FLcl_LocaleData.cpp
@@ -906,207 +906,6 @@ _LocaleData::SetDateTimeFormatter(DateTimeStyle dateStyle, DateTimeStyle timeSty
        return E_INVALID_ARG;
 }
 
-result
-_LocaleData::SetStartTimeRule(IcuSimpleTimeZone& zone, const TimeRule* pOspTimeRule)
-{
-       if (pOspTimeRule)
-       {
-               UErrorCode status = U_ZERO_ERROR;
-               IcuDateTimeRule::TimeRuleType icuTimeRuleType;
-
-               DstRuleMode ospRuleMode = static_cast< DstRuleMode >(pOspTimeRule->GetRuleMode());
-               Tizen::System::TimeMode ospTimeMode = pOspTimeRule->GetTimeMode();
-
-               switch (ospTimeMode)
-               {
-               case Tizen::System::UTC_TIME:
-               {
-                       icuTimeRuleType = IcuDateTimeRule::UTC_TIME;
-                       break;
-               }
-
-               case Tizen::System::STANDARD_TIME:
-               {
-                       icuTimeRuleType = IcuDateTimeRule::STANDARD_TIME;
-                       break;
-               }
-
-               case Tizen::System::WALL_TIME:
-               default:
-               {
-                       icuTimeRuleType = IcuDateTimeRule::WALL_TIME;
-                       break;
-               }
-               }
-
-               int time = ((pOspTimeRule->GetHour() * 60) + pOspTimeRule->GetMinute()) * 60 * 1000;
-
-               switch (ospRuleMode)
-               {
-               case EXACT_DAY:
-               {
-                       zone.setStartRule(
-                               pOspTimeRule->GetMonth(),
-                               pOspTimeRule->GetDay(),
-                               time,
-                               icuTimeRuleType,
-                               status);
-                       break;
-               }
-
-               case DAY_OF_WEEK_IN_MONTH:
-               {
-                       zone.setStartRule(
-                               pOspTimeRule->GetMonth(),
-                               pOspTimeRule->GetWeek(),
-                               pOspTimeRule->GetDayOfWeek(),
-                               time,
-                               icuTimeRuleType,
-                               status);
-                       break;
-               }
-
-               case AFTER_THE_SPECIFIED_DAY:
-               {
-                       zone.setStartRule(
-                               pOspTimeRule->GetMonth(),
-                               pOspTimeRule->GetDay(),
-                               pOspTimeRule->GetDayOfWeek(),
-                               time,
-                               icuTimeRuleType,
-                               status);
-                       break;
-               }
-
-               case BEFORE_THE_SPECIFIED_DAY:
-               {
-                       zone.setStartRule(
-                               pOspTimeRule->GetMonth(),
-                               pOspTimeRule->GetDay(),
-                               -pOspTimeRule->GetDayOfWeek(),
-                               time,
-                               icuTimeRuleType,
-                               status);
-                       break;
-               }
-
-               case BACKWARD_FROM_END_OF_MONTH:
-               {
-                       zone.setStartRule(
-                               pOspTimeRule->GetMonth(),
-                               pOspTimeRule->GetWeek() * -1,
-                               0,
-                               time,
-                               icuTimeRuleType,
-                               status);
-                       break;
-               }
-               }
-               return U_SUCCESS(status) ? E_SUCCESS : E_SYSTEM;
-       }
-       return E_INVALID_ARG;
-}
-
-result
-_LocaleData::SetEndTimeRule(IcuSimpleTimeZone& zone, const TimeRule* pOspTimeRule)
-{
-       if (pOspTimeRule)
-       {
-               UErrorCode status = U_ZERO_ERROR;
-               IcuDateTimeRule::TimeRuleType icuTimeRuleType;
-
-               DstRuleMode ospRuleMode = static_cast< DstRuleMode >(pOspTimeRule->GetRuleMode());
-               Tizen::System::TimeMode ospTimeMode = pOspTimeRule->GetTimeMode();
-
-               switch (ospTimeMode)
-               {
-               case Tizen::System::UTC_TIME:
-               {
-                       icuTimeRuleType = IcuDateTimeRule::UTC_TIME;
-                       break;
-               }
-
-               case Tizen::System::STANDARD_TIME:
-               {
-                       icuTimeRuleType = IcuDateTimeRule::STANDARD_TIME;
-                       break;
-               }
-
-               case Tizen::System::WALL_TIME:
-               default:
-               {
-                       icuTimeRuleType = IcuDateTimeRule::WALL_TIME;
-                       break;
-               }
-               }
-
-               int time = ((pOspTimeRule->GetHour() * 60) + pOspTimeRule->GetMinute()) * 60 * 1000;
-
-               switch (ospRuleMode)
-               {
-               case EXACT_DAY:
-               {
-                       zone.setEndRule(
-                               pOspTimeRule->GetMonth(),
-                               pOspTimeRule->GetDay(),
-                               time,
-                               icuTimeRuleType,
-                               status);
-                       break;
-               }
-
-               case DAY_OF_WEEK_IN_MONTH:
-               {
-                       zone.setEndRule(
-                               pOspTimeRule->GetMonth(),
-                               pOspTimeRule->GetWeek(),
-                               pOspTimeRule->GetDayOfWeek(),
-                               time,
-                               icuTimeRuleType,
-                               status);
-                       break;
-               }
-
-               case AFTER_THE_SPECIFIED_DAY:
-               {
-                       zone.setEndRule(
-                               pOspTimeRule->GetMonth(),
-                               pOspTimeRule->GetDay(),
-                               pOspTimeRule->GetDayOfWeek(),
-                               time,
-                               icuTimeRuleType,
-                               status);
-                       break;
-               }
-
-               case BEFORE_THE_SPECIFIED_DAY:
-               {
-                       zone.setEndRule(
-                               pOspTimeRule->GetMonth(),
-                               pOspTimeRule->GetDay(),
-                               -pOspTimeRule->GetDayOfWeek(),
-                               time,
-                               icuTimeRuleType,
-                               status);
-                       break;
-               }
-
-               case BACKWARD_FROM_END_OF_MONTH:
-               {
-                       zone.setEndRule(
-                               pOspTimeRule->GetMonth(),
-                               pOspTimeRule->GetWeek() * -1,
-                               0,
-                               time,
-                               icuTimeRuleType,
-                               status);
-                       break;
-               }
-               }
-               return U_SUCCESS(status) ? E_SUCCESS : E_SYSTEM;
-       }
-       return E_INVALID_ARG;
-}
 
 result
 _LocaleData::FormatDateTime(const DateTime& date, String& str)
@@ -1248,23 +1047,6 @@ _LocaleData::SetDateTimeSymbols(const DateTimeSymbols& newValue)
        return E_UNSUPPORTED_OPERATION;
 }
 
-void
-_LocaleData::SetGregorianWeekCountData(const Locale& ospLocale, DayOfWeek& firstDayOfWeek, short& minDaysInFirstWeek)
-{
-       UErrorCode success = U_ZERO_ERROR;
-       IcuLocale icuLocale;
-
-       icuLocale = GetIcuLocale(ospLocale);
-       result r = GetLastResult();
-       SysAssert(r == E_SUCCESS);
-
-       GregorianCalendar gc(icuLocale, success);
-       SysAssert(U_SUCCESS(success));
-
-       firstDayOfWeek = (DayOfWeek) gc.getFirstDayOfWeek();                  // Set __firstDayOfWeek from ICU data
-       minDaysInFirstWeek = 1;                          // To align with 2.0 version
-//    minDaysInFirstWeek = (short) gc.getMinimalDaysInFirstWeek();       // Set __minDaysInFirstWeek from ICU data
-}
 
 _LocaleData::_LocaleData(void)
        : __icuLocale()

diff --git a/src/locales/FLcl_LocaleData.h b/src/locales/FLcl_LocaleData.h
index 48d1ad8..b0faf5e 100644 (file)
--- a/src/locales/FLcl_LocaleData.h
+++ b/src/locales/FLcl_LocaleData.h
@@ -171,18 +171,6 @@ public:
        DateTimeSymbols* GetDateTimeSymbolsN(DateTimeSymbols* pDateTimeSymbols);
        result SetDateTimeSymbols(const DateTimeSymbols& newValue);
 
-
-       // Methods to support TimeZone
-       result SetStartTimeRule(IcuSimpleTimeZone& zone, const TimeRule* pOspTimeRule);
-       result SetEndTimeRule(IcuSimpleTimeZone& zone, const TimeRule* pOspTimeRule);
-
-       // Methods to support Calendar
-       void SetGregorianWeekCountData(const Locale& ospLocale, DayOfWeek& firstDayOfWeek, short& minDaysInFirstWeek);
-
-       // Lists from ICU TimeZone
-       Tizen::Base::Collection::IList* GetAvailableTimeZonesN(void);
-       Tizen::Base::Collection::IList* GetAvailableTimeZonesN(int rawOffset);
-
 private:
        _LocaleData(const _LocaleData& localeData);
        _LocaleData& operator =(const _LocaleData& localeData);