wrt-plugins-tizen_0.4.23

[framework/web/wrt-plugins-tizen.git] / src / Messaging / IMessage.cpp

diff --git a/src/Messaging/IMessage.cpp b/src/Messaging/IMessage.cpp
old mode 100755 (executable)
new mode 100644 (file)
index 9f51f8d..3d7a495
--- a/src/Messaging/IMessage.cpp
+++ b/src/Messaging/IMessage.cpp
@@ -16,11 +16,11 @@
 //
 
 #include <pcrecpp.h>
-#include <dpl/log/log.h>
 #include <Commons/Exception.h>
 #include "IMessage.h"
 #include "EventSendMessage.h"
 #include "EventMessagingService.h"
+#include <Logger.h>
 
 using namespace std;
 
@@ -40,7 +40,7 @@ IMessage::IMessage(const MessageType msgType,
     m_requestReceiver(NULL),
     m_sendMessageEvent(NULL)
 {
-    LogDebug("message creation, msgId=" << m_id << ", msgType=" << m_msgType);
+    LoggerD("message creation, msgId=" << m_id << ", msgType=" << m_msgType);
 
     //initialize dateTime of message
     time_t rawtime;
@@ -49,13 +49,13 @@ IMessage::IMessage(const MessageType msgType,
     if (local) {
         m_dateTime = *local;
     } else {
-        LogError("Failed to initialize message dateTime");
+        LoggerE("Failed to initialize message dateTime");
     }
 }
 
 IMessage::~IMessage()
 {
-    LogDebug("destroying message, msgId=" << m_id << ", msgType=" << m_msgType);
+    LoggerD("destroying message, msgId=" << m_id << ", msgType=" << m_msgType);
 }
 
 string IMessage::getId() const
@@ -177,7 +177,7 @@ void IMessage::setFolderType(FolderType folder)
 string IMessage::getCurrentUserFolder() const
 {
     if (m_folder != USERDEFINED_FOLDER) {
-        LogError("folder is not user folder type");
+        LoggerE("folder is not user folder type");
         Throw(WrtDeviceApis::Commons::UnknownException);
     }
     return m_userFolderName;
@@ -190,26 +190,26 @@ void IMessage::setCurrentUserFolder(const std::string& arg)
 
 bool IMessage::validatePhoneNumber(std::string& number)
 {
-    LogDebug("testing number=" << number);
+    LoggerD("testing number=" << number);
     return true;
 /*
     pcrecpp::RE re("[^0-9#\\+\\*]?");
     re.GlobalReplace("", &number);     //remove invailde phone number. phone Number were composed only number.
     
     if (number.empty()) {
-        LogError("wrong phoneNumber=" << number);
+        LoggerE("wrong phoneNumber=" << number);
         return false;
     }
-    LogDebug("phoneNumber=" << number);
+    LoggerD("phoneNumber=" << number);
 
     pcrecpp::RE re2("^[+#]?[0-9]{1,22}$");
     if (re2.FullMatch(number)) {
-        LogDebug("vaildate Number=" << number);
+        LoggerD("vaildate Number=" << number);
         return true;
     }
     else
     {
-        LogDebug("invaildate Number=" << number);
+        LoggerD("invaildate Number=" << number);
          return false;
     }
 */
@@ -219,7 +219,7 @@ bool IMessage::validateEmailAddr(const Recipients& addr)
 {
     for (size_t i = 0; i < addr.getRecipientSize(); i++) {
         if (false == validateEmailAddr(addr.getRecipient(i))) {
-            LogError("wrong email address");
+            LoggerE("wrong email address");
             return false;
         }
     }
@@ -237,10 +237,10 @@ bool IMessage::validateEmailAddr(const std::string& email)
         ".)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\\]?)$"
         );
     if (re.FullMatch(email)) {
-        LogDebug("emailAddress=" << email);
+        LoggerD("emailAddress=" << email);
         return true;
     }
-    LogError("wrong emailAddress=" << email);
+    LoggerE("wrong emailAddress=" << email);
     return false;
 }
 
@@ -286,7 +286,7 @@ ReqReceiverMessage* IMessage::getRequestReceiver() const
 
 void IMessage::setMessageStatus( MessageStatus status)
 {
-       LogDebug("setMessageStatus : " << status);
+       LoggerD("setMessageStatus : " << status);
        m_msgStatus = status;
 }