wrt-plugins-tizen_0.4.23

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

diff --git a/src/Messaging/MessageFactory.cpp b/src/Messaging/MessageFactory.cpp
old mode 100755 (executable)
new mode 100644 (file)
index 2598460..fad4dac
--- a/src/Messaging/MessageFactory.cpp
+++ b/src/Messaging/MessageFactory.cpp
@@ -15,7 +15,6 @@
 // limitations under the License.
 //
 
-#include <dpl/log/log.h>
 #include <Commons/Exception.h>
 #include "Sms.h"
 #include "BinarySms.h"
@@ -24,6 +23,7 @@
 #include "EmptyMessage.h"
 #include "MessageFactory.h"
 #include "IAttachment.h"
+#include <Logger.h>
 
 using namespace std;
 using namespace WrtDeviceApis::Commons;
@@ -36,7 +36,7 @@ IMessagePtr MessageFactory::createMessage(const MessageType msgType,
         const std::string& id)
 {
 
-       LogInfo("enter");
+       LoggerI("enter");
 
        ISms* retSms = NULL;
        IMms* retMms =NULL;
@@ -49,7 +49,7 @@ IMessagePtr MessageFactory::createMessage(const MessageType msgType,
        switch (msgType) {
                case SMS:
                {
-                       LogDebug("creation sms message with id");
+                       LoggerD("creation sms message with id");
                        retSms = new Sms(id);
                        imsg = (IMessagePtr) retSms;
                        break;
@@ -57,7 +57,7 @@ IMessagePtr MessageFactory::createMessage(const MessageType msgType,
 
                case BINARYSMS:
                {
-                       LogDebug("creation binary sms message with id");
+                       LoggerD("creation binary sms message with id");
                        retBinarySms = new BinarySms(id);
                        imsg = (IMessagePtr) retBinarySms;
                break;
@@ -65,7 +65,7 @@ IMessagePtr MessageFactory::createMessage(const MessageType msgType,
 
                case MMS:
                {
-                       LogDebug("creation mms message with id");
+                       LoggerD("creation mms message with id");
                        retMms =        new Mms(id);
                        imsg = (IMessagePtr) retMms;
 
@@ -74,30 +74,30 @@ IMessagePtr MessageFactory::createMessage(const MessageType msgType,
                        unsigned int idx = 0;
                        for (; idx < attachments.size() ; idx++ )
                        {
-                       LogDebug("set Messsage ID = " << attachments[idx]->getAttachmentID());
+                       LoggerD("set Messsage ID = " << attachments[idx]->getAttachmentID());
                        attachments[idx]->setMessage(imsg);
                        }
                        break;
                }
                case EMAIL:
                {
-                       LogDebug("creation email message with id");
+                       LoggerD("creation email message with id");
                        retEmail= new Email(id);
                        imsg = (IMessagePtr) retEmail;
                        break;
                }
                case EMPTY_MESSAGE:
                {
-                       LogDebug("creation empty message with id");
+                       LoggerD("creation empty message with id");
                        retEmptyMessage = new EmptyMessage(id);
                        imsg = (IMessagePtr) retEmptyMessage;
                        break;
                }
                default:
-                       LogError("creation error, unknown message type");
+                       LoggerE("creation error, unknown message type");
                        break;
        }
-       LogInfo("end");
+       LoggerI("end");
        return imsg;
 
 }
@@ -114,7 +114,7 @@ IMessagePtr MessageFactory::createMessage(const MessageType msgType,
 IMessagePtr MessageFactory::createMessage(const MessageType msgType,
         const int id, const msg_struct_t msg_data)
 {
-    LogInfo("enter");
+    LoggerI("enter");
     IMessage* retVal = NULL;
     std::ostringstream stream;
     stream << id;
@@ -122,44 +122,44 @@ IMessagePtr MessageFactory::createMessage(const MessageType msgType,
        
     switch (msgType) {
     case SMS:
-        LogDebug("creation sms message with data");
+        LoggerD("creation sms message with data");
         retVal = new Sms(idStr, msg_data);
         break;
 
     case MMS:
-        LogDebug("creation mms message with data");
+        LoggerD("creation mms message with data");
         retVal = new Mms(idStr, msg_data);
         break;
 
     case EMPTY_MESSAGE:
-        LogDebug("creation empty message with data");
+        LoggerD("creation empty message with data");
         retVal = new EmptyMessage(idStr);
         break;
                
     default:
-        LogError("creation error, unknown message type");
+        LoggerE("creation error, unknown message type");
         break;
     }
-    LogInfo("end");
+    LoggerI("end");
     return IMessagePtr(retVal);
 }
 
 IMessagePtr MessageFactory::createMessage(const MessageType msgType,
            EmailAccountInfo& account, const std::string& id )
 {
-       LogInfo("enter, CreateMessage with account");
+       LoggerI("enter, CreateMessage with account");
                
        std::ostringstream stream;
        stream << id;
        std::string idStr = stream.str();
        
-       LogInfo("createMessage with , idstr =" << idStr);
+       LoggerI("createMessage with , idstr =" << idStr);
        
        if (msgType == EMAIL)
        {       
-               LogDebug("Account Address:" << &account);
+               LoggerD("Account Address:" << &account);
                IMessage* retVal = NULL;
-               LogDebug("creation email message with account");
+               LoggerD("creation email message with account");
                retVal = new Email(account);
                return IMessagePtr(retVal);
        }
@@ -170,9 +170,9 @@ IMessagePtr MessageFactory::createMessage(const MessageType msgType,
 
 IMessagePtr MessageFactory::createEmailMessage(const int accountId, const int mailId)
 {
-       LogInfo("enter, Create Email Message with account ID");
+       LoggerI("enter, Create Email Message with account ID");
        IEmail* email = NULL;
-       LogDebug("creation email message with account ID");
+       LoggerD("creation email message with account ID");
        std::stringstream stream;
        unsigned int idx;
        
@@ -190,13 +190,13 @@ IMessagePtr MessageFactory::createEmailMessage(const int accountId, const int ma
 
        for (idx = 0; idx < attachments.size() ; idx++ )
        {
-               LogDebug("set Attachment ID = " << attachments[idx]->getAttachmentID());
+               LoggerD("set Attachment ID = " << attachments[idx]->getAttachmentID());
                attachments[idx]->setMessage(imsg);
        }
 
        for (idx = 0; idx < inlineAttachments.size() ; idx++ )
        {
-               LogDebug("set inline Attachment ID = " << inlineAttachments[idx]->getAttachmentID());
+               LoggerD("set inline Attachment ID = " << inlineAttachments[idx]->getAttachmentID());
                inlineAttachments[idx]->setMessage(imsg);
        }
 
@@ -205,7 +205,7 @@ IMessagePtr MessageFactory::createEmailMessage(const int accountId, const int ma
        
 #if 0
        IMessage* retVal = NULL;
-       LogDebug("creation email message with account ID");
+       LoggerD("creation email message with account ID");
 
        
        std::stringstream stream;
@@ -226,7 +226,7 @@ IMessagePtr MessageFactory::createEmailMessage(const int accountId, const int ma
 
 IMessagePtr MessageFactory::createEmailMessage()
 {
-       LogInfo("enter, Create Temporary Email Message without account");
+       LoggerI("enter, Create Temporary Email Message without account");
 
        IEmail* email = NULL;