[Release] wrt-plugins-common_0.3.104

[framework/web/wrt-plugins-common.git] / src / CommonsJavaScript / JSCallbackManager.cpp

diff --git a/src/CommonsJavaScript/JSCallbackManager.cpp b/src/CommonsJavaScript/JSCallbackManager.cpp
index 46a28f2..56373e3 100644 (file)
--- a/src/CommonsJavaScript/JSCallbackManager.cpp
+++ b/src/CommonsJavaScript/JSCallbackManager.cpp
@@ -20,7 +20,7 @@
  */
 
 #include "JSCallbackManager.h"
-#include <dpl/log/log.h>
+#include <dpl/log/secure_log.h>
 
 namespace WrtDeviceApis {
 namespace CommonsJavaScript {
@@ -32,12 +32,9 @@ JSCallbackManagerPtr JSCallbackManager::createObject(
     acceptJSNullAsOnSuccess,
     bool acceptJSNullAsOnError)
 {
-    LogDebug("entered");
     JSObjectRef l_onSuccess = NULL;
     JSObjectRef l_onError = NULL;
 
-    LogDebug("onSuccessCallback ptr=" << onSuccess);
-    LogDebug("onErrorCallback   ptr=" << onError);
     if (NULL != onSuccess &&
         (!acceptJSNullAsOnSuccess || !JSValueIsNull(context, onSuccess)))
     {
@@ -49,7 +46,7 @@ JSCallbackManagerPtr JSCallbackManager::createObject(
                      "success callback is not a function");
         }
     } else {
-        LogWarning("onSuccessCallback is NULL and is not registred");
+        //LogWarning("onSuccessCallback is NULL and is not registred");
     }
     if (NULL != onError &&
         (!acceptJSNullAsOnError || !JSValueIsNull(context, onError)))
@@ -62,7 +59,7 @@ JSCallbackManagerPtr JSCallbackManager::createObject(
                      "error callback is not a function");
         }
     } else {
-        LogWarning("onErrorCallback is NULL and is not registred");
+        //LogWarning("onErrorCallback is NULL and is not registred");
     }
     return JSCallbackManagerPtr(new JSCallbackManager(context, l_onSuccess,
                                                       l_onError));
@@ -76,16 +73,12 @@ JSCallbackManager::JSCallbackManager(JSContextRef context,
     m_context(context),
     m_object(NULL)
 {
-    LogDebug("entered");
-
     setOnSuccess(onSuccess);
     setOnError(onError);
 }
 
 JSCallbackManager::~JSCallbackManager()
 {
-    LogDebug("entered");
-
     if (m_onSuccess) {
         JSValueUnprotect(m_context, m_onSuccess);
     }
@@ -101,7 +94,6 @@ JSCallbackManager::~JSCallbackManager()
 
 void JSCallbackManager::setOnSuccess(JSValueRef onSuccess)
 {
-    LogDebug("entered");
     if (m_onSuccess != NULL) {
         JSValueUnprotect(m_context, m_onSuccess);
     }
@@ -119,13 +111,11 @@ void JSCallbackManager::setOnSuccess(JSValueRef onSuccess)
 
 JSValueRef JSCallbackManager::getOnSuccess() const
 {
-    LogDebug("entered");
     return m_onSuccess;
 }
 
 void JSCallbackManager::setOnError(JSValueRef onError)
 {
-    LogDebug("entered");
     if (m_onError != NULL) {
         JSValueUnprotect(m_context, m_onError);
     }
@@ -143,13 +133,11 @@ void JSCallbackManager::setOnError(JSValueRef onError)
 
 JSValueRef JSCallbackManager::getOnError() const
 {
-    LogDebug("entered");
     return m_onError;
 }
 
 void JSCallbackManager::setObject(JSObjectRef object)
 {
-    LogDebug("entered");
     if (m_object != NULL) {
         JSValueUnprotect(m_context, m_object);
     }
@@ -163,21 +151,18 @@ void JSCallbackManager::setObject(JSObjectRef object)
 
 JSObjectRef JSCallbackManager::getObject() const
 {
-    LogDebug("entered");
     return m_object;
 }
 
 void JSCallbackManager::setContext(JSContextRef context)
 {
-    LogDebug("entered");
     m_context = context;
 }
 
 void JSCallbackManager::callOnSuccess()
 {
-    LogDebug("entered");
     if (m_onSuccess == NULL) {
-        LogDebug("Success callback is not set");
+        //LogDebug("Success callback is not set");
         return;
     }
     makeCallback(m_context, NULL, m_onSuccess, NULL, 0);
@@ -185,9 +170,8 @@ void JSCallbackManager::callOnSuccess()
 
 void JSCallbackManager::callOnSuccess(JSValueRef obj)
 {
-    LogDebug("entered");
     if (m_onSuccess == NULL) {
-        LogDebug("Success callback is not set");
+        //LogDebug("Success callback is not set");
         return;
     }
     JSValueRef objParam[1] = { obj };
@@ -197,9 +181,8 @@ void JSCallbackManager::callOnSuccess(JSValueRef obj)
 void JSCallbackManager::callOnSuccess(JSValueRef obj[],
                                       int paramCount)
 {
-    LogDebug("entered");
     if (m_onSuccess == NULL) {
-        LogDebug("Success callback is not set");
+        //LogDebug("Success callback is not set");
         return;
     }
     makeCallback(m_context, NULL, m_onSuccess, obj, paramCount);
@@ -207,9 +190,8 @@ void JSCallbackManager::callOnSuccess(JSValueRef obj[],
 
 void JSCallbackManager::callOnError()
 {
-    LogDebug("entered");
     if (m_onError == NULL) {
-        LogDebug("Error callback is not set");
+        //LogDebug("Error callback is not set");
         return;
     }
     makeCallback(m_context, NULL, m_onError, NULL, 0);
@@ -217,9 +199,8 @@ void JSCallbackManager::callOnError()
 
 void JSCallbackManager::callOnError(JSValueRef obj)
 {
-    LogDebug("entered");
     if (m_onError == NULL) {
-        LogDebug("Error callback is not set");
+        //LogDebug("Error callback is not set");
         return;
     }
     JSValueRef objParam[1] = { obj };
@@ -229,9 +210,8 @@ void JSCallbackManager::callOnError(JSValueRef obj)
 void JSCallbackManager::callOnError(JSValueRef obj[],
                                     int paramCount)
 {
-    LogDebug("entered");
     if (m_onError == NULL) {
-        LogDebug("Error callback is not set");
+        //LogDebug("Error callback is not set");
         return;
     }
     makeCallback(m_context, NULL, m_onError, obj, paramCount);
@@ -243,19 +223,15 @@ void JSCallbackManager::makeCallback(JSContextRef context,
                                      JSValueRef argv[],
                                      unsigned argc)
 {
-    LogDebug("entered");
-
     if (callback == NULL) {
-        LogError("callback is NULL");
+        //LogError("callback is NULL");
         return;
     }
 
     if (JSObjectIsFunction(context, callback)) {
         if (argc == 0) {
-            LogDebug("Calling object directly, no arguments");
             JSObjectCallAsFunction(context, callback, object, 0, NULL, NULL);
         } else {
-            LogDebug("Calling object directly, one argument");
             JSObjectCallAsFunction(context, callback, object, argc, argv, NULL);
         }
         return;