wrt-plugins-tizen_0.4.23

[framework/web/wrt-plugins-tizen.git] / src / NFC / NFCAdapter.cpp

diff --git a/src/NFC/NFCAdapter.cpp b/src/NFC/NFCAdapter.cpp
old mode 100755 (executable)
new mode 100644 (file)
index a7aadcd..e8c0db5
--- a/src/NFC/NFCAdapter.cpp
+++ b/src/NFC/NFCAdapter.cpp
@@ -15,7 +15,6 @@
 // limitations under the License.
 //
 
-#include <dpl/log/log.h>
 #include <dpl/scoped_ptr.h>
 #include <Commons/Exception.h>
 #include <JSTizenException.h>
@@ -23,13 +22,14 @@
 #include "NFCDefaultAdapter.h"
 #include "NFCAdapter.h"
 #include "NFCUtil.h"
+#include <Logger.h>
 
 using namespace DPL;
 namespace DeviceAPI {
 namespace NFC {
 
 NFCAdapter::NFCAdapter() {
-       LogDebug("NFCAdapter");
+       LoggerD("NFCAdapter");
        if (!NFCDefaultAdapterSingleton::Instance().isSupported())
                ThrowMsg(UnsupportedException, "Not Support");
 
@@ -40,14 +40,14 @@ NFCAdapter::NFCAdapter() {
 }
 
 NFCAdapter::~NFCAdapter() {
-       LogDebug("Enter");
+       LoggerD("Enter");
        unsetTagListener();
        unsetPeerListener();
        m_EventNFCChangedSetPoweredPtr.Reset();
 }
 
 int NFCAdapter::setTagListener(const EventNFCChangedEmitterPtr& emitter, const TagFilterPtr& filter) {
-       LogDebug(" NFCAdapter::setTagListener Entered");
+       LoggerD(" NFCAdapter::setTagListener Entered");
        if (m_NFCTagEmitterPtr.Get() != NULL)
                ThrowMsg(PlatformException, "It has already set Tag Listener");
 
@@ -58,7 +58,7 @@ int NFCAdapter::setTagListener(const EventNFCChangedEmitterPtr& emitter, const T
 }
 
 int NFCAdapter::setPeerListener(const EventNFCChangedEmitterPtr& emitter) {
-       LogDebug(" NFCAdapter::setPeerListener Entered");
+       LoggerD(" NFCAdapter::setPeerListener Entered");
 
        if (m_NFCTargetEmitterPtr.Get() != NULL)
                ThrowMsg(PlatformException, "It has already set Peer Listener");
@@ -67,14 +67,14 @@ int NFCAdapter::setPeerListener(const EventNFCChangedEmitterPtr& emitter) {
        return NFCDefaultAdapterSingleton::Instance().setPeerListener(this);
 }
 void NFCAdapter::unsetTagListener() {
-       LogDebug(" NFCAdapter::unsetTagListener Entered");
+       LoggerD(" NFCAdapter::unsetTagListener Entered");
        m_NFCTagEmitterPtr.Reset();
        m_tagFilter.Reset();
        NFCDefaultAdapterSingleton::Instance().unsetTagListener(this);
 }
 
 void NFCAdapter::unsetPeerListener() {
-       LogDebug(" NFCAdapter::unsetPeerListener Entered");
+       LoggerD(" NFCAdapter::unsetPeerListener Entered");
        m_NFCTargetEmitterPtr.Reset();
        NFCDefaultAdapterSingleton::Instance().unsetPeerListener(this);
 }
@@ -86,7 +86,7 @@ void NFCAdapter::NFCTagHasDetected(void *props)
                        nfc_tag_type_e tagType;
 
                        if (nfc_tag_get_type((nfc_tag_h)props, &tagType) == NFC_ERROR_NONE) {
-                               LogDebug("NFCAdapter::NFCTagHasDetected Tag real type : " << tagType);
+                               LoggerD("NFCAdapter::NFCTagHasDetected Tag real type : " << tagType);
                                int cnt;
                                for (cnt = 0; cnt < m_tagFilter->getFilterSize(); cnt++) {
                                        NFCUtil util;
@@ -94,11 +94,11 @@ void NFCAdapter::NFCTagHasDetected(void *props)
                                                break;
                                }
                                if (cnt == m_tagFilter->getFilterSize()) {
-                                       LogDebug("Filter doesn't have this tag type ");
+                                       LoggerD("Filter doesn't have this tag type ");
                                        return;
                                }
                        } else {
-                               LogDebug("It can't get real nfc tag type");
+                               LoggerD("It can't get real nfc tag type");
                                int cnt;
                                for (cnt = 0; cnt < m_tagFilter->getFilterSize(); cnt++) {
                                        if (NFC_TAGTYPE_GENERIC_PICC == m_tagFilter->getFilterValue(cnt))
@@ -106,7 +106,7 @@ void NFCAdapter::NFCTagHasDetected(void *props)
                                }
 
                                if (cnt == m_tagFilter->getFilterSize()) {
-                                       LogDebug("Filter doesn't have this tag type ");
+                                       LoggerD("Filter doesn't have this tag type ");
                                        return;
                                }
 
@@ -120,7 +120,7 @@ void NFCAdapter::NFCTagHasDetected(void *props)
 
                event->setNFCProperties(props);
                event->setNFCType(NFC_TAG_TYPE);
-               LogDebug("emit event with nfc tag info");
+               LoggerD("emit event with nfc tag info");
                m_NFCTagEmitterPtr->emit(event);
        }
 }
@@ -135,7 +135,7 @@ void NFCAdapter::NFCTargetHasDetected(void *props)
                        event->setNFCStatus(NFC_ATTATCHED);
                event->setNFCProperties(props);
                event->setNFCType(NFC_TARGET_TYPE);
-               LogDebug("emit event with nfc target info");
+               LoggerD("emit event with nfc target info");
                m_NFCTargetEmitterPtr->emit(event);
        }
 }
@@ -149,7 +149,7 @@ bool NFCAdapter::getPowerState() {
 }
 
 void NFCAdapter::setPowered(const EventNFCChangedSetPoweredPtr& event) {
-       LogDebug("Enter");
+       LoggerD("Enter");
        EventRequestReceiver<EventNFCChangedSetPowered>::PostRequest(event);
 }
 
@@ -171,13 +171,13 @@ void NFCAdapter::OnRequestReceived(const EventNFCChangedSetPoweredPtr& event) {
                NFCDefaultAdapterSingleton::Instance().setPowered(event->getState(), this);
                return;
        } Catch(PlatformException) {
-               LogError("Exception: " << _rethrown_exception.GetMessage());
+               LoggerE("Exception: " << _rethrown_exception.GetMessage());
                event->setResult(false);
                event->setError(DeviceAPI::Common::JSTizenException::SERVICE_NOT_AVAILABLE);
                event->setErrorMessage("Progressing Identical Operation");
                EventRequestReceiver<EventNFCChangedSetPowered>::ManualAnswer(event);
        } Catch(WrtDeviceApis::Commons::Exception) {
-               LogError("Exception: " << _rethrown_exception.GetMessage());
+               LoggerE("Exception: " << _rethrown_exception.GetMessage());
                setPoweredManualAnswer(NFC_ERROR_OPERATION_FAILED);
        }
 }