wrt-plugins-tizen_0.4.23

[framework/web/wrt-plugins-tizen.git] / src / TimeUtil / TZDate.cpp

diff --git a/src/TimeUtil/TZDate.cpp b/src/TimeUtil/TZDate.cpp
old mode 100755 (executable)
new mode 100644 (file)
index 17b5108..93da136
--- a/src/TimeUtil/TZDate.cpp
+++ b/src/TimeUtil/TZDate.cpp
@@ -15,19 +15,13 @@
 // limitations under the License.
 //
 
-
-
-
-#include <dpl/log/log.h>
-
 #include <Commons/Exception.h>
-
 #include <unicode/timezone.h>
 #include <unicode/vtzone.h>
 #include <unicode/smpdtfmt.h>
-
 #include "TZDate.h"
 #include "TimeUtilTools.h"
+#include <Logger.h>
 
 using namespace WrtDeviceApis;
 
@@ -36,7 +30,7 @@ namespace Time {
 
 TZDate::TZDate(const bool isNotNull)
 {
-       LogDebug("entered");
+       LoggerD("entered");
 
        if (isNotNull == FALSE) {
                myCalendar = NULL;
@@ -57,7 +51,7 @@ TZDate::TZDate(const bool isNotNull)
 
 TZDate::TZDate(const std::string &timezone)
 {
-       LogDebug("entered");
+       LoggerD("entered");
 
        UErrorCode ec = U_ZERO_ERROR;
        TimeUtilTools util;
@@ -79,7 +73,7 @@ TZDate::TZDate(const std::string &timezone)
 
 TZDate::TZDate(const TZDateProperties &properties)
 {
-       LogDebug("entered");
+       LoggerD("entered");
 
        TimeUtilTools util;
        myCalendar = _makeCalendar(properties);
@@ -95,7 +89,7 @@ TZDate::TZDate(const TZDateProperties &properties)
 
 TZDate::~TZDate()
 {
-       LogDebug("entered");
+       LoggerD("entered");
 
        if (myCalendar != NULL)
                delete myCalendar;
@@ -113,7 +107,7 @@ bool  TZDate::isNull()
 
 Calendar *TZDate::_makeCalendar(const TZDateProperties &properties)
 {
-       LogDebug("entered");
+       LoggerD("entered");
        UErrorCode ec = U_ZERO_ERROR;
        TimeUtilTools util;
 
@@ -140,7 +134,7 @@ std::string TZDate::_getTimezoneName(Calendar *cal)
 
        cal->getTimeZone().getID(id);
        std::string s_result = util.toString(id);
-       LogDebug(s_result);
+       LoggerD(s_result);
        return s_result;
 }
 
@@ -247,10 +241,10 @@ TZDateProperties TZDate::toTimezone(const std::string timezone) {
 
 long TZDate::_get(const TZDateFields field, Calendar *cal)
 {
-       LogDebug("<<<");
+       LoggerD("<<<");
 
        if (_convertDateField(field) == UCAL_FIELD_COUNT){
-               LogDebug(">>> UCAL_FIELD_COUNT");
+               LoggerD(">>> UCAL_FIELD_COUNT");
                return -1;
        }
 
@@ -260,14 +254,14 @@ long TZDate::_get(const TZDateFields field, Calendar *cal)
        if (U_SUCCESS(ec)) {
                long result = util.tolong(value);
 
-               LogDebug(">>> result:" << result);
+               LoggerD(">>> result:" << result);
                return result;
        }
        ThrowMsg(Commons::PlatformException, "Can't get Calendar value");
 }
 long TZDate::get(const TZDateFields field)
 {
-       LogDebug("<<<");
+       LoggerD("<<<");
 
        long result = _get(field, myCalendar);
        if (field == TZDATE_DAY_OF_WEEK)
@@ -282,7 +276,7 @@ void TZDate::set(const TZDateFields field, const long value)
 
        TimeUtilTools util;
        myCalendar->set(_convertDateField(field), util.toint32_t(value));
-       LogDebug("Field : " << field << " value : " << get(field));
+       LoggerD("Field : " << field << " value : " << get(field));
 }
 
 long TZDate::getUTC(const TZDateFields field)
@@ -303,7 +297,7 @@ long TZDate::getUTC(const TZDateFields field)
                long result = util.tolong(value);
                if (field == TZDATE_DAY_OF_WEEK)
                        result--;
-               LogDebug("result : " << result);
+               LoggerD("result : " << result);
 
                return result;
        }
@@ -330,7 +324,7 @@ void TZDate::setUTC(const TZDateFields field, const long value)
 }
 
 long long TZDate::difference(const TZDateProperties &prop) {
-       LogDebug("entered");
+       LoggerD("entered");
 
        TimeUtilTools util;
        UErrorCode ec = U_ZERO_ERROR;
@@ -347,14 +341,14 @@ long long TZDate::difference(const TZDateProperties &prop) {
        if (U_SUCCESS(ec)) {
                UDate otherTime = otherCalendar->getTime(ec);
                if (U_SUCCESS(ec)) {
-                       LogDebug("myCalendar");
+                       LoggerD("myCalendar");
                        util.printDate(myCalendar);
-                       LogDebug("otherCalendar");
+                       LoggerD("otherCalendar");
                        util.printDate(otherCalendar);
                        delete otherCalendar;
 
-                       LogDebug("myTime : " <<myTime);
-                       LogDebug("otherTime : " << otherTime);
+                       LoggerD("myTime : " <<myTime);
+                       LoggerD("otherTime : " << otherTime);
 
                        return static_cast<long long>(myTime - otherTime);
                }
@@ -364,7 +358,7 @@ long long TZDate::difference(const TZDateProperties &prop) {
 }
 
 TZDateProperties TZDate::addDuration(const DurationProperties &duration) {
-       LogDebug("entered");
+       LoggerD("entered");
        UErrorCode ec = U_ZERO_ERROR;
 
        TimeUtilTools util;
@@ -396,7 +390,7 @@ TZDateProperties TZDate::addDuration(const DurationProperties &duration) {
                unit = DAYS_UNIT;
        }
        day = length;
-       LogDebug("day:"<<day<<" hour:"<<hour<<" min:"<<min<<" sec:"<<sec<<" msec:"<<msec);
+       LoggerD("day:"<<day<<" hour:"<<hour<<" min:"<<min<<" sec:"<<sec<<" msec:"<<msec);
        try {
                if (msec != 0) {
                        cal->add(UCAL_MILLISECOND, util.toint32_t(msec), ec);
@@ -424,7 +418,7 @@ TZDateProperties TZDate::addDuration(const DurationProperties &duration) {
                        Throw(Commons::PlatformException);
 
                while (day != 0) {
-                       LogDebug("1st day : " << day);
+                       LoggerD("1st day : " << day);
                        int amount = 0;
 
                        if (day < INT_MIN)
@@ -435,8 +429,8 @@ TZDateProperties TZDate::addDuration(const DurationProperties &duration) {
                                amount = day;
 
                        day -= amount;
-                       LogDebug("amount : " << amount);
-                       LogDebug("2nd day : " << day);
+                       LoggerD("amount : " << amount);
+                       LoggerD("2nd day : " << day);
                        cal->add(UCAL_DATE, util.toint32_t(amount), ec);
                        if (!U_SUCCESS(ec))
                                Throw(Commons::PlatformException);
@@ -446,7 +440,7 @@ TZDateProperties TZDate::addDuration(const DurationProperties &duration) {
                                Throw(Commons::PlatformException);
 
                        int diff = static_cast<int>((newValue - oldValue) / 24 / 60 / 60 / 1000);
-                       LogDebug("diff : " << diff);
+                       LoggerD("diff : " << diff);
                        if (diff != amount) {
                                Throw(Commons::OutOfRangeException);
                        }
@@ -475,7 +469,7 @@ std::string TZDate::getUTCTimezoneName() {
 
        TimeZone::getGMT()->getID(id);
        std::string s_result = util.toString(id);
-       LogDebug(s_result);
+       LoggerD(s_result);
        return s_result;
 }
 
@@ -485,12 +479,12 @@ std::string TZDate::getLocalTimezoneName() {
 
        TimeZone::createDefault()->getID(id);
        std::string s_result = util.toString(id);
-       LogDebug(s_result);
+       LoggerD(s_result);
        return s_result;
 }
 
 double TZDate::getTime() {
-       LogDebug("entered");
+       LoggerD("entered");
        UErrorCode ec = U_ZERO_ERROR;
 
        UDate date = myCalendar->getTime(ec);
@@ -501,7 +495,7 @@ double TZDate::getTime() {
 }
 
 bool TZDate::setTime(const double time) {
-       LogDebug("entered");
+       LoggerD("entered");
        UErrorCode ec = U_ZERO_ERROR;
 
        myCalendar->setTime(static_cast<UDate>(time), ec);
@@ -526,7 +520,7 @@ bool TZDate::setTime(const double time) {
                        std::string result = util.toString(str);
                        str.remove();
 
-                       LogDebug (result);
+                       LoggerD (result);
                        return result;
                }
        }
@@ -548,7 +542,7 @@ bool TZDate::setTime(const double time) {
                if (U_SUCCESS(ec)) {
                        std::string result = util.toString(str);
                        str.remove();
-                       LogDebug (result);
+                       LoggerD (result);
                        return result;
                }
        }
@@ -557,7 +551,7 @@ bool TZDate::setTime(const double time) {
  }
  
  std::string TZDate::toString(bool bLocale) {
-       LogDebug("entered");
+       LoggerD("entered");
 
        UErrorCode ec = U_ZERO_ERROR;
        UnicodeString str;
@@ -572,7 +566,7 @@ bool TZDate::setTime(const double time) {
                if (U_SUCCESS(ec)) {
                        std::string result = util.toString(str);
                        str.remove();
-                       LogDebug (result);
+                       LoggerD (result);
                        return result;
                }
        }
@@ -580,7 +574,7 @@ bool TZDate::setTime(const double time) {
 }
 
 std::string TZDate::getTimezoneAbbreviation() {
-       LogDebug("entered");
+       LoggerD("entered");
 
        UErrorCode ec = U_ZERO_ERROR;
        UnicodeString str;
@@ -596,7 +590,7 @@ std::string TZDate::getTimezoneAbbreviation() {
                        std::string result = util.toString(str);
                        str.remove();
 
-                       LogDebug (result);
+                       LoggerD (result);
 
                        return result;
                }
@@ -605,7 +599,7 @@ std::string TZDate::getTimezoneAbbreviation() {
 }
 
 long TZDate::secondsFromUTC() {
-       LogDebug("entered");
+       LoggerD("entered");
        UErrorCode ec = U_ZERO_ERROR;
        TimeUtilTools util;
 
@@ -619,12 +613,12 @@ long TZDate::secondsFromUTC() {
 
        long result = -((util.tolong(zoneOffset + dstOffset)) / MILLISTOSEC);
 
-       LogDebug("result : " << result);
+       LoggerD("result : " << result);
        return result;
 }
 
 bool TZDate::isDST() {
-       LogDebug("entered");
+       LoggerD("entered");
        UErrorCode ec = U_ZERO_ERROR;
        TimeUtilTools util;
        UBool result = myCalendar->inDaylightTime(ec);
@@ -636,7 +630,7 @@ bool TZDate::isDST() {
 }
 
 TZDateProperties TZDate::getDSTTransition(DSTTransition trans) {
-       LogDebug("entered");
+       LoggerD("entered");
        TimeUtilTools util;
        UErrorCode ec = U_ZERO_ERROR;
        TZDateProperties props;
@@ -656,7 +650,7 @@ TZDateProperties TZDate::getDSTTransition(DSTTransition trans) {
                        else
                                result = vtz->getPreviousTransition(dstTransitionDate, FALSE,  tzTrans);
                        if (result == TRUE) {
-                               LogDebug("result is TRUE");
+                               LoggerD("result is TRUE");
                                dstTransitionDate = tzTrans.getTime();
                        }
                }