wrt-plugins-tizen_0.4.23

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

diff --git a/src/NFC/NFCConverter.cpp b/src/NFC/NFCConverter.cpp
old mode 100755 (executable)
new mode 100644 (file)
index 7994cb1..c8723dc
--- a/src/NFC/NFCConverter.cpp
+++ b/src/NFC/NFCConverter.cpp
@@ -15,9 +15,6 @@
 // limitations under the License.
 //
 
-
-
-#include <dpl/log/log.h>
 #include <CommonsJavaScript/Validator.h>
 #include <CommonsJavaScript/ScopedJSStringRef.h>
 #include <CommonsJavaScript/JSUtils.h>
@@ -28,6 +25,7 @@
 #include "JSNdefRecordURI.h"
 #include "JSNdefRecordMedia.h"
 #include "JSNdefMessage.h"
+#include <Logger.h>
 
 using namespace std;
 using namespace WrtDeviceApis::CommonsJavaScript;
@@ -46,19 +44,19 @@ vector<std::string> NFCConverter::m_allowedTagFilterProperties;
 
 NFCConverter::NFCConverter(JSContextRef context) : Converter(context)
 {
-    LogDebug("entered");
+    LoggerD("entered");
     static bool init = initializeAllowedProperties();
     (void) init;
 }
 
 NFCConverter::~NFCConverter()
 {
-    LogDebug("entered");
+    LoggerD("entered");
 }
 
 TagFilterPtr NFCConverter::toNFCTagFilter(JSValueRef jsValue)
 {
-    LogDebug("entered");
+    LoggerD("entered");
     if (JSValueIsNull(m_context, jsValue) ||
         JSValueIsUndefined(m_context, jsValue)) {
         return TagFilterPtr(); //empty filter
@@ -68,15 +66,15 @@ TagFilterPtr NFCConverter::toNFCTagFilter(JSValueRef jsValue)
     if (!JSValueIsUndefined(m_context, jsValue)) {
        vector<std::string> filter_values(toVectorOfStrings(jsValue));
 
-       LogDebug("NFCConverter, start setting filter values, tag_types.size() : " << filter_values.size());
+       LoggerD("NFCConverter, start setting filter values, tag_types.size() : " << filter_values.size());
          for (unsigned int i=0; i<filter_values.size(); i++) {
                nfcTagType filterValue = toNfcTagType(filter_values.at(i));
 
                filter->addTagTypeValue(filterValue);
-                 LogDebug("NFCConverter,  tag_types.at(i): " << filter_values.at(i));
+                 LoggerD("NFCConverter,  tag_types.at(i): " << filter_values.at(i));
          }
     }
-    LogDebug("NFCConverter,  filter size == " << filter->getFilterSize());
+    LoggerD("NFCConverter,  filter size == " << filter->getFilterSize());
 
     return filter;
 }
@@ -197,7 +195,7 @@ std::string NFCConverter::toNfcTextEncodeUTFString(nfcTextEncodeUTF encode) {
 
 nfcTNF NFCConverter::toNfcTNF(const JSValueRef& arg) {
        long value = toLong(arg);
-       LogDebug("toNfcTNF,  value == " << value);
+       LoggerD("toNfcTNF,  value == " << value);
 
        if ((value < NFC_TNF_EMPTY) || (value > NFC_TNF_UNCHANGED)) {
                ThrowMsg(InvalidArgumentException, "It is not a correct tnf value");
@@ -208,7 +206,7 @@ nfcTNF NFCConverter::toNfcTNF(const JSValueRef& arg) {
 
 bool NFCConverter::initializeAllowedProperties()
 {
-    LogDebug("entered");
+    LoggerD("entered");
     //NFC Filter properties
     m_allowedTagFilterProperties.push_back(NFC_FILTER_ATTRIBUTE_TAG_TYPES);
      return true;
@@ -274,9 +272,9 @@ JSValueRef NFCConverter::toJSNdefRecordArray(INdefMessagePtr ndefMessage) {
 }
 
 bool NFCConverter::isNdefRecord(const JSValueRef& arg) {
-       LogDebug("Entered");
+       LoggerD("Entered");
        if (JSValueIsNull(m_context, arg) || JSValueIsUndefined(m_context, arg)) {
-               LogDebug("Object is Null or Undefied");
+               LoggerD("Object is Null or Undefied");
                return false;
        }
        if (JSValueIsObjectOfClass(m_context, arg, JSNdefRecord::getClassRef())
@@ -301,7 +299,7 @@ std::vector<void *> NFCConverter::toVectorOfRecordHandles(const JSValueRef& arg)
        JSObjectRef obj = toJSObjectRef(arg);
        
        if (!obj) {
-               LogError("Object is null");
+               LoggerE("Object is null");
                ThrowMsg(Commons::ConversionException, "Object is null");
        }
 
@@ -336,7 +334,7 @@ std::string NFCConverter::toRecordClassName(NdefRecordData arg) {
 }
 
 void *NFCConverter::getRecordHandle(const JSValueRef& arg) {
-       LogDebug("Entered");
+       LoggerD("Entered");
        if (!isNdefRecord(arg)) {
                ThrowMsg(Commons::ConversionException,
                         "Message is JS null or JS undefined.");
@@ -344,12 +342,12 @@ void *NFCConverter::getRecordHandle(const JSValueRef& arg) {
        JSObjectRef obj = toJSObjectRef(arg);
        
        if (!obj) {
-               LogError("Object is null");
+               LoggerE("Object is null");
                ThrowMsg(Commons::ConversionException, "Object is null");
        }
        NdefRecordPrivObject* privateObject = static_cast<NdefRecordPrivObject*>(JSObjectGetPrivate(obj));
        if (!privateObject) {
-               LogError("Private object is not set.");
+               LoggerE("Private object is not set.");
                ThrowMsg(Commons::ConversionException, "Private object not set");
        }
 
@@ -367,7 +365,7 @@ void *NFCConverter::copiedMessage(const JSValueRef& arg) {
        JSObjectRef obj = toJSObjectRef(arg);
        
        if (!obj) {
-               LogError("Object is null");
+               LoggerE("Object is null");
                ThrowMsg(Commons::ConversionException, "Object is null");
        }
        return copiedMessage(obj);
@@ -376,7 +374,7 @@ void *NFCConverter::copiedMessage(const JSValueRef& arg) {
 void *NFCConverter::copiedMessage(const JSObjectRef& obj) {
        NdefMessagePrivObject* privateObject = static_cast<NdefMessagePrivObject*>(JSObjectGetPrivate(obj));
        if (!privateObject) {
-               LogError("Private object is not set.");
+               LoggerE("Private object is not set.");
                ThrowMsg(Commons::ConversionException, "Private object is not set");
        }
 
@@ -386,7 +384,7 @@ void *NFCConverter::copiedMessage(const JSObjectRef& obj) {
 }
 
 NFCChangedCallback NFCConverter::toNFCChangedCallback(const JSValueRef& arg) {
-       LogDebug("Entered");
+       LoggerD("Entered");
     JSObjectRef object = toJSObjectRef(arg);
 
     NFCChangedCallback result;