Update change log and spec for wrt-plugins-tizen_0.4.29
authorDongjin Choi <milkelf.choi@samsung.com>
Fri, 10 May 2013 03:04:03 +0000 (12:04 +0900)
committerDongjin Choi <milkelf.choi@samsung.com>
Fri, 10 May 2013 03:43:38 +0000 (12:43 +0900)
[model] REDWOOD
[binary_type] PDA
[customer] OPEN

[Issue#] N/A
[Problem] N/A
[Cause] By the operator request, check distributor 1/2 cert
[Solution] N/A

[Issue#] N/A
[Problem] There are the unused variables.
[Solution] Removed the unused variabes.

[Issue] N/A
[Problem] findConversations sortMode bug fix
[Cause] findConversations sortMode bug fix
[Solution] findConversations sortMode bug fix

[Issue#] N/A
[Problem] Source codes are too messy
[Cause] Regecy codes
[Solution] Refactored error object codes

[Issue#] N/A
[Solution] Apply build configuration for optional Web APIs

[Issue#] N/A
[Problem] LoggerX doesn't support format
[Cause] N/A
[Solution] Use DLOG directly

[Issue#] TCT fail.
[Problem] stream position calculation bug.
[Cause] N/A
[Solution] modification.

[Issue] N/A
[Problem] findMessage Bug fix for plainBody and subject
[Cause] findMessage Bug fix for plainBody and subject
[Solution] findMessage Bug fix for plainBody and subject

[Issue] CID-51390, CID-46888, CID-51259
[Problem] Variable "service" going out of scope leaks
[Cause] don't free service memory after clone.
[Solution] don't call server clone.

[Issue] N_SE-36550
[Problem] can not get title for other type
[Cause] Core API does not support to get the title for other type
[Solution] Added new api for this feature

[Issue] N/A
[Problem] sortMode is not work for findConversation on email service
[Cause] sortMode is not work for findConversation on email service
[Solution] sortMode is not work for findConversation on email service

[Issue#] N/A
[Problem] Wrong DS default interval value set.
[Cause] Platform interval value setting bug.
[Solution] Platform bug fixed.

[Issue#] N/A
[Problem] Calendar async listener manager unneeded.
[Cause] Introduction of global context manager.
[Solution] Use global context manager instead of async listener manager.

[Issue] N/A
[Problem] Fix Message for instanceof check
[Cause] Fix Message for instanceof check
[Solution] Fix Message for instanceof check

[Issue#] N/A
[Problem] Progress Type & Progress Value can be confusing to user.
[Cause] Native API don't support about a progress Type of posted notification.
[Solution] To save the Progress Value in the unused notification data column.

[Issue#] N/A
[Problem] raise a error that is not mentioned in specification.
[Cause] N/A
[Solution] modification.

[Issue#] N/A
[Problem] Build break
[Cause] Error object's interface changed
[Solution] Changed interface

[Issue#] JIRA DCM-1499
[Problem] Performance issue
[Cause] N/A
[Solution] Modification

[team] WebAPI
[request] N/A
[horizontal_expansion] N/A

211 files changed:
CMakeLists.txt
packaging/wrt-plugins-tizen.spec
src/Alarm/JSAlarmAbsolute.cpp
src/Alarm/JSAlarmManager.cpp
src/Alarm/JSAlarmRelative.cpp
src/Application/ApplicationController.cpp
src/Application/ApplicationConverter.cpp
src/Application/JSApplication.cpp
src/Application/JSApplicationCert.cpp
src/Application/JSApplicationContext.cpp
src/Application/JSApplicationControl.cpp
src/Application/JSApplicationControlData.cpp
src/Application/JSApplicationInformation.cpp
src/Application/JSApplicationManager.cpp
src/Application/JSRequestedApplicationControl.cpp
src/Bluetooth/BluetoothAdapter.cpp
src/Bluetooth/BluetoothCallbackUtil.cpp
src/Bluetooth/CMakeLists.txt
src/Bluetooth/JSBluetoothAdapter.cpp
src/Bluetooth/JSBluetoothClass.cpp
src/Bluetooth/JSBluetoothDevice.cpp
src/Bluetooth/JSBluetoothManager.cpp
src/Bluetooth/JSBluetoothServiceHandler.cpp
src/Bluetooth/JSBluetoothSocket.cpp
src/Bookmark/BookmarkManager.cpp
src/Bookmark/JSBookmarkFolder.cpp
src/Bookmark/JSBookmarkItem.cpp
src/Bookmark/JSBookmarkManager.cpp
src/Calendar/CMakeLists.txt
src/Calendar/CalendarAsyncCallbackManager.cpp [deleted file]
src/Calendar/CalendarResponseDispatcher.cpp [changed mode: 0644->0755]
src/Calendar/JSCalendar.cpp [changed mode: 0644->0755]
src/Calendar/JSCalendarAlarm.cpp
src/Calendar/JSCalendarAttendee.cpp
src/Calendar/JSCalendarEvent.cpp
src/Calendar/JSCalendarEventId.cpp
src/Calendar/JSCalendarItemProperties.cpp
src/Calendar/JSCalendarManager.cpp
src/Calendar/JSCalendarRecurrenceRule.cpp
src/Calendar/JSCalendarTask.cpp
src/Calendar/plugin_initializer.cpp
src/Callhistory/CMakeLists.txt
src/Callhistory/JSCallHistory.cpp
src/Callhistory/JSCallHistory.h
src/Callhistory/JSCallHistoryEntry.cpp
src/Callhistory/JSRemoteParty.cpp
src/Callhistory/ResponseDispatcher.cpp
src/Common/CMakeLists.txt
src/Common/JSStringRefWrapper.cpp [new file with mode: 0644]
src/Common/JSStringRefWrapper.h [moved from src/Calendar/CalendarAsyncCallbackManager.h with 57% similarity, mode: 0644]
src/Common/JSTizenException.cpp [deleted file]
src/Common/JSTizenException.h [deleted file]
src/Common/JSTizenExceptionFactory.cpp [deleted file]
src/Common/JSTizenExceptionFactory.h [deleted file]
src/Common/JSWebAPIError.cpp
src/Common/JSWebAPIError.h
src/Common/JSWebAPIError2.cpp [deleted file]
src/Common/JSWebAPIError2.h [deleted file]
src/Common/JSWebAPIErrorFactory.cpp
src/Common/JSWebAPIErrorFactory.h
src/Common/JSWebAPIException.cpp
src/Common/JSWebAPIException.h
src/Common/PlatformException.cpp
src/Common/PlatformException.h
src/Common/SecurityExceptions.h
src/Common/TizenExceptionData.cpp [deleted file]
src/Common/TizenExceptionData.h [deleted file]
src/Common/WebAPIError.h
src/Contact/AddressBookController.cpp
src/Contact/ContactConverter.h
src/Contact/ContactManagerController.cpp
src/Contact/JSAddressBook.cpp
src/Contact/JSContact.cpp
src/Contact/JSContactAddress.cpp
src/Contact/JSContactAnniversary.cpp
src/Contact/JSContactEmailAddress.cpp
src/Contact/JSContactGroup.cpp
src/Contact/JSContactManager.cpp
src/Contact/JSContactName.cpp
src/Contact/JSContactOrganization.cpp
src/Contact/JSContactPhoneNumber.cpp
src/Contact/JSContactRef.cpp
src/Contact/JSContactWebSite.cpp
src/Contact/JSPerson.cpp
src/Content/ContentController.cpp
src/Content/ContentListener.cpp
src/Content/ContentManager.cpp
src/Content/JSAudio.cpp
src/Content/JSContent.cpp
src/Content/JSContentManager.cpp
src/Content/JSImage.cpp
src/Content/JSVideo.cpp
src/DataControl/DataControlListener.cpp
src/DataControl/JSDataControlManager.cpp
src/DataControl/JSMappedDataControlConsumer.cpp
src/DataControl/JSSQLDataControlConsumer.cpp
src/DataControl/JSSelectObjectArrayValues.cpp
src/DataSync/DataSyncManager.cpp
src/DataSync/DataSyncResponseDispatcher.cpp
src/DataSync/JSDataSyncManager.cpp
src/DataSync/JSSyncInfo.cpp
src/DataSync/JSSyncProfileInfo.cpp
src/DataSync/JSSyncServiceInfo.cpp
src/DataSync/JSSyncStatistics.cpp
src/Download/DownloadCallback.cpp
src/Download/JSDownloadManager.cpp
src/Download/JSDownloadRequest.cpp
src/Filesystem/JSFile.cpp
src/Filesystem/JSFilestream.cpp
src/Filesystem/JSFilesystemManager.cpp
src/Filesystem/PathUtils.cpp
src/Filesystem/ResponseDispatcher.cpp
src/Filesystem/Stream.cpp
src/MessagePort/JSLocalMessagePort.cpp
src/MessagePort/JSMessagePortManager.cpp
src/MessagePort/JSRemoteMessagePort.cpp
src/MessagePort/RemoteMessagePort.cpp
src/MessagePort/config.xml
src/Messaging/Attachment.cpp
src/Messaging/CMakeLists.txt
src/Messaging/ConverterMessage.cpp
src/Messaging/Email.cpp
src/Messaging/JSConversation.cpp
src/Messaging/JSMessage.cpp
src/Messaging/JSMessage.h
src/Messaging/JSMessageAttachment.cpp
src/Messaging/JSMessageBody.cpp
src/Messaging/JSMessageFolder.cpp
src/Messaging/JSMessagingService.cpp
src/Messaging/JSMessagingServiceManager.cpp
src/Messaging/JSMessagingStorage.cpp
src/Messaging/MailSync.cpp
src/Messaging/MessageAsyncCallbackManager.cpp
src/Messaging/MessageAsyncCallbackManager.h
src/Messaging/MessageListenerManager.cpp
src/Messaging/MessageListenerManager.h
src/Messaging/MessageQueryGenerator.cpp
src/Messaging/MessageQueryGenerator.h
src/Messaging/Messaging.cpp
src/Messaging/MessagingController.cpp
src/Messaging/MessagingListener.cpp
src/Messaging/Mms.cpp
src/Messaging/Sms.cpp
src/Messaging/plugin_config.cpp
src/NFC/CMakeLists.txt
src/NFC/JSNFCAdapter.cpp
src/NFC/JSNFCManager.cpp
src/NFC/JSNFCTag.cpp
src/NFC/JSNFCTarget.cpp
src/NFC/JSNdefMessage.cpp
src/NFC/JSNdefRecord.cpp
src/NFC/JSNdefRecordMedia.cpp
src/NFC/JSNdefRecordText.cpp
src/NFC/JSNdefRecordURI.cpp
src/NFC/NFCAdapter.cpp
src/NFC/NFCDefaultAdapter.cpp
src/NFC/NFCStaticController.cpp
src/NFC/NFCTag.cpp
src/NFC/NFCUtil.cpp
src/NFC/ResponseDispatcher.cpp
src/NetworkBearerSelection/CMakeLists.txt
src/NetworkBearerSelection/JSNetworkBearerSelection.cpp
src/NetworkBearerSelection/JSNetworkBearerSelectionCallbackManager.cpp [changed mode: 0755->0644]
src/NetworkBearerSelection/NetworkBearerSelection.cpp [changed mode: 0755->0644]
src/NetworkBearerSelection/NetworkBearerSelection.h
src/NetworkBearerSelection/NetworkBearerSelectionResponseDispatcher.cpp [changed mode: 0755->0644]
src/NetworkBearerSelection/OnNetworkBearerSelectionStateChanged.h
src/NetworkBearerSelection/plugin_config.cpp
src/NetworkBearerSelection/plugin_initializer.cpp [changed mode: 0755->0644]
src/Notification/JSNotificationDetailInfo.cpp [changed mode: 0644->0755]
src/Notification/JSNotificationManager.cpp
src/Notification/JSStatusNotification.cpp
src/Notification/StatusNotification.cpp
src/Notification/StatusNotification.h [changed mode: 0644->0755]
src/Package/JSPackageInformation.cpp
src/Package/JSPackageManager.cpp
src/Package/PackageManager.cpp
src/Power/JSPowerManager.cpp
src/Push/CMakeLists.txt
src/Push/JSPushManager.cpp
src/Push/JSPushMessage.cpp
src/Push/PushManager.cpp
src/Push/plugin_initializer.cpp
src/SecureElement/CMakeLists.txt
src/SecureElement/JSSEChannel.cpp
src/SecureElement/JSSEReader.cpp
src/SecureElement/JSSEService.cpp
src/SecureElement/JSSESession.cpp
src/SecureElement/SEChannel.cpp
src/SecureElement/SEConverter.cpp
src/SecureElement/SEReader.cpp
src/SecureElement/SEResponseDispatcher.cpp
src/SecureElement/SESession.cpp
src/SecureElement/SEUtil.cpp
src/SecureStorage/JSSecureStorageManager.cpp
src/SystemSetting/JSSystemSetting.cpp
src/SystemSetting/SystemSettingResponseDispatcher.cpp
src/Systeminfo/JSCellularNetworkInfo.cpp [changed mode: 0644->0755]
src/Systeminfo/JSDeviceCapabilitiesInfo.cpp
src/Systeminfo/JSSIMInfo.cpp
src/Systeminfo/JSSysteminfo.cpp
src/Systeminfo/Systeminfo.cpp
src/TimeUtil/JSTZDate.cpp
src/TimeUtil/JSTimeDuration.cpp
src/TimeUtil/JSTimeUtil.cpp
src/Tizen/JSAttributeFilter.cpp
src/Tizen/JSAttributeRangeFilter.cpp
src/Tizen/JSCompositeFilter.cpp
src/Tizen/JSSimpleCoordinates.cpp
src/Tizen/JSSortMode.cpp
src/Tizen/JSTizen.cpp

index f1c0390..38b193c 100755 (executable)
@@ -57,6 +57,41 @@ ENDIF("${CMAKE_BUILD_TYPE}" STREQUAL "")
 
 MESSAGE("Build type: ${CMAKE_BUILD_TYPE}")
 
+
+# -----------------------------------------------------------------------------
+# Determine the feature configuration for optional API
+# -----------------------------------------------------------------------------
+
+IF(ENABLE_OPTIONAL_BT)
+    MESSAGE(STATUS "Bluetooth API Enabled")
+    ADD_DEFINITIONS( -DFEATURE_OPTIONAL_BT )
+ENDIF(ENABLE_OPTIONAL_BT)
+
+IF(ENABLE_OPTIONAL_CALL_HISTORY)
+    MESSAGE(STATUS "Callhistory API Enabled")
+    ADD_DEFINITIONS( -DFEATURE_OPTIONAL_CALL_HISTORY )
+ENDIF(ENABLE_OPTIONAL_CALL_HISTORY)
+
+IF(ENABLE_OPTIONAL_NBS)
+    MESSAGE(STATUS "Network Bearer Selection API Enabled")
+    ADD_DEFINITIONS( -DFEATURE_OPTIONAL_NBS )
+ENDIF(ENABLE_OPTIONAL_NBS)
+
+IF(ENABLE_OPTIONAL_NFC)
+    MESSAGE(STATUS "NFC API Enabled")
+    ADD_DEFINITIONS( -DFEATURE_OPTIONAL_NFC )
+ENDIF(ENABLE_OPTIONAL_NFC)
+
+IF(ENABLE_OPTIONAL_PUSH)
+    MESSAGE(STATUS "Push API Enabled")
+    ADD_DEFINITIONS( -DFEATURE_OPTIONAL_PUSH )
+ENDIF(ENABLE_OPTIONAL_PUSH)
+
+IF(ENABLE_OPTIONAL_SE)
+    MESSAGE(STATUS "Secure Element API Enabled")
+    ADD_DEFINITIONS( -DFEATURE_OPTIONAL_SE )
+ENDIF(ENABLE_OPTIONAL_SE)
+
 # -----------------------------------------------------------------------------
 # CFlags
 # -----------------------------------------------------------------------------
index 9ec3829..16dd410 100755 (executable)
@@ -1,7 +1,7 @@
 Name:       wrt-plugins-tizen
 Summary:    JavaScript plugins for WebRuntime
-Version:    0.4.28
-Release:    1
+Version:    0.4.29
+Release:    0
 Group:      Development/Libraries
 License:    Apache License, Version 2.0
 Source0:    %{name}-%{version}.tar.gz
@@ -88,7 +88,14 @@ Wrt-plugin-tizen development headers
 
 export LDFLAGS+="-Wl,--rpath=%{PREFIX} -Wl,--as-needed"
 
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DDPL_LOG="ON" -DENABLE_TIME_TRACER="OFF"
+cmake \
+-DENABLE_OPTIONAL_BT=YES \
+-DENABLE_OPTIONAL_CALL_HISTORY=YES \
+-DENABLE_OPTIONAL_NBS=YES \
+-DENABLE_OPTIONAL_NFC=YES \
+-DENABLE_OPTIONAL_PUSH=YES \
+-DENABLE_OPTIONAL_SE=YES \
+. -DCMAKE_INSTALL_PREFIX=%{_prefix} -DDPL_LOG="ON" -DENABLE_TIME_TRACER="OFF"
 
 make %{?jobs:-j%jobs}
 
index 6964b24..fa3cca4 100644 (file)
 #include <CommonsJavaScript/Validator.h>
 #include <CommonsJavaScript/JSDOMExceptionFactory.h>
 
-#include <JSWebAPIException.h>
 #include <ArgumentValidator.h>
 
 #include <Commons/Exception.h>
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 #include <SecurityExceptions.h>
 
 #include "AlarmAbsolute.h"
@@ -161,9 +159,7 @@ JSObjectRef DLL_EXPORT JSAlarmAbsolute::constructor(JSContextRef ctx, JSObjectRe
                return JSValueToObject(ctx, createJSObject(ctx, priv), exception);
 
     } catch (const BasePlatformException& err) {
-               JSObjectRef exceptionObj = JSWebAPIException::makeJSWebAPIException(ctx, err);
-               *exception = exceptionObj;
-               return exceptionObj;
+               return JSWebAPIErrorFactory::postException(ctx, exception, err);
     }
 }
 
@@ -246,10 +242,10 @@ JSValueRef JSAlarmAbsolute::getNextScheduledDate( JSContextRef ctx, JSObjectRef
         return result;
                
        } catch (const BasePlatformException &err) {
-        return JSWebAPIException::throwException(ctx, exception, err);
+        return JSWebAPIErrorFactory::postException(ctx, exception, err);
     } catch (...) {
         DeviceAPI::Common::UnknownException err("Unknown Error in ApplicationManager.getAppSharedURI().");
-        return JSWebAPIException::throwException(ctx, exception, err);
+        return JSWebAPIErrorFactory::postException(ctx, exception, err);
     }
 }
 
index eec7706..6f1fae1 100644 (file)
 #include <CommonsJavaScript/JSUtils.h>
 #include <CommonsJavaScript/JSDOMExceptionFactory.h>
 
-#include <JSWebAPIException.h>
 #include <ArgumentValidator.h>
 #include <JSUtil.h>
 
 #include <SecurityExceptions.h>
 #include <Commons/Exception.h>
 #include <Commons/Regex.h>
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 #include <JSApplicationControl.h>
 #include <ApplicationControl.h>
 #include <ApplicationConverter.h>
@@ -256,10 +254,10 @@ JSValueRef JSAlarmManager::add(JSContextRef ctx, JSObjectRef object, JSObjectRef
                return JSValueMakeUndefined(ctx);
 
        }  catch (const BasePlatformException &err) {
-        return JSWebAPIException::throwException(ctx, exception, err);
+        return JSWebAPIErrorFactory::postException(ctx, exception, err);
     } catch (...) {
         DeviceAPI::Common::UnknownException err("Unknown Error in ApplicationManager.getAppSharedURI().");
-        return JSWebAPIException::throwException(ctx, exception, err);
+        return JSWebAPIErrorFactory::postException(ctx, exception, err);
     }
 }
 
@@ -293,10 +291,10 @@ JSValueRef JSAlarmManager::remove(JSContextRef ctx, JSObjectRef object, JSObject
                TIME_TRACER_ITEM_END(__FUNCTION__, 0);
                return JSValueMakeUndefined(ctx);
        } catch (const BasePlatformException &err) {
-        return JSWebAPIException::throwException(ctx, exception, err);
+        return JSWebAPIErrorFactory::postException(ctx, exception, err);
     } catch (...) {
         DeviceAPI::Common::UnknownException err("Unknown Error in ApplicationManager.getAppSharedURI().");
-        return JSWebAPIException::throwException(ctx, exception, err);
+        return JSWebAPIErrorFactory::postException(ctx, exception, err);
     }
 }
 
@@ -382,10 +380,10 @@ JSValueRef JSAlarmManager::get(JSContextRef ctx, JSObjectRef object, JSObjectRef
                TIME_TRACER_ITEM_END(__FUNCTION__, 0);
                return result;
     } catch (const BasePlatformException &err) {
-        return JSWebAPIException::throwException(ctx, exception, err);
+        return JSWebAPIErrorFactory::postException(ctx, exception, err);
     } catch (...) {
         DeviceAPI::Common::UnknownException err("Unknown Error in ApplicationManager.getAppSharedURI().");
-        return JSWebAPIException::throwException(ctx, exception, err);
+        return JSWebAPIErrorFactory::postException(ctx, exception, err);
     }
 }
 
@@ -465,10 +463,10 @@ JSValueRef JSAlarmManager::getAll(JSContextRef ctx, JSObjectRef object, JSObject
                TIME_TRACER_ITEM_END(__FUNCTION__, 0);
                return jsResult;
     } catch (const BasePlatformException &err) {
-        return JSWebAPIException::throwException(ctx, exception, err);
+        return JSWebAPIErrorFactory::postException(ctx, exception, err);
     } catch (...) {
         DeviceAPI::Common::UnknownException err("Unknown Error in ApplicationManager.getAppSharedURI().");
-        return JSWebAPIException::throwException(ctx, exception, err);
+        return JSWebAPIErrorFactory::postException(ctx, exception, err);
     }
 }
 
index 8c24ae2..d7bfcd4 100644 (file)
 #include <CommonsJavaScript/Validator.h>
 #include <CommonsJavaScript/JSDOMExceptionFactory.h>
 
-#include <JSWebAPIException.h>
 #include <ArgumentValidator.h>
 
 #include <Commons/Exception.h>
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 #include <SecurityExceptions.h>
 
 #include "plugin_config.h"
@@ -133,9 +131,7 @@ JSObjectRef DLL_EXPORT JSAlarmRelative::constructor(JSContextRef ctx, JSObjectRe
                        return JSValueToObject(ctx, createJSObject(ctx, delay, -1), exception);
                }
        } catch (const BasePlatformException& err) {
-               JSObjectRef exceptionObj = JSWebAPIException::makeJSWebAPIException(ctx, err);
-               *exception = exceptionObj;
-               return exceptionObj;
+               return JSWebAPIErrorFactory::postException(ctx, exception, err);
     }
 
 }
@@ -214,10 +210,10 @@ JSValueRef JSAlarmRelative::getRemainingSeconds(JSContextRef ctx, JSObjectRef fu
 
                return DeviceAPI::Common::JSUtil::toJSValueRef(ctx, result);
        } catch (const BasePlatformException &err) {
-        return JSWebAPIException::throwException(ctx, exception, err);
+        return JSWebAPIErrorFactory::postException(ctx, exception, err);
     } catch (...) {
         DeviceAPI::Common::UnknownException err("Unknown Error in ApplicationManager.getAppSharedURI().");
-        return JSWebAPIException::throwException(ctx, exception, err);
+        return JSWebAPIErrorFactory::postException(ctx, exception, err);
     }
 }
 
@@ -242,10 +238,10 @@ JSValueRef JSAlarmRelative::getId(JSContextRef ctx,
             return JSValueMakeNull(ctx);            
         }
     } catch (const BasePlatformException &err) {
-        return JSWebAPIException::throwException(ctx, exception, err);
+        return JSWebAPIErrorFactory::postException(ctx, exception, err);
     } catch (...) {
         DeviceAPI::Common::TypeMismatchException err("TypeMismatchException occured");
-        return JSWebAPIException::throwException(ctx, exception, err);
+        return JSWebAPIErrorFactory::postException(ctx, exception, err);
     }
 }
 
@@ -266,10 +262,10 @@ JSValueRef JSAlarmRelative::getDelay(JSContextRef ctx,
         LoggerI("JSAlarmRelative delay = " << delay);
         return DeviceAPI::Common::JSUtil::toJSValueRef(ctx, delay);
     } catch (const BasePlatformException &err) {
-        return JSWebAPIException::throwException(ctx, exception, err);
+        return JSWebAPIErrorFactory::postException(ctx, exception, err);
     } catch (...) {
         DeviceAPI::Common::TypeMismatchException err("TypeMismatchException occured");
-        return JSWebAPIException::throwException(ctx, exception, err);
+        return JSWebAPIErrorFactory::postException(ctx, exception, err);
     }
 }
 
@@ -294,10 +290,10 @@ JSValueRef JSAlarmRelative::getPeriod(JSContextRef ctx,
                return DeviceAPI::Common::JSUtil::toJSValueRef(ctx, period);
         }
        } catch (const BasePlatformException &err) {
-               return JSWebAPIException::throwException(ctx, exception, err);
+               return JSWebAPIErrorFactory::postException(ctx, exception, err);
        } catch (...) {
                DeviceAPI::Common::TypeMismatchException err("TypeMismatchException occured");
-               return JSWebAPIException::throwException(ctx, exception, err);
+               return JSWebAPIErrorFactory::postException(ctx, exception, err);
        }
 }
 
index d037546..7269852 100644 (file)
@@ -16,8 +16,7 @@
 //
 
 #include <CommonsJavaScript/JSCallbackManager.h>
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 #include <TimeTracer.h>
 #include "ApplicationController.h"
 #include "ApplicationConverter.h"
@@ -125,13 +124,13 @@ void ApplicationAsyncAnswerHandler::launch(const EventApplicationLaunchPtr &even
                {
                case ExceptionCodes::InvalidArgumentException:
                case ExceptionCodes::NotFoundException:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::NOT_FOUND_ERROR, "given app id is not found");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::NOT_FOUND_ERROR, "given app id is not found");
                        break;
                case ExceptionCodes::PlatformException:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::UNKNOWN_ERROR, "platform exception");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::UNKNOWN_ERROR, "platform exception");
                        break;
                default:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::UNKNOWN_ERROR,"unknown error");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::UNKNOWN_ERROR,"unknown error");
                        break;
                }
 
@@ -144,7 +143,7 @@ void ApplicationAsyncAnswerHandler::launch(const EventApplicationLaunchPtr &even
                return;
        } Catch(Exception) {
                LoggerE("error during processing answer" << _rethrown_exception.GetMessage());
-               error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::UNKNOWN_ERROR, "Internal error");
+               error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
 
                callbackManager->callOnError(error);
                return;
@@ -175,16 +174,16 @@ void ApplicationAsyncAnswerHandler::kill(const EventApplicationKillPtr &event)
                switch (event->getExceptionCode())
                {
                case ExceptionCodes::NotFoundException:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::NOT_FOUND_ERROR,"given package is not found");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::NOT_FOUND_ERROR,"given package is not found");
                        break;
                case ExceptionCodes::PlatformException:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::UNKNOWN_ERROR,"platform exception");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::UNKNOWN_ERROR,"platform exception");
                        break;
                case ExceptionCodes::InvalidArgumentException:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::INVALID_VALUES_ERROR, "invalid value");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "invalid value");
                        break;
                default:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::UNKNOWN_ERROR,"unknown error");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::UNKNOWN_ERROR,"unknown error");
                        break;
                }
 
@@ -197,7 +196,7 @@ void ApplicationAsyncAnswerHandler::kill(const EventApplicationKillPtr &event)
                return;
        } Catch(Exception) {
                LoggerE("error during processing answer" << _rethrown_exception.GetMessage());
-               error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::UNKNOWN_ERROR, "Internal error");
+               error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
 
                callbackManager->callOnError(error);
                return;
@@ -228,13 +227,13 @@ void ApplicationAsyncAnswerHandler::launchAppControl(const EventApplicationLaunc
                switch (event->getExceptionCode())
                {
                case ExceptionCodes::NotFoundException:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::NOT_FOUND_ERROR,"given package is not found");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::NOT_FOUND_ERROR,"given package is not found");
                        break;
                case ExceptionCodes::PlatformException:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::UNKNOWN_ERROR,"platform exception");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::UNKNOWN_ERROR,"platform exception");
                        break;
                default:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::UNKNOWN_ERROR,"unknown error");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::UNKNOWN_ERROR,"unknown error");
                        break;
                }
 
@@ -247,7 +246,7 @@ void ApplicationAsyncAnswerHandler::launchAppControl(const EventApplicationLaunc
                return;
        } Catch(Exception) {
                LoggerE("error during processing answer" << _rethrown_exception.GetMessage());
-               error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::UNKNOWN_ERROR, "Internal error");
+               error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
 
                callbackManager->callOnError(error);
                return;
@@ -321,13 +320,13 @@ void ApplicationAsyncAnswerHandler::findAppControl(const EventApplicationFindApp
                switch (event->getExceptionCode())
                {
                case ExceptionCodes::NotFoundException:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::NOT_FOUND_ERROR,"given package is not found");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::NOT_FOUND_ERROR,"given package is not found");
                        break;
                case ExceptionCodes::PlatformException:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::UNKNOWN_ERROR,"platform exception");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::UNKNOWN_ERROR,"platform exception");
                        break;
                default:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::UNKNOWN_ERROR,"unknown error");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::UNKNOWN_ERROR,"unknown error");
                        break;
                }
 
@@ -350,7 +349,7 @@ void ApplicationAsyncAnswerHandler::findAppControl(const EventApplicationFindApp
                return;
        } Catch(Exception) {
                LoggerE("error during processing answer" << _rethrown_exception.GetMessage());
-               error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::UNKNOWN_ERROR, "Internal error");
+               error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
 
                callbackManager->callOnError(error);
                return;
@@ -381,13 +380,13 @@ void ApplicationAsyncAnswerHandler::getAppsContext(const EventApplicationGetApps
                switch (event->getExceptionCode())
                {
                case ExceptionCodes::NotFoundException:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::NOT_FOUND_ERROR,"given package is not found");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::NOT_FOUND_ERROR,"given package is not found");
                        break;
                case ExceptionCodes::PlatformException:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::UNKNOWN_ERROR,"platform exception");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::UNKNOWN_ERROR,"platform exception");
                        break;
                default:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::UNKNOWN_ERROR,"unknown error");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::UNKNOWN_ERROR,"unknown error");
                        break;
                }
 
@@ -407,7 +406,7 @@ void ApplicationAsyncAnswerHandler::getAppsContext(const EventApplicationGetApps
                return;
        } Catch(Exception) {
                LoggerE("error during processing answer" << _rethrown_exception.GetMessage());
-               error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::UNKNOWN_ERROR, "Internal error");
+               error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
 
                callbackManager->callOnError(error);
                return;
@@ -438,13 +437,13 @@ void ApplicationAsyncAnswerHandler::getAppsInfo(const EventApplicationGetAppsInf
                switch (event->getExceptionCode())
                {
                case ExceptionCodes::NotFoundException:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::NOT_FOUND_ERROR,"given package is not found");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::NOT_FOUND_ERROR,"given package is not found");
                        break;
                case ExceptionCodes::PlatformException:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::UNKNOWN_ERROR,"platform exception");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::UNKNOWN_ERROR,"platform exception");
                        break;
                default:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::UNKNOWN_ERROR,"unknown error");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::UNKNOWN_ERROR,"unknown error");
                        break;
                }
 
@@ -464,7 +463,7 @@ void ApplicationAsyncAnswerHandler::getAppsInfo(const EventApplicationGetAppsInf
                return;
        } Catch(Exception) {
                LoggerE("error during processing answer" << _rethrown_exception.GetMessage());
-               error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::UNKNOWN_ERROR, "Internal error");
+               error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
 
                callbackManager->callOnError(error);
                return;
index 21727cb..849aacb 100644 (file)
@@ -20,7 +20,7 @@
 #include <CommonsJavaScript/ScopedJSStringRef.h>
 #include <Commons/RegexUtils.h>
 #include <Commons/Exception.h>
-#include <JSWebAPIError.h>
+#include <JSWebAPIErrorFactory.h>
 
 #include "ApplicationConverter.h"
 #include "JSApplication.h"
index 5f4c214..f96dd9b 100644 (file)
 #include <Commons/Exception.h>
 #include <CommonsJavaScript/ScopedJSStringRef.h>
 
-#include <JSWebAPIException.h>
 #include <ArgumentValidator.h>
 #include <JSUtil.h>
 
-//#include <JSTizenExceptionFactory.h>
-//#include <JSTizenException.h>
-//#include <SecurityExceptions.h>
+#include <JSWebAPIErrorFactory.h>
 
 #include "ApplicationController.h"
 #include "ApplicationConverter.h"
@@ -160,7 +157,7 @@ JSValueRef JSApplication::getProperty(JSContextRef context,
                }
        } Catch(WrtDeviceApis::Commons::Exception) {
         LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               JSTizenExceptionFactory::postException(context, exception,JSTizenException::INVALID_VALUES_ERROR, "Invalid value error");
+               JSWebAPIErrorFactory::postException(context, exception,JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Invalid value error");
     }
        
        return NULL;
@@ -182,10 +179,10 @@ JSValueRef JSApplication::exit(JSContextRef context,
                return JSValueMakeUndefined(context);
 
        } catch (const BasePlatformException &err) {
-           return JSWebAPIException::throwException(context, exception, err);
+           return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch (...) {
                DeviceAPI::Common::UnknownException err("Unknown Error in ApplicationManager.getAppSharedURI().");
-               return JSWebAPIException::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        }
 }
 
@@ -204,10 +201,10 @@ JSValueRef JSApplication::hide(JSContextRef context,
                return JSValueMakeUndefined(context);
 
        } catch (const BasePlatformException &err) {
-               return JSWebAPIException::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch (...) {
                DeviceAPI::Common::UnknownException err("Unknown Error in ApplicationManager.getAppSharedURI().");
-               return JSWebAPIException::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        }
 }
 
@@ -254,10 +251,10 @@ JSValueRef JSApplication::getRequestedAppControl(JSContextRef context,
                return converter->toJSValueRef(event->getRequestedAppControl());
 
         } catch (const BasePlatformException &err) {
-                return JSWebAPIException::throwException(context, exception, err);
+                return JSWebAPIErrorFactory::postException(context, exception, err);
         } catch (...) {
                 DeviceAPI::Common::UnknownException err("Unknown Error in ApplicationManager.getAppSharedURI().");
-                return JSWebAPIException::throwException(context, exception, err);
+                return JSWebAPIErrorFactory::postException(context, exception, err);
         }
 }
 
index 2dd3da8..7153000 100644 (file)
 #include <memory>
 #include <CommonsJavaScript/JSUtils.h>
 #include <CommonsJavaScript/Converter.h>
-#include <JSWebAPIException.h>
 
 //#include <Commons/Exception.h>
-//#include <JSWebAPIexception.h>
-//#include <JSTizenExceptionFactory.h>
-//#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 
 #include "ApplicationCert.h"
 #include "JSApplicationCert.h"
@@ -122,10 +119,10 @@ JSValueRef JSApplicationCert::getProperty(JSContextRef context,
                        return converter.toJSValueRef(privateData->getValue());
                }
        } catch (const BasePlatformException &err) {
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
         DeviceAPI::Common::TypeMismatchException err("TypeMismatchException occured");
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
        
        return JSValueMakeUndefined(context);
index d8dbe89..1bc2408 100644 (file)
 #include <memory>
 #include <CommonsJavaScript/JSUtils.h>
 #include <CommonsJavaScript/Converter.h>
-#include <JSWebAPIException.h>
-//#include <Commons/Exception.h>
-//#include <JSTizenExceptionFactory.h>
-//#include <JSTizenException.h>
 #include "ApplicationContext.h"
+#include <JSWebAPIErrorFactory.h>
 #include "JSApplicationContext.h"
 #include <Export.h>
 #include <Logger.h>
@@ -155,10 +152,10 @@ JSValueRef JSApplicationContext::getProperty(JSContextRef context,
                } 
 
        } catch (const BasePlatformException &err) {
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
         DeviceAPI::Common::TypeMismatchException err("TypeMismatchException occured");
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
        
        return JSValueMakeUndefined(context);
index f851e38..01d165f 100644 (file)
 #include <CommonsJavaScript/PrivateObject.h>
 #include <CommonsJavaScript/JSUtils.h>
 #include <SecurityExceptions.h>
-#include <JSWebAPIException.h>
 #include <ArgumentValidator.h>
 #include <Export.h>
 
 //#include <Commons/Exception.h>
-//#include <JSTizenExceptionFactory.h>
-//#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 
 #include "plugin_config.h"
 
@@ -164,9 +162,7 @@ JSObjectRef DLL_EXPORT JSApplicationControl::constructor(JSContextRef context,
                        appsvc->setAppControlDataArray(appControlDataArray);
                }
     } catch (const BasePlatformException& err) {
-               JSObjectRef exceptionObj = JSWebAPIException::makeJSWebAPIException(context, err);
-               *exception = exceptionObj;
-               return exceptionObj;
+       return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
        JSApplicationControlPriv *priv = new JSApplicationControlPriv(context, appsvc);
@@ -206,7 +202,7 @@ JSValueRef JSApplicationControl::getProperty(JSContextRef context, JSObjectRef o
     JSApplicationControlPriv *priv = static_cast<JSApplicationControlPriv*>(JSObjectGetPrivate(object));
     if (!priv) {
                DeviceAPI::Common::TypeMismatchException err("TypeMismatchException occured");
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
        }
 
     try {
@@ -241,10 +237,10 @@ JSValueRef JSApplicationControl::getProperty(JSContextRef context, JSObjectRef o
                }
 
     } catch (const BasePlatformException &err) {
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
         DeviceAPI::Common::TypeMismatchException err("TypeMismatchException occured");
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
        /* do not return undefined object to find method */
     return NULL;
@@ -274,10 +270,10 @@ bool JSApplicationControl::setProperty(JSContextRef context, JSObjectRef object,
                } 
 
        } catch (const BasePlatformException &err) {
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
         DeviceAPI::Common::TypeMismatchException err("TypeMismatchException occured");
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
        
        return false;
index f7110b5..29ea6f7 100644 (file)
@@ -20,9 +20,7 @@
 #include <CommonsJavaScript/JSDOMExceptionFactory.h>
 
 #include <ArgumentValidator.h>
-#include <JSWebAPIException.h>
-//#include <JSTizenExceptionFactory.h>
-//#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 #include <JSUtil.h>
 #include <Export.h>
 #include "JSApplicationControlData.h"
@@ -107,9 +105,7 @@ JSObjectRef DLL_EXPORT JSApplicationControlData::constructor(JSContextRef contex
 
            return obj;
        } catch (BasePlatformException &err) {
-               JSObjectRef exceptionObj = JSWebAPIException::makeJSWebAPIException(context, err);
-               *exception = exceptionObj;
-               return exceptionObj;
+               return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 }
 
@@ -174,10 +170,10 @@ JSValueRef JSApplicationControlData::getProperty(JSContextRef context,
                        return converter.toJSValueRef(privateData->getValue());
                } 
        } catch (const BasePlatformException &err) {
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
         DeviceAPI::Common::TypeMismatchException err("TypeMismatchException occured");
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
        
        return JSValueMakeUndefined(context);
@@ -201,10 +197,10 @@ bool JSApplicationControlData::setProperty(JSContextRef context,
                        return true;                    
                } 
        } catch (const BasePlatformException &err) {
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
         DeviceAPI::Common::TypeMismatchException err("TypeMismatchException occured");
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
        
        return false;
index ef51ae3..31da6ef 100644 (file)
 #include <CommonsJavaScript/JSUtils.h>
 #include <CommonsJavaScript/Converter.h>
 #include <Commons/Exception.h>
-#include <JSWebAPIException.h>
-//#include <JSTizenExceptionFactory.h>
-//#include <JSTizenException.h>
 #include "ApplicationInformation.h"
+#include <JSWebAPIErrorFactory.h>
 #include "JSApplicationInformation.h"
 #include "AppManagerWrapper.h"
 #include <Export.h>
@@ -196,10 +194,10 @@ JSValueRef JSApplicationInformation::getProperty(JSContextRef context,
                        } 
                }
        } catch (const BasePlatformException &err) {
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
         DeviceAPI::Common::TypeMismatchException err("TypeMismatchException occured");
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
        
        return JSValueMakeUndefined(context);
index a3764e0..9171e37 100644 (file)
 #include <CommonsJavaScript/Utils.h>
 #include <CommonsJavaScript/ScopedJSStringRef.h>
 
-#include <JSWebAPIException.h>
 #include <ArgumentValidator.h>
 #include <JSUtil.h>
 
 #include <SecurityExceptions.h>
 //#include <Commons/Exception.h>
-//#include <JSTizenExceptionFactory.h>
-//#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 
 #include "ApplicationFactory.h"
 #include "plugin_config.h"
@@ -179,7 +177,7 @@ JSValueRef JSApplicationManager::getCurrentApplication(JSContextRef context,
                return JSApplication::makeObject(context, event->getApp()); 
        } catch (...) {
                DeviceAPI::Common::UnknownException err("Unknown Error in ApplicationManager.getCurrentApplication().");
-               return JSWebAPIException::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        }
 }
 
@@ -240,10 +238,10 @@ JSValueRef JSApplicationManager::launch(JSContextRef context,
                return JSValueMakeUndefined(context);
 
        } catch (const BasePlatformException &err) {
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
         DeviceAPI::Common::UnknownException err("Unknown Error in ApplicationManager.launch().");
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 }
 
@@ -302,10 +300,10 @@ JSValueRef JSApplicationManager::kill(JSContextRef context,
                return JSValueMakeUndefined(context);
        
        } catch (const BasePlatformException &err) {
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
         DeviceAPI::Common::UnknownException err("Unknown Error in ApplicationManager.kill().");
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 }
 
@@ -332,10 +330,10 @@ JSValueRef JSApplicationManager::setUserAgent(JSContextRef context,
                return JSValueMakeUndefined(context);
 
        } catch (const BasePlatformException &err) {
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
         DeviceAPI::Common::UnknownException err("Unknown Error in ApplicationManager.removeAppInfoEventListener().");
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 }
 
@@ -437,10 +435,10 @@ JSValueRef JSApplicationManager::launchAppControl(JSContextRef context,
                TIME_TRACER_ITEM_END("launchAppControlReply", 0);
                return JSValueMakeUndefined(context);
        } catch (const BasePlatformException &err) {
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
         DeviceAPI::Common::UnknownException err("Unknown Error in ApplicationManager.launchAppControl().");
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
 }
@@ -506,10 +504,10 @@ JSValueRef JSApplicationManager::findAppControl(JSContextRef context,
                return JSValueMakeUndefined(context);
 
        } catch (const BasePlatformException &err) {
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
         DeviceAPI::Common::UnknownException err("Unknown Error in ApplicationManager.findAppControl().");
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 }
 
@@ -562,11 +560,11 @@ JSValueRef JSApplicationManager::getAppsContext(JSContextRef context,
                
        } catch (const BasePlatformException &err) {
                LoggerE("BasePlatformException");
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
            LoggerE("etc...");
         DeviceAPI::Common::UnknownException err("Unknown Error in ApplicationManager.getAppsContext().");
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 }
 
@@ -611,10 +609,10 @@ JSValueRef JSApplicationManager::getAppContext(JSContextRef context,
                TIME_TRACER_ITEM_END(__FUNCTION__, 0);
                return converter->toJSValueRefFromApplicationContext(event->getAppContext());
        } catch (const BasePlatformException &err) {
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
         DeviceAPI::Common::UnknownException err("Unknown Error in ApplicationManager.getAppContext().");
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 }
 
@@ -667,10 +665,10 @@ JSValueRef JSApplicationManager::getAppsInfo(JSContextRef context,
                return JSValueMakeUndefined(context);
                
        } catch (const BasePlatformException &err) {
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
         DeviceAPI::Common::UnknownException err("Unknown Error in ApplicationManager.getAppsInfo().");
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 }
 
@@ -717,10 +715,10 @@ JSValueRef JSApplicationManager::getAppInfo(JSContextRef context,
                return converter->toJSValueRefFromApplicationInformation(event->getAppInfo());
                
     } catch (const BasePlatformException &err) {
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
         DeviceAPI::Common::UnknownException err("Unknown Error in ApplicationManager.getAppInfo().");
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 }
 
@@ -793,10 +791,10 @@ JSValueRef JSApplicationManager::addAppInfoEventListener(JSContextRef context,
                return converter->toJSValueRef(id);
                
        } catch (const BasePlatformException &err) {
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
         DeviceAPI::Common::UnknownException err("Unknown Error in ApplicationManager.addAppInfoEventListener().");
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 }
 
@@ -848,10 +846,10 @@ else if (event->getExceptionCode() != ExceptionCodes::None) {
            return JSValueMakeUndefined(context);
 
        } catch (const BasePlatformException &err) {
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
         DeviceAPI::Common::UnknownException err("Unknown Error in ApplicationManager.removeAppInfoEventListener().");
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 }
 
@@ -901,10 +899,10 @@ JSValueRef JSApplicationManager::getAppCerts(JSContextRef context,
                return converter->toJSValueRefFromeApplicationCerts(event->getAppCerts());
                
     } catch (const BasePlatformException &err) {
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
         DeviceAPI::Common::UnknownException err("Unknown Error in ApplicationManager.getAppCerts().");
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 }
 
@@ -951,10 +949,10 @@ JSValueRef JSApplicationManager::getAppSharedURI(JSContextRef context,
                return converter->toJSValueRef(event->getSharedURI());
 
     } catch (const BasePlatformException &err) {
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
         DeviceAPI::Common::UnknownException err("Unknown Error in ApplicationManager.getAppSharedURI().");
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 }
 
index f232efd..35aae29 100644 (file)
@@ -23,8 +23,7 @@
 #include <CommonsJavaScript/JSUtils.h>
 #include <SecurityExceptions.h>
 #include <Commons/Exception.h>
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 
 #include "plugin_config.h"
 #include "ApplicationConverter.h"
@@ -40,6 +39,8 @@ using namespace DeviceAPI::Common;
 namespace DeviceAPI {
 namespace Application {
 
+using WrtDeviceApis::Commons::NotFoundException;
+
 JSClassRef JSRequestedApplicationControl::m_jsClassRef = NULL;
 
 JSClassDefinition JSRequestedApplicationControl::m_classInfo = {
@@ -154,7 +155,7 @@ JSValueRef JSRequestedApplicationControl::getProperty(JSContextRef context, JSOb
 {
     JSRequestedApplicationControlPriv *priv = static_cast<JSRequestedApplicationControlPriv*>(JSObjectGetPrivate(object));
     if (!priv) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mistmatch error.");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mistmatch error.");
        }
 
     Try {
@@ -205,16 +206,16 @@ JSValueRef JSRequestedApplicationControl::replyResult(JSContextRef context,
                providerMgr->replyResult(resultArray);
        } Catch (ConversionException) {
         LoggerE("Exception: "<<_rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception,JSTizenException::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception,JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
        } Catch (NotFoundException) {
            LoggerE("Exception: "<<_rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception,JSTizenException::NOT_FOUND_ERROR, _rethrown_exception.GetMessage()); 
+               return JSWebAPIErrorFactory::postException(context, exception,JSWebAPIErrorFactory::NOT_FOUND_ERROR, _rethrown_exception.GetMessage());
        } Catch (NullPointerException) {
            LoggerE("Exception: "<<_rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception,JSTizenException::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception,JSWebAPIErrorFactory::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
        } Catch (Exception) {
         LoggerE("Exception: "<<_rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception,JSTizenException::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception,JSWebAPIErrorFactory::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
        }
 
        return JSValueMakeUndefined(context);
@@ -238,13 +239,13 @@ JSValueRef JSRequestedApplicationControl::replyFailure(JSContextRef context,
                providerMgr->replyFailure();
        } Catch (NotFoundException) {
            LoggerE("Exception: "<<_rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception,JSTizenException::NOT_FOUND_ERROR, _rethrown_exception.GetMessage()); 
+               return JSWebAPIErrorFactory::postException(context, exception,JSWebAPIErrorFactory::NOT_FOUND_ERROR, _rethrown_exception.GetMessage());
        } Catch (NullPointerException) {
            LoggerE("Exception: "<<_rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception,JSTizenException::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception,JSWebAPIErrorFactory::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
        } Catch (Exception) {
         LoggerE("Exception: "<<_rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception,JSTizenException::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception,JSWebAPIErrorFactory::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
        }
        
        return JSValueMakeUndefined(context);
index 692125b..27f742b 100644 (file)
@@ -18,7 +18,7 @@
 #include <pcrecpp.h>
 
 #include <Logger.h>
-#include <JSWebAPIError.h>
+#include <JSWebAPIErrorFactory.h>
 #include <system_info.h>
 #include <JSUtil.h>
 
@@ -61,14 +61,14 @@ void BluetoothAdapter::onStateChangedCB(int result, bt_adapter_state_e adapterSt
             if(callback) {
                 JSContextRef context = callback->getContext();
                 ServiceNotAvailableException error("Bluetooth device is busy");
-                callback->invokeCallback("error", JSWebAPIError::makeJSWebAPIError(context, error));
+                callback->invokeCallback("error", JSWebAPIErrorFactory::makeErrorObject(context, error));
             }    
         }
         else {
             if(callback) {
                 JSContextRef context = callback->getContext();
                 UnknownException error("Unknown error");
-                callback->invokeCallback("error", JSWebAPIError::makeJSWebAPIError(context, error));        
+                callback->invokeCallback("error", JSWebAPIErrorFactory::makeErrorObject(context, error));
             }
         }
     }
@@ -124,7 +124,7 @@ void BluetoothAdapter::onVisibilityChangedCB(int result, bt_adapter_visibility_m
             if(callback) {
                 JSContextRef context = callback->getContext();
                 UnknownException error("Unknown error");
-                callback->invokeCallback("error", JSWebAPIError::makeJSWebAPIError(context, error));        
+                callback->invokeCallback("error", JSWebAPIErrorFactory::makeErrorObject(context, error));
             }
         }
         
@@ -172,7 +172,7 @@ void BluetoothAdapter::onDiscoveryStateChangedCB(int result, bt_adapter_device_d
                     
                         JSContextRef context = callback->getContext();
                         UnknownException error("Unknown error");                        
-                        callback->invokeCallback("error", JSWebAPIError::makeJSWebAPIError(context, error));                   
+                        callback->invokeCallback("error", JSWebAPIErrorFactory::makeErrorObject(context, error));
                     }
 
                     /*
@@ -360,7 +360,7 @@ void BluetoothAdapter::onBondCreatedCB(int result, bt_device_info_s *deviceInfo,
             if(callback) {
                 JSContextRef context = callback->getContext();
                 UnknownException error("Unknown error");
-                callback->invokeCallback("error", JSWebAPIError::makeJSWebAPIError(context, error));        
+                callback->invokeCallback("error", JSWebAPIErrorFactory::makeErrorObject(context, error));
             }
         }        
         
@@ -394,7 +394,7 @@ void BluetoothAdapter::onBondDestroyedCB(int result, char *remoteAddress, void *
             if(callback) {
                 JSContextRef context = callback->getContext();
                 UnknownException error("Unknown error");
-                callback->invokeCallback("error", JSWebAPIError::makeJSWebAPIError(context, error));        
+                callback->invokeCallback("error", JSWebAPIErrorFactory::makeErrorObject(context, error));
             }
         }        
         
@@ -515,7 +515,7 @@ void BluetoothAdapter::onSocketConnected(int result, bt_socket_connection_state_
                 JSContextRef context = callback->getContext();
                 NotFoundException error("Not found");
                 if(callback)
-                    callback->invokeCallback("error", JSWebAPIError::makeJSWebAPIError(context, error));
+                    callback->invokeCallback("error", JSWebAPIErrorFactory::makeErrorObject(context, error));
 
                 // Update mConnReqMap
                 object->mConnReqMap.erase(iter);
@@ -1314,14 +1314,14 @@ void BluetoothAdapter::returnKnownDevices(Common::MultiCallbackUserDataPtr userD
             LoggerE("Unknown exception");
             userData->invokeCallback(
                     "error", 
-                    JSWebAPIError::makeJSWebAPIError(userData->getContext(), UnknownException("Unknown exception"))
+                    JSWebAPIErrorFactory::makeErrorObject(userData->getContext(), UnknownException("Unknown exception"))
             );
         }
     } else {   // Not enabled
         LoggerE("Bluetooth device is turned off");
         userData->invokeCallback(
                 "error",
-                JSWebAPIError::makeJSWebAPIError(userData->getContext(), ServiceNotAvailableException("Bluetooth device is turned off"))
+                JSWebAPIErrorFactory::makeErrorObject(userData->getContext(), ServiceNotAvailableException("Bluetooth device is turned off"))
         );
     }
 }
@@ -1330,7 +1330,7 @@ void BluetoothAdapter::returnDevice(std::string &address, Common::MultiCallbackU
 {
     if(!isValidAddress(address)) {
         LoggerE("Wrong address");
-        userData->invokeCallback("error", JSWebAPIError::makeJSWebAPIError(userData->getContext(), NotFoundException("Wrong address")));
+        userData->invokeCallback("error", JSWebAPIErrorFactory::makeErrorObject(userData->getContext(), NotFoundException("Wrong address")));
         return;
     }
 
@@ -1361,7 +1361,7 @@ void BluetoothAdapter::returnDevice(std::string &address, Common::MultiCallbackU
 
             userData->invokeCallback(
                     "error",
-                    JSWebAPIError::makeJSWebAPIError(userData->getContext(), NotFoundException("There is no device with the given address"))
+                    JSWebAPIErrorFactory::makeErrorObject(userData->getContext(), NotFoundException("There is no device with the given address"))
             );            
         }        
 
@@ -1369,7 +1369,7 @@ void BluetoothAdapter::returnDevice(std::string &address, Common::MultiCallbackU
         LoggerE("Bluetooth device is turned off");
         userData->invokeCallback(
                 "error",
-                JSWebAPIError::makeJSWebAPIError(userData->getContext(), ServiceNotAvailableException("Bluetooth device is turned off"))
+                JSWebAPIErrorFactory::makeErrorObject(userData->getContext(), ServiceNotAvailableException("Bluetooth device is turned off"))
         );
     }
 }
@@ -1378,7 +1378,7 @@ void BluetoothAdapter::returnRegisteredService(std::string &uuid, std::string &n
 {
     if(!isValidUUID(uuid)) {
         LoggerE("Wrong UUID");
-        userData->invokeCallback("error", JSWebAPIError::makeJSWebAPIError(userData->getContext(), InvalidValuesException("Wrong UUID")));        
+        userData->invokeCallback("error", JSWebAPIErrorFactory::makeErrorObject(userData->getContext(), InvalidValuesException("Wrong UUID")));
         return;
     }
 
@@ -1387,7 +1387,7 @@ void BluetoothAdapter::returnRegisteredService(std::string &uuid, std::string &n
         bool isRegistered;
         if(bt_adapter_is_service_used(uuid.c_str(), &isRegistered) == BT_ERROR_NONE && isRegistered == true) {
             LoggerD("Already registered");
-            userData->invokeCallback("error", JSWebAPIError::makeJSWebAPIError(userData->getContext(), InvalidValuesException("Already registered")));
+            userData->invokeCallback("error", JSWebAPIErrorFactory::makeErrorObject(userData->getContext(), InvalidValuesException("Already registered")));
             return;
         }        
 
@@ -1415,13 +1415,13 @@ void BluetoothAdapter::returnRegisteredService(std::string &uuid, std::string &n
                     case BT_ERROR_INVALID_PARAMETER:
                     {
                         LoggerD("Invalid value");
-                        userData->invokeCallback("error", JSWebAPIError::makeJSWebAPIError(userData->getContext(), InvalidValuesException("Invalid value")));
+                        userData->invokeCallback("error", JSWebAPIErrorFactory::makeErrorObject(userData->getContext(), InvalidValuesException("Invalid value")));
                         break;
                     }
                     default:
                     {
                         LoggerD("Unknown exception");
-                        userData->invokeCallback("error", JSWebAPIError::makeJSWebAPIError(userData->getContext(), UnknownException("Unknown exception")));
+                        userData->invokeCallback("error", JSWebAPIErrorFactory::makeErrorObject(userData->getContext(), UnknownException("Unknown exception")));
                     }                    
                 }
                 
@@ -1430,20 +1430,20 @@ void BluetoothAdapter::returnRegisteredService(std::string &uuid, std::string &n
             case BT_ERROR_INVALID_PARAMETER:
             {
                 LoggerD("Invalid value");
-                userData->invokeCallback("error", JSWebAPIError::makeJSWebAPIError(userData->getContext(), InvalidValuesException("Invalid value")));
+                userData->invokeCallback("error", JSWebAPIErrorFactory::makeErrorObject(userData->getContext(), InvalidValuesException("Invalid value")));
                 break;
             }
             default:
             {
                 LoggerD("Unknown exception");
-                userData->invokeCallback("error", JSWebAPIError::makeJSWebAPIError(userData->getContext(), UnknownException("Unknown exception")));
+                userData->invokeCallback("error", JSWebAPIErrorFactory::makeErrorObject(userData->getContext(), UnknownException("Unknown exception")));
             }            
         }        
     } else {   // Not enabled
         LoggerE("Bluetooth device is turned off");
         userData->invokeCallback(
                 "error",
-                JSWebAPIError::makeJSWebAPIError(userData->getContext(), ServiceNotAvailableException("Bluetooth device is turned off"))
+                JSWebAPIErrorFactory::makeErrorObject(userData->getContext(), ServiceNotAvailableException("Bluetooth device is turned off"))
         );
     }
 }
index a1fb41f..9082954 100644 (file)
@@ -18,7 +18,7 @@
 #include <Ecore.h>
 
 #include <JSUtil.h>
-#include <JSWebAPIError.h>
+#include <JSWebAPIErrorFactory.h>
 
 #include "BluetoothCallbackUtil.h"
 #include "BluetoothAdapter.h"
@@ -54,7 +54,7 @@ static Eina_Bool jobCompleteCB(void *userData){
         case BluetoothCallbackUserData::BT_CB_ERROR:
         {
             LoggerD("BT_CB_ERROR");
-            data->mUserData->invokeCallback("error", JSWebAPIError::makeJSWebAPIError(data->mUserData->getContext(), *(data->mError)));
+            data->mUserData->invokeCallback("error", JSWebAPIErrorFactory::makeErrorObject(data->mUserData->getContext(), *(data->mError)));
             break;
         }
         case BluetoothCallbackUserData::BT_CB_DEVICE:
index 22f2765..e64d8bf 100644 (file)
@@ -2,6 +2,7 @@ SET(TARGET_NAME ${bluetooth_target})
 SET(DESTINATION_NAME ${bluetooth_dest})
 SET(TARGET_IMPL_NAME ${bluetooth_impl})
 
+IF(ENABLE_OPTIONAL_BT)
 PKG_SEARCH_MODULE(bluetooth REQUIRED capi-network-bluetooth)
 PKG_SEARCH_MODULE(system-info REQUIRED capi-system-info)
 
@@ -59,6 +60,7 @@ TARGET_LINK_LIBRARIES(${TARGET_NAME}
 
 INSTALL(TARGETS ${TARGET_NAME} ${TARGET_IMPL_NAME} LIBRARY DESTINATION ${DESTINATION_LIB_PREFIX}/${DESTINATION_NAME})
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/config.xml DESTINATION ${DESTINATION_LIB_PREFIX}/${DESTINATION_NAME})
+ENDIF(ENABLE_OPTIONAL_BT)
 INSTALL(
         DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ DESTINATION ${DESTINATION_HEADER_PREFIX}/bluetooth
         FILES_MATCHING PATTERN "*.h" PATTERN "CMakeFiles" EXCLUDE
index a6aa002..4f06056 100644 (file)
@@ -18,7 +18,6 @@
 #include <SecurityExceptions.h>
 
 #include <JSUtil.h>
-#include <JSWebAPIException.h>
 #include <ArgumentValidator.h>
 #include <GlobalContextManager.h>
 
@@ -175,10 +174,10 @@ JSValueRef JSBluetoothAdapter::setName(JSContextRef context,
         
         return JSValueMakeUndefined(context);
     } catch (const BasePlatformException &err) {
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
         DeviceAPI::Common::UnknownException err("Unknown Error in BluetoothAdapter.setName().");
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 }
 
@@ -223,10 +222,10 @@ JSValueRef JSBluetoothAdapter::setPowered(JSContextRef context,
         
         return JSValueMakeUndefined(context);
     } catch (const BasePlatformException &err) {
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
         DeviceAPI::Common::UnknownException err("Unknown Error in BluetoothAdapter.setPowered().");
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 }
 
@@ -274,10 +273,10 @@ JSValueRef JSBluetoothAdapter::setVisible(JSContextRef context,
         
         return JSValueMakeUndefined(context);
     } catch (const BasePlatformException &err) {
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
         DeviceAPI::Common::UnknownException err("Unknown Error in BluetoothAdapter.setVisible().");
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 }
 
@@ -352,10 +351,10 @@ JSValueRef JSBluetoothAdapter::discoverDevices(JSContextRef context,
         
         return JSValueMakeUndefined(context);
     } catch (const BasePlatformException &err) {
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
         DeviceAPI::Common::UnknownException err("Unknown Error in BluetoothAdapter.discoverDevices().");
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 }
 
@@ -399,10 +398,10 @@ JSValueRef JSBluetoothAdapter::stopDiscovery(JSContextRef context,
 
         return JSValueMakeUndefined(context);
     } catch (const BasePlatformException &err) {
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
         DeviceAPI::Common::UnknownException err("Unknown Error in BluetoothAdapter.stopDiscovery().");
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 }
 
@@ -446,10 +445,10 @@ JSValueRef JSBluetoothAdapter::getKnownDevices(JSContextRef context,
         
         return JSValueMakeUndefined(context);
     } catch (const BasePlatformException &err) {
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
         DeviceAPI::Common::UnknownException err("Unknown Error in BluetoothAdapter.getKnownDevices().");
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 }
 
@@ -494,10 +493,10 @@ JSValueRef JSBluetoothAdapter::getDevice(JSContextRef context,
         
         return JSValueMakeUndefined(context);
     } catch (const BasePlatformException &err) {
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
         DeviceAPI::Common::UnknownException err("Unknown Error in BluetoothAdapter.getDevice().");
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 }
 
@@ -542,10 +541,10 @@ JSValueRef JSBluetoothAdapter::createBonding(JSContextRef context,
         
         return JSValueMakeUndefined(context);
     } catch (const BasePlatformException &err) {
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
         DeviceAPI::Common::UnknownException err("Unknown Error in BluetoothAdapter.createBonding().");
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 }
 
@@ -590,10 +589,10 @@ JSValueRef JSBluetoothAdapter::destroyBonding(JSContextRef context,
         
         return JSValueMakeUndefined(context);
     } catch (const BasePlatformException &err) {
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
         DeviceAPI::Common::UnknownException err("Unknown Error in BluetoothAdapter.destroyBonding().");
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 }
 
@@ -639,10 +638,10 @@ JSValueRef JSBluetoothAdapter::registerRFCOMMServiceByUUID(JSContextRef context,
         
         return JSValueMakeUndefined(context);
     } catch (const BasePlatformException &err) {
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
         DeviceAPI::Common::UnknownException err("Unknown Error in BluetoothAdapter.registerRFCOMMServiceByUUID().");
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 }
 
index e5d92a8..1debbcd 100644 (file)
@@ -18,7 +18,6 @@
 #include <SecurityExceptions.h>
 
 #include <JSUtil.h>
-#include <JSWebAPIException.h>
 #include <ArgumentValidator.h>
 #include <GlobalContextManager.h>
 #include <PlatformException.h>
@@ -163,10 +162,10 @@ JSValueRef JSBluetoothClass::hasService(JSContextRef context,
         
         return JSUtil::toJSValueRef(context, priv->mClass->hasService(service));
     } catch (const BasePlatformException &err) {
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
         DeviceAPI::Common::UnknownException err("Unknown Error in BluetoothClass.hasService().");
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 }
 
index 1bce7ca..e7da4d3 100644 (file)
@@ -18,7 +18,6 @@
 #include <SecurityExceptions.h>
 
 #include <JSUtil.h>
-#include <JSWebAPIException.h>
 #include <ArgumentValidator.h>
 #include <GlobalContextManager.h>
 #include <PlatformException.h>
@@ -195,10 +194,10 @@ JSValueRef JSBluetoothDevice::connectToServiceByUUID(JSContextRef context,
         
         return JSValueMakeUndefined(context);
     } catch (const BasePlatformException &err) {
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
         DeviceAPI::Common::UnknownException err("Unknown Error in BluetoothDevice.connectToServiceByUUID().");
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 }
 
index 1e16f16..2f4c3c5 100644 (file)
@@ -18,7 +18,6 @@
 #include <SecurityExceptions.h>
 
 #include <JSUtil.h>
-#include <JSWebAPIException.h>
 #include <ArgumentValidator.h>
 #include <GlobalContextManager.h>
 #include <PlatformException.h>
@@ -162,10 +161,10 @@ JSValueRef JSBluetoothManager::getDefaultAdapter(JSContextRef context,
         return JSBluetoothAdapter::createJSObject(context);
 
     } catch (const BasePlatformException &err) {
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
         DeviceAPI::Common::UnknownException err("Unknown Error in BluetoothManager.getDefaultAdapter().");
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 }
 
index 8441df5..e0c5afc 100644 (file)
@@ -18,7 +18,6 @@
 #include <SecurityExceptions.h>
 
 #include <JSUtil.h>
-#include <JSWebAPIException.h>
 #include <ArgumentValidator.h>
 #include <GlobalContextManager.h>
 #include <PlatformException.h>
@@ -170,7 +169,7 @@ bool JSBluetoothServiceHandler::setProperty(JSContextRef context,
             return priv->setOnConnect(context, object);
         }
     } catch (const BasePlatformException &err) {
-        JSWebAPIException::throwException(context, exception, err);
+        JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     return false;
@@ -221,10 +220,10 @@ JSValueRef JSBluetoothServiceHandler::unregister(JSContextRef context,
         
         return JSValueMakeUndefined(context);
     } catch (const BasePlatformException &err) {
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
         DeviceAPI::Common::UnknownException err("Unknown Error in BluetoothServiceHandler.unregister().");
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 }
 
index dde2d03..cfa0607 100644 (file)
@@ -19,7 +19,6 @@
 
 #include <SecurityExceptions.h>
 #include <JSUtil.h>
-#include <JSWebAPIException.h>
 #include <ArgumentValidator.h>
 #include <GlobalContextManager.h>
 #include <PlatformException.h>
@@ -237,7 +236,7 @@ bool JSBluetoothSocket::setProperty(JSContextRef context,
             return priv->setOnError(context, object);
         }
     } catch (const BasePlatformException &err) {
-        JSWebAPIException::throwException(context, exception, err);
+        JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     return false;
@@ -281,10 +280,10 @@ JSValueRef JSBluetoothSocket::writeData(JSContextRef context,
 
         return JSUtil::toJSValueRef(context, priv->writeData(buffer, size));
     } catch (const BasePlatformException &err) {
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
         DeviceAPI::Common::UnknownException err("Unknown Error in BluetoothSocket.writeData().");
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 }
 
@@ -318,10 +317,10 @@ JSValueRef JSBluetoothSocket::readData(JSContextRef context,
         
         return JSUtil::toJSValueRef_(context, data);
     } catch (const BasePlatformException &err) {
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
         DeviceAPI::Common::UnknownException err("Unknown Error in BluetoothSocket.readData().");
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 }
 
@@ -355,10 +354,10 @@ JSValueRef JSBluetoothSocket::close(JSContextRef context,
         
         return JSValueMakeUndefined(context);
     } catch (const BasePlatformException &err) {
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
         DeviceAPI::Common::UnknownException err("Unknown Error in BluetoothSocket.close().");
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 }
 
index 3b22439..c5eb25b 100644 (file)
 #include "JSBookmarkItem.h"
 #include <queue>
 #include <Ecore.h>
-#include <JSTizenException.h>
-#include <JSTizenExceptionFactory.h>
+#include <JSWebAPIErrorFactory.h>
 #include <PlatformException.h>
 #include <favorites.h>
 #include <Logger.h>
 
-using namespace WrtDeviceApis::CommonsJavaScript;
 using namespace DeviceAPI::Common;
 
 namespace DeviceAPI {
index 88a2f53..655349a 100644 (file)
 // limitations under the License.
 //
 
-#include <JSTizenException.h>
-#include <JSTizenExceptionFactory.h>
+#include <JSWebAPIErrorFactory.h>
 #include <ArgumentValidator.h>
 #include <CommonsJavaScript/Converter.h>
 #include <PlatformException.h>
-#include <JSWebAPIException.h>
 #include "JSBookmarkFolder.h"
 #include "BookmarkManager.h"
 #include "BookmarkData.h"
@@ -109,9 +107,7 @@ JSObjectRef JSBookmarkFolder::constructor(JSContextRef ctx, JSObjectRef construc
                } else
                        throw TypeMismatchException("Can't create BookmarkFolder");
     } catch(const BasePlatformException& err){
-        JSObjectRef error = JSWebAPIException::makeJSWebAPIException(ctx, err);
-        *exception = error;
-        return error;
+       return JSWebAPIErrorFactory::postException(ctx, exception, err);
     }
 }
 
@@ -172,9 +168,9 @@ JSValueRef JSBookmarkFolder::getProperty(JSContextRef context, JSObjectRef objec
                        return convert.toJSValueRef(priv->m_title);
                }
     }catch(const BasePlatformException& err){
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }catch(const WrtDeviceApis::Commons::ConversionException& err){
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "converting fail");    
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "converting fail");    
     }
        return JSValueMakeUndefined(context);
 }
index 55d0c06..bf2c43b 100644 (file)
 #include "JSBookmarkItem.h"
 #include "JSBookmarkFolder.h"
 #include "BookmarkData.h"
-#include <JSTizenException.h>
-#include <JSTizenExceptionFactory.h>
+#include <JSWebAPIErrorFactory.h>
 #include <CommonsJavaScript/Converter.h>
 #include <ArgumentValidator.h>
 #include <PlatformException.h>
-#include <JSWebAPIException.h>
 #include <Logger.h>
 
 using namespace DeviceAPI::Common;
@@ -112,9 +110,7 @@ JSObjectRef JSBookmarkItem::constructor(JSContextRef ctx, JSObjectRef constructo
                } else
                        throw TypeMismatchException("Can't create BookmarkItem");
     }catch(const BasePlatformException& err){
-        JSObjectRef error = JSWebAPIException::makeJSWebAPIException(ctx, err);
-        *exception = error;
-        return error;
+       return JSWebAPIErrorFactory::postException(ctx, exception, err);
     }
 }
 
@@ -157,9 +153,9 @@ JSValueRef JSBookmarkItem::getProperty(JSContextRef context, JSObjectRef object,
                        return convert.toJSValueRef(priv->m_url);
                }
     }catch(const BasePlatformException& err){
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }catch(const WrtDeviceApis::Commons::ConversionException& err){
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "converting fail");    
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "converting fail");    
     }
        return JSValueMakeUndefined(context);
 }
index b5ab4a2..407ebd2 100644 (file)
@@ -15,8 +15,7 @@
 // limitations under the License.
 //
 
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 #include <SecurityExceptions.h>
 #include <CommonsJavaScript/Converter.h>
 #include <GlobalContextManager.h>
@@ -27,7 +26,6 @@
 #include "plugin_config.h"
 #include <ArgumentValidator.h>
 #include <PlatformException.h>
-#include <JSWebAPIException.h>
 #include <CommonsJavaScript/Converter.h>
 #include <TimeTracer.h>
 
@@ -141,7 +139,7 @@ JSValueRef JSBookmarkManager::get(JSContextRef ctx, JSObjectRef object, JSObject
                return converter.toJSValueRef(bookmarksArray);
 
     }catch( const BasePlatformException& err){
-        return JSWebAPIException::throwException(ctx, exception, err);
+        return JSWebAPIErrorFactory::postException(ctx, exception, err);
     }
 }
 
@@ -193,7 +191,7 @@ JSValueRef JSBookmarkManager::add(JSContextRef ctx, JSObjectRef object, JSObject
                LoggerD("bookmark parent id:" << bookmark->m_parentId);
                
     }catch( const BasePlatformException& err){
-        return JSWebAPIException::throwException(ctx, exception, err);
+        return JSWebAPIErrorFactory::postException(ctx, exception, err);
     }
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
     return JSValueMakeUndefined(ctx);
@@ -229,7 +227,7 @@ JSValueRef JSBookmarkManager::remove(JSContextRef ctx, JSObjectRef object, JSObj
         BookmarkManager::getInstance()->remove(searchData);
 
     }catch( const BasePlatformException& err){
-        return JSWebAPIException::throwException(ctx, exception, err);
+        return JSWebAPIErrorFactory::postException(ctx, exception, err);
     }
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
     return JSValueMakeUndefined(ctx);
index 4e28e92..b242e51 100755 (executable)
@@ -35,7 +35,6 @@ SET(SRCS_IMPL
        JSCalendarAttendee.cpp
        JSCalendarRecurrenceRule.cpp
        JSCalendarAlarm.cpp
-       CalendarAsyncCallbackManager.cpp
        CalendarListenerManager.cpp
        Calendar.cpp
        CalendarManager.cpp
diff --git a/src/Calendar/CalendarAsyncCallbackManager.cpp b/src/Calendar/CalendarAsyncCallbackManager.cpp
deleted file mode 100755 (executable)
index 02b5f4d..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-//
-// Tizen Web Device API
-// Copyright (c) 2012 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Apache License, Version 2.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-
-#include "CalendarAsyncCallbackManager.h"
-
-namespace DeviceAPI {
-namespace Calendar {
-
-SINGLETON_IMPLEMENTATION(CalendarAsyncCallbackManager)
-
-} // Calendar
-} // DeviceAPI
old mode 100644 (file)
new mode 100755 (executable)
index 902632d..d5522f7
 
 #include "CalendarResponseDispatcher.h"
 #include <CommonsJavaScript/JSCallbackManager.h>
-#include <JSTizenException.h>
-#include <JSTizenExceptionFactory.h>
+#include <JSWebAPIErrorFactory.h>
 #include "CalendarConverter.h"
 #include "JSCalendarEventId.h"
 #include "CalendarMultiCallback.h"
 #include "EventId.h"
-#include "CalendarAsyncCallbackManager.h"
+
 #include <Logger.h>
+#include <GlobalContextManager.h>
 
 using namespace WrtDeviceApis::Commons;
 using namespace WrtDeviceApis::CommonsJavaScript;
+using namespace DeviceAPI::Common;
 
 namespace DeviceAPI {
 namespace Calendar {
@@ -57,14 +58,17 @@ void CalendarResponseDispatcher::OnAnswerReceived(const IEventGetCalendarsPtr &e
 {
     JSCallbackManagerPtr cbm = DPL::StaticPointerCast<JSCallbackManager>(event->getPrivateData());
     if (!cbm) {
-        LoggerE("no callback manager");
-        return;
+               LoggerE("no callback manager");
+               return;
+    }
+
+    if( !GlobalContextManager::getInstance()->isAliveGlobalContext(cbm->getContext())){
+        LoggerW("Global context invalidated.");
+           return;
     }
 
     Try
     {  
-               CalendarAsyncCallbackManagerSingleton::Instance().unregisterCallbackManager(cbm);
-
         if (event->getResult()) {
             CalendarConverter converter(cbm->getContext());
             const std::vector<ICalendarPtr> &results = event->getCalendars();
@@ -78,8 +82,8 @@ void CalendarResponseDispatcher::OnAnswerReceived(const IEventGetCalendarsPtr &e
     {
         LoggerE("error during processing answer");
     }
-    JSValueRef errorObject = DeviceAPI::Common::JSTizenExceptionFactory::makeErrorObject(
-            cbm->getContext(), DeviceAPI::Common::JSTizenException::UNKNOWN_ERROR);
+    JSValueRef errorObject = DeviceAPI::Common::JSWebAPIErrorFactory::makeErrorObject(
+            cbm->getContext(), DeviceAPI::Common::JSWebAPIErrorFactory::UNKNOWN_ERROR);
     cbm->callOnError(errorObject);
 }
 
@@ -89,11 +93,14 @@ void CalendarResponseDispatcher::OnAnswerReceived(const IEventAddEventsPtr &even
     Try
     {
         if (!cbm) {
-            LoggerD("no callback manager");
-            return;
+                       LoggerD("no callback manager");
+                       return;
         }
 
-               CalendarAsyncCallbackManagerSingleton::Instance().unregisterCallbackManager(cbm);
+           if( !GlobalContextManager::getInstance()->isAliveGlobalContext(cbm->getContext())){
+               LoggerW("Global context invalidated.");
+                   return;
+           }
 
         if (event->getResult()) {
             LoggerD("result success");
@@ -115,8 +122,8 @@ void CalendarResponseDispatcher::OnAnswerReceived(const IEventAddEventsPtr &even
     {
         LoggerE("cannot convert event");
     }
-    JSValueRef errorObject = DeviceAPI::Common::JSTizenExceptionFactory::makeErrorObject(
-            cbm->getContext(), DeviceAPI::Common::JSTizenException::UNKNOWN_ERROR);
+    JSValueRef errorObject = DeviceAPI::Common::JSWebAPIErrorFactory::makeErrorObject(
+            cbm->getContext(), DeviceAPI::Common::JSWebAPIErrorFactory::UNKNOWN_ERROR);
     cbm->callOnError(errorObject);
 }
 
@@ -128,13 +135,16 @@ void CalendarResponseDispatcher::OnAnswerReceived(const IEventUpdateEventsPtr &e
         return;
     }
 
-       CalendarAsyncCallbackManagerSingleton::Instance().unregisterCallbackManager(cbm);
+    if( !GlobalContextManager::getInstance()->isAliveGlobalContext(cbm->getContext())){
+               LoggerW("Global context invalidated.");
+               return;
+    }
 
     if (event->getResult()) {
         cbm->callOnSuccess();
     } else {
-        JSValueRef errorObject = DeviceAPI::Common::JSTizenExceptionFactory::makeErrorObject(
-                cbm->getContext(), DeviceAPI::Common::JSTizenException::UNKNOWN_ERROR);
+        JSValueRef errorObject = DeviceAPI::Common::JSWebAPIErrorFactory::makeErrorObject(
+                cbm->getContext(), DeviceAPI::Common::JSWebAPIErrorFactory::UNKNOWN_ERROR);
         cbm->callOnError(errorObject);
     }
 }
@@ -147,7 +157,10 @@ void CalendarResponseDispatcher::OnAnswerReceived(const IEventDeleteEventsPtr &e
         return;
     }
 
-       CalendarAsyncCallbackManagerSingleton::Instance().unregisterCallbackManager(cbm);
+    if( !GlobalContextManager::getInstance()->isAliveGlobalContext(cbm->getContext())){
+               LoggerW("Global context invalidated.");
+               return;
+    }
 
     if (event->getResult()) {
         cbm->callOnSuccess();
@@ -155,11 +168,11 @@ void CalendarResponseDispatcher::OnAnswerReceived(const IEventDeleteEventsPtr &e
         JSValueRef errorObject;
         if (event->getExceptionCode() ==
             ExceptionCodes::NotFoundException) {
-            errorObject = DeviceAPI::Common::JSTizenExceptionFactory::makeErrorObject(
-                    cbm->getContext(), DeviceAPI::Common::JSTizenException::NOT_FOUND_ERROR);
+            errorObject = DeviceAPI::Common::JSWebAPIErrorFactory::makeErrorObject(
+                    cbm->getContext(), DeviceAPI::Common::JSWebAPIErrorFactory::NOT_FOUND_ERROR);
         } else {
-            errorObject = DeviceAPI::Common::JSTizenExceptionFactory::makeErrorObject(
-                    cbm->getContext(), DeviceAPI::Common::JSTizenException::UNKNOWN_ERROR);
+            errorObject = DeviceAPI::Common::JSWebAPIErrorFactory::makeErrorObject(
+                    cbm->getContext(), DeviceAPI::Common::JSWebAPIErrorFactory::UNKNOWN_ERROR);
         }
         cbm->callOnError(errorObject);
     }
@@ -169,13 +182,17 @@ void CalendarResponseDispatcher::OnAnswerReceived(const IEventFindEventsPtr &eve
 {
     JSCallbackManagerPtr cbm = DPL::StaticPointerCast<JSCallbackManager>(event->getPrivateData());
     if (!cbm) {
-        LoggerE("no callback manager");
-        return;
+               LoggerE("no callback manager");
+               return;
     }
+
+    if( !GlobalContextManager::getInstance()->isAliveGlobalContext(cbm->getContext())){
+        LoggerW("Global context invalidated.");
+           return;
+    }
+
     Try
     {
-               CalendarAsyncCallbackManagerSingleton::Instance().unregisterCallbackManager(cbm);
-
         if (event->getResult()) {
             CalendarConverter converter(cbm->getContext());
 
@@ -190,14 +207,14 @@ void CalendarResponseDispatcher::OnAnswerReceived(const IEventFindEventsPtr &eve
         } else {
             JSValueRef errorObject;
             if (event->getExceptionCode() == ExceptionCodes::InvalidArgumentException) {
-                errorObject = DeviceAPI::Common::JSTizenExceptionFactory::makeErrorObject(
-                        cbm->getContext(), DeviceAPI::Common::JSTizenException::INVALID_VALUES_ERROR);
+                errorObject = DeviceAPI::Common::JSWebAPIErrorFactory::makeErrorObject(
+                        cbm->getContext(), DeviceAPI::Common::JSWebAPIErrorFactory::INVALID_VALUES_ERROR);
             } else if (event->getExceptionCode() == ExceptionCodes::NotFoundException) {
-                errorObject = DeviceAPI::Common::JSTizenExceptionFactory::makeErrorObject(
-                        cbm->getContext(), DeviceAPI::Common::JSTizenException::UNKNOWN_ERROR);
+                errorObject = DeviceAPI::Common::JSWebAPIErrorFactory::makeErrorObject(
+                        cbm->getContext(), DeviceAPI::Common::JSWebAPIErrorFactory::UNKNOWN_ERROR);
             } else {
-                errorObject = DeviceAPI::Common::JSTizenExceptionFactory::makeErrorObject(
-                        cbm->getContext(), DeviceAPI::Common::JSTizenException::UNKNOWN_ERROR);
+                errorObject = DeviceAPI::Common::JSWebAPIErrorFactory::makeErrorObject(
+                        cbm->getContext(), DeviceAPI::Common::JSWebAPIErrorFactory::UNKNOWN_ERROR);
             }
             cbm->callOnError(errorObject);
             return;
@@ -206,8 +223,8 @@ void CalendarResponseDispatcher::OnAnswerReceived(const IEventFindEventsPtr &eve
     Catch(Exception)
     {
         LoggerE("error during processing answer");
-        JSValueRef errorObject = DeviceAPI::Common::JSTizenExceptionFactory::makeErrorObject(
-                cbm->getContext(), DeviceAPI::Common::JSTizenException::UNKNOWN_ERROR);
+        JSValueRef errorObject = DeviceAPI::Common::JSWebAPIErrorFactory::makeErrorObject(
+                cbm->getContext(), DeviceAPI::Common::JSWebAPIErrorFactory::UNKNOWN_ERROR);
         cbm->callOnError(errorObject);
     }
 }
@@ -222,7 +239,10 @@ void CalendarResponseDispatcher::OnAnswerReceived(const IEventExpandEventRecurre
             return;
         }
 
-               CalendarAsyncCallbackManagerSingleton::Instance().unregisterCallbackManager(cbm);
+           if( !GlobalContextManager::getInstance()->isAliveGlobalContext(cbm->getContext())){
+                       LoggerW("Global context invalidated.");
+                       return;
+           }
 
         if (event->getResult()) {
             CalendarConverter converter(cbm->getContext());
@@ -231,14 +251,14 @@ void CalendarResponseDispatcher::OnAnswerReceived(const IEventExpandEventRecurre
         } else {
             JSValueRef errorObject;
             if (event->getExceptionCode()==ExceptionCodes::InvalidArgumentException) {
-                errorObject = DeviceAPI::Common::JSTizenExceptionFactory::makeErrorObject(
-                        cbm->getContext(), DeviceAPI::Common::JSTizenException::INVALID_VALUES_ERROR);
+                errorObject = DeviceAPI::Common::JSWebAPIErrorFactory::makeErrorObject(
+                        cbm->getContext(), DeviceAPI::Common::JSWebAPIErrorFactory::INVALID_VALUES_ERROR);
             } else if (event->getExceptionCode()==ExceptionCodes::NotFoundException) {
-                errorObject = DeviceAPI::Common::JSTizenExceptionFactory::makeErrorObject(
-                        cbm->getContext(), DeviceAPI::Common::JSTizenException::NOT_FOUND_ERROR);
+                errorObject = DeviceAPI::Common::JSWebAPIErrorFactory::makeErrorObject(
+                        cbm->getContext(), DeviceAPI::Common::JSWebAPIErrorFactory::NOT_FOUND_ERROR);
             } else {
-                errorObject = DeviceAPI::Common::JSTizenExceptionFactory::makeErrorObject(
-                        cbm->getContext(), DeviceAPI::Common::JSTizenException::UNKNOWN_ERROR);
+                errorObject = DeviceAPI::Common::JSWebAPIErrorFactory::makeErrorObject(
+                        cbm->getContext(), DeviceAPI::Common::JSWebAPIErrorFactory::UNKNOWN_ERROR);
             }
             cbm->callOnError(errorObject);
             return;
@@ -247,8 +267,8 @@ void CalendarResponseDispatcher::OnAnswerReceived(const IEventExpandEventRecurre
     Catch(Exception)
     {
         LoggerE("error during processing answer");
-        JSValueRef errorObject = DeviceAPI::Common::JSTizenExceptionFactory::makeErrorObject(
-                cbm->getContext(), DeviceAPI::Common::JSTizenException::UNKNOWN_ERROR);
+        JSValueRef errorObject = DeviceAPI::Common::JSWebAPIErrorFactory::makeErrorObject(
+                cbm->getContext(), DeviceAPI::Common::JSWebAPIErrorFactory::UNKNOWN_ERROR);
         cbm->callOnError(errorObject);
     }
 }
old mode 100644 (file)
new mode 100755 (executable)
index 10e7875..4c68611
@@ -15,6 +15,7 @@
 // limitations under the License.
 //
 
+
 #include "ICalendar.h"
 #include "EventId.h"
 #include "CalendarFactory.h"
 #include <CommonsJavaScript/Utils.h>
 #include <CommonsJavaScript/Validator.h>
 #include <CommonsJavaScript/ScopedJSStringRef.h>
-#include <JSTizenException.h>
-#include <JSTizenExceptionFactory.h>
+#include <JSWebAPIErrorFactory.h>
 #include <SecurityExceptions.h>
 #include <TimeUtilConverter.h>
 #include <TimeTracer.h>
 #include <Logger.h>
 #include <Export.h>
+#include <GlobalContextManager.h>
 
 #include "JSCalendarManager.h"
 #include "CalendarConverter.h"
@@ -45,7 +46,6 @@
 #include "CalendarMultiCallback.h"
 #include "CalendarFilterConverter.h"
 
-#include "CalendarAsyncCallbackManager.h"
 #include "CalendarListenerManager.h"
 
 using namespace WrtDeviceApis::Commons;
@@ -57,6 +57,9 @@ using namespace DeviceAPI::Common;
 namespace DeviceAPI {
 namespace Calendar {
 
+using WrtDeviceApis::Commons::UnknownException;
+using WrtDeviceApis::Commons::NotFoundException;
+
 JSClassDefinition JSCalendar::m_classInfo = {
     0,
     kJSClassAttributeNone,
@@ -198,22 +201,22 @@ JSValueRef JSCalendar::add(JSContextRef context,
     Catch(UnsupportedException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(InvalidArgumentException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(ConversionException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(Exception)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
     }
 }
 
@@ -240,7 +243,7 @@ JSValueRef JSCalendar::addBatch(JSContextRef context,
 
         ICalendarPtr calendar = getCalendar(context, thisObject, NULL);
 
-        JSContextRef globalContext = privateObject->getContext();
+        JSContextRef globalContext = GlobalContextManager::getInstance()->getGlobalContext(context);
         CalendarConverter converter(context);
 
         if (argumentCount<1) {
@@ -275,30 +278,28 @@ JSValueRef JSCalendar::addBatch(JSContextRef context,
         dplEvent->setForAsynchronousCall(&CalendarResponseDispatcher::getInstance());
         calendar->addEvents(dplEvent);
 
-               CalendarAsyncCallbackManagerSingleton::Instance().registerCallbackManager(cbm, globalContext);
-
                TIME_TRACER_ITEM_END(__FUNCTION__, 0);
         return JSValueMakeUndefined(context);
     }
     Catch(UnsupportedException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(InvalidArgumentException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(ConversionException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(Exception)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
     }
 }
 
@@ -366,27 +367,27 @@ JSValueRef JSCalendar::update(JSContextRef context,
     Catch(UnsupportedException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(InvalidArgumentException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(ConversionException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
     }
     Catch (NotFoundException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_FOUND_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_FOUND_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(Exception)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
     }
 }
 
@@ -411,7 +412,7 @@ JSValueRef JSCalendar::updateBatch(JSContextRef context,
             ThrowMsg(ConversionException, "Object is null.");
         }
 
-        JSContextRef globalContext = privateObject->getContext();
+        JSContextRef globalContext = GlobalContextManager::getInstance()->getGlobalContext(context);
 
         ICalendarPtr calendar = getCalendar(context, thisObject, exception);
 
@@ -456,35 +457,33 @@ JSValueRef JSCalendar::updateBatch(JSContextRef context,
         dplEvent->setForAsynchronousCall(&CalendarResponseDispatcher::getInstance());
         calendar->updateEvents(dplEvent);
 
-               CalendarAsyncCallbackManagerSingleton::Instance().registerCallbackManager(cbm, globalContext);
-
                TIME_TRACER_ITEM_END(__FUNCTION__, 0);
         return JSValueMakeUndefined(context);
     }
     Catch(UnsupportedException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(InvalidArgumentException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(ConversionException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
     }
     Catch (NotFoundException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_FOUND_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_FOUND_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(Exception)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
     }
 }
 
@@ -558,27 +557,27 @@ JSValueRef JSCalendar::remove(JSContextRef context,
     Catch(UnsupportedException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(InvalidArgumentException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(ConversionException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
     }
     Catch (NotFoundException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_FOUND_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_FOUND_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(Exception)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
     }
 }
 
@@ -604,7 +603,7 @@ JSValueRef JSCalendar::removeBatch(JSContextRef context,
         }
 
         ICalendarPtr calendar = getCalendar(context, thisObject, exception);
-        JSContextRef globalContext = privateObject->getContext();
+        JSContextRef globalContext = GlobalContextManager::getInstance()->getGlobalContext(context);
 
         CalendarConverter converter(context);
 
@@ -667,34 +666,33 @@ JSValueRef JSCalendar::removeBatch(JSContextRef context,
         dplEvent->setForAsynchronousCall(&CalendarResponseDispatcher::getInstance());
         calendar->deleteEvents(dplEvent);
 
-               CalendarAsyncCallbackManagerSingleton::Instance().registerCallbackManager(cbm, globalContext);
                TIME_TRACER_ITEM_END(__FUNCTION__, 0);
         return JSValueMakeUndefined(context);
     }
     Catch(UnsupportedException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(InvalidArgumentException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(ConversionException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
     }
     Catch (NotFoundException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_FOUND_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_FOUND_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(Exception)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
     }
 }
 
@@ -721,7 +719,7 @@ JSValueRef JSCalendar::find(JSContextRef context,
 
         ICalendarPtr calendar = getCalendar(context, thisObject, exception);
 
-        JSContextRef globalContext = privateObject->getContext();
+        JSContextRef globalContext = GlobalContextManager::getInstance()->getGlobalContext(context);
 
         Validator validator(context, exception);
         CalendarConverter converter(context);
@@ -775,34 +773,33 @@ JSValueRef JSCalendar::find(JSContextRef context,
 
         calendar->findEvents(dplEvent);
 
-               CalendarAsyncCallbackManagerSingleton::Instance().registerCallbackManager(cbm, globalContext);
                TIME_TRACER_ITEM_END(__FUNCTION__, 0);
                return JSValueMakeUndefined(context);
     }
     Catch(UnsupportedException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(InvalidArgumentException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(ConversionException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
     }
     Catch (NotFoundException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_FOUND_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_FOUND_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(Exception)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
     }
 }
 
@@ -828,7 +825,7 @@ JSValueRef JSCalendar::get(JSContextRef context,
         }
 
         ICalendarPtr calendar = getCalendar(context, thisObject, exception);
-        JSContextRef globalContext = privateObject->getContext();
+        JSContextRef globalContext = GlobalContextManager::getInstance()->getGlobalContext(context);
 
         EventIdPtr itemId;
         CalendarConverter converter(context);
@@ -885,27 +882,27 @@ JSValueRef JSCalendar::get(JSContextRef context,
     Catch(UnsupportedException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(InvalidArgumentException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(ConversionException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
     }
     Catch (NotFoundException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_FOUND_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_FOUND_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(Exception)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
     }
 }
 
@@ -931,7 +928,7 @@ JSValueRef JSCalendar::addChangeListener(JSContextRef context,
         }
 
         ICalendarPtr calendar = getCalendar(context, thisObject, exception);
-        JSContextRef globalContext = privateObject->getContext();
+        JSContextRef globalContext = GlobalContextManager::getInstance()->getGlobalContext(context);
 
         CalendarConverter converter(context);
 
@@ -1007,22 +1004,22 @@ JSValueRef JSCalendar::addChangeListener(JSContextRef context,
     Catch(UnsupportedException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(InvalidArgumentException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(ConversionException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(Exception)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
     }
 }
 
@@ -1049,7 +1046,7 @@ JSValueRef JSCalendar::removeChangeListener(JSContextRef context,
 
         ICalendarPtr calendar = getCalendar(context, thisObject, exception);
 
-        JSContextRef globalContext = privateObject->getContext();
+        JSContextRef globalContext = GlobalContextManager::getInstance()->getGlobalContext(context);
 
         long watchId = -1;
         CalendarConverter converter(context);
@@ -1076,27 +1073,27 @@ JSValueRef JSCalendar::removeChangeListener(JSContextRef context,
     Catch(UnsupportedException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(InvalidArgumentException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(ConversionException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
     }
     Catch (NotFoundException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_FOUND_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_FOUND_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(Exception)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
     }
 }
 
index 41110c5..39beb03 100755 (executable)
@@ -18,8 +18,7 @@
 
 #include "JSCalendarAlarm.h"
 #include "CalendarConverter.h"
-#include <JSTizenException.h>
-#include <JSTizenExceptionFactory.h>
+#include <JSWebAPIErrorFactory.h>
 #include <CommonsJavaScript/Converter.h>
 #include <TimeUtilConverter.h>
 #include <JSTZDate.h>
@@ -169,30 +168,22 @@ JSObjectRef DLL_EXPORT JSCalendarAlarm::constructor(JSContextRef context,
     Catch(UnsupportedException)
     {
         LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-               JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
-        *exception = error;
-               return error;
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(InvalidArgumentException)
     {
         LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-               JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
-        *exception = error;
-               return error;
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(ConversionException)
     {
         LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-               JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
-        *exception = error;
-               return error;
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(Exception)
     {
         LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-               JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
-        *exception = error;
-               return error;
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
     }
 }
 
index d2c1862..089e0ba 100755 (executable)
@@ -16,8 +16,7 @@
 //
 
 #include "JSCalendarAttendee.h"
-#include <JSTizenException.h>
-#include <JSTizenExceptionFactory.h>
+#include <JSWebAPIErrorFactory.h>
 #include <CommonsJavaScript/Converter.h>
 #include "CalendarConverter.h"
 
@@ -190,30 +189,22 @@ JSObjectRef DLL_EXPORT JSCalendarAttendee::constructor(JSContextRef context,
     Catch(UnsupportedException)
     {
         LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-               JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
-        *exception = error;
-               return error;
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(InvalidArgumentException)
     {
         LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-               JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
-        *exception = error;
-               return error;
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(ConversionException)
     {
         LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-               JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
-        *exception = error;
-               return error;
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(Exception)
     {
         LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-               JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
-        *exception = error;
-               return error;
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
     }
 }
 
index dd52fb3..d0987f7 100755 (executable)
 #include "CalendarResponseDispatcher.h"
 #include <TimeUtilConverter.h>
 #include <JSTZDate.h>
-#include <JSTizenException.h>
-#include <JSTizenExceptionFactory.h>
+#include <JSWebAPIErrorFactory.h>
 #include <SecurityExceptions.h>
-#include "CalendarAsyncCallbackManager.h"
 #include <GlobalContextManager.h>
 #include <TimeTracer.h>
 #include <Logger.h>
@@ -49,6 +47,9 @@ using namespace DeviceAPI::Time;
 namespace DeviceAPI {
 namespace Calendar {
 
+using WrtDeviceApis::Commons::UnknownException;
+using WrtDeviceApis::Commons::NotFoundException;
+
 JSClassDefinition JSCalendarEvent::m_classInfo = {
     0,
     kJSClassAttributeNone,
@@ -176,30 +177,22 @@ JSObjectRef DLL_EXPORT JSCalendarEvent::constructor(JSContextRef context,
     Catch(UnsupportedException)
     {
         LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-               JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
-        *exception = error;
-               return error;
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(InvalidArgumentException)
     {
         LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-               JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
-        *exception = error;
-               return error;
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(ConversionException)
     {
         LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-               JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
-        *exception = error;
-               return error;
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(Exception)
     {
         LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-               JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
-        *exception = error;
-               return error;
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
     }
 }
 
@@ -282,7 +275,7 @@ JSValueRef JSCalendarEvent::expandRecurrence(JSContextRef context,
             ThrowMsg(ConversionException, "Parameter conversion failed.");
         }
 
-        JSContextRef globalContext = privateObject->getContext();
+        JSContextRef globalContext = GlobalContextManager::getInstance()->getGlobalContext(context);
         CalendarConverter converter(context);
 
         std::time_t startDate = 0;
@@ -328,34 +321,33 @@ JSValueRef JSCalendarEvent::expandRecurrence(JSContextRef context,
         dplEvent->setEndDate(endDate);
         m_calendar->expandEventRecurrence(dplEvent);
 
-               CalendarAsyncCallbackManagerSingleton::Instance().registerCallbackManager(cbm, globalContext);
                TIME_TRACER_ITEM_END(__FUNCTION__, 0);
         return JSValueMakeUndefined(context);
     }
     Catch(UnsupportedException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(InvalidArgumentException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(ConversionException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
     }
     Catch (NotFoundException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_FOUND_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_FOUND_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(Exception)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
     }
 }
 
@@ -457,7 +449,7 @@ bool JSCalendarEvent::setPropertyRecurrenceRule(JSContextRef context,
         event = getPrivateObject(object);
         if (event->getIsDetached()) {
             LoggerW("Can't set the recurrenceRule of a detached event!");
-            DeviceAPI::Common::JSTizenExceptionFactory::postException(context, exception, DeviceAPI::Common::JSTizenException::NOT_SUPPORTED_ERROR);
+            DeviceAPI::Common::JSWebAPIErrorFactory::postException(context, exception, DeviceAPI::Common::JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR);
         }
 
                if (JSValueIsNull(context, value)) {
index 16e49c0..a4fa7ff 100755 (executable)
@@ -17,8 +17,7 @@
 
 #include "JSCalendarEventId.h"
 #include "CalendarConverter.h"
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 #include <CommonsJavaScript/Converter.h>
 #include <TimeUtilConverter.h>
 #include <JSTZDate.h>
@@ -169,30 +168,22 @@ JSObjectRef DLL_EXPORT JSCalendarEventId::constructor(JSContextRef context,
     Catch(UnsupportedException)
     {
         LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-               JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
-        *exception = error;
-               return error;
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(InvalidArgumentException)
     {
         LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-               JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
-        *exception = error;
-               return error;
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(ConversionException)
     {
         LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-               JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
-        *exception = error;
-               return error;
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(Exception)
     {
         LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-               JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
-        *exception = error;
-               return error;
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
     }
 }
 
index 20bad95..23c110c 100755 (executable)
@@ -19,8 +19,7 @@
 #include <CommonsJavaScript/PrivateObject.h>
 #include <CommonsJavaScript/Converter.h>
 #include <CommonsJavaScript/JSUtils.h>
-#include <JSTizenException.h>
-#include <JSTizenExceptionFactory.h>
+#include <JSWebAPIErrorFactory.h>
 #include <SecurityExceptions.h>
 #include <TimeUtilConverter.h>
 #include <JSTZDate.h>
@@ -50,6 +49,9 @@ using namespace DeviceAPI::Time;
 namespace DeviceAPI {
 namespace Calendar {
 
+using WrtDeviceApis::Commons::UnknownException;
+using WrtDeviceApis::Commons::NotFoundException;
+
 #define TIZEN_CALENDAR_ITEM_PROPERTIES_ATTRIBUTENAME "CalendarItemProperties"
 
 JSClassDefinition JSCalendarItemProperties::m_classInfo = {
@@ -239,27 +241,27 @@ JSValueRef JSCalendarItemProperties::convertToString(JSContextRef context,
     Catch(UnsupportedException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(InvalidArgumentException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(ConversionException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
     }
     Catch (NotFoundException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_FOUND_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_FOUND_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(Exception)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
     }
 }
 
@@ -289,7 +291,7 @@ JSValueRef JSCalendarItemProperties::clone(JSContextRef context,
         if (!item) {
             ThrowMsg(ConversionException, "Parameter conversion failed.");
         }
-        JSContextRef globalContext = privateObject->getContext();
+        JSContextRef globalContext = GlobalContextManager::getInstance()->getGlobalContext(context);
 
         // Call the copy constructor.
         CalendarEventPtr clonedItem( new CalendarEvent(*item));
@@ -312,27 +314,27 @@ JSValueRef JSCalendarItemProperties::clone(JSContextRef context,
     Catch(UnsupportedException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(InvalidArgumentException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(ConversionException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
     }
     Catch (NotFoundException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_FOUND_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_FOUND_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(Exception)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
     }
 }
 
@@ -849,7 +851,7 @@ bool JSCalendarItemProperties::setPropertyDuration(JSContextRef context,
         long length = converter.getDurationLength(value);
         int unit = converter.getDurationUnit(value);
         if (length < 0) {
-            DeviceAPI::Common::JSTizenExceptionFactory::postException(context, exception, DeviceAPI::Common::JSTizenException::INVALID_VALUES_ERROR);
+            DeviceAPI::Common::JSWebAPIErrorFactory::postException(context, exception, DeviceAPI::Common::JSWebAPIErrorFactory::INVALID_VALUES_ERROR);
             return false;
         }
         if( SECONDS_UNIT==unit ) {
@@ -863,7 +865,7 @@ bool JSCalendarItemProperties::setPropertyDuration(JSContextRef context,
         } else if ( MSECS_UNIT==unit ) {
             event->setEndTime(event->getStartTime() + length/1000);
         } else {
-            DeviceAPI::Common::JSTizenExceptionFactory::postException(context, exception, DeviceAPI::Common::JSTizenException::INVALID_VALUES_ERROR);
+            DeviceAPI::Common::JSWebAPIErrorFactory::postException(context, exception, DeviceAPI::Common::JSWebAPIErrorFactory::INVALID_VALUES_ERROR);
             return false;
         }
 
index 4e96599..27cb03c 100755 (executable)
 #include <CommonsJavaScript/PrivateObject.h>
 #include <CommonsJavaScript/Utils.h>
 #include <CommonsJavaScript/Validator.h>
-#include <JSTizenException.h>
-#include <JSTizenExceptionFactory.h>
+#include <JSWebAPIErrorFactory.h>
 #include <SecurityExceptions.h>
 #include <TimeTracer.h>
 #include <Export.h>
+#include <Logger.h>
+#include <GlobalContextManager.h>
 
 #include "JSCalendarManager.h"
 #include "JSCalendar.h"
@@ -36,9 +37,6 @@
 #include "CalendarResponseDispatcher.h"
 #include "plugin_config.h"
 
-#include "CalendarAsyncCallbackManager.h"
-
-
 using namespace WrtDeviceApis::Commons;
 using namespace WrtDeviceApis::CommonsJavaScript;
 using namespace DeviceAPI::Common;
@@ -48,6 +46,9 @@ using namespace DeviceAPI::Common;
 namespace DeviceAPI {
 namespace Calendar {
 
+using WrtDeviceApis::Commons::UnknownException;
+using WrtDeviceApis::Commons::NotFoundException;
+
 JSClassDefinition JSCalendarManager::m_classInfo = {
     0,
     kJSClassAttributeNone,
@@ -125,7 +126,7 @@ JSValueRef JSCalendarManager::getCalendars(JSContextRef context,
 
         CalendarConverter converter(context);
 
-        JSContextRef globalContext = privateObject->getContext();
+        JSContextRef globalContext = GlobalContextManager::getInstance()->getGlobalContext(context);
 
         JSCallbackManagerPtr cbm = JSCallbackManager::createObject(globalContext);
 
@@ -152,29 +153,28 @@ JSValueRef JSCalendarManager::getCalendars(JSContextRef context,
         dplEvent->setForAsynchronousCall(&CalendarResponseDispatcher::getInstance());
         privateObject->getObject()->getCalendars(dplEvent);
 
-               CalendarAsyncCallbackManagerSingleton::Instance().registerCallbackManager(cbm, globalContext);
                TIME_TRACER_ITEM_END(__FUNCTION__, 0);
         return JSValueMakeUndefined(context);
     }
     Catch(UnsupportedException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(InvalidArgumentException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(ConversionException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(Exception)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
     }
 }
 
@@ -198,7 +198,7 @@ JSValueRef JSCalendarManager::getDefaultCalendar(JSContextRef context,
         }
 
                // Global context should be passed to the calendar object.
-        JSContextRef globalContext = privateObject->getContext();
+        JSContextRef globalContext = GlobalContextManager::getInstance()->getGlobalContext(context);
 
         CalendarConverter converter(globalContext);
         CalendarEvent::CalendarType calendarType = CalendarEvent::UNDEFINED_TYPE;
@@ -227,27 +227,27 @@ JSValueRef JSCalendarManager::getDefaultCalendar(JSContextRef context,
     Catch(UnsupportedException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(InvalidArgumentException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(ConversionException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
     }
     Catch (NotFoundException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_FOUND_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_FOUND_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(Exception)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
     }
 
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
@@ -274,7 +274,7 @@ JSValueRef JSCalendarManager::getUnifiedCalendar(JSContextRef context,
         }
 
                // Global context should be passed to the calendar object.
-        JSContextRef globalContext = privateObject->getContext();
+        JSContextRef globalContext = GlobalContextManager::getInstance()->getGlobalContext(context);
 
         CalendarConverter converter(globalContext);
         CalendarEvent::CalendarType calendarType = CalendarEvent::UNDEFINED_TYPE;
@@ -303,27 +303,27 @@ JSValueRef JSCalendarManager::getUnifiedCalendar(JSContextRef context,
     Catch(UnsupportedException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(InvalidArgumentException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(ConversionException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
     }
     Catch (NotFoundException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_FOUND_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_FOUND_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(Exception)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
     }
 
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
@@ -350,7 +350,7 @@ JSValueRef JSCalendarManager::getCalendar(JSContextRef context,
         }
 
                // Global context should be passed to the calendar object.
-        JSContextRef globalContext = privateObject->getContext();
+        JSContextRef globalContext = GlobalContextManager::getInstance()->getGlobalContext(context);
 
         CalendarConverter converter(globalContext);
 
@@ -387,27 +387,27 @@ JSValueRef JSCalendarManager::getCalendar(JSContextRef context,
     Catch(UnsupportedException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(InvalidArgumentException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(ConversionException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
     }
     Catch (NotFoundException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_FOUND_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_FOUND_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(Exception)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
     }
 }
 
index 2fe383c..b1349f4 100755 (executable)
@@ -16,8 +16,7 @@
 //
 
 #include "JSCalendarRecurrenceRule.h"
-#include <JSTizenException.h>
-#include <JSTizenExceptionFactory.h>
+#include <JSWebAPIErrorFactory.h>
 #include <CommonsJavaScript/Converter.h>
 #include "CalendarConverter.h"
 #include <TimeUtilConverter.h>
@@ -189,30 +188,22 @@ JSObjectRef DLL_EXPORT JSCalendarRecurrenceRule::constructor(JSContextRef contex
     Catch(UnsupportedException)
     {
         LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-               JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
-        *exception = error;
-               return error;
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(InvalidArgumentException)
     {
         LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-               JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
-        *exception = error;
-               return error;
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(ConversionException)
     {
         LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-               JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
-        *exception = error;
-               return error;
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(Exception)
     {
         LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-               JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
-        *exception = error;
-               return error;
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
     }
 }
 
index 221548e..89ad514 100755 (executable)
@@ -19,7 +19,6 @@
 #include <CommonsJavaScript/PrivateObject.h>
 #include <CommonsJavaScript/Converter.h>
 #include <CommonsJavaScript/JSUtils.h>
-#include <JSTizenExceptionFactory.h>
 #include "EventId.h"
 #include "ICalendar.h"
 #include "CalendarFactory.h"
@@ -29,8 +28,7 @@
 #include "JSCalendarEventId.h"
 #include <TimeUtilConverter.h>
 #include <JSTZDate.h>
-#include <JSTizenException.h>
-#include <JSTizenExceptionFactory.h>
+#include <JSWebAPIErrorFactory.h>
 #include <GlobalContextManager.h>
 #include <Logger.h>
 #include <Export.h>
@@ -43,6 +41,8 @@ using namespace DeviceAPI::Time;
 namespace DeviceAPI {
 namespace Calendar {
 
+using WrtDeviceApis::Commons::UnknownException;
+
 JSClassDefinition JSCalendarTask::m_classInfo = {
     0,
     kJSClassAttributeNone,
@@ -163,30 +163,22 @@ JSObjectRef DLL_EXPORT JSCalendarTask::constructor(JSContextRef context,
     Catch(UnsupportedException)
     {
         LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-               JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
-        *exception = error;
-               return error;
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(InvalidArgumentException)
     {
         LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-               JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
-        *exception = error;
-               return error;
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(ConversionException)
     {
         LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-               JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
-        *exception = error;
-               return error;
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(Exception)
     {
         LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-               JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
-        *exception = error;
-               return error;
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
     }
 }
 
index 33890e1..9d3f423 100755 (executable)
@@ -26,7 +26,6 @@
 #include "JSCalendarEventId.h"
 #include "JSCalendarAlarm.h"
 
-#include "CalendarAsyncCallbackManager.h"
 #include "CalendarListenerManager.h"
 
 #include <TimeTracer.h>
@@ -94,7 +93,6 @@ void on_frame_unload_callback(const void * context)
 {
     LoggerD("[Tizen\\Calendar] on_frame_unload_callback (" << context << ")");
 
-       CalendarAsyncCallbackManagerSingleton::Instance().unregisterContext(static_cast<JSContextRef>(context));
        CalendarListenerManagerSingleton::Instance().unregisterContext(static_cast<JSContextRef>(context));
        DeviceAPI::Common::GlobalContextManager::getInstance()->removeGlobalContext(static_cast<JSContextRef>(context));
 }
index 69cd03b..aa894d4 100755 (executable)
@@ -2,6 +2,7 @@ SET(TARGET_NAME ${callhistory_target})
 SET(DESTINATION_NAME ${callhistory_dest})
 SET(TARGET_IMPL_NAME ${callhistory_impl})
 
+IF(ENABLE_OPTIONAL_CALL_HISTORY)
 PKG_CHECK_MODULES(platform_pkgs_callhistory REQUIRED contacts-service2 glib-2.0 libpcrecpp)
 
 INCLUDE_DIRECTORIES(
@@ -60,6 +61,7 @@ TARGET_LINK_LIBRARIES(${TARGET_NAME}
 
 INSTALL(TARGETS ${TARGET_NAME} ${TARGET_IMPL_NAME} LIBRARY DESTINATION ${DESTINATION_LIB_PREFIX}/${DESTINATION_NAME})
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/config.xml DESTINATION ${DESTINATION_LIB_PREFIX}/${DESTINATION_NAME})
+ENDIF(ENABLE_OPTIONAL_CALL_HISTORY)
 INSTALL(
        DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ DESTINATION ${DESTINATION_HEADER_PREFIX}/callhistory
        FILES_MATCHING PATTERN "*.h" PATTERN "CMakeFiles" EXCLUDE
index 3357dc0..11e4240 100755 (executable)
 #include "EventCallHistoryListener.h"
 #include "CallHistoryFactory.h"
 #include "ICallHistory.h"
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
 #include <SecurityExceptions.h>
 #include <JSUtil.h>
-#include <JSWebAPIError.h>
+#include <JSWebAPIErrorFactory.h>
 #include <ArgumentValidator.h>
 #include <TimeTracer.h>
 #include <Logger.h>
@@ -149,17 +147,14 @@ JSValueRef JSCallHistory::find(JSContextRef context, JSObjectRef object, JSObjec
 
        TIZEN_SYNC_ACCESS_HANDLER(status, context, exception);
 
-       bool bSuccess = false;
-       bool bError = false;
-
        if (argumentCount < 1) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type missmatch error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type missmatch error");
        }
 
        JSCallHistoryPriv *priv = static_cast<JSCallHistoryPriv*> (JSObjectGetPrivate(thisObject));
 
        if (!priv) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type missmatch error : Invalid private pointer");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type missmatch error : Invalid private pointer");
        }
 
        JSContextRef gContext = priv->getContext();
@@ -173,38 +168,22 @@ JSValueRef JSCallHistory::find(JSContextRef context, JSObjectRef object, JSObjec
         ArgumentValidator validator(context, argumentCount, arguments);
 
                JSObjectRef successCB = validator.toFunction(0);
-               if(successCB)
-                       bSuccess = true;
 
                JSObjectRef errCB = validator.toFunction(1, true);
-               if(errCB)
-                       bError = true;
 
                unsigned long limit = validator.toULong(4, true);
                unsigned long offset = validator.toULong(5, true);
 
-               if (argumentCount >= 1) {
-                       if (JSValueIsNull(context, arguments[0]) || JSValueIsUndefined(context, arguments[0])) {
-                               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type missmatch error : success callback ");
-                       } else if (!JSObjectIsFunction(context, converter.toJSObjectRef(arguments[0]))) {
-                               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type missmatch error : success callback ");
-                       }
-                       cbm->setOnSuccess(arguments[0]);
-               }
+               if(successCB != NULL)
+                       cbm->setOnSuccess(successCB);
 
-               if (argumentCount >= 2) {
-                       if (!JSValueIsNull(context, arguments[1]) && !JSValueIsUndefined(context, arguments[1])) {
-                               if (!JSObjectIsFunction(context, converter.toJSObjectRef(arguments[1]))) {
-                                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type missmatch error : error callback ");
-                               }
-                               cbm->setOnError(arguments[1]);
-                       }
-               }
+               if(errCB != NULL)
+                       cbm->setOnError(errCB);
 
                if (argumentCount >= 3) {
                        if (!JSValueIsNull(context, arguments[2]) && !JSValueIsUndefined(context, arguments[2])) {
                                if (!JSValueIsObject(context, arguments[2])) {
-                                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type missmatch error : filter");
+                                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type missmatch error : filter");
                                }
                        }
                }
@@ -221,6 +200,10 @@ JSValueRef JSCallHistory::find(JSContextRef context, JSObjectRef object, JSObjec
                event->setForAsynchronousCall(&ResponseDispatcher::getInstance());
 
                if (argumentCount >= 3) {
+                       if(JSValueIsUndefined(context, arguments[2])) {
+                                       throw DeviceAPI::Common::TypeMismatchException("Filter is undefined");
+                       }
+
                        if(!JSValueIsNull(context, arguments[2])){
                                FilterPtr filter = filterConverter->toFilter(arguments[2]);
 
@@ -229,12 +212,14 @@ JSValueRef JSCallHistory::find(JSContextRef context, JSObjectRef object, JSObjec
                                }else{
                                        event ->setFilter(filter);
                                }
-                       }else if(JSValueIsUndefined(context, arguments[2])) {
-                                       throw DeviceAPI::Common::TypeMismatchException("Filter is undefined");
                        }
                }
 
                if (argumentCount >= 4) {
+                       if(JSValueIsUndefined(context, arguments[3])) {
+                                       throw DeviceAPI::Common::TypeMismatchException("Sortmode is undefined");
+                       }
+
                        if (!JSValueIsNull(context, arguments[3])) {
                                DeviceAPI::Tizen::SortModePtr sortMode = filterConverter->toSortMode(arguments[3]);
 
@@ -243,8 +228,6 @@ JSValueRef JSCallHistory::find(JSContextRef context, JSObjectRef object, JSObjec
                                }else{
                                        event->setSortMode(filterConverter->toSortMode(arguments[3]));
                                }
-                       }else if(JSValueIsUndefined(context, arguments[3])) {
-                                       throw DeviceAPI::Common::TypeMismatchException("Sortmode is undefined");
                        }
                }
 
@@ -254,15 +237,15 @@ JSValueRef JSCallHistory::find(JSContextRef context, JSObjectRef object, JSObjec
                callHistory->find(event);
                CallHistoryAsyncCallbackManagerSingleton::Instance().registerCallbackManager(cbm, gContext);
        } catch(const BasePlatformException& err){
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch(const WrtDeviceApis::Commons::ConversionException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, ex.GetMessage());
        } catch(const WrtDeviceApis::Commons::InvalidArgumentException& ex) {
-               cbm->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::INVALID_VALUES_ERROR, ex.GetMessage()));
+               cbm->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, ex.GetMessage()));
        } catch(const WrtDeviceApis::Commons::PlatformException& ex) {
-               cbm->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::UNKNOWN_ERROR, ex.GetMessage()));
+               cbm->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::UNKNOWN_ERROR, ex.GetMessage()));
        } catch(const WrtDeviceApis::Commons::Exception& ex) {
-               cbm->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::UNKNOWN_ERROR, ex.GetMessage()));
+               cbm->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::UNKNOWN_ERROR, ex.GetMessage()));
        }
 
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
@@ -284,19 +267,19 @@ JSValueRef JSCallHistory::remove(JSContextRef context, JSObjectRef object, JSObj
         JSObjectRef entryObj = validator.toObject(0);
 
                if (argumentCount < 1) {
-                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type missmatch error");
+                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type missmatch error");
                }
 
                JSCallHistoryPriv *priv = static_cast<JSCallHistoryPriv*> (JSObjectGetPrivate(thisObject));
 
                if (!priv) {
-                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type missmatch error : Invalid private pointer");
+                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type missmatch error : Invalid private pointer");
                }
 
                Converter converter(context);
 
                if (!JSValueIsObjectOfClass(context, arguments[0], JSCallHistoryEntry::getClassRef())) {
-                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type missmatch error : CallHistoryEntry");
+                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type missmatch error : CallHistoryEntry");
                }
 
                ICallHistoryPtr callHistory(priv->getObject());
@@ -305,15 +288,15 @@ JSValueRef JSCallHistory::remove(JSContextRef context, JSObjectRef object, JSObj
                        callHistory->remove(entry->getEntryId());
                }
        } catch(const BasePlatformException& err){
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch(const WrtDeviceApis::Commons::ConversionException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, ex.GetMessage());
        } catch(const WrtDeviceApis::Commons::InvalidArgumentException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, ex.GetMessage());
        } catch(const WrtDeviceApis::Commons::PlatformException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, ex.GetMessage());
        } catch(const WrtDeviceApis::Commons::Exception& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, ex.GetMessage());
        }
 
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
@@ -330,13 +313,13 @@ JSValueRef JSCallHistory::removeBatch(JSContextRef context, JSObjectRef object,
        TIZEN_SYNC_ACCESS_HANDLER(status, context, exception);
 
        if (argumentCount < 1) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type missmatch error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type missmatch error");
        }
 
        JSCallHistoryPriv *priv = static_cast<JSCallHistoryPriv*> (JSObjectGetPrivate(thisObject));
 
        if (!priv) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type missmatch error : Invalid private pointer");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type missmatch error : Invalid private pointer");
        }
 
        JSContextRef gContext = priv->getContext();
@@ -352,10 +335,10 @@ JSValueRef JSCallHistory::removeBatch(JSContextRef context, JSObjectRef object,
         JSObjectRef errCB = validator.toFunction(2, true);
 
                if(successCB != NULL)
-                       cbm->setOnSuccess(arguments[1]);
+                       cbm->setOnSuccess(successCB);
 
                if(errCB != NULL)
-                       cbm->setOnError(arguments[2]);
+                       cbm->setOnError(errCB);
 
                cbm->setObject(thisObject);
 
@@ -379,18 +362,18 @@ JSValueRef JSCallHistory::removeBatch(JSContextRef context, JSObjectRef object,
                        callHistory->removeBatch(event);
                        CallHistoryAsyncCallbackManagerSingleton::Instance().registerCallbackManager(cbm, gContext);
                } else {
-                       cbm->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::INVALID_VALUES_ERROR, "Invalid values error : Entry array is empty"));
+                       cbm->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Invalid values error : Entry array is empty"));
                }
        } catch(const BasePlatformException& err){
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch(const WrtDeviceApis::Commons::ConversionException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, ex.GetMessage());
        } catch(const WrtDeviceApis::Commons::InvalidArgumentException& ex) {
-               cbm->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::INVALID_VALUES_ERROR, ex.GetMessage()));
+               cbm->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, ex.GetMessage()));
        } catch(const WrtDeviceApis::Commons::PlatformException& ex) {
-               cbm->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::UNKNOWN_ERROR, ex.GetMessage()));
+               cbm->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::UNKNOWN_ERROR, ex.GetMessage()));
        } catch(const WrtDeviceApis::Commons::Exception& ex) {
-               cbm->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::UNKNOWN_ERROR, ex.GetMessage()));
+               cbm->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::UNKNOWN_ERROR, ex.GetMessage()));
        }
 
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
@@ -409,7 +392,7 @@ JSValueRef JSCallHistory::removeAll(JSContextRef context, JSObjectRef object, JS
        JSCallHistoryPriv *priv = static_cast<JSCallHistoryPriv*> (JSObjectGetPrivate(thisObject));
 
        if (!priv) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type missmatch error : Invalid private pointer");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type missmatch error : Invalid private pointer");
        }
 
        JSContextRef gContext = priv->getContext();
@@ -437,27 +420,21 @@ JSValueRef JSCallHistory::removeAll(JSContextRef context, JSObjectRef object, JS
                callHistory->removeAll(event);
                CallHistoryAsyncCallbackManagerSingleton::Instance().registerCallbackManager(cbm, gContext);
        } catch(const BasePlatformException& err){
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch(const WrtDeviceApis::Commons::ConversionException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, ex.GetMessage());
        } catch(const WrtDeviceApis::Commons::InvalidArgumentException& ex) {
-               cbm->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::INVALID_VALUES_ERROR, ex.GetMessage()));
+               cbm->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, ex.GetMessage()));
        } catch(const WrtDeviceApis::Commons::PlatformException& ex) {
-               cbm->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::UNKNOWN_ERROR, ex.GetMessage()));
+               cbm->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::UNKNOWN_ERROR, ex.GetMessage()));
        } catch(const WrtDeviceApis::Commons::Exception& ex) {
-               cbm->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::UNKNOWN_ERROR, ex.GetMessage()));
+               cbm->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::UNKNOWN_ERROR, ex.GetMessage()));
        }
 
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
        return JSValueMakeUndefined(context);
 }
 
-JSValueRef JSCallHistory::deleteRecording(JSContextRef context, JSObjectRef object, JSObjectRef thisObject, size_t argumentCount,
-       const JSValueRef arguments[], JSValueRef* exception) {
-
-       return JSValueMakeUndefined(context);
-}
-
 JSValueRef JSCallHistory::addChangeListener(JSContextRef context, JSObjectRef object, JSObjectRef thisObject, size_t argumentCount,
        const JSValueRef arguments[], JSValueRef* exception) {
 
@@ -472,13 +449,13 @@ JSValueRef JSCallHistory::addChangeListener(JSContextRef context, JSObjectRef ob
         JSObjectRef observerObj = validator.toCallbackObject(0, false,"onadded","onchanged","onremoved",NULL);
 
                if (argumentCount < 1) {
-                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type missmatch error");
+                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type missmatch error");
                }
 
                JSCallHistoryPriv *priv = static_cast<JSCallHistoryPriv*> (JSObjectGetPrivate(thisObject));
 
                if (!priv) {
-                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type missmatch error : Invalid private pointer");
+                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type missmatch error : Invalid private pointer");
                }
 
                JSContextRef gContext = priv->getContext();
@@ -502,15 +479,15 @@ JSValueRef JSCallHistory::addChangeListener(JSContextRef context, JSObjectRef ob
                return JSUtil::toJSValueRef(context, id);
 
        } catch(const BasePlatformException& err){
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch(const WrtDeviceApis::Commons::ConversionException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, ex.GetMessage());
        } catch(const WrtDeviceApis::Commons::InvalidArgumentException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, ex.GetMessage());
        } catch(const WrtDeviceApis::Commons::PlatformException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, ex.GetMessage());
        } catch(const WrtDeviceApis::Commons::Exception& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, ex.GetMessage());
        }
 }
 
@@ -531,7 +508,7 @@ JSValueRef JSCallHistory::removeChangeListener(JSContextRef context, JSObjectRef
                JSCallHistoryPriv *priv = static_cast<JSCallHistoryPriv*> (JSObjectGetPrivate(thisObject));
 
                if (!priv) {
-                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type missmatch error : Invalid private pointer");
+                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type missmatch error : Invalid private pointer");
                }
 
                JSContextRef gContext = priv->getContext();
@@ -540,22 +517,22 @@ JSValueRef JSCallHistory::removeChangeListener(JSContextRef context, JSObjectRef
                        ICallHistoryPtr callHistory(priv->getObject());
                        callHistory->removeListener(handle);
                } else {
-                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, "Invalid values error : handle");
+                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Invalid values error : handle");
                }
 
                CallHistoryListenerCancellerPtr canceller = CallHistoryListenerCancellerPtr(new CallHistoryListenerCanceller(gContext, thisObject, handle));
                DeviceAPI::Common::IListenerItemPtr listenerItem = DPL::StaticPointerCast<DeviceAPI::Common::IListenerItem>(canceller);
                CallHistoryListenerManagerSingleton::Instance().unregisterListener(listenerItem);
        } catch(const BasePlatformException& err){
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch(const WrtDeviceApis::Commons::ConversionException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, ex.GetMessage());
        } catch(const WrtDeviceApis::Commons::InvalidArgumentException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, ex.GetMessage());
        } catch(const WrtDeviceApis::Commons::PlatformException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, ex.GetMessage());
        } catch(const WrtDeviceApis::Commons::Exception& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, ex.GetMessage());
        }
 
        return JSValueMakeUndefined(context);
index 7f8c0be..540a36b 100755 (executable)
@@ -64,10 +64,6 @@ private:
                        JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[],
                        JSValueRef* exception);
 
-       static JSValueRef deleteRecording(JSContextRef context, JSObjectRef object,
-                       JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[],
-                       JSValueRef* exception);
-
        static JSValueRef addChangeListener(JSContextRef context, JSObjectRef object,
                        JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[],
                        JSValueRef* exception);
index 87dfa97..d12e56c 100755 (executable)
@@ -24,8 +24,7 @@
 #include "CallHistoryFactory.h"
 #include "ICallHistoryEntry.h"
 #include "CallHistoryDefine.h"
-#include <JSTizenException.h>
-#include <JSTizenExceptionFactory.h>
+#include <JSWebAPIErrorFactory.h>
 #include <SecurityExceptions.h>
 #include "JSCallHistoryEntry.h"
 #include "JSRemoteParty.h"
@@ -133,7 +132,7 @@ JSValueRef JSCallHistoryEntry::getProperty(JSContextRef context,
 {
        JSCallHistoryEntryPriv *priv = static_cast<JSCallHistoryEntryPriv*>(JSObjectGetPrivate(object));
        if (!priv) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type missmatch error : Invalid private pointer");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type missmatch error : Invalid private pointer");
        }
 
        try {
@@ -161,9 +160,9 @@ JSValueRef JSCallHistoryEntry::getProperty(JSContextRef context,
                        return convert.toJSValueRef(entryInfo->getDuration());
                }
        } catch(const WrtDeviceApis::Commons::ConversionException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, ex.GetMessage());
        } catch(const WrtDeviceApis::Commons::Exception& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, ex.GetMessage());
        }
        return NULL;
 }
@@ -176,7 +175,7 @@ bool JSCallHistoryEntry::setProperty(JSContextRef context,
 {
        JSCallHistoryEntryPriv *priv = static_cast<JSCallHistoryEntryPriv*>(JSObjectGetPrivate(object));
        if (!priv) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type missmatch error : Invalid private pointer");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type missmatch error : Invalid private pointer");
        }
 
        Converter converter(context);
@@ -197,7 +196,7 @@ bool JSCallHistoryEntry::setProperty(JSContextRef context,
                        }
                } 
        } catch (const WrtDeviceApis::Commons::Exception& ex) {
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown error");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown error");
        }
 
        return false;
index 7c47482..7932144 100755 (executable)
@@ -20,8 +20,7 @@
 #include <dpl/shared_ptr.h>
 #include <CommonsJavaScript/JSUtils.h>
 #include <CommonsJavaScript/JSDOMExceptionFactory.h>
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h> 
+#include <JSWebAPIErrorFactory.h>
 #include "CallHistoryDefine.h"
 #include "RemoteParty.h"
 #include "JSRemoteParty.h"
@@ -124,7 +123,7 @@ JSValueRef JSRemoteParty::getProperty(JSContextRef context,
 {
        JSRemotePartyPriv *priv = static_cast<JSRemotePartyPriv*>(JSObjectGetPrivate(object));
        if (!priv) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type missmatch error : Invalid private pointer");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type missmatch error : Invalid private pointer");
        }
 
        try {
@@ -137,9 +136,9 @@ JSValueRef JSRemoteParty::getProperty(JSContextRef context,
                        return convert.toJSValueRef(remoteParty->getPersonId());
                }
        } catch(const WrtDeviceApis::Commons::ConversionException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, ex.GetMessage());
        } catch(const WrtDeviceApis::Commons::Exception& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, ex.GetMessage());
        }
        return NULL;
 }
index 86116c8..ae0fdcf 100755 (executable)
@@ -21,8 +21,7 @@
 #include <Commons/IEvent.h>
 #include <CommonsJavaScript/JSUtils.h>
 #include <CommonsJavaScript/JSCallbackManager.h>
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h> 
+#include <JSWebAPIErrorFactory.h>
 #include "JSCallHistory.h"
 #include "Converter.h"
 #include "CallHistoryAsyncCallbackManager.h"
@@ -62,16 +61,16 @@ void ResponseDispatcher::OnAnswerReceived(const EventFindCallHistoryPtr& event)
                try {
                        data->callOnSuccess(converter.toJSValueRef(event->getResult(), data->getContext()));
                } catch(WrtDeviceApis::Commons::ConversionException) {
-                       data->callOnError(JSTizenExceptionFactory::makeErrorObject(data->getContext(), JSTizenException::UNKNOWN_ERROR, "Unknown error"));
+                       data->callOnError(JSWebAPIErrorFactory::makeErrorObject(data->getContext(), JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown error"));
                } catch(WrtDeviceApis::Commons::Exception) {
-                       data->callOnError(JSTizenExceptionFactory::makeErrorObject(data->getContext(), JSTizenException::UNKNOWN_ERROR, "Unknown error"));
+                       data->callOnError(JSWebAPIErrorFactory::makeErrorObject(data->getContext(), JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown error"));
                }
        } else {
                JSObjectRef jsException = NULL;
                if (event->getExceptionCode() == WrtDeviceApis::Commons::ExceptionCodes::SecurityException) {
-                       jsException = JSTizenExceptionFactory::makeErrorObject(data->getContext(), JSTizenException::PERMISSION_DENIED_ERROR, "Permission denied error");
+                       jsException = JSWebAPIErrorFactory::makeErrorObject(data->getContext(), JSWebAPIErrorFactory::PERMISSION_DENIED_ERROR, "Permission denied error");
                } else {
-                       jsException = JSTizenExceptionFactory::makeErrorObject(data->getContext(), JSTizenException::UNKNOWN_ERROR, "Unknown error");
+                       jsException = JSWebAPIErrorFactory::makeErrorObject(data->getContext(), JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown error");
                }
                data->callOnError(jsException);
        }
@@ -90,9 +89,9 @@ void ResponseDispatcher::OnAnswerReceived(const EventRemoveBatchPtr& event)
        } else {
                JSObjectRef jsException = NULL;
                if (event->getExceptionCode() == WrtDeviceApis::Commons::ExceptionCodes::SecurityException) {
-                       jsException = JSTizenExceptionFactory::makeErrorObject(data->getContext(), JSTizenException::PERMISSION_DENIED_ERROR, "Permission denied error");
+                       jsException = JSWebAPIErrorFactory::makeErrorObject(data->getContext(), JSWebAPIErrorFactory::PERMISSION_DENIED_ERROR, "Permission denied error");
                } else {
-                       jsException = JSTizenExceptionFactory::makeErrorObject(data->getContext(), JSTizenException::UNKNOWN_ERROR, "Unknown error");
+                       jsException = JSWebAPIErrorFactory::makeErrorObject(data->getContext(), JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown error");
                }
                data->callOnError(jsException);
        }
@@ -111,9 +110,9 @@ void ResponseDispatcher::OnAnswerReceived(const EventRemoveAllPtr& event)
        } else {
                JSObjectRef jsException = NULL;
                if (event->getExceptionCode() == WrtDeviceApis::Commons::ExceptionCodes::SecurityException) {
-                       jsException = JSTizenExceptionFactory::makeErrorObject(data->getContext(), JSTizenException::PERMISSION_DENIED_ERROR, "Permission denied error");
+                       jsException = JSWebAPIErrorFactory::makeErrorObject(data->getContext(), JSWebAPIErrorFactory::PERMISSION_DENIED_ERROR, "Permission denied error");
                } else {
-                       jsException = JSTizenExceptionFactory::makeErrorObject(data->getContext(), JSTizenException::UNKNOWN_ERROR, "Unknown error");
+                       jsException = JSWebAPIErrorFactory::makeErrorObject(data->getContext(), JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown error");
                }
                data->callOnError(jsException);
        }
index fa5b548..0394933 100755 (executable)
@@ -1,17 +1,14 @@
 SET(SRCS
-  JSTizenException.cpp
-  TizenExceptionData.cpp
-  JSTizenExceptionFactory.cpp
-  JSWebAPIError.cpp
-  JSWebAPIException.cpp
   CallbackUserData.cpp
   GlobalContextManager.cpp
   ArgumentValidator.cpp
   JSUtil.cpp
   PlatformException.cpp
   MultiCallbackUserData.cpp
+  JSStringRefWrapper.cpp
   JSWebAPIErrorFactory.cpp
-  JSWebAPIError2.cpp
+  JSWebAPIError.cpp
+  JSWebAPIException.cpp
   WebAPIError.cpp
   PropertyBag.cpp
   JSArray.cpp
diff --git a/src/Common/JSStringRefWrapper.cpp b/src/Common/JSStringRefWrapper.cpp
new file mode 100644 (file)
index 0000000..b0aa69c
--- /dev/null
@@ -0,0 +1,83 @@
+//
+// Tizen Web Device API
+// Copyright (c) 2012 Samsung Electronics Co., Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the License);
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#include "JSStringRefWrapper.h"
+
+namespace DeviceAPI {
+namespace Common {
+
+JSStringRefWrapper::JSStringRefWrapper(JSStringRefWrapper &obj) : m_ref(NULL)
+{
+       JSStringRef ref = obj.m_ref;
+       if(ref)
+       {
+               const JSChar* chars = JSStringGetCharactersPtr(ref);
+               size_t numChars = JSStringGetLength(ref);
+
+               m_ref = JSStringCreateWithCharacters(chars, numChars);
+       }
+}
+
+JSStringRefWrapper::JSStringRefWrapper(JSStringRef ref) : m_ref(ref)
+{
+}
+
+JSStringRefWrapper::JSStringRefWrapper(const std::string str)
+{
+       m_ref = JSStringCreateWithUTF8CString(str.c_str());
+}
+
+JSStringRefWrapper::JSStringRefWrapper(const char * str)
+{
+       m_ref = JSStringCreateWithUTF8CString(str);
+}
+
+JSStringRefWrapper::~JSStringRefWrapper()
+{
+       if (m_ref != NULL)
+               JSStringRelease(m_ref);
+}
+
+JSStringRefWrapper & JSStringRefWrapper::operator=(const JSStringRefWrapper &obj)
+{
+       JSStringRef ref = obj.m_ref;
+
+       if (m_ref != NULL)
+               JSStringRelease(m_ref);
+
+       if(ref)
+       {
+               const JSChar* chars = JSStringGetCharactersPtr(ref);
+               size_t numChars = JSStringGetLength(ref);
+
+               m_ref = JSStringCreateWithCharacters(chars, numChars);
+       }
+       else
+       {
+               m_ref = NULL;
+       }
+
+       return *this;
+}
+
+JSStringRef JSStringRefWrapper::get() const
+{
+       return m_ref;
+}
+
+} // Common
+} // DeviceAPI
old mode 100755 (executable)
new mode 100644 (file)
similarity index 57%
rename from src/Calendar/CalendarAsyncCallbackManager.h
rename to src/Common/JSStringRefWrapper.h
index de3b6bd..f9e9dd5
 // limitations under the License.
 //
 
+#ifndef _JS_STRING_REF_WRAPPER_H_
+#define _JS_STRING_REF_WRAPPER_H_
 
-#ifndef _TIZEN_CALENDAR_ASYNC_CALLBACK_MANAGER_H_
-#define _TIZEN_CALENDAR_ASYNC_CALLBACK_MANAGER_H_
-
-#include <AsyncCallbackManager.h>
+#include <string>
+#include <JavaScriptCore/JavaScript.h>
 
 namespace DeviceAPI {
-namespace Calendar {
+namespace Common {
 
-class CalendarAsyncCallbackManager : public DeviceAPI::Common::AsyncCallbackManager
+class JSStringRefWrapper
 {
-private:
-       CalendarAsyncCallbackManager()
-       {
-       }
-
 public:
-       virtual ~CalendarAsyncCallbackManager()
-       {
-       }
+       JSStringRefWrapper(JSStringRefWrapper &obj);
+       JSStringRefWrapper(JSStringRef ref);
+       JSStringRefWrapper(const std::string str);
+       JSStringRefWrapper(const char * str);
+       virtual ~JSStringRefWrapper();
 
-       friend class CalendarAsyncCallbackManagerSingleton;
-};
+       JSStringRefWrapper & operator=(const JSStringRefWrapper &obj);
 
-SINGLETON_DEFINITION(CalendarAsyncCallbackManager)
+       JSStringRef get() const;
+
+private:
+       JSStringRef m_ref;
+};
 
-} // Calendar
+} // Common
 } // DeviceAPI
 
-#endif // _TIZEN_CALENDAR_ASYNC_CALLBACK_MANAGER_H_
+#endif // _JS_STRING_REF_WRAPPER_H_
diff --git a/src/Common/JSTizenException.cpp b/src/Common/JSTizenException.cpp
deleted file mode 100644 (file)
index 271c829..0000000
+++ /dev/null
@@ -1,142 +0,0 @@
-//
-// Tizen Web Device API
-// Copyright (c) 2012 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Apache License, Version 2.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-#include "JSTizenException.h"
-#include <CommonsJavaScript/Converter.h>
-#include "Logger.h"
-
-namespace DeviceAPI {
-namespace Common {
-
-               const std::string JSTizenException::UNKNOWN_ERROR           = "UnknownError";
-               const std::string JSTizenException::TYPE_MISMATCH_ERROR     = "TypeMismatchError";
-               const std::string JSTizenException::INVALID_VALUES_ERROR    = "InvalidValuesError";
-               const std::string JSTizenException::TIMEOUT_ERROR           = "TimeoutError";
-               const std::string JSTizenException::IO_ERROR                = "IOError";
-               const std::string JSTizenException::NOT_SUPPORTED_ERROR     = "NotSupportedError";
-               const std::string JSTizenException::PERMISSION_DENIED_ERROR = "SecurityError";
-               const std::string JSTizenException::NOT_FOUND_ERROR         = "NotFoundError";
-               const std::string JSTizenException::SERVICE_NOT_AVAILABLE   = "ServiceNotAvailableError";
-               const std::string JSTizenException::NETWORK_ERROR           = "NetworkError";
-               const std::string JSTizenException::INVALID_ACCESS_ERROR    = "InvalidAccessError";
-
-               namespace{
-                       #define PLUGIN_NAME       "TizenException"
-                       #define PROPERTY_NAME     "name"
-                       #define PROPERTY_MESSAGE  "message"
-
-                       const std::string PROPERTY_ERROR[] = {
-                                       DeviceAPI::Common::JSTizenException::UNKNOWN_ERROR,
-                                       DeviceAPI::Common::JSTizenException::TYPE_MISMATCH_ERROR,
-                                       DeviceAPI::Common::JSTizenException::INVALID_VALUES_ERROR,
-                                       DeviceAPI::Common::JSTizenException::TIMEOUT_ERROR,
-                                       DeviceAPI::Common::JSTizenException::IO_ERROR,
-                                       DeviceAPI::Common::JSTizenException::NOT_SUPPORTED_ERROR,
-                                       DeviceAPI::Common::JSTizenException::PERMISSION_DENIED_ERROR,
-                                       DeviceAPI::Common::JSTizenException::NOT_FOUND_ERROR,
-                                       DeviceAPI::Common::JSTizenException::NETWORK_ERROR,
-                                       DeviceAPI::Common::JSTizenException::INVALID_ACCESS_ERROR,
-                       };
-               }
-
-               JSClassRef JSTizenException::m_classRef = NULL;
-
-               JSClassDefinition JSTizenException::m_classInfo = {
-                       0,
-                       kJSClassAttributeNone,
-                       PLUGIN_NAME,
-                       0,
-                       m_properties,
-                       NULL, //__function,
-                       initialize,
-                       finalize,
-                       hasProperty,
-                       NULL,
-                       NULL, //SetProperty,
-                       NULL, //DeleteProperty,
-                       NULL,
-                       NULL, //CallAsFunction,
-                       NULL, //CallAsConstructor,
-                       hasInstance,
-                       NULL, //ConvertToType,
-               };
-
-               JSStaticValue JSTizenException::m_properties[] = {
-                       { PROPERTY_NAME,    getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_MESSAGE, getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { 0, 0, 0, 0 }
-               };
-
-               const JSClassDefinition* JSTizenException::getClassInfo() {
-                       return &m_classInfo;
-               }
-
-               JSClassRef JSTizenException::getClassRef() {
-                       if (!m_classRef) {
-                               m_classRef = JSClassCreate(&m_classInfo);
-                       }
-                       return m_classRef;
-               }
-
-               void JSTizenException::initialize(JSContextRef /*context*/, JSObjectRef /*object*/) {
-               }
-
-               void JSTizenException::finalize(JSObjectRef object) {
-                       PrivateObject* privateObject = static_cast<PrivateObject*> (JSObjectGetPrivate(object));
-                       if (privateObject) {
-                               JSObjectSetPrivate(object, NULL);
-                               delete privateObject;
-                       }
-               }
-
-               bool JSTizenException::hasProperty(JSContextRef /*context*/, JSObjectRef /*object*/, JSStringRef propertyName) {
-                       const size_t size = sizeof(PROPERTY_ERROR) / sizeof(PROPERTY_ERROR[0]);
-                       for (size_t i = 0; i < size; ++i) {
-                               if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_ERROR[i].c_str())) {
-                                       return true;
-                               }
-                       }
-                       return false;
-               }
-
-               JSValueRef JSTizenException::getStaticProperty(JSContextRef context, JSObjectRef object, JSStringRef propertyName, JSValueRef* /*exception*/) {
-                       PrivateObject* privateObject = static_cast<PrivateObject*> (JSObjectGetPrivate(object));
-                       if (!privateObject) {
-                               LoggerE("Private object is not set.");
-                               return JSValueMakeUndefined(context);
-                       }
-
-//                     WrtDeviceApis::CommonsJavaScript::Converter converter(context);
-//                     try {
-//                             if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_NAME)) {
-//                                     return converter.toJSValueRef(privateObject->getObject()->getName());
-//                             } else if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_MESSAGE)) {
-//                                     return converter.toJSValueRef(privateObject->getObject()->getMessage());
-//                             }
-//                     } catch (const WrtDeviceApis::Commons::ConversionException& ex) {
-//                             LoggerE("Exception: " << ex.GetMessage());
-//                     }
-
-                       return JSValueMakeUndefined(context);
-               }
-
-               bool JSTizenException::hasInstance(JSContextRef context, JSObjectRef /*constructor*/, JSValueRef possibleInstance, JSValueRef* /*exception*/) {
-                       return JSValueIsObjectOfClass(context, possibleInstance, getClassRef());
-               }
-               
-} // Common
-}// DeviceAPI
\ No newline at end of file
diff --git a/src/Common/JSTizenException.h b/src/Common/JSTizenException.h
deleted file mode 100644 (file)
index 2e60d26..0000000
+++ /dev/null
@@ -1,96 +0,0 @@
-//
-// Tizen Web Device API
-// Copyright (c) 2012 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Apache License, Version 2.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-#ifndef JSTIZENEXCEPTION_H_
-#define JSTIZENEXCEPTION_H_
-
-#include <JavaScriptCore/JavaScript.h>
-#include <CommonsJavaScript/PrivateObject.h>
-
-#include "TizenExceptionData.h"
-
-namespace DeviceAPI {
-namespace Common {
-
-               /**
-                * @deprecated
-                * TizenException is deprecated. use JSWebAPIError instead.
-               */
-               class JSTizenException {
-                       public:
-                               typedef  WrtDeviceApis::CommonsJavaScript::PrivateObjectT<TizenExceptionDataPtr>::Type PrivateObject;
-
-                       public:
-                               static const std::string UNKNOWN_ERROR;
-                               static const std::string TYPE_MISMATCH_ERROR;
-                               static const std::string INVALID_VALUES_ERROR;
-                               static const std::string TIMEOUT_ERROR;
-                               static const std::string IO_ERROR;
-                               static const std::string NOT_SUPPORTED_ERROR;
-                               static const std::string PERMISSION_DENIED_ERROR;
-                               static const std::string NOT_FOUND_ERROR;
-                               static const std::string SERVICE_NOT_AVAILABLE;
-                               static const std::string NETWORK_ERROR;
-                               static const std::string INVALID_ACCESS_ERROR;
-                         public:
-                               static JSClassRef getClassRef();
-
-                               static const JSClassDefinition* getClassInfo();
-
-                       private:
-                               /**
-                                * The callback invoked when an object is first created.
-                                */
-                               static void initialize(JSContextRef context, JSObjectRef object);
-
-                               /**
-                                * The callback invoked when an object is finalized.
-                                */
-                               static void finalize(JSObjectRef object);
-
-                               /**
-                                * The callback invoked when getting a property's value.
-                                */
-                               static bool hasProperty(JSContextRef context, JSObjectRef object, JSStringRef propertyName);
-
-                               /**
-                                * The callback invoked when getting a property's value.
-                                */
-                               static JSValueRef getStaticProperty(JSContextRef context, JSObjectRef object, JSStringRef propertyName, JSValueRef* exception);
-
-                               /**
-                                * The callback invoked when an object is used as the target of an 'instanceof' expression.
-                                */
-                               static bool hasInstance(JSContextRef context, JSObjectRef constructor, JSValueRef possibleInstance, JSValueRef* exception);
-
-                               /**
-                                * This structure contains properties and callbacks that define a type of object.
-                                */
-                               static JSClassDefinition m_classInfo;
-
-                               /**
-                                * This structure describes a statically declared value property.
-                                */
-                               static JSStaticValue m_properties[];
-
-                               static JSClassRef m_classRef;
-               };
-
-}// Common
-}// DeviceAPI
-
-#endif /* JSTIZENEXCEPTION_H_ */
diff --git a/src/Common/JSTizenExceptionFactory.cpp b/src/Common/JSTizenExceptionFactory.cpp
deleted file mode 100644 (file)
index af21cb8..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-//
-// Tizen Web Device API
-// Copyright (c) 2012 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Apache License, Version 2.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-#include "JSTizenExceptionFactory.h"
-#include <dpl/assert.h>
-#include <CommonsJavaScript/JSUtils.h>
-#include "TizenExceptionData.h"
-#include "JSWebAPIError.h"
-#include "JSWebAPIException.h"
-#include "Logger.h"
-
-namespace DeviceAPI {
-namespace Common {
-
-               JSTizenExceptionFactory::JSTizenExceptionFactory() {
-               }
-
-               JSTizenExceptionFactory::~JSTizenExceptionFactory() {
-               }
-
-               JSObjectRef JSTizenExceptionFactory::makeErrorObject(JSContextRef context, const std::string& name, const std::string& message) {
-
-                       int code = JSWebAPIError::convertToWebAPIErrorCode(name);
-
-                       JSWebAPIError::PrivateObject::ObjectType data(new TizenExceptionData(code, name, message));
-                       return WrtDeviceApis::CommonsJavaScript::JSUtils::makeObject(context, JSWebAPIError::getClassRef(), data);
-               }
-
-               JSValueRef JSTizenExceptionFactory::postException(JSContextRef context, JSValueRef* exception, const std::string& name, const std::string& message) {
-                       Assert(exception && "Exception object can't be NULL.");
-
-                       int code = JSWebAPIException::convertToWebAPIExceptionCode(name);
-
-                       JSWebAPIError::PrivateObject::ObjectType data(new TizenExceptionData(code, name, message));
-                       *exception = WrtDeviceApis::CommonsJavaScript::JSUtils::makeObject(context, JSWebAPIException::getClassRef(), data);
-                       return JSValueMakeUndefined(context);
-               }
-}// Common
-}// DeviceAP
\ No newline at end of file
diff --git a/src/Common/JSTizenExceptionFactory.h b/src/Common/JSTizenExceptionFactory.h
deleted file mode 100644 (file)
index a1723e0..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-//
-// Tizen Web Device API
-// Copyright (c) 2012 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Apache License, Version 2.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-#ifndef JSTIZENEXCEPTIONFACTORY_H_
-#define JSTIZENEXCEPTIONFACTORY_H_
-
-
-#include <string>
-#include <dpl/noncopyable.h>
-#include <JavaScriptCore/JavaScript.h>
-
-namespace DeviceAPI {
-namespace Common {
-
-               class JSTizenExceptionFactory : public DPL::Noncopyable {
-                       public:
-                               JSTizenExceptionFactory();
-                               virtual ~JSTizenExceptionFactory();
-
-                       public:
-                               static JSObjectRef makeErrorObject(JSContextRef context, const std::string& name, const std::string& message=std::string());
-                               static JSValueRef  postException  (JSContextRef context, JSValueRef* exception, const std::string& name, const std::string& message=std::string());
-               };
-
-}// Common
-}// DeviceAPI
-
-
-#endif /* JSTIZENEXCEPTIONFACTORY_H_ */
index 9f2cb98..79a944d 100644 (file)
 //
 
 #include "JSWebAPIError.h"
-#include <CommonsJavaScript/Converter.h>
-#include <CommonsJavaScript/JSUtils.h>
+
 #include <string>
+#include <map>
+#include "JSUtil.h"
 #include "Logger.h"
 
 namespace DeviceAPI {
 namespace Common {
 
-namespace{
+#define CLASS_NAME                              "WebAPIError"
+#define PROPERTY_CODE                           "code"
+#define PROPERTY_NAME                           "name"
+#define PROPERTY_TYPE                           "type"
+#define PROPERTY_MESSAGE                                               "message"
 
-                       #define PLUGIN_NAME       "WebAPIError"
-                       #define PROPERTY_CODE     "code"
-                       #define PROPERTY_NAME     "name"
-                       #define PROPERTY_TYPE     "type"
-                       #define PROPERTY_MESSAGE  "message"
+#define PROPERTY_INDEX_SIZE_ERR                 "INDEX_SIZE_ERR"
+#define PROPERTY_DOMSTRING_SIZE_ERR             "DOMSTRING_SIZE_ERR"
+#define PROPERTY_HIERARCHY_REQUEST_ERR          "HIERARCHY_REQUEST_ERR"
+#define PROPERTY_WRONG_DOCUMENT_ERR             "WRONG_DOCUMENT_ERR"
+#define PROPERTY_INVALID_CHARACTER_ERR          "INVALID_CHARACTER_ERR"
+#define PROPERTY_NO_DATA_ALLOWED_ERR            "NO_DATA_ALLOWED_ERR"
+#define PROPERTY_NO_MODIFICATION_ALLOWED_ERR    "NO_MODIFICATION_ALLOWED_ERR"
+#define PROPERTY_NOT_FOUND_ERR                  "NOT_FOUND_ERR"
+#define PROPERTY_NOT_SUPPORTED_ERR              "NOT_SUPPORTED_ERR"
+#define PROPERTY_INUSE_ATTRIBUTE_ERR            "INUSE_ATTRIBUTE_ERR"
+#define PROPERTY_INVALID_STATE_ERR              "INVALID_STATE_ERR"
+#define PROPERTY_SYNTAX_ERR                     "SYNTAX_ERR"
+#define PROPERTY_INVALID_MODIFICATION_ERR       "INVALID_MODIFICATION_ERR"
+#define PROPERTY_NAMESPACE_ERR                  "NAMESPACE_ERR"
+#define PROPERTY_INVALID_ACCESS_ERR             "INVALID_ACCESS_ERR"
+#define PROPERTY_VALIDATION_ERR                 "VALIDATION_ERR"
+#define PROPERTY_TYPE_MISMATCH_ERR              "TYPE_MISMATCH_ERR"
+#define PROPERTY_SECURITY_ERR                   "SECURITY_ERR"
+#define PROPERTY_NETWORK_ERR                    "NETWORK_ERR"
+#define PROPERTY_ABORT_ERR                      "ABORT_ERR"
+#define PROPERTY_URL_MISMATCH_ERR               "URL_MISMATCH_ERR"
+#define PROPERTY_QUOTA_EXCEEDED_ERR             "QUOTA_EXCEEDED_ERR"
+#define PROPERTY_TIMEOUT_ERR                    "TIMEOUT_ERR"
+#define PROPERTY_INVALID_NODE_TYPE_ERR          "INVALID_NODE_TYPE_ERR"
+#define PROPERTY_DATA_CLONE_ERR                 "DATA_CLONE_ERR"
 
-                       #define PROPERTY_UNKNOWN_ERR                              "UNKNOWN_ERR"
-                       #define PROPERTY_INDEX_SIZE_ERR                           "INDEX_SIZE_ERR"
-                       #define PROPERTY_DOMSTRING_SIZE_ERR                       "DOMSTRING_SIZE_ERR"
-                       #define PROPERTY_HIERARCHY_REQUEST_ERR                    "HIERARCHY_REQUEST_ERR"
-                       #define PROPERTY_WRONG_DOCUMENT_ERR                       "WRONG_DOCUMENT_ERR"
-                       #define PROPERTY_INVALID_CHARACTER_ERR                    "INVALID_CHARACTER_ERR"
-                       #define PROPERTY_NO_DATA_ALLOWED_ERR                      "NO_DATA_ALLOWED_ERR"
-                       #define PROPERTY_NO_MODIFICATION_ALLOWED_ERR              "NO_MODIFICATION_ALLOWED_ERR"
-                       #define PROPERTY_NOT_FOUND_ERR                            "NOT_FOUND_ERR"
-                       #define PROPERTY_NOT_SUPPORTED_ERR                        "NOT_SUPPORTED_ERR"
-                       #define PROPERTY_INUSE_ATTRIBUTE_ERR                      "INUSE_ATTRIBUTE_ERR"
-                       #define PROPERTY_INVALID_STATE_ERR                        "INVALID_STATE_ERR"
-                       #define PROPERTY_SYNTAX_ERR                               "SYNTAX_ERR"
-                       #define PROPERTY_INVALID_MODIFICATION_ERR                 "INVALID_MODIFICATION_ERR"
-                       #define PROPERTY_NAMESPACE_ERR                            "NAMESPACE_ERR"
-                       #define PROPERTY_INVALID_ACCESS_ERR                       "INVALID_ACCESS_ERR"
-                       #define PROPERTY_VALIDATION_ERR                           "VALIDATION_ERR"
-                       #define PROPERTY_TYPE_MISMATCH_ERR                        "TYPE_MISMATCH_ERR"
-                       #define PROPERTY_SECURITY_ERR                             "SECURITY_ERR"
-                       #define PROPERTY_NETWORK_ERR                              "NETWORK_ERR"
-                       #define PROPERTY_ABORT_ERR                                "ABORT_ERR"
-                       #define PROPERTY_URL_MISMATCH_ERR                         "URL_MISMATCH_ERR"
-                       #define PROPERTY_QUOTA_EXCEEDED_ERR                       "QUOTA_EXCEEDED_ERR"
-                       #define PROPERTY_TIMEOUT_ERR                              "TIMEOUT_ERR"
-                       #define PROPERTY_INVALID_NODE_TYPE_ERR                    "INVALID_NODE_TYPE_ERR"
-                       #define PROPERTY_DATA_CLONE_ERR                           "DATA_CLONE_ERR"
-                       #define PROPERTY_INVALID_VALUES_ERR                       "INVALID_VALUES_ERR"
-                       #define PROPERTY_IO_ERR                                   "IO_ERR"
-                       #define PROPERTY_OUT_OF_MEMORY_ERR                        "OUT_OF_MEMORY_ERR"
-                       #define PROPERTY_NOT_CONNECTED_SERVICE_ERR                "NOT_CONNECTED_SERVICE_ERR"
-                       #define PROPERTY_FAIL_TO_REQUEST_ERR                      "FAIL_TO_REQUEST_ERR"
-                       #define PROPERTY_INVALID_RESPONSE_ERR                     "INVALID_RESPONSE_ERR"
-                       #define PROPERTY_NO_AVAILABLE_NETWORK_ERR                 "NO_AVAILABLE_NETWORK_ERR"
-                       #define PROPERTY_INVALID_DEVICE_ERR                       "INVALID_DEVICE_ERR"
-                       #define PROPERTY_NOT_SUPPORTED_FUNCTION_ERR               "NOT_SUPPORTED_FUNCTION_ERR"
-                       #define PROPERTY_NO_PERMISSION_ERR                        "NO_PERMISSION_ERR"
-                       #define PROPERTY_INVALID_ITEM_ERR                         "INVALID_ITEM_ERR"
-                       #define PROPERTY_FAIL_TO_PLAY_ERR                         "FAIL_TO_PLAY_ERR"
-                       #define PROPERTY_SERVICE_NOT_AVAILABLE                    "SERVICE_NOT_AVAILABLE"
-                       #define PROPERTY_AVPLAY_NETWORK_DISCONNECTED_ERR          "AVPLAY_NETWORK_DISCONNECTED_ERR"
-                       #define PROPERTY_AVPLAY_UNSUPPORTED_VIDEO_FORMAT_ERR      "AVPLAY_UNSUPPORTED_VIDEO_FORMAT_ERR"
-                       #define PROPERTY_AVPLAY_UNSUPPORTED_AUDIO_FORMAT_ERR      "AVPLAY_UNSUPPORTED_AUDIO_FORMAT_ERR"
-                       #define PROPERTY_AVPLAY_UNSUPPORTED_VIDEO_RESOLUTION_ERR  "AVPLAY_UNSUPPORTED_VIDEO_RESOLUTION_ERR"
-                       #define PROPERTY_AVPLAY_UNSUPPORTED_VIDEO_FRAMERATE_ERR   "AVPLAY_UNSUPPORTED_VIDEO_FRAMERATE_ERR"
-                       #define PROPERTY_AVPLAY_CURRUPTED_STREAM_ERR              "AVPLAY_CURRUPTED_STREAM_ERR"
-               }
+typedef std::map<std::string, int> DeviceAPIErrorCodeMap;
 
-               JSClassRef JSWebAPIError::m_classRef = NULL;
+static DeviceAPIErrorCodeMap errorCodes = {
+       { PROPERTY_INDEX_SIZE_ERR,              1 },
+       { PROPERTY_DOMSTRING_SIZE_ERR,          2 },
+       { PROPERTY_HIERARCHY_REQUEST_ERR,       3 },
+       { PROPERTY_WRONG_DOCUMENT_ERR,          4 },
+       { PROPERTY_INVALID_CHARACTER_ERR,       5 },
+       { PROPERTY_NO_DATA_ALLOWED_ERR,         6 },
+       { PROPERTY_NO_MODIFICATION_ALLOWED_ERR, 7 },
+       { PROPERTY_NOT_FOUND_ERR,               8 },
+       { PROPERTY_NOT_SUPPORTED_ERR,           9 },
+       { PROPERTY_INUSE_ATTRIBUTE_ERR,         10 },
+       { PROPERTY_INVALID_STATE_ERR,           11 },
+       { PROPERTY_SYNTAX_ERR,                  12 },
+       { PROPERTY_INVALID_MODIFICATION_ERR,    13 },
+       { PROPERTY_NAMESPACE_ERR,               14 },
+       { PROPERTY_INVALID_ACCESS_ERR,          15 },
+       { PROPERTY_VALIDATION_ERR,              16 },
+       { PROPERTY_TYPE_MISMATCH_ERR,           17 },
+       { PROPERTY_SECURITY_ERR,                18 },
+       { PROPERTY_NETWORK_ERR,                 19 },
+       { PROPERTY_ABORT_ERR,                   20 },
+       { PROPERTY_URL_MISMATCH_ERR,            21 },
+       { PROPERTY_QUOTA_EXCEEDED_ERR,          22 },
+       { PROPERTY_TIMEOUT_ERR,                 23 },
+       { PROPERTY_INVALID_NODE_TYPE_ERR,       24 },
+       { PROPERTY_DATA_CLONE_ERR,              25 }
+};
 
-               JSClassDefinition JSWebAPIError::m_classInfo = {
-                       0,
-                       kJSClassAttributeNone,
-                       PLUGIN_NAME,
-                       0,
-                       m_properties,
-                       m_function, //__function,
-                       initialize,
-                       finalize,
-                       NULL,
-                       NULL,
-                       NULL, //SetProperty,
-                       NULL, //DeleteProperty,
-                       NULL,
-                       NULL, //CallAsFunction,
-                       NULL, //CallAsConstructor,
-                       hasInstance,
-                       NULL, //ConvertToType,
-               };
+JSClassRef JSWebAPIError::m_classRef = NULL;
 
-        JSStaticFunction JSWebAPIError::m_function[] = {
-            { "toString", toString, kJSPropertyAttributeNone },
-            { 0, 0, 0 }
-        };
+JSClassDefinition JSWebAPIError::m_classInfo =
+{
+       0,
+       kJSClassAttributeNone,
+       CLASS_NAME,
+       0,
+       m_properties,
+       m_function,
+       initialize,
+       finalize,
+       NULL, // hasProperty,
+       NULL, // getProperty,
+       NULL, // setProperty,
+       NULL, // deleteProperty,
+       NULL, // getPropertyNames,
+       NULL, // callAsFunction,
+       NULL, // callAsConstructor,
+       hasInstance,
+       NULL, // convertToType,
+};
 
+JSStaticFunction JSWebAPIError::m_function[] =
+{
+       { "toString", toString, kJSPropertyAttributeNone },
+       { 0, 0, 0 }
+};
 
-               JSStaticValue JSWebAPIError::m_properties[] = {
-                       { PROPERTY_CODE,    getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_NAME,    getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_TYPE,    getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_MESSAGE, getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
+JSStaticValue JSWebAPIError::m_properties[] = {
+       { PROPERTY_CODE,                            getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
+       { PROPERTY_NAME,                            getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
+       { PROPERTY_TYPE,                            getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
+       { PROPERTY_MESSAGE,                         getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
 
-                       { PROPERTY_UNKNOWN_ERR,                             getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_INDEX_SIZE_ERR,                          getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_DOMSTRING_SIZE_ERR,                      getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_HIERARCHY_REQUEST_ERR,                   getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_WRONG_DOCUMENT_ERR,                      getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_INVALID_CHARACTER_ERR,                   getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_NO_DATA_ALLOWED_ERR,                     getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_NO_MODIFICATION_ALLOWED_ERR,             getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_NOT_FOUND_ERR,                           getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_NOT_SUPPORTED_ERR,                       getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_INUSE_ATTRIBUTE_ERR,                     getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_INVALID_STATE_ERR,                       getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_SYNTAX_ERR,                              getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_INVALID_MODIFICATION_ERR,                getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_NAMESPACE_ERR,                           getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_INVALID_ACCESS_ERR,                      getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_VALIDATION_ERR,                          getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_TYPE_MISMATCH_ERR,                       getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_SECURITY_ERR,                            getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_NETWORK_ERR,                             getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_ABORT_ERR,                               getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_URL_MISMATCH_ERR,                        getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_QUOTA_EXCEEDED_ERR,                      getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_TIMEOUT_ERR,                             getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_INVALID_NODE_TYPE_ERR,                   getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_DATA_CLONE_ERR,                          getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_INVALID_VALUES_ERR,                      getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_IO_ERR,                                  getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_OUT_OF_MEMORY_ERR,                       getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_NOT_CONNECTED_SERVICE_ERR,               getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_FAIL_TO_REQUEST_ERR,                     getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_INVALID_RESPONSE_ERR,                    getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_NO_AVAILABLE_NETWORK_ERR,                getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_INVALID_DEVICE_ERR,                      getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_NOT_SUPPORTED_FUNCTION_ERR,              getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_NO_PERMISSION_ERR,                       getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_INVALID_ITEM_ERR,                        getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_FAIL_TO_PLAY_ERR,                        getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_SERVICE_NOT_AVAILABLE,                   getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_AVPLAY_NETWORK_DISCONNECTED_ERR,         getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_AVPLAY_UNSUPPORTED_VIDEO_FORMAT_ERR,     getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_AVPLAY_UNSUPPORTED_AUDIO_FORMAT_ERR,     getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_AVPLAY_UNSUPPORTED_VIDEO_RESOLUTION_ERR, getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_AVPLAY_UNSUPPORTED_VIDEO_FRAMERATE_ERR,  getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_AVPLAY_CURRUPTED_STREAM_ERR,             getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { 0, 0, 0, 0 }
-               };
+       { PROPERTY_INDEX_SIZE_ERR,                  getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
+       { PROPERTY_DOMSTRING_SIZE_ERR,              getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
+       { PROPERTY_HIERARCHY_REQUEST_ERR,           getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
+       { PROPERTY_WRONG_DOCUMENT_ERR,              getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
+       { PROPERTY_INVALID_CHARACTER_ERR,           getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
+       { PROPERTY_NO_DATA_ALLOWED_ERR,             getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
+       { PROPERTY_NO_MODIFICATION_ALLOWED_ERR,     getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
+       { PROPERTY_NOT_FOUND_ERR,                   getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
+       { PROPERTY_NOT_SUPPORTED_ERR,               getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
+       { PROPERTY_INUSE_ATTRIBUTE_ERR,             getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
+       { PROPERTY_INVALID_STATE_ERR,               getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
+       { PROPERTY_SYNTAX_ERR,                      getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
+       { PROPERTY_INVALID_MODIFICATION_ERR,        getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
+       { PROPERTY_NAMESPACE_ERR,                   getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
+       { PROPERTY_INVALID_ACCESS_ERR,              getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
+       { PROPERTY_VALIDATION_ERR,                  getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
+       { PROPERTY_TYPE_MISMATCH_ERR,               getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
+       { PROPERTY_SECURITY_ERR,                    getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
+       { PROPERTY_NETWORK_ERR,                     getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
+       { PROPERTY_ABORT_ERR,                       getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
+       { PROPERTY_URL_MISMATCH_ERR,                getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
+       { PROPERTY_QUOTA_EXCEEDED_ERR,              getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
+       { PROPERTY_TIMEOUT_ERR,                     getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
+       { PROPERTY_INVALID_NODE_TYPE_ERR,           getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
+       { PROPERTY_DATA_CLONE_ERR,                  getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
+       { 0, 0, 0, 0 }
+};
 
-               const JSClassDefinition* JSWebAPIError::getClassInfo() {
-                       return &m_classInfo;
-               }
+const JSClassDefinition* JSWebAPIError::getClassInfo()
+{
+       return &m_classInfo;
+}
 
-               JSClassRef JSWebAPIError::getClassRef() {
-                       if (!m_classRef) {
-                               m_classRef = JSClassCreate(&m_classInfo);
-                       }
-                       return m_classRef;
-               }
+JSClassRef JSWebAPIError::getClassRef()
+{
+       if (!m_classRef)
+       {
+               m_classRef = JSClassCreate(&m_classInfo);
+       }
+       return m_classRef;
+}
 
-               void JSWebAPIError::initialize(JSContextRef /*context*/, JSObjectRef /*object*/) {
-               }
+bool JSWebAPIError::isObjectOfClass(JSContextRef context, JSValueRef value)
+{
+       return JSValueIsObjectOfClass(context, value, getClassRef());
+}
 
-               void JSWebAPIError::finalize(JSObjectRef object) {
-                       PrivateObject* privateObject = static_cast<PrivateObject*> (JSObjectGetPrivate(object));
-                       if (privateObject) {
-                               JSObjectSetPrivate(object, NULL);
-                               delete privateObject;
-                       }
-               }
+JSObjectRef JSWebAPIError::createJSObject(JSContextRef context, WebAPIError* webapiError)
+{
+       JSObjectRef jsObjectRef = JSObjectMake(context, getClassRef(), static_cast<void*>(webapiError));
+       if (NULL == jsObjectRef) {
+               LoggerE("object creation error");
+               return NULL;
+       }
+       return jsObjectRef;
+}
 
-               JSValueRef JSWebAPIError::getStaticProperty(JSContextRef context, JSObjectRef object, JSStringRef propertyName, JSValueRef* /*exception*/) {
-                       PrivateObject* privateObject = static_cast<PrivateObject*> (JSObjectGetPrivate(object));
-                       if (!privateObject) {
-                               LoggerE("Private object is not set.");
-                               return JSValueMakeUndefined(context);
-                       }
+WebAPIError* JSWebAPIError::getPriv(JSContextRef context, JSObjectRef object)
+{
+       if(!JSValueIsObjectOfClass(context, object, getClassRef()))
+               return NULL;
 
-                       WrtDeviceApis::CommonsJavaScript::Converter converter(context);
-                       try {
-                               if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_CODE)) {
-                                       LoggerD("propertyName PROPERTY_CODE");
-                                       return converter.toJSValueRef(privateObject->getObject()->getCode());
-                               } else if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_NAME)) {
-                                       return converter.toJSValueRef(privateObject->getObject()->getName());
-                               } else if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_TYPE)) {
-                                       return converter.toJSValueRef(privateObject->getObject()->getName());
-                               }else if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_MESSAGE)) {
-                                       return converter.toJSValueRef(privateObject->getObject()->getMessage());
-                               }else if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_UNKNOWN_ERR)) {
-                                       return converter.toJSValueRef(UNKNOWN_ERR);
-                               }else if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_INDEX_SIZE_ERR)) {
-                                       return converter.toJSValueRef(INDEX_SIZE_ERR);
-                               }else if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_DOMSTRING_SIZE_ERR)) {
-                                       return converter.toJSValueRef(DOMSTRING_SIZE_ERR);
-                               }else if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_HIERARCHY_REQUEST_ERR)) {
-                                       return converter.toJSValueRef(HIERARCHY_REQUEST_ERR);
-                               }else if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_WRONG_DOCUMENT_ERR)) {
-                                       return converter.toJSValueRef(WRONG_DOCUMENT_ERR);
-                               }else if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_INVALID_CHARACTER_ERR)) {
-                                       return converter.toJSValueRef(INVALID_CHARACTER_ERR);
-                               }else if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_NO_DATA_ALLOWED_ERR)) {
-                                       return converter.toJSValueRef(NO_DATA_ALLOWED_ERR);
-                               }else if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_NO_MODIFICATION_ALLOWED_ERR)) {
-                                       return converter.toJSValueRef(NO_MODIFICATION_ALLOWED_ERR);
-                               }else if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_NOT_FOUND_ERR)) {
-                                       return converter.toJSValueRef(NOT_FOUND_ERR);
-                               }else if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_NOT_SUPPORTED_ERR)) {
-                                       return converter.toJSValueRef(NOT_SUPPORTED_ERR);
-                               }else if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_INUSE_ATTRIBUTE_ERR)) {
-                                       return converter.toJSValueRef(INUSE_ATTRIBUTE_ERR);
-                               }else if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_INVALID_STATE_ERR)) {
-                                       return converter.toJSValueRef(INVALID_STATE_ERR);
-                               }else if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_SYNTAX_ERR)) {
-                                       return converter.toJSValueRef(SYNTAX_ERR);
-                               }else if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_INVALID_MODIFICATION_ERR)) {
-                                       return converter.toJSValueRef(INVALID_MODIFICATION_ERR);
-                               }else if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_NAMESPACE_ERR)) {
-                                       return converter.toJSValueRef(NAMESPACE_ERR);
-                               }else if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_INVALID_ACCESS_ERR)) {
-                                       return converter.toJSValueRef(INVALID_ACCESS_ERR);
-                               }else if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_VALIDATION_ERR)) {
-                                       return converter.toJSValueRef(VALIDATION_ERR);
-                               }else if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_TYPE_MISMATCH_ERR)) {
-                                       return converter.toJSValueRef(TYPE_MISMATCH_ERR);
-                               }else if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_SECURITY_ERR)) {
-                                       return converter.toJSValueRef(SECURITY_ERR);
-                               }else if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_NETWORK_ERR)) {
-                                       return converter.toJSValueRef(NETWORK_ERR);
-                               }else if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_ABORT_ERR)) {
-                                       return converter.toJSValueRef(ABORT_ERR);
-                               }else if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_URL_MISMATCH_ERR)) {
-                                       return converter.toJSValueRef(URL_MISMATCH_ERR);
-                               }else if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_QUOTA_EXCEEDED_ERR)) {
-                                       return converter.toJSValueRef(QUOTA_EXCEEDED_ERR);
-                               }else if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_TIMEOUT_ERR)) {
-                                       return converter.toJSValueRef(TIMEOUT_ERR);
-                               }else if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_INVALID_NODE_TYPE_ERR)) {
-                                       return converter.toJSValueRef(INVALID_NODE_TYPE_ERR);
-                               }else if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_DATA_CLONE_ERR)) {
-                                       return converter.toJSValueRef(DATA_CLONE_ERR);
-                               }else{
-                                       LoggerD("propertyName not supported");
-                                       return converter.toJSValueRef(UNKNOWN_ERR);
-                               }
-                       } catch (const WrtDeviceApis::Commons::ConversionException& ex) {
-                               LoggerE("Exception: " << ex.GetMessage());
-                       }
+       return static_cast<WebAPIError*>(JSObjectGetPrivate(object));
+}
 
-                       return JSValueMakeUndefined(context);
-               }
+void JSWebAPIError::initialize(JSContextRef /*context*/, JSObjectRef /*object*/)
+{
+}
 
-        JSValueRef JSWebAPIError::toString(JSContextRef context, JSObjectRef object, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception){
-                       PrivateObject* privateObject = static_cast<PrivateObject*> (JSObjectGetPrivate(thisObject));
-                       if (!privateObject) {
-                return NULL;
-                       }
+void JSWebAPIError::finalize(JSObjectRef object)
+{
+       WebAPIError* webapiErrObj = static_cast<WebAPIError*>(JSObjectGetPrivate(object));
+       if(webapiErrObj)
+       {
+               JSObjectSetPrivate(object, NULL);
+               delete webapiErrObj;
+       }
+}
 
-                       WrtDeviceApis::CommonsJavaScript::Converter converter(context);
-            std::string name = privateObject->getObject()->getName();
-            std::string message = privateObject->getObject()->getMessage();
-            std::string result = name + ": "+message;
-            return converter.toJSValueRef(result);
-        }
+JSValueRef JSWebAPIError::getStaticProperty(JSContextRef context,
+               JSObjectRef object,
+               JSStringRef propertyName,
+               JSValueRef* /*exception*/)
+{
+       WebAPIError* webapiErrObj = getPriv(context, object);
+       if(!webapiErrObj)
+       {
+               LoggerE("Private object is not set.");
+               return JSValueMakeUndefined(context);
+       }
 
-               bool JSWebAPIError::hasInstance(JSContextRef context, JSObjectRef /*constructor*/, JSValueRef possibleInstance, JSValueRef* /*exception*/) {
-                       return JSValueIsObjectOfClass(context, possibleInstance, getClassRef());
+       try
+       {
+               std::string propertyNameStr = JSUtil::JSStringToString(context, propertyName);
+
+               if (propertyNameStr == PROPERTY_CODE)
+               {
+                       return JSUtil::toJSValueRef(context, static_cast<long>(webapiErrObj->getCode()));
+               }
+               else if (propertyNameStr == PROPERTY_NAME)
+               {
+                       return JSUtil::toJSValueRef(context, webapiErrObj->getName());
+               }
+               else if (propertyNameStr == PROPERTY_TYPE)
+               {
+                       return JSUtil::toJSValueRef(context, webapiErrObj->getName());
                }
+               else if (propertyNameStr == PROPERTY_MESSAGE)
+               {
+                       return JSUtil::toJSValueRef(context, webapiErrObj->getMessage());
+               }
+               else // Error codes
+               {
+                       DeviceAPIErrorCodeMap::iterator iter = errorCodes.find(propertyNameStr);
+                       if(iter != errorCodes.end())
+                               return JSUtil::toJSValueRef(context, static_cast<long>(iter->second));
+               }
+       }
+       catch(const BasePlatformException & err)
+       {
+               LoggerE("Exception: " << err.getMessage());
+       }
 
-               int JSWebAPIError::convertToWebAPIErrorCode(const std::string& errorName){
-                       LoggerD("<<< errorName:[" << errorName << "]");
+       return JSValueMakeUndefined(context);
+}
 
-                       int retErrorCode = -1;
+JSValueRef JSWebAPIError::toString(JSContextRef context,
+               JSObjectRef object,
+               JSObjectRef thisObject,
+               size_t argumentCount,
+               const JSValueRef arguments[],
+               JSValueRef* exception)
+{
+       WebAPIError* webapiErrObj = getPriv(context, thisObject);
+       if(!webapiErrObj)
+       {
+               LoggerE("Private object is not set.");
+               return NULL;
+       }
 
-                       if(errorName.compare(JSTizenException::UNKNOWN_ERROR) == 0){
-                               retErrorCode = UNKNOWN_ERR;
-                       }else if(errorName.compare(JSTizenException::NOT_FOUND_ERROR) == 0){
-                               retErrorCode = NOT_FOUND_ERR;
-                       }else if(errorName.compare(JSTizenException::NOT_SUPPORTED_ERROR) == 0){
-                               retErrorCode = NOT_SUPPORTED_ERR;
-                       }else if(errorName.compare(JSTizenException::TYPE_MISMATCH_ERROR) == 0){
-                               retErrorCode = TYPE_MISMATCH_ERR;
-                       }else if(errorName.compare(JSTizenException::PERMISSION_DENIED_ERROR) == 0){
-                               retErrorCode = SECURITY_ERR;
-                       }else if(errorName.compare(JSTizenException::TIMEOUT_ERROR) == 0){
-                               retErrorCode = TIMEOUT_ERR;
-                       }else if(errorName.compare(JSTizenException::INVALID_VALUES_ERROR) == 0){
-                               retErrorCode = 0;
-                       }else if(errorName.compare(JSTizenException::IO_ERROR) == 0){
-                               retErrorCode = 0;
-                       }else if(errorName.compare(JSTizenException::SERVICE_NOT_AVAILABLE) == 0){
-                               retErrorCode = 0;
-                       }else if(errorName.compare(JSTizenException::NETWORK_ERROR) == 0){
-                               retErrorCode = NETWORK_ERR;
-                       }else{
-                               retErrorCode = UNKNOWN_ERR;
-                       }
+       std::string name = webapiErrObj->getName();
+       std::string message = webapiErrObj->getMessage();
 
-                       LoggerD(">>> retERrorCode:" << retErrorCode );
-                       return retErrorCode;
-               }
+       std::string result = name + ": " + message;
 
-        JSObjectRef JSWebAPIError::makeJSWebAPIError(JSContextRef context, const BasePlatformException& error){
-                       JSWebAPIError::PrivateObject::ObjectType data(new TizenExceptionData(error.getCode(), error.getName(), error.getMessage()));
-                       return WrtDeviceApis::CommonsJavaScript::JSUtils::makeObject(context, JSWebAPIError::getClassRef(), data);
-        }
-        JSValueRef JSWebAPIError::throwException(JSContextRef context, JSValueRef* exception, const BasePlatformException& error){
-                       Assert(exception && "Exception object can't be NULL.");
+       return JSUtil::toJSValueRef(context, result);
+}
 
-                       *exception = makeJSWebAPIError(context, error);
-                       return JSValueMakeUndefined(context);
-        }
+bool JSWebAPIError::hasInstance(JSContextRef context,
+               JSObjectRef /*constructor*/,
+               JSValueRef possibleInstance,
+               JSValueRef* /*exception*/)
+{
+       return JSValueIsObjectOfClass(context, possibleInstance, getClassRef());
+}
 
-}// Common
-}// DeviceAPI
+} // Common
+} // DeviceAPI
index a225b4d..86813cf 100644 (file)
 // limitations under the License.
 //
 
-#ifndef JSWEBAPIERROR_H_
-#define JSWEBAPIERROR_H_
+// TODO This object will replace JSWebAPIError.
+//      The numeric suffix ('2') will be removed after replacing JSWebAPIError.
+
+#ifndef _JS_WEBAPI_ERROR2_H_
+#define _JS_WEBAPI_ERROR2_H_
 
 #include <JavaScriptCore/JavaScript.h>
-#include <CommonsJavaScript/PrivateObject.h>
+#include "JSWebAPIErrorFactory.h"
 
-#include "JSTizenException.h"
-#include "PlatformException.h"
+#include "WebAPIError.h"
 
 namespace DeviceAPI {
 namespace Common {
 
-               class JSWebAPIError {
-                       public:
-                               typedef  WrtDeviceApis::CommonsJavaScript::PrivateObjectT<TizenExceptionDataPtr>::Type PrivateObject;
-
-                               static JSClassRef getClassRef();
-                               static const JSClassDefinition* getClassInfo();
-
-                               static int convertToWebAPIErrorCode(const std::string& errorName);
-
-                static JSObjectRef makeJSWebAPIError(JSContextRef context, const BasePlatformException& error);
-                static JSValueRef throwException(JSContextRef context, JSValueRef* exception, const BasePlatformException& error);
-
-                       private:
-                               /**
-                                * The callback invoked when an object is first created.
-                                */
-                               static void initialize(JSContextRef context, JSObjectRef object);
-
-                               /**
-                                * The callback invoked when an object is finalized.
-                                */
-                               static void finalize(JSObjectRef object);
-
-                               /**
-                                * The callback invoked when getting a property's value.
-                                */
-                               static JSValueRef getStaticProperty(JSContextRef context, JSObjectRef object, JSStringRef propertyName, JSValueRef* exception);
-
-                               /**
-                                * The callback invoked when an object is used as the target of an 'instanceof' expression.
-                                */
-                               static bool hasInstance(JSContextRef context, JSObjectRef constructor, JSValueRef possibleInstance, JSValueRef* exception);
-
-
-                static JSValueRef toString(JSContextRef context, JSObjectRef object, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception);
-
-
-                               /**
-                                * This structure contains properties and callbacks that define a type of object.
-                                */
-                               static JSClassDefinition m_classInfo;
-
-                               /**
-                                * This structure describes a statically declared value property.
-                                */
-                               static JSStaticValue m_properties[];
-
-                               static JSClassRef m_classRef;
-
-                static JSStaticFunction m_function[];
-
-                       public:
-                               enum{
-                                       UNKNOWN_ERR                              = 0,
-                                       INDEX_SIZE_ERR                           = 1,
-                                       DOMSTRING_SIZE_ERR                       = 2,
-                                       HIERARCHY_REQUEST_ERR                    = 3,
-                                       WRONG_DOCUMENT_ERR                       = 4,
-                                       INVALID_CHARACTER_ERR                    = 5,
-                                       NO_DATA_ALLOWED_ERR                      = 6,
-                                       NO_MODIFICATION_ALLOWED_ERR              = 7,
-                                       NOT_FOUND_ERR                            = 8,
-                                       NOT_SUPPORTED_ERR                        = 9,
-                                       INUSE_ATTRIBUTE_ERR                      = 10,
-                                       INVALID_STATE_ERR                        = 11,
-                                       SYNTAX_ERR                               = 12,
-                                       INVALID_MODIFICATION_ERR                 = 13,
-                                       NAMESPACE_ERR                            = 14,
-                                       INVALID_ACCESS_ERR                       = 15,
-                                       VALIDATION_ERR                           = 16,
-                                       TYPE_MISMATCH_ERR                        = 17,
-                                       SECURITY_ERR                             = 18,
-                                       NETWORK_ERR                              = 19,
-                                       ABORT_ERR                                = 20,
-                                       URL_MISMATCH_ERR                         = 21,
-                                       QUOTA_EXCEEDED_ERR                       = 22,
-                                       TIMEOUT_ERR                              = 23,
-                                       INVALID_NODE_TYPE_ERR                    = 24,
-                                       DATA_CLONE_ERR                           = 25,
-
-                               };      //WebAPIError
-               };
-
-}// Common
-}// DeviceAPI
-#endif /* JSWEBAPIERROR_H_ */
+class JSWebAPIErrorFactory;
+
+class JSWebAPIError
+{
+public:
+       static JSClassRef getClassRef();
+
+       static const JSClassDefinition* getClassInfo();
+
+       static bool isObjectOfClass(JSContextRef context, JSValueRef value);
+
+private:
+       static JSObjectRef createJSObject(JSContextRef context, WebAPIError* webapiError);
+
+       static WebAPIError* getPriv(JSContextRef context, JSObjectRef object);
+
+       static void initialize(JSContextRef context, JSObjectRef object);
+
+       static void finalize(JSObjectRef object);
+
+       static JSValueRef getStaticProperty(JSContextRef context,
+                       JSObjectRef object,
+                       JSStringRef propertyName,
+                       JSValueRef* exception);
+
+       static bool hasInstance(JSContextRef context,
+                       JSObjectRef constructor,
+                       JSValueRef possibleInstance,
+                       JSValueRef* exception);
+
+       static JSValueRef toString(JSContextRef context,
+                       JSObjectRef object,
+                       JSObjectRef thisObject,
+                       size_t argumentCount,
+                       const JSValueRef arguments[],
+                       JSValueRef* exception);
+
+       static JSClassDefinition m_classInfo;
+
+       static JSStaticValue m_properties[];
+
+       static JSClassRef m_classRef;
+
+       static JSStaticFunction m_function[];
+
+       friend class JSWebAPIErrorFactory;
+};
+
+} // Common
+} // DeviceAPI
+
+#endif // _JS_WEBAPI_ERROR2_H_
diff --git a/src/Common/JSWebAPIError2.cpp b/src/Common/JSWebAPIError2.cpp
deleted file mode 100644 (file)
index 41e35ed..0000000
+++ /dev/null
@@ -1,271 +0,0 @@
-//
-// Tizen Web Device API
-// Copyright (c) 2012 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Apache License, Version 2.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-#include "JSWebAPIError2.h"
-#include <string>
-#include <map>
-#include <CommonsJavaScript/JSUtils.h>
-#include "JSUtil.h"
-#include "Logger.h"
-
-namespace DeviceAPI {
-namespace Common {
-
-#define PLUGIN_NAME       "WebAPIError"
-#define PROPERTY_CODE     "code"
-#define PROPERTY_NAME     "name"
-#define PROPERTY_TYPE     "type"
-#define PROPERTY_MESSAGE  "message"
-
-#define PROPERTY_INDEX_SIZE_ERR                 "INDEX_SIZE_ERR"
-#define PROPERTY_DOMSTRING_SIZE_ERR             "DOMSTRING_SIZE_ERR"
-#define PROPERTY_HIERARCHY_REQUEST_ERR          "HIERARCHY_REQUEST_ERR"
-#define PROPERTY_WRONG_DOCUMENT_ERR             "WRONG_DOCUMENT_ERR"
-#define PROPERTY_INVALID_CHARACTER_ERR          "INVALID_CHARACTER_ERR"
-#define PROPERTY_NO_DATA_ALLOWED_ERR            "NO_DATA_ALLOWED_ERR"
-#define PROPERTY_NO_MODIFICATION_ALLOWED_ERR    "NO_MODIFICATION_ALLOWED_ERR"
-#define PROPERTY_NOT_FOUND_ERR                  "NOT_FOUND_ERR"
-#define PROPERTY_NOT_SUPPORTED_ERR              "NOT_SUPPORTED_ERR"
-#define PROPERTY_INUSE_ATTRIBUTE_ERR            "INUSE_ATTRIBUTE_ERR"
-#define PROPERTY_INVALID_STATE_ERR              "INVALID_STATE_ERR"
-#define PROPERTY_SYNTAX_ERR                     "SYNTAX_ERR"
-#define PROPERTY_INVALID_MODIFICATION_ERR       "INVALID_MODIFICATION_ERR"
-#define PROPERTY_NAMESPACE_ERR                  "NAMESPACE_ERR"
-#define PROPERTY_INVALID_ACCESS_ERR             "INVALID_ACCESS_ERR"
-#define PROPERTY_VALIDATION_ERR                 "VALIDATION_ERR"
-#define PROPERTY_TYPE_MISMATCH_ERR              "TYPE_MISMATCH_ERR"
-#define PROPERTY_SECURITY_ERR                   "SECURITY_ERR"
-#define PROPERTY_NETWORK_ERR                    "NETWORK_ERR"
-#define PROPERTY_ABORT_ERR                      "ABORT_ERR"
-#define PROPERTY_URL_MISMATCH_ERR               "URL_MISMATCH_ERR"
-#define PROPERTY_QUOTA_EXCEEDED_ERR             "QUOTA_EXCEEDED_ERR"
-#define PROPERTY_TIMEOUT_ERR                    "TIMEOUT_ERR"
-#define PROPERTY_INVALID_NODE_TYPE_ERR          "INVALID_NODE_TYPE_ERR"
-#define PROPERTY_DATA_CLONE_ERR                 "DATA_CLONE_ERR"
-
-typedef std::map<std::string, int> DeviceAPIErrorCodeMap;
-
-static DeviceAPIErrorCodeMap errorCodes = {
-       { PROPERTY_INDEX_SIZE_ERR,              1 },
-       { PROPERTY_DOMSTRING_SIZE_ERR,          2 },
-       { PROPERTY_HIERARCHY_REQUEST_ERR,       3 },
-       { PROPERTY_WRONG_DOCUMENT_ERR,          4 },
-       { PROPERTY_INVALID_CHARACTER_ERR,       5 },
-       { PROPERTY_NO_DATA_ALLOWED_ERR,         6 },
-       { PROPERTY_NO_MODIFICATION_ALLOWED_ERR, 7 },
-       { PROPERTY_NOT_FOUND_ERR,               8 },
-       { PROPERTY_NOT_SUPPORTED_ERR,           9 },
-       { PROPERTY_INUSE_ATTRIBUTE_ERR,         10 },
-       { PROPERTY_INVALID_STATE_ERR,           11 },
-       { PROPERTY_SYNTAX_ERR,                  12 },
-       { PROPERTY_INVALID_MODIFICATION_ERR,    13 },
-       { PROPERTY_NAMESPACE_ERR,               14 },
-       { PROPERTY_INVALID_ACCESS_ERR,          15 },
-       { PROPERTY_VALIDATION_ERR,              16 },
-       { PROPERTY_TYPE_MISMATCH_ERR,           17 },
-       { PROPERTY_SECURITY_ERR,                18 },
-       { PROPERTY_NETWORK_ERR,                 19 },
-       { PROPERTY_ABORT_ERR,                   20 },
-       { PROPERTY_URL_MISMATCH_ERR,            21 },
-       { PROPERTY_QUOTA_EXCEEDED_ERR,          22 },
-       { PROPERTY_TIMEOUT_ERR,                 23 },
-       { PROPERTY_INVALID_NODE_TYPE_ERR,       24 },
-       { PROPERTY_DATA_CLONE_ERR,              25 }
-};
-
-JSClassRef JSWebAPIError2::m_classRef = NULL;
-
-JSClassDefinition JSWebAPIError2::m_classInfo =
-{
-       0,
-       kJSClassAttributeNone,
-       PLUGIN_NAME,
-       0,
-       m_properties,
-       m_function, //__function,
-       initialize,
-       finalize,
-       NULL,
-       NULL,
-       NULL, //SetProperty,
-       NULL, //DeleteProperty,
-       NULL,
-       NULL, //CallAsFunction,
-       NULL, //CallAsConstructor,
-       hasInstance,
-       NULL, //ConvertToType,
-};
-
-JSStaticFunction JSWebAPIError2::m_function[] =
-{
-       { "toString", toString, kJSPropertyAttributeNone },
-       { 0, 0, 0 }
-};
-
-JSStaticValue JSWebAPIError2::m_properties[] = {
-       { PROPERTY_CODE, getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-       { PROPERTY_NAME, getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-       { PROPERTY_TYPE, getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-       { PROPERTY_MESSAGE, getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-
-       { PROPERTY_INDEX_SIZE_ERR, getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-       { PROPERTY_DOMSTRING_SIZE_ERR, getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-       { PROPERTY_HIERARCHY_REQUEST_ERR, getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-       { PROPERTY_WRONG_DOCUMENT_ERR, getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-       { PROPERTY_INVALID_CHARACTER_ERR, getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-       { PROPERTY_NO_DATA_ALLOWED_ERR, getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-       { PROPERTY_NO_MODIFICATION_ALLOWED_ERR, getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-       { PROPERTY_NOT_FOUND_ERR, getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-       { PROPERTY_NOT_SUPPORTED_ERR, getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-       { PROPERTY_INUSE_ATTRIBUTE_ERR, getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-       { PROPERTY_INVALID_STATE_ERR, getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-       { PROPERTY_SYNTAX_ERR, getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-       { PROPERTY_INVALID_MODIFICATION_ERR, getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-       { PROPERTY_NAMESPACE_ERR, getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-       { PROPERTY_INVALID_ACCESS_ERR, getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-       { PROPERTY_VALIDATION_ERR, getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-       { PROPERTY_TYPE_MISMATCH_ERR, getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-       { PROPERTY_SECURITY_ERR, getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-       { PROPERTY_NETWORK_ERR, getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-       { PROPERTY_ABORT_ERR, getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-       { PROPERTY_URL_MISMATCH_ERR, getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-       { PROPERTY_QUOTA_EXCEEDED_ERR, getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-       { PROPERTY_TIMEOUT_ERR, getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-       { PROPERTY_INVALID_NODE_TYPE_ERR, getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-       { PROPERTY_DATA_CLONE_ERR, getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-       { 0, 0, 0, 0 }
-};
-
-const JSClassDefinition* JSWebAPIError2::getClassInfo()
-{
-       return &m_classInfo;
-}
-
-JSClassRef JSWebAPIError2::getClassRef()
-{
-       if (!m_classRef)
-       {
-               m_classRef = JSClassCreate(&m_classInfo);
-       }
-       return m_classRef;
-}
-
-JSObjectRef JSWebAPIError2::createJSObject(JSContextRef context,
-               WebAPIErrorPtr webapiError)
-{
-       PrivateObject *priv = new PrivateObject(context, webapiError);
-       JSObjectRef jsObjectRef = JSObjectMake(context, getClassRef(), static_cast<void*>(priv));
-       if (NULL == jsObjectRef) {
-               LoggerE("object creation error");
-               return NULL;
-       }
-       return jsObjectRef;
-}
-
-void JSWebAPIError2::initialize(JSContextRef /*context*/, JSObjectRef /*object*/)
-{
-}
-
-void JSWebAPIError2::finalize(JSObjectRef object)
-{
-       PrivateObject* privateObject = static_cast<PrivateObject*>(JSObjectGetPrivate(object));
-       if (privateObject)
-       {
-               JSObjectSetPrivate(object, NULL);
-               delete privateObject;
-       }
-}
-
-JSValueRef JSWebAPIError2::getStaticProperty(JSContextRef context,
-               JSObjectRef object,
-               JSStringRef propertyName,
-               JSValueRef* /*exception*/)
-{
-       PrivateObject* privateObject = static_cast<PrivateObject*>(JSObjectGetPrivate(object));
-       if (!privateObject)
-       {
-               LoggerE("Private object is not set.");
-               return JSValueMakeUndefined(context);
-       }
-
-       try
-       {
-               std::string propertyNameStr = JSUtil::JSStringToString(context, propertyName);
-
-               if (propertyNameStr == PROPERTY_CODE)
-               {
-                       return JSUtil::toJSValueRef(context, static_cast<long>(privateObject->getObject()->getCode()));
-               }
-               else if (propertyNameStr == PROPERTY_NAME)
-               {
-                       return JSUtil::toJSValueRef(context, privateObject->getObject()->getName());
-               }
-               else if (propertyNameStr == PROPERTY_TYPE)
-               {
-                       return JSUtil::toJSValueRef(context, privateObject->getObject()->getName());
-               }
-               else if (propertyNameStr == PROPERTY_MESSAGE)
-               {
-                       return JSUtil::toJSValueRef(context, privateObject->getObject()->getMessage());
-               }
-               else // Error codes
-               {
-                       DeviceAPIErrorCodeMap::iterator iter = errorCodes.find(propertyNameStr);
-                       if(iter != errorCodes.end())
-                               return JSUtil::toJSValueRef(context, static_cast<long>(iter->second));
-               }
-       }
-       catch (const WrtDeviceApis::Commons::ConversionException& ex)
-       {
-               LoggerE("Exception: " << ex.GetMessage());
-       }
-
-       return JSValueMakeUndefined(context);
-}
-
-JSValueRef JSWebAPIError2::toString(JSContextRef context,
-               JSObjectRef object,
-               JSObjectRef thisObject,
-               size_t argumentCount,
-               const JSValueRef arguments[],
-               JSValueRef* exception)
-{
-       PrivateObject* privateObject = static_cast<PrivateObject*>(JSObjectGetPrivate(thisObject));
-       if (!privateObject)
-       {
-               LoggerE("Private object is not set.");
-               return NULL;
-       }
-
-       std::string name = privateObject->getObject()->getName();
-       std::string message = privateObject->getObject()->getMessage();
-
-       std::string result = name + ": " + message;
-
-       return JSUtil::toJSValueRef(context, result);
-}
-
-bool JSWebAPIError2::hasInstance(JSContextRef context,
-               JSObjectRef /*constructor*/,
-               JSValueRef possibleInstance,
-               JSValueRef* /*exception*/)
-{
-       return JSValueIsObjectOfClass(context, possibleInstance, getClassRef());
-}
-
-} // Common
-} // DeviceAPI
diff --git a/src/Common/JSWebAPIError2.h b/src/Common/JSWebAPIError2.h
deleted file mode 100644 (file)
index 750a257..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
-//
-// Tizen Web Device API
-// Copyright (c) 2012 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Apache License, Version 2.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-// TODO This object will replace JSWebAPIError.
-//      The numeric suffix ('2') will be removed after replacing JSWebAPIError.
-
-#ifndef _JS_WEBAPI_ERROR2_H_
-#define _JS_WEBAPI_ERROR2_H_
-
-#include <JavaScriptCore/JavaScript.h>
-#include <CommonsJavaScript/PrivateObject.h>
-
-#include "WebAPIError.h"
-
-namespace DeviceAPI {
-namespace Common {
-
-class JSWebAPIError2
-{
-public:
-       typedef WrtDeviceApis::CommonsJavaScript::PrivateObjectT<WebAPIErrorPtr>::Type PrivateObject;
-
-       static JSClassRef getClassRef();
-
-       static const JSClassDefinition* getClassInfo();
-
-       static JSObjectRef createJSObject(JSContextRef context, WebAPIErrorPtr webapiError);
-
-private:
-       /**
-        * The callback invoked when an object is first created.
-        */
-       static void initialize(JSContextRef context, JSObjectRef object);
-
-       /**
-        * The callback invoked when an object is finalized.
-        */
-       static void finalize(JSObjectRef object);
-
-       /**
-        * The callback invoked when getting a property's value.
-        */
-       static JSValueRef getStaticProperty(JSContextRef context,
-                       JSObjectRef object,
-                       JSStringRef propertyName,
-                       JSValueRef* exception);
-
-       /**
-        * The callback invoked when an object is used as the target of an 'instanceof' expression.
-        */
-       static bool hasInstance(JSContextRef context,
-                       JSObjectRef constructor,
-                       JSValueRef possibleInstance,
-                       JSValueRef* exception);
-
-       static JSValueRef toString(JSContextRef context,
-                       JSObjectRef object,
-                       JSObjectRef thisObject,
-                       size_t argumentCount,
-                       const JSValueRef arguments[],
-                       JSValueRef* exception);
-
-       /**
-        * This structure contains properties and callbacks that define a type of object.
-        */
-       static JSClassDefinition m_classInfo;
-
-       /**
-        * This structure describes a statically declared value property.
-        */
-       static JSStaticValue m_properties[];
-
-       static JSClassRef m_classRef;
-
-       static JSStaticFunction m_function[];
-};
-
-}      // Common
-}      // DeviceAPI
-
-#endif // _JS_WEBAPI_ERROR2_H_
index 0685c9c..568e31b 100644 (file)
@@ -18,9 +18,9 @@
 #include "JSWebAPIErrorFactory.h"
 #include <map>
 #include <dpl/assert.h>
-#include <CommonsJavaScript/JSUtils.h>
-#include <CommonsJavaScript/ScopedJSStringRef.h>
-#include "JSWebAPIError2.h"
+#include "JSStringRefWrapper.h"
+#include "JSWebAPIException.h"
+#include "JSWebAPIError.h"
 #include "Logger.h"
 
 #define INDEX_SIZE_ERROR_NAME_STR               "IndexSizeError"
@@ -166,28 +166,30 @@ JSObjectRef JSWebAPIErrorFactory::makeErrorObject(JSContextRef context,
                const std::string& name,
                const std::string& message)
 {
-       return createException(context, name, message);
+       return createErrorObject(context, name, message, false);
 }
 
 JSObjectRef JSWebAPIErrorFactory::makeErrorObject(JSContextRef context,
                const BasePlatformException& error)
 {
-       return createException(context, error.getName(), error.getMessage());
+       return createErrorObject(context, error.getName(), error.getMessage(), false);
 }
 
-JSValueRef JSWebAPIErrorFactory::postException(JSContextRef context,
+JSObjectRef JSWebAPIErrorFactory::postException(JSContextRef context,
                JSValueRef* exception,
                const std::string& name,
                const std::string& message)
 {
        Assert(exception && "Exception object can't be NULL.");
 
-       *exception = createException(context, name, message);
+       JSObjectRef exceptionObj = createErrorObject(context, name, message, true);
 
-       return JSValueMakeUndefined(context);
+       *exception = exceptionObj;
+
+       return exceptionObj;
 }
 
-JSValueRef JSWebAPIErrorFactory::postException(JSContextRef context,
+JSObjectRef JSWebAPIErrorFactory::postException(JSContextRef context,
                JSValueRef* exception,
                const BasePlatformException& error)
 {
@@ -196,11 +198,12 @@ JSValueRef JSWebAPIErrorFactory::postException(JSContextRef context,
        return postException(context, exception, error.getName(), error.getMessage());
 }
 
-JSObjectRef JSWebAPIErrorFactory::createException(JSContextRef context,
+JSObjectRef JSWebAPIErrorFactory::createErrorObject(JSContextRef context,
                const std::string& name,
-               const std::string& message)
+               const std::string& message,
+               const bool isException)
 {
-       JSObjectRef errorObject = NULL;
+       JSObjectRef jsErrorObject = NULL;
 
        DeviceAPIErrorProperties *properties;
 
@@ -210,30 +213,34 @@ JSObjectRef JSWebAPIErrorFactory::createException(JSContextRef context,
        else
                properties = &s_customErrorProperties;
 
+       if(properties->type == ERROR_TYPE_ECMA)
+               return createECMAErrorObject(context, properties->name, message);
+
+       WebAPIError *errorObject = NULL;
        switch(properties->type)
        {
        case ERROR_TYPE_DOM:
        case ERROR_TYPE_TIZEN:
-               errorObject = JSWebAPIError2::createJSObject(context,
-                               WebAPIErrorPtr(new WebAPIError(properties->code, properties->name, message)));
-               break;
-       case ERROR_TYPE_ECMA:
-               errorObject = createECMAException(context, properties->name, message);
+               errorObject = new WebAPIError(properties->code, properties->name, message);
                break;
        case ERROR_TYPE_CUSTOM:
-               errorObject = JSWebAPIError2::createJSObject(context,
-                               WebAPIErrorPtr(new WebAPIError(0, name, message)));
+               errorObject = new WebAPIError(0, name, message);
                break;
+       case ERROR_TYPE_ECMA:   // Cannot happen
        default:
-               errorObject = JSWebAPIError2::createJSObject(context,
-                               WebAPIErrorPtr(new WebAPIError(0, "Error", message)));
+               errorObject = new WebAPIError(0, "Error", message);
                break;
        }
 
-       return errorObject;
+       if(isException)
+               jsErrorObject = JSWebAPIException::createJSObject(context, errorObject);
+       else
+               jsErrorObject = JSWebAPIError::createJSObject(context, errorObject);
+
+       return jsErrorObject;
 }
 
-JSObjectRef JSWebAPIErrorFactory::createECMAException(JSContextRef context,
+JSObjectRef JSWebAPIErrorFactory::createECMAErrorObject(JSContextRef context,
                const std::string& name,
                const std::string& message)
 {
@@ -252,8 +259,7 @@ JSObjectRef JSWebAPIErrorFactory::createECMAException(JSContextRef context,
                jsCodeStr += "\"" + message + "\"";
        jsCodeStr += ");";
 
-       WrtDeviceApis::CommonsJavaScript::ScopedJSStringRef jsCode(
-                       JSStringCreateWithUTF8CString(jsCodeStr.c_str()));
+       JSStringRefWrapper jsCode(jsCodeStr);
 
        JSValueRef errValue = JSEvaluateScript(context, jsCode.get(), NULL, NULL, 0, NULL);
 
index 6c9e8d5..6dfc55b 100644 (file)
 #define _JS_WEBAPI_ERROR_FACTORY_H_
 
 #include <string>
-#include <dpl/noncopyable.h>
 #include <JavaScriptCore/JavaScript.h>
 #include "PlatformException.h"
 
 namespace DeviceAPI {
 namespace Common {
 
-class JSWebAPIErrorFactory: public DPL::Noncopyable
+class JSWebAPIErrorFactory
 {
 public:
        JSWebAPIErrorFactory();
@@ -39,12 +38,12 @@ public:
        static JSObjectRef makeErrorObject(JSContextRef context,
                        const BasePlatformException& error);
 
-       static JSValueRef postException(JSContextRef context,
+       static JSObjectRef postException(JSContextRef context,
                        JSValueRef* exception,
                        const std::string& name,
                        const std::string& message = std::string());
 
-       static JSValueRef postException(JSContextRef context,
+       static JSObjectRef postException(JSContextRef context,
                        JSValueRef* exception,
                        const BasePlatformException& error);
 
@@ -82,11 +81,12 @@ public:
        static const std::string SERVICE_NOT_AVAILABLE_ERROR;
 
 private:
-       static JSObjectRef createException(JSContextRef context,
+       static JSObjectRef createErrorObject(JSContextRef context,
                        const std::string& name,
-                       const std::string& message);
+                       const std::string& message,
+                       const bool isException);
 
-       static JSObjectRef createECMAException(JSContextRef context,
+       static JSObjectRef createECMAErrorObject(JSContextRef context,
                        const std::string& name,
                        const std::string& message);
 };
index b92f1f2..8df738f 100644 (file)
 //
 
 #include "JSWebAPIException.h"
-#include <CommonsJavaScript/Converter.h>
-#include <CommonsJavaScript/JSUtils.h>
 #include <string>
+#include <map>
+#include "JSUtil.h"
+#include "JSWebAPIError.h"
 #include "Logger.h"
 
 namespace DeviceAPI {
 namespace Common {
 
-namespace{
-
-                       #define PLUGIN_NAME       "WebAPIException"
-                       #define PROPERTY_CODE     "code"
-                       #define PROPERTY_NAME     "name"
-                       #define PROPERTY_TYPE     "type"
-                       #define PROPERTY_MESSAGE  "message"
-
-                       #define PROPERTY_UNKNOWN_ERR                              "UNKNOWN_ERR"
-                       #define PROPERTY_INDEX_SIZE_ERR                           "INDEX_SIZE_ERR"
-                       #define PROPERTY_DOMSTRING_SIZE_ERR                       "DOMSTRING_SIZE_ERR"
-                       #define PROPERTY_HIERARCHY_REQUEST_ERR                    "HIERARCHY_REQUEST_ERR"
-                       #define PROPERTY_WRONG_DOCUMENT_ERR                       "WRONG_DOCUMENT_ERR"
-                       #define PROPERTY_INVALID_CHARACTER_ERR                    "INVALID_CHARACTER_ERR"
-                       #define PROPERTY_NO_DATA_ALLOWED_ERR                      "NO_DATA_ALLOWED_ERR"
-                       #define PROPERTY_NO_MODIFICATION_ALLOWED_ERR              "NO_MODIFICATION_ALLOWED_ERR"
-                       #define PROPERTY_NOT_FOUND_ERR                            "NOT_FOUND_ERR"
-                       #define PROPERTY_NOT_SUPPORTED_ERR                        "NOT_SUPPORTED_ERR"
-                       #define PROPERTY_INUSE_ATTRIBUTE_ERR                      "INUSE_ATTRIBUTE_ERR"
-                       #define PROPERTY_INVALID_STATE_ERR                        "INVALID_STATE_ERR"
-                       #define PROPERTY_SYNTAX_ERR                               "SYNTAX_ERR"
-                       #define PROPERTY_INVALID_MODIFICATION_ERR                 "INVALID_MODIFICATION_ERR"
-                       #define PROPERTY_NAMESPACE_ERR                            "NAMESPACE_ERR"
-                       #define PROPERTY_INVALID_ACCESS_ERR                       "INVALID_ACCESS_ERR"
-                       #define PROPERTY_VALIDATION_ERR                           "VALIDATION_ERR"
-                       #define PROPERTY_TYPE_MISMATCH_ERR                        "TYPE_MISMATCH_ERR"
-                       #define PROPERTY_SECURITY_ERR                             "SECURITY_ERR"
-                       #define PROPERTY_NETWORK_ERR                              "NETWORK_ERR"
-                       #define PROPERTY_ABORT_ERR                                "ABORT_ERR"
-                       #define PROPERTY_URL_MISMATCH_ERR                         "URL_MISMATCH_ERR"
-                       #define PROPERTY_QUOTA_EXCEEDED_ERR                       "QUOTA_EXCEEDED_ERR"
-                       #define PROPERTY_TIMEOUT_ERR                              "TIMEOUT_ERR"
-                       #define PROPERTY_INVALID_NODE_TYPE_ERR                    "INVALID_NODE_TYPE_ERR"
-                       #define PROPERTY_DATA_CLONE_ERR                           "DATA_CLONE_ERR"
-                       #define PROPERTY_INVALID_VALUES_ERR                       "INVALID_VALUES_ERR"
-                       #define PROPERTY_IO_ERR                                   "IO_ERR"
-                       #define PROPERTY_OUT_OF_MEMORY_ERR                        "OUT_OF_MEMORY_ERR"
-                       #define PROPERTY_NOT_CONNECTED_SERVICE_ERR                "NOT_CONNECTED_SERVICE_ERR"
-                       #define PROPERTY_FAIL_TO_REQUEST_ERR                      "FAIL_TO_REQUEST_ERR"
-                       #define PROPERTY_INVALID_RESPONSE_ERR                     "INVALID_RESPONSE_ERR"
-                       #define PROPERTY_NO_AVAILABLE_NETWORK_ERR                 "NO_AVAILABLE_NETWORK_ERR"
-                       #define PROPERTY_INVALID_DEVICE_ERR                       "INVALID_DEVICE_ERR"
-                       #define PROPERTY_NOT_SUPPORTED_FUNCTION_ERR               "NOT_SUPPORTED_FUNCTION_ERR"
-                       #define PROPERTY_NO_PERMISSION_ERR                        "NO_PERMISSION_ERR"
-                       #define PROPERTY_INVALID_ITEM_ERR                         "INVALID_ITEM_ERR"
-                       #define PROPERTY_FAIL_TO_PLAY_ERR                         "FAIL_TO_PLAY_ERR"
-                       #define PROPERTY_SERVICE_NOT_AVAILABLE                    "SERVICE_NOT_AVAILABLE"
-                       #define PROPERTY_AVPLAY_NETWORK_DISCONNECTED_ERR          "AVPLAY_NETWORK_DISCONNECTED_ERR"
-                       #define PROPERTY_AVPLAY_UNSUPPORTED_VIDEO_FORMAT_ERR      "AVPLAY_UNSUPPORTED_VIDEO_FORMAT_ERR"
-                       #define PROPERTY_AVPLAY_UNSUPPORTED_AUDIO_FORMAT_ERR      "AVPLAY_UNSUPPORTED_AUDIO_FORMAT_ERR"
-                       #define PROPERTY_AVPLAY_UNSUPPORTED_VIDEO_RESOLUTION_ERR  "AVPLAY_UNSUPPORTED_VIDEO_RESOLUTION_ERR"
-                       #define PROPERTY_AVPLAY_UNSUPPORTED_VIDEO_FRAMERATE_ERR   "AVPLAY_UNSUPPORTED_VIDEO_FRAMERATE_ERR"
-                       #define PROPERTY_AVPLAY_CURRUPTED_STREAM_ERR              "AVPLAY_CURRUPTED_STREAM_ERR"
-               }
-
-               JSClassRef JSWebAPIException::m_classRef = NULL;
-
-               JSClassDefinition JSWebAPIException::m_classInfo = {
-                       0,
-                       kJSClassAttributeNone,
-                       PLUGIN_NAME,
-                       0,
-                       m_properties,
-                       m_function, //__function,
-                       initialize,
-                       finalize,
-                       NULL,
-                       NULL,
-                       NULL, //SetProperty,
-                       NULL, //DeleteProperty,
-                       NULL,
-                       NULL, //CallAsFunction,
-                       NULL, //CallAsConstructor,
-                       hasInstance,
-                       NULL, //ConvertToType,
-               };
-
-        JSStaticFunction JSWebAPIException::m_function[] = {
-            { "toString", toString, kJSPropertyAttributeNone },
-            { 0, 0, 0 }
-        };
-
-
-               JSStaticValue JSWebAPIException::m_properties[] = {
-                       { PROPERTY_CODE,    getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_NAME,    getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_TYPE,    getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_MESSAGE, getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-
-                       { PROPERTY_UNKNOWN_ERR,                             getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_INDEX_SIZE_ERR,                          getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_DOMSTRING_SIZE_ERR,                      getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_HIERARCHY_REQUEST_ERR,                   getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_WRONG_DOCUMENT_ERR,                      getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_INVALID_CHARACTER_ERR,                   getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_NO_DATA_ALLOWED_ERR,                     getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_NO_MODIFICATION_ALLOWED_ERR,             getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_NOT_FOUND_ERR,                           getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_NOT_SUPPORTED_ERR,                       getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_INUSE_ATTRIBUTE_ERR,                     getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_INVALID_STATE_ERR,                       getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_SYNTAX_ERR,                              getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_INVALID_MODIFICATION_ERR,                getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_NAMESPACE_ERR,                           getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_INVALID_ACCESS_ERR,                      getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_VALIDATION_ERR,                          getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_TYPE_MISMATCH_ERR,                       getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_SECURITY_ERR,                            getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_NETWORK_ERR,                             getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_ABORT_ERR,                               getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_URL_MISMATCH_ERR,                        getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_QUOTA_EXCEEDED_ERR,                      getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_TIMEOUT_ERR,                             getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_INVALID_NODE_TYPE_ERR,                   getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_DATA_CLONE_ERR,                          getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_INVALID_VALUES_ERR,                      getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_IO_ERR,                                  getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_OUT_OF_MEMORY_ERR,                       getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_NOT_CONNECTED_SERVICE_ERR,               getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_FAIL_TO_REQUEST_ERR,                     getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_INVALID_RESPONSE_ERR,                    getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_NO_AVAILABLE_NETWORK_ERR,                getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_INVALID_DEVICE_ERR,                      getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_NOT_SUPPORTED_FUNCTION_ERR,              getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_NO_PERMISSION_ERR,                       getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_INVALID_ITEM_ERR,                        getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_FAIL_TO_PLAY_ERR,                        getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_SERVICE_NOT_AVAILABLE,                   getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_AVPLAY_NETWORK_DISCONNECTED_ERR,         getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_AVPLAY_UNSUPPORTED_VIDEO_FORMAT_ERR,     getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_AVPLAY_UNSUPPORTED_AUDIO_FORMAT_ERR,     getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_AVPLAY_UNSUPPORTED_VIDEO_RESOLUTION_ERR, getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_AVPLAY_UNSUPPORTED_VIDEO_FRAMERATE_ERR,  getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { PROPERTY_AVPLAY_CURRUPTED_STREAM_ERR,             getStaticProperty, NULL, kJSPropertyAttributeReadOnly },
-                       { 0, 0, 0, 0 }
-               };
-
-               const JSClassDefinition* JSWebAPIException::getClassInfo() {
-                       return &m_classInfo;
-               }
-
-               JSClassRef JSWebAPIException::getClassRef() {
-                       if (!m_classRef) {
-                               m_classRef = JSClassCreate(&m_classInfo);
-                       }
-                       return m_classRef;
-               }
-
-               void JSWebAPIException::initialize(JSContextRef /*context*/, JSObjectRef /*object*/) {
-               }
-
-               void JSWebAPIException::finalize(JSObjectRef object) {
-                       PrivateObject* privateObject = static_cast<PrivateObject*> (JSObjectGetPrivate(object));
-                       if (privateObject) {
-                               JSObjectSetPrivate(object, NULL);
-                               delete privateObject;
-                       }
-               }
-
-               JSValueRef JSWebAPIException::getStaticProperty(JSContextRef context, JSObjectRef object, JSStringRef propertyName, JSValueRef* /*exception*/) {
-                       PrivateObject* privateObject = static_cast<PrivateObject*> (JSObjectGetPrivate(object));
-                       if (!privateObject) {
-                               LoggerE("Private object is not set.");
-                               return JSValueMakeUndefined(context);
-                       }
-
-                       WrtDeviceApis::CommonsJavaScript::Converter converter(context);
-                       try {
-                               if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_CODE)) {
-                                       LoggerD("propertyName PROPERTY_CODE");
-                                       return converter.toJSValueRef(privateObject->getObject()->getCode());
-                               } else if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_NAME)) {
-                                       return converter.toJSValueRef(privateObject->getObject()->getName());
-                               } else if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_TYPE)) {
-                                       return converter.toJSValueRef(privateObject->getObject()->getName());
-                               }else if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_MESSAGE)) {
-                                       return converter.toJSValueRef(privateObject->getObject()->getMessage());
-                               }else if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_UNKNOWN_ERR)) {
-                                       return converter.toJSValueRef(UNKNOWN_ERR);
-                               }else if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_INDEX_SIZE_ERR)) {
-                                       return converter.toJSValueRef(INDEX_SIZE_ERR);
-                               }else if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_DOMSTRING_SIZE_ERR)) {
-                                       return converter.toJSValueRef(DOMSTRING_SIZE_ERR);
-                               }else if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_HIERARCHY_REQUEST_ERR)) {
-                                       return converter.toJSValueRef(HIERARCHY_REQUEST_ERR);
-                               }else if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_WRONG_DOCUMENT_ERR)) {
-                                       return converter.toJSValueRef(WRONG_DOCUMENT_ERR);
-                               }else if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_INVALID_CHARACTER_ERR)) {
-                                       return converter.toJSValueRef(INVALID_CHARACTER_ERR);
-                               }else if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_NO_DATA_ALLOWED_ERR)) {
-                                       return converter.toJSValueRef(NO_DATA_ALLOWED_ERR);
-                               }else if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_NO_MODIFICATION_ALLOWED_ERR)) {
-                                       return converter.toJSValueRef(NO_MODIFICATION_ALLOWED_ERR);
-                               }else if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_NOT_FOUND_ERR)) {
-                                       return converter.toJSValueRef(NOT_FOUND_ERR);
-                               }else if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_NOT_SUPPORTED_ERR)) {
-                                       return converter.toJSValueRef(NOT_SUPPORTED_ERR);
-                               }else if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_INUSE_ATTRIBUTE_ERR)) {
-                                       return converter.toJSValueRef(INUSE_ATTRIBUTE_ERR);
-                               }else if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_INVALID_STATE_ERR)) {
-                                       return converter.toJSValueRef(INVALID_STATE_ERR);
-                               }else if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_SYNTAX_ERR)) {
-                                       return converter.toJSValueRef(SYNTAX_ERR);
-                               }else if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_INVALID_MODIFICATION_ERR)) {
-                                       return converter.toJSValueRef(INVALID_MODIFICATION_ERR);
-                               }else if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_NAMESPACE_ERR)) {
-                                       return converter.toJSValueRef(NAMESPACE_ERR);
-                               }else if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_INVALID_ACCESS_ERR)) {
-                                       return converter.toJSValueRef(INVALID_ACCESS_ERR);
-                               }else if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_VALIDATION_ERR)) {
-                                       return converter.toJSValueRef(VALIDATION_ERR);
-                               }else if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_TYPE_MISMATCH_ERR)) {
-                                       return converter.toJSValueRef(TYPE_MISMATCH_ERR);
-                               }else if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_SECURITY_ERR)) {
-                                       return converter.toJSValueRef(SECURITY_ERR);
-                               }else if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_NETWORK_ERR)) {
-                                       return converter.toJSValueRef(NETWORK_ERR);
-                               }else if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_ABORT_ERR)) {
-                                       return converter.toJSValueRef(ABORT_ERR);
-                               }else if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_URL_MISMATCH_ERR)) {
-                                       return converter.toJSValueRef(URL_MISMATCH_ERR);
-                               }else if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_QUOTA_EXCEEDED_ERR)) {
-                                       return converter.toJSValueRef(QUOTA_EXCEEDED_ERR);
-                               }else if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_TIMEOUT_ERR)) {
-                                       return converter.toJSValueRef(TIMEOUT_ERR);
-                               }else if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_INVALID_NODE_TYPE_ERR)) {
-                                       return converter.toJSValueRef(INVALID_NODE_TYPE_ERR);
-                               }else if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_DATA_CLONE_ERR)) {
-                                       return converter.toJSValueRef(DATA_CLONE_ERR);
-                               }else{
-                                       LoggerD("propertyName not supported");
-                                       return converter.toJSValueRef(UNKNOWN_ERR);
-                               }
-                       } catch (const WrtDeviceApis::Commons::ConversionException& ex) {
-                               LoggerE("Exception: " << ex.GetMessage());
-                       }
-
-                       return JSValueMakeUndefined(context);
-               }
-
-        JSValueRef JSWebAPIException::toString(JSContextRef context, JSObjectRef object, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception){
-                       PrivateObject* privateObject = static_cast<PrivateObject*> (JSObjectGetPrivate(thisObject));
-                       if (!privateObject) {
-                return NULL;
-                       }
-
-                       WrtDeviceApis::CommonsJavaScript::Converter converter(context);
-            std::string name = privateObject->getObject()->getName();
-            std::string message = privateObject->getObject()->getMessage();
-            std::string result = name + ": "+message;
-            return converter.toJSValueRef(result);
-        }
-
-               bool JSWebAPIException::hasInstance(JSContextRef context, JSObjectRef /*constructor*/, JSValueRef possibleInstance, JSValueRef* /*exception*/) {
-                       return JSValueIsObjectOfClass(context, possibleInstance, getClassRef());
-               }
-
-               int JSWebAPIException::convertToWebAPIExceptionCode(const std::string& errorName){
-                       LoggerD("<<< errorName:[" << errorName << "]");
-
-                       int retErrorCode = -1;
-
-                       if(errorName.compare(JSTizenException::UNKNOWN_ERROR) == 0){
-                               retErrorCode = UNKNOWN_ERR;
-                       }else if(errorName.compare(JSTizenException::NOT_FOUND_ERROR) == 0){
-                               retErrorCode = NOT_FOUND_ERR;
-                       }else if(errorName.compare(JSTizenException::NOT_SUPPORTED_ERROR) == 0){
-                               retErrorCode = NOT_SUPPORTED_ERR;
-                       }else if(errorName.compare(JSTizenException::TYPE_MISMATCH_ERROR) == 0){
-                               retErrorCode = TYPE_MISMATCH_ERR;
-                       }else if(errorName.compare(JSTizenException::PERMISSION_DENIED_ERROR) == 0){
-                               retErrorCode = SECURITY_ERR;
-                       }else if(errorName.compare(JSTizenException::TIMEOUT_ERROR) == 0){
-                               retErrorCode = TIMEOUT_ERR;
-                       }else if(errorName.compare(JSTizenException::INVALID_VALUES_ERROR) == 0){
-                               retErrorCode = 0;
-                       }else if(errorName.compare(JSTizenException::IO_ERROR) == 0){
-                               retErrorCode = 0;
-                       }else if(errorName.compare(JSTizenException::SERVICE_NOT_AVAILABLE) == 0){
-                               retErrorCode = 0;
-                       }else if(errorName.compare(JSTizenException::NETWORK_ERROR) == 0){
-                               retErrorCode = NETWORK_ERR;
-                       }else{
-                               retErrorCode = UNKNOWN_ERR;
-                       }
-
-                       LoggerD(">>> retERrorCode:" << retErrorCode );
-                       return retErrorCode;
-               }
-
-        JSObjectRef JSWebAPIException::makeJSWebAPIException(JSContextRef context, const BasePlatformException& error){
-                       JSWebAPIException::PrivateObject::ObjectType data(new TizenExceptionData(error.getCode(), error.getName(), error.getMessage()));
-                       return WrtDeviceApis::CommonsJavaScript::JSUtils::makeObject(context, JSWebAPIException::getClassRef(), data);
-        }
-        JSValueRef JSWebAPIException::throwException(JSContextRef context, JSValueRef* exception, const BasePlatformException& error){
-                       Assert(exception && "Exception object can't be NULL.");
-
-                       *exception = makeJSWebAPIException(context, error);
-                       return JSValueMakeUndefined(context);
-        }
-
-}// Common
-}// DeviceAPI
+#define CLASS_NAME  "WebAPIException"
+
+JSClassRef JSWebAPIException::m_classRef = NULL;
+
+JSClassDefinition JSWebAPIException::m_classInfo =
+{
+       0,
+       kJSClassAttributeNone,
+       CLASS_NAME,
+       JSWebAPIError::getClassRef(),
+       m_properties,
+       m_function,
+       initialize,
+       finalize,
+       NULL, // hasProperty,
+       NULL, // getProperty,
+       NULL, // setProperty,
+       NULL, // deleteProperty,
+       NULL, // getPropertyNames,
+       NULL, // callAsFunction,
+       NULL, // callAsConstructor,
+       hasInstance,
+       NULL, // convertToType,
+};
+
+JSStaticFunction JSWebAPIException::m_function[] =
+{
+       { "toString", toString, kJSPropertyAttributeNone },
+       { 0, 0, 0 }
+};
+
+JSStaticValue JSWebAPIException::m_properties[] = {
+       { 0, 0, 0, 0 }
+};
+
+const JSClassDefinition* JSWebAPIException::getClassInfo()
+{
+       return &m_classInfo;
+}
+
+JSClassRef JSWebAPIException::getClassRef()
+{
+       if (!m_classRef)
+       {
+               m_classRef = JSClassCreate(&m_classInfo);
+       }
+       return m_classRef;
+}
+
+bool JSWebAPIException::isObjectOfClass(JSContextRef context, JSValueRef value)
+{
+       return JSValueIsObjectOfClass(context, value, getClassRef());
+}
+
+JSObjectRef JSWebAPIException::createJSObject(JSContextRef context, WebAPIError* webapiError)
+{
+       JSObjectRef jsObjectRef = JSObjectMake(context, getClassRef(), static_cast<void*>(webapiError));
+       if (NULL == jsObjectRef) {
+               LoggerE("object creation error");
+               return NULL;
+       }
+       return jsObjectRef;
+}
+
+WebAPIError* JSWebAPIException::getPriv(JSContextRef context, JSObjectRef object)
+{
+       if(!JSValueIsObjectOfClass(context, object, getClassRef()))
+               return NULL;
+
+       return static_cast<WebAPIError*>(JSObjectGetPrivate(object));
+}
+
+void JSWebAPIException::initialize(JSContextRef /*context*/, JSObjectRef /*object*/)
+{
+}
+
+void JSWebAPIException::finalize(JSObjectRef /*object*/)
+{
+}
+
+JSValueRef JSWebAPIException::toString(JSContextRef context,
+               JSObjectRef object,
+               JSObjectRef thisObject,
+               size_t argumentCount,
+               const JSValueRef arguments[],
+               JSValueRef* exception)
+{
+       WebAPIError* webapiErrObj = getPriv(context, thisObject);
+       if(!webapiErrObj)
+       {
+               LoggerE("Private object is not set.");
+               return NULL;
+       }
+
+       std::string name = webapiErrObj->getName();
+       std::string message = webapiErrObj->getMessage();
+
+       std::string result = name + ": " + message;
+
+       return JSUtil::toJSValueRef(context, result);
+}
+
+bool JSWebAPIException::hasInstance(JSContextRef context,
+               JSObjectRef /*constructor*/,
+               JSValueRef possibleInstance,
+               JSValueRef* /*exception*/)
+{
+       return JSValueIsObjectOfClass(context, possibleInstance, getClassRef());
+}
+
+} // Common
+} // DeviceAPI
index e0f7629..f4b2d4f 100644 (file)
 // limitations under the License.
 //
 
-#ifndef JSWEBAPIEXCEPTION_H_
-#define JSWEBAPIEXCEPTION_H_
+// TODO This object will replace JSWebAPIError.
+//      The numeric suffix ('2') will be removed after replacing JSWebAPIError.
+
+#ifndef _JS_WEBAPI_EXCEPTION2_H_
+#define _JS_WEBAPI_EXCEPTION2_H_
 
 #include <JavaScriptCore/JavaScript.h>
-#include <CommonsJavaScript/PrivateObject.h>
+#include "JSWebAPIErrorFactory.h"
 
-#include "JSTizenException.h"
-#include "PlatformException.h"
+#include "WebAPIError.h"
 
 namespace DeviceAPI {
 namespace Common {
 
-               class JSWebAPIException {
-                       public:
-                               typedef  WrtDeviceApis::CommonsJavaScript::PrivateObjectT<TizenExceptionDataPtr>::Type PrivateObject;
-
-                               static JSClassRef getClassRef();
-                               static const JSClassDefinition* getClassInfo();
-
-                               static int convertToWebAPIExceptionCode(const std::string& errorName);
-
-                static JSObjectRef makeJSWebAPIException(JSContextRef context, const BasePlatformException& error);
-                static JSValueRef throwException(JSContextRef context, JSValueRef* exception, const BasePlatformException& error);
-
-                       private:
-                               /**
-                                * The callback invoked when an object is first created.
-                                */
-                               static void initialize(JSContextRef context, JSObjectRef object);
-
-                               /**
-                                * The callback invoked when an object is finalized.
-                                */
-                               static void finalize(JSObjectRef object);
-
-                               /**
-                                * The callback invoked when getting a property's value.
-                                */
-                               static JSValueRef getStaticProperty(JSContextRef context, JSObjectRef object, JSStringRef propertyName, JSValueRef* exception);
-
-                               /**
-                                * The callback invoked when an object is used as the target of an 'instanceof' expression.
-                                */
-                               static bool hasInstance(JSContextRef context, JSObjectRef constructor, JSValueRef possibleInstance, JSValueRef* exception);
-
-
-                static JSValueRef toString(JSContextRef context, JSObjectRef object, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception);
-
-
-                               /**
-                                * This structure contains properties and callbacks that define a type of object.
-                                */
-                               static JSClassDefinition m_classInfo;
-
-                               /**
-                                * This structure describes a statically declared value property.
-                                */
-                               static JSStaticValue m_properties[];
-
-                               static JSClassRef m_classRef;
-
-                static JSStaticFunction m_function[];
-
-                       public:
-                               enum{
-                                       UNKNOWN_ERR                              = 0,
-                                       INDEX_SIZE_ERR                           = 1,
-                                       DOMSTRING_SIZE_ERR                       = 2,
-                                       HIERARCHY_REQUEST_ERR                    = 3,
-                                       WRONG_DOCUMENT_ERR                       = 4,
-                                       INVALID_CHARACTER_ERR                    = 5,
-                                       NO_DATA_ALLOWED_ERR                      = 6,
-                                       NO_MODIFICATION_ALLOWED_ERR              = 7,
-                                       NOT_FOUND_ERR                            = 8,
-                                       NOT_SUPPORTED_ERR                        = 9,
-                                       INUSE_ATTRIBUTE_ERR                      = 10,
-                                       INVALID_STATE_ERR                        = 11,
-                                       SYNTAX_ERR                               = 12,
-                                       INVALID_MODIFICATION_ERR                 = 13,
-                                       NAMESPACE_ERR                            = 14,
-                                       INVALID_ACCESS_ERR                       = 15,
-                                       VALIDATION_ERR                           = 16,
-                                       TYPE_MISMATCH_ERR                        = 17,
-                                       SECURITY_ERR                             = 18,
-                                       NETWORK_ERR                              = 19,
-                                       ABORT_ERR                                = 20,
-                                       URL_MISMATCH_ERR                         = 21,
-                                       QUOTA_EXCEEDED_ERR                       = 22,
-                                       TIMEOUT_ERR                              = 23,
-                                       INVALID_NODE_TYPE_ERR                    = 24,
-                                       DATA_CLONE_ERR                           = 25,
-
-                               };      //WebAPIException
-               };
-
-}// Common
-}// DeviceAPI
-#endif /* JSWEBAPIEXCEPTION_H_ */
+class JSWebAPIErrorFactory;
+
+class JSWebAPIException
+{
+public:
+       static JSClassRef getClassRef();
+
+       static const JSClassDefinition* getClassInfo();
+
+       static bool isObjectOfClass(JSContextRef context, JSValueRef value);
+
+private:
+       static JSObjectRef createJSObject(JSContextRef context, WebAPIError* webapiError);
+
+       static WebAPIError* getPriv(JSContextRef context, JSObjectRef object);
+
+       static void initialize(JSContextRef context, JSObjectRef object);
+
+       static void finalize(JSObjectRef object);
+
+       static bool hasInstance(JSContextRef context,
+                       JSObjectRef constructor,
+                       JSValueRef possibleInstance,
+                       JSValueRef* exception);
+
+       static JSValueRef toString(JSContextRef context,
+                       JSObjectRef object,
+                       JSObjectRef thisObject,
+                       size_t argumentCount,
+                       const JSValueRef arguments[],
+                       JSValueRef* exception);
+
+       static JSClassDefinition m_classInfo;
+
+       static JSStaticValue m_properties[];
+
+       static JSClassRef m_classRef;
+
+       static JSStaticFunction m_function[];
+
+       friend class JSWebAPIErrorFactory;
+};
+
+} // Common
+} // DeviceAPI
+
+#endif // _JS_WEBAPI_EXCEPTION2_H_
index 48aa29c..168664d 100644 (file)
@@ -18,7 +18,7 @@
 
 #include "PlatformException.h"
 #include "JSUtil.h"
-#include "JSWebAPIException.h"
+#include "JSWebAPIErrorFactory.h"
 #include <CommonsJavaScript/Converter.h>
 
 using namespace WrtDeviceApis::CommonsJavaScript;
@@ -29,7 +29,7 @@ using namespace WrtDeviceApis::Commons;
 namespace DeviceAPI {
 namespace Common{
 
-BasePlatformException::BasePlatformException(int code, const char* name, const char* message):mCode(code),mName(name),mMessage(message){
+BasePlatformException::BasePlatformException(const char* name, const char* message):mName(name),mMessage(message){
 }
 
 BasePlatformException::BasePlatformException(JSContextRef context, JSValueRef value){
@@ -38,7 +38,6 @@ BasePlatformException::BasePlatformException(JSContextRef context, JSValueRef va
         return;
 
     JSValueRef message = JSUtil::getProperty(context, object, "message");
-    JSValueRef code = JSUtil::getProperty(context, object, "code");    
     JSValueRef name = JSUtil::getProperty(context, object, "name");
 
     try{
@@ -47,14 +46,11 @@ BasePlatformException::BasePlatformException(JSContextRef context, JSValueRef va
             mMessage = convert.toString(message);
         if( !JSValueIsUndefined(context, name ))
             mName = convert.toString(name);
-        if( !JSValueIsUndefined(context, code ))
-            mCode = convert.toInt(code);
     }catch( const ConversionException& err){
     }
 }
 
-int BasePlatformException::getCode() const{
-    return mCode;    
+BasePlatformException::~BasePlatformException() {
 }
 
 std::string BasePlatformException::getName() const{
@@ -66,74 +62,64 @@ std::string BasePlatformException::getMessage() const{
 }
 
 
-TypeMismatchException::TypeMismatchException(const char* message):BasePlatformException(JSWebAPIException::TYPE_MISMATCH_ERR,"TypeMismatchError", message){
+TypeMismatchException::TypeMismatchException(const char* message):BasePlatformException("TypeMismatchError", message){
 }
 TypeMismatchException::TypeMismatchException(JSContextRef ctx, JSValueRef exception):BasePlatformException(ctx,exception){
-    mCode = JSWebAPIException::TYPE_MISMATCH_ERR;
     mName = "TypeMismatchError";
 }
 
-InvalidValuesException::InvalidValuesException(const char* message):BasePlatformException(0,"InvalidValuesError", message){
+InvalidValuesException::InvalidValuesException(const char* message):BasePlatformException("InvalidValuesError", message){
 }
 InvalidValuesException::InvalidValuesException(JSContextRef ctx, JSValueRef exception):BasePlatformException(ctx,exception){
-    mCode = 0;
     mName = "InvalidValuesError";
 }
 
-IOException::IOException(const char* message):BasePlatformException(0,"IOError", message){
+IOException::IOException(const char* message):BasePlatformException("IOError", message){
 }
 IOException::IOException(JSContextRef ctx, JSValueRef exception):BasePlatformException(ctx,exception){
-    mCode = 0;
     mName = "IOError";
 }
 
 
-UnknownException::UnknownException(const char* message):BasePlatformException(0,"UnknownError", message){
+UnknownException::UnknownException(const char* message):BasePlatformException("UnknownError", message){
 }
 UnknownException::UnknownException(JSContextRef ctx, JSValueRef exception):BasePlatformException(ctx,exception){
-    mCode = 0;
     mName = "UnknownError";
 }
 
-ServiceNotAvailableException::ServiceNotAvailableException(const char* message):BasePlatformException(0,"ServiceNotAvailableError", message){
+ServiceNotAvailableException::ServiceNotAvailableException(const char* message):BasePlatformException("ServiceNotAvailableError", message){
 }
 ServiceNotAvailableException::ServiceNotAvailableException(JSContextRef ctx, JSValueRef exception):BasePlatformException(ctx,exception){
-    mCode = 0;
     mName = "ServiceNotAvailableError";
 }
 
-SecurityException::SecurityException(const char* message):BasePlatformException(JSWebAPIException::SECURITY_ERR,"SecurityError", message){
+SecurityException::SecurityException(const char* message):BasePlatformException("SecurityError", message){
 }
 SecurityException::SecurityException(JSContextRef ctx, JSValueRef exception):BasePlatformException(ctx,exception){
-    mCode = JSWebAPIException::SECURITY_ERR;
     mName = "SecurityError";
 }
 
-NotSupportedException::NotSupportedException(const char* message):BasePlatformException(JSWebAPIException::NOT_SUPPORTED_ERR,"NotSupportedError", message){
+NotSupportedException::NotSupportedException(const char* message):BasePlatformException("NotSupportedError", message){
 }
 NotSupportedException::NotSupportedException(JSContextRef ctx, JSValueRef exception):BasePlatformException(ctx,exception){
-    mCode = JSWebAPIException::NOT_SUPPORTED_ERR;
     mName = "NotSupportedError";
 }
 
-NotFoundException::NotFoundException(const char* message):BasePlatformException(JSWebAPIException::NOT_FOUND_ERR,"NotFoundError", message){
+NotFoundException::NotFoundException(const char* message):BasePlatformException("NotFoundError", message){
 }
 NotFoundException::NotFoundException(JSContextRef ctx, JSValueRef exception):BasePlatformException(ctx,exception){
-    mCode = JSWebAPIException::NOT_FOUND_ERR;
     mName = "NotFoundError";
 }
 
-InvalidAccessException::InvalidAccessException(const char* message):BasePlatformException(JSWebAPIException::INVALID_ACCESS_ERR,"InvalidAccessError", message){
+InvalidAccessException::InvalidAccessException(const char* message):BasePlatformException("InvalidAccessError", message){
 }
 InvalidAccessException::InvalidAccessException(JSContextRef ctx, JSValueRef exception):BasePlatformException(ctx,exception){
-    mCode = JSWebAPIException::INVALID_ACCESS_ERR;
     mName = "InvalidAccessError";
 }
 
-QuotaExceededException::QuotaExceededException(const char* message):BasePlatformException(JSWebAPIException::QUOTA_EXCEEDED_ERR,"QuotaExceededError", message){
+QuotaExceededException::QuotaExceededException(const char* message):BasePlatformException("QuotaExceededError", message){
 }
 QuotaExceededException::QuotaExceededException(JSContextRef ctx, JSValueRef exception):BasePlatformException(ctx,exception){
-    mCode = JSWebAPIException::QUOTA_EXCEEDED_ERR;
     mName = "QuotaExceededError";
 }
 
index 0c8027e..cc73da9 100644 (file)
@@ -28,15 +28,14 @@ namespace Common{
 
 class BasePlatformException{
 public:
-    BasePlatformException(int code, const char* name, const char* message);
+    BasePlatformException(const char* name, const char* message);
     BasePlatformException(JSContextRef ctx, JSValueRef exception);
+    virtual ~BasePlatformException();
 
-    virtual int getCode() const;
     virtual std::string getName() const;
     virtual std::string getMessage() const;
 
 protected:
-    int mCode;
     std::string mName;
     std::string mMessage;
 };
index 668fad0..0c5c3d0 100644 (file)
@@ -19,7 +19,7 @@
 #define TIZENAPIS_COMMONS_JS_SECURITYEXCEPTIONS_H_
 
 #include <JavaScriptCore/JavaScript.h>
-#include "JSTizenExceptionFactory.h"
+#include "JSWebAPIErrorFactory.h"
 
 namespace DeviceAPI {
 namespace Common {
@@ -32,12 +32,12 @@ namespace Common {
        do { \
                switch (status) { \
                        case AceSecurityStatus::InternalError: \
-                               return JSTizenExceptionFactory::postException(context, exception, \
-                                               JSTizenException::UNKNOWN_ERROR); \
+                               return JSWebAPIErrorFactory::postException(context, exception, \
+                                               JSWebAPIErrorFactory::UNKNOWN_ERROR); \
                                break; \
                        case AceSecurityStatus::AccessDenied:                                  \
-                               return JSTizenExceptionFactory::postException(context, exception, \
-                                       JSTizenException::PERMISSION_DENIED_ERROR); \
+                               return JSWebAPIErrorFactory::postException(context, exception, \
+                                       JSWebAPIErrorFactory::PERMISSION_DENIED_ERROR); \
                                break; \
                        default: \
                                break; \
@@ -52,12 +52,12 @@ namespace Common {
        do { \
                switch (status) { \
                case AceSecurityStatus::InternalError: \
-                       cbm->callOnError(JSTizenExceptionFactory::makeErrorObject(context, \
+                       cbm->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, \
                                        "SECURITY_ERROR", "internal error")); \
                        return JSValueMakeNull(context); \
                case AceSecurityStatus::AccessDenied: \
-                       cbm->callOnError(JSTizenExceptionFactory::makeErrorObject(context, \
-                                               JSTizenException::PERMISSION_DENIED_ERROR, "PERMISSION_DENIED_ERROR")); \
+                       cbm->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, \
+                                               JSWebAPIErrorFactory::PERMISSION_DENIED_ERROR, "PERMISSION_DENIED_ERROR")); \
                        return JSValueMakeNull(context); \
                default: \
                        break; \
diff --git a/src/Common/TizenExceptionData.cpp b/src/Common/TizenExceptionData.cpp
deleted file mode 100644 (file)
index 2ceb771..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// Tizen Web Device API
-// Copyright (c) 2012 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Apache License, Version 2.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-#include "TizenExceptionData.h"
-
-namespace DeviceAPI {
-namespace Common {
-
-               TizenExceptionData::TizenExceptionData(int code, const std::string& name, const std::string& message) :
-               m_code(code), m_name(name), m_message(message) {
-               }
-
-               TizenExceptionData::~TizenExceptionData() {
-               }
-
-               int TizenExceptionData::getCode() const {
-                       return m_code;
-               }
-
-               std::string TizenExceptionData::getName() const {
-                       return m_name;
-               }
-
-               std::string TizenExceptionData::getMessage() const {
-                       return m_message;
-               }
-}// Common
-}// DeviceAPI
diff --git a/src/Common/TizenExceptionData.h b/src/Common/TizenExceptionData.h
deleted file mode 100644 (file)
index f1286be..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-//
-// Tizen Web Device API
-// Copyright (c) 2012 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Apache License, Version 2.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-#ifndef TIZENEXCEPTIONDATA_H_
-#define TIZENEXCEPTIONDATA_H_
-
-#include <string>
-#include <dpl/shared_ptr.h>
-
-namespace DeviceAPI {
-namespace Common {
-
-class TizenExceptionData {
-       public:
-               TizenExceptionData(int code, const std::string& name, const std::string& message = std::string());
-               virtual ~TizenExceptionData();
-
-               int getCode() const;
-               std::string getName() const;
-               std::string getMessage() const;
-
-       private :
-               int m_code;
-               std::string m_name;
-               std::string m_message;
-};
-
-typedef DPL::SharedPtr<TizenExceptionData> TizenExceptionDataPtr;
-
-}// Common
-}// DeviceAPI
-
-#endif /* TIZENEXCEPTIONDATA_H_ */
index a055a69..323fb81 100644 (file)
@@ -39,7 +39,6 @@ private:
        std::string m_name;
        std::string m_message;
 };
-typedef DPL::SharedPtr<WebAPIError> WebAPIErrorPtr;
 
 } // Common
 } // DeviceAPI
index c7a03b8..0bde2fc 100644 (file)
@@ -23,8 +23,7 @@
  */
 
 #include <CommonsJavaScript/JSCallbackManager.h>
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 #include "AddressBookController.h"
 #include "ContactConverter.h"
 #include "JSAddressBookChangeCallbackManager.h"
@@ -89,16 +88,16 @@ void AddressBookAsyncAnswerHandler::addBatch(const EventAddressBookAddBatchPtr &
                switch (event->getExceptionCode())
                {
                case ExceptionCodes::PlatformException:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::UNKNOWN_ERROR, "Internal error");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                        break;
                case ExceptionCodes::InvalidArgumentException:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::TYPE_MISMATCH_ERROR, "Invalid value error");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Invalid value error");
                        break;
                case ExceptionCodes::ConversionException:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::TYPE_MISMATCH_ERROR, "Wrong argument");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong argument");
                        break;
                default:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::UNKNOWN_ERROR, "Unknown error");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown error");
                        break;
                }
 
@@ -119,7 +118,7 @@ void AddressBookAsyncAnswerHandler::addBatch(const EventAddressBookAddBatchPtr &
                return;
        } Catch(Exception) {
                LoggerE("error during processing answer" << _rethrown_exception.GetMessage());
-               error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::UNKNOWN_ERROR, "Internal error");
+               error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
 
                callbackManager->callOnError(error);
                return;
@@ -157,19 +156,19 @@ void AddressBookAsyncAnswerHandler::updateBatch(const EventAddressBookUpdateBatc
                switch (event->getExceptionCode())
                {
                case ExceptionCodes::PlatformException:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::UNKNOWN_ERROR, "Internal error");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                        break;
                case ExceptionCodes::NotFoundException:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::NOT_FOUND_ERROR, "record not found");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::NOT_FOUND_ERROR, "record not found");
                        break;
                case ExceptionCodes::InvalidArgumentException:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::TYPE_MISMATCH_ERROR, "Invalid value error");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Invalid value error");
                        break;
                case ExceptionCodes::ConversionException:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::TYPE_MISMATCH_ERROR, "Wrong argument");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong argument");
                        break;
                default:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::UNKNOWN_ERROR, "Unknown error");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown error");
                        break;
                }
 
@@ -211,19 +210,19 @@ void AddressBookAsyncAnswerHandler::removeBatch(const EventAddressBookRemoveBatc
                switch (event->getExceptionCode())
                {
                case ExceptionCodes::PlatformException:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::UNKNOWN_ERROR, "Internal error");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                        break;
                case ExceptionCodes::NotFoundException:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::NOT_FOUND_ERROR, "record not found");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::NOT_FOUND_ERROR, "record not found");
                        break;
                case ExceptionCodes::InvalidArgumentException:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::TYPE_MISMATCH_ERROR, "Invalid value error");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Invalid value error");
                        break;
                case ExceptionCodes::ConversionException:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::TYPE_MISMATCH_ERROR, "Wrong argument");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong argument");
                        break;
                default:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::UNKNOWN_ERROR, "Unknown error");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown error");
                        break;
                }
                callbackManager->callOnError(error);
@@ -259,16 +258,16 @@ void AddressBookAsyncAnswerHandler::find(const EventAddressBookFindPtr &event)
                switch (event->getExceptionCode())
                {
                case ExceptionCodes::PlatformException:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::NOT_SUPPORTED_ERROR, "Not support such a filter");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, "Not support such a filter");
                        break;
                case ExceptionCodes::InvalidArgumentException:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::TYPE_MISMATCH_ERROR, "Invalid value error");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Invalid value error");
                        break;
                case ExceptionCodes::ConversionException:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::TYPE_MISMATCH_ERROR, "Wrong argument");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong argument");
                        break;
                default:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::UNKNOWN_ERROR, "Unknown error");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown error");
                        break;
                }
 
@@ -289,7 +288,7 @@ void AddressBookAsyncAnswerHandler::find(const EventAddressBookFindPtr &event)
                return;
        } Catch(Exception) {
                LoggerE("error during processing answer" << _rethrown_exception.GetMessage());
-               error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::UNKNOWN_ERROR, "Internal error");
+               error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
 
                callbackManager->callOnError(error);
                return;
@@ -311,9 +310,9 @@ void AddressBookAsyncAnswerHandler::changeListenerError(const EventAddressBookCh
        JSContextRef gContext = cbm->getContext();
 
        if (event->getExceptionCode() == ExceptionCodes::NotFoundException)
-               errorObject = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::NOT_FOUND_ERROR, "Not found error");
+               errorObject = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::NOT_FOUND_ERROR, "Not found error");
        else
-               errorObject = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::UNKNOWN_ERROR, "Unknown error");
+               errorObject = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown error");
 
        cbm->callOnError(errorObject);
 }
index 926e53f..284e3e7 100755 (executable)
@@ -41,7 +41,7 @@
 #include "ContactPhoneNumber.h"
 #include "ContactEmailAddress.h"
 #include <ArgumentValidator.h>
-#include <JSWebAPIError.h>
+#include <JSWebAPIErrorFactory.h>
 #include <JSUtil.h>
 #include <Export.h>
 
index 36b7b31..9589896 100644 (file)
@@ -23,8 +23,7 @@
  */
 
 #include <CommonsJavaScript/JSCallbackManager.h>
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 #include "ContactConverter.h"
 #include "ContactManagerController.h"
 #include "ContactAsyncCallbackManager.h"
@@ -80,16 +79,16 @@ void ContactManagerAsyncAnswerHandler::getAddressBooks(const EventContactManager
                switch (event->getExceptionCode())
                {
                case ExceptionCodes::PlatformException:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::UNKNOWN_ERROR, "Internal error");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                        break;
                case ExceptionCodes::InvalidArgumentException:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::UNKNOWN_ERROR, "Invalid value error");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Invalid value error");
                        break;
                case ExceptionCodes::ConversionException:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::UNKNOWN_ERROR, "Wrong argument");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Wrong argument");
                        break;
                default:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::UNKNOWN_ERROR, "Unknown error");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown error");
                        break;
                }
 
@@ -110,7 +109,7 @@ void ContactManagerAsyncAnswerHandler::getAddressBooks(const EventContactManager
                return;
        } Catch(Exception) {
                LoggerE("error during processing answer" << _rethrown_exception.GetMessage());
-               error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::UNKNOWN_ERROR, "Internal error");
+               error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
 
                callbackManager->callOnError(error);
                return;
@@ -149,19 +148,19 @@ void ContactManagerAsyncAnswerHandler::updateBatch(const EventContactManagerUpda
                switch (event->getExceptionCode())
                {
                case ExceptionCodes::PlatformException:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::UNKNOWN_ERROR, "Internal error");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                        break;
                case ExceptionCodes::NotFoundException:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::NOT_FOUND_ERROR, "record not found");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::NOT_FOUND_ERROR, "record not found");
                        break;
                case ExceptionCodes::InvalidArgumentException:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::TYPE_MISMATCH_ERROR, "Invalid value error");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Invalid value error");
                        break;
                case ExceptionCodes::ConversionException:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::TYPE_MISMATCH_ERROR, "Wrong argument");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong argument");
                        break;
                default:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::UNKNOWN_ERROR, "Unknown error");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown error");
                        break;
                }
 
@@ -203,19 +202,19 @@ void ContactManagerAsyncAnswerHandler::removeBatch(const EventContactManagerRemo
                switch (event->getExceptionCode())
                {
                case ExceptionCodes::PlatformException:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::UNKNOWN_ERROR, "Internal error");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                        break;
                case ExceptionCodes::NotFoundException:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::NOT_FOUND_ERROR, "record not found");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::NOT_FOUND_ERROR, "record not found");
                        break;
                case ExceptionCodes::InvalidArgumentException:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::TYPE_MISMATCH_ERROR, "Invalid value error");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Invalid value error");
                        break;
                case ExceptionCodes::ConversionException:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::TYPE_MISMATCH_ERROR, "Wrong argument");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong argument");
                        break;
                default:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::UNKNOWN_ERROR, "Unknown error");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown error");
                        break;
                }
                callbackManager->callOnError(error);
@@ -251,16 +250,16 @@ void ContactManagerAsyncAnswerHandler::find(const EventContactManagerFindPtr &ev
                switch (event->getExceptionCode())
                {
                case ExceptionCodes::PlatformException:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::NOT_SUPPORTED_ERROR, "Not support such a filter");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, "Not support such a filter");
                        break;
                case ExceptionCodes::InvalidArgumentException:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::TYPE_MISMATCH_ERROR, "Invalid value error");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Invalid value error");
                        break;
                case ExceptionCodes::ConversionException:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::TYPE_MISMATCH_ERROR, "Wrong argument");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong argument");
                        break;
                default:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::UNKNOWN_ERROR, "Unknown error");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown error");
                        break;
                }
 
@@ -281,7 +280,7 @@ void ContactManagerAsyncAnswerHandler::find(const EventContactManagerFindPtr &ev
                return;
        } Catch(Exception) {
                LoggerE("error during processing answer" << _rethrown_exception.GetMessage());
-               error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::UNKNOWN_ERROR, "Internal error");
+               error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
 
                callbackManager->callOnError(error);
                return;
@@ -303,9 +302,9 @@ void ContactManagerAsyncAnswerHandler::changeListenerError(const EventContactMan
        JSContextRef gContext = cbm->getContext();
 
        if (event->getExceptionCode() == ExceptionCodes::NotFoundException)
-               errorObject = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::NOT_FOUND_ERROR, "Not found error");
+               errorObject = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::NOT_FOUND_ERROR, "Not found error");
        else
-               errorObject = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::UNKNOWN_ERROR, "Unknown error");
+               errorObject = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown error");
 
        cbm->callOnError(errorObject);
 }
index c20b064..99dfe5f 100644 (file)
@@ -27,8 +27,6 @@
 #include <CommonsJavaScript/JSCallbackManager.h>
 #include <CommonsJavaScript/JSUtils.h>
 #include <CommonsJavaScript/JSPendingOperation.h>
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
 #include <SecurityExceptions.h>
 #include <FilterConverter.h>
 #include "ContactFactory.h"
@@ -49,7 +47,7 @@
 #include "ContactListenerManager.h"
 #include "ContactFilterConverter.h"
 #include <ArgumentValidator.h>
-#include <JSWebAPIError.h>
+#include <JSWebAPIErrorFactory.h>
 #include <JSUtil.h>
 #include <TimeTracer.h>
 #include <Logger.h>
@@ -288,7 +286,7 @@ JSValueRef JSAddressBook::get(JSContextRef context,
 
        } Catch(Exception) {
                LoggerE("No private object");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Wrong object");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong object");
        }
 
        AceSecurityStatus status = CONTACT_CHECK_ACCESS(CONTACT_FUNCTION_API_ADDRESS_BOOK_GET);
@@ -300,13 +298,13 @@ JSValueRef JSAddressBook::get(JSContextRef context,
                ArgumentValidator validator(context, argumentCount, arguments);
                id = validator.toString(0, false);
        } catch (const TypeMismatchException& err ) {
-               return JSWebAPIError::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch(const BasePlatformException& err) {
-               return JSWebAPIError::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch(const ConversionException& err) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
        } catch(const NullPointerException& err) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
        }
 
        EventAddressBookGetPtr dplEvent(new EventAddressBookGet());
@@ -318,7 +316,7 @@ JSValueRef JSAddressBook::get(JSContextRef context,
                addressBook->get(dplEvent);
        } Catch(Exception) {
                LoggerE("Error on platform : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Internal error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
        }
 
        if (!dplEvent->getResult() || !dplEvent->getContactIsSet())
@@ -330,13 +328,13 @@ JSValueRef JSAddressBook::get(JSContextRef context,
                case ExceptionCodes::InvalidArgumentException:
                        LoggerE("Not Found error : " << id);
                        oss << "No Contact id '" << id << "'";
-                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_FOUND_ERROR, oss.str());
+                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_FOUND_ERROR, oss.str());
                        break;
                case ExceptionCodes::PlatformException:
-                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Internal error");
+                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                        break;
                default:
-                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Internal error");
+                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                        break;
                }
        }
@@ -349,7 +347,7 @@ JSValueRef JSAddressBook::get(JSContextRef context,
                result = converter->toJSValueRef(contact);
        } Catch(Exception) {
                LoggerE("Error on conversion : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Internal error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
        }
 
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
@@ -378,7 +376,7 @@ JSValueRef JSAddressBook::add(JSContextRef context,
                gContext = controller->getContext();
        } Catch(Exception) {
                LoggerE("No private object");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Wrong object");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong object");
        }
 
        AceSecurityStatus status = CONTACT_CHECK_ACCESS(CONTACT_FUNCTION_API_ADDRESS_BOOK_ADD);
@@ -388,13 +386,13 @@ JSValueRef JSAddressBook::add(JSContextRef context,
                ArgumentValidator validator(context, argumentCount, arguments);
                validator.toObject(0, false);
        } catch (const TypeMismatchException& err ) {
-               return JSWebAPIError::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch(const BasePlatformException& err) {
-               return JSWebAPIError::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch(const ConversionException& err) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
        } catch(const NullPointerException& err) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
        }
 
        ContactPtr contact(NULL);
@@ -406,7 +404,7 @@ JSValueRef JSAddressBook::add(JSContextRef context,
                contact = converter->toContact(arguments[0]);
        } Catch(Exception) {
                LoggerE("Error on conversion : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "1st argument must be a 'Contact object'");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "1st argument must be a 'Contact object'");
        }
 
        EventAddressBookAddPtr dplEvent(new EventAddressBookAdd());
@@ -418,7 +416,7 @@ JSValueRef JSAddressBook::add(JSContextRef context,
                addressBook->add(dplEvent);
        } Catch(Exception) {
                LoggerE("Error on platform : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Internal error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
        }
 
        if (!dplEvent->getResult())
@@ -426,13 +424,13 @@ JSValueRef JSAddressBook::add(JSContextRef context,
                switch (dplEvent->getExceptionCode())
                {
                case ExceptionCodes::PlatformException:
-                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Internal error");
+                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                        break;
                case ExceptionCodes::InvalidArgumentException:
-                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, "There is Invalid input value");
+                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "There is Invalid input value");
                        break;
                default:
-                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Internal error");
+                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                        break;
                }
        }
@@ -466,7 +464,7 @@ JSValueRef JSAddressBook::addBatch(JSContextRef context,
                gContext = controller->getContext();
        } Catch(Exception) {
                LoggerE("No private object");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Wrong object");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong object");
        }
 
        AceSecurityStatus status = CONTACT_CHECK_ACCESS(CONTACT_FUNCTION_API_ADDRESS_BOOK_ADD_BATCH);
@@ -485,13 +483,13 @@ JSValueRef JSAddressBook::addBatch(JSContextRef context,
                        js3rdParamIsFunction = true;
 
        } catch (const TypeMismatchException& err ) {
-               return JSWebAPIError::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch(const BasePlatformException& err) {
-               return JSWebAPIError::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch(const ConversionException& err) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
        } catch(const NullPointerException& err) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
        }
 
        ContactConverterFactory::ConverterType converter = ContactConverterFactory::getConverter(context);
@@ -511,7 +509,7 @@ JSValueRef JSAddressBook::addBatch(JSContextRef context,
                dplEvent->setContacts(converter->toContactArray(arguments[0]));
        } Catch(ConversionException) {
                LoggerE("Error on conversion : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "1st argument must be an array of 'Contact object'");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "1st argument must be an array of 'Contact object'");
        }
 
        // set event handler's data
@@ -526,7 +524,7 @@ JSValueRef JSAddressBook::addBatch(JSContextRef context,
                ContactAsyncCallbackManagerSingleton::Instance().registerCallbackManager(callbackManager, gContext);
        } Catch(Exception) {
                LoggerE("Error on platform : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Internal error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
        }
 
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
@@ -556,7 +554,7 @@ JSValueRef JSAddressBook::update(JSContextRef context,
                gContext = controller->getContext();
        } Catch(Exception) {
                LoggerE("No private object");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Wrong object");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong object");
        }
 
        AceSecurityStatus status = CONTACT_CHECK_ACCESS(CONTACT_FUNCTION_API_ADDRESS_BOOK_UPDATE);
@@ -567,13 +565,13 @@ JSValueRef JSAddressBook::update(JSContextRef context,
                validator.toObject(0, false);
 
        } catch (const TypeMismatchException& err ) {
-               return JSWebAPIError::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch(const BasePlatformException& err) {
-               return JSWebAPIError::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch(const ConversionException& err) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
        } catch(const NullPointerException& err) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
        }
 
        ContactPtr contact(NULL);
@@ -585,7 +583,7 @@ JSValueRef JSAddressBook::update(JSContextRef context,
                contact = converter->toContact(arguments[0]);
        } Catch(Exception) {
                LoggerE("Error on conversion : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "1st argument is not a 'Contact object'");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "1st argument is not a 'Contact object'");
        }
 
        EventAddressBookUpdatePtr dplEvent(new EventAddressBookUpdate());
@@ -597,7 +595,7 @@ JSValueRef JSAddressBook::update(JSContextRef context,
                addressBook->update(dplEvent);
        } Catch(Exception) {
                LoggerE("Error on platform : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Internal error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
        }
 
        if (!dplEvent->getResult())
@@ -608,13 +606,13 @@ JSValueRef JSAddressBook::update(JSContextRef context,
                case ExceptionCodes::NotFoundException:
                case ExceptionCodes::InvalidArgumentException:
                        oss << "No Contact id '" << contact->getId() << "'";
-                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_FOUND_ERROR, oss.str());
+                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_FOUND_ERROR, oss.str());
                        break;
                case ExceptionCodes::PlatformException:
-                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Internal error");
+                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                        break;
                default:
-                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Internal error");
+                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                        break;
                }
        }
@@ -648,7 +646,7 @@ JSValueRef JSAddressBook::updateBatch(JSContextRef context,
                gContext = controller->getContext();
        } Catch(Exception) {
                LoggerE("No private object");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Wrong object");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong object");
        }
 
        AceSecurityStatus status = CONTACT_CHECK_ACCESS(CONTACT_FUNCTION_API_ADDRESS_BOOK_UPDATE_BATCH);
@@ -668,13 +666,13 @@ JSValueRef JSAddressBook::updateBatch(JSContextRef context,
                        js3rdParamIsFunction = true;
 
        } catch (const TypeMismatchException& err ) {
-               return JSWebAPIError::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch(const BasePlatformException& err) {
-               return JSWebAPIError::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch(const ConversionException& err) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
        } catch(const NullPointerException& err) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
        }
 
        ContactConverterFactory::ConverterType converter = ContactConverterFactory::getConverter(context);
@@ -694,7 +692,7 @@ JSValueRef JSAddressBook::updateBatch(JSContextRef context,
                dplEvent->setContacts(converter->toContactArray(arguments[0]));
        } Catch(ConversionException) {
                LoggerE("Error on conversion : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "3rd argument must be an array of 'Contact object'");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "3rd argument must be an array of 'Contact object'");
        }
 
        // set event handler's data
@@ -709,7 +707,7 @@ JSValueRef JSAddressBook::updateBatch(JSContextRef context,
                ContactAsyncCallbackManagerSingleton::Instance().registerCallbackManager(callbackManager, gContext);
        } Catch(Exception) {
                LoggerE("Error on platform : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Internal error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
        }
 
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
@@ -737,7 +735,7 @@ JSValueRef JSAddressBook::remove(JSContextRef context,
                addressBook = controller->getObject();
        } Catch(Exception) {
                LoggerE("No private object");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Wrong object");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong object");
        }
 
        AceSecurityStatus status = CONTACT_CHECK_ACCESS(CONTACT_FUNCTION_API_ADDRESS_BOOK_REMOVE);
@@ -748,13 +746,13 @@ JSValueRef JSAddressBook::remove(JSContextRef context,
        try     {
                contactId = validator.toString(0, false);
        } catch (const TypeMismatchException& err ) {
-               return JSWebAPIError::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch(const BasePlatformException& err) {
-               return JSWebAPIError::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch(const ConversionException& err) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
        } catch(const NullPointerException& err) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
        }
 
        EventAddressBookRemovePtr dplEvent(new EventAddressBookRemove());
@@ -766,7 +764,7 @@ JSValueRef JSAddressBook::remove(JSContextRef context,
                addressBook->remove(dplEvent);
        } Catch(Exception) {
                LoggerE("Error on platform : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Internal error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
        }
 
        if (!dplEvent->getResult())
@@ -778,13 +776,13 @@ JSValueRef JSAddressBook::remove(JSContextRef context,
                case ExceptionCodes::InvalidArgumentException:
                        LoggerE("Not Found error : " << contactId);
                        oss << "No Contact id '" << contactId << "'";
-                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_FOUND_ERROR, oss.str());
+                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_FOUND_ERROR, oss.str());
                        break;
                case ExceptionCodes::PlatformException:
-                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Internal error");
+                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                        break;
                default:
-                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Internal error");
+                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                        break;
                }
        }
@@ -817,7 +815,7 @@ JSValueRef JSAddressBook::removeBatch(JSContextRef context,
                gContext = controller->getContext();
        } Catch(Exception) {
                LoggerE("No private object");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Wrong object");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong object");
        }
 
        AceSecurityStatus status = CONTACT_CHECK_ACCESS(CONTACT_FUNCTION_API_ADDRESS_BOOK_REMOVE_BATCH);
@@ -836,13 +834,13 @@ JSValueRef JSAddressBook::removeBatch(JSContextRef context,
                        js3rdParamIsFunction = true;
 
        } catch (const TypeMismatchException& err ) {
-               return JSWebAPIError::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch(const BasePlatformException& err) {
-               return JSWebAPIError::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch(const ConversionException& err) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
        } catch(const NullPointerException& err) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
        }
 
        ContactConverterFactory::ConverterType converter = ContactConverterFactory::getConverter(context);
@@ -862,7 +860,7 @@ JSValueRef JSAddressBook::removeBatch(JSContextRef context,
                dplEvent->setContactIds(converter->toStringArray(arguments[0]));
        } Catch(ConversionException) {
                LoggerE("Error on conversion : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "3rd argument must be an array of 'Contact id'");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "3rd argument must be an array of 'Contact id'");
        }
 
        // set event handler's data
@@ -877,7 +875,7 @@ JSValueRef JSAddressBook::removeBatch(JSContextRef context,
                ContactAsyncCallbackManagerSingleton::Instance().registerCallbackManager(callbackManager, gContext);
        } Catch(Exception) {
                LoggerE("Error on platform : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Internal error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
        }
 
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
@@ -911,7 +909,7 @@ JSValueRef JSAddressBook::find(JSContextRef context,
                gContext = controller->getContext();
        } Catch(Exception) {
                LoggerE("No private object");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Wrong object");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong object");
        }
 
        AceSecurityStatus status = CONTACT_CHECK_ACCESS(CONTACT_FUNCTION_API_ADDRESS_BOOK_FIND);
@@ -934,13 +932,13 @@ JSValueRef JSAddressBook::find(JSContextRef context,
                        js4thParamIsObject = true;
 
        } catch (const TypeMismatchException& err ) {
-               return JSWebAPIError::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch(const BasePlatformException& err) {
-               return JSWebAPIError::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch(const ConversionException& err) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
        } catch(const NullPointerException& err) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
        }
 
        JSCallbackManagerPtr callbackManager = JSCallbackManager::createObject(gContext);
@@ -961,7 +959,7 @@ JSValueRef JSAddressBook::find(JSContextRef context,
                        dplEvent->setFilter(filterConverter->toFilter(arguments[2]));
        } Catch(Exception) {
                LoggerE("Error on 3rd parameter conversion : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "3rd argument must be an 'Filter object' or 'null'");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "3rd argument must be an 'Filter object' or 'null'");
        }
 
        Try {
@@ -969,7 +967,7 @@ JSValueRef JSAddressBook::find(JSContextRef context,
                        dplEvent->setSortMode(filterConverter->toSortMode(arguments[3]));
        } Catch(Exception) {
                LoggerE("Error on 4th parameter conversion : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "4th argument must be an 'SortMode object' or 'null'");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "4th argument must be an 'SortMode object' or 'null'");
        }
 
        // set event handler's data
@@ -984,7 +982,7 @@ JSValueRef JSAddressBook::find(JSContextRef context,
                ContactAsyncCallbackManagerSingleton::Instance().registerCallbackManager(callbackManager, gContext);
        } Catch(Exception) {
                LoggerE("Error on platform : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Internal error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
        }
 
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
@@ -1016,7 +1014,7 @@ JSValueRef JSAddressBook::addChangeListener(JSContextRef context,
                gContext = controller->getContext();
        } Catch(Exception) {
                LoggerE("No private object");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Wrong object");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong object");
        }
 
        AceSecurityStatus status = CONTACT_CHECK_ACCESS(CONTACT_FUNCTION_API_ADDRESS_BOOK_ADD_CHANGE_LISTENER);
@@ -1030,13 +1028,13 @@ JSValueRef JSAddressBook::addChangeListener(JSContextRef context,
                if(errorObj)
                        js2ndParamIsFunction = true;
        } catch (const TypeMismatchException& err ) {
-               return JSWebAPIError::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch(const BasePlatformException& err) {
-               return JSWebAPIError::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch(const ConversionException& err) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
        } catch(const NullPointerException& err) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
        }
 
        ContactConverterFactory::ConverterType converter = ContactConverterFactory::getConverter(context);
@@ -1073,7 +1071,7 @@ JSValueRef JSAddressBook::addChangeListener(JSContextRef context,
 
        } Catch(ConversionException) {
                LoggerE("Error on conversion : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
        }
 
        JSAddressBookChangeCallbackManagerPtr callbackManager = JSAddressBookChangeCallbackManager::createObject(gContext);
@@ -1098,7 +1096,7 @@ JSValueRef JSAddressBook::addChangeListener(JSContextRef context,
                addressBook->addChangeListener(dplEvent);
        } Catch(Exception) {
                LoggerE("Error on platform : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Internal error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
        }
 
        if (!dplEvent->getResult() || !dplEvent->getIdIsSet())
@@ -1107,10 +1105,10 @@ JSValueRef JSAddressBook::addChangeListener(JSContextRef context,
                {
                case ExceptionCodes::InvalidArgumentException:
                case ExceptionCodes::PlatformException:
-                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Internal error");
+                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                        break;
                default:
-                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Internal error");
+                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                        break;
                }
        }
@@ -1127,7 +1125,7 @@ JSValueRef JSAddressBook::addChangeListener(JSContextRef context,
 //             result = converter->toJSValueRefLong(watchId);
        } Catch(Exception) {
                LoggerE("Error on conversion : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Internal error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
        }
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
        return result;
@@ -1155,7 +1153,7 @@ JSValueRef JSAddressBook::removeChangeListener(JSContextRef context,
                gContext = controller->getContext();
        } Catch(Exception) {
                LoggerE("No private object");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Wrong object");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong object");
        }
 
        AceSecurityStatus status = CONTACT_CHECK_ACCESS(CONTACT_FUNCTION_API_ADDRESS_BOOK_REMOVE_CHANGE_LISTENER);
@@ -1167,13 +1165,13 @@ JSValueRef JSAddressBook::removeChangeListener(JSContextRef context,
                ArgumentValidator validator(context, argumentCount, arguments);
                watchId = validator.toLong(0, false);
        } catch (const TypeMismatchException& err ) {
-               return JSWebAPIError::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch(const BasePlatformException& err) {
-               return JSWebAPIError::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch(const ConversionException& err) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
        } catch(const NullPointerException& err) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
        }
 
        EventAddressBookRemoveChangeListenerPtr dplEvent(new EventAddressBookRemoveChangeListener());
@@ -1185,7 +1183,7 @@ JSValueRef JSAddressBook::removeChangeListener(JSContextRef context,
                addressBook->removeChangeListener(dplEvent);
        } Catch(Exception) {
                LoggerE("Error on platform : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Internal error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
        }
 
        ContactsChangeListenerCancellerPtr canceller = ContactsChangeListenerCancellerPtr(new ContactsChangeListenerCanceller(gContext, thisObject, watchId));
@@ -1198,10 +1196,10 @@ JSValueRef JSAddressBook::removeChangeListener(JSContextRef context,
                {
                case ExceptionCodes::InvalidArgumentException:
                case ExceptionCodes::NotFoundException:
-                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_FOUND_ERROR, "Watch id not found");
+                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_FOUND_ERROR, "Watch id not found");
                        break;
                default:
-                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Internal error");
+                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                        break;
                }
        }
@@ -1231,7 +1229,7 @@ JSValueRef JSAddressBook::getGroup(JSContextRef context,
                gContext = controller->getContext();
        } Catch(Exception) {
                LoggerE("No private object");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Wrong object");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong object");
        }
 
        AceSecurityStatus status = CONTACT_CHECK_ACCESS(CONTACT_FUNCTION_API_ADDRESS_BOOK_GET_GROUP);
@@ -1244,13 +1242,13 @@ JSValueRef JSAddressBook::getGroup(JSContextRef context,
                ArgumentValidator validator(context, argumentCount, arguments);
                id = validator.toString(0, false);
        } catch (const TypeMismatchException& err ) {
-               return JSWebAPIError::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch(const BasePlatformException& err) {
-               return JSWebAPIError::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch(const ConversionException& err) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
        } catch(const NullPointerException& err) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
        }
 
        EventAddressBookGetGroupPtr dplEvent(new EventAddressBookGetGroup());
@@ -1262,8 +1260,8 @@ JSValueRef JSAddressBook::getGroup(JSContextRef context,
                addressBook->getGroup(dplEvent);
        } Catch(Exception) {
                LoggerE("Error on platform : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception,
-                               JSTizenException::UNKNOWN_ERROR, "Internal error");
+               return JSWebAPIErrorFactory::postException(context, exception,
+                               JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
        }
 
        if (!dplEvent->getResult() || !dplEvent->getContactGroupIsSet())
@@ -1275,16 +1273,16 @@ JSValueRef JSAddressBook::getGroup(JSContextRef context,
                case ExceptionCodes::InvalidArgumentException:
                        LoggerE("Not Found error : " << id);
                        oss << "No Contact id '" << id << "'";
-                       return JSTizenExceptionFactory::postException(context, exception,
-                                       JSTizenException::NOT_FOUND_ERROR, oss.str());
+                       return JSWebAPIErrorFactory::postException(context, exception,
+                                       JSWebAPIErrorFactory::NOT_FOUND_ERROR, oss.str());
                        break;
                case ExceptionCodes::PlatformException:
-                       return JSTizenExceptionFactory::postException(context, exception,
-                                       JSTizenException::UNKNOWN_ERROR, "Internal error");
+                       return JSWebAPIErrorFactory::postException(context, exception,
+                                       JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                        break;
                default:
-                       return JSTizenExceptionFactory::postException(context, exception,
-                                       JSTizenException::UNKNOWN_ERROR, "Internal error");
+                       return JSWebAPIErrorFactory::postException(context, exception,
+                                       JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                        break;
                }
        }
@@ -1296,8 +1294,8 @@ JSValueRef JSAddressBook::getGroup(JSContextRef context,
                result = converter->toJSValueRef(group);
        } Catch(Exception) {
                LoggerE("Error on conversion : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception,
-                               JSTizenException::UNKNOWN_ERROR, "Internal error");
+               return JSWebAPIErrorFactory::postException(context, exception,
+                               JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
        }
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
        return result;
@@ -1325,8 +1323,8 @@ JSValueRef JSAddressBook::addGroup(JSContextRef context,
                gContext = controller->getContext();
        } Catch(Exception) {
                LoggerE("No private object");
-               return JSTizenExceptionFactory::postException(context, exception,
-                               JSTizenException::TYPE_MISMATCH_ERROR, "Wrong object");
+               return JSWebAPIErrorFactory::postException(context, exception,
+                               JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong object");
        }
 
        AceSecurityStatus status = CONTACT_CHECK_ACCESS(CONTACT_FUNCTION_API_ADDRESS_BOOK_ADD_GROUP);
@@ -1337,13 +1335,13 @@ JSValueRef JSAddressBook::addGroup(JSContextRef context,
                validator.toObject(0, false);
 
        } catch (const TypeMismatchException& err ) {
-               return JSWebAPIError::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch(const BasePlatformException& err) {
-               return JSWebAPIError::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch(const ConversionException& err) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
        } catch(const NullPointerException& err) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
        }
 
        ContactGroupPtr group(NULL);
@@ -1356,8 +1354,8 @@ JSValueRef JSAddressBook::addGroup(JSContextRef context,
                group = converter->toContactGroup(arguments[0]);
        } Catch(Exception) {
                LoggerE("Error on conversion : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception,
-                               JSTizenException::TYPE_MISMATCH_ERROR, "1st argument must be a 'ContactGroup object'");
+               return JSWebAPIErrorFactory::postException(context, exception,
+                               JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "1st argument must be a 'ContactGroup object'");
        }
 
        EventAddressBookAddGroupPtr dplEvent(new EventAddressBookAddGroup());
@@ -1369,8 +1367,8 @@ JSValueRef JSAddressBook::addGroup(JSContextRef context,
                addressBook->addGroup(dplEvent);
        } Catch(Exception) {
                LoggerE("Error on platform : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception,
-                               JSTizenException::UNKNOWN_ERROR, "Internal error");
+               return JSWebAPIErrorFactory::postException(context, exception,
+                               JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
        }
 
        if (!dplEvent->getResult())
@@ -1378,12 +1376,12 @@ JSValueRef JSAddressBook::addGroup(JSContextRef context,
                switch (dplEvent->getExceptionCode())
                {
                case ExceptionCodes::PlatformException:
-                       return JSTizenExceptionFactory::postException(context, exception,
-                                       JSTizenException::UNKNOWN_ERROR, "Internal error");
+                       return JSWebAPIErrorFactory::postException(context, exception,
+                                       JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                        break;
                default:
-                       return JSTizenExceptionFactory::postException(context, exception,
-                                       JSTizenException::UNKNOWN_ERROR, "Internal error");
+                       return JSWebAPIErrorFactory::postException(context, exception,
+                                       JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                        break;
                }
        }
@@ -1413,7 +1411,7 @@ JSValueRef JSAddressBook::updateGroup(JSContextRef context,
                gContext = controller->getContext();
        } Catch(Exception) {
                LoggerE("No private object");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Wrong object");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong object");
        }
 
        AceSecurityStatus status = CONTACT_CHECK_ACCESS(CONTACT_FUNCTION_API_ADDRESS_BOOK_UPDATE_GROUP);
@@ -1424,13 +1422,13 @@ JSValueRef JSAddressBook::updateGroup(JSContextRef context,
                validator.toObject(0, false);
 
        } catch (const TypeMismatchException& err ) {
-               return JSWebAPIError::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch(const BasePlatformException& err) {
-               return JSWebAPIError::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch(const ConversionException& err) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
        } catch(const NullPointerException& err) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
        }
 
        ContactGroupPtr contact(NULL);
@@ -1442,7 +1440,7 @@ JSValueRef JSAddressBook::updateGroup(JSContextRef context,
                contact = converter->toContactGroup(arguments[0]);
        } Catch(Exception) {
                LoggerE("Error on conversion : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "1st argument is not a 'ContactGroup object'");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "1st argument is not a 'ContactGroup object'");
        }
 
        EventAddressBookUpdateGroupPtr dplEvent(new EventAddressBookUpdateGroup());
@@ -1454,8 +1452,8 @@ JSValueRef JSAddressBook::updateGroup(JSContextRef context,
                addressBook->updateGroup(dplEvent);
        } Catch(Exception) {
                LoggerE("Error on platform : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception,
-                               JSTizenException::UNKNOWN_ERROR, "Internal error");
+               return JSWebAPIErrorFactory::postException(context, exception,
+                               JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
        }
 
        if (!dplEvent->getResult())
@@ -1466,16 +1464,16 @@ JSValueRef JSAddressBook::updateGroup(JSContextRef context,
                case ExceptionCodes::NotFoundException:
                case ExceptionCodes::InvalidArgumentException:
                        oss << "No Contact id '" << contact->getId() << "'";
-                       return JSTizenExceptionFactory::postException(context, exception,
-                                       JSTizenException::NOT_FOUND_ERROR, oss.str());
+                       return JSWebAPIErrorFactory::postException(context, exception,
+                                       JSWebAPIErrorFactory::NOT_FOUND_ERROR, oss.str());
                        break;
                case ExceptionCodes::PlatformException:
-                       return JSTizenExceptionFactory::postException(context, exception,
-                                       JSTizenException::UNKNOWN_ERROR, "Internal error");
+                       return JSWebAPIErrorFactory::postException(context, exception,
+                                       JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                        break;
                default:
-                       return JSTizenExceptionFactory::postException(context, exception,
-                                       JSTizenException::UNKNOWN_ERROR, "Internal error");
+                       return JSWebAPIErrorFactory::postException(context, exception,
+                                       JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                        break;
                }
        }
@@ -1503,8 +1501,8 @@ JSValueRef JSAddressBook::removeGroup(JSContextRef context,
                addressBook = controller->getObject();
        } Catch(Exception) {
                LoggerE("No private object");
-               return JSTizenExceptionFactory::postException(context, exception,
-                               JSTizenException::TYPE_MISMATCH_ERROR, "Wrong object");
+               return JSWebAPIErrorFactory::postException(context, exception,
+                               JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong object");
        }
 
        AceSecurityStatus status = CONTACT_CHECK_ACCESS(CONTACT_FUNCTION_API_ADDRESS_BOOK_REMOVE_GROUP);
@@ -1516,13 +1514,13 @@ JSValueRef JSAddressBook::removeGroup(JSContextRef context,
                ArgumentValidator validator(context, argumentCount, arguments);
                groupId = validator.toString(0, false);
        } catch (const TypeMismatchException& err ) {
-               return JSWebAPIError::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch(const BasePlatformException& err) {
-               return JSWebAPIError::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch(const ConversionException& err) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
        } catch(const NullPointerException& err) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
        }
 
        EventAddressBookRemoveGroupPtr dplEvent(new EventAddressBookRemoveGroup());
@@ -1534,8 +1532,8 @@ JSValueRef JSAddressBook::removeGroup(JSContextRef context,
                addressBook->removeGroup(dplEvent);
        } Catch(Exception) {
                LoggerE("Error on platform : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception,
-                               JSTizenException::UNKNOWN_ERROR, "Internal error");
+               return JSWebAPIErrorFactory::postException(context, exception,
+                               JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
        }
 
        if (!dplEvent->getResult())
@@ -1547,16 +1545,16 @@ JSValueRef JSAddressBook::removeGroup(JSContextRef context,
                case ExceptionCodes::InvalidArgumentException:
                        LoggerE("Not Found error : " << groupId);
                        oss << "No Contact id '" << groupId << "'";
-                       return JSTizenExceptionFactory::postException(context, exception,
-                                       JSTizenException::NOT_FOUND_ERROR, oss.str());
+                       return JSWebAPIErrorFactory::postException(context, exception,
+                                       JSWebAPIErrorFactory::NOT_FOUND_ERROR, oss.str());
                        break;
                case ExceptionCodes::PlatformException:
-                       return JSTizenExceptionFactory::postException(context, exception,
-                                       JSTizenException::UNKNOWN_ERROR, "Internal error");
+                       return JSWebAPIErrorFactory::postException(context, exception,
+                                       JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                        break;
                default:
-                       return JSTizenExceptionFactory::postException(context, exception,
-                                       JSTizenException::UNKNOWN_ERROR, "Internal error");
+                       return JSWebAPIErrorFactory::postException(context, exception,
+                                       JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                        break;
                }
        }
@@ -1586,8 +1584,8 @@ JSValueRef JSAddressBook::getGroups(JSContextRef context,
                gContext = controller->getContext();
        } Catch(Exception) {
                LoggerE("No private object");
-               return JSTizenExceptionFactory::postException(context, exception,
-                               JSTizenException::TYPE_MISMATCH_ERROR, "Wrong object");
+               return JSWebAPIErrorFactory::postException(context, exception,
+                               JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong object");
        }
 
        AceSecurityStatus status = CONTACT_CHECK_ACCESS(CONTACT_FUNCTION_API_ADDRESS_BOOK_GET_GROUPS);
@@ -1605,8 +1603,8 @@ JSValueRef JSAddressBook::getGroups(JSContextRef context,
                addressBook->getGroups(dplEvent);
        } Catch(Exception) {
                LoggerE("Error on platform : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception,
-                               JSTizenException::UNKNOWN_ERROR, "Internal error");
+               return JSWebAPIErrorFactory::postException(context, exception,
+                               JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
        }
 
        if (!dplEvent->getResult() || !dplEvent->getContactGroupsIsSet())
@@ -1618,16 +1616,16 @@ JSValueRef JSAddressBook::getGroups(JSContextRef context,
                case ExceptionCodes::InvalidArgumentException:
                        LoggerE("Not Found error : " << id);
                        oss << "No Contact id '" << id << "'";
-                       return JSTizenExceptionFactory::postException(context, exception,
-                                       JSTizenException::NOT_FOUND_ERROR, oss.str());
+                       return JSWebAPIErrorFactory::postException(context, exception,
+                                       JSWebAPIErrorFactory::NOT_FOUND_ERROR, oss.str());
                        break;
                case ExceptionCodes::PlatformException:
-                       return JSTizenExceptionFactory::postException(context, exception,
-                                       JSTizenException::UNKNOWN_ERROR, "Internal error");
+                       return JSWebAPIErrorFactory::postException(context, exception,
+                                       JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                        break;
                default:
-                       return JSTizenExceptionFactory::postException(context, exception,
-                                       JSTizenException::UNKNOWN_ERROR, "Internal error");
+                       return JSWebAPIErrorFactory::postException(context, exception,
+                                       JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                        break;
                }
        }
@@ -1639,8 +1637,8 @@ JSValueRef JSAddressBook::getGroups(JSContextRef context,
                result = converter->toJSValueRef(groups);
        } Catch(Exception) {
                LoggerE("Error on conversion : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception,
-                               JSTizenException::UNKNOWN_ERROR, "Internal error");
+               return JSWebAPIErrorFactory::postException(context, exception,
+                               JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
        }
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
        return result;
index 9e5edbd..65946e4 100644 (file)
@@ -24,8 +24,6 @@
 
 #include <dpl/shared_ptr.h>
 #include <CommonsJavaScript/Validator.h>
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
 #include <SecurityExceptions.h>
 #include "ContactFactory.h"
 #include "plugin_config.h"
@@ -33,7 +31,7 @@
 #include "JSContact.h"
 #include "Contact.h"
 #include <ArgumentValidator.h>
-#include <JSWebAPIError.h>
+#include <JSWebAPIErrorFactory.h>
 #include <TimeTracer.h>
 #include <Logger.h>
 #include <Export.h>
@@ -223,7 +221,7 @@ JSObjectRef JSContact::constructor(JSContextRef context,
                else
                {
                        LoggerE("Argument type mismatch : 1nd argument must be ContactInit object or string");
-                       *exception = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::TYPE_MISMATCH_ERROR, "2nd argument must be 'ContactTextFormat'");
+                       *exception = JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "2nd argument must be 'ContactTextFormat'");
                        return NULL;
                }
        }
@@ -238,11 +236,11 @@ JSObjectRef JSContact::constructor(JSContextRef context,
 
                } Catch(ConversionException) {
                        LoggerE("Argument type mismatch : " << _rethrown_exception.GetMessage());
-                       *exception = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::TYPE_MISMATCH_ERROR, "1st argument must be 'ContactInit object'");
+                       *exception = JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "1st argument must be 'ContactInit object'");
                        return NULL;
                } Catch(Exception) {
                        LoggerE("Argument type mismatch : " << _rethrown_exception.GetMessage());
-                       *exception = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::UNKNOWN_ERROR, "Internal error");
+                       *exception = JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                        return NULL;
                }
        }
@@ -258,19 +256,19 @@ JSObjectRef JSContact::constructor(JSContextRef context,
 
                } Catch(ConversionException) {
                        LoggerE("Argument type mismatch : " << _rethrown_exception.GetMessage());
-                       *exception = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::TYPE_MISMATCH_ERROR, "2nd argument must be 'ContactTextFormat'");
+                       *exception = JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "2nd argument must be 'ContactTextFormat'");
                        return NULL;
                } Catch(InvalidArgumentException) {
                        LoggerE("Argument type mismatch : " << _rethrown_exception.GetMessage());
-                       *exception = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::INVALID_VALUES_ERROR, "1st argument must be vCard string");
+                       *exception = JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "1st argument must be vCard string");
                        return NULL;
                } Catch(UnsupportedException) {
                        LoggerE("Argument type mismatch : " << _rethrown_exception.GetMessage());
-                       *exception = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::NOT_SUPPORTED_ERROR, "Only support vCard 3.0");
+                       *exception = JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, "Only support vCard 3.0");
                        return NULL;
                } Catch(Exception) {
                        LoggerE("Argument type mismatch : " << _rethrown_exception.GetMessage());
-                       *exception = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::UNKNOWN_ERROR, "Internal error");
+                       *exception = JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                        return NULL;
                }
        }
@@ -280,7 +278,7 @@ JSObjectRef JSContact::constructor(JSContextRef context,
                        contact = ContactFactory::getInstance().createContact();
                } Catch(Exception) {
                        LoggerE("Argument type mismatch : " << _rethrown_exception.GetMessage());
-                       *exception = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::UNKNOWN_ERROR, "Internal error");
+                       *exception = JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                        return NULL;
                }
        }
@@ -291,7 +289,7 @@ JSObjectRef JSContact::constructor(JSContextRef context,
                jsobject = createJSObject(gContext, contact);
        } Catch(Exception) {
                LoggerE("Argument type mismatch : " << _rethrown_exception.GetMessage());
-               *exception = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::UNKNOWN_ERROR, "Internal error");
+               *exception = JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                return NULL;
        }
 
@@ -463,7 +461,7 @@ bool JSContact::setName(JSContextRef context,
        Catch(WrtDeviceApis::Commons::Exception)
        {
                LoggerW("trying to set incorrect value");
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch");
        }
 
        return true;
@@ -525,7 +523,7 @@ bool JSContact::setAddresses(JSContextRef context,
        Catch(WrtDeviceApis::Commons::Exception)
        {
                LoggerW("trying to set incorrect value");
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch");
        }
 
        return true;
@@ -575,7 +573,7 @@ bool JSContact::setPhotoURI(JSContextRef context,
        Catch(WrtDeviceApis::Commons::Exception)
        {
                LoggerW("trying to set incorrect value");
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch");
        }
 
        return true;
@@ -637,7 +635,7 @@ bool JSContact::setPhoneNumbers(JSContextRef context,
        Catch(WrtDeviceApis::Commons::Exception)
        {
                LoggerW("trying to set incorrect value");
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch");
        }
 
        return true;
@@ -703,7 +701,7 @@ bool JSContact::setEmails(JSContextRef context,
        Catch(WrtDeviceApis::Commons::Exception)
        {
                LoggerW("trying to set incorrect value");
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch");
        }
 
        return true;
@@ -753,7 +751,7 @@ bool JSContact::setBirthday(JSContextRef context,
        Catch(WrtDeviceApis::Commons::Exception)
        {
                LoggerW("trying to set incorrect value");
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch");
        }
 
        return true;
@@ -816,7 +814,7 @@ bool JSContact::setAnniversaries(JSContextRef context,
        Catch(WrtDeviceApis::Commons::Exception)
        {
                LoggerW("trying to set incorrect value");
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch");
        }
 
        return true;
@@ -879,7 +877,7 @@ bool JSContact::setOrganizations(JSContextRef context,
        Catch(WrtDeviceApis::Commons::Exception)
        {
                LoggerW("trying to set incorrect value");
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch");
        }
 
        return true;
@@ -948,7 +946,7 @@ bool JSContact::setNotes(JSContextRef context,
        Catch(WrtDeviceApis::Commons::Exception)
        {
                LoggerW("trying to set incorrect value");
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch");
        }
 
        return true;
@@ -1011,7 +1009,7 @@ bool JSContact::setUrls(JSContextRef context,
        Catch(WrtDeviceApis::Commons::Exception)
        {
                LoggerW("trying to set incorrect value");
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch");
        }
 
        return true;
@@ -1061,7 +1059,7 @@ bool JSContact::setRingtoneURI(JSContextRef context,
        Catch(WrtDeviceApis::Commons::Exception)
        {
                LoggerW("trying to set incorrect value");
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch");
        }
 
        return true;
@@ -1125,7 +1123,7 @@ bool JSContact::setGroupIds(JSContextRef context,
        Catch(WrtDeviceApis::Commons::Exception)
        {
                LoggerW("trying to set incorrect value");
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch");
        }
 
        return true;
@@ -1149,7 +1147,7 @@ JSValueRef JSContact::convertToString(JSContextRef context,
                }
        } Catch(Exception) {
                LoggerE("Argument type mismatch : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Wrong object");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong object");
        }
 
 //     AceSecurityStatus status = CONTACT_CHECK_ACCESS(
@@ -1161,13 +1159,13 @@ JSValueRef JSContact::convertToString(JSContextRef context,
        try     {
                format = validator.toString(0, false);
        } catch (const TypeMismatchException& err ) {
-               return JSWebAPIError::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch(const BasePlatformException& err) {
-               return JSWebAPIError::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch(const ConversionException& err) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
        } catch(const NullPointerException& err) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
        }
 
        std::string vCard;
@@ -1175,13 +1173,13 @@ JSValueRef JSContact::convertToString(JSContextRef context,
                vCard = contact->convertToString(format);
        } Catch(ConversionException) {
                LoggerE("Error on platform : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "1st argument must be 'ContactTextFormat string'");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "1st argument must be 'ContactTextFormat string'");
        } Catch(UnsupportedException) {
                LoggerE("Error on platform : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR, "Only support vCard 3.0");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, "Only support vCard 3.0");
        } Catch(Exception) {
                LoggerE("Error on platform : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Internal error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
        }
 
        ContactConverterFactory::ConverterType converter = ContactConverterFactory::getConverter(context);
@@ -1190,7 +1188,7 @@ JSValueRef JSContact::convertToString(JSContextRef context,
                result = converter->toJSValueRef(vCard);
        } Catch(Exception) {
                LoggerE("Error on conversion : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Internal error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
        }
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
        return result;
@@ -1214,7 +1212,7 @@ JSValueRef JSContact::clone(JSContextRef context,
                }
        } Catch(Exception) {
                LoggerE("Argument type mismatch : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Wrong object");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong object");
        }
 
 //     AceSecurityStatus status = CONTACT_CHECK_ACCESS(
@@ -1226,7 +1224,7 @@ JSValueRef JSContact::clone(JSContextRef context,
                clonedContact = contact->clone();
        } Catch(Exception) {
                LoggerE("Error on conversion : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Internal error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
        }
 
        JSValueRef result;
@@ -1239,7 +1237,7 @@ JSValueRef JSContact::clone(JSContextRef context,
                result = createJSObject(gContext, clonedContact);
        } Catch(Exception) {
                LoggerE("Error on conversion : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Internal error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
        }
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
        return result;
index 479d4a7..8e7d116 100755 (executable)
@@ -24,8 +24,7 @@
 
 #include <dpl/shared_ptr.h>
 #include <CommonsJavaScript/Validator.h>
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 #include "ContactConverter.h"
 #include "JSContactAddress.h"
 #include <Logger.h>
@@ -190,7 +189,7 @@ JSObjectRef JSContactAddress::constructor(JSContextRef context,
 
        } Catch(Exception ) {
                LoggerE("Argument type mismatch : " << _rethrown_exception.GetMessage());
-               *exception = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::TYPE_MISMATCH_ERROR, "1st argument must be a 'ContactAddressInit object'");
+               *exception = JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "1st argument must be a 'ContactAddressInit object'");
                return NULL;
        }
 
@@ -206,7 +205,7 @@ JSObjectRef JSContactAddress::constructor(JSContextRef context,
 
        } Catch(Exception) {
                LoggerE("Argument type mismatch : " << _rethrown_exception.GetMessage());
-               *exception = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::TYPE_MISMATCH_ERROR, "1st argument must be a 'ContactAddressInit object'");
+               *exception = JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "1st argument must be a 'ContactAddressInit object'");
                return NULL;
        }
 
@@ -216,7 +215,7 @@ JSObjectRef JSContactAddress::constructor(JSContextRef context,
                jsobject = createJSObject(gContext, contactEmailAddress);
        } Catch(Exception) {
                LoggerE("Argument type mismatch : " << _rethrown_exception.GetMessage());
-               *exception = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::UNKNOWN_ERROR, "Internal error");
+               *exception = JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                return NULL;
        }
 
@@ -274,7 +273,7 @@ bool JSContactAddress::setCountry(JSContextRef context,
        Catch(WrtDeviceApis::Commons::Exception)
        {
                LoggerW("trying to set incorrect value");
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch");
        }
        return true;
 }
@@ -323,7 +322,7 @@ bool JSContactAddress::setRegion(JSContextRef context,
        Catch(WrtDeviceApis::Commons::Exception)
        {
                LoggerW("trying to set incorrect value");
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch");
        }
        return true;
 }
@@ -371,7 +370,7 @@ bool JSContactAddress::setCity(JSContextRef context,
        Catch(WrtDeviceApis::Commons::Exception)
        {
                LoggerW("trying to set incorrect value");
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch");
        }
        return true;
 }
@@ -420,7 +419,7 @@ bool JSContactAddress::setStreetAddress(JSContextRef context,
        Catch(WrtDeviceApis::Commons::Exception)
        {
                LoggerW("trying to set incorrect value");
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch");
        }
        return true;
 }
@@ -469,7 +468,7 @@ bool JSContactAddress::setAdditionalInformation(JSContextRef context,
        Catch(WrtDeviceApis::Commons::Exception)
        {
                LoggerW("trying to set incorrect value");
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch");
        }
        return true;
 }
@@ -518,7 +517,7 @@ bool JSContactAddress::setPostalCode(JSContextRef context,
        Catch(WrtDeviceApis::Commons::Exception)
        {
                LoggerW("trying to set incorrect value");
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch");
        }
        return true;
 }
@@ -561,7 +560,7 @@ bool JSContactAddress::setIsDefault(JSContextRef context,
        Catch(WrtDeviceApis::Commons::Exception)
        {
                LoggerW("trying to set incorrect value");
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch");
        }
        return true;
 }
@@ -622,7 +621,7 @@ bool JSContactAddress::setTypes(JSContextRef context,
        Catch(WrtDeviceApis::Commons::Exception)
        {
                LoggerW("trying to set incorrect value");
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch");
        }
        return true;
 }
index 66c4c1f..2009e85 100644 (file)
@@ -24,8 +24,7 @@
 
 #include <dpl/shared_ptr.h>
 #include <CommonsJavaScript/Validator.h>
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 #include "ContactConverter.h"
 #include "JSContactAnniversary.h"
 #include <Logger.h>
@@ -175,16 +174,16 @@ JSObjectRef JSContactAnniversary::constructor(JSContextRef context,
                        contactAnniversary->setLabel(label);
                }
        } catch (const TypeMismatchException& err ) {
-               JSWebAPIError::throwException(context, exception, err);
+               JSWebAPIErrorFactory::postException(context, exception, err);
                return NULL;
        } catch(const BasePlatformException& err) {
-               JSWebAPIError::throwException(context, exception, err);
+               JSWebAPIErrorFactory::postException(context, exception, err);
                return NULL;
        } catch(const ConversionException& err) {
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
                return NULL;
        } catch(const NullPointerException& err) {
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
                return NULL;
        }
 
@@ -194,7 +193,7 @@ JSObjectRef JSContactAnniversary::constructor(JSContextRef context,
                contactAnniversary->setDate(date);
        } Catch(Exception) {
                LoggerE("Argument type mismatch : " << _rethrown_exception.GetMessage());
-               *exception = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::TYPE_MISMATCH_ERROR, "1st argument must be a 'Date object'");
+               *exception = JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "1st argument must be a 'Date object'");
                return NULL;
        }
 
@@ -204,7 +203,7 @@ JSObjectRef JSContactAnniversary::constructor(JSContextRef context,
                jsobject = createJSObject(gContext, contactAnniversary);
        } Catch(Exception) {
                LoggerE("Argument type mismatch : " << _rethrown_exception.GetMessage());
-               *exception = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::TYPE_MISMATCH_ERROR, "Wrong arguments");
+               *exception = JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong arguments");
                return NULL;
        }
 
@@ -254,7 +253,7 @@ bool JSContactAnniversary::setDate(JSContextRef context,
        Catch(WrtDeviceApis::Commons::Exception)
        {
                LoggerW("trying to set incorrect value");
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch");
        }
        return true;
 }
@@ -302,7 +301,7 @@ bool JSContactAnniversary::setLabel(JSContextRef context,
        Catch(WrtDeviceApis::Commons::Exception)
        {
                LoggerW("trying to set incorrect value");
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch");
        }
        return true;
 }
index 51ec327..362b566 100755 (executable)
@@ -24,8 +24,7 @@
 
 #include <dpl/shared_ptr.h>
 #include <CommonsJavaScript/Validator.h>
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 #include "ContactConverter.h"
 #include "JSContactEmailAddress.h"
 #include <Logger.h>
@@ -187,16 +186,16 @@ JSObjectRef JSContactEmailAddress::constructor(JSContextRef context,
                        isDefault = Argvalidator.toBool(2, false);
 
        } catch (const TypeMismatchException& err ) {
-               JSWebAPIError::throwException(context, exception, err);
+               JSWebAPIErrorFactory::postException(context, exception, err);
                return NULL;
        } catch(const BasePlatformException& err) {
-               JSWebAPIError::throwException(context, exception, err);
+               JSWebAPIErrorFactory::postException(context, exception, err);
                return NULL;
        } catch(const ConversionException& err) {
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
                return NULL;
        } catch(const NullPointerException& err) {
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
                return NULL;
        }
 
@@ -211,7 +210,7 @@ JSObjectRef JSContactEmailAddress::constructor(JSContextRef context,
                jsobject = createJSObject(gContext, contactEmailAddress);
        } Catch(Exception) {
                LoggerE("Argument type mismatch : " << _rethrown_exception.GetMessage());
-               *exception = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::TYPE_MISMATCH_ERROR, "Wrong arguments");
+               *exception = JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong arguments");
                return NULL;
        }
 
@@ -261,7 +260,7 @@ bool JSContactEmailAddress::setEmail(JSContextRef context,
        Catch(WrtDeviceApis::Commons::Exception)
        {
                LoggerW("trying to set incorrect value");
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch");
        }
        return true;
 }
@@ -304,7 +303,7 @@ bool JSContactEmailAddress::setIsDefault(JSContextRef context,
        Catch(WrtDeviceApis::Commons::Exception)
        {
                LoggerW("trying to set incorrect value");
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch");
        }
        return true;
 }
@@ -366,7 +365,7 @@ bool JSContactEmailAddress::setTypes(JSContextRef context,
        Catch(WrtDeviceApis::Commons::Exception)
        {
                LoggerW("trying to set incorrect value");
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch");
        }
        return true;
 }
index b248e5b..e39e517 100644 (file)
@@ -25,8 +25,7 @@
 #include "JSContactGroup.h"
 #include <dpl/shared_ptr.h>
 #include <CommonsJavaScript/Validator.h>
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 #include "ContactConverter.h"
 #include <Logger.h>
 #include <Export.h>
@@ -187,16 +186,16 @@ JSObjectRef JSContactGroup::constructor(JSContextRef context,
                        contactGroup->setPhotoURI(Argvalidator.toString(2, true));
 
        } catch (const TypeMismatchException& err ) {
-               JSWebAPIError::throwException(context, exception, err);
+               JSWebAPIErrorFactory::postException(context, exception, err);
                return NULL;
        } catch(const BasePlatformException& err) {
-               JSWebAPIError::throwException(context, exception, err);
+               JSWebAPIErrorFactory::postException(context, exception, err);
                return NULL;
        } catch(const ConversionException& err) {
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
                return NULL;
        } catch(const NullPointerException& err) {
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
                return NULL;
        }
 
@@ -206,7 +205,7 @@ JSObjectRef JSContactGroup::constructor(JSContextRef context,
                jsobject = createJSObject(gContext, contactGroup);
        } Catch(Exception) {
                LoggerE("Argument type mismatch : " << _rethrown_exception.GetMessage());
-               *exception = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::UNKNOWN_ERROR, "Internal error");
+               *exception = JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                return NULL;
        }
 
@@ -268,7 +267,7 @@ bool JSContactGroup::setId(JSContextRef context,
                LoggerW("trying to set incorrect value");
        }
 
-       JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch");
+       JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch");
        return false;
 }
 
@@ -316,7 +315,7 @@ bool JSContactGroup::setAddressBookId(JSContextRef context,
        Catch(WrtDeviceApis::Commons::Exception)
        {
                LoggerW("trying to set incorrect value");
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch");
        }
 
        return true;
@@ -366,7 +365,7 @@ bool JSContactGroup::setName(JSContextRef context,
        Catch(WrtDeviceApis::Commons::Exception)
        {
                LoggerW("trying to set incorrect value");
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch");
        }
 
        return true;
@@ -416,7 +415,7 @@ bool JSContactGroup::setRingtoneURI(JSContextRef context,
        Catch(WrtDeviceApis::Commons::Exception)
        {
                LoggerW("trying to set incorrect value");
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch");
        }
 
        return true;
@@ -466,7 +465,7 @@ bool JSContactGroup::setPhotoURI(JSContextRef context,
        Catch(WrtDeviceApis::Commons::Exception)
        {
                LoggerW("trying to set incorrect value");
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch");
        }
 
        return true;
index 5e527ae..73ceda6 100644 (file)
@@ -30,8 +30,6 @@
 #include <CommonsJavaScript/Converter.h>
 #include <CommonsJavaScript/JSUtils.h>
 #include <CommonsJavaScript/JSPendingOperation.h>
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
 #include <SecurityExceptions.h>
 #include <FilterConverter.h>
 #include "ContactFactory.h"
@@ -45,7 +43,7 @@
 #include "JSContactManagerChangeCallbackManager.h"
 #include "ContactFilterConverter.h"
 #include <ArgumentValidator.h>
-#include <JSWebAPIError.h>
+#include <JSWebAPIErrorFactory.h>
 #include <TimeTracer.h>
 #include <Logger.h>
 #include <Export.h>
@@ -156,7 +154,7 @@ JSValueRef JSContactManager::getAddressBooks(JSContextRef context,
                gContext = controller->getContext();
        } Catch(Exception) {
                LoggerE("No private object");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Wrong object");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong object");
        }
 
        AceSecurityStatus status = CONTACT_CHECK_ACCESS(CONTACT_FUNCTION_API_CONTACT_MANAGER_GET_ADDRESS_BOOKS);
@@ -170,13 +168,13 @@ JSValueRef JSContactManager::getAddressBooks(JSContextRef context,
                if(errorObj)
                        js2ndParamIsFunction = true;
        } catch (const TypeMismatchException& err ) {
-               return JSWebAPIError::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch(const BasePlatformException& err) {
-               return JSWebAPIError::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch(const ConversionException& err) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
        } catch(const NullPointerException& err) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
        }
 
        JSCallbackManagerPtr callbackManager = JSCallbackManager::createObject(gContext);
@@ -202,7 +200,7 @@ JSValueRef JSContactManager::getAddressBooks(JSContextRef context,
                ContactAsyncCallbackManagerSingleton::Instance().registerCallbackManager(callbackManager, gContext);
        } Catch(Exception) {
                LoggerE("Error on platform : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Internal error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
        }
 
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
@@ -223,7 +221,7 @@ JSValueRef JSContactManager::getDefaultAddressBook(JSContextRef context,
                static_cast<ContactManagerController*>(JSObjectGetPrivate(thisObject));
        if (!priv) {
                LoggerE("private object is null");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Wrong object");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong object");
        }
 
        AceSecurityStatus status = CONTACT_CHECK_ACCESS(CONTACT_FUNCTION_API_CONTACT_MANAGER_GET_DEFAULT_ADDRESS_BOOK);
@@ -236,7 +234,7 @@ JSValueRef JSContactManager::getDefaultAddressBook(JSContextRef context,
                gContext = priv->getContext();
        } Catch(Exception) {
                LoggerE("contact manager or context is null");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Wrong object");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong object");
        }
 
        ContactConverterFactory::ConverterType converter = ContactConverterFactory::getConverter(gContext);
@@ -249,7 +247,7 @@ JSValueRef JSContactManager::getDefaultAddressBook(JSContextRef context,
                contactManager->getDefaultAddressBook(dplEvent);
        } Catch(Exception) {
                LoggerE("Error on platform : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Internal error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
        }
 
        if (!dplEvent->getResult() || !dplEvent->getDefaultAddressBookIsSet())
@@ -261,13 +259,13 @@ JSValueRef JSContactManager::getDefaultAddressBook(JSContextRef context,
                case ExceptionCodes::InvalidArgumentException:
                        LoggerE("Not Found error");
                        oss << "No default address book";
-                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_FOUND_ERROR, oss.str());
+                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_FOUND_ERROR, oss.str());
                        break;
                case ExceptionCodes::PlatformException:
-                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Internal error");
+                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                        break;
                default:
-                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Internal error");
+                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                        break;
                }
        }
@@ -279,7 +277,7 @@ JSValueRef JSContactManager::getDefaultAddressBook(JSContextRef context,
                resultValue = converter->toJSValueRef(defaultAddressBook);
        } Catch(Exception){
                LoggerE("Conversion error.");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Internal error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
        }
 
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
@@ -299,7 +297,7 @@ JSValueRef JSContactManager::getUnifiedAddressBook(JSContextRef context,
                static_cast<ContactManagerController*>(JSObjectGetPrivate(thisObject));
        if (!priv) {
                LoggerE("private object is null");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Wrong object");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong object");
        }
 
        AceSecurityStatus status = CONTACT_CHECK_ACCESS(CONTACT_FUNCTION_API_CONTACT_MANAGER_GET_UNIFIED_ADDRESS_BOOK);
@@ -312,7 +310,7 @@ JSValueRef JSContactManager::getUnifiedAddressBook(JSContextRef context,
                gContext = priv->getContext();
        } Catch(Exception) {
                LoggerE("contact manager or context is null");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Wrong object");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong object");
        }
 
        ContactConverterFactory::ConverterType converter = ContactConverterFactory::getConverter(gContext);
@@ -325,7 +323,7 @@ JSValueRef JSContactManager::getUnifiedAddressBook(JSContextRef context,
                contactManager->getUnifiedAddressBook(dplEvent);
        } Catch(Exception) {
                LoggerE("Error on platform : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Internal error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
        }
 
        if (!dplEvent->getResult() || !dplEvent->getUnifiedAddressBookIsSet())
@@ -337,13 +335,13 @@ JSValueRef JSContactManager::getUnifiedAddressBook(JSContextRef context,
                case ExceptionCodes::InvalidArgumentException:
                        LoggerE("Not Found error");
                        oss << "No default address book";
-                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_FOUND_ERROR, oss.str());
+                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_FOUND_ERROR, oss.str());
                        break;
                case ExceptionCodes::PlatformException:
-                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Internal error");
+                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                        break;
                default:
-                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Internal error");
+                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                        break;
                }
        }
@@ -355,7 +353,7 @@ JSValueRef JSContactManager::getUnifiedAddressBook(JSContextRef context,
                resultValue = converter->toJSValueRef(unifiedAddressBook);
        } Catch(Exception){
                LoggerE("Conversion error.");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Internal error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
        }
 
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
@@ -375,7 +373,7 @@ JSValueRef JSContactManager::getAddressBook(JSContextRef context,
                static_cast<ContactManagerController*>(JSObjectGetPrivate(thisObject));
        if (!priv) {
                LoggerE("private object is null");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Wrong object");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong object");
        }
 
        AceSecurityStatus status = CONTACT_CHECK_ACCESS(CONTACT_FUNCTION_API_CONTACT_MANAGER_GET_ADDRESS_BOOK);
@@ -388,7 +386,7 @@ JSValueRef JSContactManager::getAddressBook(JSContextRef context,
                gContext = priv->getContext();
        } Catch(Exception) {
                LoggerE("contact manager or context is null");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Wrong object");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong object");
        }
 
        ContactConverterFactory::ConverterType converter = ContactConverterFactory::getConverter(gContext);
@@ -398,13 +396,13 @@ JSValueRef JSContactManager::getAddressBook(JSContextRef context,
                ArgumentValidator validator(context, argumentCount, arguments);
                addressBookId = validator.toString(0, false);
        } catch (const TypeMismatchException& err ) {
-               return JSWebAPIError::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch(const BasePlatformException& err) {
-               return JSWebAPIError::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch(const ConversionException& err) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
        } catch(const NullPointerException& err) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
        }
 
        EventContactManagerGetAddressBookPtr dplEvent(new EventContactManagerGetAddressBook());
@@ -416,7 +414,7 @@ JSValueRef JSContactManager::getAddressBook(JSContextRef context,
                contactManager->getAddressBook(dplEvent);
        } Catch(Exception) {
                LoggerE("Error on platform : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Internal error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
        }
 
        if (!dplEvent->getResult() || !dplEvent->getAddressBookIsSet())
@@ -428,13 +426,13 @@ JSValueRef JSContactManager::getAddressBook(JSContextRef context,
                case ExceptionCodes::InvalidArgumentException:
                        LoggerE("Not Found error : " << addressBookId);
                        oss << "No Contact id '" << addressBookId << "'";
-                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_FOUND_ERROR, oss.str());
+                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_FOUND_ERROR, oss.str());
                        break;
                case ExceptionCodes::PlatformException:
-                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Internal error");
+                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                        break;
                default:
-                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Internal error");
+                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                        break;
                }
        }
@@ -446,7 +444,7 @@ JSValueRef JSContactManager::getAddressBook(JSContextRef context,
                resultValue = converter->toJSValueRef(addressBook);
        } Catch(Exception){
                LoggerE("Conversion error.");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Internal error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
        }
 
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
@@ -473,7 +471,7 @@ JSValueRef JSContactManager::get(JSContextRef context,
                addressBook = controller->getObject();
        } Catch(Exception) {
                LoggerE("No private object");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Wrong object");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong object");
        }
 
        AceSecurityStatus status = CONTACT_CHECK_ACCESS(CONTACT_FUNCTION_API_CONTACT_MANAGER_GET);
@@ -482,7 +480,7 @@ JSValueRef JSContactManager::get(JSContextRef context,
        if (argumentCount < 1) {
                /* 1st Argument must be string. */
                LoggerE("1st argument must not be undefined.");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_FOUND_ERROR, "No Contact id 'undefined'");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_FOUND_ERROR, "No Contact id 'undefined'");
        }
 
        std::string id;
@@ -492,13 +490,13 @@ JSValueRef JSContactManager::get(JSContextRef context,
                ArgumentValidator validator(context, argumentCount, arguments);
                id = validator.toString(0, false);
        } catch (const TypeMismatchException& err ) {
-               return JSWebAPIError::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch(const BasePlatformException& err) {
-               return JSWebAPIError::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch(const ConversionException& err) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
        } catch(const NullPointerException& err) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
        }
 
        EventContactManagerGetPtr dplEvent(new EventContactManagerGet());
@@ -510,7 +508,7 @@ JSValueRef JSContactManager::get(JSContextRef context,
                addressBook->get(dplEvent);
        } Catch(Exception) {
                LoggerE("Error on platform : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Internal error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
        }
 
        if (!dplEvent->getResult() || !dplEvent->getPersonIsSet())
@@ -522,13 +520,13 @@ JSValueRef JSContactManager::get(JSContextRef context,
                case ExceptionCodes::InvalidArgumentException:
                        LoggerE("Not Found error : " << id);
                        oss << "No Person id '" << id << "'";
-                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_FOUND_ERROR, oss.str());
+                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_FOUND_ERROR, oss.str());
                        break;
                case ExceptionCodes::PlatformException:
-                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Internal error");
+                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                        break;
                default:
-                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Internal error");
+                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                        break;
                }
        }
@@ -540,7 +538,7 @@ JSValueRef JSContactManager::get(JSContextRef context,
                result = converter->toJSValueRef(person);
        } Catch(Exception) {
                LoggerE("Error on conversion : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Internal error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
        }
 
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
@@ -567,7 +565,7 @@ JSValueRef JSContactManager::update(JSContextRef context,
                addressBook = controller->getObject();
        } Catch(Exception) {
                LoggerE("No private object");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Wrong object");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong object");
        }
 
        AceSecurityStatus status = CONTACT_CHECK_ACCESS(CONTACT_FUNCTION_API_CONTACT_MANAGER_UPDATE);
@@ -577,13 +575,13 @@ JSValueRef JSContactManager::update(JSContextRef context,
                ArgumentValidator validator(context, argumentCount, arguments);
                validator.toObject(0, false);
        } catch (const TypeMismatchException& err ) {
-               return JSWebAPIError::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch(const BasePlatformException& err) {
-               return JSWebAPIError::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch(const ConversionException& err) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
        } catch(const NullPointerException& err) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
        }
 
        PersonPtr person(NULL);
@@ -595,7 +593,7 @@ JSValueRef JSContactManager::update(JSContextRef context,
                person = converter->toPerson(arguments[0]);
        } Catch(Exception) {
                LoggerE("Error on conversion : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "1st argument is not a 'Contact object'");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "1st argument is not a 'Contact object'");
        }
 
        EventContactManagerUpdatePtr dplEvent(new EventContactManagerUpdate());
@@ -607,7 +605,7 @@ JSValueRef JSContactManager::update(JSContextRef context,
                addressBook->update(dplEvent);
        } Catch(Exception) {
                LoggerE("Error on platform : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Internal error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
        }
 
        if (!dplEvent->getResult())
@@ -618,13 +616,13 @@ JSValueRef JSContactManager::update(JSContextRef context,
                case ExceptionCodes::NotFoundException:
                case ExceptionCodes::InvalidArgumentException:
                        oss << "No Contact id '" << person->getId() << "'";
-                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_FOUND_ERROR, oss.str());
+                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_FOUND_ERROR, oss.str());
                        break;
                case ExceptionCodes::PlatformException:
-                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Internal error");
+                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                        break;
                default:
-                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Internal error");
+                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                        break;
                }
        }
@@ -658,8 +656,8 @@ JSValueRef JSContactManager::updateBatch(JSContextRef context,
                gContext = controller->getContext();
        } Catch(Exception) {
                LoggerE("No private object");
-               return JSTizenExceptionFactory::postException(context, exception,
-                               JSTizenException::TYPE_MISMATCH_ERROR, "Wrong object");
+               return JSWebAPIErrorFactory::postException(context, exception,
+                               JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong object");
        }
 
        AceSecurityStatus status = CONTACT_CHECK_ACCESS(CONTACT_FUNCTION_API_CONTACT_MANAGER_UPDATE_BATCH);
@@ -677,13 +675,13 @@ JSValueRef JSContactManager::updateBatch(JSContextRef context,
                if(errorObj)
                        js3rdParamIsFunction = true;
        } catch (const TypeMismatchException& err ) {
-               return JSWebAPIError::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch(const BasePlatformException& err) {
-               return JSWebAPIError::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch(const ConversionException& err) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
        } catch(const NullPointerException& err) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
        }
 
        ContactConverterFactory::ConverterType converter = ContactConverterFactory::getConverter(context);
@@ -703,8 +701,8 @@ JSValueRef JSContactManager::updateBatch(JSContextRef context,
                dplEvent->setPersons(converter->toPersonArray(arguments[0]));
        } Catch(ConversionException) {
                LoggerE("Error on conversion : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception,
-                               JSTizenException::TYPE_MISMATCH_ERROR, "3rd argument must be a 'function' or a 'null'");
+               return JSWebAPIErrorFactory::postException(context, exception,
+                               JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "3rd argument must be a 'function' or a 'null'");
        }
 
        // set event handler's data
@@ -719,8 +717,8 @@ JSValueRef JSContactManager::updateBatch(JSContextRef context,
                ContactAsyncCallbackManagerSingleton::Instance().registerCallbackManager(callbackManager, gContext);
        } Catch(Exception) {
                LoggerE("Error on platform : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception,
-                               JSTizenException::UNKNOWN_ERROR, "Internal error");
+               return JSWebAPIErrorFactory::postException(context, exception,
+                               JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
        }
 
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
@@ -748,7 +746,7 @@ JSValueRef JSContactManager::remove(JSContextRef context,
                addressBook = controller->getObject();
        } Catch(Exception) {
                LoggerE("No private object");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Wrong object");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong object");
        }
 
        AceSecurityStatus status = CONTACT_CHECK_ACCESS(CONTACT_FUNCTION_API_CONTACT_MANAGER_REMOVE);
@@ -761,13 +759,13 @@ JSValueRef JSContactManager::remove(JSContextRef context,
                ArgumentValidator validator(context, argumentCount, arguments);
                personId = validator.toString(0, false);
        } catch (const TypeMismatchException& err ) {
-               return JSWebAPIError::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch(const BasePlatformException& err) {
-               return JSWebAPIError::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch(const ConversionException& err) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
        } catch(const NullPointerException& err) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
        }
 
        EventContactManagerRemovePtr dplEvent(new EventContactManagerRemove());
@@ -779,8 +777,8 @@ JSValueRef JSContactManager::remove(JSContextRef context,
                addressBook->remove(dplEvent);
        } Catch(Exception) {
                LoggerE("Error on platform : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception,
-                               JSTizenException::UNKNOWN_ERROR, "Internal error");
+               return JSWebAPIErrorFactory::postException(context, exception,
+                               JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
        }
 
        if (!dplEvent->getResult())
@@ -792,16 +790,16 @@ JSValueRef JSContactManager::remove(JSContextRef context,
                case ExceptionCodes::InvalidArgumentException:
                        LoggerE("Not Found error : " << personId);
                        oss << "No Contact id '" << personId << "'";
-                       return JSTizenExceptionFactory::postException(context, exception,
-                                       JSTizenException::NOT_FOUND_ERROR, oss.str());
+                       return JSWebAPIErrorFactory::postException(context, exception,
+                                       JSWebAPIErrorFactory::NOT_FOUND_ERROR, oss.str());
                        break;
                case ExceptionCodes::PlatformException:
-                       return JSTizenExceptionFactory::postException(context, exception,
-                                       JSTizenException::UNKNOWN_ERROR, "Internal error");
+                       return JSWebAPIErrorFactory::postException(context, exception,
+                                       JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                        break;
                default:
-                       return JSTizenExceptionFactory::postException(context, exception,
-                                       JSTizenException::UNKNOWN_ERROR, "Internal error");
+                       return JSWebAPIErrorFactory::postException(context, exception,
+                                       JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                        break;
                }
        }
@@ -835,7 +833,7 @@ JSValueRef JSContactManager::removeBatch(JSContextRef context,
                gContext = controller->getContext();
        } Catch(Exception) {
                LoggerE("No private object");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Wrong object");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong object");
        }
 
        AceSecurityStatus status = CONTACT_CHECK_ACCESS(CONTACT_FUNCTION_API_CONTACT_MANAGER_REMOVE_BATCH);
@@ -853,13 +851,13 @@ JSValueRef JSContactManager::removeBatch(JSContextRef context,
                if(errorObj)
                        js3rdParamIsFunction = true;
        } catch (const TypeMismatchException& err ) {
-               return JSWebAPIError::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch(const BasePlatformException& err) {
-               return JSWebAPIError::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch(const ConversionException& err) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
        } catch(const NullPointerException& err) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
        }
 
        ContactConverterFactory::ConverterType converter = ContactConverterFactory::getConverter(context);
@@ -879,7 +877,7 @@ JSValueRef JSContactManager::removeBatch(JSContextRef context,
                dplEvent->setPersonIds(converter->toStringArray(arguments[0]));
        } Catch(ConversionException) {
                LoggerE("Error on conversion : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "3rd argument must be an array of 'Contact id'");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "3rd argument must be an array of 'Contact id'");
        }
 
        // set event handler's data
@@ -894,7 +892,7 @@ JSValueRef JSContactManager::removeBatch(JSContextRef context,
                ContactAsyncCallbackManagerSingleton::Instance().registerCallbackManager(callbackManager, gContext);
        } Catch(Exception) {
                LoggerE("Error on platform : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Internal error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
        }
 
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
@@ -928,7 +926,7 @@ JSValueRef JSContactManager::find(JSContextRef context,
                gContext = controller->getContext();
        } Catch(Exception) {
                LoggerE("No private object");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Wrong object");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong object");
        }
 
        AceSecurityStatus status = CONTACT_CHECK_ACCESS(CONTACT_FUNCTION_API_CONTACT_MANAGER_FIND);
@@ -951,13 +949,13 @@ JSValueRef JSContactManager::find(JSContextRef context,
                        js4thParamIsObject = true;
 
        } catch (const TypeMismatchException& err ) {
-               return JSWebAPIError::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch(const BasePlatformException& err) {
-               return JSWebAPIError::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch(const ConversionException& err) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
        } catch(const NullPointerException& err) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
        }
 
        JSCallbackManagerPtr callbackManager = JSCallbackManager::createObject(gContext);
@@ -978,7 +976,7 @@ JSValueRef JSContactManager::find(JSContextRef context,
                        dplEvent->setFilter(filterConverter->toFilter(arguments[2]));
        } Catch(Exception) {
                LoggerE("Error on 3rd parameter conversion : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "3rd argument must be an 'Filter object' or 'null'");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "3rd argument must be an 'Filter object' or 'null'");
        }
 
        Try {
@@ -986,7 +984,7 @@ JSValueRef JSContactManager::find(JSContextRef context,
                        dplEvent->setSortMode(filterConverter->toSortMode(arguments[3]));
        } Catch(Exception) {
                LoggerE("Error on 4th parameter conversion : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "4th argument must be an 'SortMode object' or 'null'");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "4th argument must be an 'SortMode object' or 'null'");
        }
 
        // set event handler's data
@@ -1001,7 +999,7 @@ JSValueRef JSContactManager::find(JSContextRef context,
                ContactAsyncCallbackManagerSingleton::Instance().registerCallbackManager(callbackManager, gContext);
        } Catch(Exception) {
                LoggerE("Error on platform : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Internal error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
        }
 
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
@@ -1033,7 +1031,7 @@ JSValueRef JSContactManager::addChangeListener(JSContextRef context,
                gContext = controller->getContext();
        } Catch(Exception) {
                LoggerE("No private object");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Wrong object");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong object");
        }
 
        AceSecurityStatus status = CONTACT_CHECK_ACCESS(CONTACT_FUNCTION_API_CONTACT_MANAGER_ADD_CHANGE_LISTENER);
@@ -1049,13 +1047,13 @@ JSValueRef JSContactManager::addChangeListener(JSContextRef context,
                        js2ndParamIsFunction = true;
 
        } catch (const TypeMismatchException& err ) {
-               return JSWebAPIError::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch(const BasePlatformException& err) {
-               return JSWebAPIError::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch(const ConversionException& err) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
        } catch(const NullPointerException& err) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
        }
 
        ContactConverterFactory::ConverterType converter = ContactConverterFactory::getConverter(context);
@@ -1092,7 +1090,7 @@ JSValueRef JSContactManager::addChangeListener(JSContextRef context,
 
        } Catch(ConversionException) {
                LoggerE("Error on conversion : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
        }
 
        JSContactManagerChangeCallbackManagerPtr callbackManager = JSContactManagerChangeCallbackManager::createObject(gContext);
@@ -1117,7 +1115,7 @@ JSValueRef JSContactManager::addChangeListener(JSContextRef context,
                addressBook->addChangeListener(dplEvent);
        } Catch(Exception) {
                LoggerE("Error on platform : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Internal error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
        }
 
        if (!dplEvent->getResult() || !dplEvent->getIdIsSet())
@@ -1126,10 +1124,10 @@ JSValueRef JSContactManager::addChangeListener(JSContextRef context,
                {
                case ExceptionCodes::InvalidArgumentException:
                case ExceptionCodes::PlatformException:
-                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Internal error");
+                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                        break;
                default:
-                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Internal error");
+                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                        break;
                }
        }
@@ -1145,7 +1143,7 @@ JSValueRef JSContactManager::addChangeListener(JSContextRef context,
                result = converter->toJSValueRefLong(watchId);
        } Catch(Exception) {
                LoggerE("Error on conversion : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Internal error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
        }
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
        return result;
@@ -1173,7 +1171,7 @@ JSValueRef JSContactManager::removeChangeListener(JSContextRef context,
                gContext = controller->getContext();
        } Catch(Exception) {
                LoggerE("No private object");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Wrong object");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong object");
        }
 
        AceSecurityStatus status = CONTACT_CHECK_ACCESS(CONTACT_FUNCTION_API_CONTACT_MANAGER_REMOVE_CHANGE_LISTENER);
@@ -1186,13 +1184,13 @@ JSValueRef JSContactManager::removeChangeListener(JSContextRef context,
                ArgumentValidator validator(context, argumentCount, arguments);
                watchId = validator.toLong(0, false, 0);
        } catch (const TypeMismatchException& err ) {
-               return JSWebAPIError::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch(const BasePlatformException& err) {
-               return JSWebAPIError::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch(const ConversionException& err) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
        } catch(const NullPointerException& err) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
        }
 
        EventContactManagerRemoveChangeListenerPtr dplEvent(new EventContactManagerRemoveChangeListener());
@@ -1204,7 +1202,7 @@ JSValueRef JSContactManager::removeChangeListener(JSContextRef context,
                addressBook->removeChangeListener(dplEvent);
        } Catch(Exception) {
                LoggerE("Error on platform : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Internal error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
        }
 
        PersonsChangeListenerCancellerPtr canceller = PersonsChangeListenerCancellerPtr(new PersonsChangeListenerCanceller(gContext, thisObject, watchId));
@@ -1217,10 +1215,10 @@ JSValueRef JSContactManager::removeChangeListener(JSContextRef context,
                {
                case ExceptionCodes::InvalidArgumentException:
                case ExceptionCodes::NotFoundException:
-                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_FOUND_ERROR, "Watch id not found");
+                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_FOUND_ERROR, "Watch id not found");
                        break;
                default:
-                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Internal error");
+                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                        break;
                }
        }
index 1744911..60ace3f 100644 (file)
@@ -24,8 +24,7 @@
 
 #include <dpl/shared_ptr.h>
 #include <CommonsJavaScript/Validator.h>
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 #include "ContactConverter.h"
 #include "JSContactName.h"
 #include <Logger.h>
@@ -200,7 +199,7 @@ JSObjectRef JSContactName::constructor(JSContextRef context,
 
        } Catch(Exception ) {
                LoggerE("Argument type mismatch : " << _rethrown_exception.GetMessage());
-               *exception = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::TYPE_MISMATCH_ERROR, "1st argument must be 'object'");
+               *exception = JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "1st argument must be 'object'");
                return NULL;
        }
 
@@ -215,7 +214,7 @@ JSObjectRef JSContactName::constructor(JSContextRef context,
 
        } Catch(Exception) {
                LoggerE("Argument type mismatch : " << _rethrown_exception.GetMessage());
-               *exception = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::UNKNOWN_ERROR, "Internal error");
+               *exception = JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                return NULL;
        }
 
@@ -225,7 +224,7 @@ JSObjectRef JSContactName::constructor(JSContextRef context,
                jsobject = createJSObject(gContext, contactName);
        } Catch(Exception) {
                LoggerE("Argument type mismatch : " << _rethrown_exception.GetMessage());
-               *exception = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::UNKNOWN_ERROR, "Internal error");
+               *exception = JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                return NULL;
        }
 
@@ -284,7 +283,7 @@ bool JSContactName::setPrefix(JSContextRef context,
        Catch(WrtDeviceApis::Commons::Exception)
        {
                LoggerW("trying to set incorrect value");
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch");
        }
        return true;
 }
@@ -332,7 +331,7 @@ bool JSContactName::setSuffix(JSContextRef context,
        Catch(WrtDeviceApis::Commons::Exception)
        {
                LoggerW("trying to set incorrect value");
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch");
        }
        return true;
 }
@@ -379,7 +378,7 @@ bool JSContactName::setFirstName(JSContextRef context,
        Catch(WrtDeviceApis::Commons::Exception)
        {
                LoggerW("trying to set incorrect value");
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch");
        }
 
        return true;
@@ -429,7 +428,7 @@ bool JSContactName::setMiddleName(JSContextRef context,
        Catch(WrtDeviceApis::Commons::Exception)
        {
                LoggerW("trying to set incorrect value");
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch");
        }
 
        return true;
@@ -479,7 +478,7 @@ bool JSContactName::setLastName(JSContextRef context,
        Catch(WrtDeviceApis::Commons::Exception)
        {
                LoggerW("trying to set incorrect value");
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch");
        }
 
        return true;
@@ -541,7 +540,7 @@ bool JSContactName::setNicknames(JSContextRef context,
        Catch(WrtDeviceApis::Commons::Exception)
        {
                LoggerW("trying to set incorrect value");
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch");
        }
 
        return true;
@@ -610,7 +609,7 @@ bool JSContactName::setPhoneticFirstName(JSContextRef context,
        Catch(WrtDeviceApis::Commons::Exception)
        {
                LoggerW("trying to set incorrect value");
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch");
        }
 
        return true;
@@ -660,7 +659,7 @@ bool JSContactName::setPhoneticLastName(JSContextRef context,
        Catch(WrtDeviceApis::Commons::Exception)
        {
                LoggerW("trying to set incorrect value");
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch");
        }
 
        return true;
index 517b105..17df015 100644 (file)
@@ -25,8 +25,7 @@
 #include "JSContactOrganization.h"
 #include <dpl/shared_ptr.h>
 #include <CommonsJavaScript/Validator.h>
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 #include "ContactConverter.h"
 #include <Logger.h>
 #include <Export.h>
@@ -186,7 +185,7 @@ JSObjectRef JSContactOrganization::constructor(JSContextRef context,
 
        } Catch(Exception ) {
                LoggerE("Argument type mismatch : " << _rethrown_exception.GetMessage());
-               *exception = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::TYPE_MISMATCH_ERROR, "1st argument must be a 'object'");
+               *exception = JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "1st argument must be a 'object'");
                return NULL;
        }
 
@@ -201,7 +200,7 @@ JSObjectRef JSContactOrganization::constructor(JSContextRef context,
 
        } Catch(Exception) {
                LoggerE("Argument type mismatch : " << _rethrown_exception.GetMessage());
-               *exception = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::UNKNOWN_ERROR, "Internal error");
+               *exception = JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                return NULL;
        }
 
@@ -211,7 +210,7 @@ JSObjectRef JSContactOrganization::constructor(JSContextRef context,
                jsobject = createJSObject(gContext, contactOrganization);
        } Catch(Exception) {
                LoggerE("Argument type mismatch : " << _rethrown_exception.GetMessage());
-               *exception = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::UNKNOWN_ERROR, "Internal error");
+               *exception = JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                return NULL;
        }
 
@@ -269,7 +268,7 @@ bool JSContactOrganization::setName(JSContextRef context,
        Catch(WrtDeviceApis::Commons::Exception)
        {
                LoggerW("trying to set incorrect value");
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch");
        }
        return true;
 }
@@ -318,7 +317,7 @@ bool JSContactOrganization::setDepartment(JSContextRef context,
        Catch(WrtDeviceApis::Commons::Exception)
        {
                LoggerW("trying to set incorrect value");
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch");
        }
        return true;
 }
@@ -385,7 +384,7 @@ bool JSContactOrganization::setTitle(JSContextRef context,
        Catch(WrtDeviceApis::Commons::Exception)
        {
                LoggerW("trying to set incorrect value");
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch");
        }
        return true;
 }
@@ -433,7 +432,7 @@ bool JSContactOrganization::setRole(JSContextRef context,
        Catch(WrtDeviceApis::Commons::Exception)
        {
                LoggerW("trying to set incorrect value");
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch");
        }
        return true;
 }
@@ -481,7 +480,7 @@ bool JSContactOrganization::setLogoURI(JSContextRef context,
        Catch(WrtDeviceApis::Commons::Exception)
        {
                LoggerW("trying to set incorrect value");
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch");
        }
        return true;
 }
index a1fa441..b212775 100755 (executable)
@@ -24,8 +24,7 @@
 
 #include <dpl/shared_ptr.h>
 #include <CommonsJavaScript/Validator.h>
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 #include "ContactConverter.h"
 #include "JSContactPhoneNumber.h"
 #include <Logger.h>
@@ -185,16 +184,16 @@ JSObjectRef JSContactPhoneNumber::constructor(JSContextRef context,
                        isDefault = Argvalidator.toBool(2, false);
 
        } catch (const TypeMismatchException& err ) {
-               JSWebAPIError::throwException(context, exception, err);
+               JSWebAPIErrorFactory::postException(context, exception, err);
                return NULL;
        } catch(const BasePlatformException& err) {
-               JSWebAPIError::throwException(context, exception, err);
+               JSWebAPIErrorFactory::postException(context, exception, err);
                return NULL;
        } catch(const ConversionException& err) {
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
                return NULL;
        } catch(const NullPointerException& err) {
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
                return NULL;
        }
 
@@ -209,7 +208,7 @@ JSObjectRef JSContactPhoneNumber::constructor(JSContextRef context,
                jsobject = createJSObject(gContext, contactPhoneNumber);
        } Catch(Exception) {
                LoggerE("Argument type mismatch : " << _rethrown_exception.GetMessage());
-               *exception = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::TYPE_MISMATCH_ERROR, "Wrong arguments");
+               *exception = JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong arguments");
                return NULL;
        }
 
@@ -259,7 +258,7 @@ bool JSContactPhoneNumber::setNumber(JSContextRef context,
        Catch(WrtDeviceApis::Commons::Exception)
        {
                LoggerW("trying to set incorrect value");
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch");
        }
        return true;
 }
@@ -302,7 +301,7 @@ bool JSContactPhoneNumber::setIsDefault(JSContextRef context,
        Catch(WrtDeviceApis::Commons::Exception)
        {
                LoggerW("trying to set incorrect value");
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch");
        }
        return true;
 }
@@ -362,7 +361,7 @@ bool JSContactPhoneNumber::setTypes(JSContextRef context,
        Catch(WrtDeviceApis::Commons::Exception)
        {
                LoggerW("trying to set incorrect value");
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch");
        }
        return true;
 }
index 7329649..dc74feb 100644 (file)
@@ -24,8 +24,7 @@
 
 #include <dpl/shared_ptr.h>
 #include <CommonsJavaScript/Validator.h>
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 #include "ContactConverter.h"
 #include "JSContactRef.h"
 #include <Logger.h>
@@ -182,7 +181,7 @@ JSObjectRef JSContactRef::constructor(JSContextRef context,
 
        } Catch(Exception ) {
                LoggerE("Argument type mismatch : " << _rethrown_exception.GetMessage());
-               *exception = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::INVALID_VALUES_ERROR, "Wrong arguments");
+               *exception = JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Wrong arguments");
                return NULL;
        }
 
@@ -195,7 +194,7 @@ JSObjectRef JSContactRef::constructor(JSContextRef context,
                addressBookId = converter->toString(arguments[0]);
        } Catch(Exception) {
                LoggerE("Argument type mismatch : " << _rethrown_exception.GetMessage());
-               *exception = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::TYPE_MISMATCH_ERROR, "Wrong arguments");
+               *exception = JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong arguments");
                return NULL;
        }
 
@@ -203,7 +202,7 @@ JSObjectRef JSContactRef::constructor(JSContextRef context,
                contactId = converter->toString(arguments[1]);
        } Catch(Exception) {
                LoggerE("Argument type mismatch : " << _rethrown_exception.GetMessage());
-               *exception = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::TYPE_MISMATCH_ERROR, "Wrong arguments");
+               *exception = JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong arguments");
                return NULL;
        }
 
@@ -217,7 +216,7 @@ JSObjectRef JSContactRef::constructor(JSContextRef context,
                jsobject = createJSObject(gContext, contactRef);
        } Catch(Exception) {
                LoggerE("Argument type mismatch : " << _rethrown_exception.GetMessage());
-               *exception = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::TYPE_MISMATCH_ERROR, "Wrong arguments");
+               *exception = JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong arguments");
                return NULL;
        }
 
@@ -271,7 +270,7 @@ bool JSContactRef::setAddressBookId(JSContextRef context,
                LoggerW("trying to set incorrect value");
        }
 
-       JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch");
+       JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch");
        return false;
 }
 
@@ -314,7 +313,7 @@ bool JSContactRef::setContactId(JSContextRef context,
                LoggerW("trying to set incorrect value");
        }
 
-       JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch");
+       JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch");
        return false;
 }
 
index 92eada9..a87ea6d 100644 (file)
@@ -24,8 +24,7 @@
 
 #include <dpl/shared_ptr.h>
 #include <CommonsJavaScript/Validator.h>
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 #include "ContactConverter.h"
 #include "JSContactWebSite.h"
 #include <Logger.h>
@@ -176,16 +175,16 @@ JSObjectRef JSContactWebSite::constructor(JSContextRef context,
                }
 
        } catch (const TypeMismatchException& err ) {
-               JSWebAPIError::throwException(context, exception, err);
+               JSWebAPIErrorFactory::postException(context, exception, err);
                return NULL;
        } catch(const BasePlatformException& err) {
-               JSWebAPIError::throwException(context, exception, err);
+               JSWebAPIErrorFactory::postException(context, exception, err);
                return NULL;
        } catch(const ConversionException& err) {
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
                return NULL;
        } catch(const NullPointerException& err) {
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
                return NULL;
        }
 
@@ -199,7 +198,7 @@ JSObjectRef JSContactWebSite::constructor(JSContextRef context,
                jsobject = createJSObject(gContext, contactWebSite);
        } Catch(Exception) {
                LoggerE("Argument type mismatch : " << _rethrown_exception.GetMessage());
-               *exception = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::TYPE_MISMATCH_ERROR, "Wrong arguments");
+               *exception = JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong arguments");
                return NULL;
        }
 
@@ -249,7 +248,7 @@ bool JSContactWebSite::setUrl(JSContextRef context,
        Catch(WrtDeviceApis::Commons::Exception)
        {
                LoggerW("trying to set incorrect value");
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch");
        }
        return true;
 }
@@ -302,7 +301,7 @@ bool JSContactWebSite::setType(JSContextRef context,
        Catch(WrtDeviceApis::Commons::Exception)
        {
                LoggerW("trying to set incorrect value");
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch");
        }
        return true;
 }
index 8b5a0c2..e0dcb9c 100644 (file)
 
 #include <dpl/shared_ptr.h>
 #include <CommonsJavaScript/Validator.h>
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
 #include <SecurityExceptions.h>
 #include "ContactFactory.h"
 #include "plugin_config.h"
 #include "ContactConverter.h"
 #include "JSPerson.h"
 #include <ArgumentValidator.h>
-#include <JSWebAPIError.h>
+#include <JSWebAPIErrorFactory.h>
 #include <TimeTracer.h>
 #include <Logger.h>
 #include <Export.h>
@@ -327,7 +325,7 @@ bool JSPerson::setIsFavorite(JSContextRef context,
        Catch(WrtDeviceApis::Commons::Exception)
        {
                LoggerW("trying to set incorrect value");
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch");
        }
 
        return true;
@@ -376,7 +374,7 @@ bool JSPerson::setPhotoURI(JSContextRef context,
        Catch(WrtDeviceApis::Commons::Exception)
        {
                LoggerW("trying to set incorrect value");
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch");
        }
 
        return true;
@@ -425,7 +423,7 @@ bool JSPerson::setRingtoneURI(JSContextRef context,
        Catch(WrtDeviceApis::Commons::Exception)
        {
                LoggerW("trying to set incorrect value");
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch");
        }
 
        return true;
@@ -472,7 +470,7 @@ bool JSPerson::setDisplayContactId(JSContextRef context,
        Catch(WrtDeviceApis::Commons::Exception)
        {
                LoggerW("trying to set incorrect value");
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch");
        }
 
        return true;
@@ -498,8 +496,8 @@ JSValueRef JSPerson::link(JSContextRef context,
        Catch(Exception)
        {
                LoggerE("Argument type mismatch : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception,
-                               JSTizenException::TYPE_MISMATCH_ERROR, "Wrong object");
+               return JSWebAPIErrorFactory::postException(context, exception,
+                               JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong object");
        }
 
        AceSecurityStatus status = CONTACT_CHECK_ACCESS(CONTACT_FUNCTION_API_PERSON_LINK);
@@ -510,13 +508,13 @@ JSValueRef JSPerson::link(JSContextRef context,
        try     {
                personId = validator.toString(0, false);
        } catch (const TypeMismatchException& err ) {
-               return JSWebAPIError::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch(const BasePlatformException& err) {
-               return JSWebAPIError::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch(const ConversionException& err) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
        } catch(const NullPointerException& err) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
        }
 
        EventPersonLinkPtr dplEvent(new EventPersonLink());
@@ -531,14 +529,14 @@ JSValueRef JSPerson::link(JSContextRef context,
        Catch(ConversionException)
        {
                LoggerE("Error on platform : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception,
-                               JSTizenException::TYPE_MISMATCH_ERROR, "1st argument must be 'PersonId'");
+               return JSWebAPIErrorFactory::postException(context, exception,
+                               JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "1st argument must be 'PersonId'");
        }
        Catch(Exception)
        {
                LoggerE("Error on platform : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception,
-                               JSTizenException::UNKNOWN_ERROR, "Internal error");
+               return JSWebAPIErrorFactory::postException(context, exception,
+                               JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
        }
 
        if (!dplEvent->getResult())
@@ -548,21 +546,21 @@ JSValueRef JSPerson::link(JSContextRef context,
                {
                case ExceptionCodes::NotFoundException:
                        oss << "Person id (" << personId << ") is not exists.";
-                       return JSTizenExceptionFactory::postException(context, exception,
-                                       JSTizenException::INVALID_VALUES_ERROR, oss.str());
+                       return JSWebAPIErrorFactory::postException(context, exception,
+                                       JSWebAPIErrorFactory::INVALID_VALUES_ERROR, oss.str());
                        break;
                case ExceptionCodes::InvalidArgumentException:
                        oss << "Person id (" << personId << ") is wrong.";
-                       return JSTizenExceptionFactory::postException(context, exception,
-                                       JSTizenException::INVALID_VALUES_ERROR, oss.str());
+                       return JSWebAPIErrorFactory::postException(context, exception,
+                                       JSWebAPIErrorFactory::INVALID_VALUES_ERROR, oss.str());
                        break;
                case ExceptionCodes::PlatformException:
-                       return JSTizenExceptionFactory::postException(context, exception,
-                                       JSTizenException::UNKNOWN_ERROR, "Internal error");
+                       return JSWebAPIErrorFactory::postException(context, exception,
+                                       JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                        break;
                default:
-                       return JSTizenExceptionFactory::postException(context, exception,
-                                       JSTizenException::UNKNOWN_ERROR, "Internal error");
+                       return JSWebAPIErrorFactory::postException(context, exception,
+                                       JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                        break;
                }
        }
@@ -590,8 +588,8 @@ JSValueRef JSPerson::unlink(JSContextRef context,
        Catch(Exception)
        {
                LoggerE("Argument type mismatch : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception,
-                               JSTizenException::TYPE_MISMATCH_ERROR, "Wrong object");
+               return JSWebAPIErrorFactory::postException(context, exception,
+                               JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong object");
        }
 
        AceSecurityStatus status = CONTACT_CHECK_ACCESS(CONTACT_FUNCTION_API_PERSON_UNLINK);
@@ -602,13 +600,13 @@ JSValueRef JSPerson::unlink(JSContextRef context,
        try     {
                contactId = validator.toString(0, false);
        } catch (const TypeMismatchException& err ) {
-               return JSWebAPIError::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch(const BasePlatformException& err) {
-               return JSWebAPIError::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch(const ConversionException& err) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
        } catch(const NullPointerException& err) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "");
        }
 
        EventPersonUnlinkPtr dplEvent(new EventPersonUnlink());
@@ -623,14 +621,14 @@ JSValueRef JSPerson::unlink(JSContextRef context,
        Catch(ConversionException)
        {
                LoggerE("Error on platform : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception,
-                               JSTizenException::TYPE_MISMATCH_ERROR, "1st argument must be 'ContactId'");
+               return JSWebAPIErrorFactory::postException(context, exception,
+                               JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "1st argument must be 'ContactId'");
        }
        Catch(Exception)
        {
                LoggerE("Error on platform : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception,
-                               JSTizenException::UNKNOWN_ERROR, "Internal error");
+               return JSWebAPIErrorFactory::postException(context, exception,
+                               JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
        }
 
        if (!dplEvent->getResult())
@@ -640,26 +638,26 @@ JSValueRef JSPerson::unlink(JSContextRef context,
                {
                case ExceptionCodes::InvalidArgumentException:
                        oss << "No Contact id is wrong : '" << contactId << "'";
-                       return JSTizenExceptionFactory::postException(context, exception,
-                                       JSTizenException::INVALID_VALUES_ERROR, oss.str());
+                       return JSWebAPIErrorFactory::postException(context, exception,
+                                       JSWebAPIErrorFactory::INVALID_VALUES_ERROR, oss.str());
                        break;
                case ExceptionCodes::NotFoundException:
                        oss << "No Contact id '" << contactId << "'";
-                       return JSTizenExceptionFactory::postException(context, exception,
-                                       JSTizenException::INVALID_VALUES_ERROR, oss.str());
+                       return JSWebAPIErrorFactory::postException(context, exception,
+                                       JSWebAPIErrorFactory::INVALID_VALUES_ERROR, oss.str());
                        break;
                case ExceptionCodes::OutOfRangeException:
                        oss << "Contact (id:'" << contactId << "') is not a member of person";
-                       return JSTizenExceptionFactory::postException(context, exception,
-                                       JSTizenException::INVALID_VALUES_ERROR, oss.str());
+                       return JSWebAPIErrorFactory::postException(context, exception,
+                                       JSWebAPIErrorFactory::INVALID_VALUES_ERROR, oss.str());
                        break;
                case ExceptionCodes::PlatformException:
-                       return JSTizenExceptionFactory::postException(context, exception,
-                                       JSTizenException::UNKNOWN_ERROR, "Internal error");
+                       return JSWebAPIErrorFactory::postException(context, exception,
+                                       JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                        break;
                default:
-                       return JSTizenExceptionFactory::postException(context, exception,
-                                       JSTizenException::UNKNOWN_ERROR, "Internal error");
+                       return JSWebAPIErrorFactory::postException(context, exception,
+                                       JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                        break;
                }
        }
@@ -675,8 +673,8 @@ JSValueRef JSPerson::unlink(JSContextRef context,
        Catch(Exception)
        {
                LoggerE("Error on conversion : " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception,
-                               JSTizenException::UNKNOWN_ERROR, "Internal error");
+               return JSWebAPIErrorFactory::postException(context, exception,
+                               JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
        }
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
        return result;
index 2c058f5..3a2ab38 100755 (executable)
@@ -16,8 +16,7 @@
 //
 
 #include <CommonsJavaScript/JSCallbackManager.h>
-#include <JSTizenException.h>
-#include <JSTizenExceptionFactory.h>
+#include <JSWebAPIErrorFactory.h>
 #include "ContentController.h"
 #include "ContentConverter.h"
 #include "ContentAsyncCallbackManager.h"
@@ -62,8 +61,8 @@ void MediacontentManagerController::OnAnswerReceived(const IEventUpdateMediaItem
         }
         else
         {
-            JSValueRef errorObject = DeviceAPI::Common::JSTizenExceptionFactory::makeErrorObject(
-                       cbm->getContext(), DeviceAPI::Common::JSTizenException::UNKNOWN_ERROR);
+            JSValueRef errorObject = DeviceAPI::Common::JSWebAPIErrorFactory::makeErrorObject(
+                       cbm->getContext(), DeviceAPI::Common::JSWebAPIErrorFactory::UNKNOWN_ERROR);
             cbm->callOnError(errorObject);
         }
         return;
@@ -95,8 +94,8 @@ void MediacontentManagerController::OnAnswerReceived(const IEventBrowseFolderPtr
         }
         else
         {
-            JSValueRef errorObject = DeviceAPI::Common::JSTizenExceptionFactory::makeErrorObject(
-                       cbm->getContext(), DeviceAPI::Common::JSTizenException::UNKNOWN_ERROR);
+            JSValueRef errorObject = DeviceAPI::Common::JSWebAPIErrorFactory::makeErrorObject(
+                       cbm->getContext(), DeviceAPI::Common::JSWebAPIErrorFactory::UNKNOWN_ERROR);
             cbm->callOnError(errorObject);
         }
         return;
@@ -129,8 +128,8 @@ void MediacontentManagerController::OnAnswerReceived(const IEventFindFolderPtr &
         }
         else
         {
-            JSValueRef errorObject = DeviceAPI::Common::JSTizenExceptionFactory::makeErrorObject(
-                       cbm->getContext(), DeviceAPI::Common::JSTizenException::UNKNOWN_ERROR);
+            JSValueRef errorObject = DeviceAPI::Common::JSWebAPIErrorFactory::makeErrorObject(
+                       cbm->getContext(), DeviceAPI::Common::JSWebAPIErrorFactory::UNKNOWN_ERROR);
             cbm->callOnError(errorObject);
         }
         return;
index 606c821..2b47c82 100755 (executable)
@@ -18,7 +18,7 @@
 #include <pthread.h>
 #include <CommonsJavaScript/JSUtils.h>
 #include <CommonsJavaScript/Validator.h>
-#include <JSWebAPIError.h>
+#include <JSWebAPIErrorFactory.h>
 #include <JSUtil.h>
 #include "ContentListener.h"
 #include "ContentConverter.h"
index 5f8ef50..0bbfb3e 100755 (executable)
@@ -224,6 +224,16 @@ void MediacontentManager::readCommonDataFromMediaInfo(media_info_h info, Mediaco
                }
        }
 
+       if (MEDIA_CONTENT_ERROR_NONE == media_info_get_title(info, &tmpStr) )
+       {
+               if (tmpStr)
+               {
+                   newMedia->setTitle(tmpStr);
+                   free(tmpStr);
+                   tmpStr = NULL;
+               }
+       }
+
        if ( MEDIA_CONTENT_ERROR_NONE == media_info_get_file_path(info, &tmpStr) )
        {
                if (tmpStr)
@@ -303,7 +313,7 @@ void MediacontentManager::readImageFromMediaInfo( media_info_h info, Mediaconten
                                {
                                        struct tm *result = (struct tm *)calloc(1, sizeof(struct tm));
                                        if (strptime(tmpStr, "%Y:%m:%d %H:%M:%S", result) == NULL) {
-                                               LogError( "Couldn't convert supplied date.");
+                                               LoggerE( "Couldn't convert supplied date.");
                                        }
                                
                                        newImage->setReleasedDate(result);
@@ -311,16 +321,6 @@ void MediacontentManager::readImageFromMediaInfo( media_info_h info, Mediaconten
                                        tmpStr = NULL;
                                }
                        }
-                       if ( MEDIA_CONTENT_ERROR_NONE == image_meta_get_title(img, &tmpStr) )
-                       {
-                               if( tmpStr )
-                               {
-                                       newImage->setTitle(tmpStr);
-                                       free(tmpStr);
-                                       tmpStr = NULL;
-                               }
-                       }
-
                        if ( MEDIA_CONTENT_ERROR_NONE == image_meta_get_width(img, &tmpInt) )
                        {
                                newImage->setImageWidth(tmpInt);
@@ -421,7 +421,7 @@ void MediacontentManager::readVideoFromMediaInfo( media_info_h info, Mediaconten
                                {       
                                        struct tm *result=(struct tm *)calloc(1, sizeof(struct tm));
                                        if (strptime(tmpStr, "%Y:%m:%d %H:%M:%S", result) == NULL) {
-                                               LogError( "Couldn't convert supplied date.");
+                                               LoggerE( "Couldn't convert supplied date.");
                                        }
                                        newVideo->setReleasedDate(result);
                                        
@@ -440,16 +440,6 @@ void MediacontentManager::readVideoFromMediaInfo( media_info_h info, Mediaconten
                                }
                        }
 
-                       if ( MEDIA_CONTENT_ERROR_NONE == video_meta_get_title(video, &tmpStr) )
-                       {
-                               if( tmpStr )
-                               {
-                                       newVideo->setTitle(tmpStr);
-                                       free(tmpStr);
-                                       tmpStr = NULL;
-                               }
-                       }
-
                        if ( MEDIA_CONTENT_ERROR_NONE == video_meta_get_artist(video, &tmpStr) )
                        {       
                                if ( tmpStr)
@@ -532,7 +522,7 @@ void MediacontentManager::readMusicFromMediaInfo( media_info_h info, Mediaconten
                                {       
                                        struct tm *result = (struct tm *)calloc(1, sizeof(struct tm));
                                        if (strptime(tmpStr, "%Y:%m:%d %H:%M:%S", result) == NULL) {
-                                               LogError( "Couldn't convert supplied date.");
+                                               LoggerE( "Couldn't convert supplied date.");
                                        }
                                        newAudio->setReleasedDate(result);
                                        
@@ -541,16 +531,6 @@ void MediacontentManager::readMusicFromMediaInfo( media_info_h info, Mediaconten
                                }
                        }
 
-                       if ( MEDIA_CONTENT_ERROR_NONE == audio_meta_get_title(audio, &tmpStr) )
-                       {
-                               if (tmpStr)
-                               {
-                                       newAudio->setTitle(tmpStr);
-                                       free(tmpStr);
-                                       tmpStr = NULL;
-                               }
-                       }
-
                        if ( MEDIA_CONTENT_ERROR_NONE == audio_meta_get_album(audio, &tmpStr) )
                        {
                                if (tmpStr)
@@ -746,7 +726,7 @@ void MediacontentManager::OnRequestReceived(const IEventFindFolderPtr &eFolder)
        if ( MEDIA_CONTENT_ERROR_NONE != 
                media_folder_foreach_folder_from_db (NULL, mediaFolderCallback, eFolder.Get()))
        {       
-               LogError("error ( media_folder_foreach_folder_from_db ) : ");
+               LoggerE("error ( media_folder_foreach_folder_from_db ) : ");
                eFolder->setResult(false);
        }
        else
@@ -846,7 +826,7 @@ void MediacontentManager::OnRequestReceived(const IEventBrowseFolderPtr &eBrowse
                        else
                        {
                                
-                               LogError("error ( media filter create ) : ");
+                               LoggerE("error ( media filter create ) : ");
                                eBrowse->setResult(false);
                        }
                }
@@ -858,7 +838,7 @@ void MediacontentManager::OnRequestReceived(const IEventBrowseFolderPtr &eBrowse
                        if ( MEDIA_CONTENT_ERROR_NONE !=  
                                media_folder_foreach_media_from_db (folderID.c_str(), filter, mediaItemCallback, eBrowse.Get()))
                        {       
-                               LogError("error ( media_folder_foreach_folder_from_db ) : " << ret);
+                               LoggerE("error ( media_folder_foreach_folder_from_db ) : " << ret);
                                eBrowse->setResult(false);
                        }
                        else
@@ -871,7 +851,7 @@ void MediacontentManager::OnRequestReceived(const IEventBrowseFolderPtr &eBrowse
                        if ( MEDIA_CONTENT_ERROR_NONE !=  
                                media_info_foreach_media_from_db (filter, mediaItemCallback, eBrowse.Get()))
                        {
-                               LogError("error ( media_folder_foreach_folder_from_db ) : " << ret);
+                               LoggerE("error ( media_folder_foreach_folder_from_db ) : " << ret);
                                eBrowse->setResult(false);
                        }
                        else
@@ -885,13 +865,13 @@ void MediacontentManager::OnRequestReceived(const IEventBrowseFolderPtr &eBrowse
                {
                        if ( MEDIA_CONTENT_ERROR_NONE != media_filter_destroy(filter))
                        {
-                               LogError("media_filter_create Error: " << ret);
+                               LoggerE("media_filter_create Error: " << ret);
                        }
                }
 
        }
        catch(const Exception &ex){
-                       LogError("Exception: " << ex.DumpToString());
+                       LoggerE("Exception: " << ex.DumpToString());
                        eBrowse->setResult(false);
                        return;
        }
@@ -1111,7 +1091,7 @@ void MediacontentManager::OnRequestReceived(const IEventUpdateMediaPtr &eMedia)
        }
     catch (const Exception &ex)
     {
-        LogError("Exception: " << ex.DumpToString());
+        LoggerE("Exception: " << ex.DumpToString());
         eMedia->setResult(false);
     }
 }
@@ -1148,7 +1128,7 @@ void MediacontentManager::OnRequestReceived(const IEventUpdateMediaItemsPtr &eIt
        }
        catch (const Exception &ex)
        {
-                LogError("Exception: " << ex.DumpToString());
+                LoggerE("Exception: " << ex.DumpToString());
                 eItems->setResult(false);
        }       
 }
index b29a84b..b63be9b 100755 (executable)
@@ -18,8 +18,7 @@
 #include <CommonsJavaScript/PrivateObject.h>
 #include <CommonsJavaScript/Converter.h>
 #include <CommonsJavaScript/JSUtils.h>
-#include <JSTizenException.h>
-#include <JSTizenExceptionFactory.h>
+#include <JSWebAPIErrorFactory.h>
 
 #include "JSAudio.h"
 #include "JSAudioLyrics.h"
@@ -442,7 +441,7 @@ bool JSAudio::setPropertyAlbum(
     Catch(Exception)
     {
         LoggerW("trying to set incorrect value");
-        DeviceAPI::Common::JSTizenExceptionFactory::postException(context, exception, DeviceAPI::Common::JSTizenException::TYPE_MISMATCH_ERROR);
+        DeviceAPI::Common::JSWebAPIErrorFactory::postException(context, exception, DeviceAPI::Common::JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR);
     }
 
        return false;
@@ -474,7 +473,7 @@ bool  JSAudio::setPropertyArtist(
        }
                else
                {
-                       DeviceAPI::Common::JSTizenExceptionFactory::postException(context, exception, DeviceAPI::Common::JSTizenException::TYPE_MISMATCH_ERROR);
+                       DeviceAPI::Common::JSWebAPIErrorFactory::postException(context, exception, DeviceAPI::Common::JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR);
                        return false;
                }
        }
@@ -489,7 +488,7 @@ bool  JSAudio::setPropertyArtist(
     Catch(Exception)
     {
         LoggerW("trying to set incorrect value");
-        return DeviceAPI::Common::JSTizenExceptionFactory::postException(context, exception, DeviceAPI::Common::JSTizenException::TYPE_MISMATCH_ERROR);
+        return DeviceAPI::Common::JSWebAPIErrorFactory::postException(context, exception, DeviceAPI::Common::JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR);
     }
        
        return false;
@@ -531,7 +530,7 @@ bool JSAudio::setPropertyComposer(
     }
     Catch(Exception)
     {
-        return DeviceAPI::Common::JSTizenExceptionFactory::postException(context, exception, DeviceAPI::Common::JSTizenException::TYPE_MISMATCH_ERROR);
+        return DeviceAPI::Common::JSWebAPIErrorFactory::postException(context, exception, DeviceAPI::Common::JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR);
     }
        
        return false;
@@ -574,7 +573,7 @@ bool        JSAudio::setPropertyGenre(
     Catch(Exception)
     {
         LoggerW("trying to set incorrect value");
-        return DeviceAPI::Common::JSTizenExceptionFactory::postException(context, exception, DeviceAPI::Common::JSTizenException::TYPE_MISMATCH_ERROR);
+        return DeviceAPI::Common::JSWebAPIErrorFactory::postException(context, exception, DeviceAPI::Common::JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR);
     }
 
        return false;
@@ -599,7 +598,7 @@ bool JSAudio::setPropertyTrackNumber(
     Catch(Exception)
     {
         LoggerW("trying to set incorrect value");
-        DeviceAPI::Common::JSTizenExceptionFactory::postException(context, exception, DeviceAPI::Common::JSTizenException::TYPE_MISMATCH_ERROR);
+        DeviceAPI::Common::JSWebAPIErrorFactory::postException(context, exception, DeviceAPI::Common::JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR);
     }
 
        return false;
index 2a2aee4..bfe69b6 100755 (executable)
@@ -18,8 +18,7 @@
 #include <CommonsJavaScript/PrivateObject.h>
 #include <CommonsJavaScript/Converter.h>
 #include <CommonsJavaScript/JSUtils.h>
-#include <JSTizenException.h>
-#include <JSTizenExceptionFactory.h>
+#include <JSWebAPIErrorFactory.h>
 #include "JSContent.h"
 #include <Logger.h>
 
@@ -464,7 +463,7 @@ bool        JSMedia::setPropertyRating(
     Catch(Exception)
     {
         LoggerW("trying to set incorrect value");
-        DeviceAPI::Common::JSTizenExceptionFactory::postException(context, exception, DeviceAPI::Common::JSTizenException::TYPE_MISMATCH_ERROR);
+        DeviceAPI::Common::JSWebAPIErrorFactory::postException(context, exception, DeviceAPI::Common::JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR);
     }
 
     return false;
@@ -494,7 +493,7 @@ bool                JSMedia::setPropertyDisplayName(
        Catch(Exception)
        {
                LoggerW("trying to set incorrect value");
-               DeviceAPI::Common::JSTizenExceptionFactory::postException(context, exception, DeviceAPI::Common::JSTizenException::TYPE_MISMATCH_ERROR);
+               DeviceAPI::Common::JSWebAPIErrorFactory::postException(context, exception, DeviceAPI::Common::JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR);
        }
 
        return false;
@@ -523,7 +522,7 @@ bool                JSMedia::setPropertyDescription(
        Catch(Exception)
        {
                LoggerW("trying to set incorrect value");
-               DeviceAPI::Common::JSTizenExceptionFactory::postException(context, exception, DeviceAPI::Common::JSTizenException::TYPE_MISMATCH_ERROR);
+               DeviceAPI::Common::JSWebAPIErrorFactory::postException(context, exception, DeviceAPI::Common::JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR);
        }
 
        return false;
index adb4cd4..fa01700 100755 (executable)
 #include <CommonsJavaScript/JSPendingOperation.h>
 #include <CommonsJavaScript/PrivateObject.h>
 #include <CommonsJavaScript/ScopedJSStringRef.h>
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
 #include <SecurityExceptions.h>
 #include <CallbackUserData.h>
 #include <MultiCallbackUserData.h>
 #include <GlobalContextManager.h>
 #include <FilterConverter.h>
-#include <JSWebAPIError.h>
+#include <JSWebAPIErrorFactory.h>
 #include <ArgumentValidator.h>
 #include <TimeTracer.h>
 
@@ -52,7 +50,6 @@
 #include "ContentImage.h"
 #include "ContentFilterConverter.h"
 #include "ContentUtility.h"
-#include "JSWebAPIException.h"
 #include <Logger.h>
 
 using namespace DeviceAPI::Common;
@@ -120,7 +117,7 @@ JSValueRef JSMediacontentManager::getFolders(
     privateObject = static_cast<MediacontentManagerPrivObject*>(JSObjectGetPrivate(thisObject));
     if (!privateObject) {
         DeviceAPI::Common::UnknownException err("Content's private object is NULL.");
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     JSContextRef globalContext = GlobalContextManager::getInstance()->getGlobalContext(context);
@@ -143,11 +140,11 @@ JSValueRef JSMediacontentManager::getFolders(
             cbm->setOnError(errorCallbackObj);
         }
     }catch(const BasePlatformException &err){
-        return JSWebAPIException::throwException(context,exception,err);
+        return JSWebAPIErrorFactory::postException(context,exception,err);
     }
     catch(...){
         DeviceAPI::Common::UnknownException err("Unknown Error in ContentManager.getDirectories().");
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     Try
@@ -165,27 +162,27 @@ JSValueRef JSMediacontentManager::getFolders(
     Catch(WrtDeviceApis::Commons::UnsupportedException)
     {
         LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(WrtDeviceApis::Commons::InvalidArgumentException)
     {
         LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(WrtDeviceApis::Commons::ConversionException)
     {
         LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(WrtDeviceApis::Commons::NotFoundException)
     {
         LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_FOUND_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_FOUND_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(WrtDeviceApis::Commons::Exception)
     {
         LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
     }
 
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
@@ -210,7 +207,7 @@ JSValueRef JSMediacontentManager::findItems(
     privateObject = static_cast<MediacontentManagerPrivObject*>(JSObjectGetPrivate(thisObject));
     if(!privateObject) {
         DeviceAPI::Common::UnknownException err("Content's private object is NULL.");
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     AceSecurityStatus status = CONTENT_CHECK_ACCESS(CONTENT_FUNCTION_API_FIND_ITEMS);
@@ -285,11 +282,11 @@ JSValueRef JSMediacontentManager::findItems(
             }
         }
     }catch(const BasePlatformException &err){
-        return JSWebAPIException::throwException(context,exception,err);
+        return JSWebAPIErrorFactory::postException(context,exception,err);
     }
     catch(...){
         DeviceAPI::Common::UnknownException err("Unknown Error in find().");
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     Try
@@ -310,27 +307,27 @@ JSValueRef JSMediacontentManager::findItems(
     Catch(WrtDeviceApis::Commons::UnsupportedException)
     {
         LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(WrtDeviceApis::Commons::InvalidArgumentException)
     {
         LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(WrtDeviceApis::Commons::ConversionException)
     {
         LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(WrtDeviceApis::Commons::NotFoundException)
     {
         LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_FOUND_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_FOUND_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(WrtDeviceApis::Commons::Exception)
     {
         LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
     }
 
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
@@ -351,7 +348,7 @@ JSValueRef JSMediacontentManager::updateItemsBatch(JSContextRef context,
     privateObject = static_cast<MediacontentManagerPrivObject*>(JSObjectGetPrivate(thisObject));
     if(!privateObject) {
         DeviceAPI::Common::UnknownException err("Content's private object is NULL.");
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     JSContextRef globalContext = GlobalContextManager::getInstance()->getGlobalContext(context);
@@ -391,11 +388,11 @@ JSValueRef JSMediacontentManager::updateItemsBatch(JSContextRef context,
             cbm->setOnError(errorCallbackObj);
         }
     }catch(const BasePlatformException &err){
-        return JSWebAPIException::throwException(context,exception,err);
+        return JSWebAPIErrorFactory::postException(context,exception,err);
     }
     catch(...){
         DeviceAPI::Common::UnknownException err("Unknown Error in updateBatch().");
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     Try
@@ -414,27 +411,27 @@ JSValueRef JSMediacontentManager::updateItemsBatch(JSContextRef context,
     Catch(WrtDeviceApis::Commons::UnsupportedException)
     {
         LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(WrtDeviceApis::Commons::InvalidArgumentException)
     {
         LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(WrtDeviceApis::Commons::ConversionException)
     {
         LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(WrtDeviceApis::Commons::NotFoundException)
     {
         LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_FOUND_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_FOUND_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(WrtDeviceApis::Commons::Exception)
     {
         LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
     }
 
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
@@ -458,7 +455,7 @@ JSValueRef JSMediacontentManager::updateItem(
     privateObject = static_cast<MediacontentManagerPrivObject*>(JSObjectGetPrivate(thisObject));
     if (!privateObject) {
         DeviceAPI::Common::UnknownException err("Content's private object is NULL.");
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     AceSecurityStatus status = CONTENT_CHECK_ACCESS(CONTENT_FUNCTION_API_UPDATE_ITEM);
@@ -525,27 +522,27 @@ JSValueRef JSMediacontentManager::updateItem(
     Catch(WrtDeviceApis::Commons::UnsupportedException)
     {
     LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-    return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
+    return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(WrtDeviceApis::Commons::InvalidArgumentException)
     {
     LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-    return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
+    return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(WrtDeviceApis::Commons::ConversionException)
     {
     LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-    return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
+    return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(WrtDeviceApis::Commons::NotFoundException)
     {
     LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-    return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_FOUND_ERROR, _rethrown_exception.GetMessage());
+    return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_FOUND_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(WrtDeviceApis::Commons::Exception)
     {
     LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-    return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
+    return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
     }
 
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
@@ -563,7 +560,7 @@ static void _scanCompletedCallback(std::string err_msg, std::string path, void *
             }
             else{
                         DeviceAPI::Common::UnknownException err(err_msg.c_str());
-                        JSObjectRef errorObject = JSWebAPIError::makeJSWebAPIError(cb->getContext(),err);
+                        JSObjectRef errorObject = JSWebAPIErrorFactory::makeErrorObject(cb->getContext(),err);
                         cb->callErrorCallback(errorObject);
             }
             delete cb;
@@ -584,7 +581,7 @@ JSValueRef JSMediacontentManager::scanFile(
     privateObject = static_cast<MediacontentManagerPrivObject*>(JSObjectGetPrivate(thisObject));
     if(!privateObject) {
         DeviceAPI::Common::UnknownException err("Content's private object is NULL.");
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     AceSecurityStatus status = CONTENT_CHECK_ACCESS(CONTENT_FUNCTION_API_SCAN_FILE);
@@ -614,11 +611,11 @@ JSValueRef JSMediacontentManager::scanFile(
             callback->setErrorCallback(errorCallbackObj);
         }
     }catch(const BasePlatformException &err){
-        return JSWebAPIException::throwException(context,exception,err);
+        return JSWebAPIErrorFactory::postException(context,exception,err);
     }
     catch(...){
         DeviceAPI::Common::UnknownException err("Unknown Error in scanFile().");
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     Try
@@ -629,27 +626,27 @@ JSValueRef JSMediacontentManager::scanFile(
     Catch(WrtDeviceApis::Commons::UnsupportedException)
     {
         LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(WrtDeviceApis::Commons::InvalidArgumentException)
     {
         LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(WrtDeviceApis::Commons::ConversionException)
     {
         LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(WrtDeviceApis::Commons::NotFoundException)
     {
         LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_FOUND_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_FOUND_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(WrtDeviceApis::Commons::Exception)
     {
         LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
     }
 
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
@@ -671,7 +668,7 @@ JSValueRef JSMediacontentManager::setChangeListener(
     privateObject = static_cast<MediacontentManagerPrivObject*>(JSObjectGetPrivate(thisObject));
     if(!privateObject) {
         DeviceAPI::Common::UnknownException err("Content's private object is NULL.");
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     AceSecurityStatus status = CONTENT_CHECK_ACCESS(CONTENT_FUNCTION_API_SET_CHANGE_LISTENER);
@@ -688,11 +685,11 @@ JSValueRef JSMediacontentManager::setChangeListener(
             throw DeviceAPI::Common::UnknownException( "Unknown exception is occured by platfrom");
         }
     }catch(const BasePlatformException &err){
-        return JSWebAPIException::throwException(context,exception,err);
+        return JSWebAPIErrorFactory::postException(context,exception,err);
     }
     catch(...){
         DeviceAPI::Common::UnknownException err("Unknown Error in setChangeListener().");
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
@@ -712,7 +709,7 @@ JSValueRef JSMediacontentManager::unsetChangeListener(
     privateObject = static_cast<MediacontentManagerPrivObject*>(JSObjectGetPrivate(thisObject));
     if(!privateObject) {
         DeviceAPI::Common::UnknownException err("Content's private object is NULL.");
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     AceSecurityStatus status = CONTENT_CHECK_ACCESS(CONTENT_FUNCTION_API_SET_CHANGE_LISTENER);
@@ -726,11 +723,11 @@ JSValueRef JSMediacontentManager::unsetChangeListener(
             throw DeviceAPI::Common::UnknownException( "Unknown exception is occured by platfrom");
         }
     }catch(const BasePlatformException &err){
-        return JSWebAPIException::throwException(context,exception,err);
+        return JSWebAPIErrorFactory::postException(context,exception,err);
     }
     catch(...){
         DeviceAPI::Common::UnknownException err("Unknown Error in unsetChangeListener().");
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
index 140e8ed..5ffd7fd 100755 (executable)
@@ -21,8 +21,7 @@
 #include <CommonsJavaScript/JSDOMExceptionFactory.h>
 #include <JSSimpleCoordinates.h>
 
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 #include <SecurityExceptions.h>
 
 #include "JSUtil.h"
@@ -239,7 +238,7 @@ bool        JSImage::setPropertyOrientation(
     Catch(Exception)
     {
         LoggerW("trying to get incorrect value");
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR);
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR);
     }
 
     return false;
@@ -268,7 +267,7 @@ bool        JSImage::setPropertyGeolocation(
        Catch(Exception)
        {
                LoggerW("trying to get incorrect value");
-               DeviceAPI::Common::JSTizenExceptionFactory::postException(context, exception, DeviceAPI::Common::JSTizenException::TYPE_MISMATCH_ERROR);
+               DeviceAPI::Common::JSWebAPIErrorFactory::postException(context, exception, DeviceAPI::Common::JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR);
        }
 
        return false;
index 4a9dec1..46ee810 100755 (executable)
@@ -17,8 +17,7 @@
 
 #include <CommonsJavaScript/Converter.h>
 #include <CommonsJavaScript/JSUtils.h>
-#include <JSTizenException.h>
-#include <JSTizenExceptionFactory.h>
+#include <JSWebAPIErrorFactory.h>
 #include <JSSimpleCoordinates.h>
 
 #include "ContentConverter.h"
@@ -181,7 +180,7 @@ bool JSVideo::setPropertyGeoLocation(
     Catch(Exception)
     {
         LoggerW("trying to get incorrect value");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR);
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR);
     }
        return false;
 }
@@ -329,7 +328,7 @@ bool JSVideo::setPropertyArtists(
                 }
             }
             else{
-                DeviceAPI::Common::JSTizenExceptionFactory::postException(context, exception, DeviceAPI::Common::JSTizenException::TYPE_MISMATCH_ERROR);
+                DeviceAPI::Common::JSWebAPIErrorFactory::postException(context, exception, DeviceAPI::Common::JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR);
             }
             video->setVideoArtist(artists, true);
             return true;
@@ -338,7 +337,7 @@ bool JSVideo::setPropertyArtists(
     Catch(Exception)
     {
         LoggerW("trying to set incorrect value");
-        DeviceAPI::Common::JSTizenExceptionFactory::postException(context, exception, DeviceAPI::Common::JSTizenException::TYPE_MISMATCH_ERROR);
+        DeviceAPI::Common::JSWebAPIErrorFactory::postException(context, exception, DeviceAPI::Common::JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR);
     }
        return false;
 }
@@ -364,7 +363,7 @@ bool JSVideo::setPropertyAlbum(
     Catch(Exception)
     {
         LoggerW("trying to set incorrect value");
-        DeviceAPI::Common::JSTizenExceptionFactory::postException(context, exception, DeviceAPI::Common::JSTizenException::TYPE_MISMATCH_ERROR);
+        DeviceAPI::Common::JSWebAPIErrorFactory::postException(context, exception, DeviceAPI::Common::JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR);
     }
        return false;
 }
index 69a785b..3254502 100644 (file)
@@ -26,8 +26,7 @@
 #include "DataControlAsyncCallbackManager.h"
 #include "JSSelectObjectArrayValues.h"
 #include <CommonsJavaScript/JSUtils.h>
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 #include <Logger.h>
 
 using namespace DeviceAPI::Common;
@@ -81,8 +80,8 @@ void DataControlListener::MakeErrorJSCallBack(JSCallbackManagerPtr cbm, JSContex
                                errorMsg = "permission denied error";
                        
                        err[0] = converter.toJSValueRef(reqid);
-                       err[1] = JSTizenExceptionFactory::makeErrorObject(globalContext, 
-                               JSTizenException::PERMISSION_DENIED_ERROR, errorMsg);   
+                       err[1] = JSWebAPIErrorFactory::makeErrorObject(globalContext,
+                                       JSWebAPIErrorFactory::PERMISSION_DENIED_ERROR, errorMsg);
 
                        break;
                case ExceptionCodes::UnsupportedException:
@@ -90,8 +89,8 @@ void DataControlListener::MakeErrorJSCallBack(JSCallbackManagerPtr cbm, JSContex
                                errorMsg = "unsupport error";
 
                        err[0] = converter.toJSValueRef(reqid);
-                       err[1] = JSTizenExceptionFactory::makeErrorObject(globalContext, 
-                               JSTizenException::NOT_SUPPORTED_ERROR, errorMsg);       
+                       err[1] = JSWebAPIErrorFactory::makeErrorObject(globalContext,
+                                       JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, errorMsg);
 
                        break;
                case ExceptionCodes::NotFoundException:
@@ -99,8 +98,8 @@ void DataControlListener::MakeErrorJSCallBack(JSCallbackManagerPtr cbm, JSContex
                                errorMsg = "not found error";
 
                        err[0] = converter.toJSValueRef(reqid);
-                       err[1] = JSTizenExceptionFactory::makeErrorObject(globalContext, 
-                               JSTizenException::NOT_FOUND_ERROR, errorMsg);   
+                       err[1] = JSWebAPIErrorFactory::makeErrorObject(globalContext,
+                                       JSWebAPIErrorFactory::NOT_FOUND_ERROR, errorMsg);
 
                        break;
                case ExceptionCodes::AlreadyInUseException:
@@ -108,8 +107,8 @@ void DataControlListener::MakeErrorJSCallBack(JSCallbackManagerPtr cbm, JSContex
                                errorMsg = "service not available";
 
                        err[0] = converter.toJSValueRef(reqid);
-                       err[1] = JSTizenExceptionFactory::makeErrorObject(globalContext, 
-                               JSTizenException::SERVICE_NOT_AVAILABLE, errorMsg);     
+                       err[1] = JSWebAPIErrorFactory::makeErrorObject(globalContext,
+                                       JSWebAPIErrorFactory::INVALID_VALUES_ERROR, errorMsg);
 
                        break;
                case ExceptionCodes::EventCancelledException:
@@ -122,8 +121,8 @@ void DataControlListener::MakeErrorJSCallBack(JSCallbackManagerPtr cbm, JSContex
                                errorMsg = "unknown error";
 
                        err[0] = converter.toJSValueRef(reqid);
-                       err[1] = JSTizenExceptionFactory::makeErrorObject(globalContext, 
-                               JSTizenException::UNKNOWN_ERROR, errorMsg);     
+                       err[1] = JSWebAPIErrorFactory::makeErrorObject(globalContext,
+                                       JSWebAPIErrorFactory::UNKNOWN_ERROR, errorMsg);
 
                        break;
        }
index 9b5e955..557b5c9 100644 (file)
@@ -21,8 +21,7 @@
 #include <CommonsJavaScript/JSUtils.h>
 #include <CommonsJavaScript/JSCallbackManager.h>
 #include <CommonsJavaScript/Utils.h>
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 #include <SecurityExceptions.h>
 #include <Commons/Exception.h>
 #include <TimeTracer.h>
@@ -33,8 +32,6 @@
 #include "DataControlListener.h"
 #include "plugin_config.h"
 #include <ArgumentValidator.h> 
-#include <JSWebAPIError.h>
-#include <JSWebAPIException.h> 
 #include <JSUtil.h>  
 
 
@@ -156,12 +153,12 @@ JSValueRef JSDataControlManager::getDataControlConsumer (
        }
        catch (const BasePlatformException &err) 
        {
-               return JSWebAPIException::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } 
        catch (...) 
        {
                DeviceAPI::Common::UnknownException err("");
-               return JSWebAPIException::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        }  
 
        JSValueRef reserveArguments[3];
@@ -203,27 +200,27 @@ JSValueRef JSDataControlManager::getDataControlConsumer (
        Catch (WrtDeviceApis::Commons::ConversionException)
        {
                LoggerE("ConversionException");
-               return JSTizenExceptionFactory::postException(context, exception, 
-                                       JSTizenException::TYPE_MISMATCH_ERROR, "type mismatch error");
+               return JSWebAPIErrorFactory::postException(context, exception, 
+                                       JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "type mismatch error");
 
        }
        Catch (WrtDeviceApis::Commons::InvalidArgumentException) 
        {
                LoggerE("InvalidArgumentException");
-               return JSTizenExceptionFactory::postException(context, exception, 
-                               JSTizenException::INVALID_VALUES_ERROR, "type mismatch error");
+               return JSWebAPIErrorFactory::postException(context, exception, 
+                               JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "type mismatch error");
        }
        Catch(WrtDeviceApis::Commons::UnsupportedException)
        {
                LoggerE("UnsupportException");
-               return JSTizenExceptionFactory::postException(context, exception,
-                               JSTizenException::NOT_SUPPORTED_ERROR, "Unsupport Exception");
+               return JSWebAPIErrorFactory::postException(context, exception,
+                               JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, "Unsupport Exception");
        }
        Catch(WrtDeviceApis::Commons::Exception) 
        {
                LoggerE("UnkownException");
-               return JSTizenExceptionFactory::postException(context, exception,
-                               JSTizenException::UNKNOWN_ERROR, "Unkown error");
+               return JSWebAPIErrorFactory::postException(context, exception,
+                               JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unkown error");
        }
 }
 
index 54fc85a..e460038 100644 (file)
 #include <CommonsJavaScript/JSUtils.h>
 #include <CommonsJavaScript/JSCallbackManager.h>
 #include <CommonsJavaScript/Utils.h>
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 #include <SecurityExceptions.h>
 #include <Commons/Exception.h>
 #include <TimeTracer.h>
 #include <ArgumentValidator.h> 
-#include <JSWebAPIError.h>
-#include <JSWebAPIException.h> 
 #include <JSUtil.h>  
 #include "DataControlFactory.h"
 #include "JSMappedDataControlConsumer.h"
@@ -186,12 +183,12 @@ JSValueRef JSMappedDataControlConsumer::addValue(
        }
        catch (const BasePlatformException &err) 
        {
-               return JSWebAPIException::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } 
        catch (...) 
        {
                DeviceAPI::Common::UnknownException err("");
-               return JSWebAPIException::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        }  
        
 
@@ -204,8 +201,8 @@ JSValueRef JSMappedDataControlConsumer::addValue(
 
        if (priv == NULL)
        {
-               return JSTizenExceptionFactory::postException(context, exception, 
-                                       JSTizenException::TYPE_MISMATCH_ERROR, "type mismatch error");
+               return JSWebAPIErrorFactory::postException(context, exception, 
+                                       JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "type mismatch error");
        }
                
        JSCallbackManagerPtr cbm = JSCallbackManager::createObject(priv->getContext(), NULL, NULL);
@@ -250,27 +247,27 @@ JSValueRef JSMappedDataControlConsumer::addValue(
        Catch (WrtDeviceApis::Commons::ConversionException)
        {
                LoggerE("ConversionException");
-               return JSTizenExceptionFactory::postException(context, exception, 
-                                       JSTizenException::TYPE_MISMATCH_ERROR, "type mismatch error");
+               return JSWebAPIErrorFactory::postException(context, exception, 
+                                       JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "type mismatch error");
 
        }
        Catch (WrtDeviceApis::Commons::InvalidArgumentException) 
        {
                LoggerE("InvalidArgumentException");
-               return JSTizenExceptionFactory::postException(context, exception, 
-                               JSTizenException::INVALID_VALUES_ERROR, "type mismatch error");
+               return JSWebAPIErrorFactory::postException(context, exception, 
+                               JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "type mismatch error");
        }
        Catch(WrtDeviceApis::Commons::UnsupportedException)
        {
                LoggerE("UnsupportException");
-               return JSTizenExceptionFactory::postException(context, exception,
-                               JSTizenException::NOT_SUPPORTED_ERROR, "Unsupport Exception");
+               return JSWebAPIErrorFactory::postException(context, exception,
+                               JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, "Unsupport Exception");
        }
        Catch(WrtDeviceApis::Commons::Exception) 
        {
                LoggerE("UnkownException");
-               return JSTizenExceptionFactory::postException(context, exception,
-                               JSTizenException::UNKNOWN_ERROR, "Unkown error");
+               return JSWebAPIErrorFactory::postException(context, exception,
+                               JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unkown error");
        }
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
        return JSValueMakeUndefined(context);
@@ -301,12 +298,12 @@ JSValueRef JSMappedDataControlConsumer::updateValue(
        }
        catch (const BasePlatformException &err) 
        {
-               return JSWebAPIException::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } 
        catch (...) 
        {
                DeviceAPI::Common::UnknownException err("");
-               return JSWebAPIException::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        }  
        
 
@@ -319,8 +316,8 @@ JSValueRef JSMappedDataControlConsumer::updateValue(
 
        if (priv == NULL)
        {
-               return JSTizenExceptionFactory::postException(context, exception, 
-                                       JSTizenException::TYPE_MISMATCH_ERROR, "type mismatch error");
+               return JSWebAPIErrorFactory::postException(context, exception, 
+                                       JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "type mismatch error");
        }
                
        JSCallbackManagerPtr cbm = JSCallbackManager::createObject(priv->getContext(), NULL, NULL);
@@ -367,27 +364,27 @@ JSValueRef JSMappedDataControlConsumer::updateValue(
        Catch (WrtDeviceApis::Commons::ConversionException)
        {
                LoggerE("ConversionException");
-               return JSTizenExceptionFactory::postException(context, exception, 
-                                       JSTizenException::TYPE_MISMATCH_ERROR, "type mismatch error");
+               return JSWebAPIErrorFactory::postException(context, exception, 
+                                       JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "type mismatch error");
 
        }
        Catch (WrtDeviceApis::Commons::InvalidArgumentException) 
        {
                LoggerE("InvalidArgumentException");
-               return JSTizenExceptionFactory::postException(context, exception, 
-                               JSTizenException::INVALID_VALUES_ERROR, "type mismatch error");
+               return JSWebAPIErrorFactory::postException(context, exception, 
+                               JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "type mismatch error");
        }
        Catch(WrtDeviceApis::Commons::UnsupportedException)
        {
                LoggerE("UnsupportException");
-               return JSTizenExceptionFactory::postException(context, exception,
-                               JSTizenException::NOT_SUPPORTED_ERROR, "Unsupport Exception");
+               return JSWebAPIErrorFactory::postException(context, exception,
+                               JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, "Unsupport Exception");
        }
        Catch(WrtDeviceApis::Commons::Exception) 
        {
                LoggerE("UnkownException");
-               return JSTizenExceptionFactory::postException(context, exception,
-                               JSTizenException::UNKNOWN_ERROR, "Unkown error");
+               return JSWebAPIErrorFactory::postException(context, exception,
+                               JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unkown error");
        }
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
        return JSValueMakeUndefined(context);
@@ -414,8 +411,8 @@ JSValueRef JSMappedDataControlConsumer::getValue(
        
        if (priv == NULL)
        {
-               return JSTizenExceptionFactory::postException(context, exception, 
-                                       JSTizenException::TYPE_MISMATCH_ERROR, "type mismatch error");
+               return JSWebAPIErrorFactory::postException(context, exception, 
+                                       JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "type mismatch error");
        }
 
                // argument validation with new validator  
@@ -429,12 +426,12 @@ JSValueRef JSMappedDataControlConsumer::getValue(
        }
        catch (const BasePlatformException &err) 
        {
-               return JSWebAPIException::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } 
        catch (...) 
        {
                DeviceAPI::Common::UnknownException err("");
-               return JSWebAPIException::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        }  
        
        JSContextRef globalContext = priv->getContext();
@@ -480,27 +477,27 @@ JSValueRef JSMappedDataControlConsumer::getValue(
        Catch (WrtDeviceApis::Commons::ConversionException)
        {
                LoggerE("ConversionException");
-               return JSTizenExceptionFactory::postException(context, exception, 
-                                       JSTizenException::TYPE_MISMATCH_ERROR, "type mismatch error");
+               return JSWebAPIErrorFactory::postException(context, exception, 
+                                       JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "type mismatch error");
 
        }
        Catch (WrtDeviceApis::Commons::InvalidArgumentException) 
        {
                LoggerE("InvalidArgumentException");
-               return JSTizenExceptionFactory::postException(context, exception, 
-                               JSTizenException::INVALID_VALUES_ERROR, "type mismatch error");
+               return JSWebAPIErrorFactory::postException(context, exception, 
+                               JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "type mismatch error");
        }
        Catch(WrtDeviceApis::Commons::UnsupportedException)
        {
                LoggerE("UnsupportException");
-               return JSTizenExceptionFactory::postException(context, exception,
-                               JSTizenException::NOT_SUPPORTED_ERROR, "Unsupport Exception");
+               return JSWebAPIErrorFactory::postException(context, exception,
+                               JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, "Unsupport Exception");
        }
        Catch(WrtDeviceApis::Commons::Exception) 
        {
                LoggerE("UnkownException");
-               return JSTizenExceptionFactory::postException(context, exception,
-                               JSTizenException::UNKNOWN_ERROR, "Unkown error");
+               return JSWebAPIErrorFactory::postException(context, exception,
+                               JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unkown error");
        }
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
        return JSValueMakeUndefined(context);
@@ -529,12 +526,12 @@ JSValueRef JSMappedDataControlConsumer::removeValue(
        }
        catch (const BasePlatformException &err) 
        {
-               return JSWebAPIException::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } 
        catch (...) 
        {
                DeviceAPI::Common::UnknownException err("");
-               return JSWebAPIException::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        }  
        
 
@@ -547,8 +544,8 @@ JSValueRef JSMappedDataControlConsumer::removeValue(
 
        if (priv == NULL)
        {
-               return JSTizenExceptionFactory::postException(context, exception, 
-                                       JSTizenException::TYPE_MISMATCH_ERROR, "type mismatch error");
+               return JSWebAPIErrorFactory::postException(context, exception, 
+                                       JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "type mismatch error");
        }
                
        JSCallbackManagerPtr cbm = JSCallbackManager::createObject(priv->getContext(), NULL, NULL);
@@ -593,27 +590,27 @@ JSValueRef JSMappedDataControlConsumer::removeValue(
        Catch (WrtDeviceApis::Commons::ConversionException)
        {
                LoggerE("ConversionException");
-               return JSTizenExceptionFactory::postException(context, exception, 
-                                       JSTizenException::TYPE_MISMATCH_ERROR, "type mismatch error");
+               return JSWebAPIErrorFactory::postException(context, exception, 
+                                       JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "type mismatch error");
 
        }
        Catch (WrtDeviceApis::Commons::InvalidArgumentException) 
        {
                LoggerE("InvalidArgumentException");
-               return JSTizenExceptionFactory::postException(context, exception, 
-                               JSTizenException::INVALID_VALUES_ERROR, "type mismatch error");
+               return JSWebAPIErrorFactory::postException(context, exception, 
+                               JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "type mismatch error");
        }
        Catch(WrtDeviceApis::Commons::UnsupportedException)
        {
                LoggerE("UnsupportException");
-               return JSTizenExceptionFactory::postException(context, exception,
-                               JSTizenException::NOT_SUPPORTED_ERROR, "Unsupport Exception");
+               return JSWebAPIErrorFactory::postException(context, exception,
+                               JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, "Unsupport Exception");
        }
        Catch(WrtDeviceApis::Commons::Exception) 
        {
                LoggerE("UnkownException");
-               return JSTizenExceptionFactory::postException(context, exception,
-                               JSTizenException::UNKNOWN_ERROR, "Unkown error");
+               return JSWebAPIErrorFactory::postException(context, exception,
+                               JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unkown error");
        }
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
        return JSValueMakeUndefined(context);
index 1cf4a4a..96724c6 100644 (file)
 #include <CommonsJavaScript/JSUtils.h>
 #include <CommonsJavaScript/JSCallbackManager.h>
 #include <CommonsJavaScript/Utils.h>
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 #include <SecurityExceptions.h>
 #include <Commons/Exception.h>
 #include <TimeTracer.h>
 #include <ArgumentValidator.h> 
-#include <JSWebAPIError.h>
-#include <JSWebAPIException.h> 
 #include <JSUtil.h>  
 #include "DataControlFactory.h"
 #include "JSSQLDataControlConsumer.h"
@@ -186,12 +183,12 @@ JSValueRef JSSQLDataControlConsumer::insert(
        }
        catch (const BasePlatformException &err) 
        {
-               return JSWebAPIException::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } 
        catch (...) 
        {
                DeviceAPI::Common::UnknownException err("");
-               return JSWebAPIException::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        }  
 
 
@@ -204,8 +201,8 @@ JSValueRef JSSQLDataControlConsumer::insert(
        
        if (priv == NULL)
        {
-               return JSTizenExceptionFactory::postException(context, exception, 
-                                       JSTizenException::TYPE_MISMATCH_ERROR, "type mismatch error");
+               return JSWebAPIErrorFactory::postException(context, exception, 
+                                       JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "type mismatch error");
        }
 
        JSCallbackManagerPtr cbm = JSCallbackManager::createObject(priv->getContext(), NULL, NULL);
@@ -246,27 +243,27 @@ JSValueRef JSSQLDataControlConsumer::insert(
        Catch (WrtDeviceApis::Commons::ConversionException)
        {
                LoggerE("ConversionException");
-               return JSTizenExceptionFactory::postException(context, exception, 
-                                       JSTizenException::TYPE_MISMATCH_ERROR, "type mismatch error");
+               return JSWebAPIErrorFactory::postException(context, exception, 
+                                       JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "type mismatch error");
 
        }
        Catch (WrtDeviceApis::Commons::InvalidArgumentException) 
        {
                LoggerE("InvalidArgumentException");
-               return JSTizenExceptionFactory::postException(context, exception, 
-                               JSTizenException::INVALID_VALUES_ERROR, "type mismatch error");
+               return JSWebAPIErrorFactory::postException(context, exception, 
+                               JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "type mismatch error");
        }
        Catch(WrtDeviceApis::Commons::UnsupportedException)
        {
                LoggerE("UnsupportException");
-               return JSTizenExceptionFactory::postException(context, exception,
-                               JSTizenException::NOT_SUPPORTED_ERROR, "Unsupport Exception");
+               return JSWebAPIErrorFactory::postException(context, exception,
+                               JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, "Unsupport Exception");
        }
        Catch(WrtDeviceApis::Commons::Exception) 
        {
                LoggerE("UnkownException");
-               return JSTizenExceptionFactory::postException(context, exception,
-                               JSTizenException::UNKNOWN_ERROR, "Unkown error");
+               return JSWebAPIErrorFactory::postException(context, exception,
+                               JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unkown error");
        }
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
        return JSValueMakeUndefined(context);
@@ -296,12 +293,12 @@ JSValueRef JSSQLDataControlConsumer::update(
        }
        catch (const BasePlatformException &err) 
        {
-               return JSWebAPIException::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } 
        catch (...) 
        {
                DeviceAPI::Common::UnknownException err("");
-               return JSWebAPIException::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        }  
 
        DataControlConverter converter(context);
@@ -313,8 +310,8 @@ JSValueRef JSSQLDataControlConsumer::update(
 
        if (priv == NULL)
        {
-               return JSTizenExceptionFactory::postException(context, exception, 
-                                       JSTizenException::TYPE_MISMATCH_ERROR, "type mismatch error");
+               return JSWebAPIErrorFactory::postException(context, exception, 
+                                       JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "type mismatch error");
        }
 
        
@@ -358,27 +355,27 @@ JSValueRef JSSQLDataControlConsumer::update(
        Catch (WrtDeviceApis::Commons::ConversionException)
        {
                LoggerE("ConversionException");
-               return JSTizenExceptionFactory::postException(context, exception, 
-                                       JSTizenException::TYPE_MISMATCH_ERROR, "type mismatch error");
+               return JSWebAPIErrorFactory::postException(context, exception, 
+                                       JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "type mismatch error");
 
        }
        Catch (WrtDeviceApis::Commons::InvalidArgumentException) 
        {
                LoggerE("InvalidArgumentException");
-               return JSTizenExceptionFactory::postException(context, exception, 
-                               JSTizenException::INVALID_VALUES_ERROR, "type mismatch error");
+               return JSWebAPIErrorFactory::postException(context, exception, 
+                               JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "type mismatch error");
        }
        Catch(WrtDeviceApis::Commons::UnsupportedException)
        {
                LoggerE("UnsupportException");
-               return JSTizenExceptionFactory::postException(context, exception,
-                               JSTizenException::NOT_SUPPORTED_ERROR, "Unsupport Exception");
+               return JSWebAPIErrorFactory::postException(context, exception,
+                               JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, "Unsupport Exception");
        }
        Catch(WrtDeviceApis::Commons::Exception) 
        {
                LoggerE("UnkownException");
-               return JSTizenExceptionFactory::postException(context, exception,
-                               JSTizenException::UNKNOWN_ERROR, "Unkown error");
+               return JSWebAPIErrorFactory::postException(context, exception,
+                               JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unkown error");
        }
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
        return JSValueMakeUndefined(context);
@@ -411,12 +408,12 @@ JSValueRef JSSQLDataControlConsumer::select(
        }
        catch (const BasePlatformException &err) 
        {
-               return JSWebAPIException::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } 
        catch (...) 
        {
                DeviceAPI::Common::UnknownException err("");
-               return JSWebAPIException::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        }  
        
 
@@ -428,8 +425,8 @@ JSValueRef JSSQLDataControlConsumer::select(
        
        if (priv == NULL)
        {
-               return JSTizenExceptionFactory::postException(context, exception, 
-                                       JSTizenException::TYPE_MISMATCH_ERROR, "type mismatch error");
+               return JSWebAPIErrorFactory::postException(context, exception, 
+                                       JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "type mismatch error");
        }
 
        JSContextRef globalContext = priv->getContext();
@@ -497,27 +494,27 @@ JSValueRef JSSQLDataControlConsumer::select(
        Catch (WrtDeviceApis::Commons::ConversionException)
        {
                LoggerE("ConversionException");
-               return JSTizenExceptionFactory::postException(context, exception, 
-                                       JSTizenException::TYPE_MISMATCH_ERROR, "type mismatch error");
+               return JSWebAPIErrorFactory::postException(context, exception, 
+                                       JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "type mismatch error");
 
        }
        Catch (WrtDeviceApis::Commons::InvalidArgumentException) 
        {
                LoggerE("InvalidArgumentException");
-               return JSTizenExceptionFactory::postException(context, exception, 
-                               JSTizenException::INVALID_VALUES_ERROR, "type mismatch error");
+               return JSWebAPIErrorFactory::postException(context, exception, 
+                               JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "type mismatch error");
        }
        Catch(WrtDeviceApis::Commons::UnsupportedException)
        {
                LoggerE("UnsupportException");
-               return JSTizenExceptionFactory::postException(context, exception,
-                               JSTizenException::NOT_SUPPORTED_ERROR, "Unsupport Exception");
+               return JSWebAPIErrorFactory::postException(context, exception,
+                               JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, "Unsupport Exception");
        }
        Catch(WrtDeviceApis::Commons::Exception) 
        {
                LoggerE("UnkownException");
-               return JSTizenExceptionFactory::postException(context, exception,
-                               JSTizenException::UNKNOWN_ERROR, "Unkown error");
+               return JSWebAPIErrorFactory::postException(context, exception,
+                               JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unkown error");
        }
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
        return JSValueMakeUndefined(context);
@@ -545,12 +542,12 @@ JSValueRef JSSQLDataControlConsumer::remove(
        }
        catch (const BasePlatformException &err) 
        {
-               return JSWebAPIException::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } 
        catch (...) 
        {
                DeviceAPI::Common::UnknownException err("");
-               return JSWebAPIException::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        }  
 
        DataControlConverter converter(context);
@@ -562,8 +559,8 @@ JSValueRef JSSQLDataControlConsumer::remove(
        
        if (priv == NULL)
        {
-               return JSTizenExceptionFactory::postException(context, exception, 
-                                       JSTizenException::TYPE_MISMATCH_ERROR, "type mismatch error");
+               return JSWebAPIErrorFactory::postException(context, exception, 
+                                       JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "type mismatch error");
        }
 
        JSCallbackManagerPtr cbm = JSCallbackManager::createObject(priv->getContext(), NULL, NULL);
@@ -608,27 +605,27 @@ JSValueRef JSSQLDataControlConsumer::remove(
        Catch (WrtDeviceApis::Commons::ConversionException)
        {
                LoggerE("ConversionException");
-               return JSTizenExceptionFactory::postException(context, exception, 
-                                       JSTizenException::TYPE_MISMATCH_ERROR, "type mismatch error");
+               return JSWebAPIErrorFactory::postException(context, exception, 
+                                       JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "type mismatch error");
 
        }
        Catch (WrtDeviceApis::Commons::InvalidArgumentException) 
        {
                LoggerE("InvalidArgumentException");
-               return JSTizenExceptionFactory::postException(context, exception, 
-                               JSTizenException::INVALID_VALUES_ERROR, "type mismatch error");
+               return JSWebAPIErrorFactory::postException(context, exception, 
+                               JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "type mismatch error");
        }
        Catch(WrtDeviceApis::Commons::UnsupportedException)
        {
                LoggerE("UnsupportException");
-               return JSTizenExceptionFactory::postException(context, exception,
-                               JSTizenException::NOT_SUPPORTED_ERROR, "Unsupport Exception");
+               return JSWebAPIErrorFactory::postException(context, exception,
+                               JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, "Unsupport Exception");
        }
        Catch(WrtDeviceApis::Commons::Exception) 
        {
                LoggerE("UnkownException");
-               return JSTizenExceptionFactory::postException(context, exception,
-                               JSTizenException::UNKNOWN_ERROR, "Unkown error");
+               return JSWebAPIErrorFactory::postException(context, exception,
+                               JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unkown error");
        }
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
        return JSValueMakeUndefined(context);
index c8d3f9f..a0e7e65 100644 (file)
@@ -17,8 +17,7 @@
 
 #include <algorithm>
 #include <CommonsJavaScript/ScopedJSStringRef.h>
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 #include "DataControlFactory.h"
 #include "RowData.h"
 #include "DataControlConverter.h"
@@ -225,7 +224,7 @@ JSValueRef JSSelectObjectArrayValues::getProperty(JSContextRef context,
                        }
                        else 
                        {
-                               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch");
+                               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch");
                        }
                }
        }
@@ -282,7 +281,7 @@ bool JSSelectObjectArrayValues::setProperty(JSContextRef context,
        Catch(WrtDeviceApis::Commons::Exception)
        {
                LoggerE("error occured");
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch");
        }*/
        return false;
 }
@@ -315,7 +314,7 @@ bool JSSelectObjectArrayValues::deleteProperty(JSContextRef context,
        Catch(WrtDeviceApis::Commons::Exception)
        {
                LoggerE("error occured");
-               JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch");
+               JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch");
        }*/
        return false;
 }
index 05edc10..ff33873 100755 (executable)
@@ -308,8 +308,10 @@ static sync_agent_ds_sync_interval_e convertToPlatformSyncInterval(SyncInfo::Syn
                return SYNC_AGENT_SYNC_INTERVAL_1_WEEK;
        } else if(SyncInfo::INTERVAL_1_MONTH==syncInterval) {
                return SYNC_AGENT_SYNC_INTERVAL_1_MONTH;
+       } else if(SyncInfo::INTERVAL_UNDEFINED==syncInterval) {
+               return SYNC_AGENT_SYNC_INTERVAL_NONE;
        } else {
-               LoggerW("Error while converting a sync interval.");
+               LoggerW("Error while converting a JS sync interval.");
        }
 
        return SYNC_AGENT_SYNC_INTERVAL_1_WEEK;
@@ -333,8 +335,10 @@ static SyncInfo::SyncInterval convertToSyncInterval(sync_agent_ds_sync_interval_
                return SyncInfo::INTERVAL_1_WEEK;
        } else if(SYNC_AGENT_SYNC_INTERVAL_1_MONTH==syncInterval) {
                return SyncInfo::INTERVAL_1_MONTH;
+       } else if(SYNC_AGENT_SYNC_INTERVAL_NONE==syncInterval) {
+               return SyncInfo::INTERVAL_UNDEFINED;
        } else {
-               LoggerW("Error while converting a sync interval.");
+               LoggerW("Error while converting a platform sync interval.");
        }
 
        return SyncInfo::INTERVAL_UNDEFINED;
@@ -470,7 +474,7 @@ void DataSyncManager::OnRequestReceived(const IEventAddProfilePtr &event)
                        password = categories->at(i)->getPassword();
                        enable = categories->at(i)->getEnable();
 
-                       LoggerD("serviceType: "<<serviceType<<", tgtURI: "<<tgtURI<<", id: "<<id<<" for index: "<<i);
+                       LoggerD("serviceType: "<<serviceType<<", tgtURI: "<<tgtURI<<" for index: "<<i);
 
                        ret = sync_agent_ds_set_sync_service_info(profile_h, serviceType, enable, srcURI, (char*)(tgtURI.c_str()),
                                        0==id.size() ? NULL : (char*)(id.c_str()), 0==password.size() ? NULL : (char*)(password.c_str()));
@@ -580,7 +584,7 @@ void DataSyncManager::OnRequestReceived(const IEventUpdateProfilePtr &event)
                        password = categories->at(i)->getPassword();
                        enable = categories->at(i)->getEnable();
 
-                       LoggerD("serviceType: "<<serviceType<<", tgtURI: "<<tgtURI<<", id: "<<id<<" for index: "<<i);
+                       LoggerD("serviceType: "<<serviceType<<", tgtURI: "<<tgtURI<<" for index: "<<i);
 
                        ret = sync_agent_ds_set_sync_service_info(profile_h, serviceType, enable, srcURI, (char*)(tgtURI.c_str()),
                                        0==id.size() ? NULL : (char*)(id.c_str()), 0==password.size() ? NULL : (char*)(password.c_str()));
index 2a7256b..c6d0fcb 100755 (executable)
@@ -21,8 +21,7 @@
 #include "DataSyncMultiCallback.h"
 
 #include <CommonsJavaScript/JSCallbackManager.h>
-#include <JSTizenException.h>
-#include <JSTizenExceptionFactory.h>
+#include <JSWebAPIErrorFactory.h>
 #include <Logger.h>
 #include <GlobalContextManager.h>
 
@@ -86,10 +85,10 @@ void DataSyncResponseDispatcher::onAnswerReceived(const OnDataSyncStateChangedPt
                 LoggerD("Sync failed with: "<<event->getExceptionCode());
                 JSValueRef errorObject;
                 if (ExceptionCodes::PlatformException==event->getExceptionCode()) {
-                    //errorObject = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::NETWORK_ERROR, event->getErrorMessage());
-                    errorObject = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::NETWORK_ERROR);
+                    //errorObject = JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::NETWORK_ERROR, event->getErrorMessage());
+                    errorObject = JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::NETWORK_ERROR);
                 } else {
-                    errorObject = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::UNKNOWN_ERROR);
+                    errorObject = JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::UNKNOWN_ERROR);
                 }
                 JSValueRef objParam[2] = {profileId, errorObject};
                 multiCallbacks->getOnFailed()->callOnSuccess(objParam, 2);
index 0417b57..edb3727 100755 (executable)
@@ -23,8 +23,7 @@
 #include <CommonsJavaScript/Utils.h>
 #include <CommonsJavaScript/Validator.h>
 #include <CommonsJavaScript/ScopedJSStringRef.h>
-#include <JSTizenException.h>
-#include <JSTizenExceptionFactory.h>
+#include <JSWebAPIErrorFactory.h>
 #include <SecurityExceptions.h>
 
 #include "OnDataSyncStateChanged.h"
@@ -47,6 +46,9 @@ using namespace DeviceAPI::Common;
 namespace DeviceAPI {
 namespace DataSync {
 
+using WrtDeviceApis::Commons::UnknownException;
+using WrtDeviceApis::Commons::NotFoundException;
+
 JSClassDefinition JSDataSyncManager::m_classInfo = {
     0,
     kJSClassAttributeNone,
@@ -180,27 +182,27 @@ JSValueRef JSDataSyncManager::add(JSContextRef context,
     Catch(OutOfRangeException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, "QuotaExceededError", _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::QUOTA_EXCEEDED_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(UnsupportedException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(InvalidArgumentException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(ConversionException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(Exception)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
     }
 }
 
@@ -259,22 +261,22 @@ JSValueRef JSDataSyncManager::update(JSContextRef context,
     Catch(UnsupportedException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(InvalidArgumentException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(ConversionException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(Exception)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
     }
 }
 
@@ -328,27 +330,27 @@ JSValueRef JSDataSyncManager::remove(JSContextRef context,
     Catch (NotFoundException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_FOUND_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_FOUND_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(UnsupportedException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(InvalidArgumentException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(ConversionException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(Exception)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
     }
 }
 
@@ -390,22 +392,22 @@ JSValueRef JSDataSyncManager::getMaxProfilesNum(JSContextRef context,
     Catch(UnsupportedException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(InvalidArgumentException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(ConversionException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(Exception)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
     }
 }
 
@@ -447,22 +449,22 @@ JSValueRef JSDataSyncManager::getProfilesNum(JSContextRef context,
     Catch(UnsupportedException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(InvalidArgumentException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(ConversionException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(Exception)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
     }
 }
 
@@ -516,27 +518,27 @@ JSValueRef JSDataSyncManager::get(JSContextRef context,
     Catch (NotFoundException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_FOUND_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_FOUND_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(UnsupportedException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(InvalidArgumentException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(ConversionException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(Exception)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
     }
 }
 
@@ -578,22 +580,22 @@ JSValueRef JSDataSyncManager::getAll(JSContextRef context,
     Catch(UnsupportedException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(InvalidArgumentException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(ConversionException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(Exception)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
     }
 }
 
@@ -684,7 +686,7 @@ JSValueRef JSDataSyncManager::startSync(JSContextRef context,
 
                                LoggerD("Set the emitter.");
                                dplEvent->setEmitter(emitter);
-                       } else  if (JSValueIsNull(context, arguments[1]) || JSValueIsUndefined(context, arguments[1]) ) {
+                       } else  if (JSValueIsNull(context, arguments[1]) ) {
                                LoggerD("Null or undefined listener.");
                        } else {
                                ThrowMsg(ConversionException, "Wrong second parameter type.");
@@ -720,27 +722,27 @@ JSValueRef JSDataSyncManager::startSync(JSContextRef context,
     Catch(UnsupportedException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(InvalidArgumentException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(ConversionException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
     }
     Catch (NotFoundException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_FOUND_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_FOUND_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(Exception)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
     }
 
     return JSValueMakeUndefined(context);
@@ -794,27 +796,27 @@ JSValueRef JSDataSyncManager::stopSync(JSContextRef context,
     Catch(UnsupportedException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(InvalidArgumentException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(ConversionException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
     }
     Catch (NotFoundException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_FOUND_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_FOUND_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(Exception)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
     }
 
     return JSValueMakeUndefined(context);
@@ -871,27 +873,27 @@ JSValueRef JSDataSyncManager::getLastSyncStatistics(JSContextRef context,
     Catch (NotFoundException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_FOUND_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_FOUND_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(UnsupportedException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(InvalidArgumentException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(ConversionException)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(Exception)
     {
                LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
     }
 }
 
index bb252b4..f281d22 100755 (executable)
@@ -19,8 +19,7 @@
 #include "JSSyncInfo.h"
 #include "DataSyncConverter.h"
 
-#include <JSTizenException.h>
-#include <JSTizenExceptionFactory.h>
+#include <JSWebAPIErrorFactory.h>
 #include <CommonsJavaScript/Converter.h>
 #include <Logger.h>
 
@@ -186,30 +185,22 @@ JSObjectRef JSSyncInfo::constructor(JSContextRef context,
     Catch(UnsupportedException)
     {
         LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-               JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
-        *exception = error;
-               return error;
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(InvalidArgumentException)
     {
         LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-               JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
-        *exception = error;
-               return error;
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(ConversionException)
     {
         LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-               JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
-        *exception = error;
-               return error;
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(Exception)
     {
         LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-               JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
-        *exception = error;
-               return error;
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
     }
 }
 
@@ -242,7 +233,11 @@ JSValueRef JSSyncInfo::getProperty(JSContextRef context,
                } else if (JSStringIsEqualToUTF8CString(propertyName, TIZEN_SYNC_INFO_TYPE)) {
             return converter.toJSValueRef(converter.toTizenValue(syncInfo->getSyncType()));
                } else if (JSStringIsEqualToUTF8CString(propertyName, TIZEN_SYNC_INFO_INTERVAL)) {
-            return converter.toJSValueRef(converter.toTizenValue(syncInfo->getSyncInterval()));
+                       if( SyncInfo::INTERVAL_UNDEFINED==syncInfo->getSyncInterval() ) {
+                           return JSValueMakeUndefined(context);
+                       } else {
+                   return converter.toJSValueRef(converter.toTizenValue(syncInfo->getSyncInterval()));
+                       }
                } else {
                        LoggerD("Wrong property name.");
                }
index f0920a5..1d3d451 100755 (executable)
@@ -21,8 +21,7 @@
 #include "JSSyncServiceInfo.h"
 #include "DataSyncConverter.h"
 
-#include <JSTizenException.h>
-#include <JSTizenExceptionFactory.h>
+#include <JSWebAPIErrorFactory.h>
 #include <CommonsJavaScript/Converter.h>
 #include <CommonsJavaScript/JSUtils.h>
 #include <Logger.h>
@@ -178,30 +177,22 @@ JSObjectRef JSSyncProfileInfo::constructor(JSContextRef context,
     Catch(UnsupportedException)
     {
         LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-               JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
-        *exception = error;
-               return error;
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(InvalidArgumentException)
     {
         LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-               JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
-        *exception = error;
-               return error;
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(ConversionException)
     {
         LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-               JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
-        *exception = error;
-               return error;
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(Exception)
     {
         LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-               JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
-        *exception = error;
-               return error;
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
     }
 }
 
index e020e16..d0f7493 100755 (executable)
@@ -17,8 +17,7 @@
 
 
 #include "JSSyncServiceInfo.h"
-#include <JSTizenException.h>
-#include <JSTizenExceptionFactory.h>
+#include <JSWebAPIErrorFactory.h>
 #include <CommonsJavaScript/Converter.h>
 #include "DataSyncConverter.h"
 #include <Logger.h>
@@ -175,30 +174,22 @@ JSObjectRef JSSyncServiceInfo::constructor(JSContextRef context,
     Catch(UnsupportedException)
     {
         LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-               JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
-        *exception = error;
-               return error;
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(InvalidArgumentException)
     {
         LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-               JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
-        *exception = error;
-               return error;
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(ConversionException)
     {
         LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-               JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
-        *exception = error;
-               return error;
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
     }
     Catch(Exception)
     {
         LoggerW("Exception: "<<_rethrown_exception.GetMessage());
-               JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
-        *exception = error;
-               return error;
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
     }
 }
 
index 2bb1260..5d7c958 100644 (file)
@@ -19,8 +19,7 @@
 #include "JSSyncStatistics.h"
 #include "DataSyncConverter.h"
 
-#include <JSTizenException.h>
-#include <JSTizenExceptionFactory.h>
+#include <JSWebAPIErrorFactory.h>
 #include <CommonsJavaScript/Converter.h>
 #include <Logger.h>
 
index d6f678c..5d86479 100755 (executable)
 // limitations under the License.
 //
 
-#include <JSWebAPIError.h>
+#include <JSWebAPIErrorFactory.h>
 #include <PlatformException.h>
 #include <JSUtil.h>
 
 #include "DownloadCallback.h"
 
-using namespace WrtDeviceApis::Commons;
-using namespace WrtDeviceApis::CommonsJavaScript;
-
 using namespace DeviceAPI::Common;
 
 namespace DeviceAPI {
@@ -146,7 +143,7 @@ void DownloadCallback::onfailed(long downloadId, BasePlatformException &error)
 
        JSValueRef objParam[2] = {
                        JSUtil::toJSValueRef(context, downloadId),
-                       JSWebAPIError::makeJSWebAPIError(context, error)
+                       JSWebAPIErrorFactory::makeErrorObject(context, error)
                };
        mCallbackUserData->invokeCallback("onfailed", 2, objParam);
 }
index 2fbb577..e3d899f 100644 (file)
@@ -18,7 +18,6 @@
 #include <SecurityExceptions.h>
 
 #include <JSUtil.h>
-#include <JSWebAPIException.h>
 #include <ArgumentValidator.h>
 #include <GlobalContextManager.h>
 
@@ -147,11 +146,11 @@ JSValueRef JSDownloadManager::startDownload(JSContextRef context,
         return JSUtil::toJSValueRef(context, downloadId);
     } catch (const BasePlatformException &err) {
         LOGE("%s : %s", err.getName().c_str(), err.getMessage().c_str());
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
         DeviceAPI::Common::UnknownException err("Unknown Error in tizen.download.start().");
         LOGE("%s : %s", err.getName().c_str(), err.getMessage().c_str());
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 }
 
@@ -186,11 +185,11 @@ JSValueRef JSDownloadManager::setListener(JSContextRef context,
         return JSValueMakeUndefined(context);
     } catch (const BasePlatformException &err) {
         LOGE("%s : %s", err.getName().c_str(), err.getMessage().c_str());
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
         DeviceAPI::Common::UnknownException err("Unknown Error in tizen.download.setListener().");
         LOGE("%s : %s", err.getName().c_str(), err.getMessage().c_str());
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 }
 
@@ -220,11 +219,11 @@ JSValueRef JSDownloadManager::cancelDownload(JSContextRef context,
         return JSValueMakeUndefined(context);
     } catch (const BasePlatformException &err) {
         LOGE("%s : %s", err.getName().c_str(), err.getMessage().c_str());
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
         DeviceAPI::Common::UnknownException err("Unknown Error in tizen.download.cancel().");
         LOGE("%s : %s", err.getName().c_str(), err.getMessage().c_str());
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 }
 
@@ -254,11 +253,11 @@ JSValueRef JSDownloadManager::pauseDownload(JSContextRef context,
         return JSValueMakeUndefined(context);
     } catch (const BasePlatformException &err) {
         LOGE("%s : %s", err.getName().c_str(), err.getMessage().c_str());
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
         DeviceAPI::Common::UnknownException err("Unknown Error in tizen.download.pause().");
         LOGE("%s : %s", err.getName().c_str(), err.getMessage().c_str());
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 }
 
@@ -288,11 +287,11 @@ JSValueRef JSDownloadManager::resumeDownload(JSContextRef context,
         return JSValueMakeUndefined(context);
     } catch (const BasePlatformException &err) {
         LOGE("%s : %s", err.getName().c_str(), err.getMessage().c_str());
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
         DeviceAPI::Common::UnknownException err("Unknown Error in tizen.download.resume().");
         LOGE("%s : %s", err.getName().c_str(), err.getMessage().c_str());
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 }
 
@@ -323,11 +322,11 @@ JSValueRef JSDownloadManager::getState(JSContextRef context,
         return JSUtil::toJSValueRef(context, ret);
     } catch (const BasePlatformException &err) {
         LOGE("%s : %s", err.getName().c_str(), err.getMessage().c_str());
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
         DeviceAPI::Common::UnknownException err("Unknown Error in tizen.download.resume().");
         LOGE("%s : %s", err.getName().c_str(), err.getMessage().c_str());
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 }
 
@@ -359,11 +358,11 @@ JSValueRef JSDownloadManager::getDownloadRequest(JSContextRef context,
         return obj;
     } catch (const BasePlatformException &err) {
         LOGE("%s : %s", err.getName().c_str(), err.getMessage().c_str());
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
         DeviceAPI::Common::UnknownException err("Unknown Error in tizen.download.resume().");
         LOGE("%s : %s", err.getName().c_str(), err.getMessage().c_str());
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 }
 
@@ -393,11 +392,11 @@ JSValueRef JSDownloadManager::getMIMEType(JSContextRef context,
         return JSUtil::toJSValueRef(context, ret);
     } catch (const BasePlatformException &err) {
         LOGE("%s : %s", err.getName().c_str(), err.getMessage().c_str());
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
         DeviceAPI::Common::UnknownException err("Unknown Error in tizen.download.resume().");
         LOGE("%s : %s", err.getName().c_str(), err.getMessage().c_str());
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 }
 
index 03a6212..4bda4f0 100644 (file)
@@ -21,7 +21,6 @@
 
 #include <Logger.h>
 #include <JSUtil.h>
-#include <JSWebAPIError.h>
 #include <JSWebAPIErrorFactory.h>
 #include <ArgumentValidator.h>
 
index e408437..b083d25 100644 (file)
 #include <CommonsJavaScript/Validator.h>
 #include <CommonsJavaScript/JSUtils.h>
 #include <CommonsJavaScript/Utils.h>
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h> 
+#include <JSWebAPIErrorFactory.h>
 #include <SecurityExceptions.h>
 #include <ArgumentValidator.h>
-#include <JSWebAPIError.h>
-#include <JSWebAPIException.h>
 #include <JSUtil.h>
 #include <Export.h>
 
@@ -185,7 +182,7 @@ JSValueRef JSFile::getProperty(JSContextRef context,
        static_cast<PrivateObject*>(JSObjectGetPrivate(object));
        if (!privateObject) {
                LoggerE("Private object is not set.");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch error");
        }
 
        JSContextRef globalContext = privateObject->getContext();
@@ -357,7 +354,7 @@ JSValueRef JSFile::toUri(JSContextRef context,
        PrivateObject* privateObject = static_cast<PrivateObject*>(JSObjectGetPrivate(thisObject));
        if (!privateObject) {
                LoggerE("Private object is not set.");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch error");
        }
 
        Converter converter(context);
@@ -371,13 +368,13 @@ JSValueRef JSFile::toUri(JSContextRef context,
                TIME_TRACER_ITEM_END(__FUNCTION__, 0);
                return converter.toJSValueRef(privateObject->getObject()->getNode()->toUri(widgetId));
        } catch(const WrtDeviceApis::Commons::ConversionException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, ex.GetMessage());
        } catch (const WrtDeviceApis::Commons::UnsupportedException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, ex.GetMessage());
        } catch(const WrtDeviceApis::Commons::InvalidArgumentException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, ex.GetMessage());
        } catch(const WrtDeviceApis::Commons::Exception& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, ex.GetMessage());
        }
 }
 
@@ -391,7 +388,7 @@ JSValueRef JSFile::listFiles(JSContextRef context,
        TIME_TRACER_ITEM_BEGIN(__FUNCTION__, 0);
        PrivateObject* privateObject = static_cast<PrivateObject*>(JSObjectGetPrivate(thisObject));
        if (!privateObject) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch error");
        }
 
        LoggerD("OK");
@@ -404,10 +401,10 @@ JSValueRef JSFile::listFiles(JSContextRef context,
                validator.toObject(2, true);
        }
        catch (const BasePlatformException &err) {
-               return JSWebAPIException::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch (...) {
                DeviceAPI::Common::UnknownException err("");
-               return JSWebAPIException::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        }
 
        JSContextRef globalContext = privateObject->getContext();
@@ -463,13 +460,13 @@ JSValueRef JSFile::listFiles(JSContextRef context,
 
 
        } catch(const WrtDeviceApis::Commons::ConversionException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, ex.GetMessage());
        } catch (const WrtDeviceApis::Commons::UnsupportedException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, ex.GetMessage());
        } catch(const WrtDeviceApis::Commons::InvalidArgumentException& ex) {
-               cbm->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::INVALID_VALUES_ERROR, ex.GetMessage()));
+               cbm->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, ex.GetMessage()));
        } catch(const WrtDeviceApis::Commons::Exception& ex) {
-               cbm->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::UNKNOWN_ERROR, ex.GetMessage()));
+               cbm->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::UNKNOWN_ERROR, ex.GetMessage()));
        }
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
        return JSValueMakeUndefined(context);
@@ -485,7 +482,7 @@ JSValueRef JSFile::openStream(JSContextRef context,
        TIME_TRACER_ITEM_BEGIN(__FUNCTION__, 0);
        PrivateObject* privateObject = static_cast<PrivateObject*>(JSObjectGetPrivate(thisObject));
        if (!privateObject) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch error");
        }
 
        // argument validation with new validator
@@ -495,10 +492,10 @@ JSValueRef JSFile::openStream(JSContextRef context,
                validator.toFunction(2, true);
        }
        catch (const BasePlatformException &err) {
-               return JSWebAPIException::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch (...) {
                DeviceAPI::Common::UnknownException err("");
-               return JSWebAPIException::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        }
 
        JSContextRef globalContext = privateObject->getContext();
@@ -542,7 +539,7 @@ JSValueRef JSFile::openStream(JSContextRef context,
                }
 
                if ((AM_READ != mode) && (PERM_READ == privateObject->getObject()->getNode()->getPermissions())) {
-                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::PERMISSION_DENIED_ERROR, "Permission denied error");
+                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::PERMISSION_DENIED_ERROR, "Permission denied error");
                }
 
                std::string path = privateObject->getObject()->getNode()->getPath()->getFullPath();
@@ -563,13 +560,13 @@ JSValueRef JSFile::openStream(JSContextRef context,
 
 
        } catch(const WrtDeviceApis::Commons::ConversionException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, ex.GetMessage());
        } catch (const WrtDeviceApis::Commons::UnsupportedException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, ex.GetMessage());
        } catch(const WrtDeviceApis::Commons::InvalidArgumentException& ex) {
-               cbm->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::INVALID_VALUES_ERROR, ex.GetMessage()));
+               cbm->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, ex.GetMessage()));
        } catch(const WrtDeviceApis::Commons::Exception& ex) {
-               cbm->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::UNKNOWN_ERROR, ex.GetMessage()));
+               cbm->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::UNKNOWN_ERROR, ex.GetMessage()));
        }
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
        return JSValueMakeUndefined(context);
@@ -585,7 +582,7 @@ JSValueRef JSFile::readAsText(JSContextRef context,
        TIME_TRACER_ITEM_BEGIN(__FUNCTION__, 0);
        PrivateObject* privateObject = static_cast<PrivateObject*>(JSObjectGetPrivate(thisObject));
        if (!privateObject) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch error");
        }
 
 
@@ -596,10 +593,10 @@ JSValueRef JSFile::readAsText(JSContextRef context,
                validator.toFunction(1, true);
        }
        catch (const BasePlatformException &err) {
-               return JSWebAPIException::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch (...) {
                DeviceAPI::Common::UnknownException err("");
-               return JSWebAPIException::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        }
        
 
@@ -642,7 +639,7 @@ JSValueRef JSFile::readAsText(JSContextRef context,
                }
 
                if (NT_FILE != privateObject->getObject()->getNode()->getType()) {
-                       cbm->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::IO_ERROR, "IO error"));
+                       cbm->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::IO_ERROR, "IO error"));
                        return JSValueMakeUndefined(context);
                }
 
@@ -655,13 +652,13 @@ JSValueRef JSFile::readAsText(JSContextRef context,
                privateObject->getObject()->getNode()->read(event);
 
        } catch(const WrtDeviceApis::Commons::ConversionException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, ex.GetMessage());
        } catch (const WrtDeviceApis::Commons::UnsupportedException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, ex.GetMessage());
        } catch(const WrtDeviceApis::Commons::InvalidArgumentException& ex) {
-               cbm->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::INVALID_VALUES_ERROR, ex.GetMessage()));
+               cbm->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, ex.GetMessage()));
        } catch(const WrtDeviceApis::Commons::Exception& ex) {
-               cbm->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::UNKNOWN_ERROR, ex.GetMessage()));
+               cbm->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::UNKNOWN_ERROR, ex.GetMessage()));
        }
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
        return JSValueMakeUndefined(context);
@@ -677,7 +674,7 @@ JSValueRef JSFile::copyTo(JSContextRef context,
        TIME_TRACER_ITEM_BEGIN(__FUNCTION__, 0);
        PrivateObject* privateObject = static_cast<PrivateObject*>(JSObjectGetPrivate(thisObject));
        if (!privateObject) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch error");
        }
 
        JSContextRef globalContext = privateObject->getContext();
@@ -695,10 +692,10 @@ JSValueRef JSFile::copyTo(JSContextRef context,
                validator.toFunction(4, true);
        }
        catch (const BasePlatformException &err) {
-               return JSWebAPIException::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch (...) {
                DeviceAPI::Common::UnknownException err("");
-               return JSWebAPIException::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        }
        
 
@@ -730,7 +727,7 @@ JSValueRef JSFile::copyTo(JSContextRef context,
                bool overwrite = converter.toBool(reserveArguments[2]);;
                
                if (NT_DIRECTORY != privateObject->getObject()->getNode()->getType()) {
-                       cbm->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::IO_ERROR, "IO error"));
+                       cbm->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::IO_ERROR, "IO error"));
                        return JSValueMakeUndefined(context);
                }
 
@@ -757,15 +754,15 @@ JSValueRef JSFile::copyTo(JSContextRef context,
                                        
                IManager::getInstance().copy(event);
        } catch(const WrtDeviceApis::Commons::ConversionException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, ex.GetMessage());
        } catch (const WrtDeviceApis::Commons::UnsupportedException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, ex.GetMessage());
        } catch(const WrtDeviceApis::Commons::NotFoundException &ex) {
-               cbm->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::NOT_FOUND_ERROR, ex.GetMessage()));
+               cbm->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::NOT_FOUND_ERROR, ex.GetMessage()));
        } catch(const WrtDeviceApis::Commons::InvalidArgumentException& ex) {
-               cbm->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::INVALID_VALUES_ERROR, ex.GetMessage()));
+               cbm->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, ex.GetMessage()));
        } catch(const WrtDeviceApis::Commons::Exception& ex) {
-               cbm->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::UNKNOWN_ERROR, ex.GetMessage()));
+               cbm->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::UNKNOWN_ERROR, ex.GetMessage()));
        }
 
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
@@ -782,7 +779,7 @@ JSValueRef JSFile::moveTo(JSContextRef context,
        TIME_TRACER_ITEM_BEGIN(__FUNCTION__, 0);
        PrivateObject* privateObject = static_cast<PrivateObject*>(JSObjectGetPrivate(thisObject));
        if (!privateObject) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch error");
        }
 
        JSContextRef globalContext = privateObject->getContext();
@@ -796,10 +793,10 @@ JSValueRef JSFile::moveTo(JSContextRef context,
                validator.toFunction(4, true);
        }
        catch (const BasePlatformException &err) {
-               return JSWebAPIException::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch (...) {
                DeviceAPI::Common::UnknownException err("");
-               return JSWebAPIException::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        }
 
        size_t index = 0;
@@ -819,7 +816,7 @@ JSValueRef JSFile::moveTo(JSContextRef context,
                }
 
                if ((privateObject->getObject()->getNode()->getPermissions() & PERM_WRITE) == 0) {
-                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::PERMISSION_DENIED_ERROR, "Permission denied error");
+                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::PERMISSION_DENIED_ERROR, "Permission denied error");
                }
 
                Converter converter(context);
@@ -833,7 +830,7 @@ JSValueRef JSFile::moveTo(JSContextRef context,
                cbm->setObject(thisObject);
 
                if (NT_DIRECTORY != privateObject->getObject()->getNode()->getType()) {
-                       cbm->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::IO_ERROR, "io error"));
+                       cbm->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::IO_ERROR, "io error"));
                        return JSValueMakeUndefined(context);
                }
 
@@ -860,16 +857,16 @@ JSValueRef JSFile::moveTo(JSContextRef context,
                IManager::getInstance().move(event);
 
        } catch(const WrtDeviceApis::Commons::ConversionException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, ex.GetMessage());
        } catch (const WrtDeviceApis::Commons::UnsupportedException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, ex.GetMessage());
        }       catch(const WrtDeviceApis::Commons::NotFoundException &ex) {
-               cbm->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::NOT_FOUND_ERROR, ex.GetMessage()));
+               cbm->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::NOT_FOUND_ERROR, ex.GetMessage()));
        }
        catch(const WrtDeviceApis::Commons::InvalidArgumentException& ex) {
-               cbm->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::INVALID_VALUES_ERROR, ex.GetMessage()));
+               cbm->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, ex.GetMessage()));
        } catch(const WrtDeviceApis::Commons::Exception& ex) {
-               cbm->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::UNKNOWN_ERROR, ex.GetMessage()));
+               cbm->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::UNKNOWN_ERROR, ex.GetMessage()));
        }
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
        return JSValueMakeUndefined(context);
@@ -885,7 +882,7 @@ JSValueRef JSFile::createDirectory(JSContextRef context,
        TIME_TRACER_ITEM_BEGIN(__FUNCTION__, 0);
        PrivateObject* privateObject = static_cast<PrivateObject*>(JSObjectGetPrivate(thisObject));
        if (!privateObject) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch error");
        }
 
        AceSecurityStatus status = FILESYSTEM_CHECK_ACCESS(FILESYSTEM_FUNCTION_API_CREATE_DIR);
@@ -909,15 +906,15 @@ JSValueRef JSFile::createDirectory(JSContextRef context,
                TIME_TRACER_ITEM_END(__FUNCTION__, 0);
                return WrtDeviceApis::CommonsJavaScript::JSUtils::makeObject(privateObject->getContext(), getClassRef(), privData);
        } catch (const WrtDeviceApis::Commons::PlatformException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::IO_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::IO_ERROR, ex.GetMessage());
        } catch(const WrtDeviceApis::Commons::ConversionException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, ex.GetMessage());
        } catch (const WrtDeviceApis::Commons::UnsupportedException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, ex.GetMessage());
        } catch(const WrtDeviceApis::Commons::InvalidArgumentException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, ex.GetMessage());
        } catch(const WrtDeviceApis::Commons::Exception& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, ex.GetMessage());
        }
 }
 
@@ -931,7 +928,7 @@ JSValueRef JSFile::createFile(JSContextRef context,
        TIME_TRACER_ITEM_BEGIN(__FUNCTION__, 0);
        PrivateObject* privateObject = static_cast<PrivateObject*>(JSObjectGetPrivate(thisObject));
        if (!privateObject) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch error");
        }
 
        AceSecurityStatus status = FILESYSTEM_CHECK_ACCESS(FILESYSTEM_FUNCTION_API_CREATE_FILE);
@@ -957,15 +954,15 @@ JSValueRef JSFile::createFile(JSContextRef context,
                INodePtr node = privateObject->getObject()->getNode()->createChild(path, NT_FILE);
                return JSUtils::makeObject(privateObject->getContext(), getClassRef(), node);*/
        } catch (const WrtDeviceApis::Commons::PlatformException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::IO_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::IO_ERROR, ex.GetMessage());
        } catch(const WrtDeviceApis::Commons::ConversionException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, ex.GetMessage());
        } catch (const WrtDeviceApis::Commons::UnsupportedException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, ex.GetMessage());
        } catch(const WrtDeviceApis::Commons::InvalidArgumentException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, ex.GetMessage());
        } catch(const WrtDeviceApis::Commons::Exception& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, ex.GetMessage());
        }
 
 }
@@ -980,14 +977,14 @@ JSValueRef JSFile::resolve(JSContextRef context,
        TIME_TRACER_ITEM_BEGIN(__FUNCTION__, 0);
        PrivateObject* privateObject = static_cast<PrivateObject*>(JSObjectGetPrivate(thisObject));
        if (!privateObject) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch error");
        }
 
        AceSecurityStatus status = FILESYSTEM_CHECK_ACCESS(FILESYSTEM_FUNCTION_API_RESOLVE);
        TIZEN_SYNC_ACCESS_HANDLER(status, context, exception);
 
        if (privateObject->getObject()->getNode()->getType() != NT_DIRECTORY) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::IO_ERROR, "IO error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::IO_ERROR, "IO error");
        }
 
        Converter converter(context);
@@ -1011,17 +1008,17 @@ JSValueRef JSFile::resolve(JSContextRef context,
                return JSUtils::makeObject(privateObject->getContext(), getClassRef(), node);
                */
        } catch (const WrtDeviceApis::Commons::PlatformException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::IO_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::IO_ERROR, ex.GetMessage());
        } catch(const WrtDeviceApis::Commons::ConversionException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, ex.GetMessage());
        } catch (const WrtDeviceApis::Commons::UnsupportedException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, ex.GetMessage());
        } catch(const WrtDeviceApis::Commons::InvalidArgumentException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, ex.GetMessage());
        } catch(const WrtDeviceApis::Commons::NotFoundException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_FOUND_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_FOUND_ERROR, ex.GetMessage());
        } catch(const WrtDeviceApis::Commons::Exception& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, ex.GetMessage());
        }
 }
 
@@ -1035,14 +1032,14 @@ JSValueRef JSFile::deleteDirectory(JSContextRef context,
        TIME_TRACER_ITEM_BEGIN(__FUNCTION__, 0);
        PrivateObject* privateObject = static_cast<PrivateObject*>(JSObjectGetPrivate(thisObject));
        if (!privateObject) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch error");
        }
        
        AceSecurityStatus status = FILESYSTEM_CHECK_ACCESS(FILESYSTEM_FUNCTION_API_DELETE_DIR);
        TIZEN_SYNC_ACCESS_HANDLER(status, context, exception);
 
        if (argc < 2) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type missmatch error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type missmatch error");
        }
 
        JSContextRef globalContext = privateObject->getContext();
@@ -1056,10 +1053,10 @@ JSValueRef JSFile::deleteDirectory(JSContextRef context,
                validator.toFunction(3, true);
        }
        catch (const BasePlatformException &err) {
-               return JSWebAPIException::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch (...) {
                DeviceAPI::Common::UnknownException err("");
-               return JSWebAPIException::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        }
 
        size_t index = 0;
@@ -1086,11 +1083,11 @@ JSValueRef JSFile::deleteDirectory(JSContextRef context,
                cbm->setObject(thisObject);
 
                if ((privateObject->getObject()->getNode()->getPermissions() & PERM_WRITE) == 0) {
-                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::PERMISSION_DENIED_ERROR, "Permission denied error");
+                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::PERMISSION_DENIED_ERROR, "Permission denied error");
                }
 
                if (privateObject->getObject()->getNode()->getType() != NT_DIRECTORY) {
-                       cbm->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::IO_ERROR, "IO error"));
+                       cbm->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::IO_ERROR, "IO error"));
                        return JSValueMakeUndefined(context);
                }
 
@@ -1099,7 +1096,7 @@ JSValueRef JSFile::deleteDirectory(JSContextRef context,
                bool recursive = converter.toBool(reserveArguments[1]);
 
                if (*privateObject->getObject()->getNode()->getPath() != path->getPath()) {
-                       cbm->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::NOT_FOUND_ERROR, "not found error"));
+                       cbm->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::NOT_FOUND_ERROR, "not found error"));
                        return JSValueMakeUndefined(context);
                }
 
@@ -1132,18 +1129,18 @@ JSValueRef JSFile::deleteDirectory(JSContextRef context,
                        IManager::getInstance().remove(eventRemove);
                }
        } catch (const WrtDeviceApis::Commons::PlatformException& ex) {
-       cbm->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::IO_ERROR, ex.GetMessage()));
+       cbm->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::IO_ERROR, ex.GetMessage()));
 
        } catch(const WrtDeviceApis::Commons::ConversionException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, ex.GetMessage());
        } catch (const WrtDeviceApis::Commons::UnsupportedException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, ex.GetMessage());
        } catch(const WrtDeviceApis::Commons::InvalidArgumentException& ex) {
-               cbm->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::INVALID_VALUES_ERROR, ex.GetMessage()));
+               cbm->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, ex.GetMessage()));
        } catch(const WrtDeviceApis::Commons::NotFoundException& ex) {
-               cbm->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::NOT_FOUND_ERROR, ex.GetMessage()));
+               cbm->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::NOT_FOUND_ERROR, ex.GetMessage()));
        } catch(const WrtDeviceApis::Commons::Exception& ex) {
-               cbm->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::UNKNOWN_ERROR, ex.GetMessage()));
+               cbm->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::UNKNOWN_ERROR, ex.GetMessage()));
        }
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
        return JSValueMakeUndefined(context);
@@ -1162,7 +1159,7 @@ JSValueRef JSFile::deleteFile(JSContextRef context,
        PrivateObject* privateObject = static_cast<PrivateObject*>(JSObjectGetPrivate(thisObject));
 
        if (!privateObject) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch error");
        }
        // argument validation with new validator
        try {
@@ -1171,10 +1168,10 @@ JSValueRef JSFile::deleteFile(JSContextRef context,
                validator.toFunction(2, true);
        }
        catch (const BasePlatformException &err) {
-               return JSWebAPIException::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch (...) {
                DeviceAPI::Common::UnknownException err("");
-               return JSWebAPIException::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        }
 
        JSContextRef globalContext = privateObject->getContext();
@@ -1197,7 +1194,7 @@ JSValueRef JSFile::deleteFile(JSContextRef context,
 
 
                if ((privateObject->getObject()->getNode()->getPermissions() & PERM_WRITE) == 0) {
-                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::PERMISSION_DENIED_ERROR, "Permission denied error");
+                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::PERMISSION_DENIED_ERROR, "Permission denied error");
                }
 
                JSValueRef onSuccess = NULL;
@@ -1211,7 +1208,7 @@ JSValueRef JSFile::deleteFile(JSContextRef context,
                cbm->setObject(thisObject);
 
                if (privateObject->getObject()->getNode()->getType() != NT_DIRECTORY) {
-                       cbm->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::IO_ERROR, "IO error"));
+                       cbm->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::IO_ERROR, "IO error"));
                        return JSValueMakeUndefined(context);
                }
 
@@ -1227,11 +1224,10 @@ JSValueRef JSFile::deleteFile(JSContextRef context,
                                if(eventResolve->getExceptionCode() == WrtDeviceApis::Commons::ExceptionCodes::NotFoundException){
                                        LoggerD("POST IO NOT_FOUND_ERROR");
                                        ThrowMsg(WrtDeviceApis::Commons::NotFoundException, "Not found error");
-                               
                                }
 
                                LoggerD("POST IO ERROR");
-                               cbm->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::IO_ERROR, "IO error"));
+                               cbm->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::IO_ERROR, "IO error"));
                                return JSValueMakeUndefined(context);
                        }
 
@@ -1250,17 +1246,17 @@ JSValueRef JSFile::deleteFile(JSContextRef context,
                }
        } catch (const WrtDeviceApis::Commons::PlatformException& ex) {
                LoggerD("Platform Exception !!!!!!!! post io error");
-               cbm->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::IO_ERROR, ex.GetMessage()));
+               cbm->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::IO_ERROR, ex.GetMessage()));
        } catch(const WrtDeviceApis::Commons::ConversionException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, ex.GetMessage());
        } catch (const WrtDeviceApis::Commons::UnsupportedException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, ex.GetMessage());
        } catch(const WrtDeviceApis::Commons::InvalidArgumentException& ex) {
-               cbm->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::INVALID_VALUES_ERROR, ex.GetMessage()));
+               cbm->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, ex.GetMessage()));
        } catch(const WrtDeviceApis::Commons::NotFoundException& ex) {
-               cbm->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::NOT_FOUND_ERROR, ex.GetMessage()));
+               cbm->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::NOT_FOUND_ERROR, ex.GetMessage()));
        } catch(const WrtDeviceApis::Commons::Exception& ex) {
-               cbm->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::UNKNOWN_ERROR, ex.GetMessage()));
+               cbm->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::UNKNOWN_ERROR, ex.GetMessage()));
        }
 
        LoggerD(">>>");
index 134879e..95e2ad6 100644 (file)
@@ -22,8 +22,7 @@
 
 #include <Commons/Base64.h>
 #include <CommonsJavaScript/JSUtils.h>
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 #include <SecurityExceptions.h>
 #include <TimeTracer.h>
 #include <Export.h>
@@ -118,7 +117,7 @@ JSValueRef JSFilestream::getProperty(JSContextRef context,
 {
        PrivateObject* privateObject = static_cast<PrivateObject*>(JSObjectGetPrivate(object));
        if (!privateObject) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch error");
                
        }
 
@@ -134,8 +133,10 @@ JSValueRef JSFilestream::getProperty(JSContextRef context,
                        }
                        return converter.toJSValueRef(static_cast<unsigned long>(pos));
                } else if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_BYTES_AVAILABLE)) {
-                       unsigned long long bytes = stream->getSize() - stream->getPosition();
-                       return converter.toJSValueRef(static_cast<unsigned long long>(bytes));
+                       long position = stream->getPosition();
+                       long bytes = stream->getSize() - position;
+                       
+                       return converter.toJSValueRefLong(static_cast<long>(bytes));
                }
        } catch (const WrtDeviceApis::Commons::ConversionException& ex) {
                LoggerW("trying to get incorrect value");
@@ -192,7 +193,7 @@ JSValueRef JSFilestream::close(JSContextRef context,
        TIME_TRACER_ITEM_BEGIN(__FUNCTION__, 0);
        PrivateObject* privateObject =  static_cast<PrivateObject*>(JSObjectGetPrivate(thisObject));
        if (!privateObject) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch error");
                
        }
        
@@ -203,7 +204,7 @@ JSValueRef JSFilestream::close(JSContextRef context,
        Try {
                privateObject->getObject()->close();
        } Catch (WrtDeviceApis::Commons::PlatformException) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown error");
        }
 
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
@@ -221,7 +222,7 @@ JSValueRef JSFilestream::read(JSContextRef context,
        TIME_TRACER_ITEM_BEGIN("read(UTF8)", 0);
        PrivateObject* privateObject = static_cast<PrivateObject*>(JSObjectGetPrivate(thisObject));
        if (!privateObject) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch error");
        }
 
        Converter converter(context);
@@ -259,13 +260,13 @@ JSValueRef JSFilestream::read(JSContextRef context,
                        return converter.toJSValueRef(outStr);
                }
        } catch(const WrtDeviceApis::Commons::ConversionException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, ex.GetMessage());
        } catch (const WrtDeviceApis::Commons::UnsupportedException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, ex.GetMessage());
        } catch(const WrtDeviceApis::Commons::InvalidArgumentException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, ex.GetMessage());
        } catch(const WrtDeviceApis::Commons::PlatformException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::IO_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::IO_ERROR, ex.GetMessage());
        }
        
 }
@@ -280,7 +281,7 @@ JSValueRef JSFilestream::readBytes(JSContextRef context,
        TIME_TRACER_ITEM_BEGIN(__FUNCTION__, 0);
        PrivateObject* privateObject = static_cast<PrivateObject*>(JSObjectGetPrivate(thisObject));
        if (!privateObject) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch error");
        }
 
        AceSecurityStatus status = FILESYSTEM_CHECK_ACCESS(FILESYSTEM_FUNCTION_API_READ_BYTES);
@@ -305,13 +306,13 @@ JSValueRef JSFilestream::readBytes(JSContextRef context,
                TIME_TRACER_ITEM_END(__FUNCTION__, 0);
                return converter.toJSValueRef(data.Get(), privateObject->getObject()->getCount());
        } catch(const WrtDeviceApis::Commons::ConversionException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, ex.GetMessage());
        } catch (const WrtDeviceApis::Commons::UnsupportedException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, ex.GetMessage());
        } catch(const WrtDeviceApis::Commons::InvalidArgumentException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, ex.GetMessage());
        } catch(const WrtDeviceApis::Commons::PlatformException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::IO_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::IO_ERROR, ex.GetMessage());
        }
 
 }
@@ -326,7 +327,7 @@ JSValueRef JSFilestream::readBase64(JSContextRef context,
        TIME_TRACER_ITEM_BEGIN(__FUNCTION__, 0);
        PrivateObject* privateObject = static_cast<PrivateObject*>(JSObjectGetPrivate(thisObject));
        if (!privateObject) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch error");
        }
 
        AceSecurityStatus status = FILESYSTEM_CHECK_ACCESS(FILESYSTEM_FUNCTION_API_READ_BASE64);
@@ -351,13 +352,13 @@ JSValueRef JSFilestream::readBase64(JSContextRef context,
                TIME_TRACER_ITEM_END(__FUNCTION__, 0);
                return converter.toJSValueRef(base64);
        } catch(const WrtDeviceApis::Commons::ConversionException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, ex.GetMessage());
        } catch (const WrtDeviceApis::Commons::UnsupportedException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, ex.GetMessage());
        } catch(const WrtDeviceApis::Commons::InvalidArgumentException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, ex.GetMessage());
        } catch(const WrtDeviceApis::Commons::PlatformException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::IO_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::IO_ERROR, ex.GetMessage());
        }
 
 }
@@ -372,7 +373,7 @@ JSValueRef JSFilestream::write(JSContextRef context,
        TIME_TRACER_ITEM_BEGIN(__FUNCTION__, 0);
        PrivateObject* privateObject = static_cast<PrivateObject*>(JSObjectGetPrivate(thisObject));
        if (!privateObject) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch error");
        }
 
        AceSecurityStatus status = FILESYSTEM_CHECK_ACCESS(FILESYSTEM_FUNCTION_API_WRITE);
@@ -390,13 +391,13 @@ JSValueRef JSFilestream::write(JSContextRef context,
 
 
        } catch(const WrtDeviceApis::Commons::ConversionException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, ex.GetMessage());
        } catch (const WrtDeviceApis::Commons::UnsupportedException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, ex.GetMessage());
        } catch(const WrtDeviceApis::Commons::InvalidArgumentException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, ex.GetMessage());
        } catch(const WrtDeviceApis::Commons::PlatformException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::IO_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::IO_ERROR, ex.GetMessage());
        }
 
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
@@ -413,7 +414,7 @@ JSValueRef JSFilestream::writeBytes(JSContextRef context,
        TIME_TRACER_ITEM_BEGIN(__FUNCTION__, 0);
        PrivateObject* privateObject = static_cast<PrivateObject*>(JSObjectGetPrivate(thisObject));
        if (!privateObject) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch error");
        }
 
        AceSecurityStatus status = FILESYSTEM_CHECK_ACCESS(FILESYSTEM_FUNCTION_API_WRITE_BYTES);
@@ -432,13 +433,13 @@ JSValueRef JSFilestream::writeBytes(JSContextRef context,
                        stream->write(*it);
                }
        } catch(const WrtDeviceApis::Commons::ConversionException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, ex.GetMessage());
        } catch (const WrtDeviceApis::Commons::UnsupportedException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, ex.GetMessage());
        } catch(const WrtDeviceApis::Commons::InvalidArgumentException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, ex.GetMessage());
        } catch(const WrtDeviceApis::Commons::PlatformException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::IO_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::IO_ERROR, ex.GetMessage());
        }
 
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
@@ -455,7 +456,7 @@ JSValueRef JSFilestream::writeBase64(JSContextRef context,
        TIME_TRACER_ITEM_BEGIN(__FUNCTION__, 0);
        PrivateObject* privateObject = static_cast<PrivateObject*>(JSObjectGetPrivate(thisObject));
        if (!privateObject) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type mismatch error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type mismatch error");
        }
 
        AceSecurityStatus status = FILESYSTEM_CHECK_ACCESS(FILESYSTEM_FUNCTION_API_WRITE_BASE64);
@@ -474,13 +475,13 @@ JSValueRef JSFilestream::writeBase64(JSContextRef context,
 
                privateObject->getObject()->write(base64);
        } catch(const WrtDeviceApis::Commons::ConversionException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, ex.GetMessage());
        } catch (const WrtDeviceApis::Commons::UnsupportedException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, ex.GetMessage());
        } catch(const WrtDeviceApis::Commons::InvalidArgumentException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, ex.GetMessage());
        } catch(const WrtDeviceApis::Commons::PlatformException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::IO_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::IO_ERROR, ex.GetMessage());
        }
 
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
index 92acfc7..80ed8d9 100644 (file)
 #include <CommonsJavaScript/Utils.h>
 #include <CommonsJavaScript/JSUtils.h>
 #include <CommonsJavaScript/Validator.h>
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h> 
+#include <JSWebAPIErrorFactory.h>
 #include <SecurityExceptions.h>
 #include <Commons/WrtAccess/WrtAccess.h>
 #include <WidgetDB/WidgetDBMgr.h>
 #include <WidgetDB/IWidgetDB.h>
 #include <TimeTracer.h>
 #include <ArgumentValidator.h>
-#include <JSWebAPIError.h>
 #include <JSWebAPIException.h>
 #include <JSUtil.h>
 #include <Export.h>
@@ -179,7 +177,7 @@ JSValueRef JSFilesystemManager::getMaxPathLength(JSContextRef context,
        try {
                return converter->toJSValueRef(IManager::getInstance().getMaxPathLength());
        } catch (const WrtDeviceApis::Commons::ConversionException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::IO_ERROR, "IO error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::IO_ERROR, "IO error");
        }
 }
 
@@ -207,14 +205,14 @@ JSValueRef JSFilesystemManager::getStorage(JSContextRef context,
                validator.toFunction(2, true);  
        }
        catch (const BasePlatformException &err) {
-               return JSWebAPIException::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch (...) {
                DeviceAPI::Common::UnknownException err("");
-               return JSWebAPIException::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        }
 
        if (argc < 2) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type missmatch error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type missmatch error");
        }
 
 
@@ -245,13 +243,13 @@ JSValueRef JSFilesystemManager::getStorage(JSContextRef context,
                IManager::getInstance().getStorage(event);
 
        } catch(const WrtDeviceApis::Commons::ConversionException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, ex.GetMessage());
        } catch (const WrtDeviceApis::Commons::UnsupportedException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, ex.GetMessage());
        } catch(const WrtDeviceApis::Commons::InvalidArgumentException& ex) {
-               cbm->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::INVALID_VALUES_ERROR, ex.GetMessage()));
+               cbm->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, ex.GetMessage()));
        } catch(const WrtDeviceApis::Commons::Exception& ex) {
-               cbm->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::UNKNOWN_ERROR, ex.GetMessage()));
+               cbm->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::UNKNOWN_ERROR, ex.GetMessage()));
        }
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
        return JSValueMakeUndefined(context);
@@ -280,14 +278,14 @@ JSValueRef JSFilesystemManager::getStorageList(JSContextRef context,
                validator.toFunction(1, true);  
        }
        catch (const BasePlatformException &err) {
-               return JSWebAPIException::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch (...) {
                DeviceAPI::Common::UnknownException err("");
-               return JSWebAPIException::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        }
 
        if (argc < 1) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type missmatch error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type missmatch error");
        }
 
        
@@ -317,13 +315,13 @@ JSValueRef JSFilesystemManager::getStorageList(JSContextRef context,
                IManager::getInstance().listStorages(event);
 
        } catch(const WrtDeviceApis::Commons::ConversionException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, ex.GetMessage());
        } catch (const WrtDeviceApis::Commons::UnsupportedException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, ex.GetMessage());
        } catch(const WrtDeviceApis::Commons::InvalidArgumentException& ex) {
-               cbm->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::INVALID_VALUES_ERROR, ex.GetMessage()));
+               cbm->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, ex.GetMessage()));
        } catch(const WrtDeviceApis::Commons::Exception& ex) {
-               cbm->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::UNKNOWN_ERROR, ex.GetMessage()));
+               cbm->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::UNKNOWN_ERROR, ex.GetMessage()));
        }
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
        return JSValueMakeUndefined(context);
@@ -354,15 +352,15 @@ JSValueRef JSFilesystemManager::addStorageStateListener(JSContextRef context,
        }
        catch (const BasePlatformException &err) {
                LogDebug("Exception");
-               return JSWebAPIException::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch (...) {
                DeviceAPI::Common::UnknownException err("");
-               return JSWebAPIException::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        }
        
 
        if (argc < 1) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "TYPE_MISMATCH_ERROR");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "TYPE_MISMATCH_ERROR");
        }
 
 
@@ -391,13 +389,13 @@ JSValueRef JSFilesystemManager::addStorageStateListener(JSContextRef context,
 
                return converter->toJSValueRefLong(id);
        } catch(const WrtDeviceApis::Commons::ConversionException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, ex.GetMessage());
        } catch (const WrtDeviceApis::Commons::UnsupportedException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, ex.GetMessage());
        } catch(const WrtDeviceApis::Commons::InvalidArgumentException& ex) {
-               cbm->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::INVALID_VALUES_ERROR, ex.GetMessage()));
+               cbm->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, ex.GetMessage()));
        } catch(const WrtDeviceApis::Commons::Exception& ex) {
-               cbm->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::UNKNOWN_ERROR, ex.GetMessage()));
+               cbm->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::UNKNOWN_ERROR, ex.GetMessage()));
        }
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
        return JSValueMakeUndefined(context);
@@ -427,14 +425,14 @@ JSValueRef JSFilesystemManager::removeStorageStateListener(JSContextRef context,
                validator.toLong(0, false);
        }
        catch (const BasePlatformException &err) {
-               return JSWebAPIException::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch (...) {
                DeviceAPI::Common::UnknownException err("");
-               return JSWebAPIException::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        }
 
        if (argc < 1) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type missmatch error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type missmatch error");
        }
 
 
@@ -457,15 +455,15 @@ JSValueRef JSFilesystemManager::removeStorageStateListener(JSContextRef context,
 
                }
        } catch(const WrtDeviceApis::Commons::ConversionException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, ex.GetMessage());
        } catch (const WrtDeviceApis::Commons::UnsupportedException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, ex.GetMessage());
        } catch (const WrtDeviceApis::Commons::NotFoundException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_FOUND_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_FOUND_ERROR, ex.GetMessage());
        } catch(const WrtDeviceApis::Commons::InvalidArgumentException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, ex.GetMessage());
        } catch(const WrtDeviceApis::Commons::Exception& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, ex.GetMessage());
        }
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
        return JSValueMakeUndefined(context);
@@ -500,14 +498,14 @@ JSValueRef JSFilesystemManager::resolve(JSContextRef context,
                validator.toString(3, true);
        }
        catch (const BasePlatformException &err) {
-               return JSWebAPIException::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        } catch (...) {
                DeviceAPI::Common::UnknownException err("");
-               return JSWebAPIException::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        }
        
        if (argc < 2) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type missmatch error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type missmatch error");
        }
 
        LogDebug("resolve");
@@ -552,14 +550,14 @@ JSValueRef JSFilesystemManager::resolve(JSContextRef context,
                        std::string perms = converter->toString(reserveArguments[3]);
                        LoggerD("perms:[" << perms << "]");
                        if (("r" != perms) && ("rw" != perms) && ("w" != perms) && ("a" != perms)) {
-                               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Invalid permission");
+                               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Invalid permission");
                        } else if ("r" == perms) {
                                permissions = PERM_READ;
                        }
                }
 
                if (permissions & PERM_WRITE && virtualPath == "wgt-package") {
-                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::PERMISSION_DENIED_ERROR, "permission denied");
+                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::PERMISSION_DENIED_ERROR, "permission denied");
                }
 
                PermissionsAccessInfo perms(permissions, virtualPath);
@@ -578,15 +576,15 @@ JSValueRef JSFilesystemManager::resolve(JSContextRef context,
                IManager::getInstance().getNode(event);
                
        } catch(const WrtDeviceApis::Commons::ConversionException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, ex.GetMessage());
        } catch(const WrtDeviceApis::Commons::NotFoundException& ex) {
-               cbm->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::NOT_FOUND_ERROR, ex.GetMessage()));
+               cbm->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::NOT_FOUND_ERROR, ex.GetMessage()));
        } catch (const WrtDeviceApis::Commons::UnsupportedException& ex) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR, ex.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, ex.GetMessage());
        } catch(const WrtDeviceApis::Commons::InvalidArgumentException& ex) {
-               cbm->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::INVALID_VALUES_ERROR, ex.GetMessage()));
+               cbm->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, ex.GetMessage()));
        } catch(const WrtDeviceApis::Commons::Exception& ex) {
-               cbm->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::UNKNOWN_ERROR, ex.GetMessage()));
+               cbm->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::UNKNOWN_ERROR, ex.GetMessage()));
        }
 
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
index b31d12b..c66ae28 100755 (executable)
@@ -17,7 +17,6 @@
 
 #include "PathUtils.h"
 #include <Logger.h>
-
 namespace DeviceAPI {
 namespace Filesystem {
 namespace PathUtils {
index e8f9f23..e41fd70 100644 (file)
@@ -22,8 +22,7 @@
 #include <Commons/Exception.h>
 #include <Commons/IEvent.h>
 #include <CommonsJavaScript/JSUtils.h>
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h> 
+#include <JSWebAPIErrorFactory.h>
 #include "JSFile.h"
 #include "JSFilestream.h"
 #include "EventGetNodeData.h"
@@ -77,9 +76,9 @@ void ResponseDispatcher::OnAnswerReceived(const EventResolvePtr& event)
        }  else {
                JSObjectRef jsException;
                if (event->getExceptionCode() == WrtDeviceApis::Commons::ExceptionCodes::NotFoundException) {
-                       jsException = JSTizenExceptionFactory::makeErrorObject(data->getCallbackManager()->getContext(), JSTizenException::NOT_FOUND_ERROR, "NotFoundError");
+                       jsException = JSWebAPIErrorFactory::makeErrorObject(data->getCallbackManager()->getContext(), JSWebAPIErrorFactory::NOT_FOUND_ERROR, "NotFoundError");
                } else {
-                       jsException = JSTizenExceptionFactory::makeErrorObject(data->getCallbackManager()->getContext(), JSTizenException::UNKNOWN_ERROR, "Unknown error");
+                       jsException = JSWebAPIErrorFactory::makeErrorObject(data->getCallbackManager()->getContext(), JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown error");
                }
                data->getCallbackManager()->callOnError(jsException);
        }
@@ -104,14 +103,14 @@ void ResponseDispatcher::OnAnswerReceived(const EventListNodesPtr& event)
                        data->callOnSuccess(result);
                }
                Catch(WrtDeviceApis::Commons::ConversionException) {
-                       data->callOnError(JSTizenExceptionFactory::makeErrorObject(data->getContext(), JSTizenException::IO_ERROR, "IO error"));
+                       data->callOnError(JSWebAPIErrorFactory::makeErrorObject(data->getContext(), JSWebAPIErrorFactory::IO_ERROR, "IO error"));
                }
        } else {
                JSObjectRef jsException = NULL;
                if (event->getExceptionCode() == WrtDeviceApis::Commons::ExceptionCodes::SecurityException) {
-                       jsException = JSTizenExceptionFactory::makeErrorObject(data->getContext(), JSTizenException::PERMISSION_DENIED_ERROR, "Permission denied error");
+                       jsException = JSWebAPIErrorFactory::makeErrorObject(data->getContext(), JSWebAPIErrorFactory::PERMISSION_DENIED_ERROR, "Permission denied error");
                } else {
-                       jsException = JSTizenExceptionFactory::makeErrorObject(data->getContext(), JSTizenException::IO_ERROR, "IO error");
+                       jsException = JSWebAPIErrorFactory::makeErrorObject(data->getContext(), JSWebAPIErrorFactory::IO_ERROR, "IO error");
                }
                data->callOnError(jsException);
        }
@@ -133,10 +132,10 @@ void ResponseDispatcher::OnAnswerReceived(const EventOpenPtr& event)
                JSObjectRef jsException;
 
                if (event->getExceptionCode() == WrtDeviceApis::Commons::ExceptionCodes::NotFoundException) {
-                       jsException = JSTizenExceptionFactory::makeErrorObject(data->getContext(), JSTizenException::NOT_FOUND_ERROR, "NotFoundError");
+                       jsException = JSWebAPIErrorFactory::makeErrorObject(data->getContext(), JSWebAPIErrorFactory::NOT_FOUND_ERROR, "NotFoundError");
                }
                else {
-                       jsException = JSTizenExceptionFactory::makeErrorObject(data->getContext(), JSTizenException::IO_ERROR, "IO error");
+                       jsException = JSWebAPIErrorFactory::makeErrorObject(data->getContext(), JSWebAPIErrorFactory::IO_ERROR, "IO error");
                }
                data->callOnError(jsException);
        }
@@ -161,13 +160,13 @@ void ResponseDispatcher::OnAnswerReceived(const EventCopyPtr& event)
        } else {
                JSObjectRef jsException = NULL;
                if (event->getExceptionCode() == WrtDeviceApis::Commons::ExceptionCodes::SecurityException) {
-                       jsException = JSTizenExceptionFactory::makeErrorObject(data->getContext(), JSTizenException::PERMISSION_DENIED_ERROR, "Permission denied error");
+                       jsException = JSWebAPIErrorFactory::makeErrorObject(data->getContext(), JSWebAPIErrorFactory::PERMISSION_DENIED_ERROR, "Permission denied error");
                } 
                else if (event->getExceptionCode() == WrtDeviceApis::Commons::ExceptionCodes::NotFoundException) {
-                       jsException = JSTizenExceptionFactory::makeErrorObject(data->getContext(), JSTizenException::NOT_FOUND_ERROR, "NotFoundError");
+                       jsException = JSWebAPIErrorFactory::makeErrorObject(data->getContext(), JSWebAPIErrorFactory::NOT_FOUND_ERROR, "NotFoundError");
                }
                else {
-                       jsException = JSTizenExceptionFactory::makeErrorObject(data->getContext(), JSTizenException::IO_ERROR, "IO error");
+                       jsException = JSWebAPIErrorFactory::makeErrorObject(data->getContext(), JSWebAPIErrorFactory::IO_ERROR, "IO error");
                }
                data->callOnError(jsException);
        }
@@ -193,13 +192,13 @@ void ResponseDispatcher::OnAnswerReceived(const EventMovePtr& event)
        } else {
                JSObjectRef jsException = NULL;
                if (event->getExceptionCode() == WrtDeviceApis::Commons::ExceptionCodes::SecurityException) {
-                       jsException = JSTizenExceptionFactory::makeErrorObject(data->getContext(), JSTizenException::PERMISSION_DENIED_ERROR, "Permission denied error");
+                       jsException = JSWebAPIErrorFactory::makeErrorObject(data->getContext(), JSWebAPIErrorFactory::PERMISSION_DENIED_ERROR, "Permission denied error");
                } 
                else if (event->getExceptionCode() == WrtDeviceApis::Commons::ExceptionCodes::NotFoundException) {
-                       jsException = JSTizenExceptionFactory::makeErrorObject(data->getContext(), JSTizenException::NOT_FOUND_ERROR, "NotFoundError");
+                       jsException = JSWebAPIErrorFactory::makeErrorObject(data->getContext(), JSWebAPIErrorFactory::NOT_FOUND_ERROR, "NotFoundError");
                }
                else {
-                       jsException = JSTizenExceptionFactory::makeErrorObject(data->getContext(), JSTizenException::IO_ERROR, "IO error");
+                       jsException = JSWebAPIErrorFactory::makeErrorObject(data->getContext(), JSWebAPIErrorFactory::IO_ERROR, "IO error");
                }
                data->callOnError(jsException);
        }
@@ -219,13 +218,13 @@ void ResponseDispatcher::OnAnswerReceived(const EventRemovePtr& event)
        } else {
                JSObjectRef jsException = NULL;
                if (event->getExceptionCode() ==WrtDeviceApis::Commons::ExceptionCodes::SecurityException) {
-                       jsException = JSTizenExceptionFactory::makeErrorObject(data->getContext(), JSTizenException::PERMISSION_DENIED_ERROR, "Permission denied error");
+                       jsException = JSWebAPIErrorFactory::makeErrorObject(data->getContext(), JSWebAPIErrorFactory::PERMISSION_DENIED_ERROR, "Permission denied error");
                } 
                else if (event->getExceptionCode() == WrtDeviceApis::Commons::ExceptionCodes::NotFoundException) {
-                       jsException = JSTizenExceptionFactory::makeErrorObject(data->getContext(), JSTizenException::NOT_FOUND_ERROR, "NotFoundError");
+                       jsException = JSWebAPIErrorFactory::makeErrorObject(data->getContext(), JSWebAPIErrorFactory::NOT_FOUND_ERROR, "NotFoundError");
                }
                else {
-                       jsException = JSTizenExceptionFactory::makeErrorObject(data->getContext(), JSTizenException::IO_ERROR, "IO error");
+                       jsException = JSWebAPIErrorFactory::makeErrorObject(data->getContext(), JSWebAPIErrorFactory::IO_ERROR, "IO error");
                }
                data->callOnError(jsException);
        }
@@ -261,19 +260,19 @@ void ResponseDispatcher::OnAnswerReceived(const EventReadTextPtr& event)
                        }
                }
                Catch(WrtDeviceApis::Commons::ConversionException) {
-                       data->callOnError(JSTizenExceptionFactory::makeErrorObject(
-                       data->getContext(), JSTizenException::IO_ERROR, "IO error"));
+                       data->callOnError(JSWebAPIErrorFactory::makeErrorObject(
+                       data->getContext(), JSWebAPIErrorFactory::IO_ERROR, "IO error"));
                }
        }  else {
                JSObjectRef jsException = NULL;
                if (event->getExceptionCode() == WrtDeviceApis::Commons::ExceptionCodes::SecurityException) {
-                       jsException = JSTizenExceptionFactory::makeErrorObject(data->getContext(), JSTizenException::PERMISSION_DENIED_ERROR, "Permission denied error");
+                       jsException = JSWebAPIErrorFactory::makeErrorObject(data->getContext(), JSWebAPIErrorFactory::PERMISSION_DENIED_ERROR, "Permission denied error");
                } 
                else if (event->getExceptionCode() == WrtDeviceApis::Commons::ExceptionCodes::NotFoundException) {
-                       jsException = JSTizenExceptionFactory::makeErrorObject(data->getContext(), JSTizenException::NOT_FOUND_ERROR, "NotFoundError");
+                       jsException = JSWebAPIErrorFactory::makeErrorObject(data->getContext(), JSWebAPIErrorFactory::NOT_FOUND_ERROR, "NotFoundError");
                }
                else {
-                       jsException = JSTizenExceptionFactory::makeErrorObject(data->getContext(), JSTizenException::IO_ERROR, "IO error");
+                       jsException = JSWebAPIErrorFactory::makeErrorObject(data->getContext(), JSWebAPIErrorFactory::IO_ERROR, "IO error");
                }
                data->callOnError(jsException);
        }
@@ -292,18 +291,18 @@ void ResponseDispatcher::OnAnswerReceived(const EventGetStoragePtr& event)
                        JSValueRef result = converter.toJSValueRef(event->getResult(), data->getContext());
                        data->callOnSuccess(result);
                } Catch (WrtDeviceApis::Commons::ConversionException) {
-                       data->callOnError(JSTizenExceptionFactory::makeErrorObject(data->getContext(), JSTizenException::IO_ERROR, "IO error"));
+                       data->callOnError(JSWebAPIErrorFactory::makeErrorObject(data->getContext(), JSWebAPIErrorFactory::IO_ERROR, "IO error"));
                }
        } else {
                JSObjectRef jsException = NULL;
                if (event->getExceptionCode() == WrtDeviceApis::Commons::ExceptionCodes::SecurityException) {
-                       jsException = JSTizenExceptionFactory::makeErrorObject(data->getContext(), JSTizenException::PERMISSION_DENIED_ERROR, "Permission denied error");
+                       jsException = JSWebAPIErrorFactory::makeErrorObject(data->getContext(), JSWebAPIErrorFactory::PERMISSION_DENIED_ERROR, "Permission denied error");
                } 
                else if (event->getExceptionCode() == WrtDeviceApis::Commons::ExceptionCodes::NotFoundException) {
-                       jsException = JSTizenExceptionFactory::makeErrorObject(data->getContext(), JSTizenException::NOT_FOUND_ERROR, "Not found error");                       
+                       jsException = JSWebAPIErrorFactory::makeErrorObject(data->getContext(), JSWebAPIErrorFactory::NOT_FOUND_ERROR, "Not found error");                      
                }
                else {
-                       jsException = JSTizenExceptionFactory::makeErrorObject(data->getContext(), JSTizenException::IO_ERROR, "IO error");
+                       jsException = JSWebAPIErrorFactory::makeErrorObject(data->getContext(), JSWebAPIErrorFactory::IO_ERROR, "IO error");
                }
                data->callOnError(jsException);
        }
@@ -322,14 +321,14 @@ void ResponseDispatcher::OnAnswerReceived(const EventListStoragesPtr& event)
                        JSValueRef result = converter.toJSValueRef(event->getResult(), data->getContext());
                        data->callOnSuccess(result);
                } Catch (WrtDeviceApis::Commons::ConversionException) {
-                       data->callOnError(JSTizenExceptionFactory::makeErrorObject(data->getContext(), JSTizenException::IO_ERROR, "IO error"));
+                       data->callOnError(JSWebAPIErrorFactory::makeErrorObject(data->getContext(), JSWebAPIErrorFactory::IO_ERROR, "IO error"));
                }
        } else {
                JSObjectRef jsException = NULL;
                if (event->getExceptionCode() == WrtDeviceApis::Commons::ExceptionCodes::SecurityException) {
-                       jsException = JSTizenExceptionFactory::makeErrorObject(data->getContext(), JSTizenException::PERMISSION_DENIED_ERROR, "Permission denied error");
+                       jsException = JSWebAPIErrorFactory::makeErrorObject(data->getContext(), JSWebAPIErrorFactory::PERMISSION_DENIED_ERROR, "Permission denied error");
                } else {
-                       jsException = JSTizenExceptionFactory::makeErrorObject(data->getContext(), JSTizenException::IO_ERROR, "IO error");
+                       jsException = JSWebAPIErrorFactory::makeErrorObject(data->getContext(), JSWebAPIErrorFactory::IO_ERROR, "IO error");
                }
                data->callOnError(jsException);
        }
index 6003438..c0e9af7 100644 (file)
@@ -243,12 +243,6 @@ unsigned long long Stream::getSize() const
     if (!m_stream.seekg(0, std::_S_end)) {
         return 0;
     }
-
-       pos = m_stream.tellg();
-
-       if (pos == -1) {
-               return 0;
-       }
        
     unsigned long long result = m_stream.tellg();
     m_stream.seekg(pos, std::_S_beg);
index 4d438af..2223403 100644 (file)
@@ -27,8 +27,8 @@
 #include <CommonsJavaScript/Converter.h>
 #include <CommonsJavaScript/JSCallbackManager.h>
 #include <CommonsJavaScript/JSUtils.h>
-#include <JSWebAPIException.h>
 #include <ArgumentValidator.h>
+#include <JSWebAPIErrorFactory.h>
 #include <TimeTracer.h>
 #include "EventLocalMessagePortAddMessagePortListener.h"
 #include "EventLocalMessagePortRemoveMessagePortListener.h"
@@ -206,7 +206,7 @@ JSValueRef JSLocalMessagePort::addMessagePortListener(JSContextRef context,
        catch(BasePlatformException &e)
        {
                LoggerE("No private object");
-               return JSWebAPIException::throwException(context, exception, e);
+               return JSWebAPIErrorFactory::postException(context, exception, e);
        }
 
        JSValueRef listener = NULL;
@@ -219,7 +219,7 @@ JSValueRef JSLocalMessagePort::addMessagePortListener(JSContextRef context,
        }
        catch(BasePlatformException &e)
        {
-               return JSWebAPIException::throwException(context, exception, e);
+               return JSWebAPIErrorFactory::postException(context, exception, e);
        }
 
        JSCallbackManagerPtr callbackManager = JSCallbackManager::createObject(gContext);
@@ -243,7 +243,7 @@ JSValueRef JSLocalMessagePort::addMessagePortListener(JSContextRef context,
        Catch(Exception)
        {
                LoggerE("Error on platform : " << _rethrown_exception.GetMessage());
-               return JSWebAPIException::throwException(context, exception,
+               return JSWebAPIErrorFactory::postException(context, exception,
                                UnknownException("Plugin's internal error"));
        }
 
@@ -252,15 +252,15 @@ JSValueRef JSLocalMessagePort::addMessagePortListener(JSContextRef context,
                switch (dplEvent->getExceptionCode())
                {
                case ExceptionCodes::InvalidArgumentException:
-                       return JSWebAPIException::throwException(context, exception,
+                       return JSWebAPIErrorFactory::postException(context, exception,
                                        UnknownException("Plugin's internal error."));
                        break;
                case ExceptionCodes::PlatformException:
-                       return JSWebAPIException::throwException(context, exception,
+                       return JSWebAPIErrorFactory::postException(context, exception,
                                        UnknownException("The method cannot proceed due to a severe system error."));
                        break;
                default:
-                       return JSWebAPIException::throwException(context, exception,
+                       return JSWebAPIErrorFactory::postException(context, exception,
                                        UnknownException("Internal error"));
                        break;
                }
@@ -280,7 +280,7 @@ JSValueRef JSLocalMessagePort::addMessagePortListener(JSContextRef context,
        catch(BasePlatformException &e)
        {
                LoggerE("Error on conversion : " << e.getMessage());
-               return JSWebAPIException::throwException(context, exception,
+               return JSWebAPIErrorFactory::postException(context, exception,
                                UnknownException("Internal error"));
        }
 
@@ -313,7 +313,7 @@ JSValueRef JSLocalMessagePort::removeMessagePortListener(JSContextRef context,
        catch(BasePlatformException &e)
        {
                LoggerE("No private object");
-               return JSWebAPIException::throwException(context, exception, e);
+               return JSWebAPIErrorFactory::postException(context, exception, e);
        }
 
        long watchId = 0;
@@ -326,7 +326,7 @@ JSValueRef JSLocalMessagePort::removeMessagePortListener(JSContextRef context,
        }
        catch(BasePlatformException &e)
        {
-               return JSWebAPIException::throwException(context, exception, e);
+               return JSWebAPIErrorFactory::postException(context, exception, e);
        }
 
        EventLocalMessagePortRemoveMessagePortListenerPtr dplEvent(new EventLocalMessagePortRemoveMessagePortListener());
@@ -341,7 +341,7 @@ JSValueRef JSLocalMessagePort::removeMessagePortListener(JSContextRef context,
        Catch(Exception)
        {
                LoggerE("Error on platform : " << _rethrown_exception.GetMessage());
-               return JSWebAPIException::throwException(context, exception,
+               return JSWebAPIErrorFactory::postException(context, exception,
                                UnknownException("Internal error"));
        }
 
@@ -356,20 +356,20 @@ JSValueRef JSLocalMessagePort::removeMessagePortListener(JSContextRef context,
                switch (dplEvent->getExceptionCode())
                {
                case ExceptionCodes::InvalidArgumentException:
-                       return JSWebAPIException::throwException(context, exception,
+                       return JSWebAPIErrorFactory::postException(context, exception,
                                        InvalidValuesException(oss.str().c_str()));
                        break;
                case ExceptionCodes::NotFoundException:
                        oss << "No watchId (" << watchId << ") has been registered.";
-                       return JSWebAPIException::throwException(context, exception,
+                       return JSWebAPIErrorFactory::postException(context, exception,
                                        NotFoundException(oss.str().c_str()));
                        break;
                case ExceptionCodes::PlatformException:
-                       return JSWebAPIException::throwException(context, exception,
+                       return JSWebAPIErrorFactory::postException(context, exception,
                                        UnknownException("The method cannot proceed due to a severe system error."));
                        break;
                default:
-                       return JSWebAPIException::throwException(context, exception,
+                       return JSWebAPIErrorFactory::postException(context, exception,
                                        UnknownException("Internal error."));
                        break;
                }
index 3301de8..a13ec0d 100644 (file)
@@ -25,8 +25,8 @@
 #include "JSMessagePortManager.h"
 #include <dpl/shared_ptr.h>
 #include <CommonsJavaScript/Validator.h>
-#include <JSWebAPIException.h>
 #include <ArgumentValidator.h>
+#include <JSWebAPIErrorFactory.h>
 #include <TimeTracer.h>
 #include "IMessagePortManager.h"
 #include "MessagePortFactory.h"
@@ -143,7 +143,7 @@ JSValueRef JSMessagePortManager::requestLocalMessagePort(JSContextRef context,
        catch(BasePlatformException &e)
        {
                LoggerE("No private object");
-               return JSWebAPIException::throwException(context, exception, e);
+               return JSWebAPIErrorFactory::postException(context, exception, e);
        }
 
        string localMessagePortName;
@@ -156,12 +156,12 @@ JSValueRef JSMessagePortManager::requestLocalMessagePort(JSContextRef context,
        }
        catch(BasePlatformException &e)
        {
-               return JSWebAPIException::throwException(context, exception, e);
+               return JSWebAPIErrorFactory::postException(context, exception, e);
        }
 
        if(localMessagePortName.empty())
        {
-               return JSWebAPIException::throwException(context, exception,
+               return JSWebAPIErrorFactory::postException(context, exception,
                                InvalidValuesException("Local message port name is empty"));
        }
 
@@ -178,7 +178,7 @@ JSValueRef JSMessagePortManager::requestLocalMessagePort(JSContextRef context,
        Catch(Exception)
        {
                LoggerE("Error on platform : " << _rethrown_exception.GetMessage());
-               return JSWebAPIException::throwException(context, exception,
+               return JSWebAPIErrorFactory::postException(context, exception,
                                UnknownException("Plugin's internal error"));
        }
 
@@ -189,15 +189,15 @@ JSValueRef JSMessagePortManager::requestLocalMessagePort(JSContextRef context,
                {
                case ExceptionCodes::InvalidArgumentException:
                        oss << "Invalid local message port name ('" << localMessagePortName << "')";
-                       return JSWebAPIException::throwException(context, exception,
+                       return JSWebAPIErrorFactory::postException(context, exception,
                                        InvalidValuesException(oss.str().c_str()));
                        break;
                case ExceptionCodes::PlatformException:
-                       return JSWebAPIException::throwException(context, exception,
+                       return JSWebAPIErrorFactory::postException(context, exception,
                                        UnknownException("The method cannot proceed due to a severe system error."));
                        break;
                default:
-                       return JSWebAPIException::throwException(context, exception,
+                       return JSWebAPIErrorFactory::postException(context, exception,
                                        UnknownException("Internal error"));
                        break;
                }
@@ -213,7 +213,7 @@ JSValueRef JSMessagePortManager::requestLocalMessagePort(JSContextRef context,
        catch(BasePlatformException &e)
        {
                LoggerE("Error on conversion : " << e.getMessage());
-               return JSWebAPIException::throwException(context, exception,
+               return JSWebAPIErrorFactory::postException(context, exception,
                                UnknownException("Internal error"));
        }
 
@@ -246,7 +246,7 @@ JSValueRef JSMessagePortManager::requestTrustedLocalMessagePort(JSContextRef con
        catch(BasePlatformException &e)
        {
                LoggerE("No private object");
-               return JSWebAPIException::throwException(context, exception, e);
+               return JSWebAPIErrorFactory::postException(context, exception, e);
        }
 
        string localMessagePortName;
@@ -259,12 +259,12 @@ JSValueRef JSMessagePortManager::requestTrustedLocalMessagePort(JSContextRef con
        }
        catch(BasePlatformException &e)
        {
-               return JSWebAPIException::throwException(context, exception, e);
+               return JSWebAPIErrorFactory::postException(context, exception, e);
        }
 
        if(localMessagePortName.empty())
        {
-               return JSWebAPIException::throwException(context, exception,
+               return JSWebAPIErrorFactory::postException(context, exception,
                                InvalidValuesException("Local message port name is empty"));
        }
 
@@ -281,7 +281,7 @@ JSValueRef JSMessagePortManager::requestTrustedLocalMessagePort(JSContextRef con
        Catch(Exception)
        {
                LoggerE("Error on platform : " << _rethrown_exception.GetMessage());
-               return JSWebAPIException::throwException(context, exception,
+               return JSWebAPIErrorFactory::postException(context, exception,
                                UnknownException("Plugin's internal error"));
        }
 
@@ -292,15 +292,15 @@ JSValueRef JSMessagePortManager::requestTrustedLocalMessagePort(JSContextRef con
                {
                case ExceptionCodes::InvalidArgumentException:
                        oss << "Invalid local message port name ('" << localMessagePortName << "')";
-                       return JSWebAPIException::throwException(context, exception,
+                       return JSWebAPIErrorFactory::postException(context, exception,
                                        InvalidValuesException(oss.str().c_str()));
                        break;
                case ExceptionCodes::PlatformException:
-                       return JSWebAPIException::throwException(context, exception,
+                       return JSWebAPIErrorFactory::postException(context, exception,
                                        UnknownException("The method cannot proceed due to a severe system error."));
                        break;
                default:
-                       return JSWebAPIException::throwException(context, exception,
+                       return JSWebAPIErrorFactory::postException(context, exception,
                                        UnknownException("Internal error"));
                        break;
                }
@@ -316,7 +316,7 @@ JSValueRef JSMessagePortManager::requestTrustedLocalMessagePort(JSContextRef con
        catch(BasePlatformException &e)
        {
                LoggerE("Error on conversion : " << e.getMessage());
-               return JSWebAPIException::throwException(context, exception,
+               return JSWebAPIErrorFactory::postException(context, exception,
                                UnknownException("Internal error"));
        }
 
@@ -349,7 +349,7 @@ JSValueRef JSMessagePortManager::requestRemoteMessagePort(JSContextRef context,
        catch(BasePlatformException &e)
        {
                LoggerE("No private object");
-               return JSWebAPIException::throwException(context, exception, e);
+               return JSWebAPIErrorFactory::postException(context, exception, e);
        }
 
        string appId;
@@ -364,19 +364,19 @@ JSValueRef JSMessagePortManager::requestRemoteMessagePort(JSContextRef context,
        }
        catch(BasePlatformException &e)
        {
-               return JSWebAPIException::throwException(context, exception, e);
+               return JSWebAPIErrorFactory::postException(context, exception, e);
        }
 
 
        if(appId.empty())
        {
-               return JSWebAPIException::throwException(context, exception,
+               return JSWebAPIErrorFactory::postException(context, exception,
                                InvalidValuesException("Application id is empty"));
        }
 
        if(remoteMessagePortName.empty())
        {
-               return JSWebAPIException::throwException(context, exception,
+               return JSWebAPIErrorFactory::postException(context, exception,
                                InvalidValuesException("Remote message port name is empty"));
        }
 
@@ -394,7 +394,7 @@ JSValueRef JSMessagePortManager::requestRemoteMessagePort(JSContextRef context,
        Catch(Exception)
        {
                LoggerE("Error on platform : " << _rethrown_exception.GetMessage());
-               return JSWebAPIException::throwException(context, exception,
+               return JSWebAPIErrorFactory::postException(context, exception,
                                UnknownException("Plugin's internal error"));
        }
 
@@ -405,20 +405,20 @@ JSValueRef JSMessagePortManager::requestRemoteMessagePort(JSContextRef context,
                {
                case ExceptionCodes::InvalidArgumentException:
                        oss << "Invalid values for appId '" << appId << "' or port name '" << remoteMessagePortName << "'";
-                       return JSWebAPIException::throwException(context, exception,
+                       return JSWebAPIErrorFactory::postException(context, exception,
                                        InvalidValuesException(oss.str().c_str()));
                        break;
                case ExceptionCodes::NotFoundException:
                        oss << "No port name '" << remoteMessagePortName << "' on app '" << appId << "'";
-                       return JSWebAPIException::throwException(context, exception,
+                       return JSWebAPIErrorFactory::postException(context, exception,
                                        NotFoundException(oss.str().c_str()));
                        break;
                case ExceptionCodes::PlatformException:
-                       return JSWebAPIException::throwException(context, exception,
+                       return JSWebAPIErrorFactory::postException(context, exception,
                                        UnknownException("The method cannot proceed due to a severe system error."));
                        break;
                default:
-                       return JSWebAPIException::throwException(context, exception,
+                       return JSWebAPIErrorFactory::postException(context, exception,
                                        UnknownException("Internal error"));
                        break;
                }
@@ -434,7 +434,7 @@ JSValueRef JSMessagePortManager::requestRemoteMessagePort(JSContextRef context,
        catch(BasePlatformException &e)
        {
                LoggerE("Error on conversion : " << e.getMessage());
-               return JSWebAPIException::throwException(context, exception,
+               return JSWebAPIErrorFactory::postException(context, exception,
                                UnknownException("Internal error"));
        }
 
@@ -467,7 +467,7 @@ JSValueRef JSMessagePortManager::requestTrustedRemoteMessagePort(JSContextRef co
        catch(BasePlatformException &e)
        {
                LoggerE("No private object");
-               return JSWebAPIException::throwException(context, exception, e);
+               return JSWebAPIErrorFactory::postException(context, exception, e);
        }
 
        string appId;
@@ -482,19 +482,19 @@ JSValueRef JSMessagePortManager::requestTrustedRemoteMessagePort(JSContextRef co
        }
        catch(BasePlatformException &e)
        {
-               return JSWebAPIException::throwException(context, exception, e);
+               return JSWebAPIErrorFactory::postException(context, exception, e);
        }
 
 
        if(appId.empty())
        {
-               return JSWebAPIException::throwException(context, exception,
+               return JSWebAPIErrorFactory::postException(context, exception,
                                InvalidValuesException("Application id is empty"));
        }
 
        if(remoteMessagePortName.empty())
        {
-               return JSWebAPIException::throwException(context, exception,
+               return JSWebAPIErrorFactory::postException(context, exception,
                                InvalidValuesException("Remote message port name is empty"));
        }
 
@@ -512,7 +512,7 @@ JSValueRef JSMessagePortManager::requestTrustedRemoteMessagePort(JSContextRef co
        Catch(Exception)
        {
                LoggerE("Error on platform : " << _rethrown_exception.GetMessage());
-               return JSWebAPIException::throwException(context, exception,
+               return JSWebAPIErrorFactory::postException(context, exception,
                                UnknownException("Plugin's internal error"));
        }
 
@@ -523,25 +523,25 @@ JSValueRef JSMessagePortManager::requestTrustedRemoteMessagePort(JSContextRef co
                {
                case ExceptionCodes::InvalidArgumentException:
                        oss << "Invalid values for appId '" << appId << "' or port name '" << remoteMessagePortName << "'";
-                       return JSWebAPIException::throwException(context, exception,
+                       return JSWebAPIErrorFactory::postException(context, exception,
                                        InvalidValuesException(oss.str().c_str()));
                        break;
                case ExceptionCodes::NotFoundException:
                        oss << "No port name '" << remoteMessagePortName << "' on app '" << appId << "'";
-                       return JSWebAPIException::throwException(context, exception,
+                       return JSWebAPIErrorFactory::postException(context, exception,
                                        NotFoundException(oss.str().c_str()));
                        break;
                case ExceptionCodes::PlatformWrongStateException:
                        oss << "Have no permission to access app '" << appId << "'";
-                       return JSWebAPIException::throwException(context, exception,
+                       return JSWebAPIErrorFactory::postException(context, exception,
                                        InvalidAccessException(oss.str().c_str()));
                        break;
                case ExceptionCodes::PlatformException:
-                       return JSWebAPIException::throwException(context, exception,
+                       return JSWebAPIErrorFactory::postException(context, exception,
                                        UnknownException("The method cannot proceed due to a severe system error."));
                        break;
                default:
-                       return JSWebAPIException::throwException(context, exception,
+                       return JSWebAPIErrorFactory::postException(context, exception,
                                        UnknownException("Internal error"));
                        break;
                }
@@ -557,7 +557,7 @@ JSValueRef JSMessagePortManager::requestTrustedRemoteMessagePort(JSContextRef co
        catch(BasePlatformException &e)
        {
                LoggerE("Error on conversion : " << e.getMessage());
-               return JSWebAPIException::throwException(context, exception,
+               return JSWebAPIErrorFactory::postException(context, exception,
                                UnknownException("Internal error"));
        }
 
index 908eaa4..4bc1641 100644 (file)
@@ -28,7 +28,7 @@
 #include <CommonsJavaScript/JSCallbackManager.h>
 #include <CommonsJavaScript/JSUtils.h>
 #include <CommonsJavaScript/JSPendingOperation.h>
-#include <JSWebAPIException.h>
+#include <JSWebAPIErrorFactory.h>
 #include <TimeTracer.h>
 #include "EventRemoteMessagePortSendMessage.h"
 #include "JSLocalMessagePort.h"
@@ -221,8 +221,8 @@ JSValueRef JSRemoteMessagePort::sendMessage(JSContextRef context,
        }
        catch(BasePlatformException &e)
        {
-               LogError("No private object");
-               return JSWebAPIException::throwException(context, exception, e);
+               LoggerE("No private object");
+               return JSWebAPIErrorFactory::postException(context, exception, e);
        }
 
        MessagePortDataItemMapPtr data(NULL);
@@ -237,7 +237,7 @@ JSValueRef JSRemoteMessagePort::sendMessage(JSContextRef context,
        }
        catch(BasePlatformException &e)
        {
-               return JSWebAPIException::throwException(context, exception, e);
+               return JSWebAPIErrorFactory::postException(context, exception, e);
        }
 
        try
@@ -248,7 +248,7 @@ JSValueRef JSRemoteMessagePort::sendMessage(JSContextRef context,
        }
        catch(BasePlatformException &e)
        {
-               return JSWebAPIException::throwException(context, exception, e);
+               return JSWebAPIErrorFactory::postException(context, exception, e);
        }
 
        EventRemoteMessagePortSendMessagePtr dplEvent(new EventRemoteMessagePortSendMessage());
@@ -264,8 +264,8 @@ JSValueRef JSRemoteMessagePort::sendMessage(JSContextRef context,
        }
        Catch(Exception)
        {
-               LogError("Error on platform : " << _rethrown_exception.GetMessage());
-               return JSWebAPIException::throwException(context, exception,
+               LoggerE("Error on platform : " << _rethrown_exception.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception,
                                UnknownException("Plugin's internal error."));
        }
 
@@ -274,27 +274,27 @@ JSValueRef JSRemoteMessagePort::sendMessage(JSContextRef context,
                switch (dplEvent->getExceptionCode())
                {
                case ExceptionCodes::ConversionException:
-                       return JSWebAPIException::throwException(context, exception,
+                       return JSWebAPIErrorFactory::postException(context, exception,
                                        TypeMismatchException("Wrong LocalMessagePort object."));
                        break;
                case ExceptionCodes::InvalidArgumentException:
-                       return JSWebAPIException::throwException(context, exception,
+                       return JSWebAPIErrorFactory::postException(context, exception,
                                        InvalidValuesException("The data argument is wrong."));
                        break;
                case ExceptionCodes::NotFoundException:
-                       return JSWebAPIException::throwException(context, exception,
+                       return JSWebAPIErrorFactory::postException(context, exception,
                                        UnknownException("The target application's port is not found."));
                        break;
                case ExceptionCodes::PlatformException:
-                       return JSWebAPIException::throwException(context, exception,
+                       return JSWebAPIErrorFactory::postException(context, exception,
                                        UnknownException("The method cannot proceed due to a severe system error."));
                        break;
                case ExceptionCodes::OutOfRangeException:
-                       return JSWebAPIException::throwException(context, exception,
+                       return JSWebAPIErrorFactory::postException(context, exception,
                                        QuotaExceededException("The size of message has exceeded the maximum limit."));
                        break;
                default:
-                       return JSWebAPIException::throwException(context, exception,
+                       return JSWebAPIErrorFactory::postException(context, exception,
                                        UnknownException("Internal error"));
                        break;
                }
index a252591..e3c36d1 100644 (file)
@@ -102,37 +102,37 @@ void RemoteMessagePort::OnRequestReceived(const EventRemoteMessagePortSendMessag
        }
        Catch(InvalidArgumentException)
        {
-               LogError("Error [InvalidArguments] : " << _rethrown_exception.GetMessage());
+               LoggerE("Error [InvalidArguments] : " << _rethrown_exception.GetMessage());
                event->setExceptionCode(ExceptionCodes::InvalidArgumentException);
                event->setResult(false);
        }
        Catch(ConversionException)
        {
-               LogError("Error [ConversionException] : " << _rethrown_exception.GetMessage());
+               LoggerE("Error [ConversionException] : " << _rethrown_exception.GetMessage());
                event->setExceptionCode(ExceptionCodes::ConversionException);
                event->setResult(false);
        }
        Catch(NotFoundException)
        {
-               LogError("Error [NotFound] : " << _rethrown_exception.GetMessage());
+               LoggerE("Error [NotFound] : " << _rethrown_exception.GetMessage());
                event->setExceptionCode(ExceptionCodes::NotFoundException);
                event->setResult(false);
        }
        Catch(OutOfRangeException)
        {
-               LogError("Error [OutOfRange] : " << _rethrown_exception.GetMessage());
+               LoggerE("Error [OutOfRange] : " << _rethrown_exception.GetMessage());
                event->setExceptionCode(ExceptionCodes::OutOfRangeException);
                event->setResult(false);
        }
        Catch(PlatformException)
        {
-               LogError("Error [PlatformException] : " << _rethrown_exception.GetMessage());
+               LoggerE("Error [PlatformException] : " << _rethrown_exception.GetMessage());
                event->setExceptionCode(ExceptionCodes::PlatformException);
                event->setResult(false);
        }
        Catch(Exception)
        {
-               LogError("Error [Unknown] : " << _rethrown_exception.GetMessage());
+               LoggerE("Error [Unknown] : " << _rethrown_exception.GetMessage());
                event->setExceptionCode(ExceptionCodes::UnknownException);
                event->setResult(false);
        }
index 5be7b26..c028149 100644 (file)
@@ -9,7 +9,6 @@
 
     <api-feature>
         <name>http://tizen.org/privilege/messageport</name>
-        <device-capability>messageport</device-capability>
     </api-feature>
 
 </plugin-properties>
index e66fcee..d16e489 100644 (file)
@@ -77,7 +77,7 @@ Attachment::Attachment(email_attachment_data_t* att)
        m_isInlineAttachment =  att->inline_content_status;
        //m_mimeType = std::string(att->attachment_mime_type);
        LoggerD(" showname = " << m_attachShortName << " isDownloaded = " << m_isDownloaded << " attachmentID = " << m_attachmentID << "Mime= " << m_mimeType);
-       LoggerD("save name is = " << att->attachment_path << "isInlineAttachment = " << m_isInlineAttachment);
+//     LoggerD("save name is = " << att->attachment_path << "isInlineAttachment = " << m_isInlineAttachment);
 
        if ( att->attachment_path)
        {
index 03c9c68..b33f480 100755 (executable)
@@ -4,6 +4,8 @@ SET(TARGET_IMPL_NAME ${messaging_impl})
 
 PKG_CHECK_MODULES(platform_pkgs_messaging REQUIRED msg-service email-service dbus-1)
 
+ADD_DEFINITIONS("-fvisibility=hidden")
+
 INCLUDE_DIRECTORIES(
        ${TOP}/Tizen
        ${TOP}/Common
index 1818080..9a25644 100644 (file)
@@ -31,7 +31,7 @@
 #include "JSConversation.h"
 #include "JSMessageFolder.h"
 
-#include <JSWebAPIError.h>
+#include <JSWebAPIErrorFactory.h>
 #include <Logger.h>
 
 #if 0 // MESSAGING ATTACHMENT IS BLOCKED
index a250d30..0848c61 100644 (file)
@@ -14,7 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
+
 #include <unistd.h>
 #include <cstdio>
 #include <cstddef>
@@ -64,7 +64,7 @@ Email::Email(const string& id) :
                        //exception
                        ThrowMsg(WrtDeviceApis::Commons::PlatformException, " message id is invalid");
                }
-                               
+
                reload();
        } catch (const WrtDeviceApis::Commons::PlatformException& ex) {
                LoggerE("Exception: " << ex.DumpToString());
@@ -74,7 +74,7 @@ Email::Email(const string& id) :
 }
 
 Email::Email(const std::string& id, int accountId) :
-       IMessage(EMAIL, id) 
+       IMessage(EMAIL, id)
 {
        LOG_ENTER
 
@@ -83,11 +83,11 @@ Email::Email(const std::string& id, int accountId) :
                        //exception
                        ThrowMsg(WrtDeviceApis::Commons::PlatformException, " message id is invalid");
                }
-               
+
                LoggerD("Account ID = " << accountId);
                m_accountId = accountId;
                reload();
-               
+
        } catch (const WrtDeviceApis::Commons::PlatformException& ex) {
                LoggerE("Exception: " << ex.DumpToString());
        }
@@ -104,7 +104,7 @@ Email::Email(EmailAccountInfo& account) : IMessage(EMAIL)
          if (getIdRef().empty()) {
                create(account);
          }
-       
+
         reload();
     }
     catch (const WrtDeviceApis::Commons::PlatformException& ex) {
@@ -169,7 +169,7 @@ int Email::downloadBody()
 }
 
 void Email::downloadBodyCancel( int handle)
-{      
+{
        return MailSync::getInstance().cancelDownloadBody(handle);
 }
 
@@ -181,7 +181,7 @@ int Email::downloadAttachment( const IAttachmentPtr& attachment)
 }
 
 void Email::downloadAttachmentCancel( int handle)
-{      
+{
        LOG_ENTER
        return MailSync::getInstance().cancelDownloadAttachment(handle);
        LOG_EXIT
@@ -234,14 +234,14 @@ int Email::getAccountID()
                return m_mail->account_id;
        else
                return -1;
-       
+
        LOG_EXIT
 }
 
 int Email::getUID()
 {
        LOG_ENTER
-       
+
        if (m_mail)
                return m_mail->mail_id;
        else
@@ -264,7 +264,7 @@ int Email::isBodyDownloaded()
 }
 
 bool Email::hasAttachment()
-{      
+{
        std::size_t attachmentSize = getAttachmentsCount();
        if ( attachmentSize > 0)
                        return true;
@@ -291,7 +291,7 @@ void Email::moveToFolder(const string& newFolder)
 {
 /*
        Assert(m_mail && "mail is NULL.");
-       
+
        update();
 
        int accountId = m_mail->account_id;
@@ -308,7 +308,7 @@ void Email::moveToFolder(const string& newFolder)
            "Couldn't move mail to folder: " << newFolder << ". [" <<
            error << "]");
        }
-       
+
        error = email_free_mailbox(&mailbox, 1);        //free
        if (EMF_ERROR_NONE != error) {
            LoggerE("Failed to destroy mailbox: " << error);
@@ -328,7 +328,7 @@ void Email::copyToFolder(const FolderType newFolder)
 void Email::copyToFolder(const string& newFolder)
 {
        LOG_ENTER
-/*             
+/*
        Assert(m_mail && "mail is NULL.");
 
        update();
@@ -337,7 +337,7 @@ void Email::copyToFolder(const string& newFolder)
        ScopedMail mail(EmailService::cloneMail(m_mail.Get())); //clone
        mail->mailbox_name = (NULL != newFolder.c_str() ? strdup(newFolder.c_str()) : NULL);
        mail->account_id = accountId;
-       
+
        //Attachment
        email_attachment_data_t* attachment = NULL;
        int attachmentCount = 0;
@@ -346,12 +346,12 @@ void Email::copyToFolder(const string& newFolder)
                ThrowMsg( WrtDeviceApis::Commons::PlatformException,
                        "Couldn't get attachment list: " << newFolder << ". [" << error << "]");
        }
-       
+
        int mailId = EmailService::addMail( mail.Get(), attachment );
        if (0 == mailId) {
            ThrowMsg(WrtDeviceApis::Commons::PlatformException, "Cloned mail didn't get new id.");
        }
-*/     
+*/
     LOG_EXIT
 }
 
@@ -394,18 +394,18 @@ void Email::create( EmailAccountInfo& account )
 
        m_accountId = account.getIntId();
        //MailSender::getInstance();
-       
+
       LoggerD("account ID : " << m_accountId);
        ScopedMail mail(EmailService::createMailData(account));
-       
+
        setEmailAccount(account);       //save account
 
        mail->mailbox_type = EMAIL_MAILBOX_TYPE_DRAFT;
-       
+
        setId(convertId(EmailService::addMail(mail.Get(), NULL)));
        setFolderType(DRAFTBOX);
        setMessageStatus(MESSAGE_STATUS_DRAFT);
-       
+
     LOG_EXIT
 }
 
@@ -426,7 +426,7 @@ void Email::reload()
 
     //m_mailbox.Reset(EmailService::getMailboxByMailId(m_accountId, getIntId()) );
     //setFolderType(EmailConverter::toFolderType(m_mailbox->mailbox_type));
-    
+
     setFolderType(EmailConverter::toFolderType(m_mail->mailbox_type));
     setMessageStatus(EmailConverter::toMessageStatus(m_mail->mailbox_type));
 
@@ -461,7 +461,7 @@ void Email::readHeader()
     struct tm timeinfo;
        memset(&timeinfo, 0, sizeof(timeinfo));
     memcpy(t, &timeinfo, sizeof(struct tm));
-    setDateTime(timeinfo); 
+    setDateTime(timeinfo);
 
 #else
 
@@ -494,12 +494,12 @@ void Email::readHeader()
                memset(buf, 0x00, sizeof(buf));
                targetBuf += snprintf(buf, sizeof(buf), "%.2s", targetBuf);
                timeinfo.tm_sec = atoi(buf);
-               
+
                setDateTime(timeinfo);
        }
 
 #endif
-       
+
 #if 0
     time_t rawtime;
     time(&rawtime);
@@ -544,11 +544,11 @@ void Email::readBody() {
                        ThrowMsg(WrtDeviceApis::Commons::PlatformException,
                                        "Cannot read plain body size");
                }
-               
+
                fseek(file.Get(), 0, SEEK_SET);
                DPL::ScopedPtr<char> data(new char[size + 1]);
                memset(data.Get(), 0, size + 1);
-        TEMP_FAILURE_RETRY(fread(data.Get(), 1, size, file.Get()) &&
+        TEMP_FAILURE_RETRY(fread(data.Get(), 1, size-2, file.Get()) &&
                            ferror(file.Get()) == 0 ? -1 : 0);
                setBody(data.Get());
        }
@@ -569,7 +569,7 @@ void Email::readBody() {
                        ThrowMsg(WrtDeviceApis::Commons::PlatformException,
                                        "Cannot read html body size");
                }
-               
+
                fseek(file.Get(), 0, SEEK_SET);
                DPL::ScopedPtr<char> data(new char[size + 1]);
                memset(data.Get(), 0, size + 1);
@@ -582,12 +582,12 @@ void Email::readBody() {
        //email_attachment_info_t* attachment = NULL;
        email_attachment_data_t* attachment = NULL;
        int attachmentCount = 0;
-       
+
        int error = email_get_attachment_data_list( m_mail->mail_id, &attachment, &attachmentCount);    //get Attachment list
        if (EMAIL_ERROR_NONE != error) {
                ThrowMsg( WrtDeviceApis::Commons::PlatformException, "Couldn't get attachment list: ");
        }
-       
+
        if ( attachment && attachmentCount > 0)
        {
                LoggerD("reading attachments , attahcment count = " << attachmentCount);
@@ -601,7 +601,7 @@ void Email::readBody() {
                                IAttachmentPtr tmpAtt(new Attachment());
                                if (attachment[i].attachment_path)
                                        tmpAtt->init(attachment[i].attachment_path, false);
-                       
+
                                if (tmpAtt)
                                {
                                        LoggerD("attachment[i].inline_content_status : " << attachment[i].inline_content_status);
@@ -622,17 +622,17 @@ void Email::readBody() {
                                }
                                LoggerD(" append Attachment complete");
 
-                       
+
                        }
                        catch ( const WrtDeviceApis::Commons::Exception& ex )
                        {
                                LoggerE("Error while trying to append attachment " << attachment[i].attachment_path << ": " << ex.DumpToString());
                        }
-                       
+
                }
 
        }
-       
+
        if (attachment)
        {
                error = email_free_attachment_data(&attachment, attachmentCount);
@@ -667,12 +667,12 @@ void Email::readInfo()
 void Email::updateBody()
 {
        LOG_ENTER
+
        int error = 0;
        bool locationChecker = false;
+
        if (isBodyValid()) { return; }
+
        if (!m_mail) {
                LoggerD("m_mail is NULL");
                ThrowMsg(WrtDeviceApis::Commons::PlatformException, "Mail is NULL.");
@@ -714,7 +714,6 @@ void Email::updateBody()
                ThrowMsg(WrtDeviceApis::Commons::PlatformException, "Plain Body File Open Error");
        }
 
-
        // For Html Body
        locationChecker = EmailUtils::isFrameworkEmailData(m_mail->file_path_html);
        if((locationChecker == true) || (!m_mail->file_path_html))      // html file is not exist or exist on email frame work then create tmp html file
@@ -777,7 +776,7 @@ void Email::updateSubject()
     if (!m_mail) {
         ThrowMsg(WrtDeviceApis::Commons::PlatformException, "Mail not allocated.");
     }
-    
+
     m_mail->subject = String::strdup(getSubjectRef());
     setSubjectValidity(true);
 
@@ -869,7 +868,7 @@ void Email::updateMessage()
                error = email_free_attachment_data(&attachment, attachmentCount);
                if (EMAIL_ERROR_NONE != error) {
                        LoggerW("email_free_attachment_data [" << error << "]");
-               }               
+               }
        }
 
        LOG_EXIT
@@ -882,24 +881,24 @@ void Email::createSendMessage()
     MailSender::getInstance(); //start email service
        LoggerD("getUID:  " << getUID());
        if ( getUID() > 0 && m_accountId > 0)
-       {       
+       {
                update();
        }
        else
-       {       
+       {
        DPL::Mutex::ScopedLock mx(&m_updateMutex);
-               
+
                EmailAccountInfo account = getEmailAccount();
                m_accountId = account.getIntId();       //set account ID
                LoggerD("account ID : " << m_accountId);
                m_mail.Reset(EmailService::createMailData(account));
-               
+
                updateSubject();
                updateBody();
                updateRecipients();
                updatePriority();
                updateReadStatus();
-               
+
                email_mailbox_t* mailbox;
                int error = email_get_mailbox_by_mailbox_type(m_accountId, EMAIL_MAILBOX_TYPE_OUTBOX, &mailbox );
                if (EMAIL_ERROR_NONE != error) {
@@ -915,15 +914,15 @@ void Email::createSendMessage()
                       ThrowMsg(WrtDeviceApis::Commons::PlatformException,
                                "Couldn't add message to mailbox. [" << error << "]");
                }
-               
+
                LoggerD("m_mail->mail_id =" << m_mail->mail_id);
-               
+
                setId(convertId(m_mail->mail_id));
                setFolderType(OUTBOX);
                setMessageStatus(MESSAGE_STATUS_SENDING);
 
                updateAttachments();    //update Attachment.
-               
+
                error = email_free_mailbox(&mailbox, 1);
                if (EMAIL_ERROR_NONE != error) {
                        LoggerE("Failed to destroy mailbox: " << error);
@@ -943,7 +942,7 @@ void Email::createSendMessage()
                if (m_mail->file_path_plain)
                        free(m_mail->file_path_plain);
                m_mail->file_path_plain = strdup(result->file_path_plain);
-               
+
                if ( m_mail->file_path_html)
                {
                        free(m_mail->file_path_html);
@@ -953,12 +952,12 @@ void Email::createSendMessage()
                {
                        m_mail->file_path_html = strdup(result->file_path_html);
                }
-               
+
                error = email_free_mail_data(&result, 1);
                if (EMAIL_ERROR_NONE != error) {
                    ThrowMsg(WrtDeviceApis::Commons::PlatformException,
                             "Couldn't find message " << m_mail->mail_id << ". [" << error << "]");
-               }               
+               }
 
     }
        LOG_EXIT
@@ -970,27 +969,27 @@ void Email::addMessageToDraft()
     LOG_ENTER
 
     MailSender::getInstance(); //start email service
-       
+
        LoggerD("getUID:  " << getUID());
     if ( getUID() > 0 && m_accountId > 0)
-    {  
+    {
                update();
     }
     else
-    {  
+    {
                DPL::Mutex::ScopedLock mx(&m_updateMutex);
-               
+
                EmailAccountInfo account = getEmailAccount();
                m_accountId = account.getIntId();       //set account ID
                LoggerD("account ID : " << m_accountId);
                m_mail.Reset(EmailService::createMailData(account));
-               
+
                updateSubject();
                updateBody();
                updateRecipients();
                updatePriority();
                updateReadStatus();
-               
+
                email_mailbox_t* mailbox;
                int error = email_get_mailbox_by_mailbox_type(m_accountId, EMAIL_MAILBOX_TYPE_DRAFT, &mailbox );
                if (EMAIL_ERROR_NONE != error) {
@@ -1006,15 +1005,15 @@ void Email::addMessageToDraft()
                       ThrowMsg(WrtDeviceApis::Commons::PlatformException,
                                "Couldn't add message to mailbox. [" << error << "]");
                }
-               
+
                LoggerD("message id =" << m_mail->mail_id);
-               
+
                setId(convertId(m_mail->mail_id));
                setFolderType(DRAFTBOX);
                setMessageStatus(MESSAGE_STATUS_DRAFT);
 
                updateAttachments();    //update Attachment.
-               
+
                error = email_free_mailbox(&mailbox, 1);
                if (EMAIL_ERROR_NONE != error) {
                        LoggerE("Failed to destroy mailbox: " << error);
@@ -1037,11 +1036,11 @@ void Email::addMessageToDraft()
                        int mail_id_array[1];
                        email_mail_attribute_type attribute_type;
                        email_mail_attribute_value_t attribute_value;
-               
+
                        mail_id_array[0] = m_mail->mail_id;
                        attribute_type = EMAIL_MAIL_ATTRIBUTE_BODY_DOWNLOAD_STATUS;
                        attribute_value.integer_type_value = 1;
-                       
+
                        email_update_mail_attribute(m_accountId, mail_id_array, 1, EMAIL_MAIL_ATTRIBUTE_BODY_DOWNLOAD_STATUS, attribute_value);
                }
 
@@ -1051,7 +1050,7 @@ void Email::addMessageToDraft()
                if (m_mail->file_path_plain)
                        free(m_mail->file_path_plain);
                m_mail->file_path_plain = strdup(result->file_path_plain);
-               
+
                if ( m_mail->file_path_html)
                {
                        free(m_mail->file_path_html);
@@ -1061,12 +1060,12 @@ void Email::addMessageToDraft()
                {
                        m_mail->file_path_html = strdup(result->file_path_html);
                }
-               
+
                error = email_free_mail_data(&result, 1);
                if (EMAIL_ERROR_NONE != error) {
                    ThrowMsg(WrtDeviceApis::Commons::PlatformException,
                             "Couldn't find message " << m_mail->mail_id << ". [" << error << "]");
-               }               
+               }
 
     }
 
@@ -1146,7 +1145,7 @@ void Email::updateAttachments()
     }
 
     email_attachment_data_t* attachment = NULL;
-    int attachmentCount = 0;           
+    int attachmentCount = 0;
     email_mailbox_t* mailBox = NULL;
     int error = 0;
 
@@ -1159,12 +1158,12 @@ void Email::updateAttachments()
                        ThrowMsg( WrtDeviceApis::Commons::PlatformException, "Couldn't get attachment list: ");
                }
                error = email_get_mailbox_by_mailbox_id(m_mail->mailbox_id, &mailBox);
-               
+
                if (EMAIL_ERROR_NONE != error) {
                        ThrowMsg(WrtDeviceApis::Commons::PlatformException,
                        "Couldn't get mailbox. [" << error << "]");
-               }       
-                
+               }
+
                if ( attachmentCount > 0 )
                {
                        LoggerD("attachmentCount=" << attachmentCount);
@@ -1193,11 +1192,11 @@ void Email::updateAttachments()
                        }
 
                }
-               
+
                //set Attachment
                std::size_t attachmentSize = getAttachmentsCount();
                std::size_t inlineAttachmentSize = getInlineAttachmentsCount();
-               
+
                LoggerD("update attachments, attachmentSize=" << attachmentSize);
                if (attachmentSize > 0)
                {
@@ -1222,7 +1221,7 @@ void Email::updateAttachments()
                                cp_cmd << " \"" << att->getFullPath() << "\"";
                                cp_cmd << " \"" << buf << "\"";
 
-                               attachment_info = EmailService::alloc<email_attachment_data_t>();                                       
+                               attachment_info = EmailService::alloc<email_attachment_data_t>();
                                attachment_info->attachment_name = String::strdup(att->getShortName());
                                attachment_info->attachment_path = String::strdup( buf );
                                attachment_info->save_status = true;
@@ -1264,8 +1263,8 @@ void Email::updateAttachments()
                                        LoggerD("error :" << error);
                                        ThrowMsg(WrtDeviceApis::Commons::PlatformException, "Error while adding attachment. [" << error << "]");
                                }
-                               else 
-                               {       
+                               else
+                               {
                                        LoggerD(" attachment id : " << attachment_info->attachment_id);
                                        LoggerD(" attachment inline : " << attachment_info->inline_content_status);
                                        LoggerD(" setNth(i+1) : " << i+1);
@@ -1275,17 +1274,17 @@ void Email::updateAttachments()
                                        att->setMessage(SharedFromThis());
                                        att->setNth(i+1);
                                }
-                               
+
                                if (attachment_info)
                                        EmailService::freeAttachment(attachment_info);
-                       }       
-                       
+                       }
+
                }
                LoggerD("update attachments, inlineAttachmentSize=" << inlineAttachmentSize);
-               if (inlineAttachmentSize > 0) 
+               if (inlineAttachmentSize > 0)
                {
                        email_attachment_data_t* attachment_info = NULL;
-                       for (std::size_t i = 0; i < inlineAttachmentSize; ++i) 
+                       for (std::size_t i = 0; i < inlineAttachmentSize; ++i)
                        {
                                IAttachmentPtr att = getInlineAttachment(i);
                                if (!att) {
@@ -1304,7 +1303,7 @@ void Email::updateAttachments()
                                cp_cmd << " \"" << att->getFullPath() << "\"";
                                cp_cmd << " \"" << buf << "\"";
 
-                               attachment_info = EmailService::alloc<email_attachment_data_t>();                                       
+                               attachment_info = EmailService::alloc<email_attachment_data_t>();
                                attachment_info->attachment_name = String::strdup(att->getShortName());
                                attachment_info->attachment_path = String::strdup( buf );
                                attachment_info->save_status = true;
@@ -1343,9 +1342,9 @@ void Email::updateAttachments()
                                ThrowMsg(WrtDeviceApis::Commons::PlatformException,
                                     "Error while adding attachment. [" << error << "]");
                                }
-                               else 
-                               {       
-                                       LoggerD(" attachment id : " << attachment_info->attachment_id);                         
+                               else
+                               {
+                                       LoggerD(" attachment id : " << attachment_info->attachment_id);
                                        LoggerD(" attachment inline : " << attachment_info->inline_content_status);
                                        LoggerD(" setNth(i+(int)attachmentSize+1) : " << i+(int)attachmentSize+1);
                                        att->setDownloaded(true);
@@ -1355,18 +1354,18 @@ void Email::updateAttachments()
 //                                     att->setNth(i+1);
                                        att->setNth(i + (int)attachmentSize + 1);
                                }
-                               
+
                                if (attachment_info)
                                        EmailService::freeAttachment(attachment_info);
-                       }       
-                       
+                       }
+
                }
-       
 
-       
-       } 
+
+
+       }
        Catch(WrtDeviceApis::Commons::PlatformException) {
-          if (attachment) 
+          if (attachment)
           {
                int error = email_free_attachment_data(&attachment, attachmentCount);
                if (EMAIL_ERROR_NONE != error) {
index 47eacd2..eb29d8a 100755 (executable)
@@ -27,7 +27,7 @@
 #include "JSConversation.h"
 #include "ConverterMessage.h"
 
-#include <JSWebAPIError.h>
+#include <JSWebAPIErrorFactory.h>
 #include <Logger.h>
 
 
index 05d9b1d..6454250 100644 (file)
 #include "MessagingListener.h"
 #include "ReqReceiverMessage.h"
 
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 #include <SecurityExceptions.h>
 
 #include <CommonsJavaScript/ScopedJSStringRef.h>
 // ==== new common headers
 #include <GlobalContextManager.h>
 #include <PlatformException.h>
-#include <JSWebAPIError.h>
-#include <JSWebAPIException.h>
 #include <JSUtil.h>
+#include <Export.h>
 #include <ArgumentValidator.h>
 // ====
 
@@ -122,6 +120,26 @@ JSStaticValue JSMessage::m_property[] = {
     { 0, 0, 0, 0 }
 };
 
+JSClassRef JSMessage::jsInit(JSContextRef context)
+{
+    LoggerI("enter");
+    return JSClassCreate(&m_classInfo);
+}
+
+const JSClassDefinition* JSMessage::getClassInfo()
+{
+    LoggerI("enter");
+    return &(m_classInfo);
+}
+
+JSClassRef DLL_EXPORT JSMessage::getClassRef()
+{
+    LoggerI("enter");
+    if (!m_jsClassRef) {
+        m_jsClassRef = JSClassCreate(&m_classInfo);
+    }
+    return m_jsClassRef;
+}
 
 JSValueRef JSMessage::createJSObject(JSContextRef context,
                EmailAccountInfo& account,
@@ -186,11 +204,9 @@ JSValueRef JSMessage::createJSObject(JSContextRef context,
         const IMessagePtr& msg,
         EventUpdateMessageAnswerReceiver* listener)
 {
-       JSClassRef jsClassRef = JSClassCreate(getClassInfo());
        JSMessagePrivateObject* priv = new JSMessagePrivateObject(context, msg);
        priv->setUpdateMsgReceiver(listener);
-       JSObjectRef jsValueRef = JSObjectMake(context, jsClassRef, static_cast<void*>(priv));
-       JSClassRelease(jsClassRef);
+       JSObjectRef jsValueRef = JSObjectMake(context, JSMessage::getClassRef(), static_cast<void*>(priv));
        if (NULL == jsValueRef) {
                LoggerE("object creation error");
                return JSValueMakeUndefined(context);
@@ -202,14 +218,11 @@ JSValueRef JSMessage::createJSObject(JSContextRef context,
         const IMessagePtr& msg)
 {
        LoggerD("createJSObject");
-       JSClassRef jsClassRef = JSClassCreate(getClassInfo());
-       LoggerD("jsClassRef success");
        JSMessagePrivateObject* priv = new JSMessagePrivateObject(context, msg);
        LoggerD("priv success");
 
-       JSObjectRef jsValueRef = JSObjectMake(context, jsClassRef, static_cast<void*>(priv));
+       JSObjectRef jsValueRef = JSObjectMake(context, JSMessage::getClassRef(), static_cast<void*>(priv));
        LoggerD("JSObjectMake success");
-       JSClassRelease(jsClassRef);
        if (NULL == jsValueRef) {
                LoggerE("object creation error");
                return JSValueMakeUndefined(context);
@@ -438,7 +451,7 @@ bool JSMessage::hasInstance(JSContextRef context,
        return true;
 }
 
-JSObjectRef JSMessage::constructor(JSContextRef context,
+JSObjectRef DLL_EXPORT JSMessage::constructor(JSContextRef context,
         JSObjectRef constructor,
         size_t argumentCount,
         const JSValueRef arguments[],
@@ -571,17 +584,15 @@ JSObjectRef JSMessage::constructor(JSContextRef context,
     }
     catch(BasePlatformException &bex) {
         LoggerE("Message creation failed: " << bex.getMessage());
-        JSObjectRef error = JSWebAPIException::makeJSWebAPIException(context, bex);
-        *exception = error;
-        return error;
+        return JSWebAPIErrorFactory::postException(context, exception, bex);
     }
     catch(...) {
         DeviceAPI::Common::UnknownException err("UnknownError in Message constructor.");
-        JSObjectRef error = JSWebAPIException::makeJSWebAPIException(context, err);
-        *exception = error;
-        return error;
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
-    return NULL;
+
+    return JSWebAPIErrorFactory::postException(context, exception,
+            DeviceAPI::Common::UnknownException("UnknownError in Message constructor."));
 }
 
 JSValueRef JSMessage::convertToType(JSContextRef context,
@@ -1389,14 +1400,14 @@ bool JSMessage::setAttachments(JSContextRef context,
             static_cast<JSMessagePrivateObject*>(JSObjectGetPrivate(object));
 
         if (!priv) {
-            return JSTizenExceptionFactory::postException(context, exception,
-                          JSTizenException::INVALID_VALUES_ERROR, JSMESSAGING_EXCEPTION_MSG_INVALID_ARGUMENT);
+            return JSWebAPIErrorFactory::postException(context, exception,
+                          JSWebAPIErrorFactory::INVALID_VALUES_ERROR, JSMESSAGING_EXCEPTION_MSG_INVALID_ARGUMENT);
         }
     }
     Catch(WrtDeviceApis::Commons::NullPointerException) {
         LoggerE("Error on pointer, null value");
-          return JSTizenExceptionFactory::postException(context, exception,
-                          JSTizenException::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN);
+          return JSWebAPIErrorFactory::postException(context, exception,
+                          JSWebAPIErrorFactory::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN);
     }
 
     vector<string> attachments;
@@ -1455,18 +1466,18 @@ bool JSMessage::setAttachments(JSContextRef context,
     }
     Catch(WrtDeviceApis::Commons::ConversionException) {
         LoggerE("Error on conversion");
-         return JSTizenExceptionFactory::postException(context, exception,
-                  JSTizenException::TYPE_MISMATCH_ERROR, JSMESSAGING_EXCEPTION_MSG_INVALID_ARGUMENT);
+         return JSWebAPIErrorFactory::postException(context, exception,
+                  JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, JSMESSAGING_EXCEPTION_MSG_INVALID_ARGUMENT);
     }
     Catch(WrtDeviceApis::Commons::NullPointerException) {
         LoggerE("Error on pointer, null value");
-         return JSTizenExceptionFactory::postException(context, exception,
-                        JSTizenException::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN);
+         return JSWebAPIErrorFactory::postException(context, exception,
+                        JSWebAPIErrorFactory::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN);
     }
     Catch(WrtDeviceApis::Commons::InvalidArgumentException) {
         LoggerE("Invalid argument");
-          return JSTizenExceptionFactory::postException(context, exception,
-                          JSTizenException::INVALID_VALUES_ERROR, JSMESSAGING_EXCEPTION_MSG_INVALID_ARGUMENT);
+          return JSWebAPIErrorFactory::postException(context, exception,
+                          JSWebAPIErrorFactory::INVALID_VALUES_ERROR, JSMESSAGING_EXCEPTION_MSG_INVALID_ARGUMENT);
     }
     return false;
 }
index be6a68a..d7662bd 100755 (executable)
@@ -37,26 +37,11 @@ class JSMessage
     /*
      * This method initializes object in the JS Engine.
      */
-    static JSClassRef jsInit(JSContextRef context)
-    {
-        LoggerI("enter");
-        return JSClassCreate(&m_classInfo);
-    }
-
-    static const JSClassDefinition* getClassInfo()
-    {
-        LoggerI("enter");
-        return &(m_classInfo);
-    }
-
-    static JSClassRef getClassRef()
-    {
-        LoggerI("enter");
-        if (!m_jsClassRef) {
-            m_jsClassRef = JSClassCreate(&m_classInfo);
-        }
-        return m_jsClassRef;
-    }
+    static JSClassRef jsInit(JSContextRef context);
+
+    static const JSClassDefinition* getClassInfo();
+
+    static JSClassRef getClassRef();
 
     static JSObjectRef constructor(JSContextRef ctx,
                        JSObjectRef constructor,
index 9be10e2..c724a13 100644 (file)
 #include <EventGetNodeData.h>
 #include <FilesystemUtils.h>
 #include <IManager.h>
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
 #include "AttachmentFactory.h"
 #include "MessagingErrorMsg.h"
 #include "Attachment.h"
 
-#include <JSWebAPIError.h>
-#include <JSWebAPIException.h>
+#include <JSWebAPIErrorFactory.h>
 #include <ArgumentValidator.h>
+#include <Export.h>
 #include <Logger.h>
 
 #if 0
@@ -98,7 +96,7 @@ const JSClassDefinition* JSMessageAttachment::getClassInfo()
     return &(m_classInfo);
 }
 
-JSClassRef JSMessageAttachment::getClassRef()
+JSClassRef DLL_EXPORT JSMessageAttachment::getClassRef()
 {
     if (!m_jsClassRef) {
         m_jsClassRef = JSClassCreate(&m_classInfo);
@@ -197,14 +195,14 @@ JSValueRef JSMessageAttachment::getMessageID(JSContextRef context,
        Catch(WrtDeviceApis::Commons::InvalidArgumentException)
        {
                LoggerE("invalid value conversion");
-               return JSTizenExceptionFactory::postException(context, exception,
-               JSTizenException::TYPE_MISMATCH_ERROR, JSMESSAGING_EXCEPTION_MSG_INVALID_ARGUMENT);
+               return JSWebAPIErrorFactory::postException(context, exception,
+               JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, JSMESSAGING_EXCEPTION_MSG_INVALID_ARGUMENT);
        }
        Catch(WrtDeviceApis::Commons::Exception)
        {
                LoggerE("Unkown Exception");
-               return JSTizenExceptionFactory::postException(context, exception,
-               JSTizenException::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN);
+               return JSWebAPIErrorFactory::postException(context, exception,
+               JSWebAPIErrorFactory::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN);
        }
 }
 
@@ -244,14 +242,14 @@ JSValueRef JSMessageAttachment::getContentID(JSContextRef context,
        Catch(WrtDeviceApis::Commons::InvalidArgumentException)
        {
                LoggerE("invalid value conversion");
-               return JSTizenExceptionFactory::postException(context, exception,
-               JSTizenException::TYPE_MISMATCH_ERROR, JSMESSAGING_EXCEPTION_MSG_INVALID_ARGUMENT);
+               return JSWebAPIErrorFactory::postException(context, exception,
+               JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, JSMESSAGING_EXCEPTION_MSG_INVALID_ARGUMENT);
        }
        Catch(WrtDeviceApis::Commons::Exception)
        {
                LoggerE("Unkown Exception");
-               return JSTizenExceptionFactory::postException(context, exception,
-               JSTizenException::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN);
+               return JSWebAPIErrorFactory::postException(context, exception,
+               JSWebAPIErrorFactory::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN);
        }
 }
 
@@ -274,14 +272,14 @@ JSValueRef JSMessageAttachment::getLoaded(JSContextRef context,
            Catch(WrtDeviceApis::Commons::InvalidArgumentException)
            {
                   LoggerE("invalid value conversion");
-                  return JSTizenExceptionFactory::postException(context, exception,
-                          JSTizenException::TYPE_MISMATCH_ERROR, JSMESSAGING_EXCEPTION_MSG_INVALID_ARGUMENT);
+                  return JSWebAPIErrorFactory::postException(context, exception,
+                          JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, JSMESSAGING_EXCEPTION_MSG_INVALID_ARGUMENT);
            }
            Catch(WrtDeviceApis::Commons::Exception)
            {
                LoggerE("Unkown Exception");
-                  return JSTizenExceptionFactory::postException(context, exception,
-                               JSTizenException::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN);
+                  return JSWebAPIErrorFactory::postException(context, exception,
+                               JSWebAPIErrorFactory::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN);
            }
 //         return JSValueMakeUndefined(context);
 }
@@ -366,22 +364,22 @@ JSValueRef JSMessageAttachment::getFilePath(JSContextRef context,
                Catch(WrtDeviceApis::Commons::InvalidArgumentException)
                {
                   LoggerE("invalid value conversion");
-                  return JSTizenExceptionFactory::postException(context, exception,
-                          JSTizenException::TYPE_MISMATCH_ERROR, JSMESSAGING_EXCEPTION_MSG_INVALID_ARGUMENT);
+                  return JSWebAPIErrorFactory::postException(context, exception,
+                          JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, JSMESSAGING_EXCEPTION_MSG_INVALID_ARGUMENT);
                }
                Catch(WrtDeviceApis::Commons::Exception)
                {
                    LoggerE("Unkown Exception");
-                   return JSTizenExceptionFactory::postException(context, exception,
-                               JSTizenException::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN);
+                   return JSWebAPIErrorFactory::postException(context, exception,
+                               JSWebAPIErrorFactory::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN);
                }
 //             return JSValueMakeUndefined(context);
 
        }
        else
        {
-               return JSTizenExceptionFactory::postException(context, exception,
-                       JSTizenException::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN);
+               return JSWebAPIErrorFactory::postException(context, exception,
+                       JSWebAPIErrorFactory::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN);
        }
 
 /* // MESSAGING ATTACHMENT IS BLOCKED
@@ -415,16 +413,16 @@ JSValueRef JSMessageAttachment::getFilePath(JSContextRef context,
                    WrtDeviceApis::Commons::ExceptionCodes::Enumeration code = event->getExceptionCode();
                    if (code != WrtDeviceApis::Commons::ExceptionCodes::None) {
                        LoggerE("Attachment location not resolved. Exception code: " << code);
-                          return JSTizenExceptionFactory::postException(context, exception,
-                                        JSTizenException::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN);
+                          return JSWebAPIErrorFactory::postException(context, exception,
+                                        JSWebAPIErrorFactory::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN);
 
                    }
 
                    DeviceAPI::Filesystem::INodePtr node = event->getResult();
                    if (!node) {
                        LoggerE("Resolved attachment location is empty.");
-                          return JSTizenExceptionFactory::postException(context, exception,
-                                        JSTizenException::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN);
+                          return JSWebAPIErrorFactory::postException(context, exception,
+                                        JSWebAPIErrorFactory::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN);
 
                    }
 
@@ -441,15 +439,15 @@ JSValueRef JSMessageAttachment::getFilePath(JSContextRef context,
                Catch(WrtDeviceApis::Commons::InvalidArgumentException)
                {
                   LoggerE("invalid value conversion");
-                  return JSTizenExceptionFactory::postException(context, exception,
-                          JSTizenException::TYPE_MISMATCH_ERROR, JSMESSAGING_EXCEPTION_MSG_INVALID_ARGUMENT);
+                  return JSWebAPIErrorFactory::postException(context, exception,
+                          JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, JSMESSAGING_EXCEPTION_MSG_INVALID_ARGUMENT);
 
                }
                Catch(WrtDeviceApis::Commons::Exception)
                {
                    LoggerE("Unkown Exception");
-                   return JSTizenExceptionFactory::postException(context, exception,
-                               JSTizenException::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN);
+                   return JSWebAPIErrorFactory::postException(context, exception,
+                               JSWebAPIErrorFactory::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN);
                }
                return JSValueMakeUndefined(context);
 */
@@ -483,7 +481,7 @@ JSMessageAttachmentPrivate* JSMessageAttachment::getPrivate(JSObjectRef thisObje
     return thisPrivate;
 }
 
-JSObjectRef JSMessageAttachment::constructor(JSContextRef context,
+JSObjectRef DLL_EXPORT JSMessageAttachment::constructor(JSContextRef context,
                JSObjectRef constructor,
                size_t argumentCount,
                const JSValueRef arguments[],
@@ -545,17 +543,15 @@ JSObjectRef JSMessageAttachment::constructor(JSContextRef context,
                }
        }catch(BasePlatformException & e) {
                LoggerE("Message creation failed: " << e.getMessage());
-               JSObjectRef error = JSWebAPIException::makeJSWebAPIException(context, e);
-               *exception = error;
-               return error;
+               return JSWebAPIErrorFactory::postException(context, exception, e);
        }
        catch(...) {
                DeviceAPI::Common::UnknownException err("UnknownError in Message constructor.");
-               JSObjectRef error = JSWebAPIException::makeJSWebAPIException(context, err);
-               *exception = error;
-               return error;
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        }
-       return NULL;
+
+       return JSWebAPIErrorFactory::postException(context, exception,
+                       DeviceAPI::Common::UnknownException("UnknownError in Message constructor."));
 }
 
 JSValueRef JSMessageAttachment::getProperty(JSContextRef context,
index 617b3ac..b7c6473 100644 (file)
 #include <CommonsJavaScript/JSUtils.h>
 #include "ConverterMessage.h"
 #include "JSMessageBody.h"
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
 #include "MessagingErrorMsg.h"
 #include "JSMessageAttachment.h"
-#include <JSWebAPIError.h>
+#include <JSWebAPIErrorFactory.h>
 #include <ArgumentValidator.h>
 #include <JSUtil.h>
 #include <Logger.h>
index eafd0b4..b80c3b3 100644 (file)
 #include "IMessageFolder.h"
 #include "IMessagingTypes.h"
 
-#include <JSWebAPIError.h>
 #include <Logger.h>
-
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
 #include <SecurityExceptions.h>
 
 #include "MessagingErrorMsg.h"
index 0c30fbd..5205514 100644 (file)
 #include <Commons/StringUtils.h>
 
 #include "ReqReceiverMessage.h"
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
 #include <SecurityExceptions.h>
 
-#include <JSWebAPIError.h>
+#include <JSWebAPIErrorFactory.h>
 #include <ArgumentValidator.h>
 #include <JSUtil.h>
 
@@ -382,12 +380,12 @@ JSValueRef JSMessagingService::createMessage(JSContextRef context, JSObjectRef o
 
         }
             Catch(WrtDeviceApis::Commons::InvalidArgumentException) {
-              return JSTizenExceptionFactory::postException(context, exception,
-                JSTizenException::INVALID_VALUES_ERROR, JSMESSAGING_EXCEPTION_MSG_INVALID_ARGUMENT);
+              return JSWebAPIErrorFactory::postException(context, exception,
+                JSWebAPIErrorFactory::INVALID_VALUES_ERROR, JSMESSAGING_EXCEPTION_MSG_INVALID_ARGUMENT);
            }
             Catch(WrtDeviceApis::Commons::ConversionException) {
-              return JSTizenExceptionFactory::postException(context, exception,
-                JSTizenException::TYPE_MISMATCH_ERROR, JSMESSAGING_EXCEPTION_MSG_TYPE_MISMATCH);
+              return JSWebAPIErrorFactory::postException(context, exception,
+                JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, JSMESSAGING_EXCEPTION_MSG_TYPE_MISMATCH);
             }
 
 //            LoggerI(">>>");
@@ -396,8 +394,8 @@ JSValueRef JSMessagingService::createMessage(JSContextRef context, JSObjectRef o
     else
     {
         LoggerD(" Private Object is NULL ");
-        return JSTizenExceptionFactory::postException(context, exception,
-                JSTizenException::NOT_FOUND_ERROR, JSMESSAGING_EXCEPTION_MSG_NOT_FOUND);
+        return JSWebAPIErrorFactory::postException(context, exception,
+                JSWebAPIErrorFactory::NOT_FOUND_ERROR, JSMESSAGING_EXCEPTION_MSG_NOT_FOUND);
     }
 
 }
@@ -421,7 +419,7 @@ JSValueRef JSMessagingService::sendMessage(JSContextRef context,
     if (!priv) {
         LoggerE("Private object is NULL.");
         DeviceAPI::Common::UnknownException err("Private object is NULL.");
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     JSContextRef globalContext = priv->getContext();
@@ -477,17 +475,17 @@ JSValueRef JSMessagingService::sendMessage(JSContextRef context,
     }
     catch(const BasePlatformException& err) {
         LoggerE(err.getMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
     catch (const WrtDeviceApis::Commons::NullPointerException& exc) {
         LoggerE(exc.GetMessage().c_str());
         DeviceAPI::Common::TypeMismatchException err(exc.GetMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
     catch (const WrtDeviceApis::Commons::Exception& exc) {
         LoggerE(exc.GetMessage().c_str());
         DeviceAPI::Common::UnknownException err(exc.GetMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     return JSValueMakeUndefined(context);
@@ -511,7 +509,7 @@ JSValueRef JSMessagingService::loadMessageBody(JSContextRef context,
     if (!priv) {
         LoggerE("Private object is NULL.");
         DeviceAPI::Common::UnknownException err("Private object is NULL.");
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     JSContextRef globalContext = priv->getContext(); //create global Context
@@ -584,17 +582,17 @@ JSValueRef JSMessagingService::loadMessageBody(JSContextRef context,
     }
     catch(const BasePlatformException& err) {
         LoggerE(err.getMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
     catch (const WrtDeviceApis::Commons::NullPointerException& exc) {
         LoggerE(exc.GetMessage().c_str());
         DeviceAPI::Common::TypeMismatchException err(exc.GetMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
     catch (const WrtDeviceApis::Commons::Exception& exc) {
         LoggerE(exc.GetMessage().c_str());
         DeviceAPI::Common::UnknownException err(exc.GetMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     return JSValueMakeUndefined(context);
@@ -618,7 +616,7 @@ JSValueRef JSMessagingService::loadMessageAttachment(JSContextRef context,
     if (!priv) {
         LoggerE("Private object is NULL.");
         DeviceAPI::Common::UnknownException err("Private object is NULL.");
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     JSContextRef globalContext = priv->getContext(); //create global Context
@@ -688,12 +686,12 @@ JSValueRef JSMessagingService::loadMessageAttachment(JSContextRef context,
     }
     catch(const BasePlatformException& err) {
         LoggerE(err.getMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
     catch (const WrtDeviceApis::Commons::Exception& exc) {
         LoggerE(exc.GetMessage().c_str());
         DeviceAPI::Common::UnknownException err(exc.GetMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     return JSValueMakeUndefined(context);
@@ -713,7 +711,7 @@ JSValueRef JSMessagingService::sync(JSContextRef context, JSObjectRef function,
     if (!priv) {
         LoggerE("Private object is NULL.");
         DeviceAPI::Common::UnknownException err("Private object is NULL.");
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     JSContextRef globalContext = priv->getContext(); //get global Context
@@ -765,12 +763,12 @@ JSValueRef JSMessagingService::sync(JSContextRef context, JSObjectRef function,
     }
     catch(const BasePlatformException& err) {
         LoggerE(err.getMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
     catch (const WrtDeviceApis::Commons::Exception& exc) {
         LoggerE(exc.GetMessage().c_str());
         DeviceAPI::Common::UnknownException err(exc.GetMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 }
 
@@ -788,7 +786,7 @@ JSValueRef JSMessagingService::syncFolder(JSContextRef context, JSObjectRef func
     if (!priv) {
         LoggerE("Private object is NULL.");
         DeviceAPI::Common::UnknownException err("Private object is NULL.");
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     JSContextRef globalContext = priv->getContext(); //get global Context
@@ -855,17 +853,17 @@ JSValueRef JSMessagingService::syncFolder(JSContextRef context, JSObjectRef func
     }
     catch(const BasePlatformException& err) {
         LoggerE(err.getMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
     catch (const WrtDeviceApis::Commons::NullPointerException& exc) {
         LoggerE(exc.GetMessage().c_str());
         DeviceAPI::Common::TypeMismatchException err(exc.GetMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
     catch (const WrtDeviceApis::Commons::Exception& exc) {
         LoggerE(exc.GetMessage().c_str());
         DeviceAPI::Common::UnknownException err(exc.GetMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 }
 #if 0
@@ -953,31 +951,31 @@ JSValueRef JSMessagingService::cancelOperation(JSContextRef context, JSObjectRef
         }
         Catch (WrtDeviceApis::Commons::InvalidArgumentException){
             LoggerE("Exception: " << _rethrown_exception.GetMessage());
-            return JSTizenExceptionFactory::postException(context, exception,
-                JSTizenException::INVALID_VALUES_ERROR, JSMESSAGING_EXCEPTION_MSG_INVALID_ARGUMENT);
+            return JSWebAPIErrorFactory::postException(context, exception,
+                JSWebAPIErrorFactory::INVALID_VALUES_ERROR, JSMESSAGING_EXCEPTION_MSG_INVALID_ARGUMENT);
         }
         Catch (WrtDeviceApis::Commons::NotFoundException){
             LoggerE("Exception: " << _rethrown_exception.GetMessage());
-            return JSTizenExceptionFactory::postException(context, exception,
-                JSTizenException::NOT_FOUND_ERROR, JSMESSAGING_EXCEPTION_MSG_NOT_FOUND);
+            return JSWebAPIErrorFactory::postException(context, exception,
+                JSWebAPIErrorFactory::NOT_FOUND_ERROR, JSMESSAGING_EXCEPTION_MSG_NOT_FOUND);
         }
         Catch (WrtDeviceApis::Commons::UnsupportedException){
             LoggerE("Exception: " << _rethrown_exception.GetMessage());
-            return JSTizenExceptionFactory::postException(context, exception,
-                JSTizenException::NOT_SUPPORTED_ERROR, JSMESSAGING_EXCEPTION_MSG_NOT_SUPPORTED);
+            return JSWebAPIErrorFactory::postException(context, exception,
+                JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, JSMESSAGING_EXCEPTION_MSG_NOT_SUPPORTED);
         }
         Catch (WrtDeviceApis::Commons::Exception){
             LoggerE("Exception: " << _rethrown_exception.GetMessage());
-            return JSTizenExceptionFactory::postException(context, exception,
-                JSTizenException::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN);
+            return JSWebAPIErrorFactory::postException(context, exception,
+                JSWebAPIErrorFactory::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN);
         }
 
     }
     else
     {
         LoggerD(" Private Object is NULL ");
-        return JSTizenExceptionFactory::postException(context, exception,
-                    JSTizenException::NOT_FOUND_ERROR, JSMESSAGING_EXCEPTION_MSG_NOT_FOUND);
+        return JSWebAPIErrorFactory::postException(context, exception,
+                    JSWebAPIErrorFactory::NOT_FOUND_ERROR, JSMESSAGING_EXCEPTION_MSG_NOT_FOUND);
     }
 
     LoggerD(">>>");
@@ -994,7 +992,7 @@ JSValueRef JSMessagingService::stopSync(JSContextRef context, JSObjectRef functi
     if (!priv) {
         LoggerE("Private object is NULL.");
         DeviceAPI::Common::UnknownException err("Private object is NULL.");
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     try {
@@ -1060,12 +1058,12 @@ JSValueRef JSMessagingService::stopSync(JSContextRef context, JSObjectRef functi
     }
     catch(const BasePlatformException& err) {
         LoggerE(err.getMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
     catch (const WrtDeviceApis::Commons::Exception& exc) {
         LoggerE(exc.GetMessage().c_str());
         DeviceAPI::Common::UnknownException err(exc.GetMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     return JSValueMakeUndefined(context);
index b94c732..4f38771 100644 (file)
 #include <CommonsJavaScript/JSUtils.h>
 #include <CommonsJavaScript/JSCallbackManager.h>
 #include <CommonsJavaScript/Utils.h>
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 #include <SecurityExceptions.h>
 
-#include <JSWebAPIError.h>
 #include <ArgumentValidator.h>
+#include <Export.h>
 
 #include "JSMessagingServiceManager.h"
 #include "MessagingController.h"
@@ -82,7 +81,7 @@ namespace Messaging {
             { 0, 0, 0 }
     };
 
-    const JSClassRef JSMessagingServiceManager::getClassRef() {
+    const JSClassRef DLL_EXPORT JSMessagingServiceManager::getClassRef() {
         if (!m_jsClassRef) {
             m_jsClassRef = JSClassCreate(&m_classInfo);
         }
@@ -146,7 +145,7 @@ JSValueRef JSMessagingServiceManager::getMessagingServices(JSContextRef context,
     if (!priv) {
         LoggerE("Private object is NULL.");
         DeviceAPI::Common::UnknownException err("Private object is NULL.");
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     JSContextRef gContext = priv->getContext();
@@ -182,12 +181,12 @@ JSValueRef JSMessagingServiceManager::getMessagingServices(JSContextRef context,
     }
     catch(const BasePlatformException& err) {
         LoggerE(err.getMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
     catch (const WrtDeviceApis::Commons::Exception& exc) {
         LoggerE(exc.GetMessage().c_str());
         DeviceAPI::Common::UnknownException err(exc.GetMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     return JSValueMakeUndefined(context);
index db31995..06e2895 100644 (file)
 #include <CommonsJavaScript/JSDOMExceptionFactory.h>
 #include <CommonsJavaScript/SecurityExceptions.h>
 
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 #include <SecurityExceptions.h>
 
-#include <JSWebAPIError.h>
 #include <ArgumentValidator.h>
 #include <JSUtil.h>
 
@@ -169,8 +167,8 @@ bool JSMessagingStorage::hasInstance(JSContextRef context, JSObjectRef construct
         Catch (WrtDeviceApis::Commons::Exception)
         {
             LoggerE("Exception: " << _rethrown_exception.GetMessage());
-            return JSTizenExceptionFactory::postException(context, exception,
-               JSTizenException::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN);
+            return JSWebAPIErrorFactory::postException(context, exception,
+               JSWebAPIErrorFactory::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN);
         }
 
         LoggerD(">>>");
@@ -192,14 +190,14 @@ JSValueRef JSMessagingStorage::addDraftMessage(JSContextRef context, JSObjectRef
     if (!priv) {
         LoggerE("Private object is NULL.");
         DeviceAPI::Common::UnknownException err("Private object is NULL.");
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     MessagingStoragePrivObjPtr objectPriv = priv->getObject();
     if (!objectPriv) {
         LoggerE("objectPriv is NULL.");
         DeviceAPI::Common::UnknownException err("objectPriv is NULL.");
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     WrtDeviceApis::CommonsJavaScript::JSCallbackManagerPtr callbackManager(NULL);
@@ -207,7 +205,7 @@ JSValueRef JSMessagingStorage::addDraftMessage(JSContextRef context, JSObjectRef
     if (!callbackManager) {
         LoggerE("callbackManager is NULL.");
         DeviceAPI::Common::UnknownException err("callbackManager is NULL.");
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     ConverterMessageFactory::ConverterType converter = ConverterMessageFactory::getConverter(context);
@@ -249,27 +247,27 @@ JSValueRef JSMessagingStorage::addDraftMessage(JSContextRef context, JSObjectRef
     }
     catch(const BasePlatformException& err) {
         LoggerE(err.getMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
     catch (const WrtDeviceApis::Commons::ConversionException& exc) {
         LoggerE(exc.GetMessage().c_str());
         DeviceAPI::Common::TypeMismatchException err(exc.GetMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
     catch (const WrtDeviceApis::Commons::NullPointerException& exc) {
         LoggerE(exc.GetMessage().c_str());
         DeviceAPI::Common::TypeMismatchException err(exc.GetMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
     catch (const WrtDeviceApis::Commons::InvalidArgumentException& exc) {
         LoggerE(exc.GetMessage().c_str());
         DeviceAPI::Common::InvalidValuesException err(exc.GetMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
     catch (const WrtDeviceApis::Commons::Exception& exc) {
         LoggerE(exc.GetMessage().c_str());
         DeviceAPI::Common::UnknownException err(exc.GetMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     return JSValueMakeUndefined(context);
@@ -290,14 +288,14 @@ JSValueRef JSMessagingStorage::findMessages(JSContextRef context, JSObjectRef ob
     if (!priv) {
         LoggerE("Private object is NULL.");
         DeviceAPI::Common::UnknownException err("Private object is NULL.");
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     MessagingStoragePrivObjPtr objectPriv = priv->getObject();
     if (!objectPriv) {
         LoggerE("objectPriv is NULL.");
         DeviceAPI::Common::UnknownException err("objectPriv is NULL.");
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     WrtDeviceApis::CommonsJavaScript::JSCallbackManagerPtr callbackManager(NULL);
@@ -305,7 +303,7 @@ JSValueRef JSMessagingStorage::findMessages(JSContextRef context, JSObjectRef ob
     if (!callbackManager) {
         LoggerE("callbackManager is NULL.");
         DeviceAPI::Common::UnknownException err("callbackManager is NULL.");
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     ConverterMessageFactory::ConverterType converter = ConverterMessageFactory::getConverter(context);
@@ -372,27 +370,27 @@ JSValueRef JSMessagingStorage::findMessages(JSContextRef context, JSObjectRef ob
     }
     catch(const BasePlatformException& err) {
         LoggerE(err.getMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
     catch (const WrtDeviceApis::Commons::ConversionException& exc) {
         LoggerE(exc.GetMessage().c_str());
         DeviceAPI::Common::TypeMismatchException err(exc.GetMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
     catch (const WrtDeviceApis::Commons::NullPointerException& exc) {
         LoggerE(exc.GetMessage().c_str());
         DeviceAPI::Common::TypeMismatchException err(exc.GetMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
     catch (const WrtDeviceApis::Commons::InvalidArgumentException& exc) {
         LoggerE(exc.GetMessage().c_str());
         DeviceAPI::Common::InvalidValuesException err(exc.GetMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
     catch (const WrtDeviceApis::Commons::Exception& exc) {
         LoggerE(exc.GetMessage().c_str());
         DeviceAPI::Common::UnknownException err(exc.GetMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     return JSValueMakeUndefined(context);
@@ -412,14 +410,14 @@ JSValueRef JSMessagingStorage::removeMessages(JSContextRef context, JSObjectRef
     if (!priv) {
         LoggerE("Private object is NULL.");
         DeviceAPI::Common::UnknownException err("Private object is NULL.");
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     MessagingStoragePrivObjPtr objectPriv = priv->getObject();
     if (!objectPriv) {
         LoggerE("objectPriv is NULL.");
         DeviceAPI::Common::UnknownException err("objectPriv is NULL.");
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     WrtDeviceApis::CommonsJavaScript::JSCallbackManagerPtr callbackManager(NULL);
@@ -427,7 +425,7 @@ JSValueRef JSMessagingStorage::removeMessages(JSContextRef context, JSObjectRef
     if (!callbackManager) {
         LoggerE("callbackManager is NULL.");
         DeviceAPI::Common::UnknownException err("callbackManager is NULL.");
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     ConverterMessageFactory::ConverterType converter = ConverterMessageFactory::getConverter(context);
@@ -476,27 +474,27 @@ JSValueRef JSMessagingStorage::removeMessages(JSContextRef context, JSObjectRef
     }
     catch(const BasePlatformException& err) {
         LoggerE(err.getMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
     catch (const WrtDeviceApis::Commons::ConversionException& exc) {
         LoggerE(exc.GetMessage().c_str());
         DeviceAPI::Common::TypeMismatchException err(exc.GetMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
     catch (const WrtDeviceApis::Commons::NullPointerException& exc) {
         LoggerE(exc.GetMessage().c_str());
         DeviceAPI::Common::TypeMismatchException err(exc.GetMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
     catch (const WrtDeviceApis::Commons::InvalidArgumentException& exc) {
         LoggerE(exc.GetMessage().c_str());
         DeviceAPI::Common::InvalidValuesException err(exc.GetMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
     catch (const WrtDeviceApis::Commons::Exception& exc) {
         LoggerE(exc.GetMessage().c_str());
         DeviceAPI::Common::UnknownException err(exc.GetMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     return JSValueMakeUndefined(context);
@@ -517,14 +515,14 @@ JSValueRef JSMessagingStorage::updateMessages(JSContextRef context, JSObjectRef
     if (!priv) {
         LoggerE("Private object is NULL.");
         DeviceAPI::Common::UnknownException err("Private object is NULL.");
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     MessagingStoragePrivObjPtr objectPriv = priv->getObject();
     if (!objectPriv) {
         LoggerE("objectPriv is NULL.");
         DeviceAPI::Common::UnknownException err("objectPriv is NULL.");
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     WrtDeviceApis::CommonsJavaScript::JSCallbackManagerPtr callbackManager(NULL);
@@ -532,7 +530,7 @@ JSValueRef JSMessagingStorage::updateMessages(JSContextRef context, JSObjectRef
     if (!callbackManager) {
         LoggerE("callbackManager is NULL.");
         DeviceAPI::Common::UnknownException err("callbackManager is NULL.");
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     ConverterMessageFactory::ConverterType converter = ConverterMessageFactory::getConverter(context);
@@ -582,27 +580,27 @@ JSValueRef JSMessagingStorage::updateMessages(JSContextRef context, JSObjectRef
     }
     catch(const BasePlatformException& err) {
         LoggerE(err.getMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
     catch (const WrtDeviceApis::Commons::ConversionException& exc) {
         LoggerE(exc.GetMessage().c_str());
         DeviceAPI::Common::TypeMismatchException err(exc.GetMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
     catch (const WrtDeviceApis::Commons::NullPointerException& exc) {
         LoggerE(exc.GetMessage().c_str());
         DeviceAPI::Common::TypeMismatchException err(exc.GetMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
     catch (const WrtDeviceApis::Commons::InvalidArgumentException& exc) {
         LoggerE(exc.GetMessage().c_str());
         DeviceAPI::Common::InvalidValuesException err(exc.GetMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
     catch (const WrtDeviceApis::Commons::Exception& exc) {
         LoggerE(exc.GetMessage().c_str());
         DeviceAPI::Common::UnknownException err(exc.GetMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     return JSValueMakeUndefined(context);
@@ -622,14 +620,14 @@ JSValueRef JSMessagingStorage::findConversations(JSContextRef context, JSObjectR
     if (!priv) {
         LoggerE("Private object is NULL.");
         DeviceAPI::Common::UnknownException err("Private object is NULL.");
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     MessagingStoragePrivObjPtr objectPriv = priv->getObject();
     if (!objectPriv) {
         LoggerE("objectPriv is NULL.");
         DeviceAPI::Common::UnknownException err("objectPriv is NULL.");
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     WrtDeviceApis::CommonsJavaScript::JSCallbackManagerPtr callbackManager(NULL);
@@ -637,7 +635,7 @@ JSValueRef JSMessagingStorage::findConversations(JSContextRef context, JSObjectR
     if (!callbackManager) {
         LoggerE("callbackManager is NULL.");
         DeviceAPI::Common::UnknownException err("callbackManager is NULL.");
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     ConverterMessageFactory::ConverterType converter = ConverterMessageFactory::getConverter(context);
@@ -704,27 +702,27 @@ JSValueRef JSMessagingStorage::findConversations(JSContextRef context, JSObjectR
     }
     catch(const BasePlatformException& err) {
         LoggerE(err.getMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
     catch (const WrtDeviceApis::Commons::ConversionException& exc) {
         LoggerE(exc.GetMessage().c_str());
         DeviceAPI::Common::TypeMismatchException err(exc.GetMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
     catch (const WrtDeviceApis::Commons::NullPointerException& exc) {
         LoggerE(exc.GetMessage().c_str());
         DeviceAPI::Common::TypeMismatchException err(exc.GetMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
     catch (const WrtDeviceApis::Commons::InvalidArgumentException& exc) {
         LoggerE(exc.GetMessage().c_str());
         DeviceAPI::Common::InvalidValuesException err(exc.GetMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
     catch (const WrtDeviceApis::Commons::Exception& exc) {
         LoggerE(exc.GetMessage().c_str());
         DeviceAPI::Common::UnknownException err(exc.GetMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     return JSValueMakeUndefined(context);
@@ -744,14 +742,14 @@ JSValueRef JSMessagingStorage::removeConversations(JSContextRef context, JSObjec
     if (!priv) {
         LoggerE("Private object is NULL.");
         DeviceAPI::Common::UnknownException err("Private object is NULL.");
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     MessagingStoragePrivObjPtr objectPriv = priv->getObject();
     if (!objectPriv) {
         LoggerE("objectPriv is NULL.");
         DeviceAPI::Common::UnknownException err("objectPriv is NULL.");
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     WrtDeviceApis::CommonsJavaScript::JSCallbackManagerPtr callbackManager(NULL);
@@ -759,7 +757,7 @@ JSValueRef JSMessagingStorage::removeConversations(JSContextRef context, JSObjec
     if (!callbackManager) {
         LoggerE("callbackManager is NULL.");
         DeviceAPI::Common::UnknownException err("callbackManager is NULL.");
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     ConverterMessageFactory::ConverterType converter = ConverterMessageFactory::getConverter(context);
@@ -809,27 +807,27 @@ JSValueRef JSMessagingStorage::removeConversations(JSContextRef context, JSObjec
     }
     catch(const BasePlatformException& err) {
         LoggerE(err.getMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
     catch (const WrtDeviceApis::Commons::ConversionException& exc) {
         LoggerE(exc.GetMessage().c_str());
         DeviceAPI::Common::TypeMismatchException err(exc.GetMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
     catch (const WrtDeviceApis::Commons::NullPointerException& exc) {
         LoggerE(exc.GetMessage().c_str());
         DeviceAPI::Common::TypeMismatchException err(exc.GetMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
     catch (const WrtDeviceApis::Commons::InvalidArgumentException& exc) {
         LoggerE(exc.GetMessage().c_str());
         DeviceAPI::Common::InvalidValuesException err(exc.GetMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
     catch (const WrtDeviceApis::Commons::Exception& exc) {
         LoggerE(exc.GetMessage().c_str());
         DeviceAPI::Common::UnknownException err(exc.GetMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     return JSValueMakeUndefined(context);
@@ -849,14 +847,14 @@ JSValueRef JSMessagingStorage::findFolders(JSContextRef context, JSObjectRef obj
     if (!priv) {
         LoggerE("Private object is NULL.");
         DeviceAPI::Common::UnknownException err("Private object is NULL.");
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     MessagingStoragePrivObjPtr objectPriv = priv->getObject();
     if (!objectPriv) {
         LoggerE("objectPriv is NULL.");
         DeviceAPI::Common::UnknownException err("objectPriv is NULL.");
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     WrtDeviceApis::CommonsJavaScript::JSCallbackManagerPtr callbackManager(NULL);
@@ -864,7 +862,7 @@ JSValueRef JSMessagingStorage::findFolders(JSContextRef context, JSObjectRef obj
     if (!callbackManager) {
         LoggerE("callbackManager is NULL.");
         DeviceAPI::Common::UnknownException err("callbackManager is NULL.");
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     ConverterMessageFactory::ConverterType converter = ConverterMessageFactory::getConverter(context);
@@ -910,27 +908,27 @@ JSValueRef JSMessagingStorage::findFolders(JSContextRef context, JSObjectRef obj
     }
     catch(const BasePlatformException& err) {
         LoggerE(err.getMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
     catch (const WrtDeviceApis::Commons::ConversionException& exc) {
         LoggerE(exc.GetMessage().c_str());
         DeviceAPI::Common::TypeMismatchException err(exc.GetMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
     catch (const WrtDeviceApis::Commons::NullPointerException& exc) {
         LoggerE(exc.GetMessage().c_str());
         DeviceAPI::Common::TypeMismatchException err(exc.GetMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
     catch (const WrtDeviceApis::Commons::InvalidArgumentException& exc) {
         LoggerE(exc.GetMessage().c_str());
         DeviceAPI::Common::InvalidValuesException err(exc.GetMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
     catch (const WrtDeviceApis::Commons::Exception& exc) {
         LoggerE(exc.GetMessage().c_str());
         DeviceAPI::Common::UnknownException err(exc.GetMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     return JSValueMakeUndefined(context);
@@ -951,14 +949,14 @@ JSValueRef JSMessagingStorage::addMessagesChangeListener(JSContextRef context, J
     if (!priv) {
         LoggerE("Private object is NULL.");
         DeviceAPI::Common::UnknownException err("Private object is NULL.");
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     MessagingStoragePrivObjPtr objectPriv = priv->getObject();
     if (!objectPriv) {
         LoggerE("objectPriv is NULL.");
         DeviceAPI::Common::UnknownException err("objectPriv is NULL.");
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     WrtDeviceApis::CommonsJavaScript::JSCallbackManagerPtr callbackManager(NULL);
@@ -1041,32 +1039,32 @@ JSValueRef JSMessagingStorage::addMessagesChangeListener(JSContextRef context, J
     }
     catch(const BasePlatformException& err) {
         LoggerE(err.getMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
     catch (const WrtDeviceApis::Commons::ConversionException& exc) {
         LoggerE(exc.GetMessage().c_str());
         DeviceAPI::Common::TypeMismatchException err(exc.GetMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
     catch (const WrtDeviceApis::Commons::InvalidArgumentException& exc) {
         LoggerE(exc.GetMessage().c_str());
         DeviceAPI::Common::InvalidValuesException err(exc.GetMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
     catch (const WrtDeviceApis::Commons::UnsupportedException& exc) {
         LoggerE(exc.GetMessage().c_str());
         DeviceAPI::Common::InvalidValuesException err(exc.GetMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
     catch (const WrtDeviceApis::Commons::AlreadyInUseException& exc) {
         LoggerE(exc.GetMessage().c_str());
         DeviceAPI::Common::InvalidValuesException err(exc.GetMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
     catch (const WrtDeviceApis::Commons::Exception& exc) {
         LoggerE(exc.GetMessage().c_str());
         DeviceAPI::Common::UnknownException err(exc.GetMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 }
 
@@ -1084,14 +1082,14 @@ JSValueRef JSMessagingStorage::addConversationsChangeListener(JSContextRef conte
     if (!priv) {
         LoggerE("Private object is NULL.");
         DeviceAPI::Common::UnknownException err("Private object is NULL.");
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     MessagingStoragePrivObjPtr objectPriv = priv->getObject();
     if (!objectPriv) {
         LoggerE("objectPriv is NULL.");
         DeviceAPI::Common::UnknownException err("objectPriv is NULL.");
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     WrtDeviceApis::CommonsJavaScript::JSCallbackManagerPtr callbackManager(NULL);
@@ -1176,32 +1174,32 @@ JSValueRef JSMessagingStorage::addConversationsChangeListener(JSContextRef conte
     }
     catch(const BasePlatformException& err) {
         LoggerE(err.getMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
     catch (const WrtDeviceApis::Commons::ConversionException& exc) {
         LoggerE(exc.GetMessage().c_str());
         DeviceAPI::Common::TypeMismatchException err(exc.GetMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
     catch (const WrtDeviceApis::Commons::InvalidArgumentException& exc) {
         LoggerE(exc.GetMessage().c_str());
         DeviceAPI::Common::InvalidValuesException err(exc.GetMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
     catch (const WrtDeviceApis::Commons::UnsupportedException& exc) {
         LoggerE(exc.GetMessage().c_str());
         DeviceAPI::Common::InvalidValuesException err(exc.GetMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
     catch (const WrtDeviceApis::Commons::AlreadyInUseException& exc) {
         LoggerE(exc.GetMessage().c_str());
         DeviceAPI::Common::InvalidValuesException err(exc.GetMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
     catch (const WrtDeviceApis::Commons::Exception& exc) {
         LoggerE(exc.GetMessage().c_str());
         DeviceAPI::Common::UnknownException err(exc.GetMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 }
 
@@ -1220,14 +1218,14 @@ JSValueRef JSMessagingStorage::addFoldersChangeListener(JSContextRef context, JS
     if (!priv) {
         LoggerE("Private object is NULL.");
         DeviceAPI::Common::UnknownException err("Private object is NULL.");
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     MessagingStoragePrivObjPtr objectPriv = priv->getObject();
     if (!objectPriv) {
         LoggerE("objectPriv is NULL.");
         DeviceAPI::Common::UnknownException err("objectPriv is NULL.");
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     WrtDeviceApis::CommonsJavaScript::JSCallbackManagerPtr callbackManager(NULL);
@@ -1310,32 +1308,32 @@ JSValueRef JSMessagingStorage::addFoldersChangeListener(JSContextRef context, JS
     }
     catch(const BasePlatformException& err) {
         LoggerE(err.getMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
     catch (const WrtDeviceApis::Commons::ConversionException& exc) {
         LoggerE(exc.GetMessage().c_str());
         DeviceAPI::Common::TypeMismatchException err(exc.GetMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
     catch (const WrtDeviceApis::Commons::InvalidArgumentException& exc) {
         LoggerE(exc.GetMessage().c_str());
         DeviceAPI::Common::InvalidValuesException err(exc.GetMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
     catch (const WrtDeviceApis::Commons::UnsupportedException& exc) {
         LoggerE(exc.GetMessage().c_str());
         DeviceAPI::Common::InvalidValuesException err(exc.GetMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
     catch (const WrtDeviceApis::Commons::AlreadyInUseException& exc) {
         LoggerE(exc.GetMessage().c_str());
         DeviceAPI::Common::InvalidValuesException err(exc.GetMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
     catch (const WrtDeviceApis::Commons::Exception& exc) {
         LoggerE(exc.GetMessage().c_str());
         DeviceAPI::Common::UnknownException err(exc.GetMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 }
 
@@ -1353,14 +1351,14 @@ JSValueRef JSMessagingStorage::removeChangeListener(JSContextRef context, JSObje
     if (!priv) {
         LoggerE("Private object is NULL.");
         DeviceAPI::Common::UnknownException err("Private object is NULL.");
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     MessagingStoragePrivObjPtr objectPriv = priv->getObject();
     if (!objectPriv) {
         LoggerE("objectPriv is NULL.");
         DeviceAPI::Common::UnknownException err("objectPriv is NULL.");
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     WrtDeviceApis::CommonsJavaScript::JSCallbackManagerPtr callbackManager(NULL);
@@ -1392,22 +1390,22 @@ JSValueRef JSMessagingStorage::removeChangeListener(JSContextRef context, JSObje
     }
     catch(const BasePlatformException& err) {
         LoggerE(err.getMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
     catch (const WrtDeviceApis::Commons::ConversionException& exc) {
         LoggerE(exc.GetMessage().c_str());
         DeviceAPI::Common::TypeMismatchException err(exc.GetMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
     catch (const WrtDeviceApis::Commons::InvalidArgumentException& exc) {
         LoggerE(exc.GetMessage().c_str());
         DeviceAPI::Common::InvalidValuesException err(exc.GetMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
     catch (const WrtDeviceApis::Commons::Exception& exc) {
         LoggerE(exc.GetMessage().c_str());
         DeviceAPI::Common::UnknownException err(exc.GetMessage().c_str());
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
     return JSValueMakeUndefined(context);
index 8caafe0..5852d86 100644 (file)
@@ -486,10 +486,11 @@ void MailSync::OnEventReceived(const DBus::MessageEvent& event)
                                                        if (err == EMAIL_ERROR_NONE) {
                                                                LoggerD("attachment Name : " << attachment_data->attachment_name);
                                                                LoggerD("attachment ID : " << attachment_data->attachment_id);
-                                                               LoggerD("attachment attachment_mime_type : " << attachment_data->attachment_mime_type);
+
                                                                attachment->init(attachment_data->attachment_path, false);
                                                                if(attachment_data->attachment_mime_type)
                                                                {
+                                                                       LoggerD("attachment attachment_mime_type : " << attachment_data->attachment_mime_type);
                                                                        attachment->setMimeType(attachment_data->attachment_mime_type);
                                                                }
                                                                LoggerD("attachment getMimeTypes : " << attachment->getMimeType());
index 5f7045d..09c3736 100755 (executable)
 //
 
 #include "MessageAsyncCallbackManager.h"
-#include <dpl/singleton_impl.h>
-
-using namespace DPL;
-
-IMPLEMENT_SINGLETON(DeviceAPI::Messaging::MessageAsyncCallbackManager)
 
 namespace DeviceAPI {
 namespace Messaging {
 
+SINGLETON_IMPLEMENTATION(MessageAsyncCallbackManager)
+
 } // Tizen1_0
 } // TizenApis
index 8e98ca1..991e677 100644 (file)
@@ -18,7 +18,6 @@
 #ifndef _TIZEN_MESSAGING_ASYNC_CALLBACK_MANAGER_H_
 #define _TIZEN_MESSAGING_ASYNC_CALLBACK_MANAGER_H_
 
-#include <dpl/singleton.h>
 #include <AsyncCallbackManager.h>
 
 namespace DeviceAPI {
@@ -27,22 +26,23 @@ namespace Messaging {
 
 class MessageAsyncCallbackManager : public DeviceAPI::Common::AsyncCallbackManager
 {
-public:
+private:
        MessageAsyncCallbackManager()
        {
        }
 
+public:
        virtual ~MessageAsyncCallbackManager()
        {
        }
 
-       friend class DPL::Singleton<MessageAsyncCallbackManager>;
+       friend class MessageAsyncCallbackManagerSingleton;
 };
 
-typedef DPL::Singleton<MessageAsyncCallbackManager> MessageAsyncCallbackManagerSingleton;
+SINGLETON_DEFINITION(MessageAsyncCallbackManager)
 
 
 } // Tizen1_0
 } // TizenApis
 
-#endif // _TIZEN_MESSAGING_ASYNC_CALLBACK_MANAGER_H_
\ No newline at end of file
+#endif // _TIZEN_MESSAGING_ASYNC_CALLBACK_MANAGER_H_
index f195050..94cc8e5 100755 (executable)
 //
 
 #include "MessageListenerManager.h"
-#include <dpl/singleton_impl.h>
-
-using namespace DPL;
-
-IMPLEMENT_SINGLETON(DeviceAPI::Messaging::MessageListenerManager)
 
 namespace DeviceAPI {
 namespace Messaging {
 
+SINGLETON_IMPLEMENTATION(MessageListenerManager)
+
 } // Tizen1_0
 } // TizenApis
index 1d41879..4580a57 100644 (file)
@@ -21,7 +21,6 @@
 #include <map>
 #include <JavaScriptCore/JavaScript.h>
 #include <dpl/shared_ptr.h>
-#include <dpl/singleton.h>
 #include <IListenerManager.h>
 #include "JSMessagingStorage.h"
 #include <Logger.h>
@@ -33,16 +32,19 @@ using namespace DeviceAPI::Messaging;
 
 class MessageListenerManager : public DeviceAPI::Common::IListenerController
 {
-public:
+private:
        MessageListenerManager()
        {
        }
 
+public:
        virtual ~MessageListenerManager()
        {
        }
+
+       friend class MessageListenerManagerSingleton;
 };
-typedef DPL::Singleton<MessageListenerManager> MessageListenerManagerSingleton;
+SINGLETON_DEFINITION(MessageListenerManager)
 
 class MessageListenerCanceller : public DeviceAPI::Common::IListenerItem
 {
index f4ce798..e88d5a5 100644 (file)
@@ -106,12 +106,12 @@ namespace DeviceAPI {
                MessageQueryGenerator::~MessageQueryGenerator() {
                }
 
-               void MessageQueryGenerator::reset(QueryGeneratorMode mode){
+               void MessageQueryGenerator::reset(QueryGeneratorMode mode, int limit, int offset){
                        m_query.clear();
                        m_queryVector.clear();
 
-                       m_limit     = 0;
-                       m_offset    = 0;
+                       m_limit     = limit;
+                       m_offset    = offset;
                        m_mode      = mode;
 
                        m_query.append(getQueryPrefix());
@@ -574,7 +574,10 @@ namespace DeviceAPI {
                                                retClause = emfAttributeName + "=" + convertMessageTypeToString(valueString);
                                                break;
                                        } else if(attrName.compare(MessageFilterValidatorFactory::ATTRIBUTE_BODY)==0) {
-                                               retClause = emfAttributeName + " ='" + valueString + "'";
+                                               retClause = emfAttributeName + " LIKE '" + valueString + "'";
+                                               break;
+                                       } else if(attrName.compare(MessageFilterValidatorFactory::ATTRIBUTE_SUBJECT)==0) {
+                                               retClause = emfAttributeName + " LIKE '" + valueString + "'";
                                                break;
                                        }
 
@@ -851,6 +854,7 @@ namespace DeviceAPI {
 
                        if(m_sortMode != NULL)
                        {
+                               LoggerD("m_sortMode exist");
                                std::string platformAttrName = convertToEmfAttrName(m_sortMode->getAttributeName());
                                std::string sortModeString;
                                if(m_sortMode->getOrder() == ASCENDING_SORT_ORDER){
@@ -864,6 +868,10 @@ namespace DeviceAPI {
                        if(m_limit != 0){
                                buffer << " LIMIT "  << m_offset  << "," << m_limit;
                        }
+                       else
+                       {
+                               buffer << " LIMIT "  << m_offset  << ", -1";
+                       }
 
                        m_orderLimit.append(buffer.str());
 
index 68d9469..d9dc314 100644 (file)
@@ -101,7 +101,7 @@ namespace DeviceAPI {
                                        return m_serviceType;
                                }                               
 
-                               void reset(QueryGeneratorMode mode);
+                               void reset(QueryGeneratorMode mode, int limit, int offset);
 
                        protected:
                                virtual void setEmailAttributeMap();
index db9d3e4..f86edb4 100644 (file)
@@ -2452,9 +2452,11 @@ std::vector<IConversationPtr> Messaging::queryConversations(const DeviceAPI::Tiz
        switch(type){
                case EMAIL:{
                        LoggerD("type is EMAIL:[" << conversationType <<"]");
-                       queryGenerator->reset(MessageQueryGenerator::MODE_EMAIL);
+                       queryGenerator->reset(MessageQueryGenerator::MODE_EMAIL, limit, offset);
                        filter->travel(filterVisitor, 0);
                        filterSql = queryGenerator->getQuery();
+                       orderLimitSql = queryGenerator->getOrderLimit();
+                       filterSql.append(orderLimitSql);
 //                     LOGD("filterSql:[%s]",  filterSql.c_str());
                        result = queryEmailConversation(filterSql);
                        break;
@@ -2462,7 +2464,7 @@ std::vector<IConversationPtr> Messaging::queryConversations(const DeviceAPI::Tiz
 
                case SMS:{
                        LoggerD("type is SMS:[" << conversationType <<"]");
-                       queryGenerator->reset(MessageQueryGenerator::MODE_SMS);
+                       queryGenerator->reset(MessageQueryGenerator::MODE_SMS, limit, offset);
                        IFilterVisitorPtr filterVisitor = DPL::StaticPointerCast<IFilterVisitor>(queryGenerator);
                        filter->travel(filterVisitor, 0);
                        filterSql = queryGenerator->getQuery();
@@ -2475,7 +2477,7 @@ std::vector<IConversationPtr> Messaging::queryConversations(const DeviceAPI::Tiz
 
                case MMS:{
                        LoggerD("type is MMS:[" << conversationType <<"]");
-                       queryGenerator->reset(MessageQueryGenerator::MODE_MMS);
+                       queryGenerator->reset(MessageQueryGenerator::MODE_MMS, limit, offset);
                        IFilterVisitorPtr filterVisitor = DPL::StaticPointerCast<IFilterVisitor>(queryGenerator);
                        filter->travel(filterVisitor, 0);
                        filterSql = queryGenerator->getQuery();
index 9b126bf..4986daf 100644 (file)
@@ -18,8 +18,7 @@
 #include <Commons/Exception.h>
 #include <CommonsJavaScript/JSDOMExceptionFactory.h>
 #include <JavaScriptCore/JavaScript.h>
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 #include <SecurityExceptions.h>
 
 #include "MessagingErrorMsg.h"
@@ -100,20 +99,20 @@ void MessagingController::OnAnswerReceived(const EventGetMessagingServicePtr &ev
                WrtDeviceApis::Commons::ExceptionCodes::Enumeration exception = event->getExceptionCode();
                switch(exception) {
                        case WrtDeviceApis::Commons::ExceptionCodes::InvalidArgumentException:
-                               errorObject = JSTizenExceptionFactory::makeErrorObject(context,         
-                                               JSTizenException::INVALID_VALUES_ERROR, JSMESSAGING_EXCEPTION_MSG_INVALID_ARGUMENT);
+                               errorObject = JSWebAPIErrorFactory::makeErrorObject(context,            
+                                               JSWebAPIErrorFactory::INVALID_VALUES_ERROR, JSMESSAGING_EXCEPTION_MSG_INVALID_ARGUMENT);
                                break;
                        case WrtDeviceApis::Commons::ExceptionCodes::PlatformException:
-                               errorObject = JSTizenExceptionFactory::makeErrorObject(context,         
-                                               JSTizenException::IO_ERROR, JSMESSAGING_EXCEPTION_MSG_IO);
+                               errorObject = JSWebAPIErrorFactory::makeErrorObject(context,            
+                                               JSWebAPIErrorFactory::IO_ERROR, JSMESSAGING_EXCEPTION_MSG_IO);
                        break;
                        case WrtDeviceApis::Commons::ExceptionCodes::PlatformWrongStateException:
-                               errorObject = JSTizenExceptionFactory::makeErrorObject(context,         
-                                               JSTizenException::NOT_SUPPORTED_ERROR, JSMESSAGING_EXCEPTION_MSG_NOT_SUPPORTED);
+                               errorObject = JSWebAPIErrorFactory::makeErrorObject(context,            
+                                               JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, JSMESSAGING_EXCEPTION_MSG_NOT_SUPPORTED);
                        break;
                        default:
-                               errorObject = JSTizenExceptionFactory::makeErrorObject(context,         
-                                               JSTizenException::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN);
+                               errorObject = JSWebAPIErrorFactory::makeErrorObject(context,            
+                                               JSWebAPIErrorFactory::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN);
                                break;
                }
                callbackManager->callOnError(errorObject);
@@ -154,8 +153,8 @@ void MessagingController::OnAnswerReceived(const EventMessagingServicePtr &event
                        if(msg)
                                callbackManager->callOnSuccess(msg);
                        else
-                               callbackManager->callOnError( JSTizenExceptionFactory::makeErrorObject(globalContext,
-                                               JSTizenException::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN));
+                               callbackManager->callOnError( JSWebAPIErrorFactory::makeErrorObject(globalContext,
+                                               JSWebAPIErrorFactory::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN));
                }
                else
                {
@@ -178,8 +177,8 @@ void MessagingController::OnAnswerReceived(const EventMessagingServicePtr &event
                        if ( attachment)
                                callbackManager->callOnSuccess(attachment);
                        else
-                               callbackManager->callOnError( JSTizenExceptionFactory::makeErrorObject(globalContext,
-                                               JSTizenException::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN));
+                               callbackManager->callOnError( JSWebAPIErrorFactory::makeErrorObject(globalContext,
+                                               JSWebAPIErrorFactory::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN));
                }
                else
                {
@@ -226,12 +225,12 @@ void MessagingController::OnAnswerReceived(const EventMessagingServicePtr &event
                        switch (event->getExceptionCode()) {
                                case WrtDeviceApis::Commons::ExceptionCodes::PlatformException:
                                case WrtDeviceApis::Commons::ExceptionCodes::ConversionException:
-                                       error = JSTizenExceptionFactory::makeErrorObject(globalContext,           
-                                                 JSTizenException::INVALID_VALUES_ERROR, JSMESSAGING_EXCEPTION_MSG_INVALID_ARGUMENT);
+                                       error = JSWebAPIErrorFactory::makeErrorObject(globalContext,      
+                                                 JSWebAPIErrorFactory::INVALID_VALUES_ERROR, JSMESSAGING_EXCEPTION_MSG_INVALID_ARGUMENT);
                                        break;
                                default:
-                                       error = JSTizenExceptionFactory::makeErrorObject(globalContext,           
-                                                 JSTizenException::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN);
+                                       error = JSWebAPIErrorFactory::makeErrorObject(globalContext,      
+                                                 JSWebAPIErrorFactory::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN);
                                        break;
                        }
                  }
@@ -296,12 +295,12 @@ void MessagingController::OnAnswerReceived(const EventSendMessagePtr& event)
         switch (event->getExceptionCode()) {
         case WrtDeviceApis::Commons::ExceptionCodes::PlatformException:
         case WrtDeviceApis::Commons::ExceptionCodes::ConversionException:
-                       error = JSTizenExceptionFactory::makeErrorObject(context,               
-                                               JSTizenException::INVALID_VALUES_ERROR, JSMESSAGING_EXCEPTION_MSG_INVALID_ARGUMENT);
+                       error = JSWebAPIErrorFactory::makeErrorObject(context,          
+                                               JSWebAPIErrorFactory::INVALID_VALUES_ERROR, JSMESSAGING_EXCEPTION_MSG_INVALID_ARGUMENT);
                        break;
         default:
-            error = JSTizenExceptionFactory::makeErrorObject(context,          
-                                               JSTizenException::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN);
+            error = JSWebAPIErrorFactory::makeErrorObject(context,             
+                                               JSWebAPIErrorFactory::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN);
                        break;
         }
     }
index ae36649..1e1d5e7 100644 (file)
@@ -24,8 +24,7 @@
 #include "StorageChangesConversationGenerator.h"
 #include "StorageChangesFolderGenerator.h"
 
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 #include <SecurityExceptions.h>
 
 #include "MessagingErrorMsg.h"
@@ -103,23 +102,23 @@ void MessagingListener::OnAnswerReceived(
     }
     Catch(WrtDeviceApis::Commons::PlatformException) {
         LoggerE("platform error");
-        callbackManager->callOnError(JSTizenExceptionFactory::makeErrorObject(context,         
-                                               JSTizenException::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN));
+        callbackManager->callOnError(JSWebAPIErrorFactory::makeErrorObject(context,            
+                                               JSWebAPIErrorFactory::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN));
     }
     Catch(WrtDeviceApis::Commons::ConversionException) {
         LoggerE("conversion error");
-        callbackManager->callOnError(JSTizenExceptionFactory::makeErrorObject(context,         
-                                               JSTizenException::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN));
+        callbackManager->callOnError(JSWebAPIErrorFactory::makeErrorObject(context,            
+                                               JSWebAPIErrorFactory::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN));
     }
     Catch(WrtDeviceApis::Commons::InvalidArgumentException) {
         LoggerE("InvalidArgument error");
-        callbackManager->callOnError(JSTizenExceptionFactory::makeErrorObject(context,         
-                                               JSTizenException::INVALID_VALUES_ERROR, JSMESSAGING_EXCEPTION_MSG_INVALID_ARGUMENT));
+        callbackManager->callOnError(JSWebAPIErrorFactory::makeErrorObject(context,            
+                                               JSWebAPIErrorFactory::INVALID_VALUES_ERROR, JSMESSAGING_EXCEPTION_MSG_INVALID_ARGUMENT));
     }
     Catch(WrtDeviceApis::Commons::UnknownException) {
         LoggerE("unknown error");
-        callbackManager->callOnError(JSTizenExceptionFactory::makeErrorObject(context,         
-                                               JSTizenException::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN));
+        callbackManager->callOnError(JSWebAPIErrorFactory::makeErrorObject(context,            
+                                               JSWebAPIErrorFactory::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN));
     }
 
 }
@@ -164,27 +163,27 @@ void MessagingListener::OnAnswerReceived(
     }
     Catch(WrtDeviceApis::Commons::PlatformException) {
         LoggerE("platform error");
-        callbackManager->callOnError(JSTizenExceptionFactory::makeErrorObject(context,         
-                                               JSTizenException::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN));
+        callbackManager->callOnError(JSWebAPIErrorFactory::makeErrorObject(context,            
+                                               JSWebAPIErrorFactory::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN));
     }
 
     Catch(WrtDeviceApis::Commons::ConversionException) {
         LoggerE("conversion error");
-        callbackManager->callOnError(JSTizenExceptionFactory::makeErrorObject(context,         
-                                               JSTizenException::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN));
+        callbackManager->callOnError(JSWebAPIErrorFactory::makeErrorObject(context,            
+                                               JSWebAPIErrorFactory::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN));
     }
 
     Catch(WrtDeviceApis::Commons::InvalidArgumentException) 
     {
         LoggerE("conversion error");
-        callbackManager->callOnError(JSTizenExceptionFactory::makeErrorObject(context,         
-                                               JSTizenException::INVALID_VALUES_ERROR, JSMESSAGING_EXCEPTION_MSG_INVALID_ARGUMENT));
+        callbackManager->callOnError(JSWebAPIErrorFactory::makeErrorObject(context,            
+                                               JSWebAPIErrorFactory::INVALID_VALUES_ERROR, JSMESSAGING_EXCEPTION_MSG_INVALID_ARGUMENT));
     }
 
     Catch(WrtDeviceApis::Commons::UnknownException) {
         LoggerE("unknown error");
-        callbackManager->callOnError(JSTizenExceptionFactory::makeErrorObject(context,         
-                                               JSTizenException::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN));
+        callbackManager->callOnError(JSWebAPIErrorFactory::makeErrorObject(context,            
+                                               JSWebAPIErrorFactory::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN));
     }
 }
 
@@ -220,20 +219,20 @@ void MessagingListener::OnAnswerReceived(
 
     Catch(WrtDeviceApis::Commons::PlatformException) {
         LoggerE("platform error");
-        callbackManager->callOnError(JSTizenExceptionFactory::makeErrorObject(context,         
-                                               JSTizenException::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN));
+        callbackManager->callOnError(JSWebAPIErrorFactory::makeErrorObject(context,            
+                                               JSWebAPIErrorFactory::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN));
     }
 
     Catch(WrtDeviceApis::Commons::ConversionException) {
         LoggerE("conversion error");
-        callbackManager->callOnError(JSTizenExceptionFactory::makeErrorObject(context,         
-                                               JSTizenException::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN));
+        callbackManager->callOnError(JSWebAPIErrorFactory::makeErrorObject(context,            
+                                               JSWebAPIErrorFactory::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN));
     }
 
     Catch(WrtDeviceApis::Commons::UnknownException) {
         LoggerE("unknown error");
-        callbackManager->callOnError(JSTizenExceptionFactory::makeErrorObject(context,         
-                                               JSTizenException::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN));
+        callbackManager->callOnError(JSWebAPIErrorFactory::makeErrorObject(context,            
+                                               JSWebAPIErrorFactory::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN));
     }
 
 }
@@ -270,20 +269,20 @@ void MessagingListener::OnAnswerReceived(
 
     Catch(WrtDeviceApis::Commons::PlatformException) {
         LoggerE("platform error");
-        callbackManager->callOnError(JSTizenExceptionFactory::makeErrorObject(context,         
-                                               JSTizenException::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN));
+        callbackManager->callOnError(JSWebAPIErrorFactory::makeErrorObject(context,            
+                                               JSWebAPIErrorFactory::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN));
     }
 
     Catch(WrtDeviceApis::Commons::ConversionException) {
         LoggerE("conversion error");
-        callbackManager->callOnError(JSTizenExceptionFactory::makeErrorObject(context,         
-                                               JSTizenException::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN));
+        callbackManager->callOnError(JSWebAPIErrorFactory::makeErrorObject(context,            
+                                               JSWebAPIErrorFactory::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN));
     }
 
     Catch(WrtDeviceApis::Commons::UnknownException) {
         LoggerE("unknown error");
-        callbackManager->callOnError(JSTizenExceptionFactory::makeErrorObject(context,         
-                                               JSTizenException::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN));
+        callbackManager->callOnError(JSWebAPIErrorFactory::makeErrorObject(context,            
+                                               JSWebAPIErrorFactory::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN));
     }
 
 }
@@ -320,20 +319,20 @@ void MessagingListener::OnAnswerReceived(
 
     Catch(WrtDeviceApis::Commons::PlatformException) {
         LoggerE("platform error");
-        callbackManager->callOnError(JSTizenExceptionFactory::makeErrorObject(context,         
-                                               JSTizenException::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN));
+        callbackManager->callOnError(JSWebAPIErrorFactory::makeErrorObject(context,            
+                                               JSWebAPIErrorFactory::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN));
     }
 
     Catch(WrtDeviceApis::Commons::ConversionException) {
         LoggerE("conversion error");
-        callbackManager->callOnError(JSTizenExceptionFactory::makeErrorObject(context,         
-                                               JSTizenException::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN));
+        callbackManager->callOnError(JSWebAPIErrorFactory::makeErrorObject(context,            
+                                               JSWebAPIErrorFactory::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN));
     }
 
     Catch(WrtDeviceApis::Commons::UnknownException) {
         LoggerE("conversion error");
-        callbackManager->callOnError(JSTizenExceptionFactory::makeErrorObject(context,         
-                                               JSTizenException::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN));
+        callbackManager->callOnError(JSWebAPIErrorFactory::makeErrorObject(context,            
+                                               JSWebAPIErrorFactory::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN));
     }
 }
 
@@ -377,26 +376,26 @@ void MessagingListener::OnAnswerReceived(const EventQueryConversationsPtr& event
        Catch(WrtDeviceApis::Commons::PlatformException) 
        {
                LoggerE("platform error");
-               callbackManager->callOnError(JSTizenExceptionFactory::makeErrorObject(context,          
-                                               JSTizenException::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN));
+               callbackManager->callOnError(JSWebAPIErrorFactory::makeErrorObject(context,             
+                                               JSWebAPIErrorFactory::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN));
        }
        Catch(WrtDeviceApis::Commons::ConversionException) 
        {
                LoggerE("conversion error");
-               callbackManager->callOnError(JSTizenExceptionFactory::makeErrorObject(context,          
-                                               JSTizenException::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN));
+               callbackManager->callOnError(JSWebAPIErrorFactory::makeErrorObject(context,             
+                                               JSWebAPIErrorFactory::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN));
        }
        Catch(WrtDeviceApis::Commons::InvalidArgumentException)
        {
                LoggerE("conversion error");
-               callbackManager->callOnError(JSTizenExceptionFactory::makeErrorObject(context,
-                                               JSTizenException::INVALID_VALUES_ERROR, JSMESSAGING_EXCEPTION_MSG_INVALID_ARGUMENT));
+               callbackManager->callOnError(JSWebAPIErrorFactory::makeErrorObject(context,
+                                               JSWebAPIErrorFactory::INVALID_VALUES_ERROR, JSMESSAGING_EXCEPTION_MSG_INVALID_ARGUMENT));
        }       
        Catch(WrtDeviceApis::Commons::UnknownException) 
        {
                LoggerE("unknown error");
-               callbackManager->callOnError(JSTizenExceptionFactory::makeErrorObject(context,          
-                                               JSTizenException::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN));
+               callbackManager->callOnError(JSWebAPIErrorFactory::makeErrorObject(context,             
+                                               JSWebAPIErrorFactory::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN));
        }
 
 }
@@ -434,20 +433,20 @@ void MessagingListener::OnAnswerReceived(const EventDeleteConversationsPtr& even
        Catch(WrtDeviceApis::Commons::PlatformException) 
        {
                LoggerE("platform error");
-               callbackManager->callOnError(JSTizenExceptionFactory::makeErrorObject(context,          
-                                               JSTizenException::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN));
+               callbackManager->callOnError(JSWebAPIErrorFactory::makeErrorObject(context,             
+                                               JSWebAPIErrorFactory::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN));
        }
        Catch(WrtDeviceApis::Commons::ConversionException) 
        {
                LoggerE("conversion error");
-               callbackManager->callOnError(JSTizenExceptionFactory::makeErrorObject(context,          
-                                               JSTizenException::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN));
+               callbackManager->callOnError(JSWebAPIErrorFactory::makeErrorObject(context,             
+                                               JSWebAPIErrorFactory::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN));
        }
        Catch(WrtDeviceApis::Commons::UnknownException) 
        {
                LoggerE("unknown error");
-               callbackManager->callOnError(JSTizenExceptionFactory::makeErrorObject(context,          
-                                               JSTizenException::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN));
+               callbackManager->callOnError(JSWebAPIErrorFactory::makeErrorObject(context,             
+                                               JSWebAPIErrorFactory::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN));
        }
 }
 
@@ -492,26 +491,26 @@ void MessagingListener::OnAnswerReceived(const EventQueryFoldersPtr& event)
        Catch(WrtDeviceApis::Commons::PlatformException) 
        {
                LoggerE("platform error");
-               callbackManager->callOnError(JSTizenExceptionFactory::makeErrorObject(context,          
-                                               JSTizenException::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN));
+               callbackManager->callOnError(JSWebAPIErrorFactory::makeErrorObject(context,             
+                                               JSWebAPIErrorFactory::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN));
        }
        Catch(WrtDeviceApis::Commons::ConversionException) 
        {
                LoggerE("conversion error");
-               callbackManager->callOnError(JSTizenExceptionFactory::makeErrorObject(context,          
-                                               JSTizenException::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN));
+               callbackManager->callOnError(JSWebAPIErrorFactory::makeErrorObject(context,             
+                                               JSWebAPIErrorFactory::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN));
        }
        Catch(WrtDeviceApis::Commons::InvalidArgumentException) 
        {
                LoggerE("conversion error");
-               callbackManager->callOnError(JSTizenExceptionFactory::makeErrorObject(context,          
-                                               JSTizenException::INVALID_VALUES_ERROR, JSMESSAGING_EXCEPTION_MSG_INVALID_ARGUMENT));
+               callbackManager->callOnError(JSWebAPIErrorFactory::makeErrorObject(context,             
+                                               JSWebAPIErrorFactory::INVALID_VALUES_ERROR, JSMESSAGING_EXCEPTION_MSG_INVALID_ARGUMENT));
        }       
        Catch(WrtDeviceApis::Commons::UnknownException) 
        {
                LoggerE("unknown error");
-               callbackManager->callOnError(JSTizenExceptionFactory::makeErrorObject(context,          
-                                               JSTizenException::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN));
+               callbackManager->callOnError(JSWebAPIErrorFactory::makeErrorObject(context,             
+                                               JSWebAPIErrorFactory::UNKNOWN_ERROR, JSMESSAGING_EXCEPTION_MSG_UNKNOWN));
        }
 
 }
index de609c8..ab94f50 100644 (file)
@@ -1110,7 +1110,7 @@ void Mms::addMessageToDraft()
                msg_set_int_value(m_messageData, MSG_MESSAGE_ID_INT, msgId);
 
                setId(convertId(msgId));
-               readExistingMessage();
+               readAllData();
 
                msg_release_struct(&sendOpt);
 
@@ -1125,7 +1125,49 @@ void Mms::addMessageToDraft()
 
 void Mms::readAllData()
 {
-    readExistingMessage();
+       LoggerD("entered");
+
+       if (getIdRef().empty() || (EMPTY_ID == getIdRef())) 
+       {
+               ThrowMsg(WrtDeviceApis::Commons::PlatformException, "Empty id.");
+       }
+
+       msg_release_struct(&m_messageData);
+       m_messageData = NULL;
+       msg_struct_t sendOpt = NULL;
+
+       Try {
+
+               m_messageData = msg_create_struct(MSG_STRUCT_MESSAGE_INFO);
+               sendOpt = msg_create_struct(MSG_STRUCT_SENDOPT);
+
+               // trying to get message from platform
+               if (MSG_SUCCESS != msg_get_message(MsgGetCommonHandle(), convertId(getIdRef()), m_messageData, sendOpt)) 
+               {
+                       LoggerE("get message error");
+                       Throw(WrtDeviceApis::Commons::PlatformException);
+               }
+               LoggerD("message found with msgId=" << getIdRef());
+
+               // read all mms dat to abstraction layer
+               readConversationId(m_messageData);
+//             readRecipientList(m_messageData);
+               readPriority(m_messageData);
+               readSubject(m_messageData);
+               readBodyAndAttachments(m_messageData);
+               readFolder(m_messageData);
+               readDateTime(m_messageData);
+               readReadStatus(m_messageData);
+               readMessageStatus(m_messageData);
+
+               msg_release_struct(&sendOpt);
+       }
+       Catch(WrtDeviceApis::Commons::PlatformException) {
+               LoggerE("exception");
+               // nothing to do
+               msg_release_struct(&sendOpt);
+       }
+
 }
 
 void Mms::moveToFolder(const FolderType newFolder)
index 5aa74d5..96ef69a 100644 (file)
@@ -110,7 +110,54 @@ void Sms::update(bool draftsOnly)
 
 void Sms::readAllData()
 {
-    readExistingMessage();
+       if (getIdRef().empty() || (EMPTY_ID == getIdRef())) {
+               ThrowMsg(WrtDeviceApis::Commons::PlatformException, "Empty id.");
+       }
+
+       // release old data
+       if (m_messageData) {
+               // release platform message if it was created previously
+       msg_release_struct(&m_messageData);
+       m_messageData = NULL;
+       }
+       msg_struct_t sendOpt = NULL;
+
+       Try {
+               // create new platform structure
+               m_messageData = msg_create_struct(MSG_STRUCT_MESSAGE_INFO);
+               sendOpt = msg_create_struct(MSG_STRUCT_SENDOPT);
+
+               msg_message_id_t l_id = convertId(getIdRef());
+               LoggerD("reading message id=" << l_id);
+               // trying to get message from platform
+               if (MSG_SUCCESS == msg_get_message(MsgGetCommonHandle(), l_id, m_messageData, sendOpt)) 
+               {
+                       LoggerD("message found with msgId=" << getIdRef());
+
+                       // read all mms dat to abstraction layer
+                       readConversationId(m_messageData);
+//                     readRecipientList(m_messageData);
+                       readBody(m_messageData);
+                       readFolder(m_messageData);
+                       readDateTime(m_messageData);
+                       readReadStatus(m_messageData);
+                       readSize(m_messageData);
+                       readMessageStatus(m_messageData);
+
+               } else {
+                       LoggerE("message not found with msgId=" << getIdRef());
+                       setId("");
+                       Throw(WrtDeviceApis::Commons::PlatformException);
+               }
+
+               msg_release_struct(&sendOpt);
+       }
+       Catch(WrtDeviceApis::Commons::PlatformException) {
+               LoggerE("exception");
+               // nothing to do
+               msg_release_struct(&sendOpt);
+       }
+
 }
 
 void Sms::moveToFolder(const FolderType newFolder)
@@ -856,7 +903,7 @@ void Sms::addMessageToDraft()
 
         setId(convertId(msgId));
 
-        readExistingMessage();
+        readAllData();
         msg_release_struct(&sendOpt);
 
     }
index caf5a27..f7c0bd6 100755 (executable)
@@ -36,7 +36,9 @@ namespace Messaging {
 
 using namespace WrtDeviceApis::Commons;
 
-const char* MessagingExportedNames[] = 
+#pragma GCC visibility push(default)
+
+const char* MessagingExportedNames[] =
 {
        "getMessageServices",
        "createMessage",
@@ -62,8 +64,11 @@ const char* MessagingExportedNames[] =
 static WrtDeviceApis::Commons::FunctionMapping createMessagingFunctions();
 static WrtDeviceApis::Commons::FunctionMapping MessagingFunctions = createMessagingFunctions();
 
+
 DEFINE_FUNCTION_GETTER(Messaging, MessagingFunctions);
 
+#pragma GCC visibility pop
+
 static WrtDeviceApis::Commons::FunctionMapping createMessagingFunctions()
 {
      /**
index 8a6afa4..eea7f19 100755 (executable)
@@ -2,6 +2,7 @@ SET(TARGET_NAME ${nfc_target})
 SET(DESTINATION_NAME ${nfc_dest})
 SET(TARGET_IMPL_NAME ${nfc_impl})
 
+IF(ENABLE_OPTIONAL_NFC)
 PKG_CHECK_MODULES(platform_pkgs_nfc REQUIRED capi-network-nfc)
 
 INCLUDE_DIRECTORIES(
@@ -64,6 +65,7 @@ TARGET_LINK_LIBRARIES(${TARGET_NAME}
 
 INSTALL(TARGETS ${TARGET_NAME} ${TARGET_IMPL_NAME} LIBRARY DESTINATION ${DESTINATION_LIB_PREFIX}/${DESTINATION_NAME})
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/config.xml DESTINATION ${DESTINATION_LIB_PREFIX}/${DESTINATION_NAME})
+ENDIF(ENABLE_OPTIONAL_NFC)
 INSTALL(
        DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ DESTINATION ${DESTINATION_HEADER_PREFIX}/nfc
        FILES_MATCHING PATTERN "*.h" PATTERN "CMakeFiles" EXCLUDE
index 9765f38..e48b746 100644 (file)
 #include <CommonsJavaScript/JSUtils.h>
 #include <CommonsJavaScript/JSCallbackManager.h>
 #include <CommonsJavaScript/Utils.h>
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 #include <SecurityExceptions.h>
 #include <GlobalContextManager.h>
 #include <ArgumentValidator.h>
 #include <JSUtil.h>
-#include <JSWebAPIException.h>
 #include <PlatformException.h>
 
 #include "JSNFCManager.h"
@@ -200,7 +198,7 @@ JSValueRef JSNFCAdapter::setTagListener (JSContextRef context, JSObjectRef objec
                NFCAdapterPrivObject* privateObject = static_cast<NFCAdapterPrivObject*>(JSObjectGetPrivate(thisObject));
                if (!privateObject) {
                        LoggerE("private object is null");
-                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
                }
 
                INFCAdapterPtr nfcAdapter(privateObject->getObject());
@@ -223,19 +221,19 @@ JSValueRef JSNFCAdapter::setTagListener (JSContextRef context, JSObjectRef objec
                return JSValueMakeUndefined(context);
     } Catch (BasePlatformException) {
         LoggerE(_rethrown_exception.getName() << ": " << _rethrown_exception.getMessage());
-        return JSWebAPIException::throwException(context, exception, _rethrown_exception);
+        return JSWebAPIErrorFactory::postException(context, exception, _rethrown_exception);
        } Catch (ConversionException) {
                LoggerE("JSNFCAdapter::setTagListener : ConversionException");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
     } Catch (PlatformException) {
                LoggerE("PlatformException: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::SERVICE_NOT_AVAILABLE, "Service Not Available");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::SERVICE_NOT_AVAILABLE_ERROR, "Service Not Available");
        } Catch (WrtDeviceApis::Commons::UnknownException) {
                LoggerE("UnknownException: " << _rethrown_exception.GetMessage());
        } Catch (WrtDeviceApis::Commons::Exception) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
-       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
 }
 
 JSValueRef JSNFCAdapter::setPeerListener (JSContextRef context, JSObjectRef object,
@@ -263,7 +261,7 @@ JSValueRef JSNFCAdapter::setPeerListener (JSContextRef context, JSObjectRef obje
                NFCAdapterPrivObject* privateObject = static_cast<NFCAdapterPrivObject*>(JSObjectGetPrivate(thisObject));
                if (!privateObject) {
                        LoggerE("private object is null");
-                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
                }
 
                INFCAdapterPtr nfcAdapter(privateObject->getObject());
@@ -287,19 +285,19 @@ JSValueRef JSNFCAdapter::setPeerListener (JSContextRef context, JSObjectRef obje
                return JSValueMakeUndefined(context);
     } Catch (BasePlatformException) {
         LoggerE(_rethrown_exception.getName() << ": " << _rethrown_exception.getMessage());
-        return JSWebAPIException::throwException(context, exception, _rethrown_exception);
+        return JSWebAPIErrorFactory::postException(context, exception, _rethrown_exception);
        } Catch (ConversionException) {
                LoggerE("JSNFCAdapter::setPeerListener : ConversionException");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (PlatformException) {
                LoggerE("PlatformException: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::SERVICE_NOT_AVAILABLE, "Service Not Available");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::SERVICE_NOT_AVAILABLE_ERROR, "Service Not Available");
        } Catch (WrtDeviceApis::Commons::UnknownException) {
                LoggerE("UnknownException: " << _rethrown_exception.GetMessage());
        } Catch (WrtDeviceApis::Commons::Exception) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
-       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
 }
 JSValueRef JSNFCAdapter::unsetTagListener(JSContextRef context, JSObjectRef object, JSObjectRef thisObject,
                size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception) {
@@ -311,7 +309,7 @@ JSValueRef JSNFCAdapter::unsetTagListener(JSContextRef context, JSObjectRef obje
        NFCAdapterPrivObject* privateObject = static_cast<NFCAdapterPrivObject*>(JSObjectGetPrivate(thisObject));
        if (!privateObject) {
                LoggerE("private object is null");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        }
 
        Try     {
@@ -325,14 +323,14 @@ JSValueRef JSNFCAdapter::unsetTagListener(JSContextRef context, JSObjectRef obje
 
                return JSValueMakeUndefined(context);
        } Catch (NullPointerException) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (PlatformException) {
                LoggerE("PlatformException: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::SERVICE_NOT_AVAILABLE, "Service Not Available");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::SERVICE_NOT_AVAILABLE_ERROR, "Service Not Available");
        } Catch (WrtDeviceApis::Commons::Exception) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
-       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
 }
 
 JSValueRef JSNFCAdapter::unsetPeerListener(JSContextRef context, JSObjectRef object, JSObjectRef thisObject,
@@ -345,7 +343,7 @@ JSValueRef JSNFCAdapter::unsetPeerListener(JSContextRef context, JSObjectRef obj
        NFCAdapterPrivObject* privateObject = static_cast<NFCAdapterPrivObject*>(JSObjectGetPrivate(thisObject));
        if (!privateObject) {
                LoggerE("private object is null");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        }
 
        Try {
@@ -359,14 +357,14 @@ JSValueRef JSNFCAdapter::unsetPeerListener(JSContextRef context, JSObjectRef obj
 
                return JSValueMakeUndefined(context);
        } Catch (NullPointerException) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (PlatformException) {
                LoggerE("PlatformException: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::SERVICE_NOT_AVAILABLE, "Service Not Available");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::SERVICE_NOT_AVAILABLE_ERROR, "Service Not Available");
        } Catch (WrtDeviceApis::Commons::Exception) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
-       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
 }
 
 JSValueRef JSNFCAdapter::getCachedMessage (JSContextRef context, JSObjectRef object,
@@ -380,7 +378,7 @@ JSValueRef JSNFCAdapter::getCachedMessage (JSContextRef context, JSObjectRef obj
        NFCAdapterPrivObject* privateObject = static_cast<NFCAdapterPrivObject*>(JSObjectGetPrivate(thisObject));
        if (!privateObject) {
                LoggerE("private object is null");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        }
 
        JSContextRef global_context = GlobalContextManager::getInstance()->getGlobalContext(context);
@@ -394,14 +392,14 @@ JSValueRef JSNFCAdapter::getCachedMessage (JSContextRef context, JSObjectRef obj
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        } Catch (PlatformException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::SERVICE_NOT_AVAILABLE, "Service Not Available");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::SERVICE_NOT_AVAILABLE_ERROR, "Service Not Available");
        } Catch(NullPointerException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (WrtDeviceApis::Commons::Exception) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
-       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
 }
 
 JSValueRef JSNFCAdapter::setPowered (JSContextRef context, JSObjectRef object,
@@ -417,7 +415,7 @@ JSValueRef JSNFCAdapter::setPowered (JSContextRef context, JSObjectRef object,
        NFCAdapterPrivObject* privateObject = static_cast<NFCAdapterPrivObject*>(JSObjectGetPrivate(thisObject));
        if (!privateObject) {
                LoggerE("private object is null");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        }
 
        INFCAdapterPtr nfcAdapter(privateObject->getObject());
@@ -445,23 +443,23 @@ JSValueRef JSNFCAdapter::setPowered (JSContextRef context, JSObjectRef object,
                return JSValueMakeUndefined(context);
     } Catch (BasePlatformException) {
         LoggerE(_rethrown_exception.getName() << ": " << _rethrown_exception.getMessage());
-        return JSWebAPIException::throwException(context, exception, _rethrown_exception);
+        return JSWebAPIErrorFactory::postException(context, exception, _rethrown_exception);
        } Catch (ConversionException) {
                LoggerE("ConversionException");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (PlatformException) {
                LoggerE("PlatformException: " << _rethrown_exception.GetMessage());
-               callbackManager->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::SERVICE_NOT_AVAILABLE, "Service Not Available"));
+               callbackManager->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::SERVICE_NOT_AVAILABLE_ERROR, "Service Not Available"));
                return JSValueMakeUndefined(context);
        } Catch (WrtDeviceApis::Commons::UnknownException) {
                LoggerE("UnknownException: " << _rethrown_exception.GetMessage());
        } Catch(NullPointerException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (WrtDeviceApis::Commons::Exception) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
-       callbackManager->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::UNKNOWN_ERROR,"Unknown Error"));
+       callbackManager->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::UNKNOWN_ERROR,"Unknown Error"));
        return JSValueMakeUndefined(context);
 }
 
index bc3ee6d..49e3c0e 100755 (executable)
 
 #include <Commons/Exception.h>
 #include <CommonsJavaScript/PrivateObject.h>
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 #include <SecurityExceptions.h>
 #include <GlobalContextManager.h>
 #include <ArgumentValidator.h>
-#include <JSWebAPIException.h>
 #include <PlatformException.h>
 
 #include "JSNFCManager.h"
@@ -197,25 +195,25 @@ JSValueRef JSNFCManager::getDefaultAdapter (JSContextRef context, JSObjectRef ob
                return JSNFCAdapter::createJSObject(GlobalContextManager::getInstance()->getGlobalContext(context));
        } Catch (UnsupportedException) {
                LoggerE("UnsupportedException: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR, "Not Supported");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, "Not Supported");
        } Catch (ConversionException) {
                LoggerE("ConversionException: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (NullPointerException) {
                LoggerE("NullPointerException: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (InvalidArgumentException) {
                LoggerE("InvalidArgumentException: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, "Invalid Values");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Invalid Values");
        } Catch (PlatformException) {
                LoggerE("PlatformException: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::SERVICE_NOT_AVAILABLE, "Service Not Available");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::SERVICE_NOT_AVAILABLE_ERROR, "Service Not Available");
        } Catch (WrtDeviceApis::Commons::UnknownException) {
                LoggerE("UnknownException: " << _rethrown_exception.GetMessage());
        } Catch (WrtDeviceApis::Commons::Exception) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
-       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
 }
 
 JSValueRef JSNFCManager::setExclusiveMode (JSContextRef context, JSObjectRef object,
@@ -240,19 +238,19 @@ JSValueRef JSNFCManager::setExclusiveMode (JSContextRef context, JSObjectRef obj
                return JSValueMakeUndefined(context);
     } Catch (BasePlatformException) {
         LoggerE(_rethrown_exception.getName() << ": " << _rethrown_exception.getMessage());
-        return JSWebAPIException::throwException(context, exception, _rethrown_exception);
+        return JSWebAPIErrorFactory::postException(context, exception, _rethrown_exception);
        } Catch (ConversionException) {
                LoggerE("ConversionException: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (NullPointerException) {
                LoggerE("NullPointerException: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (WrtDeviceApis::Commons::UnknownException) {
                LoggerE("UnknownException: " << _rethrown_exception.GetMessage());
        } Catch (WrtDeviceApis::Commons::Exception) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
-       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
 }
 
 }
index d75b445..7580d7c 100644 (file)
 #include <CommonsJavaScript/JSUtils.h>
 #include <CommonsJavaScript/JSCallbackManager.h>
 #include <CommonsJavaScript/Utils.h>
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 #include <SecurityExceptions.h>
 #include <ArgumentValidator.h>
 #include <GlobalContextManager.h>
-#include <JSWebAPIException.h>
 #include <PlatformException.h>
 
 #include "JSNFCTag.h"
@@ -209,7 +207,7 @@ JSValueRef JSNFCTag::readNDEF(JSContextRef context,
        NFCTagPrivObject* privateObject = static_cast<NFCTagPrivObject*>(JSObjectGetPrivate(thisObject));
        if (NULL == privateObject) {
                LoggerE("private object is null");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        }
 
        INFCTagPtr nfcTag(privateObject->getObject());
@@ -234,20 +232,20 @@ JSValueRef JSNFCTag::readNDEF(JSContextRef context,
                return JSValueMakeUndefined(context);
     } Catch (BasePlatformException) {
         LoggerE(_rethrown_exception.getName() << ": " << _rethrown_exception.getMessage());
-        return JSWebAPIException::throwException(context, exception, _rethrown_exception);
+        return JSWebAPIErrorFactory::postException(context, exception, _rethrown_exception);
        } Catch (ConversionException) {
                LoggerE("readNDEF : ConversionException");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (UnsupportedException) {
                LoggerE("UnsupportedException: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR, "Not Support NDEF");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, "Not Support NDEF");
        } Catch (InvalidArgumentException) {
                LoggerE("readNDEF InvalidArgumentException");
-               callbackManager->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::INVALID_VALUES_ERROR, "Invalid Values"));
+               callbackManager->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Invalid Values"));
                return JSValueMakeUndefined(context);
        } Catch (PlatformException) {
                LoggerE("PlatformException: " << _rethrown_exception.GetMessage());
-               callbackManager->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::SERVICE_NOT_AVAILABLE, "Service Not Available"));
+               callbackManager->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::SERVICE_NOT_AVAILABLE_ERROR, "Service Not Available"));
                return JSValueMakeUndefined(context);
        } Catch (WrtDeviceApis::Commons::UnknownException) {
                LoggerE("UnknownException: " << _rethrown_exception.GetMessage());
@@ -255,7 +253,7 @@ JSValueRef JSNFCTag::readNDEF(JSContextRef context,
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
 
-       callbackManager->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::UNKNOWN_ERROR,"Unknown Error"));
+       callbackManager->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::UNKNOWN_ERROR,"Unknown Error"));
        return JSValueMakeUndefined(context);
 }
 
@@ -276,7 +274,7 @@ JSValueRef JSNFCTag::writeNDEF(JSContextRef context,
        NFCTagPrivObject* privateObject = static_cast<NFCTagPrivObject*>(JSObjectGetPrivate(thisObject));
        if (NULL == privateObject) {
                LoggerE("private object is null");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        }
 
        INFCTagPtr nfcTag(privateObject->getObject());
@@ -304,20 +302,20 @@ JSValueRef JSNFCTag::writeNDEF(JSContextRef context,
                return JSValueMakeUndefined(context);
     } Catch (BasePlatformException) {
         LoggerE(_rethrown_exception.getName() << ": " << _rethrown_exception.getMessage());
-        return JSWebAPIException::throwException(context, exception, _rethrown_exception);
+        return JSWebAPIErrorFactory::postException(context, exception, _rethrown_exception);
        } Catch (ConversionException) {
                LoggerE("writeNDEF : ConversionException");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (UnsupportedException) {
                LoggerE("UnsupportedException: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR, "Not Support NDEF");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR, "Not Support NDEF");
        } Catch (InvalidArgumentException) {
                LoggerE("writeNDEF InvalidArgumentException");
-               callbackManager->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::INVALID_VALUES_ERROR, "Invalid Values"));
+               callbackManager->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Invalid Values"));
                return JSValueMakeUndefined(context);
        } Catch (PlatformException) {
                LoggerE("PlatformException: " << _rethrown_exception.GetMessage());
-               callbackManager->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::SERVICE_NOT_AVAILABLE, "Service Not Available"));
+               callbackManager->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::SERVICE_NOT_AVAILABLE_ERROR, "Service Not Available"));
                return JSValueMakeUndefined(context);
        } Catch (WrtDeviceApis::Commons::UnknownException) {
                LoggerE("UnknownException: " << _rethrown_exception.GetMessage());
@@ -325,7 +323,7 @@ JSValueRef JSNFCTag::writeNDEF(JSContextRef context,
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
 
-       callbackManager->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::UNKNOWN_ERROR,"Unknown Error"));
+       callbackManager->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::UNKNOWN_ERROR,"Unknown Error"));
        return JSValueMakeUndefined(context);
 }
 
@@ -346,7 +344,7 @@ JSValueRef JSNFCTag::transceive(JSContextRef context,
        NFCTagPrivObject* privateObject = static_cast<NFCTagPrivObject*>(JSObjectGetPrivate(thisObject));
        if (NULL == privateObject) {
                LoggerE("private object is null");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        }
 
        INFCTagPtr nfcTag(privateObject->getObject());
@@ -377,17 +375,17 @@ JSValueRef JSNFCTag::transceive(JSContextRef context,
                return JSValueMakeUndefined(context);
     } Catch (BasePlatformException) {
         LoggerE(_rethrown_exception.getName() << ": " << _rethrown_exception.getMessage());
-        return JSWebAPIException::throwException(context, exception, _rethrown_exception);
+        return JSWebAPIErrorFactory::postException(context, exception, _rethrown_exception);
        } Catch (ConversionException) {
                LoggerE("transceive : ConversionException");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (InvalidArgumentException) {
                LoggerE("transceive InvalidArgumentException");
-               callbackManager->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::INVALID_VALUES_ERROR, "Invalid Values"));
+               callbackManager->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Invalid Values"));
                return JSValueMakeUndefined(context);
        } Catch (PlatformException) {
                LoggerE("PlatformException: " << _rethrown_exception.GetMessage());
-               callbackManager->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::SERVICE_NOT_AVAILABLE, "Service Not Available"));
+               callbackManager->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::SERVICE_NOT_AVAILABLE_ERROR, "Service Not Available"));
                return JSValueMakeUndefined(context);
        } Catch (WrtDeviceApis::Commons::UnknownException) {
                LoggerE("UnknownException: " << _rethrown_exception.GetMessage());
@@ -395,7 +393,7 @@ JSValueRef JSNFCTag::transceive(JSContextRef context,
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
 
-       callbackManager->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::UNKNOWN_ERROR,"Unknown Error"));
+       callbackManager->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::UNKNOWN_ERROR,"Unknown Error"));
        return JSValueMakeUndefined(context);
 }
 
index addb719..ac9f58f 100644 (file)
 #include <CommonsJavaScript/JSUtils.h>
 #include <CommonsJavaScript/JSCallbackManager.h>
 #include <CommonsJavaScript/Utils.h>
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 #include <SecurityExceptions.h>
 #include <ArgumentValidator.h>
 #include <GlobalContextManager.h>
-#include <JSWebAPIException.h>
 #include <PlatformException.h>
 
 #include "JSNFCTarget.h"
@@ -189,7 +187,7 @@ JSValueRef JSNFCTarget::setReceiveNDEFListener(JSContextRef context,
        NFCTargetPrivObject* privateObject = static_cast<NFCTargetPrivObject*>(JSObjectGetPrivate(thisObject));
        if (NULL == privateObject) {
                LoggerE("private object is null");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        }
        
        INFCTargetPtr nfcTarget(privateObject->getObject());
@@ -215,20 +213,20 @@ JSValueRef JSNFCTarget::setReceiveNDEFListener(JSContextRef context,
                return JSValueMakeUndefined(context);
     } Catch (BasePlatformException) {
         LoggerE(_rethrown_exception.getName() << ": " << _rethrown_exception.getMessage());
-        return JSWebAPIException::throwException(context, exception, _rethrown_exception);
+        return JSWebAPIErrorFactory::postException(context, exception, _rethrown_exception);
        } Catch (ConversionException) {
                LoggerE("setReceiveNDEFListener : ConversionException");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (PlatformException) {
                LoggerE("PlatformException: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::SERVICE_NOT_AVAILABLE, "Service Not Available");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::SERVICE_NOT_AVAILABLE_ERROR, "Service Not Available");
        } Catch (WrtDeviceApis::Commons::UnknownException) {
                LoggerE("UnknownException: " << _rethrown_exception.GetMessage());
        } Catch (WrtDeviceApis::Commons::Exception) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
 
-       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
 }
 
 JSValueRef JSNFCTarget::unsetReceiveNDEFListener(JSContextRef context,
@@ -248,7 +246,7 @@ JSValueRef JSNFCTarget::unsetReceiveNDEFListener(JSContextRef context,
                NFCTargetPrivObject* privateObject = static_cast<NFCTargetPrivObject*>(JSObjectGetPrivate(thisObject));
                if (NULL == privateObject) {
                        LoggerE("private object is null");
-                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
                }
 
                INFCTargetPtr nfcTarget(privateObject->getObject());
@@ -263,15 +261,15 @@ JSValueRef JSNFCTarget::unsetReceiveNDEFListener(JSContextRef context,
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        } Catch(NullPointerException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (PlatformException) {
                LoggerE("PlatformException: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::SERVICE_NOT_AVAILABLE, "Service Not Available");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::SERVICE_NOT_AVAILABLE_ERROR, "Service Not Available");
        } Catch (WrtDeviceApis::Commons::Exception) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
 
-       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
 }
 
 JSValueRef JSNFCTarget::sendNDEF(JSContextRef context,
@@ -293,7 +291,7 @@ JSValueRef JSNFCTarget::sendNDEF(JSContextRef context,
        NFCTargetPrivObject* privateObject = static_cast<NFCTargetPrivObject*>(JSObjectGetPrivate(thisObject));
        if (NULL == privateObject) {
                LoggerE("private object is null");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        }
 
        INFCTargetPtr nfcTarget(privateObject->getObject());
@@ -319,17 +317,17 @@ JSValueRef JSNFCTarget::sendNDEF(JSContextRef context,
                return JSValueMakeUndefined(context);
     } Catch (BasePlatformException) {
         LoggerE(_rethrown_exception.getName() << ": " << _rethrown_exception.getMessage());
-        return JSWebAPIException::throwException(context, exception, _rethrown_exception);
+        return JSWebAPIErrorFactory::postException(context, exception, _rethrown_exception);
        } Catch (ConversionException) {
                LoggerE("sendNDEF : ConversionException");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (InvalidArgumentException) {
                LoggerE("sendNDEF InvalidArgumentException");
-               callbackManager->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::INVALID_VALUES_ERROR, "Invalid Values"));
+               callbackManager->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Invalid Values"));
                return JSValueMakeUndefined(context);
        } Catch (PlatformException) {
                LoggerE("PlatformException: " << _rethrown_exception.GetMessage());
-               callbackManager->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::SERVICE_NOT_AVAILABLE, "Service Not Available"));
+               callbackManager->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::SERVICE_NOT_AVAILABLE_ERROR, "Service Not Available"));
                return JSValueMakeUndefined(context);
        } Catch (WrtDeviceApis::Commons::UnknownException) {
                LoggerE("UnknownException: " << _rethrown_exception.GetMessage());
@@ -337,7 +335,7 @@ JSValueRef JSNFCTarget::sendNDEF(JSContextRef context,
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
 
-       callbackManager->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::UNKNOWN_ERROR,"Unknown Error"));
+       callbackManager->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::UNKNOWN_ERROR,"Unknown Error"));
        return JSValueMakeUndefined(context);
 }
 
index 784d55c..a5e978e 100644 (file)
 #include <Commons/Exception.h>
 #include <CommonsJavaScript/PrivateObject.h>
 #include <CommonsJavaScript/JSUtils.h>
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 #include <SecurityExceptions.h>
-#include <JSWebAPIException.h>
 #include <PlatformException.h>
 
 #include "NFCFactory.h"
@@ -210,29 +208,19 @@ JSObjectRef JSNdefMessage::constructor(JSContextRef ctx, JSObjectRef constructor
                } else
                        throw TypeMismatchException("Parameter Type Mismatch");
        } Catch(BasePlatformException){
-               JSObjectRef error = JSWebAPIException::makeJSWebAPIException(ctx, _rethrown_exception);
-        *exception = error;
-        return error;
+               return JSWebAPIErrorFactory::postException(ctx, exception, _rethrown_exception);
        } Catch(ConversionException) {
-               JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(ctx, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
-               *exception = error;
-               return error;
+               return JSWebAPIErrorFactory::postException(ctx, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (InvalidArgumentException) {
-               JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(ctx, JSTizenException::INVALID_VALUES_ERROR, "Invalid Values");
-               *exception = error;
-               return error;
+               return JSWebAPIErrorFactory::postException(ctx, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Invalid Values");
        } Catch (PlatformException) {
-               JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(ctx, JSTizenException::SERVICE_NOT_AVAILABLE, "Service Not Available");
-               *exception = error;
-               return error;
+               return JSWebAPIErrorFactory::postException(ctx, exception, JSWebAPIErrorFactory::SERVICE_NOT_AVAILABLE_ERROR, "Service Not Available");
        } Catch (WrtDeviceApis::Commons::UnknownException) {
                LoggerE("PlatformException: " << _rethrown_exception.GetMessage());
        } Catch (WrtDeviceApis::Commons::Exception) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
-       JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(ctx, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
-       *exception = error;
-       return error;
+       return JSWebAPIErrorFactory::postException(ctx, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
 }
 
 JSValueRef JSNdefMessage::getProperty(JSContextRef context, JSObjectRef object,
@@ -327,7 +315,7 @@ JSValueRef JSNdefMessage::toByte(JSContextRef context,
                NdefMessagePrivObject* privateObject = static_cast<NdefMessagePrivObject*>(JSObjectGetPrivate(thisObject));
                if (NULL == privateObject) {
                        LoggerE("private object is null");
-                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
                }
 
                INdefMessagePtr ndefMessage(privateObject->getObject());
@@ -338,20 +326,20 @@ JSValueRef JSNdefMessage::toByte(JSContextRef context,
                return convert.toJSValueRef(newMessage->toByte());
        } Catch (ConversionException) {
                LoggerE("ConversionException: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (WrtDeviceApis::Commons::UnknownException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        } Catch (PlatformException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::SERVICE_NOT_AVAILABLE, "Service Not Available");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::SERVICE_NOT_AVAILABLE_ERROR, "Service Not Available");
        } Catch(NullPointerException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (WrtDeviceApis::Commons::Exception) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
 
-       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
 }
 
 }
index ac50e77..df1f4fd 100644 (file)
 #include <string>
 #include <CommonsJavaScript/JSUtils.h>
 
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 #include <SecurityExceptions.h>
 #include <ArgumentValidator.h>
 #include <GlobalContextManager.h>
-#include <JSWebAPIException.h>
 #include <PlatformException.h>
 #include "NFCFactory.h"
 
@@ -163,32 +161,22 @@ JSObjectRef JSNdefRecord::constructor(JSContextRef ctx, JSObjectRef constructor,
                } else
                        throw TypeMismatchException("Parameter Type Mismatch");
     } Catch (BasePlatformException) {
-        JSObjectRef error = JSWebAPIException::makeJSWebAPIException(ctx, _rethrown_exception);
-        *exception = error;
-        return error;
+       return JSWebAPIErrorFactory::postException(ctx, exception, _rethrown_exception);
        } Catch(ConversionException) {
                LoggerE("ConversionException: " << _rethrown_exception.GetMessage());
-               JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(ctx, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
-               *exception = error;
-        return error;
+               return JSWebAPIErrorFactory::postException(ctx, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (InvalidArgumentException) {
                LoggerE("InvalidArgumentException: " << _rethrown_exception.GetMessage());
-               JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(ctx, JSTizenException::INVALID_VALUES_ERROR, "Invalid Values");
-               *exception = error;
-        return error;
+               return JSWebAPIErrorFactory::postException(ctx, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Invalid Values");
        } Catch (PlatformException) {
                LoggerE("PlatformException: " << _rethrown_exception.GetMessage());
-               JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(ctx, JSTizenException::SERVICE_NOT_AVAILABLE, "Service Not Available");
-               *exception = error;
-        return error;
+               return JSWebAPIErrorFactory::postException(ctx, exception, JSWebAPIErrorFactory::SERVICE_NOT_AVAILABLE_ERROR, "Service Not Available");
        } Catch (WrtDeviceApis::Commons::UnknownException) {
                LoggerE("PlatformException: " << _rethrown_exception.GetMessage());
        } Catch (WrtDeviceApis::Commons::Exception) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
-       JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(ctx, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
-       *exception = error;
-       return error;
+       return JSWebAPIErrorFactory::postException(ctx, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
 }
 
 JSValueRef JSNdefRecord::getProperty(JSContextRef context, JSObjectRef object,
index d7f4d28..01a2241 100644 (file)
 #include <string>
 #include <CommonsJavaScript/JSUtils.h>
 
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 #include <SecurityExceptions.h>
 #include <ArgumentValidator.h>
 #include <GlobalContextManager.h>
-#include <JSWebAPIException.h>
 #include <PlatformException.h>
 
 #include "NFCFactory.h"
@@ -130,32 +128,22 @@ JSObjectRef JSNdefRecordMedia::constructor(JSContextRef ctx, JSObjectRef constru
            JSStringRelease(ctorName);
                return result;
     } Catch (BasePlatformException) {
-        JSObjectRef error = JSWebAPIException::makeJSWebAPIException(ctx, _rethrown_exception);
-        *exception = error;
-        return error;
+       return JSWebAPIErrorFactory::postException(ctx, exception, _rethrown_exception);
        } Catch(ConversionException) {
                LoggerE("ConversionException: " << _rethrown_exception.GetMessage());
-               JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(ctx, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
-               *exception = error;
-        return error;
+               return JSWebAPIErrorFactory::postException(ctx, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (InvalidArgumentException) {
                LoggerE("InvalidArgumentException: " << _rethrown_exception.GetMessage());
-               JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(ctx, JSTizenException::INVALID_VALUES_ERROR, "Invalid Values");
-               *exception = error;
-        return error;
+               return JSWebAPIErrorFactory::postException(ctx, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Invalid Values");
        } Catch (PlatformException) {
                LoggerE("PlatformException: " << _rethrown_exception.GetMessage());
-               JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(ctx, JSTizenException::SERVICE_NOT_AVAILABLE, "Service Not Available");
-               *exception = error;
-        return error;
+               return JSWebAPIErrorFactory::postException(ctx, exception, JSWebAPIErrorFactory::SERVICE_NOT_AVAILABLE_ERROR, "Service Not Available");
        } Catch (WrtDeviceApis::Commons::UnknownException) {
                LoggerE("PlatformException: " << _rethrown_exception.GetMessage());
        } Catch (WrtDeviceApis::Commons::Exception) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
-       JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(ctx, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
-       *exception = error;
-       return error;
+       return JSWebAPIErrorFactory::postException(ctx, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
 }
 
 JSValueRef JSNdefRecordMedia::getProperty(JSContextRef context, JSObjectRef object,
index 341f7de..eb920c7 100644 (file)
 #include <string>
 #include <CommonsJavaScript/JSUtils.h>
 
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 #include <SecurityExceptions.h>
 #include <ArgumentValidator.h>
 #include <GlobalContextManager.h>
-#include <JSWebAPIException.h>
 #include <PlatformException.h>
 
 #include "NFCFactory.h"
@@ -138,32 +136,22 @@ JSObjectRef JSNdefRecordText::constructor(JSContextRef ctx, JSObjectRef construc
 
                return result;
     } Catch (BasePlatformException) {
-        JSObjectRef error = JSWebAPIException::makeJSWebAPIException(ctx, _rethrown_exception);
-        *exception = error;
-        return error;
+       return JSWebAPIErrorFactory::postException(ctx, exception, _rethrown_exception);
        } Catch(ConversionException) {
                LoggerE("ConversionException: " << _rethrown_exception.GetMessage());
-               JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(ctx, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
-               *exception = error;
-        return error;
+               return JSWebAPIErrorFactory::postException(ctx, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (InvalidArgumentException) {
                LoggerE("InvalidArgumentException: " << _rethrown_exception.GetMessage());
-               JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(ctx, JSTizenException::INVALID_VALUES_ERROR, "Invalid Values");
-               *exception = error;
-        return error;
+               return JSWebAPIErrorFactory::postException(ctx, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Invalid Values");
        } Catch (PlatformException) {
                LoggerE("PlatformException: " << _rethrown_exception.GetMessage());
-               JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(ctx, JSTizenException::SERVICE_NOT_AVAILABLE, "Service Not Available");
-               *exception = error;
-        return error;
+               return JSWebAPIErrorFactory::postException(ctx, exception, JSWebAPIErrorFactory::SERVICE_NOT_AVAILABLE_ERROR, "Service Not Available");
        } Catch (WrtDeviceApis::Commons::UnknownException) {
                LoggerE("PlatformException: " << _rethrown_exception.GetMessage());
        } Catch (WrtDeviceApis::Commons::Exception) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
-       JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(ctx, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
-       *exception = error;
-       return error;
+       return JSWebAPIErrorFactory::postException(ctx, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
 }
 JSValueRef JSNdefRecordText::getProperty(JSContextRef context, JSObjectRef object,
        JSStringRef propertyName, JSValueRef* exception) {
index 8deda02..285f025 100644 (file)
 #include <string>
 #include <CommonsJavaScript/JSUtils.h>
 
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 #include <SecurityExceptions.h>
 #include <CommonsJavaScript/Converter.h>
 #include <ArgumentValidator.h>
 #include <GlobalContextManager.h>
-#include <JSWebAPIException.h>
 #include <PlatformException.h>
 
 #include "NFCFactory.h"
@@ -125,32 +123,22 @@ JSObjectRef JSNdefRecordURI::constructor(JSContextRef ctx, JSObjectRef construct
            JSStringRelease(ctorName);
                return result;
     } Catch (BasePlatformException) {
-        JSObjectRef error = JSWebAPIException::makeJSWebAPIException(ctx, _rethrown_exception);
-        *exception = error;
-        return error;
+       return JSWebAPIErrorFactory::postException(ctx, exception, _rethrown_exception);
        } Catch(ConversionException) {
                LoggerE("ConversionException: " << _rethrown_exception.GetMessage());
-               JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(ctx, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
-               *exception = error;
-        return error;
+               return JSWebAPIErrorFactory::postException(ctx, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (InvalidArgumentException) {
                LoggerE("InvalidArgumentException: " << _rethrown_exception.GetMessage());
-               JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(ctx, JSTizenException::INVALID_VALUES_ERROR, "Invalid Values");
-               *exception = error;
-        return error;
+               return JSWebAPIErrorFactory::postException(ctx, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Invalid Values");
        } Catch (PlatformException) {
                LoggerE("PlatformException: " << _rethrown_exception.GetMessage());
-               JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(ctx, JSTizenException::SERVICE_NOT_AVAILABLE, "Service Not Available");
-               *exception = error;
-        return error;
+               return JSWebAPIErrorFactory::postException(ctx, exception, JSWebAPIErrorFactory::SERVICE_NOT_AVAILABLE_ERROR, "Service Not Available");
        } Catch (WrtDeviceApis::Commons::UnknownException) {
                LoggerE("PlatformException: " << _rethrown_exception.GetMessage());
        } Catch (WrtDeviceApis::Commons::Exception) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
-       JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(ctx, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
-       *exception = error;
-       return error;
+       return JSWebAPIErrorFactory::postException(ctx, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
 }
 JSValueRef JSNdefRecordURI::getProperty(JSContextRef context, JSObjectRef object,
        JSStringRef propertyName, JSValueRef* exception) {
index e8c0db5..6ad697d 100644 (file)
@@ -17,8 +17,8 @@
 
 #include <dpl/scoped_ptr.h>
 #include <Commons/Exception.h>
-#include <JSTizenException.h>
 #include <nfc.h>
+#include <JSWebAPIErrorFactory.h>
 #include "NFCDefaultAdapter.h"
 #include "NFCAdapter.h"
 #include "NFCUtil.h"
@@ -160,7 +160,7 @@ void NFCAdapter::OnRequestReceived(const EventNFCChangedSetPoweredPtr& event) {
        }
        if (m_EventNFCChangedSetPoweredPtr.Get() !=NULL) {
                event->setResult(false);
-               event->setError(DeviceAPI::Common::JSTizenException::SERVICE_NOT_AVAILABLE);
+               event->setError(DeviceAPI::Common::JSWebAPIErrorFactory::SERVICE_NOT_AVAILABLE_ERROR);
                event->setErrorMessage("Progressing Identical Operation");
                return;
        }
@@ -173,7 +173,7 @@ void NFCAdapter::OnRequestReceived(const EventNFCChangedSetPoweredPtr& event) {
        } Catch(PlatformException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
                event->setResult(false);
-               event->setError(DeviceAPI::Common::JSTizenException::SERVICE_NOT_AVAILABLE);
+               event->setError(DeviceAPI::Common::JSWebAPIErrorFactory::SERVICE_NOT_AVAILABLE_ERROR);
                event->setErrorMessage("Progressing Identical Operation");
                EventRequestReceiver<EventNFCChangedSetPowered>::ManualAnswer(event);
        } Catch(WrtDeviceApis::Commons::Exception) {
index 23f7511..e944e6d 100755 (executable)
@@ -19,7 +19,6 @@
 #include <dpl/scoped_ptr.h>
 #include <dpl/singleton_impl.h>
 #include <Commons/Exception.h>
-#include <JSTizenException.h>
 #include <nfc.h>
 #include "NFCDefaultAdapter.h"
 #include "NFCUtil.h"
index 0950191..dbdf43a 100644 (file)
@@ -22,8 +22,7 @@
 #include <CommonsJavaScript/JSCallbackManager.h>
 #include <CommonsJavaScript/ScopedJSStringRef.h>
 #include <Commons/IEvent.h>
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 
 #include "NFCStaticController.h"
 #include "EventNFCChangedPrivateData.h"
@@ -82,7 +81,7 @@ void NFCStaticController::onAnswerReceived(const EventNFCChangedPtr& event) {
                LoggerE("Conversion exception while processing EventNFCChanged");
        } Catch (PlatformException) {
                LoggerE("PlatformException:Platform can't create NFCTag"  << _rethrown_exception.GetMessage());
-       } Catch (UnknownException) {
+       } Catch (WrtDeviceApis::Commons::UnknownException) {
                LoggerE("UnknownException:Platform can't create NFCTag"  << _rethrown_exception.GetMessage());
        } Catch (NullPointerException) {
                LoggerE("NullPointer exception while processing EventNFCChanged");
@@ -112,23 +111,23 @@ void NFCStaticController::OnAnswerReceived(const EventNFCChangedSetPoweredPtr &e
                JSValueRef errorObject;
                if (error != "") {
                        if (errorMessage != "")
-                               errorObject = JSTizenExceptionFactory::makeErrorObject(cbm->getContext(), error, errorMessage);
+                               errorObject = JSWebAPIErrorFactory::makeErrorObject(cbm->getContext(), error, errorMessage);
                        else
-                               errorObject = JSTizenExceptionFactory::makeErrorObject(cbm->getContext(), error, error);
+                               errorObject = JSWebAPIErrorFactory::makeErrorObject(cbm->getContext(), error, error);
                } else
-                       errorObject = JSTizenExceptionFactory::makeErrorObject(cbm->getContext(), JSTizenException::UNKNOWN_ERROR,"Unknown Error");
+                       errorObject = JSWebAPIErrorFactory::makeErrorObject(cbm->getContext(), JSWebAPIErrorFactory::UNKNOWN_ERROR,"Unknown Error");
                cbm->callOnError(errorObject);
        } Catch (PlatformException) {
                LoggerE("PlatformException"  << _rethrown_exception.GetMessage());
-               JSValueRef errorObject = JSTizenExceptionFactory::makeErrorObject(cbm->getContext(), JSTizenException::SERVICE_NOT_AVAILABLE,"Service Not Available");
+               JSValueRef errorObject = JSWebAPIErrorFactory::makeErrorObject(cbm->getContext(), JSWebAPIErrorFactory::SERVICE_NOT_AVAILABLE_ERROR,"Service Not Available");
                cbm->callOnError(errorObject);
-       } Catch (UnknownException) {
+       } Catch (WrtDeviceApis::Commons::UnknownException) {
                LoggerE("UnknownException"  << _rethrown_exception.GetMessage());
-               JSValueRef errorObject = JSTizenExceptionFactory::makeErrorObject(cbm->getContext(), JSTizenException::UNKNOWN_ERROR,"Unknown Error");
+               JSValueRef errorObject = JSWebAPIErrorFactory::makeErrorObject(cbm->getContext(), JSWebAPIErrorFactory::UNKNOWN_ERROR,"Unknown Error");
                cbm->callOnError(errorObject);          
        } Catch (Exception) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               JSValueRef errorObject = JSTizenExceptionFactory::makeErrorObject(cbm->getContext(), JSTizenException::UNKNOWN_ERROR,"Unknown Error");
+               JSValueRef errorObject = JSWebAPIErrorFactory::makeErrorObject(cbm->getContext(), JSWebAPIErrorFactory::UNKNOWN_ERROR,"Unknown Error");
                cbm->callOnError(errorObject);  
        }
 }
index 8f60f34..573a81c 100644 (file)
@@ -16,7 +16,7 @@
 //
 
 #include <Commons/Exception.h>
-#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 
 #include "NFCTag.h"
 #include "NFCUtil.h"
@@ -403,7 +403,7 @@ void NFCTag::OnRequestReceived(const EventTagActionFormatPtr& event) {
 
                if (m_EventTagActionFormatPtr.Get() != NULL) {
                        event->setResult(false);
-                       event->setError(DeviceAPI::Common::JSTizenException::SERVICE_NOT_AVAILABLE);
+                       event->setError(DeviceAPI::Common::JSWebAPIErrorFactory::SERVICE_NOT_AVAILABLE_ERROR);
                        event->setErrorMessage("Progressing Identical Operation");
                        EventRequestReceiver<EventTagActionFormat>::ManualAnswer(event);
                        return;
index d7fed7c..52acff8 100644 (file)
@@ -16,8 +16,8 @@
 //
 
 #include <Commons/Exception.h>
-#include <JSTizenException.h>
 #include <nfc.h>
+#include <JSWebAPIErrorFactory.h>
 #include "NFCUtil.h"
 #include <Logger.h>
 
@@ -236,20 +236,20 @@ std::string NFCUtil::getNFCErrorString(const int errorCode) {
                case NFC_ERROR_INVALID_PARAMETER:
                case NFC_ERROR_INVALID_NDEF_MESSAGE:
                case NFC_ERROR_INVALID_RECORD_TYPE:
-                       return DeviceAPI::Common::JSTizenException::INVALID_VALUES_ERROR;
+                       return DeviceAPI::Common::JSWebAPIErrorFactory::INVALID_VALUES_ERROR;
                case NFC_ERROR_NO_DEVICE:
                case NFC_ERROR_OUT_OF_MEMORY:
                case NFC_ERROR_OPERATION_FAILED:
                case NFC_ERROR_DEVICE_BUSY:
-                       return DeviceAPI::Common::JSTizenException::UNKNOWN_ERROR;
+                       return DeviceAPI::Common::JSWebAPIErrorFactory::UNKNOWN_ERROR;
                case NFC_ERROR_NOT_ACTIVATED:
-                       return DeviceAPI::Common::JSTizenException::SERVICE_NOT_AVAILABLE;
+                       return DeviceAPI::Common::JSWebAPIErrorFactory::SERVICE_NOT_AVAILABLE_ERROR;
                case NFC_ERROR_NOT_SUPPORTED:
-                       return DeviceAPI::Common::JSTizenException::NOT_SUPPORTED_ERROR;
+                       return DeviceAPI::Common::JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR;
                case NFC_ERROR_TIMED_OUT:
-                       return DeviceAPI::Common::JSTizenException::TIMEOUT_ERROR;
+                       return DeviceAPI::Common::JSWebAPIErrorFactory::TIMEOUT_ERROR;
        }
-       return DeviceAPI::Common::JSTizenException::UNKNOWN_ERROR;
+       return DeviceAPI::Common::JSWebAPIErrorFactory::UNKNOWN_ERROR;
 }
 
 std::string NFCUtil::getNFCErrorMessage(const int errorCode) {
index 429fb62..f89e30c 100644 (file)
@@ -17,8 +17,7 @@
 
 #include <vector>
 #include <CommonsJavaScript/JSCallbackManager.h>
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 #include "ResponseDispatcher.h"
 #include "NFCConverter.h"
 #include "JSNdefMessage.h"
@@ -77,20 +76,20 @@ void NFCResponseDispatcher::OnAnswerReceived(const EventTagActionReadPtr &event)
                JSValueRef errorObject;
                if (error != "") {
                        if (errorMessage != "")
-                               errorObject = JSTizenExceptionFactory::makeErrorObject(cbm->getContext(), error, errorMessage);
+                               errorObject = JSWebAPIErrorFactory::makeErrorObject(cbm->getContext(), error, errorMessage);
                        else
-                               errorObject = JSTizenExceptionFactory::makeErrorObject(cbm->getContext(), error, error);
+                               errorObject = JSWebAPIErrorFactory::makeErrorObject(cbm->getContext(), error, error);
                } else
-                       errorObject = JSTizenExceptionFactory::makeErrorObject(cbm->getContext(), JSTizenException::UNKNOWN_ERROR,"Unknown Error");
+                       errorObject = JSWebAPIErrorFactory::makeErrorObject(cbm->getContext(), JSWebAPIErrorFactory::UNKNOWN_ERROR,"Unknown Error");
 
                cbm->callOnError(errorObject);
        } Catch (PlatformException) {
                LoggerE("Platform can't create NdefMessage"  << _rethrown_exception.GetMessage());
-               JSValueRef errorObject = JSTizenExceptionFactory::makeErrorObject(cbm->getContext(), JSTizenException::UNKNOWN_ERROR,"Unknown Error");
+               JSValueRef errorObject = JSWebAPIErrorFactory::makeErrorObject(cbm->getContext(), JSWebAPIErrorFactory::UNKNOWN_ERROR,"Unknown Error");
                cbm->callOnError(errorObject);          
        } Catch (Exception) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               JSValueRef errorObject = JSTizenExceptionFactory::makeErrorObject(cbm->getContext(), JSTizenException::UNKNOWN_ERROR,"Unknown Error");
+               JSValueRef errorObject = JSWebAPIErrorFactory::makeErrorObject(cbm->getContext(), JSWebAPIErrorFactory::UNKNOWN_ERROR,"Unknown Error");
                cbm->callOnError(errorObject);  
        }
 }
@@ -118,11 +117,11 @@ void NFCResponseDispatcher::OnAnswerReceived(const EventTagActionWritePtr &event
        JSValueRef errorObject;
        if (error != "") {
                if (errorMessage != "")
-                       errorObject = JSTizenExceptionFactory::makeErrorObject(cbm->getContext(), error, errorMessage);
+                       errorObject = JSWebAPIErrorFactory::makeErrorObject(cbm->getContext(), error, errorMessage);
                else
-                       errorObject = JSTizenExceptionFactory::makeErrorObject(cbm->getContext(), error, error);
+                       errorObject = JSWebAPIErrorFactory::makeErrorObject(cbm->getContext(), error, error);
        } else
-               errorObject = JSTizenExceptionFactory::makeErrorObject(cbm->getContext(), JSTizenException::UNKNOWN_ERROR,"Unknown Error");
+               errorObject = JSWebAPIErrorFactory::makeErrorObject(cbm->getContext(), JSWebAPIErrorFactory::UNKNOWN_ERROR,"Unknown Error");
 
        cbm->callOnError(errorObject);
 }
@@ -154,20 +153,20 @@ void NFCResponseDispatcher::OnAnswerReceived(const EventTagActionTransceivePtr &
                JSValueRef errorObject;
                if (error != "") {
                        if (errorMessage != "")
-                               errorObject = JSTizenExceptionFactory::makeErrorObject(cbm->getContext(), error, errorMessage);
+                               errorObject = JSWebAPIErrorFactory::makeErrorObject(cbm->getContext(), error, errorMessage);
                        else
-                               errorObject = JSTizenExceptionFactory::makeErrorObject(cbm->getContext(), error, error);
+                               errorObject = JSWebAPIErrorFactory::makeErrorObject(cbm->getContext(), error, error);
                } else
-                       errorObject = JSTizenExceptionFactory::makeErrorObject(cbm->getContext(), JSTizenException::UNKNOWN_ERROR,"Unknown Error");
+                       errorObject = JSWebAPIErrorFactory::makeErrorObject(cbm->getContext(), JSWebAPIErrorFactory::UNKNOWN_ERROR,"Unknown Error");
 
                cbm->callOnError(errorObject);
        } Catch (ConversionException) {
                LoggerE("Conversion exception while processing EventTagActionTransceive");
-               JSValueRef errorObject = JSTizenExceptionFactory::makeErrorObject(cbm->getContext(), JSTizenException::UNKNOWN_ERROR,"Unknown Error");
+               JSValueRef errorObject = JSWebAPIErrorFactory::makeErrorObject(cbm->getContext(), JSWebAPIErrorFactory::UNKNOWN_ERROR,"Unknown Error");
                cbm->callOnError(errorObject);          
        } Catch (Exception) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               JSValueRef errorObject = JSTizenExceptionFactory::makeErrorObject(cbm->getContext(), JSTizenException::UNKNOWN_ERROR,"Unknown Error");
+               JSValueRef errorObject = JSWebAPIErrorFactory::makeErrorObject(cbm->getContext(), JSWebAPIErrorFactory::UNKNOWN_ERROR,"Unknown Error");
                cbm->callOnError(errorObject);  
        }
 }
@@ -195,11 +194,11 @@ void NFCResponseDispatcher::OnAnswerReceived(const EventTagActionFormatPtr &even
        JSValueRef errorObject;
        if (error != "") {
                if (errorMessage != "")
-                       errorObject = JSTizenExceptionFactory::makeErrorObject(cbm->getContext(), error, errorMessage);
+                       errorObject = JSWebAPIErrorFactory::makeErrorObject(cbm->getContext(), error, errorMessage);
                else
-                       errorObject = JSTizenExceptionFactory::makeErrorObject(cbm->getContext(), error, error);
+                       errorObject = JSWebAPIErrorFactory::makeErrorObject(cbm->getContext(), error, error);
        } else
-               errorObject = JSTizenExceptionFactory::makeErrorObject(cbm->getContext(), JSTizenException::UNKNOWN_ERROR,"Unknown Error");
+               errorObject = JSWebAPIErrorFactory::makeErrorObject(cbm->getContext(), JSWebAPIErrorFactory::UNKNOWN_ERROR,"Unknown Error");
 
        cbm->callOnError(errorObject);
 }
@@ -227,11 +226,11 @@ void NFCResponseDispatcher::OnAnswerReceived(const EventTargetActionSendPtr &eve
        JSValueRef errorObject;
        if (error != "") {
                if (errorMessage != "")
-                       errorObject = JSTizenExceptionFactory::makeErrorObject(cbm->getContext(), error, errorMessage);
+                       errorObject = JSWebAPIErrorFactory::makeErrorObject(cbm->getContext(), error, errorMessage);
                else
-                       errorObject = JSTizenExceptionFactory::makeErrorObject(cbm->getContext(), error, error);
+                       errorObject = JSWebAPIErrorFactory::makeErrorObject(cbm->getContext(), error, error);
        } else
-               errorObject = JSTizenExceptionFactory::makeErrorObject(cbm->getContext(), JSTizenException::UNKNOWN_ERROR,"Unknown Error");
+               errorObject = JSWebAPIErrorFactory::makeErrorObject(cbm->getContext(), JSWebAPIErrorFactory::UNKNOWN_ERROR,"Unknown Error");
 
        cbm->callOnError(errorObject);
 }
index 2802b33..e625c6c 100755 (executable)
@@ -1,6 +1,7 @@
 SET(TARGET_NAME ${networkbearerselection_target})
 SET(DESTINATION_NAME ${networkbearerselection_dest})
 
+IF(ENABLE_OPTIONAL_NBS)
 PKG_CHECK_MODULES(platform_pkgs_networkbearerselection REQUIRED capi-network-connection)
 
 INCLUDE_DIRECTORIES(
@@ -27,6 +28,7 @@ TARGET_LINK_LIBRARIES(${TARGET_NAME}
 
 INSTALL(TARGETS ${TARGET_NAME} ${TARGET_IMPL_NAME} LIBRARY DESTINATION ${DESTINATION_LIB_PREFIX}/${DESTINATION_NAME})
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/config.xml DESTINATION ${DESTINATION_LIB_PREFIX}/${DESTINATION_NAME})
+ENDIF(ENABLE_OPTIONAL_NBS)
 INSTALL(
        DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ DESTINATION ${DESTINATION_HEADER_PREFIX}/networkbearerselection
        FILES_MATCHING PATTERN "*.h" PATTERN "CMakeFiles" EXCLUDE
index ec19246..d66e8f9 100755 (executable)
@@ -26,8 +26,7 @@
 #include "EventNetworkBearerSelection.h"
 #include "EventNetworkBearerRelease.h"
 #include "OnNetworkBearerSelectionStateChanged.h"
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 #include <SecurityExceptions.h>
 #include "JSNetworkBearerSelection.h"
 #include "JSNetworkBearerSelectionCallbackManager.h"
@@ -120,26 +119,26 @@ JSValueRef JSNetworkBearerSelection::requestRouteToHost(JSContextRef context, JS
 
     if (!priv) {
         LoggerE("private object is null");
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Wrong Object");
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Wrong Object");
     }
     if (argumentCount < 3) {
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type missmatch error");
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type missmatch error");
     }
     if (argumentCount == 4) {
         if (check.isCallback(arguments[3])) {
             LoggerD("arguments 3 is callback");
-        } else if (!JSValueIsNull(context, arguments[3]) && !JSValueIsUndefined(context, arguments[3])) {
-            return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type missmatch error");
+        } else if (!JSValueIsNull(context, arguments[3])) {
+            return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type missmatch error");
         }
     }
 
        AceSecurityStatus status = NETWORKBEARERSELECTION_CHECK_ACCESS(NETWORKBEARERSELECTION_FUNCTION_API_REQUEST_ROUTE_TO_HOST);
        TIZEN_SYNC_ACCESS_HANDLER(status, context, exception);
 
-       JSValueRef onsuccess;
-       JSValueRef onpaused;
-       JSValueRef onresumed;
-       JSValueRef ondisconnected;
+       JSValueRef onsuccess = NULL;
+       JSValueRef onpaused = NULL;
+       JSValueRef onresumed = NULL;
+       JSValueRef ondisconnected = NULL;
 
     Try {
        JSObjectRef callbackObject = converter.toJSObjectRef(arguments[2]);
@@ -172,9 +171,13 @@ JSValueRef JSNetworkBearerSelection::requestRouteToHost(JSContextRef context, JS
            ThrowMsg(ConversionException, "2nd argument's onsuccess attribute is not a 'function'");
        }
 
+        if( onsuccess == NULL && onpaused == NULL && onresumed == NULL && ondisconnected == NULL ) {
+           ThrowMsg(ConversionException, "2nd argument is not a callback'");            
+        }
+
     } Catch(ConversionException) {
         LoggerE("Error on conversion : " << _rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
     }
 
        JSNetworkBearerSelectionCallbackManagerPtr callbackManager = JSNetworkBearerSelectionCallbackManager::createObject(priv->getContext());
@@ -182,7 +185,7 @@ JSValueRef JSNetworkBearerSelection::requestRouteToHost(JSContextRef context, JS
     std::string networkType = converter.toString(arguments[0]);
     std::string domainName = converter.toString(arguments[1]);
     if (strcmp(networkType.c_str(), "CELLULAR") != 0) {
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type missmatch error");
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type missmatch error");
     }
 
        callbackManager->setOnSuccess(onsuccess);
@@ -209,12 +212,12 @@ JSValueRef JSNetworkBearerSelection::requestRouteToHost(JSContextRef context, JS
 
         NetworkBearerSelections->requestRouteToHost(dplEvent);
         } else {
-            callbackManager->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::NETWORK_ERROR, "Network error"));        
+            callbackManager->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::NETWORK_ERROR, "Network error"));        
         }
     }
     
     Catch(WrtDeviceApis::Commons::Exception) {
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown error");        
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown error");        
     }
     return JSValueMakeUndefined(context);
 }
@@ -229,13 +232,13 @@ JSValueRef JSNetworkBearerSelection::releaseRouteToHost(JSContextRef context, JS
     
     if (!priv) {
         LoggerE("private object is null");
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Wrong Object");
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Wrong Object");
     }
     if (argumentCount < 3) {
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type missmatch error");
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type missmatch error");
     }
     if (!check.isCallback(arguments[2])) {
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type missmatch error");
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type missmatch error");
     }
 
        AceSecurityStatus status = NETWORKBEARERSELECTION_CHECK_ACCESS(NETWORKBEARERSELECTION_FUNCTION_API_RELEASE_ROUTE_TO_HOST);
@@ -244,7 +247,7 @@ JSValueRef JSNetworkBearerSelection::releaseRouteToHost(JSContextRef context, JS
     std::string networkType = converter.toString(arguments[0]);
     std::string domainName = converter.toString(arguments[1]);
     if (strcmp(networkType.c_str(), "CELLULAR") != 0) {
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type missmatch error");        
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type missmatch error");        
     }
 
     JSValueRef onSuccessForCbm = NULL, onErrorForCbm = NULL;
@@ -252,8 +255,8 @@ JSValueRef JSNetworkBearerSelection::releaseRouteToHost(JSContextRef context, JS
     if (argumentCount > 3) {
         if (check.isCallback(arguments[3])) {
             onErrorForCbm = arguments[3];
-        } else if (!JSValueIsNull(context, arguments[3]) && !JSValueIsUndefined(context, arguments[3])) {
-            return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type missmatch error");
+        } else if (!JSValueIsNull(context, arguments[3])) {
+            return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type missmatch error");
         }
     }
     JSCallbackManagerPtr callbackManager(JSCallbackManager::createObject(priv->getContext(), onSuccessForCbm, onErrorForCbm, true, true));
@@ -271,7 +274,7 @@ JSValueRef JSNetworkBearerSelection::releaseRouteToHost(JSContextRef context, JS
     }
     
     Catch(WrtDeviceApis::Commons::Exception) {
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown error");        
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown error");        
     }
 
     return JSValueMakeUndefined(context);
old mode 100755 (executable)
new mode 100644 (file)
index 980bd37..3abbe05
@@ -33,6 +33,7 @@ namespace NetworkBearerSelection {
     
 static void connection_state_changed_callback(connection_profile_state_e state, void* user_data)
 {
+    LoggerD("enter");
     if(user_data != NULL) {
         LoggerD("Callback registration Succeeded");
         NewtorkBearerSelectionPendingEvent *pendingEvent = (NewtorkBearerSelectionPendingEvent *)user_data;
@@ -53,6 +54,7 @@ static void connection_state_changed_callback(connection_profile_state_e state,
 
 static void connection_opened_callback(connection_error_e result, void* user_data)
 {
+    LoggerD("enter");
        if (result ==  CONNECTION_ERROR_NONE) {
         LoggerD("Connection open Succeeded");
         if(user_data != NULL) {
@@ -71,6 +73,7 @@ static void connection_opened_callback(connection_error_e result, void* user_dat
 
 static void connection_closed_callback(connection_error_e result, void* user_data)
 {
+    LoggerD("enter");
        if (result ==  CONNECTION_ERROR_NONE) {
                LoggerD("Connection close Succeeded");
         if (user_data != NULL) {
@@ -87,8 +90,18 @@ static void connection_closed_callback(connection_error_e result, void* user_dat
     }
 }
 
+static void connection_closed_callback2(connection_error_e result, void* user_data)
+{
+    LoggerD("enter");
+       if (result ==  CONNECTION_ERROR_NONE) {
+               LoggerD("Connection close Succeeded");
+    }
+}
+
+
 static void connection_removed_callback(connection_error_e result, void* user_data)
 {
+    LoggerD("enter");
     if (user_data != NULL) {
         if (result ==  CONNECTION_ERROR_NONE) {
             LoggerD("Connection close Succeeded");
@@ -107,7 +120,8 @@ static void connection_removed_callback(connection_error_e result, void* user_da
 }
 
 NetworkBearerSelection::NetworkBearerSelection() : m_connectionHandle(NULL),
-                                                   m_profileHandle(NULL)
+                                                   m_profileHandle(NULL),
+                                                   m_connectionState(NETWORK_UNKNOWN)
 {
     int ret = connection_create(&m_connectionHandle);
 
@@ -141,7 +155,9 @@ void NetworkBearerSelection::releaseRouteToHost(const EventNetworkBearerReleaseP
 
 void NetworkBearerSelection::OnRequestReceived(const EventNetworkBearerSelectionPtr &event)
 {
-    if (checkProfileHandle() == false) {
+    LoggerD("m_connectionState : " << m_connectionState);
+
+    if (m_connectionState == NETWORK_CONNECTED) {
         reLaunchConnection(event);
         return;
     }
@@ -151,11 +167,13 @@ void NetworkBearerSelection::OnRequestReceived(const EventNetworkBearerSelection
     int ret = connection_get_profile_iterator(m_connectionHandle, CONNECTION_ITERATOR_TYPE_REGISTERED, &profileIter);
        if (ret != CONNECTION_ERROR_NONE) {
         LoggerD("Fail to get profile iterator");
+        makeCallback(event, CONNECTION_STATE_PLATFORM_ERROR);
         return;
     }
     while (connection_profile_iterator_has_next(profileIter)) {
         if (connection_profile_iterator_next(profileIter, &m_profileHandle) != CONNECTION_ERROR_NONE) {
             LoggerD("Fail to get profile handle");
+            makeCallback(event, CONNECTION_STATE_PLATFORM_ERROR);
             return;
        }
     }
@@ -164,6 +182,7 @@ void NetworkBearerSelection::OnRequestReceived(const EventNetworkBearerSelection
 
     if (connection_open_profile(m_connectionHandle, m_profileHandle, connection_opened_callback, pendingEvent) != CONNECTION_ERROR_NONE) {
         LoggerD("Connection open Failed");
+        makeCallback(event, CONNECTION_STATE_PLATFORM_ERROR);
         delete pendingEvent;
         pendingEvent = NULL;
     }
@@ -181,7 +200,7 @@ void NetworkBearerSelection::OnRequestReceived(const EventNetworkBearerReleasePt
         }        
         
         NewtorkBearerReleasePendingEvent *pendingEvent = new NewtorkBearerReleasePendingEvent((void *)this, event);
-        
+
         if (connection_close_profile(m_connectionHandle, m_profileHandle, connection_closed_callback, pendingEvent) != CONNECTION_ERROR_NONE) {
             LoggerD("connection close failed");
             delete pendingEvent;
@@ -199,7 +218,8 @@ void NetworkBearerSelection::reLaunchConnection(const EventNetworkBearerSelectio
     LoggerD("enter");
 
     if (connection_profile_unset_state_changed_cb(m_profileHandle) != CONNECTION_ERROR_NONE) {
-        LoggerD("unset callback is failed");        
+        LoggerD("unset callback is failed");
+        makeCallback(event, CONNECTION_STATE_PLATFORM_ERROR);
         return;
     }
 
@@ -207,6 +227,7 @@ void NetworkBearerSelection::reLaunchConnection(const EventNetworkBearerSelectio
 
     if (connection_close_profile(m_connectionHandle, m_profileHandle, connection_removed_callback, pendingEvent) != CONNECTION_ERROR_NONE) {
         LoggerD("connection close failed");
+        makeCallback(event, CONNECTION_STATE_PLATFORM_ERROR);
         delete pendingEvent;
         pendingEvent = NULL;
     }
@@ -222,11 +243,13 @@ void NetworkBearerSelection::removeStateChangeListener(const EventNetworkBearerS
     int ret = connection_get_profile_iterator(m_connectionHandle, CONNECTION_ITERATOR_TYPE_REGISTERED, &profileIter);
     if (ret != CONNECTION_ERROR_NONE) {
         LoggerD("Fail to get profile iterator");
+        makeCallback(event, CONNECTION_STATE_PLATFORM_ERROR);
         return;
     }
     while (connection_profile_iterator_has_next(profileIter)) {
         if (connection_profile_iterator_next(profileIter, &m_profileHandle) != CONNECTION_ERROR_NONE) {
             LoggerD("Fail to get profile handle");
+            makeCallback(event, CONNECTION_STATE_PLATFORM_ERROR);
             return;
         }
     }
@@ -235,6 +258,7 @@ void NetworkBearerSelection::removeStateChangeListener(const EventNetworkBearerS
 
     if (connection_open_profile(m_connectionHandle, m_profileHandle, connection_opened_callback, pendingEvent) != CONNECTION_ERROR_NONE) {
         LoggerD("Connection open Failed");
+        makeCallback(event, CONNECTION_STATE_PLATFORM_ERROR);
         delete pendingEvent;
         pendingEvent = NULL;
     }
@@ -246,11 +270,10 @@ void NetworkBearerSelection::registStateChangeListener(const EventNetworkBearerS
     char *interfaceName = NULL;
     char *hostAddr = NULL;
     struct hostent *host_entry;
-    int ndx = 0;
-    int ret = 0;
 
        if (connection_profile_get_network_interface_name(m_profileHandle, &interfaceName) != CONNECTION_ERROR_NONE) {
         LoggerD("Fail to get interface name!");
+        makeCallback(event, CONNECTION_STATE_PLATFORM_ERROR);
     }
        else {
         LoggerD("Interface name : " << interfaceName);
@@ -260,7 +283,13 @@ void NetworkBearerSelection::registStateChangeListener(const EventNetworkBearerS
 
     if(!host_entry) {
         LoggerD("gethostbyname is failed");
-        makeCallback(event, CONNECTION_STATE_ERROR);
+        makeCallback(event, CONNECTION_STATE_INVALID_VALUES_ERROR);
+
+        if (connection_close_profile(m_connectionHandle, m_profileHandle, connection_closed_callback2, NULL) != CONNECTION_ERROR_NONE) {
+            LoggerD("connection close failed");
+            makeCallback(event, CONNECTION_STATE_PLATFORM_ERROR);
+        }
+        m_profileHandle = NULL;
         return;
     }
 
@@ -276,24 +305,30 @@ void NetworkBearerSelection::deregistStateChangeListener(const EventNetworkBeare
 {
     LoggerD("enter");
     m_profileHandle = NULL;
-
+    m_connectionState = NETWORK_DISCONNECTED;
        EventRequestReceiver<EventNetworkBearerRelease>::ManualAnswer(event);         
 }
 
 void NetworkBearerSelection::makeCallback(const EventNetworkBearerSelectionPtr &event, connectionStateType state)
 {
-    LoggerD("enter");
+    LoggerD("state : " << state);
     OnNetworkBearerSelectionStateChangedEmitterPtr emitter = event->getEmitter();
        OnNetworkBearerSelectionStateChangedPtr listener(new OnNetworkBearerSelectionStateChanged());    
 
     m_domainName = event->getDomainName();    
-
     listener->setConnectionStateType(state);
 
-    if (state == CONNECTION_STATE_ERROR) {
+    if (state == CONNECTION_STATE_INVALID_VALUES_ERROR) {
+        m_connectionState = NETWORK_CONNECTION_FAILED;
         listener->setExceptionCode(ExceptionCodes::InvalidArgumentException);
+    } else if (state == CONNECTION_STATE_PLATFORM_ERROR) {
+        m_connectionState = NETWORK_CONNECTION_FAILED;
+        listener->setExceptionCode(ExceptionCodes::PlatformException);
+    } else if (state == CONNECTION_STATE_DISCONNECTED) {
+        m_connectionState = NETWORK_DISCONNECTED;
+    } else if (state == CONNECTION_STATE_CONNECTED) {
+        m_connectionState = NETWORK_CONNECTED;
     }
-
     emitter->emit(listener);
 }
 
index 27545c9..40ae3fa 100755 (executable)
 namespace DeviceAPI {
 namespace NetworkBearerSelection {
 
+enum {
+    NETWORK_UNKNOWN = 0,
+    NETWORK_CONNECTED = 1,
+    NETWORK_DISCONNECTED = 2,
+    NETWORK_CONNECTION_FAILED = 3
+};
+
 class NetworkBearerSelection : public INetworkBearerSelection
 {
     friend class NetworkBearerSelectionFactory;
@@ -59,6 +66,7 @@ class NetworkBearerSelection : public INetworkBearerSelection
     connection_h m_connectionHandle;
     connection_profile_h m_profileHandle;
     std::string m_domainName;
+    long m_connectionState;
 };
 
 class NewtorkBearerSelectionPendingEvent
old mode 100755 (executable)
new mode 100644 (file)
index 8cdfe20..0634e5d
@@ -18,8 +18,7 @@
 #include "NetworkBearerSelectionResponseDispatcher.h"
 #include "JSNetworkBearerSelectionCallbackManager.h"
 #include <CommonsJavaScript/JSCallbackManager.h>
-#include <JSTizenException.h>
-#include <JSTizenExceptionFactory.h>
+#include <JSWebAPIErrorFactory.h>
 #include <Logger.h>
 
 using namespace DeviceAPI::Common;
@@ -69,19 +68,19 @@ void NetworkBearerSelectionResponseDispatcher::OnAnswerReceived(const EventNetwo
                switch (event->getExceptionCode())
                {
                case ExceptionCodes::PlatformException:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::UNKNOWN_ERROR, "Internal error");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                        break;
                case ExceptionCodes::NotFoundException:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::NOT_FOUND_ERROR, "record not found");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::NOT_FOUND_ERROR, "record not found");
                        break;
                case ExceptionCodes::InvalidArgumentException:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::INVALID_VALUES_ERROR, "DomainName is not setted");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "DomainName is not setted");
                        break;
                case ExceptionCodes::ConversionException:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::TYPE_MISMATCH_ERROR, "Wrong argument");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong argument");
                        break;
                default:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::UNKNOWN_ERROR, "Unknown error");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown error");
                        break;
                }
 
@@ -110,7 +109,7 @@ void NetworkBearerSelectionResponseDispatcher::onAnswerReceived(const OnNetworkB
         } else if (event->getConnectionStateType() == CONNECTION_STATE_DISCONNECTED) {
             LoggerD("disconnect callback");  
             callbackManager->callOnDisconnected();
-        } else if (event->getConnectionStateType() == CONNECTION_STATE_ERROR) {
+        } else if (event->getConnectionStateType() == CONNECTION_STATE_INVALID_VALUES_ERROR || event->getConnectionStateType() == CONNECTION_STATE_PLATFORM_ERROR) {
                JSContextRef gContext = callbackManager->getContext();        
             JSValueRef error = NULL;
             
@@ -119,19 +118,19 @@ void NetworkBearerSelectionResponseDispatcher::onAnswerReceived(const OnNetworkB
                        switch (event->getExceptionCode())
                        {
                        case ExceptionCodes::PlatformException:
-                               error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::UNKNOWN_ERROR, "Internal error");
+                               error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                                break;
                        case ExceptionCodes::NotFoundException:
-                               error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::NOT_FOUND_ERROR, "record not found");
+                               error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::NOT_FOUND_ERROR, "record not found");
                                break;
                        case ExceptionCodes::InvalidArgumentException:
-                               error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::INVALID_VALUES_ERROR, "Invalid values error");
+                               error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Invalid values error");
                                break;
                        case ExceptionCodes::ConversionException:
-                               error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::TYPE_MISMATCH_ERROR, "Wrong argument");
+                               error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong argument");
                                break;
                        default:
-                               error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::UNKNOWN_ERROR, "Unknown error");
+                               error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown error");
                                break;
                        }
 
index c29c6fb..02d393d 100755 (executable)
@@ -29,7 +29,8 @@ namespace NetworkBearerSelection {
 enum connectionStateType {
     CONNECTION_STATE_DISCONNECTED = 0,
     CONNECTION_STATE_CONNECTED = 1,
-    CONNECTION_STATE_ERROR = 2
+    CONNECTION_STATE_INVALID_VALUES_ERROR = 2,
+    CONNECTION_STATE_PLATFORM_ERROR = 3
 };
 
 class OnNetworkBearerSelectionStateChanged : public WrtDeviceApis::Commons::ListenerEvent<OnNetworkBearerSelectionStateChanged>
index 5f60bf5..111047e 100755 (executable)
@@ -37,8 +37,12 @@ static WrtDeviceApis::Commons::FunctionMapping createNetworkBearerSelectionFunct
 static WrtDeviceApis::Commons::FunctionMapping NetworkBearerSelectionFunctions =
     createNetworkBearerSelectionFunctions();
 
+#pragma GCC visibility push(default)
+
 DEFINE_FUNCTION_GETTER(NetworkBearerSelection, NetworkBearerSelectionFunctions);
 
+#pragma GCC visibility pop
+
 static WrtDeviceApis::Commons::FunctionMapping createNetworkBearerSelectionFunctions()
 {
     using namespace WrtDeviceApis::Commons;
old mode 100644 (file)
new mode 100755 (executable)
index 57ddf82..dbcfca6
@@ -18,7 +18,7 @@
 #include <SecurityExceptions.h>
 
 #include <JSUtil.h>
-#include <JSWebAPIError.h>
+#include <JSWebAPIErrorFactory.h>
 #include <ArgumentValidator.h>
 #include <GlobalContextManager.h>
 #include <MultiCallbackUserData.h>
@@ -145,6 +145,9 @@ void JSNotificationDetailInfo::setPrivateObject(JSContextRef context, JSObjectRe
     if (priv) {
         JSObjectSetPrivate(object, static_cast<void*>(priv));
     }
+    else {
+       throw TypeMismatchException("NotificationDetailInfo object is invaild.");
+    }
 
     // mainText
     JSUtil::setProperty(context, object, NOTIFICATION_DETAIL_INFO_MAIN_TEXT,
index 6b1f504..f637443 100644 (file)
@@ -18,7 +18,7 @@
 #include <SecurityExceptions.h>
 
 #include <JSUtil.h>
-#include <JSWebAPIError.h>
+#include <JSWebAPIErrorFactory.h>
 #include <ArgumentValidator.h>
 #include <GlobalContextManager.h>
 #include <MultiCallbackUserData.h>
@@ -171,10 +171,10 @@ JSValueRef JSNotificationManager::post(JSContextRef context,
                TIME_TRACER_ITEM_END(__FUNCTION__, 0);
         return JSValueMakeUndefined(context);
     } catch (const BasePlatformException &err) {
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
         DeviceAPI::Common::UnknownException err("Unknown Error in NotificationManager.post().");
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 }
 
@@ -210,10 +210,10 @@ JSValueRef JSNotificationManager::update(JSContextRef context,
                TIME_TRACER_ITEM_END(__FUNCTION__, 0);
         return JSValueMakeUndefined(context);
     } catch (const BasePlatformException &err) {
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
         DeviceAPI::Common::UnknownException err("Unknown Error in NotificationManager.update().");
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 }
 
@@ -245,10 +245,10 @@ JSValueRef JSNotificationManager::remove(JSContextRef context,
                TIME_TRACER_ITEM_END(__FUNCTION__, 0);
         return JSValueMakeUndefined(context);
     } catch (const BasePlatformException &err) {
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
         DeviceAPI::Common::UnknownException err("Unknown Error in NotificationManager.remove().");
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 }
 
@@ -276,10 +276,10 @@ JSValueRef JSNotificationManager::removeAll(JSContextRef context,
                TIME_TRACER_ITEM_END(__FUNCTION__, 0);
         return JSValueMakeUndefined(context);
     } catch (const BasePlatformException &err) {
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
         DeviceAPI::Common::UnknownException err("Unknown Error in NotificationManager.removeAll().");
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 }
 
@@ -310,10 +310,10 @@ JSValueRef JSNotificationManager::get(JSContextRef context,
        return obj;
        
     } catch (const BasePlatformException &err) {
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
         DeviceAPI::Common::UnknownException err("Unknown Error in NotificationManager.get().");
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 }
 
@@ -349,10 +349,10 @@ JSValueRef JSNotificationManager::getAll(JSContextRef context,
         return jsResult;
                
     } catch (const BasePlatformException &err) {
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
         DeviceAPI::Common::UnknownException err("Unknown Error in NotificationManager.getAll().");
-        return JSWebAPIError::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 }
 
index 9710714..87db11a 100755 (executable)
 #include <SecurityExceptions.h>
 
 #include <JSUtil.h>
-#include <JSWebAPIError.h>
 #include <ArgumentValidator.h>
 #include <GlobalContextManager.h>
 #include <MultiCallbackUserData.h>
 #include <PlatformException.h>
-#include <JSWebAPIError.h>
+#include <JSWebAPIErrorFactory.h>
 #include <FilesystemUtils.h>
 #include "plugin_config.h"
 
@@ -496,7 +495,7 @@ JSObjectRef JSStatusNotification::constructor(JSContextRef context,
      catch ( const BasePlatformException& err) 
     {
         LoggerW(" notification convertion is failed. "   << err.getName().c_str() << ":"  << err.getMessage().c_str());
-       JSObjectRef error = JSWebAPIError::makeJSWebAPIError(context, err);
+       JSObjectRef error = JSWebAPIErrorFactory::makeErrorObject(context, err);
        *exception = error;
        return error;
     }
index 8397142..f9e61ad 100755 (executable)
@@ -122,7 +122,7 @@ StatusNotification::StatusNotification(NotificationType statusType) :
                throw TypeMismatchException("value is not notification type");
        }
 
-       setProgressType(NOTI_PROGRESS_TYPE_PERCENTAGE); //default
+       //setProgressType(NOTI_PROGRESS_TYPE_PERCENTAGE);       //default
 
        LoggerI("Notification Type : " << type);
 
@@ -135,8 +135,12 @@ StatusNotification::StatusNotification(NotificationType statusType) :
                if (NOTIFICATION_TYPE_ONGOING ==  type)
                {       //ongoing no ticker.
                        LoggerI("ongoing type");
-                       notification_set_display_applist(noti, NOTIFICATION_DISPLAY_APP_NOTIFICATION_TRAY |NOTIFICATION_DISPLAY_APP_INDICATOR );
+                       if ( NOTIFICATION_ERROR_NONE != notification_set_display_applist(noti, NOTIFICATION_DISPLAY_APP_NOTIFICATION_TRAY |NOTIFICATION_DISPLAY_APP_INDICATOR ))
+                       {
+                               throw UnknownException("can't set notification display applist");
+                       }
                }
+               
        }
        else
        {
@@ -196,17 +200,29 @@ StatusNotification::StatusNotification(void* noti) :
 
                LoggerI(" notification type  =" << type);
                setNotiType(type);
-               setProgressType(NOTI_PROGRESS_TYPE_PERCENTAGE); //default.
+               //setProgressType(NOTI_PROGRESS_TYPE_PERCENTAGE); //default.
+               //read Progress type value.
+               char *strProgressType = NULL;
+               if (NOTIFICATION_ERROR_NONE == notification_get_image(notification, NOTIFICATION_IMAGE_TYPE_LIST_5,  &strProgressType))
+               {
+                       if ( strProgressType )
+                       {
+                               std::string notiProgressType(strProgressType);
+                               if( notiProgressType.compare(TIZEN_NOTIFICATION_PROGRESS_TYPE_BYTE) == 0)
+                                       m_progressType = NOTI_PROGRESS_TYPE_SIZE;
+                       }
+               }
                
                setNotificationHandle((void*)notification);
                loadThumbnails();
                loadDetailInfos();
 
+#if 0
                 if ( type  == NOTI_TYPE_PROGRESS)
                 {
                         notification_update_progress(notification, NOTIFICATION_PRIV_ID_NONE, getProgressValue());
                 }
-
+#endif
                //service
                bundle *bSvc = NULL;
 
@@ -288,16 +304,28 @@ StatusNotification::StatusNotification(int privID) :
 
                LoggerI(" notification type  =" << type);
                setNotiType(type);
-               setProgressType(NOTI_PROGRESS_TYPE_PERCENTAGE); //default.      
+               //setProgressType(NOTI_PROGRESS_TYPE_PERCENTAGE); //default.
+               //read Progress type value.
+               char *strProgressType = NULL;
+               if (NOTIFICATION_ERROR_NONE == notification_get_image(notification, NOTIFICATION_IMAGE_TYPE_LIST_5,  &strProgressType))
+               {
+                       if ( strProgressType )
+                       {
+                               std::string notiProgressType(strProgressType);
+                               if( notiProgressType.compare(TIZEN_NOTIFICATION_PROGRESS_TYPE_BYTE) == 0)
+                                       m_progressType = NOTI_PROGRESS_TYPE_SIZE;
+                       }
+               }
+               
                setNotificationHandle((void*)notification);
                loadThumbnails();
                loadDetailInfos();
-
+#if 0
                 if ( type  == NOTI_TYPE_PROGRESS)
                 {
                         notification_update_progress(notification, NOTIFICATION_PRIV_ID_NONE, getProgressValue());
                 }
-
+#endif
                //service
                bundle *bSvc = NULL;
 
@@ -340,14 +368,13 @@ StatusNotification::~StatusNotification()
        
        if (m_notiHandle)
        {
-#if 0
                LoggerI(" service = " << m_service);
                if (m_service != NULL)
                {
                        service_destroy(m_service);
                        m_service = NULL;
                }
-#endif         
+
                if (notification_free(m_notiHandle) != NOTIFICATION_ERROR_NONE)
                {
                        throw UnknownException("notification free failed...");
@@ -980,9 +1007,10 @@ void StatusNotification::setApplicationId(const std::string& appId)
 std::string StatusNotification::getApplicationId()
 {
        std::string retString;
-       service_h service = NULL;
        char* appIdStr = NULL;
-       
+#if 0  
+       service_h service = NULL;
+
        if (m_service != NULL)
        {
                int retcode;
@@ -1008,10 +1036,10 @@ std::string StatusNotification::getApplicationId()
                        }
                }
        }
-
-       if (service != NULL) 
+#endif
+       if (m_service != NULL) 
        {
-               if (service_get_app_id(service, &appIdStr) != SERVICE_ERROR_NONE)
+               if (service_get_app_id(m_service, &appIdStr) != SERVICE_ERROR_NONE)
                {
                        throw UnknownException ("get a appId error");
                }
@@ -1102,6 +1130,48 @@ void StatusNotification::setProgressValue(const double &progressValue)
        }
 }
 
+NotificationProgressType StatusNotification::getProgressType()
+{
+       return m_progressType;
+}
+
+void StatusNotification::setProgressType(NotificationProgressType type)
+{
+       
+       if (m_notiHandle)
+       {
+               LoggerI(" NotificationProgressType = " << type);
+
+               std::string progressType;
+
+               if ( type == NOTI_PROGRESS_TYPE_PERCENTAGE)
+               {
+                       progressType = TIZEN_NOTIFICATION_PROGRESS_TYPE_PERCENTAGE;
+               }
+               else if ( type == NOTI_PROGRESS_TYPE_SIZE)
+               {
+                       progressType = TIZEN_NOTIFICATION_PROGRESS_TYPE_BYTE;
+               }
+               else
+               {
+                       throw TypeMismatchException("Invalid Progress Type.");
+               }
+               
+               if (notification_set_image(m_notiHandle,NOTIFICATION_IMAGE_TYPE_LIST_5, progressType.c_str()) != NOTIFICATION_ERROR_NONE)
+               {
+                       throw UnknownException("set notification sound error");
+               }
+
+               m_progressType = type;
+       }
+       else
+       {       
+               LoggerD("noti Handle is NULL");
+               throw UnknownException("notification handle is null");
+       }
+       
+}
+
 std::string StatusNotification::getSubIconPath()
 {
         LoggerI("Handle = " << m_notiHandle);
old mode 100644 (file)
new mode 100755 (executable)
index 78b15f9..f99d077
@@ -41,18 +41,21 @@ public:
        StatusNotification(int privID);                         //private ID of Notification.
        
        ~StatusNotification();
-       
+
+#if 0  
         NotificationProgressType getProgressType()
         {
                return m_progressType;
         }
-
-       std::string getEnumProgressType();
-        
         void setProgressType( NotificationProgressType type)
         {
                m_progressType = type;
         }
+#endif
+
+       std::string getEnumProgressType();
+        
+
         void setUpdatedFlag(bool value)
         {
              if (value)
@@ -105,9 +108,12 @@ public:
        
        bool getDefaultVibration() ;    
        void setDefaultVibration(const bool& vibration) ;
-       
-       double getProgressValue() ;
-       void setProgressValue(const double & progressValue) ;
+
+       NotificationProgressType getProgressType();
+       void setProgressType(NotificationProgressType type);
+
+        double getProgressValue() ;
+        void setProgressValue(const double & progressValue);
        
        std::string getSubIconPath() ;
        void setSubIconPath(const std::string& subIconPath) ;
@@ -168,7 +174,6 @@ private:
                
 protected:
 
-       //NotificationType m_notiType;
        NotificationType m_notiType;
        service_h m_service;
        notification_h m_notiHandle;
index f6eccd2..421f8d8 100644 (file)
 // limitations under the License.
 //
 
-#include <JSWebAPIException.h>
 #include <CommonsJavaScript/Converter.h>
 #include <CommonsJavaScript/JSUtils.h>
 #include <CommonsJavaScript/Utils.h>
 #include <JSUtil.h>
+#include <JSWebAPIErrorFactory.h>
 #include "JSPackageInformation.h"
 #include "PackageInformation.h"
 #include <Logger.h>
@@ -148,10 +148,10 @@ JSValueRef JSPackageInformation::getProperty(JSContextRef context,
                        return JSUtil::toJSValueRef(context, privateData->m_appIds);
                }
        } catch (const BasePlatformException &err) {
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
         DeviceAPI::Common::TypeMismatchException err("TypeMismatchException occured");
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
        
        return JSValueMakeUndefined(context);
index 727914a..76fac86 100644 (file)
 // limitations under the License.
 //
 
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 #include <SecurityExceptions.h>
 
 #include <ArgumentValidator.h>
 #include <PlatformException.h>
-#include <JSWebAPIException.h>
 
 #include <CommonsJavaScript/Converter.h>
 //#include <CommonsJavaScript/JSUtils.h>
@@ -155,10 +153,10 @@ JSValueRef JSPackageManager::install(JSContextRef context,
                return JSValueMakeUndefined(context);
                
        } catch (const BasePlatformException &err) {
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
         DeviceAPI::Common::UnknownException err("Unknown Error in ApplicationManager.getAppSharedURI().");
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 }
 
@@ -211,10 +209,10 @@ JSValueRef JSPackageManager::uninstall(JSContextRef context,
                return JSValueMakeUndefined(context);
                
        } catch (const BasePlatformException &err) {
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
         DeviceAPI::Common::UnknownException err("Unknown Error in ApplicationManager.getAppSharedURI().");
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 }
 
@@ -247,10 +245,10 @@ JSValueRef JSPackageManager::getPackagesInfo(JSContextRef context,
                return JSValueMakeUndefined(context);
                
        } catch (const BasePlatformException &err) {
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
         DeviceAPI::Common::UnknownException err("Unknown Error in ApplicationManager.getAppSharedURI().");
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 }
 
@@ -275,10 +273,10 @@ JSValueRef JSPackageManager::getPackageInfo(JSContextRef context,
                return JSPackageInformation::createJSObject(context, pkgInfo);
 
        } catch (const BasePlatformException &err) {
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
         DeviceAPI::Common::UnknownException err("Unknown Error in ApplicationManager.getAppSharedURI().");
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 }
 
@@ -329,10 +327,10 @@ JSValueRef JSPackageManager::setPackageInfoEventListener(JSContextRef context,
                return JSValueMakeUndefined(context);
                
        } catch (const BasePlatformException &err) {
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
         DeviceAPI::Common::UnknownException err("Unknown Error in ApplicationManager.getAppSharedURI().");
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 }
 
@@ -354,7 +352,7 @@ JSValueRef JSPackageManager::unsetPackageInfoEventListener(JSContextRef context,
                return JSValueMakeUndefined(context);
 
        } catch(const BasePlatformException& err) {
-               return JSWebAPIException::throwException(context, exception, err);
+               return JSWebAPIErrorFactory::postException(context, exception, err);
        }
 }
 
@@ -385,7 +383,7 @@ JSValueRef JSPackageManager::move(JSContextRef context,
                string id = converter.toString(checkedArguments[0]);
                string storage = converter.toString(checkedArguments[1]);
                if ((storage.compare("EXTERNAL") != 0) && (storage.compare("INTERNAL") != 0)) {
-                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Wrong second parameter type");
+                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong second parameter type");
                }
                
                JSObjectRef eventCBObj = converter.toJSObjectRef(arguments[2]);
@@ -394,7 +392,7 @@ JSValueRef JSPackageManager::move(JSContextRef context,
 
                if (!JSObjectIsFunction(context, converter.toJSObjectRef(onprogress)) ||
                        !JSObjectIsFunction(context, converter.toJSObjectRef(oncomplete))) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Wrong third parameter type");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong third parameter type");
                }
 
                CallbackUserData *onprogressCb = new CallbackUserData(GlobalContextManager::getInstance()->getGlobalContext(context));
@@ -413,13 +411,13 @@ JSValueRef JSPackageManager::move(JSContextRef context,
 
        } Catch (NotFoundException) {
         LoggerE("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_FOUND_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_FOUND_ERROR, _rethrown_exception.GetMessage());
        } Catch (ConversionException) {
         LoggerE("Exception: "<<_rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
        } Catch (Exception) {
         LoggerE("Exception: "<<_rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
        }
 
        return JSValueMakeUndefined(context);
@@ -438,7 +436,7 @@ JSValueRef JSPackageManager::isInstalled(JSContextRef context,
 
        // Should I change first parameter to "undefined" or throw exception???
        if (argumentCount < 1) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "wrong parameter");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "wrong parameter");
        }       
 
        Try {
@@ -448,13 +446,13 @@ JSValueRef JSPackageManager::isInstalled(JSContextRef context,
                return converter.toJSValueRef(PackageManager::getInstance()->isInstalled(id));
     } Catch (NotFoundException) {
         LoggerE("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_FOUND_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_FOUND_ERROR, _rethrown_exception.GetMessage());
        } Catch (ConversionException) {
         LoggerE("Exception: "<<_rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
        } Catch (Exception) {
         LoggerE("Exception: "<<_rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
        }
 
        return false;
@@ -482,13 +480,13 @@ JSValueRef JSPackageManager::getPackageIdFromAppId(JSContextRef context,
                return converter.toJSValueRef(PackageManager::getInstance()->getPackageIdFromAppId(id));
     } Catch (NotFoundException) {
         LoggerE("Exception: "<<_rethrown_exception.GetMessage());
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_FOUND_ERROR, _rethrown_exception.GetMessage());
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_FOUND_ERROR, _rethrown_exception.GetMessage());
        } Catch (ConversionException) {
         LoggerE("Exception: "<<_rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, _rethrown_exception.GetMessage());
        } Catch (Exception) {
         LoggerE("Exception: "<<_rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, _rethrown_exception.GetMessage());
        }
 
        return JSValueMakeUndefined(context);
index ce64dc6..1c07d55 100644 (file)
@@ -17,8 +17,7 @@
 
 #include <glib.h>
 
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 #include <GlobalContextManager.h>
 #include <PlatformException.h>
 
@@ -346,7 +345,7 @@ static gboolean getCompleteCB(void *data)
                
            JSObjectRef jsResult = JSCreateArrayObject(context, 0, NULL);
            if (jsResult == NULL) {
-                       JSValueRef error = JSTizenExceptionFactory::makeErrorObject(callback->getContext(), JSTizenException::UNKNOWN_ERROR, "platform exception");
+                       JSValueRef error = JSWebAPIErrorFactory::makeErrorObject(callback->getContext(), JSWebAPIErrorFactory::UNKNOWN_ERROR, "platform exception");
                callback->callErrorCallback(error);
                        return false;
            }
@@ -354,7 +353,7 @@ static gboolean getCompleteCB(void *data)
            for (size_t i = 0; i < pkgInfoList.size(); ++i) {
                JSValueRef tmpVal = JSPackageInformation::createJSObject(context, &pkgInfoList[i]);
                if (!JSSetArrayElement(context, jsResult, i, tmpVal)) {
-                               JSValueRef error = JSTizenExceptionFactory::makeErrorObject(callback->getContext(), JSTizenException::UNKNOWN_ERROR, "platform exception");
+                               JSValueRef error = JSWebAPIErrorFactory::makeErrorObject(callback->getContext(), JSWebAPIErrorFactory::UNKNOWN_ERROR, "platform exception");
                        callback->callErrorCallback(error);
                                return false;
                }
@@ -362,7 +361,7 @@ static gboolean getCompleteCB(void *data)
 
                callback->callSuccessCallback(jsResult);
        } else {
-               JSValueRef error = JSTizenExceptionFactory::makeErrorObject(callback->getContext(), JSTizenException::UNKNOWN_ERROR, "platform exception");
+               JSValueRef error = JSWebAPIErrorFactory::makeErrorObject(callback->getContext(), JSWebAPIErrorFactory::UNKNOWN_ERROR, "platform exception");
                callback->callErrorCallback(error);
        }
 
@@ -540,9 +539,9 @@ void install_request_cb(int id, const char *type, const char *package,
        case PACAKGE_MANAGER_EVENT_STATE_FAILED: {
                JSValueRef jsError = NULL;
                if (error == PACKAGE_MANAGER_ERROR_NO_SUCH_PACKAGE) {
-                       jsError = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::NOT_FOUND_ERROR,"given package is not found");
+                       jsError = JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::NOT_FOUND_ERROR,"given package is not found");
                } else {
-                       jsError = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::UNKNOWN_ERROR,"platform exception");
+                       jsError = JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::UNKNOWN_ERROR,"platform exception");
                }
 
                if (callback->getOnError()) {
@@ -570,7 +569,7 @@ void install_request_cb(int id, const char *type, const char *package,
                break;          
        }
        default:
-               JSValueRef error = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::UNKNOWN_ERROR,"platform exception");
+               JSValueRef error = JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::UNKNOWN_ERROR,"platform exception");
                if (callback->getOnError()) {
                        callback->getOnError()->callSuccessCallback(error);
                }
@@ -634,7 +633,7 @@ void PackageManager::install(string pkgPath, PackageInstallEventCallback* callba
        if (ret != PACKAGE_MANAGER_ERROR_NONE) {
                if (errCallback) {
                        JSValueRef error = 
-                               JSTizenExceptionFactory::makeErrorObject(globalCtx, JSTizenException::UNKNOWN_ERROR, "Platform Error");
+                               JSWebAPIErrorFactory::makeErrorObject(globalCtx, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Platform Error");
                        errCallback->callSuccessCallback(error);
                }
                delete callback;
@@ -645,7 +644,7 @@ void PackageManager::install(string pkgPath, PackageInstallEventCallback* callba
        if (ret != PACKAGE_MANAGER_ERROR_NONE) {
                if (errCallback) {
                        JSValueRef error = 
-                               JSTizenExceptionFactory::makeErrorObject(globalCtx, JSTizenException::NOT_FOUND_ERROR, "Not proper file");
+                               JSWebAPIErrorFactory::makeErrorObject(globalCtx, JSWebAPIErrorFactory::NOT_FOUND_ERROR, "Not proper file");
                        errCallback->callSuccessCallback(error);
                }
                delete callback;
@@ -658,7 +657,7 @@ void PackageManager::install(string pkgPath, PackageInstallEventCallback* callba
        if (ret != PACKAGE_MANAGER_ERROR_NONE) {
                if (errCallback) {
                        JSValueRef error = 
-                               JSTizenExceptionFactory::makeErrorObject(globalCtx, JSTizenException::UNKNOWN_ERROR, "Platform Error");
+                               JSWebAPIErrorFactory::makeErrorObject(globalCtx, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Platform Error");
                        errCallback->callSuccessCallback(error);
                }
                delete callback;
@@ -678,7 +677,7 @@ void PackageManager::uninstall(string pkgPath, PackageInstallEventCallback* call
        if (ret != PACKAGE_MANAGER_ERROR_NONE) {
                if (errCallback) {
                        JSValueRef error = 
-                               JSTizenExceptionFactory::makeErrorObject(globalCtx, JSTizenException::UNKNOWN_ERROR, "Platform Error");
+                               JSWebAPIErrorFactory::makeErrorObject(globalCtx, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Platform Error");
                        errCallback->callSuccessCallback(error);
                }
                //clean-up callback object
@@ -690,7 +689,7 @@ void PackageManager::uninstall(string pkgPath, PackageInstallEventCallback* call
        if (ret != PACKAGE_MANAGER_ERROR_NONE) {
                if (errCallback) {
                        JSValueRef error = 
-                               JSTizenExceptionFactory::makeErrorObject(globalCtx, JSTizenException::NOT_FOUND_ERROR, "Not proper file");
+                               JSWebAPIErrorFactory::makeErrorObject(globalCtx, JSWebAPIErrorFactory::NOT_FOUND_ERROR, "Not proper file");
                        // TODO: how can I handle about uninstallable package???
                        errCallback->callSuccessCallback(error);
                }
@@ -705,7 +704,7 @@ void PackageManager::uninstall(string pkgPath, PackageInstallEventCallback* call
        if (ret != PACKAGE_MANAGER_ERROR_NONE) {
                if (errCallback) {
                        JSValueRef error = 
-                               JSTizenExceptionFactory::makeErrorObject(globalCtx, JSTizenException::UNKNOWN_ERROR, "Platform Error");
+                               JSWebAPIErrorFactory::makeErrorObject(globalCtx, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Platform Error");
                        errCallback->callSuccessCallback(error);
                }
                //clean-up callback object
index b42bf04..b5c292b 100644 (file)
@@ -19,7 +19,6 @@
 #include <CallbackUserData.h>
 #include <GlobalContextManager.h>
 #include <JSUtil.h>
-#include <JSWebAPIException.h>
 #include <ArgumentValidator.h>
 #include <TimeTracer.h>
 
@@ -29,7 +28,6 @@
 #include <Logger.h>
 
 using namespace WrtDeviceApis::Commons;
-using namespace WrtDeviceApis::CommonsJavaScript;
 using namespace DeviceAPI::Common;
 using namespace std;
 
@@ -121,7 +119,7 @@ JSValueRef JSPowerManager::request(JSContextRef context,
         PowerState state(state_str.c_str());
         PowerManager::getInstance()->request( resource , state );
     }catch(const BasePlatformException& err){
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
@@ -146,7 +144,7 @@ JSValueRef JSPowerManager::release(JSContextRef context,
         PowerManager::getInstance()->release( resource );
 
     }catch(const BasePlatformException& err){
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
     return JSValueMakeUndefined(context);
@@ -174,9 +172,9 @@ JSValueRef JSPowerManager::setScreenStateChangeListener(JSContextRef context,
         PowerManager::getInstance()->addScreenStateChangedCallback(callback);
 
     }catch(const BasePlatformException& err){
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }catch( const std::bad_alloc& oom){
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Out of memory");
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Out of memory");
     }
 
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
@@ -218,7 +216,7 @@ JSValueRef JSPowerManager::getScreenBrightness(JSContextRef context,
                TIME_TRACER_ITEM_END(__FUNCTION__, 0);
         return JSUtil::toJSValueRef(context, brightness);
     }catch(const BasePlatformException& err){
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 }
 
@@ -240,7 +238,7 @@ JSValueRef JSPowerManager::setScreenBrightness(JSContextRef context,
         LOGE(" value = %f", value);
         PowerManager::getInstance()->setScreenBrightness(value);
     }catch(const BasePlatformException& err){
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
     return JSValueMakeUndefined(context);
@@ -262,7 +260,7 @@ JSValueRef JSPowerManager::isScreenOn(JSContextRef context,
                TIME_TRACER_ITEM_END(__FUNCTION__, 0);
         return JSUtil::toJSValueRef(context,state);
     }catch(const BasePlatformException& err){
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 }
 
@@ -279,7 +277,7 @@ JSValueRef JSPowerManager::restoreScreenBrightness(JSContextRef context,
     try{
         PowerManager::getInstance()->restoreScreenBrightness();
     }catch(const BasePlatformException& err){
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
     return JSValueMakeUndefined(context);}
@@ -299,7 +297,7 @@ JSValueRef JSPowerManager::turnScreenOn(JSContextRef context,
     try{
         PowerManager::getInstance()->setScreenState(true);
     }catch(const BasePlatformException& err){
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
     return JSValueMakeUndefined(context);
@@ -320,7 +318,7 @@ JSValueRef JSPowerManager::turnScreenOff(JSContextRef context,
     try{
         PowerManager::getInstance()->setScreenState(false);
     }catch(const BasePlatformException& err){
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
        TIME_TRACER_ITEM_END(__FUNCTION__, 0);
     return JSValueMakeUndefined(context);
index 8321951..b782951 100644 (file)
@@ -3,6 +3,7 @@ SET(TARGET_NAME ${push_target})
 SET(DESTINATION_NAME ${push_dest})
 SET(TARGET_IMPL_NAME ${push_impl})
 
+IF(ENABLE_OPTIONAL_PUSH)
 PKG_CHECK_MODULES(platform_pkgs_push REQUIRED push capi-appfw-application)
 
 INCLUDE_DIRECTORIES(
@@ -48,6 +49,7 @@ TARGET_LINK_LIBRARIES(${TARGET_NAME}
 
 INSTALL(TARGETS ${TARGET_NAME} ${TARGET_IMPL_NAME} LIBRARY DESTINATION ${DESTINATION_LIB_PREFIX}/${DESTINATION_NAME})
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/config.xml DESTINATION ${DESTINATION_LIB_PREFIX}/${DESTINATION_NAME})
+ENDIF(ENABLE_OPTIONAL_PUSH)
 INSTALL(
         DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ DESTINATION ${DESTINATION_HEADER_PREFIX}/push
         FILES_MATCHING PATTERN "*.h" PATTERN "CMakeFiles" EXCLUDE
index 2ef763a..76d6a8f 100644 (file)
@@ -18,7 +18,6 @@
 #include <SecurityExceptions.h>
 
 #include <JSUtil.h>
-#include <JSWebAPIException.h>
 #include <ArgumentValidator.h>
 #include <GlobalContextManager.h>
 #include <MultiCallbackUserData.h>
@@ -144,12 +143,12 @@ JSValueRef JSPushManager::registerService(JSContextRef context,
                TIME_TRACER_ITEM_END(__FUNCTION__, 0);
         return JSValueMakeUndefined(context);
     } catch (const BasePlatformException &err) {
-        LoggerE(err.getName() << ": " << err.getMessage());
-        return JSWebAPIException::throwException(context, exception, err);
+        LOGE("%s: %s", err.getName().c_str(), err.getMessage().c_str());
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
         DeviceAPI::Common::UnknownException err("Unknown Error in PushManager.registerService().");
-        LoggerE(err.getName() << ": " << err.getMessage());
-        return JSWebAPIException::throwException(context, exception, err);
+        LOGE("%s: %s", err.getName().c_str(), err.getMessage().c_str());
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 }
 
@@ -193,12 +192,12 @@ JSValueRef JSPushManager::unregisterService(JSContextRef context,
                TIME_TRACER_ITEM_END(__FUNCTION__, 0);
         return JSValueMakeUndefined(context);
     } catch (const BasePlatformException &err) {
-        LoggerE(err.getName() << ": " << err.getMessage());
-        return JSWebAPIException::throwException(context, exception, err);
+        LOGE("%s: %s", err.getName().c_str(), err.getMessage().c_str());
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
         DeviceAPI::Common::UnknownException err("Unknown Error in PushManager.unregisterService().");
-        LoggerE(err.getName() << ": " << err.getMessage());
-        return JSWebAPIException::throwException(context, exception, err);
+        LOGE("%s: %s", err.getName().c_str(), err.getMessage().c_str());
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 }
 
@@ -236,12 +235,12 @@ JSValueRef JSPushManager::connectService(JSContextRef context,
                TIME_TRACER_ITEM_END(__FUNCTION__, 0);
         return JSValueMakeUndefined(context);
     } catch (const BasePlatformException &err) {
-        LoggerE(err.getName() << ": " << err.getMessage());
-        return JSWebAPIException::throwException(context, exception, err);
+        LOGE("%s: %s", err.getName().c_str(), err.getMessage().c_str());
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
         DeviceAPI::Common::UnknownException err("Unknown Error in PushManager.connectService().");
-        LoggerE(err.getName() << ": " << err.getMessage());
-        return JSWebAPIException::throwException(context, exception, err);
+        LOGE("%s: %s", err.getName().c_str(), err.getMessage().c_str());
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 }
 
@@ -269,12 +268,12 @@ JSValueRef JSPushManager::disconnectService(JSContextRef context,
                TIME_TRACER_ITEM_END(__FUNCTION__, 0);
         return JSValueMakeUndefined(context);
     } catch (const BasePlatformException &err) {
-        LoggerE(err.getName() << ": " << err.getMessage());
-        return JSWebAPIException::throwException(context, exception, err);
+        LOGE("%s: %s", err.getName().c_str(), err.getMessage().c_str());
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
         DeviceAPI::Common::UnknownException err("Unknown Error in PushManager.disconnectService().");
-        LoggerE(err.getName() << ": " << err.getMessage());
-        return JSWebAPIException::throwException(context, exception, err);
+        LOGE("%s: %s", err.getName().c_str(), err.getMessage().c_str());
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 }
 
@@ -306,12 +305,12 @@ JSValueRef JSPushManager::getRegistrationId(JSContextRef context,
                        return JSUtil::toJSValueRef(context, ret);
         }
     } catch (const BasePlatformException &err) {
-        LoggerE(err.getName() << ": " << err.getMessage());
-        return JSWebAPIException::throwException(context, exception, err);
+        LOGE("%s: %s", err.getName().c_str(), err.getMessage().c_str());
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } catch (...) {
         DeviceAPI::Common::UnknownException err("Unknown Error in PushManager.getRegistrationId().");
-        LoggerE(err.getName() << ": " << err.getMessage());
-        return JSWebAPIException::throwException(context, exception, err);
+        LOGE("%s: %s", err.getName().c_str(), err.getMessage().c_str());
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 }
 
index 0f6be88..338e200 100644 (file)
@@ -18,7 +18,7 @@
 #include <SecurityExceptions.h>
 
 #include <JSUtil.h>
-#include <JSWebAPIError.h>
+#include <JSWebAPIErrorFactory.h>
 #include <ArgumentValidator.h>
 #include <GlobalContextManager.h>
 #include <MultiCallbackUserData.h>
index bc4c457..92e4bbf 100644 (file)
@@ -16,7 +16,7 @@
 //
 
 #include <JSUtil.h>
-#include <JSWebAPIError.h>
+#include <JSWebAPIErrorFactory.h>
 #include <PlatformException.h>
 
 #include <app_manager.h>
@@ -77,7 +77,7 @@ static std::string _get_internal_error(int err)
     }
 
     if (!success) {
-        LoggerE("Platform error %d <%s>", err, msg.c_str());
+        LOGE("Platform error %d <%s>", err, msg.c_str());
     }
 
     return msg;
@@ -152,11 +152,11 @@ static void get_param(const char *msg, const char *name, char **value)
 
 static void push_connection_state_cb(push_state_e state, const char *err, void *user_data)
 {
-    LoggerI("Push connection state cb with state: "<< state <<", err: "<< err);
+    LOGD("Push connection state cb with state: %d, err: %s", state, err);
 
     PushManager *thisPushManager = static_cast<PushManager*>(user_data);
     if (!thisPushManager) {
-        LoggerE("user_data of push_connection_state_cb() is NULL.");
+        LOGE("user_data of push_connection_state_cb() is NULL.");
     } else {
        thisPushManager->m_connectionState = state;
     }
@@ -170,7 +170,7 @@ static void push_notify_cb(push_notification_h noti, void *user_data)
     char *alertMessage = NULL;
     long long int date = -1;
 
-    LoggerI("Push notification cb");
+    LOGD("Push notification cb");
 
     try {
         PushManager *thisPushManager = static_cast<PushManager*>(user_data);
@@ -180,7 +180,7 @@ static void push_notify_cb(push_notification_h noti, void *user_data)
 
         MultiCallbackUserDataPtr callback = thisPushManager->m_notificationCallback;
         if (!callback) {
-            LoggerW("notification callback is not set. ignored.");
+            LOGW("notification callback is not set. ignored.");
             return;
         }
 
@@ -202,7 +202,7 @@ static void push_notify_cb(push_notification_h noti, void *user_data)
 
         ret = push_get_notification_time(noti, &date);
         if (ret != PUSH_ERROR_NONE) {
-            LoggerE("Platform error while getting notification date/time. " << _get_internal_error(ret));
+            LOGE("Platform error while getting notification date/time. %s", _get_internal_error(ret).c_str());
         }
 
         PushMessage *pushMessage = new PushMessage();
@@ -223,7 +223,7 @@ static void push_notify_cb(push_notification_h noti, void *user_data)
 
         callback->invokeCallback("onsuccess", pushMessageObj);
     } catch (const BasePlatformException &err) {
-        LoggerE(err.getMessage());
+        LOGE("%s", err.getMessage().c_str());
     }
 }
 
@@ -232,7 +232,7 @@ static void push_registration_result_cb(push_result_e result, const char *msg, v
     int ret;
     char *tmp = NULL;
 
-    LoggerI("Push registration cb");
+    LOGD("Push registration cb");
 
     try {
         PushManager *thisPushManager = static_cast<PushManager*>(user_data);
@@ -257,17 +257,17 @@ static void push_registration_result_cb(push_result_e result, const char *msg, v
             }
         } else {
             UnknownException error(msg == NULL ? "Unknown" : msg);
-            JSObjectRef errorObj = JSWebAPIError::makeJSWebAPIError(callback->getContext(), error);
+            JSObjectRef errorObj = JSWebAPIErrorFactory::makeErrorObject(callback->getContext(), error);
             callback->invokeCallback("onerror", errorObj);
         }
     } catch (const BasePlatformException &err) {
-        LoggerE(err.getMessage());
+        LOGE("%s", err.getMessage().c_str());
     }
 }
 
 static void push_unregistration_result_cb(push_result_e result, const char *msg, void *user_data)
 {
-    LoggerI("Push unregistration cb");
+    LOGD("Push unregistration cb");
 
     try {
         PushManager *thisPushManager = static_cast<PushManager*>(user_data);
@@ -284,11 +284,11 @@ static void push_unregistration_result_cb(push_result_e result, const char *msg,
             callback->invokeCallback("onsuccess");
         } else {
             UnknownException error(msg == NULL ? "Unknown" : msg);
-            JSObjectRef errorObj = JSWebAPIError::makeJSWebAPIError(callback->getContext(), error);
+            JSObjectRef errorObj = JSWebAPIErrorFactory::makeErrorObject(callback->getContext(), error);
             callback->invokeCallback("onerror", errorObj);
         }
     } catch (const BasePlatformException &err) {
-        LoggerE(err.getMessage());
+        LOGE("%s", err.getMessage().c_str());
     }
 }
 
@@ -296,26 +296,24 @@ PushManager::PushManager():
     m_connectionState(PUSH_STATE_UNREGISTERED),
     m_connectionHandle(NULL)
 {
-    LoggerI("Connecting to the push service...");
-    LoggerI("Push App id: " << m_appId);
-    LoggerI("Push Package id: " << m_pkgId);
+    LOGD("Connecting to the push service...");
 
     int ret = push_connect(m_pkgId.c_str(), push_connection_state_cb, push_notify_cb, this, &m_connectionHandle);
     if (PUSH_ERROR_NONE!=ret) {
-        LoggerE("Error while connecting to the push service: "<< ret);
+        LOGE("Error while connecting to the push service: %d", ret);
         return;
     }
 }
 
 PushManager::~PushManager()
 {
-    LoggerI("Disconnecting to the push service...");
+    LOGD("Disconnecting to the push service...");
 
     push_disconnect(m_connectionHandle);
 }
 
 PushManager *PushManager::getInstance() {
-    LoggerI("Getting instance of PushManager...");
+    LOGD("Getting instance of PushManager...");
     static PushManager instance;
     return &instance;
 }
@@ -326,18 +324,18 @@ void PushManager::setAppId(std::string appId) {
 
     int ret = app_manager_get_app_info(appId.c_str(), &handle);
     if (ret != APP_MANAGER_ERROR_NONE) {
-        LoggerE("WrtAccess initialization failed");
+        LOGE("WrtAccess initialization failed");
         return;
     }
 
     ret = app_info_get_package(handle, &_pkg_id);
     if ((ret != APP_MANAGER_ERROR_NONE) || (_pkg_id == NULL)) {
-        LoggerD("Fail to get pkg_id by " << appId.c_str());
+        LOGW("Fail to get pkg_id by %s", appId.c_str());
     }
 
     ret = app_info_destroy(handle);
     if (ret != APP_MANAGER_ERROR_NONE) {
-        LoggerE("WrtAccess initialization failed");
+        LOGE("WrtAccess initialization failed");
         return;
     }
 
@@ -367,14 +365,14 @@ void PushManager::registerService(ApplicationControlPtr appControl, MultiCallbac
     if (appControl->getUri().compare("") != 0) {
         ret = service_set_uri(service, appControl->getUri().c_str());
         if (ret != SERVICE_ERROR_NONE) {
-            LoggerW("Platform error while setting uri to appControl. " << _get_internal_error(ret));
+            LOGW("Platform error while setting uri to appControl. %s", _get_internal_error(ret).c_str());
         }
     }
 
     if (appControl->getMime().compare("") != 0) {
         ret = service_set_mime(service, appControl->getMime().c_str());
         if (ret != SERVICE_ERROR_NONE) {
-            LoggerW("Platform error while setting mime to appControl. " << _get_internal_error(ret));
+            LOGW("Platform error while setting mime to appControl. %s", _get_internal_error(ret).c_str());
         }
     }
 
@@ -391,7 +389,7 @@ void PushManager::registerService(ApplicationControlPtr appControl, MultiCallbac
         for (size_t i = 0; i < controlDataArray.size(); i++) {
             key = controlDataArray.at(i)->getKey();
             if (key.empty()) {
-                LoggerW("Invalid key for " << i << " in ApplicationControl's data array.");
+                LOGW("Invalid key for %d in ApplicationControl's data array.", i);
             } else {
                 std::vector<std::string> valueArray = controlDataArray.at(i)->getValue();
                 size_t size = valueArray.size();
@@ -408,12 +406,12 @@ void PushManager::registerService(ApplicationControlPtr appControl, MultiCallbac
                 if (size == 1) {
                     ret = service_add_extra_data(service, (const char*)key.c_str(), arr[0]);
                     if (ret != SERVICE_ERROR_NONE) {
-                        LoggerW("Platform error while adding extra data to appControl. " << _get_internal_error(ret));
+                        LOGW("Platform error while adding extra data to appControl. %s", _get_internal_error(ret).c_str());
                     }
                 } else {
                     ret = service_add_extra_data_array(service, (const char*)key.c_str(), arr, size);
                     if (ret != SERVICE_ERROR_NONE) {
-                        LoggerW("Platform error while adding extra data array to appControl. " << _get_internal_error(ret));
+                        LOGW("Platform error while adding extra data array to appControl. %s", _get_internal_error(ret).c_str());
                     }
                 }
 
@@ -469,7 +467,7 @@ std::string PushManager::getRegistrationId()
 
     ret = push_get_registration_id(m_connectionHandle, &regId);
     if (ret != PUSH_ERROR_NONE) {
-        LoggerW("Platform error while getting registration id. " << _get_internal_error(ret));
+        LOGW("Platform error while getting registration id. %s", _get_internal_error(ret).c_str());
     } else {
         if (regId) {
             str = regId;
index 13cc47f..8f365fc 100644 (file)
@@ -38,38 +38,38 @@ namespace Push {
 
 void on_widget_start_callback(int widgetId)
 {
-    LoggerD("[Tizen\\Push] on_widget_start_callback (%d)", widgetId);
+    LOGD("[Tizen\\Push] on_widget_start_callback (%d)", widgetId);
        TIME_TRACER_INIT();
     try {
         WrtDB::WidgetDAOReadOnly dao(widgetId);
         PushManager::setAppId(DPL::ToUTF8String(dao.getTzAppId()));
         WrtAccessSingleton::Instance().initialize(widgetId);
     } catch (...) {
-        LoggerE("WrtAccess initialization failed");
+        LOGE("WrtAccess initialization failed");
     }
 }
 
 void on_widget_stop_callback(int widgetId)
 {
-    LoggerD("[Tizen\\Push] on_widget_stop_callback (%d)", widgetId);
+    LOGD("[Tizen\\Push] on_widget_stop_callback (%d)", widgetId);
        TIME_TRACER_EXPORT_REPORT_TO(TIME_TRACER_EXPORT_FILE,"Push");
        TIME_TRACER_RELEASE();
     try {
         WrtAccessSingleton::Instance().deinitialize(widgetId);
     } catch (...) {
-        LoggerE("WrtAccess deinitialization failed");
+        LOGE("WrtAccess deinitialization failed");
     }
 }
 
 void on_frame_load_callback(const void * context)
 {
-    LoggerD("[Tizen\\Push] on_frame_load_callback (%p)", context);
+    LOGD("[Tizen\\Push] on_frame_load_callback (%p)", context);
     GlobalContextManager::getInstance()->addGlobalContext(static_cast<JSContextRef>(context));
 }
 
 void on_frame_unload_callback(const void * context)
 {
-    LoggerD("[Tizen\\Push] on_frame_unload_callback (%p)", context);
+    LOGD("[Tizen\\Push] on_frame_unload_callback (%p)", context);
     GlobalContextManager::getInstance()->removeGlobalContext(static_cast<JSContextRef>(context));
 }
 
index 0e3b8cc..c3cc7e5 100755 (executable)
@@ -2,6 +2,7 @@ SET(TARGET_NAME ${secureelement_target})
 SET(DESTINATION_NAME ${secureelement_dest})
 SET(TARGET_IMPL_NAME ${secureelement_impl})
 
+IF(ENABLE_OPTIONAL_SE)
 PKG_CHECK_MODULES(platform_pkgs_secureelement REQUIRED smartcard-service smartcard-service-common)
 
 INCLUDE_DIRECTORIES(
@@ -55,6 +56,7 @@ TARGET_LINK_LIBRARIES(${TARGET_NAME}
 
 INSTALL(TARGETS ${TARGET_NAME} ${TARGET_IMPL_NAME} LIBRARY DESTINATION ${DESTINATION_LIB_PREFIX}/${DESTINATION_NAME})
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/config.xml DESTINATION ${DESTINATION_LIB_PREFIX}/${DESTINATION_NAME})
+ENDIF(ENABLE_OPTIONAL_SE)
 INSTALL(
        DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ DESTINATION ${DESTINATION_HEADER_PREFIX}/secureelement
        FILES_MATCHING PATTERN "*.h" PATTERN "CMakeFiles" EXCLUDE
index 9f9fa06..984e292 100644 (file)
 #include <CommonsJavaScript/JSUtils.h>
 #include <CommonsJavaScript/JSCallbackManager.h>
 #include <CommonsJavaScript/Utils.h>
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 #include <ArgumentValidator.h>
-#include <JSWebAPIException.h>
 #include <SecurityExceptions.h>
 #include "SEFactory.h"
 #include "SEResponseDispatcher.h"
@@ -175,7 +173,7 @@ JSValueRef JSSEChannel::close(JSContextRef context,
        SEChannelPrivObject* privateObject = static_cast<SEChannelPrivObject*>(JSObjectGetPrivate(thisObject));
        if (NULL == privateObject) {
                LoggerE("private object is null");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        }
 
        ISEChannelPtr seChannel(privateObject->getObject());
@@ -187,7 +185,7 @@ JSValueRef JSSEChannel::close(JSContextRef context,
        } Catch (WrtDeviceApis::Commons::Exception) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
-       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
 }
 
 JSValueRef JSSEChannel::transmit(JSContextRef context,
@@ -205,7 +203,7 @@ JSValueRef JSSEChannel::transmit(JSContextRef context,
        if ((argumentCount < 2) || JSValueIsNull(context, arguments[0]) || JSValueIsUndefined(context, arguments[0]) || !JSIsArrayValue(context, arguments[0])) {
                /* 1st argument is mandatory. And 1st argument must be Array */
                LoggerE("data TypeMismatchException!");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        }
 
        JSValueRef onSuccessForCbm = NULL, onErrorForCbm = NULL;
@@ -223,14 +221,14 @@ JSValueRef JSSEChannel::transmit(JSContextRef context,
                }
        } catch (const BasePlatformException &err) {
         LoggerE(err.getName() << ": " << err.getMessage());
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
 
        SEChannelPrivObject* privateObject = static_cast<SEChannelPrivObject*>(JSObjectGetPrivate(thisObject));
        if (NULL == privateObject) {
                LoggerE("private object is null");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        }
 
        ISEChannelPtr seChannel(privateObject->getObject());
@@ -249,14 +247,14 @@ JSValueRef JSSEChannel::transmit(JSContextRef context,
                return JSValueMakeUndefined(context);
        } Catch (ConversionException) {
                LoggerE("ConversionException: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (WrtDeviceApis::Commons::UnknownException) {
                LoggerE("UnknownException: " << _rethrown_exception.GetMessage());
        } Catch (WrtDeviceApis::Commons::Exception) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
 
-       callbackManager->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::UNKNOWN_ERROR,"Unknown Error"));
+       callbackManager->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::UNKNOWN_ERROR,"Unknown Error"));
        return JSValueMakeUndefined(context);
 }
 
index 397e3cc..1e3732f 100644 (file)
 #include <CommonsJavaScript/JSUtils.h>
 #include <CommonsJavaScript/JSCallbackManager.h>
 #include <CommonsJavaScript/Utils.h>
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 #include <SecurityExceptions.h>
 #include <ArgumentValidator.h>
-#include <JSWebAPIException.h>
 #include "SEFactory.h"
 #include "SEResponseDispatcher.h"
 #include "JSSEReader.h"
@@ -178,7 +176,7 @@ JSValueRef JSSEReader::getName(JSContextRef context,
        SEReaderPrivObject* privateObject = static_cast<SEReaderPrivObject*>(JSObjectGetPrivate(thisObject));
        if (NULL == privateObject) {
                LoggerE("private object is null");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        }
 
        ISEReaderPtr seReader(privateObject->getObject());
@@ -213,13 +211,13 @@ JSValueRef JSSEReader::openSession(JSContextRef context,
                }
        } catch (const BasePlatformException &err) {
         LoggerE(err.getName() << ": " << err.getMessage());
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
        SEReaderPrivObject* privateObject = static_cast<SEReaderPrivObject*>(JSObjectGetPrivate(thisObject));
        if (NULL == privateObject) {
                LoggerE("private object is null");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        }
 
        ISEReaderPtr seReader(privateObject->getObject());
@@ -237,14 +235,14 @@ JSValueRef JSSEReader::openSession(JSContextRef context,
                return JSValueMakeUndefined(context);
        } Catch (ConversionException) {
                LoggerE("ConversionException");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (WrtDeviceApis::Commons::UnknownException) {
                LoggerE("UnknownException: " << _rethrown_exception.GetMessage());
        } Catch (WrtDeviceApis::Commons::Exception) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
 
-       callbackManager->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::UNKNOWN_ERROR,"Unknown Error"));
+       callbackManager->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::UNKNOWN_ERROR,"Unknown Error"));
        return JSValueMakeUndefined(context);
 }
 
@@ -263,7 +261,7 @@ JSValueRef JSSEReader::closeSessions(JSContextRef context,
        SEReaderPrivObject* privateObject = static_cast<SEReaderPrivObject*>(JSObjectGetPrivate(thisObject));
        if (NULL == privateObject) {
                LoggerE("private object is null");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        }
 
        ISEReaderPtr seReader(privateObject->getObject());
index de91abb..00c1980 100755 (executable)
 #include <CommonsJavaScript/JSUtils.h>
 #include <CommonsJavaScript/JSCallbackManager.h>
 #include <CommonsJavaScript/Utils.h>
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 #include <SecurityExceptions.h>
 #include <ArgumentValidator.h>
-#include <JSWebAPIException.h>
 #include "SEFactory.h"
 #include "SEResponseDispatcher.h"
 #include "JSSEService.h"
@@ -158,13 +156,13 @@ JSValueRef JSSEService::getReaders(JSContextRef context,
                }
        } catch (const BasePlatformException &err) {
         LoggerE(err.getName() << ": " << err.getMessage());
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
        SEServicePrivObject* privateObject = static_cast<SEServicePrivObject*>(JSObjectGetPrivate(thisObject));
        if (NULL == privateObject) {
                LoggerE("private object is null");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        }
 
        ISEServicePtr seService(privateObject->getObject());
@@ -180,14 +178,14 @@ JSValueRef JSSEService::getReaders(JSContextRef context,
                return JSValueMakeUndefined(context);
        } Catch (ConversionException) {
                LoggerE("ConversionException");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (WrtDeviceApis::Commons::UnknownException) {
                LoggerE("UnknownException: " << _rethrown_exception.GetMessage());
        } Catch (WrtDeviceApis::Commons::Exception) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
 
-       callbackManager->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::UNKNOWN_ERROR,"Unknown Error"));
+       callbackManager->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::UNKNOWN_ERROR,"Unknown Error"));
        return JSValueMakeUndefined(context);
 }
 
@@ -209,7 +207,7 @@ JSValueRef JSSEService::registerSEListener(JSContextRef context,
                if (!argValidator.toObject(0))
                        throw TypeMismatchException("Parameter is not Object");
        }catch(const BasePlatformException& err){
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
        SEConverter convert(context);
@@ -219,14 +217,14 @@ JSValueRef JSSEService::registerSEListener(JSContextRef context,
        } else {
                /* 1st argument must be SEListener. */
                LoggerE("SEListener must has onSEReady and onSENotReady");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        }
 
 
        SEServicePrivObject* privateObject = static_cast<SEServicePrivObject*>(JSObjectGetPrivate(thisObject));
        if (NULL == privateObject) {
                LoggerE("private object is null");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        }
 
        ISEServicePtr seService(privateObject->getObject());
@@ -245,14 +243,14 @@ JSValueRef JSSEService::registerSEListener(JSContextRef context,
                return convert.toJSValueRef(static_cast<unsigned long>(emitter->getId()));
        } Catch (ConversionException) {
                LoggerE("ConversionException");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (WrtDeviceApis::Commons::UnknownException) {
                LoggerE("UnknownException: " << _rethrown_exception.GetMessage());
        } Catch (WrtDeviceApis::Commons::Exception) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
 
-       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR,"Unknown Error");
+       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR,"Unknown Error");
 }
 
 JSValueRef JSSEService::unregisterSEListener(JSContextRef context, JSObjectRef object, JSObjectRef thisObject,
@@ -267,13 +265,13 @@ JSValueRef JSSEService::unregisterSEListener(JSContextRef context, JSObjectRef o
                ArgumentValidator validator(context, argumentCount, arguments);
           value = validator.toULong(0);
        }catch(const BasePlatformException& err){
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
        SEServicePrivObject* privateObject = static_cast<SEServicePrivObject*>(JSObjectGetPrivate(thisObject));
        if (NULL == privateObject) {
                LoggerE("private object is null");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        }
 
        Try     {
@@ -289,15 +287,15 @@ JSValueRef JSSEService::unregisterSEListener(JSContextRef context, JSObjectRef o
                return JSValueMakeUndefined(context);
        } Catch (ConversionException) {
                LoggerE("ConversionException");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (NullPointerException) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (WrtDeviceApis::Commons::NotFoundException) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, "Not Found ID");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Not Found ID");
        } Catch (WrtDeviceApis::Commons::Exception) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
-       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
 }
 
 JSValueRef JSSEService::shutdown(JSContextRef context,
@@ -315,7 +313,7 @@ JSValueRef JSSEService::shutdown(JSContextRef context,
        SEServicePrivObject* privateObject = static_cast<SEServicePrivObject*>(JSObjectGetPrivate(thisObject));
        if (NULL == privateObject) {
                LoggerE("private object is null");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        }
 
        ISEServicePtr seService(privateObject->getObject());
@@ -327,7 +325,7 @@ JSValueRef JSSEService::shutdown(JSContextRef context,
        } Catch (WrtDeviceApis::Commons::Exception) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
-       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
 }
 
 }
index 29cae58..409dca4 100644 (file)
 #include <CommonsJavaScript/JSUtils.h>
 #include <CommonsJavaScript/JSCallbackManager.h>
 #include <CommonsJavaScript/Utils.h>
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 #include <SecurityExceptions.h>
 #include <ArgumentValidator.h>
-#include <JSWebAPIException.h>
 #include "SEFactory.h"
 #include "SEResponseDispatcher.h"
 #include "JSSESession.h"
@@ -178,7 +176,7 @@ JSValueRef JSSESession::getATR(JSContextRef context,
                SESessionPrivObject* privateObject = static_cast<SESessionPrivObject*>(JSObjectGetPrivate(thisObject));
                if (NULL == privateObject) {
                        LoggerE("private object is null");
-                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
                }
 
                ISESessionPtr seSession(privateObject->getObject());
@@ -187,7 +185,7 @@ JSValueRef JSSESession::getATR(JSContextRef context,
        } Catch (WrtDeviceApis::Commons::Exception) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
-       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
 }
 
 JSValueRef JSSESession::close(JSContextRef context,
@@ -204,7 +202,7 @@ JSValueRef JSSESession::close(JSContextRef context,
                SESessionPrivObject* privateObject = static_cast<SESessionPrivObject*>(JSObjectGetPrivate(thisObject));
                if (NULL == privateObject) {
                        LoggerE("private object is null");
-                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
                }
 
                ISESessionPtr seSession(privateObject->getObject());
@@ -213,7 +211,7 @@ JSValueRef JSSESession::close(JSContextRef context,
        } Catch (WrtDeviceApis::Commons::Exception) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
-       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
 }
 
 JSValueRef JSSESession::closeChannels(JSContextRef context,
@@ -230,7 +228,7 @@ JSValueRef JSSESession::closeChannels(JSContextRef context,
                SESessionPrivObject* privateObject = static_cast<SESessionPrivObject*>(JSObjectGetPrivate(thisObject));
                if (NULL == privateObject) {
                        LoggerE("private object is null");
-                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
                }
 
                ISESessionPtr seSession(privateObject->getObject());
@@ -239,7 +237,7 @@ JSValueRef JSSESession::closeChannels(JSContextRef context,
        } Catch (WrtDeviceApis::Commons::Exception) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
-       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
 }
 
 JSValueRef JSSESession::openBasicChannel(JSContextRef context,
@@ -257,7 +255,7 @@ JSValueRef JSSESession::openBasicChannel(JSContextRef context,
        if ((argumentCount < 2) || JSValueIsNull(context, arguments[0]) || JSValueIsUndefined(context, arguments[0]) || !JSIsArrayValue(context, arguments[0])) {
                /* 1st argument is mandatory. And 1st argument must be Array. */
                LoggerE("AID TypeMismatchException!");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        }
 
        JSValueRef onSuccessForCbm = NULL, onErrorForCbm = NULL;
@@ -275,13 +273,13 @@ JSValueRef JSSESession::openBasicChannel(JSContextRef context,
                }
        } catch (const BasePlatformException &err) {
         LoggerE(err.getName() << ": " << err.getMessage());
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
        SESessionPrivObject* privateObject = static_cast<SESessionPrivObject*>(JSObjectGetPrivate(thisObject));
        if (NULL == privateObject) {
                LoggerE("private object is null");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        }
 
        ISESessionPtr seSession(privateObject->getObject());
@@ -291,7 +289,7 @@ JSValueRef JSSESession::openBasicChannel(JSContextRef context,
                std::vector<unsigned char> aid = convert.toVectorOfUChars(arguments[0]);
                if ((aid.size() < 5) || (aid.size() > 16)) {
                        LoggerE("wrong aid length : " << aid.size());
-                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, "Wrong AID length");
+                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Wrong AID length");
                }
                EventSEOpenChannelPtr event(new EventSEOpenChannel(aid, true));
                event->setPrivateData( StaticPointerCast<IEventPrivateData>(callbackManager) );
@@ -304,14 +302,14 @@ JSValueRef JSSESession::openBasicChannel(JSContextRef context,
                return JSValueMakeUndefined(context);
        } Catch (ConversionException) {
                LoggerE("ConversionException");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (WrtDeviceApis::Commons::UnknownException) {
                LoggerE("UnknownException: " << _rethrown_exception.GetMessage());
        } Catch (WrtDeviceApis::Commons::Exception) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
 
-       callbackManager->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::UNKNOWN_ERROR,"Unknown Error"));
+       callbackManager->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::UNKNOWN_ERROR,"Unknown Error"));
        return JSValueMakeUndefined(context);
 }
 
@@ -330,7 +328,7 @@ JSValueRef JSSESession::openLogicalChannel(JSContextRef context,
        if ((argumentCount < 2) || JSValueIsNull(context, arguments[0]) || JSValueIsUndefined(context, arguments[0]) || !JSIsArrayValue(context, arguments[0])) {
                /* 1st argument is mandatory. And 1st argument must be Array. */
                LoggerE("AID TypeMismatchException!");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        }
 
        JSValueRef onSuccessForCbm = NULL, onErrorForCbm = NULL;
@@ -348,13 +346,13 @@ JSValueRef JSSESession::openLogicalChannel(JSContextRef context,
                }
        } catch (const BasePlatformException &err) {
         LoggerE(err.getName() << ": " << err.getMessage());
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }
 
        SESessionPrivObject* privateObject = static_cast<SESessionPrivObject*>(JSObjectGetPrivate(thisObject));
        if (NULL == privateObject) {
                LoggerE("private object is null");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        }
 
        ISESessionPtr seSession(privateObject->getObject());
@@ -364,7 +362,7 @@ JSValueRef JSSESession::openLogicalChannel(JSContextRef context,
                std::vector<unsigned char> aid = convert.toVectorOfUChars(arguments[0]);
                if ((aid.size() < 5) || (aid.size() > 16)) {
                        LoggerE("wrong aid length : " << aid.size());
-                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, "Wrong AID length");
+                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Wrong AID length");
                }
                EventSEOpenChannelPtr event(new EventSEOpenChannel(aid, false));
                event->setPrivateData( StaticPointerCast<IEventPrivateData>(callbackManager) );
@@ -377,14 +375,14 @@ JSValueRef JSSESession::openLogicalChannel(JSContextRef context,
                return JSValueMakeUndefined(context);
        } Catch (ConversionException) {
                LoggerE("ConversionException");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (WrtDeviceApis::Commons::UnknownException) {
                LoggerE("UnknownException: " << _rethrown_exception.GetMessage());
        } Catch (WrtDeviceApis::Commons::Exception) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
 
-       callbackManager->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::UNKNOWN_ERROR,"Unknown Error"));
+       callbackManager->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::UNKNOWN_ERROR,"Unknown Error"));
        return JSValueMakeUndefined(context);
 }
 
index 557a12c..eecd56f 100644 (file)
@@ -16,8 +16,8 @@
 //
 
 #include <Commons/Exception.h>
-#include <JSTizenException.h>
 #include <ByteArray.h>
+#include <JSWebAPIErrorFactory.h>
 #include "SEChannel.h"
 #include "SEUtil.h"
 #include <Logger.h>
@@ -117,7 +117,7 @@ void SEChannel::OnRequestReceived(const EventSEChannelTransmitPtr& event) {
        } catch (const WrtDeviceApis::Commons::Exception& ex) {
                LoggerE("Exception: " << ex.GetMessage());
                event->setResult(false);
-               event->setError(DeviceAPI::Common::JSTizenException::UNKNOWN_ERROR);
+               event->setError(DeviceAPI::Common::JSWebAPIErrorFactory::UNKNOWN_ERROR);
                event->setErrorMessage("Unknown Error");
                EventRequestReceiver<EventSEChannelTransmit>::ManualAnswer(event);
        }       
index 57a313c..b2211c8 100644 (file)
@@ -18,8 +18,7 @@
 #include <CommonsJavaScript/Validator.h>
 #include <CommonsJavaScript/JSUtils.h>
 #include "SEConverter.h"
-#include <JSWebAPIError.h>
-#include <TizenExceptionData.h>
+#include <JSWebAPIErrorFactory.h>
 #include <Logger.h>
 
 using namespace std;
@@ -92,14 +91,7 @@ SEListener SEConverter::toSEListener(const JSValueRef& arg) {
 }
 
 JSValueRef SEConverter::makeSeErrorObject(std::string error, std::string message) {
-       int code = JSWebAPIError::UNKNOWN_ERR;
-       if (error.compare("InvalidStateError") == 0)
-               code = JSWebAPIError::INVALID_STATE_ERR;
-       else
-               code = JSWebAPIError::convertToWebAPIErrorCode(error);
-
-       JSWebAPIError::PrivateObject::ObjectType data(new TizenExceptionData(code, error, message));
-       return JSUtils::makeObject(m_context, JSWebAPIError::getClassRef(), data);
+       return JSWebAPIErrorFactory::makeErrorObject(m_context, error, message);
 }
 
 }
index 266cae6..f621473 100755 (executable)
@@ -16,7 +16,7 @@
 //
 
 #include <Commons/Exception.h>
-#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 #include "SEReader.h"
 #include "SEUtil.h"
 #include <Logger.h>
@@ -87,7 +87,7 @@ void SEReader::openSessionManualAnswer(void *session, int error, const EventSEOp
                event->setErrorMessage(util.getErrorMessage(error));
        } else if (session == NULL) {
                event->setResult(false);
-               event->setError(DeviceAPI::Common::JSTizenException::UNKNOWN_ERROR);
+               event->setError(DeviceAPI::Common::JSWebAPIErrorFactory::UNKNOWN_ERROR);
                event->setErrorMessage("Unknown Error");
        } else {
                event->setSession(session);
@@ -118,7 +118,7 @@ void SEReader::OnRequestReceived(const EventSEOpenSessionPtr& event) {
        } catch (const WrtDeviceApis::Commons::Exception& ex) {
                LoggerE("Exception: " << ex.GetMessage());
                event->setResult(false);
-               event->setError(DeviceAPI::Common::JSTizenException::UNKNOWN_ERROR);
+               event->setError(DeviceAPI::Common::JSWebAPIErrorFactory::UNKNOWN_ERROR);
                event->setErrorMessage("Unknown Error");
                EventRequestReceiver<EventSEOpenSession>::ManualAnswer(event);
        }
index bd1db32..03dabb1 100644 (file)
@@ -18,8 +18,7 @@
 #include <vector>
 #include <CommonsJavaScript/JSCallbackManager.h>
 #include <CommonsJavaScript/ScopedJSStringRef.h>
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 #include "JSSEReader.h"
 #include "JSSESession.h"
 #include "JSSEChannel.h"
index ff69b86..4a180ba 100644 (file)
@@ -20,7 +20,7 @@
 #include <Ecore.h>
 
 #include <Commons/Exception.h>
-#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 #include "SESession.h"
 #include "SEUtil.h"
 #include <Logger.h>
@@ -101,7 +101,7 @@ void SESession::openChannelManualAnswer(void * channel, int error, const EventSE
                event->setErrorMessage(util.getErrorMessage(error));
        } else if (channel == NULL) {
                event->setResult(false);
-               event->setError(DeviceAPI::Common::JSTizenException::UNKNOWN_ERROR);
+               event->setError(DeviceAPI::Common::JSWebAPIErrorFactory::UNKNOWN_ERROR);
                event->setErrorMessage("Unknown Error");
        } else {
                event->setChannel(channel);
@@ -140,7 +140,7 @@ void SESession::OnRequestReceived(const EventSEOpenChannelPtr& event) {
        } catch (const WrtDeviceApis::Commons::Exception& ex) {
                LoggerE("Exception: " << ex.GetMessage());
                event->setResult(false);
-               event->setError(DeviceAPI::Common::JSTizenException::UNKNOWN_ERROR);
+               event->setError(DeviceAPI::Common::JSWebAPIErrorFactory::UNKNOWN_ERROR);
                event->setErrorMessage("Unknown Error");
                EventRequestReceiver<EventSEOpenChannel>::ManualAnswer(event);
        }
index 65387be..0f50002 100644 (file)
@@ -18,8 +18,8 @@
 
 
 #include "SEUtil.h"
-#include <JSTizenException.h>
 #include <smartcard-types.h>
+#include <JSWebAPIErrorFactory.h>
 #include <Logger.h>
 
 namespace DeviceAPI {
@@ -61,18 +61,18 @@ std::string SEUtil::getErrorString(const int errorCode) {
                case SCARD_ERROR_IPC_FAILED:
                case SCARD_ERROR_OPERATION_TIMEOUT:
                case SCARD_ERROR_UNKNOWN:
-                       return DeviceAPI::Common::JSTizenException::IO_ERROR;
+                       return DeviceAPI::Common::JSWebAPIErrorFactory::IO_ERROR;
                case SCARD_ERROR_ILLEGAL_STATE:
                case SCARD_ERROR_ILLEGAL_REFERENCE:
                        return "InvalidStateError";
                case SCARD_ERROR_ILLEGAL_PARAM:
-                       return DeviceAPI::Common::JSTizenException::INVALID_VALUES_ERROR;
+                       return DeviceAPI::Common::JSWebAPIErrorFactory::INVALID_VALUES_ERROR;
                case SCARD_ERROR_SECURITY_NOT_ALLOWED:
-                       return DeviceAPI::Common::JSTizenException::PERMISSION_DENIED_ERROR;
+                       return DeviceAPI::Common::JSWebAPIErrorFactory::PERMISSION_DENIED_ERROR;
                case SCARD_ERROR_IO_FAILED:
-                       return DeviceAPI::Common::JSTizenException::NOT_FOUND_ERROR;
+                       return DeviceAPI::Common::JSWebAPIErrorFactory::NOT_FOUND_ERROR;
        }
-       return DeviceAPI::Common::JSTizenException::UNKNOWN_ERROR;
+       return DeviceAPI::Common::JSWebAPIErrorFactory::UNKNOWN_ERROR;
 }
 
 std::string SEUtil::getErrorMessage(const int errorCode) {
index f1d3a51..b2a5561 100644 (file)
@@ -20,8 +20,7 @@
 #include <CommonsJavaScript/JSCallbackManager.h>
 #include <CommonsJavaScript/Utils.h>
 #include <SecurityExceptions.h>
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 #include "JSSecureStorageManager.h"
 #include "plugin_config.h"
 
@@ -153,21 +152,21 @@ JSValueRef JSSecureStorageManager::listKeys(JSContextRef context, JSObjectRef ob
                switch(ex.getCode())
                {
                        case WrtDeviceApis::Commons::ExceptionCodes::NotFoundException:
-                               return JSTizenExceptionFactory::postException(context, exception, 
-                                       JSTizenException::NOT_FOUND_ERROR, "not found error"); 
+                               return JSWebAPIErrorFactory::postException(context, exception, 
+                                       JSWebAPIErrorFactory::NOT_FOUND_ERROR, "not found error"); 
                        case WrtDeviceApis::Commons::ExceptionCodes::InvalidArgumentException:
-                               return JSTizenExceptionFactory::postException(context, exception, 
-                                       JSTizenException::INVALID_VALUES_ERROR, "invalid parameter error"); 
+                               return JSWebAPIErrorFactory::postException(context, exception, 
+                                       JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "invalid parameter error"); 
                        case WrtDeviceApis::Commons::ExceptionCodes::ConversionException:
-                               return JSTizenExceptionFactory::postException(context, exception, 
-                                       JSTizenException::TYPE_MISMATCH_ERROR, "type mismatch error");  
+                               return JSWebAPIErrorFactory::postException(context, exception, 
+                                       JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "type mismatch error");      
                        case WrtDeviceApis::Commons::ExceptionCodes::SecurityException:
-                               return JSTizenExceptionFactory::postException(context, exception, 
-                                       JSTizenException::PERMISSION_DENIED_ERROR, "permission denied error");  
+                               return JSWebAPIErrorFactory::postException(context, exception, 
+                                       JSWebAPIErrorFactory::PERMISSION_DENIED_ERROR, "permission denied error");      
                        case WrtDeviceApis::Commons::ExceptionCodes::Exception:
                        default:
-                               return JSTizenExceptionFactory::postException(context, exception, 
-                                       JSTizenException::UNKNOWN_ERROR, "Unkown error");
+                               return JSWebAPIErrorFactory::postException(context, exception, 
+                                       JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unkown error");
                }
        }
        return JSValueMakeUndefined(context);
@@ -219,21 +218,21 @@ JSValueRef JSSecureStorageManager::set(JSContextRef context, JSObjectRef object,
                switch(ex.getCode())
                {
                        case WrtDeviceApis::Commons::ExceptionCodes::NotFoundException:
-                               return JSTizenExceptionFactory::postException(context, exception, 
-                                       JSTizenException::NOT_FOUND_ERROR, "not found error"); 
+                               return JSWebAPIErrorFactory::postException(context, exception, 
+                                       JSWebAPIErrorFactory::NOT_FOUND_ERROR, "not found error"); 
                        case WrtDeviceApis::Commons::ExceptionCodes::InvalidArgumentException:
-                               return JSTizenExceptionFactory::postException(context, exception, 
-                                       JSTizenException::INVALID_VALUES_ERROR, "invalid parameter error"); 
+                               return JSWebAPIErrorFactory::postException(context, exception, 
+                                       JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "invalid parameter error"); 
                        case WrtDeviceApis::Commons::ExceptionCodes::ConversionException:
-                               return JSTizenExceptionFactory::postException(context, exception, 
-                                       JSTizenException::TYPE_MISMATCH_ERROR, "type mismatch error");  
+                               return JSWebAPIErrorFactory::postException(context, exception, 
+                                       JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "type mismatch error");      
                        case WrtDeviceApis::Commons::ExceptionCodes::SecurityException:
-                               return JSTizenExceptionFactory::postException(context, exception, 
-                                       JSTizenException::PERMISSION_DENIED_ERROR, "permission denied error");  
+                               return JSWebAPIErrorFactory::postException(context, exception, 
+                                       JSWebAPIErrorFactory::PERMISSION_DENIED_ERROR, "permission denied error");      
                        case WrtDeviceApis::Commons::ExceptionCodes::Exception:
                        default:
-                               return JSTizenExceptionFactory::postException(context, exception, 
-                                       JSTizenException::UNKNOWN_ERROR, "Unkown error");
+                               return JSWebAPIErrorFactory::postException(context, exception, 
+                                       JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unkown error");
                }
        }
        return JSValueMakeUndefined(context);
@@ -275,21 +274,21 @@ JSValueRef JSSecureStorageManager::get(JSContextRef context, JSObjectRef object,
                switch(ex.getCode())
                {
                        case WrtDeviceApis::Commons::ExceptionCodes::NotFoundException:
-                               return JSTizenExceptionFactory::postException(context, exception, 
-                                       JSTizenException::NOT_FOUND_ERROR, "not found error"); 
+                               return JSWebAPIErrorFactory::postException(context, exception, 
+                                       JSWebAPIErrorFactory::NOT_FOUND_ERROR, "not found error"); 
                        case WrtDeviceApis::Commons::ExceptionCodes::InvalidArgumentException:
-                               return JSTizenExceptionFactory::postException(context, exception, 
-                                       JSTizenException::INVALID_VALUES_ERROR, "invalid parameter error"); 
+                               return JSWebAPIErrorFactory::postException(context, exception, 
+                                       JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "invalid parameter error"); 
                        case WrtDeviceApis::Commons::ExceptionCodes::ConversionException:
-                               return JSTizenExceptionFactory::postException(context, exception, 
-                                       JSTizenException::TYPE_MISMATCH_ERROR, "type mismatch error");  
+                               return JSWebAPIErrorFactory::postException(context, exception, 
+                                       JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "type mismatch error");      
                        case WrtDeviceApis::Commons::ExceptionCodes::SecurityException:
-                               return JSTizenExceptionFactory::postException(context, exception, 
-                                       JSTizenException::PERMISSION_DENIED_ERROR, "permission denied error");  
+                               return JSWebAPIErrorFactory::postException(context, exception, 
+                                       JSWebAPIErrorFactory::PERMISSION_DENIED_ERROR, "permission denied error");      
                        case WrtDeviceApis::Commons::ExceptionCodes::Exception:
                        default:
-                               return JSTizenExceptionFactory::postException(context, exception, 
-                                       JSTizenException::UNKNOWN_ERROR, "Unkown error");
+                               return JSWebAPIErrorFactory::postException(context, exception, 
+                                       JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unkown error");
                }
        }
        return JSValueMakeUndefined(context);
@@ -331,21 +330,21 @@ JSValueRef JSSecureStorageManager::remove(JSContextRef context, JSObjectRef obje
                switch(ex.getCode())
                {
                        case WrtDeviceApis::Commons::ExceptionCodes::NotFoundException:
-                               return JSTizenExceptionFactory::postException(context, exception, 
-                                       JSTizenException::NOT_FOUND_ERROR, "not found error"); 
+                               return JSWebAPIErrorFactory::postException(context, exception, 
+                                       JSWebAPIErrorFactory::NOT_FOUND_ERROR, "not found error"); 
                        case WrtDeviceApis::Commons::ExceptionCodes::InvalidArgumentException:
-                               return JSTizenExceptionFactory::postException(context, exception, 
-                                       JSTizenException::INVALID_VALUES_ERROR, "invalid parameter error"); 
+                               return JSWebAPIErrorFactory::postException(context, exception, 
+                                       JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "invalid parameter error"); 
                        case WrtDeviceApis::Commons::ExceptionCodes::ConversionException:
-                               return JSTizenExceptionFactory::postException(context, exception, 
-                                       JSTizenException::TYPE_MISMATCH_ERROR, "type mismatch error");  
+                               return JSWebAPIErrorFactory::postException(context, exception, 
+                                       JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "type mismatch error");      
                        case WrtDeviceApis::Commons::ExceptionCodes::SecurityException:
-                               return JSTizenExceptionFactory::postException(context, exception, 
-                                       JSTizenException::PERMISSION_DENIED_ERROR, "permission denied error");  
+                               return JSWebAPIErrorFactory::postException(context, exception, 
+                                       JSWebAPIErrorFactory::PERMISSION_DENIED_ERROR, "permission denied error");      
                        case WrtDeviceApis::Commons::ExceptionCodes::Exception:
                        default:
-                               return JSTizenExceptionFactory::postException(context, exception, 
-                                       JSTizenException::UNKNOWN_ERROR, "Unkown error");
+                               return JSWebAPIErrorFactory::postException(context, exception, 
+                                       JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unkown error");
                }
        }       
        return JSValueMakeUndefined(context);
@@ -381,21 +380,21 @@ JSValueRef JSSecureStorageManager::removeAll(JSContextRef context, JSObjectRef o
                switch(ex.getCode())
                {
                        case WrtDeviceApis::Commons::ExceptionCodes::NotFoundException:
-                               return JSTizenExceptionFactory::postException(context, exception, 
-                                       JSTizenException::NOT_FOUND_ERROR, "not found error"); 
+                               return JSWebAPIErrorFactory::postException(context, exception, 
+                                       JSWebAPIErrorFactory::NOT_FOUND_ERROR, "not found error"); 
                        case WrtDeviceApis::Commons::ExceptionCodes::InvalidArgumentException:
-                               return JSTizenExceptionFactory::postException(context, exception, 
-                                       JSTizenException::INVALID_VALUES_ERROR, "invalid parameter error"); 
+                               return JSWebAPIErrorFactory::postException(context, exception, 
+                                       JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "invalid parameter error"); 
                        case WrtDeviceApis::Commons::ExceptionCodes::ConversionException:
-                               return JSTizenExceptionFactory::postException(context, exception, 
-                                       JSTizenException::TYPE_MISMATCH_ERROR, "type mismatch error");  
+                               return JSWebAPIErrorFactory::postException(context, exception, 
+                                       JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "type mismatch error");      
                        case WrtDeviceApis::Commons::ExceptionCodes::SecurityException:
-                               return JSTizenExceptionFactory::postException(context, exception, 
-                                       JSTizenException::PERMISSION_DENIED_ERROR, "permission denied error");  
+                               return JSWebAPIErrorFactory::postException(context, exception, 
+                                       JSWebAPIErrorFactory::PERMISSION_DENIED_ERROR, "permission denied error");      
                        case WrtDeviceApis::Commons::ExceptionCodes::Exception:
                        default:
-                               return JSTizenExceptionFactory::postException(context, exception, 
-                                       JSTizenException::UNKNOWN_ERROR, "Unkown error");
+                               return JSWebAPIErrorFactory::postException(context, exception, 
+                                       JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unkown error");
                }
        }
        return JSValueMakeUndefined(context);
index 1fbd54c..bcc0f6a 100644 (file)
@@ -29,8 +29,7 @@
 #include "EventGetSetting.h"
 #include "SystemSettingFactory.h"
 
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 #include <SecurityExceptions.h>
 #include <TimeTracer.h>
 #include "JSSystemSetting.h"
@@ -54,6 +53,8 @@ using namespace DeviceAPI::Common;
 namespace DeviceAPI {
 namespace SystemSetting {
 
+using WrtDeviceApis::Commons::UnknownException;
+
 JSClassDefinition JSSystemSetting::m_classInfo = {
     0,
     kJSClassAttributeNone,
@@ -151,14 +152,14 @@ JSValueRef JSSystemSetting::setProperty(JSContextRef context, JSObjectRef object
        
        if (!priv) {
                LoggerE("private object is null");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Wrong Object");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Wrong Object");
        }
        if (argumentCount < 3) {
                LoggerD("Argument is too few");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type missmatch error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type missmatch error");
        }
        if (!check.isCallback(arguments[2])) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type missmatch error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type missmatch error");
        }
 
        AceSecurityStatus status = SYSTEMSETTING_CHECK_ACCESS(SYSTEMSETTING_FUNCTION_API_SET_PROPERTY);
@@ -170,7 +171,7 @@ JSValueRef JSSystemSetting::setProperty(JSContextRef context, JSObjectRef object
                if (check.isCallback(arguments[3])) {
                        onErrorForCbm = arguments[3];
                } else if (!JSValueIsNull(context, arguments[3])) {
-                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type missmatch error");
+                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type missmatch error");
                }
        }
 
@@ -212,22 +213,22 @@ JSValueRef JSSystemSetting::setProperty(JSContextRef context, JSObjectRef object
 
        Catch(WrtDeviceApis::Commons::ConversionException) {
                LoggerD("Exception");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type missmatch error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type missmatch error");
        }
 
        Catch(WrtDeviceApis::Commons::InvalidArgumentException) {
                LoggerD("Exception");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, "invalid value error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "invalid value error");
        }
 
        Catch(WrtDeviceApis::Commons::PlatformException) {
                LoggerD("Exception");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "platform error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "platform error");
        }
 
        Catch(WrtDeviceApis::Commons::Exception) {
                LoggerD("Exception");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown error");
        }
 
        LoggerD("end");
@@ -247,15 +248,15 @@ JSValueRef JSSystemSetting::getProperty(JSContextRef context, JSObjectRef object
        
        if (!priv) {
                LoggerE("private object is null");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Wrong Object");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Wrong Object");
        }
 
        if (argumentCount < 2) {
                LoggerD("Argument is too few");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type missmatch error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type missmatch error");
        }
        if (!check.isCallback(arguments[1])) {
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type missmatch error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type missmatch error");
        }
 
 /*
@@ -269,7 +270,7 @@ JSValueRef JSSystemSetting::getProperty(JSContextRef context, JSObjectRef object
                if (check.isCallback(arguments[2])) {
                        onErrorForCbm = arguments[2];
                } else if (!JSValueIsNull(context, arguments[2])) {
-                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type missmatch error");
+                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type missmatch error");
                }
        }
 
@@ -295,22 +296,22 @@ JSValueRef JSSystemSetting::getProperty(JSContextRef context, JSObjectRef object
 
        Catch(WrtDeviceApis::Commons::ConversionException) {
                LoggerD("Exception");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type missmatch error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type missmatch error");
        }
 
        Catch(WrtDeviceApis::Commons::InvalidArgumentException) {
                LoggerD("Exception");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, "invalid value error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "invalid value error");
        }
 
        Catch(WrtDeviceApis::Commons::PlatformException) {
                LoggerD("Exception");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "platform error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "platform error");
        }
 
        Catch(WrtDeviceApis::Commons::Exception) {
                LoggerD("Exception");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown error");
        }
 
        LoggerD("end");
index 2d16e5a..4762c25 100755 (executable)
@@ -17,8 +17,7 @@
 
 #include "SystemSettingResponseDispatcher.h"
 #include <CommonsJavaScript/JSCallbackManager.h>
-#include <JSTizenException.h>
-#include <JSTizenExceptionFactory.h>
+#include <JSWebAPIErrorFactory.h>
 #include <FilesystemUtils.h>
 #include "SystemSettingAsyncCallbackManager.h"
 #include <Logger.h>
@@ -66,19 +65,19 @@ void SystemSettingResponseDispatcher::OnAnswerReceived(const EventSetWallpaperPt
                switch (event->getExceptionCode())
                {
                case ExceptionCodes::PlatformException:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::UNKNOWN_ERROR, "Internal error");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                        break;
                case ExceptionCodes::NotFoundException:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::NOT_FOUND_ERROR, "record not found");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::NOT_FOUND_ERROR, "record not found");
                        break;
                case ExceptionCodes::InvalidArgumentException:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::INVALID_VALUES_ERROR, "DomainName is not setted");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "DomainName is not setted");
                        break;
                case ExceptionCodes::ConversionException:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::TYPE_MISMATCH_ERROR, "Wrong argument");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong argument");
                        break;
                default:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::UNKNOWN_ERROR, "Unknown error");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown error");
                        break;
                }
                LoggerD("callOnError");
@@ -108,19 +107,19 @@ void SystemSettingResponseDispatcher::OnAnswerReceived(const EventSetRingtonePtr
                switch (event->getExceptionCode())
                {
                case ExceptionCodes::PlatformException:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::UNKNOWN_ERROR, "Internal error");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                        break;
                case ExceptionCodes::NotFoundException:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::NOT_FOUND_ERROR, "record not found");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::NOT_FOUND_ERROR, "record not found");
                        break;
                case ExceptionCodes::InvalidArgumentException:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::INVALID_VALUES_ERROR, "DomainName is not setted");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "DomainName is not setted");
                        break;
                case ExceptionCodes::ConversionException:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::TYPE_MISMATCH_ERROR, "Wrong argument");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong argument");
                        break;
                default:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::UNKNOWN_ERROR, "Unknown error");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown error");
                        break;
                }
 
@@ -150,19 +149,19 @@ void SystemSettingResponseDispatcher::OnAnswerReceived(const EventSetSettingPtr
                switch (event->getExceptionCode())
                {
                case ExceptionCodes::PlatformException:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::UNKNOWN_ERROR, "Internal error");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                        break;
                case ExceptionCodes::NotFoundException:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::NOT_FOUND_ERROR, "record not found");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::NOT_FOUND_ERROR, "record not found");
                        break;
                case ExceptionCodes::InvalidArgumentException:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::INVALID_VALUES_ERROR, "DomainName is not setted");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "DomainName is not setted");
                        break;
                case ExceptionCodes::ConversionException:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::TYPE_MISMATCH_ERROR, "Wrong argument");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong argument");
                        break;
                default:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::UNKNOWN_ERROR, "Unknown error");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown error");
                        break;
                }
 
@@ -194,19 +193,19 @@ void SystemSettingResponseDispatcher::OnAnswerReceived(const EventGetSettingPtr
                switch (event->getExceptionCode())
                {
                case ExceptionCodes::PlatformException:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::UNKNOWN_ERROR, "Internal error");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
                        break;
                case ExceptionCodes::NotFoundException:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::NOT_FOUND_ERROR, "record not found");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::NOT_FOUND_ERROR, "record not found");
                        break;
                case ExceptionCodes::InvalidArgumentException:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::INVALID_VALUES_ERROR, "DomainName is not setted");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "DomainName is not setted");
                        break;
                case ExceptionCodes::ConversionException:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::TYPE_MISMATCH_ERROR, "Wrong argument");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong argument");
                        break;
                default:
-                       error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::UNKNOWN_ERROR, "Unknown error");
+                       error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown error");
                        break;
                }
 
@@ -220,7 +219,7 @@ void SystemSettingResponseDispatcher::OnAnswerReceived(const EventGetSettingPtr
 
        if (settingPath.size() == 0)
        {
-               error = JSTizenExceptionFactory::makeErrorObject(gContext, JSTizenException::UNKNOWN_ERROR, "Unknown error");
+               error = JSWebAPIErrorFactory::makeErrorObject(gContext, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown error");
                callbackManager->callOnError(error);
                return;
        }
old mode 100644 (file)
new mode 100755 (executable)
index 75d5506..db1dc54
@@ -16,9 +16,9 @@
 //
 
 #include <memory>
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 #include <SecurityExceptions.h>
+#include <system_info.h>
 #include "JSCellularNetworkInfo.h"
 #include "plugin_config.h"
 #include <Logger.h>
@@ -155,6 +155,17 @@ JSValueRef JSCellularNetworkInfo::getProperty(JSContextRef context, JSObjectRef
         } else if (JSStringIsEqualToUTF8CString(propertyName, CELLULARNETWORK_IMEI_PROPERTY)) {
             AceSecurityStatus status = SYSTEMINFO_CHECK_ACCESS(SYSTEMINFO_FUNCTION_API_GET_PROPERTY_PARTNER_VALUE);
             TIZEN_SYNC_ACCESS_HANDLER(status, context, exception);
+
+            char* imei = NULL;
+
+            if (system_info_get_value_string(SYSTEM_INFO_KEY_MOBILE_DEVICE_ID, &imei) == SYSTEM_INFO_ERROR_NONE) {
+                if (imei) {
+                    LoggerD("imei : " << imei);
+                    cellularNetworkInfo->imei = imei;
+                    free(imei);
+                }
+            }
+
             return convert.toJSValueRef(cellularNetworkInfo->imei);
         }            
     }
index 43270db..3f3a715 100755 (executable)
@@ -18,8 +18,7 @@
 #include <fstream>
 #include <pcrecpp.h>
 #include <memory>
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 #include <SecurityExceptions.h>
 #include <sensor.h>
 #include <sensors.h>
index 8b6e534..2ddac9c 100755 (executable)
@@ -16,8 +16,7 @@
 //
 
 #include <memory>
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 #include <SecurityExceptions.h>
 #include <sim.h>
 #include "JSSIMInfo.h"
index 0339b0c..ca70e74 100755 (executable)
@@ -24,8 +24,7 @@
 #include "SysteminfoFactory.h"
 #include "EventGetSysteminfo.h"
 #include "EventWatchSysteminfo.h"
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 #include <SecurityExceptions.h>
 #include <TimeTracer.h>
 #include "SysteminfoListener.h"
@@ -120,7 +119,7 @@ JSValueRef JSSysteminfo::getCapabilities(JSContextRef context, JSObjectRef objec
 
     if (!priv) {
         LoggerE("private object is null");
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type missmatch error");
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type missmatch error");
     }
     Try
     {
@@ -133,13 +132,13 @@ JSValueRef JSSysteminfo::getCapabilities(JSContextRef context, JSObjectRef objec
         return (static_cast<JSValueRef>(JSDeviceCapabilitiesInfo::createJSObject(context, result)));
     }
     Catch(WrtDeviceApis::Commons::ConversionException) {
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, "Invalid values error");
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Invalid values error");
     }
     Catch(WrtDeviceApis::Commons::InvalidArgumentException){
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, "Invalid values error");
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Invalid values error");
     }
     Catch(WrtDeviceApis::Commons::Exception) {
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown error");
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown error");
     }    
 }
 
@@ -154,13 +153,13 @@ JSValueRef JSSysteminfo::getPropertyValue(JSContextRef context, JSObjectRef obje
 
     if (!priv) {
         LoggerE("private object is null");
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Wrong Object");
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Wrong Object");
     }
     if (argumentCount < 2) {
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type missmatch error");
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type missmatch error");
     }
     if (!check.isCallback(arguments[1])) {
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type missmatch error");
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type missmatch error");
     }
 
     JSValueRef onSuccessForCbm = NULL, onErrorForCbm = NULL;
@@ -169,7 +168,7 @@ JSValueRef JSSysteminfo::getPropertyValue(JSContextRef context, JSObjectRef obje
         if (check.isCallback(arguments[2])) {
             onErrorForCbm = arguments[2];
         } else if (!JSValueIsNull(context, arguments[2])) {
-            return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type missmatch error");
+            return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type missmatch error");
         }
     }
     
@@ -195,10 +194,10 @@ JSValueRef JSSysteminfo::getPropertyValue(JSContextRef context, JSObjectRef obje
     }
     
     Catch(WrtDeviceApis::Commons::ConversionException) {
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type missmatch error");
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type missmatch error");
     }
     Catch(WrtDeviceApis::Commons::Exception) {
-        cbm->callOnError(JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::UNKNOWN_ERROR, "Unknown error"));
+        cbm->callOnError(JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown error"));
     }
     return JSValueMakeUndefined(context);
 }
@@ -214,13 +213,13 @@ JSValueRef JSSysteminfo::addPropertyValueChangeListener(JSContextRef context, JS
 
     if (!priv) {
         LoggerE("private object is null");
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Wrong Object");
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Wrong Object");
     }
     if (argumentCount < 2) {
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type missmatch error");
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type missmatch error");
     }
     if (!check.isCallback(arguments[1])) {
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type missmatch error");
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type missmatch error");
     }
     
     JSValueRef onSuccessForCbm = NULL;
@@ -235,7 +234,7 @@ JSValueRef JSSysteminfo::addPropertyValueChangeListener(JSContextRef context, JS
                 option.highThreshold = converter.toDouble(JSUtils::getJSProperty(context, arguments[2], "highThreshold", exception));
                 option.lowThreshold = converter.toDouble(JSUtils::getJSProperty(context, arguments[2], "lowThreshold", exception));
             } else if (!JSValueIsNull(context, arguments[2])) {
-                return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type missmatch error");        
+                return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type missmatch error");        
             }
         }
         ISysteminfoPtr Systeminfos(priv->getObject());
@@ -260,13 +259,13 @@ JSValueRef JSSysteminfo::addPropertyValueChangeListener(JSContextRef context, JS
     }
 
     Catch(WrtDeviceApis::Commons::ConversionException) {
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type missmatch error");
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type missmatch error");
     }
     Catch(WrtDeviceApis::Commons::InvalidArgumentException) {
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, "Invalid values error");
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Invalid values error");
     }
     Catch(WrtDeviceApis::Commons::Exception) {
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown error");
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown error");
     }
 }
 
@@ -279,10 +278,10 @@ JSValueRef JSSysteminfo::removePropertyValueChangeListener(JSContextRef context,
     Converter converter(context);
     if (!priv) {
         LoggerE("private object is null");
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Wrong Object");
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Wrong Object");
     }
     if (argumentCount < 1) {
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type missmatch error");
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type missmatch error");
     }
 
     Try {
@@ -299,13 +298,13 @@ JSValueRef JSSysteminfo::removePropertyValueChangeListener(JSContextRef context,
                return JSValueMakeUndefined(context);
        }
     Catch(WrtDeviceApis::Commons::ConversionException) {
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type missmatch error");
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type missmatch error");
     }    
     Catch(WrtDeviceApis::Commons::InvalidArgumentException) {
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, "Invalid values error");
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Invalid values error");
     }
     Catch(WrtDeviceApis::Commons::Exception) {
-        return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown error");        
+        return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown error");        
     }
 }
 
index 984e53d..f40bb37 100755 (executable)
@@ -1243,7 +1243,6 @@ PROPERTY_GET_SYSTEMINFO_DEFINITION(CellularNetwork) {
     connection_address_family_e addressFamily = CONNECTION_ADDRESS_FAMILY_IPV4;
     char* ipAddr = NULL;
     char* apn = NULL;
-    char* imei = NULL;
     int plmn = 0, cellId = 0, lac = 0, isRoaming = 0, isFlightMode = 0;
 
     TIME_TRACER_ITEM_BEGIN("(cellular)mcc", 0);
@@ -1320,16 +1319,6 @@ PROPERTY_GET_SYSTEMINFO_DEFINITION(CellularNetwork) {
         }
     }
 
-       TIME_TRACER_ITEM_BEGIN("(cellular)imei", 0);
-    if (system_info_get_value_string(SYSTEM_INFO_KEY_MOBILE_DEVICE_ID, &imei) == SYSTEM_INFO_ERROR_NONE) {
-        if (imei) {
-            LoggerD("imei : " << imei);
-            cellularNetwork->imei = imei;
-            free(imei);
-        }
-    }
-       TIME_TRACER_ITEM_END("(cellular)imei", 0);
-
     return JSCellularNetworkInfo::createJSObject(context, cellularNetwork);
 }
 
index 2f8cee1..1364cda 100644 (file)
 #include <CommonsJavaScript/PrivateObject.h>
 #include <CommonsJavaScript/JSUtils.h>
 #include <Commons/Exception.h>
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 #include <ArgumentValidator.h>
-#include <JSWebAPIException.h>
 
 #include "DurationProperties.h"
 #include "JSTZDate.h"
@@ -294,22 +292,16 @@ JSObjectRef JSTZDate::constructor(JSContextRef ctx, JSObjectRef constructor, siz
                }
        } Catch(ConversionException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(ctx, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
-               *exception = error;
-               return error;
+               return JSWebAPIErrorFactory::postException(ctx, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (InvalidArgumentException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(ctx, JSTizenException::INVALID_VALUES_ERROR, "Invalid Values");
-               *exception = error;
-               return error;
+               return JSWebAPIErrorFactory::postException(ctx, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Invalid Values");
        } Catch (PlatformException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        } Catch (WrtDeviceApis::Commons::Exception) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
-       JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(ctx, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
-       *exception = error;
-       return error;
+       return JSWebAPIErrorFactory::postException(ctx, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
 }
 const JSClassRef JSTZDate::getClassRef()
 {
@@ -342,17 +334,17 @@ JSValueRef JSTZDate::getTimezone(JSContextRef context, JSObjectRef function,
                return converter.toJSValueRef(timezone);
        } Catch(NullPointerException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch(WrtDeviceApis::Commons::UnknownException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        } Catch (InvalidArgumentException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, "Invalid Values");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Invalid Values");
        } Catch (PlatformException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
 
-       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
 }
 
 JSValueRef JSTZDate::toTimezone(JSContextRef context, JSObjectRef function,
@@ -372,23 +364,23 @@ JSValueRef JSTZDate::toTimezone(JSContextRef context, JSObjectRef function,
                TZDatePtr tzDate(privateObject->getObject());
                return createJSObject(context, tzDate->getTime(), timezone);
        } catch(const BasePlatformException& err){
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } Catch(NullPointerException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch(WrtDeviceApis::Commons::UnknownException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        } Catch (InvalidArgumentException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, "Invalid Values");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Invalid Values");
        } Catch(ConversionException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (PlatformException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
 
-       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
 }
 
 JSValueRef JSTZDate::diffTZDate(JSContextRef context, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef * exception, CompareType type) {
@@ -442,23 +434,23 @@ JSValueRef JSTZDate::difference(JSContextRef context, JSObjectRef function,
        Try {
                return diffTZDate(context, thisObject, argumentCount,  arguments, exception, DIFFERENCE);
        } catch(const BasePlatformException& err){
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } Catch(InvalidArgumentException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, "Invalid Values");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Invalid Values");
        } Catch(NullPointerException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch(WrtDeviceApis::Commons::UnknownException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        } Catch(ConversionException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (PlatformException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
 
-       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
 }
 
 JSValueRef JSTZDate::equalsTo(JSContextRef context, JSObjectRef function,
@@ -468,22 +460,22 @@ JSValueRef JSTZDate::equalsTo(JSContextRef context, JSObjectRef function,
        Try {
                return diffTZDate(context, thisObject, argumentCount,  arguments, exception, EQUALSTO);
        } catch(const BasePlatformException& err){
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } Catch(NullPointerException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch(WrtDeviceApis::Commons::UnknownException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        } Catch (InvalidArgumentException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, "Invalid Values");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Invalid Values");
        } Catch(ConversionException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (PlatformException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
-       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
 }
 
 JSValueRef JSTZDate::earlierThan(JSContextRef context, JSObjectRef function,
@@ -493,22 +485,22 @@ JSValueRef JSTZDate::earlierThan(JSContextRef context, JSObjectRef function,
        Try {
                return diffTZDate(context, thisObject, argumentCount,  arguments, exception, EARLIERTHAN);
        } catch(const BasePlatformException& err){
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } Catch(NullPointerException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch(WrtDeviceApis::Commons::UnknownException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        } Catch (InvalidArgumentException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, "Invalid Values");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Invalid Values");
        } Catch(ConversionException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (PlatformException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
-       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
 
 }
 
@@ -520,22 +512,22 @@ JSValueRef JSTZDate::laterThan(JSContextRef context, JSObjectRef function,
        Try {
                return diffTZDate(context, thisObject, argumentCount,  arguments, exception, LATERTHAN);
        } catch(const BasePlatformException& err){
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } Catch(NullPointerException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch(WrtDeviceApis::Commons::UnknownException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        } Catch (InvalidArgumentException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, "Invalid Values");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Invalid Values");
        } Catch(ConversionException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (PlatformException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
-       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
 
 }
 
@@ -565,23 +557,23 @@ JSValueRef JSTZDate::addDuration(JSContextRef context, JSObjectRef function,
                return (static_cast<JSValueRef>(createJSObject(context, result)));
        } Catch(NullPointerException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch(WrtDeviceApis::Commons::UnknownException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        } Catch (InvalidArgumentException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, "Invalid Values");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Invalid Values");
        } Catch(ConversionException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (PlatformException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        } Catch (OutOfRangeException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, "The result is beyond the scope that TZDate can handle.");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "The result is beyond the scope that TZDate can handle.");
        }
 
-       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
 }
 
 JSValueRef JSTZDate::toUTC(JSContextRef context, JSObjectRef function,
@@ -599,16 +591,16 @@ JSValueRef JSTZDate::toUTC(JSContextRef context, JSObjectRef function,
                return createJSObject(context, tzDate->getTime(), tzDate->getUTCTimezoneName());
        } Catch(NullPointerException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch(WrtDeviceApis::Commons::UnknownException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        } Catch (InvalidArgumentException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, "Invalid Values");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Invalid Values");
        } Catch (PlatformException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
-       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
 }
 
 
@@ -627,16 +619,16 @@ JSValueRef JSTZDate::toLocalTimezone(JSContextRef context, JSObjectRef function,
                return createJSObject(context, tzDate->getTime(), tzDate->getLocalTimezoneName());
        } Catch(NullPointerException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch(WrtDeviceApis::Commons::UnknownException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        } Catch (InvalidArgumentException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, "Invalid Values");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Invalid Values");
        } Catch (PlatformException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
-       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
 }
 
 JSValueRef JSTZDate::toLocaleDateString(JSContextRef context, JSObjectRef function,
@@ -656,17 +648,17 @@ JSValueRef JSTZDate::toLocaleDateString(JSContextRef context, JSObjectRef functi
                return converter.toJSValueRef(result);
        } Catch(NullPointerException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch(WrtDeviceApis::Commons::UnknownException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        } Catch (InvalidArgumentException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, "Invalid Values");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Invalid Values");
        } Catch (PlatformException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
 
-       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
 }
 
 JSValueRef JSTZDate::toLocaleTimeString(JSContextRef context, JSObjectRef function,
@@ -686,17 +678,17 @@ JSValueRef JSTZDate::toLocaleTimeString(JSContextRef context, JSObjectRef functi
                return converter.toJSValueRef(result);
        } Catch(NullPointerException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch(WrtDeviceApis::Commons::UnknownException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        } Catch (InvalidArgumentException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, "Invalid Values");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Invalid Values");
        } Catch (PlatformException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
 
-       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
 }
 
 JSValueRef JSTZDate::toLocaleString(JSContextRef context, JSObjectRef function,
@@ -716,17 +708,17 @@ JSValueRef JSTZDate::toLocaleString(JSContextRef context, JSObjectRef function,
                return converter.toJSValueRef(result);
        } Catch(NullPointerException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch(WrtDeviceApis::Commons::UnknownException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        } Catch (InvalidArgumentException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, "Invalid Values");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Invalid Values");
        } Catch (PlatformException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
 
-       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
 }
 
 JSValueRef JSTZDate::toDateString(JSContextRef context, JSObjectRef function,
@@ -746,17 +738,17 @@ JSValueRef JSTZDate::toDateString(JSContextRef context, JSObjectRef function,
                return converter.toJSValueRef(result);
        } Catch(NullPointerException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch(WrtDeviceApis::Commons::UnknownException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        } Catch (InvalidArgumentException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, "Invalid Values");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Invalid Values");
        } Catch (PlatformException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
 
-       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
 }
 
 JSValueRef JSTZDate::toTimeString(JSContextRef context, JSObjectRef function,
@@ -776,17 +768,17 @@ JSValueRef JSTZDate::toTimeString(JSContextRef context, JSObjectRef function,
                return converter.toJSValueRef(result);
        } Catch(NullPointerException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch(WrtDeviceApis::Commons::UnknownException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        } Catch (InvalidArgumentException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, "Invalid Values");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Invalid Values");
        } Catch (PlatformException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
 
-       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
 }
 
 
@@ -807,17 +799,17 @@ JSValueRef JSTZDate::toString(JSContextRef context, JSObjectRef function,
                return converter.toJSValueRef(result);
        } Catch(NullPointerException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch(WrtDeviceApis::Commons::UnknownException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        } Catch (InvalidArgumentException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, "Invalid Values");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Invalid Values");
        } Catch (PlatformException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
 
-       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
 }
 
 JSValueRef JSTZDate::getDate(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[],
@@ -890,7 +882,7 @@ JSValueRef JSTZDate::getTZDateValue(JSContextRef context, JSObjectRef thisObject
 
                if (privateObject == NULL) {
                        LoggerE(">>> NULL Exception");
-                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
                }
 
                TZDatePtr tzDate(privateObject->getObject());
@@ -901,17 +893,17 @@ JSValueRef JSTZDate::getTZDateValue(JSContextRef context, JSObjectRef thisObject
                return converter.toJSValueRef(static_cast<int> (retVal));
        } Catch(NullPointerException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch(WrtDeviceApis::Commons::UnknownException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        } Catch (InvalidArgumentException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, "Invalid Values");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Invalid Values");
        } Catch (PlatformException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
 
-       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
 }
 
 JSValueRef JSTZDate::setDate(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[],
@@ -923,22 +915,22 @@ JSValueRef JSTZDate::setDate(JSContextRef context, JSObjectRef function, JSObjec
        try{
                setTZDateValue(context, thisObject, argumentCount, arguments, exception, dateFields);
        } catch(const BasePlatformException& err){
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }  Catch(NullPointerException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch(WrtDeviceApis::Commons::UnknownException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
        } Catch (InvalidArgumentException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, "Invalid Values");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Invalid Values");
        } Catch(ConversionException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (PlatformException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
        }
 
        return JSValueMakeNull(context);
@@ -953,22 +945,22 @@ JSValueRef JSTZDate::setFullYear(JSContextRef context, JSObjectRef function, JSO
        try{
                setTZDateValue(context, thisObject, argumentCount, arguments, exception, dateFields);
        } catch(const BasePlatformException& err){
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } Catch(NullPointerException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch(WrtDeviceApis::Commons::UnknownException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
        } Catch (InvalidArgumentException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, "Invalid Values");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Invalid Values");
        } Catch(ConversionException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (PlatformException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
        }
 
        return JSValueMakeNull(context);
@@ -983,22 +975,22 @@ JSValueRef JSTZDate::setHours(JSContextRef context, JSObjectRef function, JSObje
        Try {
                setTZDateValue(context, thisObject, argumentCount, arguments, exception, dateFields);
        } catch(const BasePlatformException& err){
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }Catch(NullPointerException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch(WrtDeviceApis::Commons::UnknownException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
        } Catch (InvalidArgumentException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, "Invalid Values");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Invalid Values");
        } Catch(ConversionException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (PlatformException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
        }
 
        return JSValueMakeNull(context);
@@ -1013,22 +1005,22 @@ JSValueRef JSTZDate::setMilliseconds(JSContextRef context, JSObjectRef function,
        Try{
                setTZDateValue(context, thisObject, argumentCount, arguments, exception, dateFields);
        } catch(const BasePlatformException& err){
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }Catch(NullPointerException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch(WrtDeviceApis::Commons::UnknownException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
        } Catch (InvalidArgumentException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, "Invalid Values");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Invalid Values");
        } Catch(ConversionException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (PlatformException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
        }
 
        return JSValueMakeNull(context);
@@ -1043,22 +1035,22 @@ JSValueRef JSTZDate::setMinutes(JSContextRef context, JSObjectRef function, JSOb
        Try {
                setTZDateValue(context, thisObject, argumentCount, arguments, exception, dateFields);
        } catch(const BasePlatformException& err){
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }Catch(NullPointerException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch(WrtDeviceApis::Commons::UnknownException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
        } Catch (InvalidArgumentException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, "Invalid Values");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Invalid Values");
        } Catch(ConversionException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (PlatformException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
        }
 
        return JSValueMakeNull(context);
@@ -1073,22 +1065,22 @@ JSValueRef JSTZDate::setMonth(JSContextRef context, JSObjectRef function, JSObje
        Try {
                setTZDateValue(context, thisObject, argumentCount, arguments, exception, dateFields);
        } catch(const BasePlatformException& err){
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }Catch(NullPointerException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch(WrtDeviceApis::Commons::UnknownException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
        } Catch (InvalidArgumentException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, "Invalid Values");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Invalid Values");
        } Catch(ConversionException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (PlatformException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
        }
 
        return JSValueMakeNull(context);
@@ -1103,22 +1095,22 @@ JSValueRef JSTZDate::setSeconds(JSContextRef context, JSObjectRef function, JSOb
        Try {
                setTZDateValue(context, thisObject, argumentCount, arguments, exception, dateFields);
        } catch(const BasePlatformException& err){
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     }Catch(NullPointerException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch(WrtDeviceApis::Commons::UnknownException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
        } Catch (InvalidArgumentException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, "Invalid Values");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Invalid Values");
        } Catch(ConversionException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (PlatformException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
        }
 
        return JSValueMakeNull(context);
@@ -1211,17 +1203,17 @@ JSValueRef JSTZDate::getUTCTZDateValue(JSContextRef context, JSObjectRef thisObj
                return converter.toJSValueRefLong(result);
        } Catch(NullPointerException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch(WrtDeviceApis::Commons::UnknownException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        } Catch (InvalidArgumentException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, "Invalid Values");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Invalid Values");
        } Catch (PlatformException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
 
-       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
 }
 
 JSValueRef JSTZDate::setUTCDate(JSContextRef context, JSObjectRef function,
@@ -1300,20 +1292,20 @@ JSValueRef JSTZDate::setUTCTZDateValue(JSContextRef context, JSObjectRef thisObj
                return JSValueMakeNull(context);
        } Catch(NullPointerException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch(WrtDeviceApis::Commons::UnknownException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        } Catch (InvalidArgumentException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, "Invalid Values");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Invalid Values");
        } Catch(ConversionException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (PlatformException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
 
-       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
 }
 
 JSValueRef JSTZDate::getTimezoneAbbreviation(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef * exception) {
@@ -1334,16 +1326,16 @@ JSValueRef JSTZDate::getTimezoneAbbreviation(JSContextRef context, JSObjectRef f
                return converter.toJSValueRef(tzDate->getTimezoneAbbreviation());
        } Catch(NullPointerException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch(WrtDeviceApis::Commons::UnknownException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        } Catch (InvalidArgumentException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, "Invalid Values");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Invalid Values");
        } Catch (PlatformException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
-       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
 }
 
 JSValueRef JSTZDate::secondsFromUTC(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef * exception) {
@@ -1363,16 +1355,16 @@ JSValueRef JSTZDate::secondsFromUTC(JSContextRef context, JSObjectRef function,
                return converter.toJSValueRefLong(tzDate->secondsFromUTC());
        } Catch(NullPointerException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch(WrtDeviceApis::Commons::UnknownException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        } Catch (InvalidArgumentException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, "Invalid Values");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Invalid Values");
        } Catch (PlatformException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
-       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
 }
 JSValueRef JSTZDate::isDST(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef * exception) {
        LoggerD("entered");
@@ -1390,16 +1382,16 @@ JSValueRef JSTZDate::isDST(JSContextRef context, JSObjectRef function, JSObjectR
                return converter.toJSValueRef(tzDate->isDST());
        } Catch(NullPointerException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch(WrtDeviceApis::Commons::UnknownException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        } Catch (InvalidArgumentException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, "Invalid Values");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Invalid Values");
        } Catch (PlatformException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
-       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
 }
 
 JSValueRef JSTZDate::getPreviousDSTTransition(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef * exception) {
@@ -1423,16 +1415,16 @@ JSValueRef JSTZDate::getPreviousDSTTransition(JSContextRef context, JSObjectRef
                return createJSObject(context, resultDate);
        } Catch(NullPointerException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch(WrtDeviceApis::Commons::UnknownException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        } Catch (InvalidArgumentException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, "Invalid Values");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Invalid Values");
        } Catch (PlatformException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
-       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
 }
 
 JSValueRef JSTZDate::getNextDSTTransition(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef * exception) {
@@ -1456,16 +1448,16 @@ JSValueRef JSTZDate::getNextDSTTransition(JSContextRef context, JSObjectRef func
                return createJSObject(context, resultDate);
        } Catch(NullPointerException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch(WrtDeviceApis::Commons::UnknownException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        } Catch (InvalidArgumentException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, "Invalid Values");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Invalid Values");
        } Catch (PlatformException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
-       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
 }
 
 }              //DeviceAPI
index f425e1d..a35c3f4 100644 (file)
@@ -21,8 +21,7 @@
 #include <Commons/Exception.h>
 #include <CommonsJavaScript/Utils.h>
 #include <CommonsJavaScript/JSCallbackManager.h>
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 #include "JSTimeDuration.h"
 #include "TimeUtilConverter.h"
 #include <Logger.h>
@@ -157,16 +156,16 @@ bool JSTimeDuration::setProperty(JSContextRef context, JSObjectRef object,
                return true;
        } Catch (NullPointerException) {
                LoggerE("NullPointerException: " << _rethrown_exception.GetMessage());
-               *exception = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               *exception = JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (ConversionException) {
                LoggerE("ConversionException: " << _rethrown_exception.GetMessage());
-               *exception = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               *exception = JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (InvalidArgumentException) {
                LoggerE("InvalidArgumentException: " << _rethrown_exception.GetMessage());
-               *exception = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::INVALID_VALUES_ERROR, "Invalid Values");
+               *exception = JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Invalid Values");
        } Catch (WrtDeviceApis::Commons::Exception) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               *exception = JSTizenExceptionFactory::makeErrorObject(context, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+               *exception = JSWebAPIErrorFactory::makeErrorObject(context, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
        }
        return false;
 }
@@ -211,31 +210,20 @@ JSObjectRef JSTimeDuration::constructor(JSContextRef ctx, JSObjectRef constructo
                }
        } Catch(NullPointerException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(ctx, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
-               *exception = error;
-               return error;
-       } Catch(UnknownException) {
+               return JSWebAPIErrorFactory::postException(ctx, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
+       } Catch(WrtDeviceApis::Commons::UnknownException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(ctx, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
-               *exception = error;
-               return error;
+               return JSWebAPIErrorFactory::postException(ctx, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
        } Catch(ConversionException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(ctx, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
-               *exception = error;
-               return error;
+               return JSWebAPIErrorFactory::postException(ctx, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (InvalidArgumentException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(ctx, JSTizenException::INVALID_VALUES_ERROR, "Invalid Values");
-               *exception = error;
-               return error;
+               return JSWebAPIErrorFactory::postException(ctx, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Invalid Values");
        } Catch (WrtDeviceApis::Commons::Exception) {
            LoggerW("Trying to get incorrect value");
        }
-       JSObjectRef error = JSTizenExceptionFactory::makeErrorObject(ctx, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
-       *exception = error;
-       return error;
-
+       return JSWebAPIErrorFactory::postException(ctx, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
 }
 
 JSValueRef JSTimeDuration::diffTimeDuration(JSContextRef context, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef * exception, CompareType type) {
@@ -244,7 +232,7 @@ JSValueRef JSTimeDuration::diffTimeDuration(JSContextRef context, JSObjectRef th
        TimeDurationPrivObject* privateObject = static_cast<TimeDurationPrivObject*>(JSObjectGetPrivate(thisObject));
        if (!privateObject) {
                LoggerE("Private object is not set.");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        }
 
        TimeUtilConverter converter(context);
@@ -302,19 +290,19 @@ JSValueRef JSTimeDuration::difference(JSContextRef context, JSObjectRef function
                return diffTimeDuration(context, thisObject, argumentCount, arguments, exception, DIFFERENCE);
        } Catch(ConversionException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (InvalidArgumentException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, "Invalid Values");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Invalid Values");
        } Catch (UnsupportedException) {
                LoggerE("JSTimeUtil::hasInstance NotSupportedException");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR , "Not Support");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR , "Not Support");
        } Catch (PlatformException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        } Catch (WrtDeviceApis::Commons::Exception) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());             
        }
-       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
 }
 
 JSValueRef JSTimeDuration::equalsTo(JSContextRef context, JSObjectRef function, 
@@ -324,19 +312,19 @@ JSValueRef JSTimeDuration::equalsTo(JSContextRef context, JSObjectRef function,
                return diffTimeDuration(context, thisObject, argumentCount, arguments, exception, EQUALSTO);
        } Catch(ConversionException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (InvalidArgumentException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, "Invalid Values");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Invalid Values");
        } Catch (UnsupportedException) {
                LoggerE("JSTimeUtil::hasInstance NotSupportedException");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR , "Not Support");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR , "Not Support");
        } Catch (PlatformException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        } Catch (WrtDeviceApis::Commons::Exception) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());                     
        }
-       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
 }
 
 JSValueRef JSTimeDuration::lessThan(JSContextRef context, JSObjectRef function, 
@@ -346,19 +334,19 @@ JSValueRef JSTimeDuration::lessThan(JSContextRef context, JSObjectRef function,
                return diffTimeDuration(context, thisObject, argumentCount, arguments, exception, LESSTHAN);
        } Catch(ConversionException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (InvalidArgumentException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, "Invalid Values");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Invalid Values");
        } Catch (UnsupportedException) {
                LoggerE("JSTimeUtil::hasInstance NotSupportedException");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR , "Not Support");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR , "Not Support");
        } Catch (PlatformException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        } Catch (WrtDeviceApis::Commons::Exception) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());             
        }
-       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
 }
 
 JSValueRef JSTimeDuration::greaterThan(JSContextRef context, JSObjectRef function, 
@@ -368,19 +356,19 @@ JSValueRef JSTimeDuration::greaterThan(JSContextRef context, JSObjectRef functio
                return diffTimeDuration(context, thisObject, argumentCount, arguments, exception, GREATERTHAN);
        } Catch(ConversionException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (InvalidArgumentException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, "Invalid Values");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Invalid Values");
        } Catch (UnsupportedException) {
                LoggerE("JSTimeUtil::hasInstance NotSupportedException");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR , "Not Support");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR , "Not Support");
        } Catch (PlatformException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        } Catch (WrtDeviceApis::Commons::Exception) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
-       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
 }
 
 } //Time
index 9c8c581..2c8d50f 100644 (file)
 #include <Commons/Exception.h>
 #include <CommonsJavaScript/Utils.h>
 #include <CommonsJavaScript/JSCallbackManager.h>
-#include <JSTizenExceptionFactory.h>
-#include <JSTizenException.h>
+#include <JSWebAPIErrorFactory.h>
 #include <ArgumentValidator.h>
-#include <JSWebAPIException.h>
 
 #include "JSTimeUtil.h"
 #include "JSTZDate.h"
@@ -126,7 +124,7 @@ JSValueRef JSTimeUtil::getCurrentDateTime(JSContextRef context,
                TimeUtilPrivObject* privateObject = static_cast<TimeUtilPrivObject*>(JSObjectGetPrivate(thisObject));
                if (NULL == privateObject) {
                        LoggerE("private object is null");
-                       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+                       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
                }
        
                return JSTZDate::createJSObject(context);
@@ -134,12 +132,12 @@ JSValueRef JSTimeUtil::getCurrentDateTime(JSContextRef context,
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        } Catch(NullPointerException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (WrtDeviceApis::Commons::Exception) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
 
-       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
 }
 
 JSValueRef JSTimeUtil::getLocalTimezone(JSContextRef context,
@@ -166,14 +164,14 @@ JSValueRef JSTimeUtil::getLocalTimezone(JSContextRef context,
                return converter.toJSValueRef(localTimezone);
        } Catch(NullPointerException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (PlatformException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        } Catch (WrtDeviceApis::Commons::Exception) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
 
-       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
 }
 
 JSValueRef JSTimeUtil::getAvailableTimezones(JSContextRef context,
@@ -206,19 +204,19 @@ JSValueRef JSTimeUtil::getAvailableTimezones(JSContextRef context,
                return converter.toJSValueRef(timezonesArray);
        } Catch (InvalidArgumentException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, "Invalid Values");;
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Invalid Values");;
        } Catch (UnsupportedException) {
                LoggerE("JSTimeUtil::hasInstance NotSupportedException");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR , "Not Support");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR , "Not Support");
        } Catch (NullPointerException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (PlatformException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        } Catch (WrtDeviceApis::Commons::Exception) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
-       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");    
+       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");   
 }
 
 JSValueRef JSTimeUtil::getDateFormat(JSContextRef context,
@@ -247,25 +245,25 @@ JSValueRef JSTimeUtil::getDateFormat(JSContextRef context,
                
                return converter.toJSValueRef(dateformat);
        } catch(const BasePlatformException& err){
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
     } Catch(ConversionException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (InvalidArgumentException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, "Invalid Values");;
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Invalid Values");;
        } Catch (UnsupportedException) {
                LoggerE("JSTimeUtil::hasInstance NotSupportedException");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR , "Not Support");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR , "Not Support");
        } Catch (NullPointerException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (PlatformException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        } Catch (WrtDeviceApis::Commons::Exception) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        }
-       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");    
+       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");   
 }
 
 JSValueRef JSTimeUtil::getTimeFormat(JSContextRef context,
@@ -292,19 +290,19 @@ JSValueRef JSTimeUtil::getTimeFormat(JSContextRef context,
                return converter.toJSValueRef(timeFormat);
        } Catch (InvalidArgumentException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, "Invalid Values");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Invalid Values");
        } Catch (UnsupportedException) {
                LoggerE("JSTimeUtil::hasInstance NotSupportedException");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR , "Not Support");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR , "Not Support");
        } Catch (NullPointerException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (PlatformException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        } Catch (WrtDeviceApis::Commons::Exception) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());             
        }
-       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
 }
 
 JSValueRef JSTimeUtil::isLeapYear(JSContextRef context, JSObjectRef function, 
@@ -324,22 +322,22 @@ JSValueRef JSTimeUtil::isLeapYear(JSContextRef context, JSObjectRef function,
 
                return converter.toJSValueRef(true);    
     }catch(const BasePlatformException& err){
-        return JSWebAPIException::throwException(context, exception, err);
+        return JSWebAPIErrorFactory::postException(context, exception, err);
        } Catch(ConversionException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::TYPE_MISMATCH_ERROR, "Type Mismatch");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Type Mismatch");
        } Catch (InvalidArgumentException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::INVALID_VALUES_ERROR, "Invalid Values");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::INVALID_VALUES_ERROR, "Invalid Values");
        } Catch (UnsupportedException) {
                LoggerE("JSTimeUtil::hasInstance NotSupportedException");
-               return JSTizenExceptionFactory::postException(context, exception, JSTizenException::NOT_SUPPORTED_ERROR , "Not Support");
+               return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::NOT_SUPPORTED_ERROR , "Not Support");
        } Catch (PlatformException) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());
        } Catch (WrtDeviceApis::Commons::Exception) {
                LoggerE("Exception: " << _rethrown_exception.GetMessage());             
        }
-       return JSTizenExceptionFactory::postException(context, exception, JSTizenException::UNKNOWN_ERROR, "Unknown Error");
+       return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Unknown Error");
 }
 
 } //TimeUtil
index 85251bf..cf8b90f 100644 (file)
@@ -27,9 +27,9 @@
 #include <string>
 #include <dpl/shared_ptr.h>
 #include <CommonsJavaScript/ScopedJSStringRef.h>
-#include <JSWebAPIException.h>
 #include <JSUtil.h>
 #include <ArgumentValidator.h>
+#include <JSWebAPIErrorFactory.h>
 #include "AnyFactory.h"
 #include <Logger.h>
 
@@ -149,9 +149,7 @@ JSObjectRef JSAttributeFilter::constructor(JSContextRef context,
        }
        catch(BasePlatformException &e)
        {
-               JSObjectRef exceptionObj = JSWebAPIException::makeJSWebAPIException(context, e);
-               *exception = exceptionObj;
-               return exceptionObj;
+               return JSWebAPIErrorFactory::postException(context, exception, e);
        }
 
        try
@@ -181,9 +179,7 @@ JSObjectRef JSAttributeFilter::constructor(JSContextRef context,
        }
        catch(BasePlatformException &e)
        {
-               JSObjectRef exceptionObj = JSWebAPIException::makeJSWebAPIException(context, e);
-               *exception = exceptionObj;
-               return exceptionObj;
+               return JSWebAPIErrorFactory::postException(context, exception, e);
        }
 
        matchValue = AnyFactory::createAnyEmpty(context);
@@ -204,10 +200,8 @@ JSObjectRef JSAttributeFilter::constructor(JSContextRef context,
        Catch(Exception)
        {
                LoggerE("Argument type mismatch : " << _rethrown_exception.GetMessage());
-               JSObjectRef exceptionObj = JSWebAPIException::makeJSWebAPIException(
-                               context, TypeMismatchException("Error occurred while creating object"));
-               *exception = exceptionObj;
-               return exceptionObj;
+               return JSWebAPIErrorFactory::postException(context, exception,
+                               TypeMismatchException("Error occurred while creating object"));
        }
 
        return jsobject;
index dda8b0b..97eb7fb 100644 (file)
@@ -25,9 +25,9 @@
 #include "JSAttributeRangeFilter.h"
 #include <dpl/shared_ptr.h>
 #include <CommonsJavaScript/ScopedJSStringRef.h>
-#include <JSWebAPIException.h>
 #include <JSUtil.h>
 #include <ArgumentValidator.h>
+#include <JSWebAPIErrorFactory.h>
 #include "AnyFactory.h"
 #include <Logger.h>
 
@@ -150,9 +150,7 @@ JSObjectRef JSAttributeRangeFilter::constructor(JSContextRef context,
        }
        catch(BasePlatformException &e)
        {
-               JSObjectRef exceptionObj = JSWebAPIException::makeJSWebAPIException(context, e);
-               *exception = exceptionObj;
-               return exceptionObj;
+               return JSWebAPIErrorFactory::postException(context, exception, e);
        }
 
        initialValue = AnyFactory::createAnyEmpty(context);
@@ -180,10 +178,8 @@ JSObjectRef JSAttributeRangeFilter::constructor(JSContextRef context,
        Catch(Exception)
        {
                LoggerE("Argument type mismatch : " << _rethrown_exception.GetMessage());
-               JSObjectRef exceptionObj = JSWebAPIException::makeJSWebAPIException(
-                               context, TypeMismatchException("Error occurred while creating object"));
-               *exception = exceptionObj;
-               return exceptionObj;
+               return JSWebAPIErrorFactory::postException(context, exception,
+                               TypeMismatchException("Error occurred while creating object"));
        }
 
        return jsobject;
index e29d443..306dc8b 100644 (file)
@@ -26,9 +26,9 @@
 #include <string>
 #include <dpl/shared_ptr.h>
 #include <CommonsJavaScript/ScopedJSStringRef.h>
-#include <JSWebAPIException.h>
 #include <JSUtil.h>
 #include <ArgumentValidator.h>
+#include <JSWebAPIErrorFactory.h>
 #include <Logger.h>
 
 #define ATTRIBUTE_FILTER_CLASS_NAME "CompositeFilter"
@@ -149,9 +149,7 @@ JSObjectRef JSCompositeFilter::constructor(JSContextRef context,
        }
        catch(BasePlatformException &e)
        {
-               JSObjectRef exceptionObj = JSWebAPIException::makeJSWebAPIException(context, e);
-               *exception = exceptionObj;
-               return exceptionObj;
+               return JSWebAPIErrorFactory::postException(context, exception, e);
        }
 
        try
@@ -167,9 +165,7 @@ JSObjectRef JSCompositeFilter::constructor(JSContextRef context,
        }
        catch(BasePlatformException &e)
        {
-               JSObjectRef exceptionObj = JSWebAPIException::makeJSWebAPIException(context, e);
-               *exception = exceptionObj;
-               return exceptionObj;
+               return JSWebAPIErrorFactory::postException(context, exception, e);
        }
 
        CompositeFilterPtr compositeFilter(new CompositeFilter(type, FilterArrayPtr(new FilterArray())));
@@ -183,10 +179,8 @@ JSObjectRef JSCompositeFilter::constructor(JSContextRef context,
        Catch(Exception)
        {
                LoggerE("Argument type mismatch : " << _rethrown_exception.GetMessage());
-               JSObjectRef exceptionObj = JSWebAPIException::makeJSWebAPIException(
-                               context, TypeMismatchException("Error occurred while creating object"));
-               *exception = exceptionObj;
-               return exceptionObj;
+               return JSWebAPIErrorFactory::postException(context, exception,
+                               TypeMismatchException("Error occurred while creating object"));
        }
 
        return jsobject;
index 85b26c5..256deb3 100644 (file)
@@ -26,9 +26,9 @@
 
 #include <string>
 #include <dpl/shared_ptr.h>
-#include <JSWebAPIException.h>
 #include <JSUtil.h>
 #include <ArgumentValidator.h>
+#include <JSWebAPIErrorFactory.h>
 #include <Logger.h>
 
 #define ATTRIBUTE_FILTER_CLASS_NAME "SimpleCoordinates"
@@ -137,9 +137,7 @@ JSObjectRef JSSimpleCoordinates::constructor(JSContextRef context,
        }
        catch(BasePlatformException &e)
        {
-               JSObjectRef exceptionObj = JSWebAPIException::makeJSWebAPIException(context, e);
-               *exception = exceptionObj;
-               return exceptionObj;
+               return JSWebAPIErrorFactory::postException(context, exception, e);
        }
 
        SimpleCoordinatesPtr simpleCoordinates(new SimpleCoordinates(latitude, longitude));
@@ -153,10 +151,8 @@ JSObjectRef JSSimpleCoordinates::constructor(JSContextRef context,
        Catch(Exception)
        {
                LoggerE("Argument type mismatch : " << _rethrown_exception.GetMessage());
-               JSObjectRef exceptionObj = JSWebAPIException::makeJSWebAPIException(
-                               context, TypeMismatchException("Error occurred while creating object"));
-               *exception = exceptionObj;
-               return exceptionObj;
+               return JSWebAPIErrorFactory::postException(context, exception,
+                               TypeMismatchException("Error occurred while creating object"));
        }
 
        return jsobject;
index 9bb9377..3f3cfc8 100644 (file)
@@ -25,9 +25,9 @@
 #include "JSSortMode.h"
 #include <string>
 #include <dpl/shared_ptr.h>
-#include <JSWebAPIException.h>
 #include <JSUtil.h>
 #include <ArgumentValidator.h>
+#include <JSWebAPIErrorFactory.h>
 #include <Logger.h>
 
 #define ATTRIBUTE_FILTER_CLASS_NAME "SortMode"
@@ -135,9 +135,7 @@ JSObjectRef JSSortMode::constructor(JSContextRef context,
        }
        catch(BasePlatformException &e)
        {
-               JSObjectRef exceptionObj = JSWebAPIException::makeJSWebAPIException(context, e);
-               *exception = exceptionObj;
-               return exceptionObj;
+               return JSWebAPIErrorFactory::postException(context, exception, e);
        }
 
        try
@@ -159,9 +157,7 @@ JSObjectRef JSSortMode::constructor(JSContextRef context,
        }
        catch(BasePlatformException &e)
        {
-               JSObjectRef exceptionObj = JSWebAPIException::makeJSWebAPIException(context, e);
-               *exception = exceptionObj;
-               return exceptionObj;
+               return JSWebAPIErrorFactory::postException(context, exception, e);
        }
 
        SortModePtr sortMode(new SortMode(attributeName, sortOrder));
@@ -175,10 +171,8 @@ JSObjectRef JSSortMode::constructor(JSContextRef context,
        Catch(Exception)
        {
                LoggerE("Argument type mismatch : " << _rethrown_exception.GetMessage());
-               JSObjectRef exceptionObj = JSWebAPIException::makeJSWebAPIException(
-                               context, TypeMismatchException("Error occurred while creating object"));
-               *exception = exceptionObj;
-               return exceptionObj;
+               return JSWebAPIErrorFactory::postException(context, exception,
+                               TypeMismatchException("Error occurred while creating object"));
        }
 
        return jsobject;
index 166986c..533f828 100644 (file)
@@ -246,6 +246,7 @@ bool JSTizen::setProperty(JSContextRef context, JSObjectRef object,
     //return false.
     return false;
 }
+
 } // Tizen
 } // DeviceAPI