Update change log and spec for wrt-plugins-tizen_0.4.44

[platform/framework/web/wrt-plugins-tizen.git] / src / Application / ApplicationConverter.cpp

diff --git a/src/Application/ApplicationConverter.cpp b/src/Application/ApplicationConverter.cpp
old mode 100755 (executable)
new mode 100644 (file)
index b17a301..02318b1
--- a/src/Application/ApplicationConverter.cpp
+++ b/src/Application/ApplicationConverter.cpp
@@ -15,13 +15,12 @@
 // limitations under the License.
 //
 
-
-#include <dpl/log/log.h>
 #include <CommonsJavaScript/JSUtils.h>
 #include <CommonsJavaScript/Validator.h>
 #include <CommonsJavaScript/ScopedJSStringRef.h>
 #include <Commons/RegexUtils.h>
 #include <Commons/Exception.h>
+#include <JSWebAPIErrorFactory.h>
 
 #include "ApplicationConverter.h"
 #include "JSApplication.h"
@@ -31,11 +30,13 @@
 #include "JSApplicationControlData.h"
 #include "JSApplicationControl.h"
 #include "JSRequestedApplicationControl.h"
+#include "JSApplicationMetaData.h"
 #include "JSApplicationCert.h"
 
 namespace DeviceAPI {
 namespace Application {
 
+using namespace DeviceAPI::Common;
 using namespace WrtDeviceApis;
 using namespace WrtDeviceApis::CommonsJavaScript;
 
@@ -50,7 +51,6 @@ ApplicationConverter::~ApplicationConverter()
 
 JSValueRef ApplicationConverter::toJSValueRefFromApplication(const ApplicationPtr &arg)
 {
-       LogDebug("entered to toJSValueRefFromApplication ");
        if(arg == NULL) {
                Throw(Commons::ConversionException);
        }
@@ -60,7 +60,6 @@ JSValueRef ApplicationConverter::toJSValueRefFromApplication(const ApplicationPt
 
 JSValueRef ApplicationConverter::toJSValueRefFromApplicationCert(const ApplicationCertPtr &arg)
 {
-       LogDebug("entered to toJSValueRefFromApplicationCert ");
        if(arg == NULL) {
                Throw(Commons::ConversionException);
        }
@@ -68,7 +67,7 @@ JSValueRef ApplicationConverter::toJSValueRefFromApplicationCert(const Applicati
 }
 
 
-JSValueRef ApplicationConverter::toJSValueRefFromeApplicationCerts(const ApplicationCertArrayPtr &arg)
+JSValueRef ApplicationConverter::toJSValueRefFromApplicationCerts(const ApplicationCertArrayPtr &arg)
 {
        if(arg == NULL) {
                Throw(Commons::InvalidArgumentException);
@@ -77,6 +76,24 @@ JSValueRef ApplicationConverter::toJSValueRefFromeApplicationCerts(const Applica
 }
 
 
+JSValueRef ApplicationConverter::toJSValueRefFromApplicationMetaData(const ApplicationMetaDataPtr &arg)
+{
+       if(arg == NULL) {
+               Throw(Commons::ConversionException);
+       }
+       return CommonsJavaScript::JSUtils::makeObject(m_context, JSApplicationMetaData::getClassRef(), arg);
+}
+
+
+JSValueRef ApplicationConverter::toJSValueRefFromApplicationMetaDataArray(const ApplicationMetaDataArrayPtr &arg)
+{
+       if(arg == NULL) {
+               Throw(Commons::InvalidArgumentException);
+       }
+       return toJSValueRef_(*arg, &ApplicationConverter::toJSValueRefFromApplicationMetaData, this);
+}
+
+
 JSValueRef ApplicationConverter::toJSValueRefFromApplicationInformation(const ApplicationInformationPtr &arg)
 {
        if(arg == NULL) {
@@ -250,7 +267,6 @@ ApplicationContextArrayPtr ApplicationConverter::toApplicationContextArray(const
 
 JSValueRef ApplicationConverter::toJSValueRef(const RequestedApplicationControlPtr &arg)
 {
-       LogDebug("entered to toJSValueRefFromRequestedApplicationControl" );
        if(arg == NULL) {
                Throw(Commons::InvalidArgumentException);
        }
@@ -269,7 +285,6 @@ RequestedApplicationControlPtr ApplicationConverter::toRequestedApplicationContr
 
 JSValueRef ApplicationConverter::toJSValueRef(const ApplicationControlPtr &arg)
 {
-       LogDebug("entered");
        if(arg == NULL) {
                Throw(Commons::InvalidArgumentException);
        }
@@ -281,13 +296,12 @@ ApplicationControlPtr ApplicationConverter::toApplicationControl(const JSValueRe
        if(JSApplicationControl::isObjectOfClass(m_context, jsValue)) {
                return JSApplicationControl::getApplicationControl(m_context, jsValue);
        } else {
-           ThrowMsg(Commons::ConversionException, "Wrong parameter type.");
+           throw TypeMismatchException("not a object of class ApplicationControl");
        }
 }
 
 JSValueRef ApplicationConverter::toJSValueRef(const ApplicationControlDataPtr &arg)
 {
-       LogDebug("entered");
        return CommonsJavaScript::JSUtils::makeObject(m_context, JSApplicationControlData::getClassRef(), arg);
 }