From 6545d2c8bab3e35b5b9e097feb36ef226de93415 Mon Sep 17 00:00:00 2001 From: Michal Michalski Date: Wed, 30 Oct 2019 12:28:49 +0100 Subject: [PATCH] [common] Simplify instance methods registration (4) + Macros REGISTER_(A)SYNC have been replaced with new macro REGISTER_METHOD, which takes only the method name. The string parameter is now created from the method name. [Verification] + tct-notification-tizen-tests 100% pass (mobile) + tct-package-tizen-tests 100% pass (mobile) + tct-playerutil-tizen-tests 100% pass (mobile) + tct-power-tizen-tests 100% pass (mobile) + tct-privacyprivilege-tizen-tests 100% pass (mobile) + tct-preference-tizen-tests 100% pass (mobile) + tct-push-tizen-tests 100% pass (mobile) + tct-fmradio-tizen-tests 100% pass (mobile) + tct-secureelement-tizen-tests 100% pass (mobile) Signed-off-by: Michal Michalski Change-Id: Ie3e5b6f88c283dce6a6703980a1e8d597b3e4d41 --- src/notification/notification_api.js | 24 ++++----- src/notification/notification_instance.cc | 32 +++++------ src/notification/notification_instance.h | 4 +- src/package/package_api.js | 16 +++--- src/package/package_instance.cc | 32 +++++------ src/package/package_instance.h | 8 +-- src/playerutil/playerutil_api.js | 4 +- src/playerutil/playerutil_instance.cc | 14 ++--- src/playerutil/playerutil_instance.h | 4 +- src/power/power_api.js | 20 +++---- src/power/power_instance.cc | 45 ++++++++-------- src/power/power_instance.h | 20 +++---- src/ppm/ppm_api.js | 8 +-- src/ppm/ppm_instance.cc | 22 ++++---- src/ppm/ppm_instance.h | 8 +-- src/preference/preference_api.js | 16 +++--- src/preference/preference_instance.cc | 43 ++++++++------- src/preference/preference_instance.h | 16 +++--- src/push/push_api.js | 22 ++++---- src/push/push_instance.cc | 59 +++++++++------------ src/push/push_instance.h | 22 ++++---- src/radio/radio_api.js | 32 +++++------ src/radio/radio_instance.cc | 72 ++++++++++++------------- src/radio/radio_instance.h | 28 +++++----- src/secureelement/secureelement_api.js | 34 ++++++------ src/secureelement/secureelement_instance.cc | 82 ++++++++++++++--------------- src/secureelement/secureelement_instance.h | 34 ++++++------ 27 files changed, 358 insertions(+), 363 deletions(-) diff --git a/src/notification/notification_api.js b/src/notification/notification_api.js index 6679ab3..1ca6622 100644 --- a/src/notification/notification_api.js +++ b/src/notification/notification_api.js @@ -106,7 +106,7 @@ NotificationManager.prototype.post = function(notification) { notification: args.notification }; - var result = native_.callSync('NotificationManager_post', data); + var result = native_.callSync('NotificationManagerPost', data); if (native_.isFailure(result)) { throw native_.getErrorObject(result); @@ -145,7 +145,7 @@ NotificationManager.prototype.update = function(notification) { notification: args.notification }; - var result = native_.callSync('NotificationManager_update', data); + var result = native_.callSync('NotificationManagerUpdate', data); if (native_.isFailure(result)) { throw native_.getErrorObject(result); @@ -163,7 +163,7 @@ NotificationManager.prototype.remove = function(id) { id: args.id }; - var result = native_.callSync('NotificationManager_remove', data); + var result = native_.callSync('NotificationManagerRemove', data); if (native_.isFailure(result)) { throw native_.getErrorObject(result); @@ -171,7 +171,7 @@ NotificationManager.prototype.remove = function(id) { }; NotificationManager.prototype.removeAll = function() { - var result = native_.callSync('NotificationManager_removeAll', {}); + var result = native_.callSync('NotificationManagerRemoveAll', {}); if (native_.isFailure(result)) { throw native_.getErrorObject(result); @@ -194,7 +194,7 @@ NotificationManager.prototype.get = function(id) { id: args.id }; - var result = native_.callSync('NotificationManager_get', data); + var result = native_.callSync('NotificationManagerGet', data); if (native_.isFailure(result)) { throw native_.getErrorObject(result); @@ -222,7 +222,7 @@ NotificationManager.prototype.getNotification = function(id) { id: args.id }; - var result = native_.callSync('NotificationManager_get', data); + var result = native_.callSync('NotificationManagerGet', data); if (native_.isFailure(result)) { throw native_.getErrorObject(result); @@ -243,7 +243,7 @@ NotificationManager.prototype.getAll = function() { 'Use getAllNotifications() instead.' ); - var result = native_.callSync('NotificationManager_getAll', {}); + var result = native_.callSync('NotificationManagerGetAll', {}); if (native_.isFailure(result)) { throw native_.getErrorObject(result); @@ -262,7 +262,7 @@ NotificationManager.prototype.getAll = function() { }; NotificationManager.prototype.getAllNotifications = function() { - var result = native_.callSync('NotificationManager_getAll', { + var result = native_.callSync('NotificationManagerGetAll', { //add marker for UserNotification implementation newImpl: true }); @@ -314,7 +314,7 @@ NotificationManager.prototype.playLEDCustomEffect = function( } args.color = convertColorToInt(args.color); - var result = native_.callSync('NotificationManager_playLEDCustomEffect', args); + var result = native_.callSync('NotificationManagerPlayLEDCustomEffect', args); if (native_.isFailure(result)) { throw native_.getErrorObject(result); } @@ -324,7 +324,7 @@ NotificationManager.prototype.playLEDCustomEffect = function( * Stops the custom effect of the service LED that is located to the front of a device. */ NotificationManager.prototype.stopLEDCustomEffect = function() { - var result = native_.callSync('NotificationManager_stopLEDCustomEffect'); + var result = native_.callSync('NotificationManagerStopLEDCustomEffect'); if (native_.isFailure(result)) { throw native_.getErrorObject(result); } @@ -339,7 +339,7 @@ NotificationManager.prototype.saveNotificationAsTemplate = function(name, notifi //add marker for UserNotification implementation args.newImpl = args.notification instanceof tizen.UserNotification; - var result = native_.callSync('NotificationManager_saveNotificationAsTemplate', args); + var result = native_.callSync('NotificationManagerSaveNotificationAsTemplate', args); if (native_.isFailure(result)) { throw native_.getErrorObject(result); @@ -356,7 +356,7 @@ NotificationManager.prototype.createNotificationFromTemplate = function(name) { } var result = native_.callSync( - 'NotificationManager_createNotificationFromTemplate', + 'NotificationManagerCreateNotificationFromTemplate', args ); diff --git a/src/notification/notification_instance.cc b/src/notification/notification_instance.cc index 32471a1..c57755d 100644 --- a/src/notification/notification_instance.cc +++ b/src/notification/notification_instance.cc @@ -38,20 +38,20 @@ NotificationInstance::NotificationInstance() { ScopeLogger(); using std::placeholders::_1; using std::placeholders::_2; -#define REGISTER_SYNC(c, x) \ - RegisterSyncHandler(c, std::bind(&NotificationInstance::x, this, _1, _2)); - REGISTER_SYNC("NotificationManager_get", NotificationManagerGet); - REGISTER_SYNC("NotificationManager_update", NotificationManagerUpdate); - REGISTER_SYNC("NotificationManager_remove", NotificationManagerRemove); - REGISTER_SYNC("NotificationManager_getAll", NotificationManagerGetAll); - REGISTER_SYNC("NotificationManager_post", NotificationManagerPost); - REGISTER_SYNC("NotificationManager_removeAll", NotificationManagerRemoveAll); - REGISTER_SYNC("NotificationManager_playLEDCustomEffect", NotificationManagerPlayLEDCustomEffect); - REGISTER_SYNC("NotificationManager_stopLEDCustomEffect", NotificationManagerStopLEDCustomEffect); - REGISTER_SYNC("NotificationManager_saveNotificationAsTemplate", NotificationManagerSaveTemplate); - REGISTER_SYNC("NotificationManager_createNotificationFromTemplate", - NotificationManagerCreateFromTemplate); -#undef REGISTER_SYNC + +#define REGISTER_METHOD(M) \ + RegisterSyncHandler(#M, std::bind(&NotificationInstance::M, this, _1, _2)) + REGISTER_METHOD(NotificationManagerGet); + REGISTER_METHOD(NotificationManagerUpdate); + REGISTER_METHOD(NotificationManagerRemove); + REGISTER_METHOD(NotificationManagerGetAll); + REGISTER_METHOD(NotificationManagerPost); + REGISTER_METHOD(NotificationManagerRemoveAll); + REGISTER_METHOD(NotificationManagerPlayLEDCustomEffect); + REGISTER_METHOD(NotificationManagerStopLEDCustomEffect); + REGISTER_METHOD(NotificationManagerSaveNotificationAsTemplate); + REGISTER_METHOD(NotificationManagerCreateNotificationFromTemplate); +#undef REGISTER_METHOD manager_ = NotificationManager::GetInstance(); } @@ -214,7 +214,7 @@ void NotificationInstance::NotificationManagerStopLEDCustomEffect(const picojson } } -void NotificationInstance::NotificationManagerSaveTemplate(const picojson::value& args, +void NotificationInstance::NotificationManagerSaveNotificationAsTemplate(const picojson::value& args, picojson::object& out) { ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeNotification, &out); @@ -228,7 +228,7 @@ void NotificationInstance::NotificationManagerSaveTemplate(const picojson::value } } -void NotificationInstance::NotificationManagerCreateFromTemplate(const picojson::value& args, +void NotificationInstance::NotificationManagerCreateNotificationFromTemplate(const picojson::value& args, picojson::object& out) { ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeNotification, &out); diff --git a/src/notification/notification_instance.h b/src/notification/notification_instance.h index fa0715f..9374ae2 100644 --- a/src/notification/notification_instance.h +++ b/src/notification/notification_instance.h @@ -40,8 +40,8 @@ class NotificationInstance : public common::ParsedInstance { void NotificationManagerPlayLEDCustomEffect(const picojson::value& args, picojson::object& out); void NotificationManagerStopLEDCustomEffect(const picojson::value& args, picojson::object& out); - void NotificationManagerSaveTemplate(const picojson::value& args, picojson::object& out); - void NotificationManagerCreateFromTemplate(const picojson::value& args, picojson::object& out); + void NotificationManagerSaveNotificationAsTemplate(const picojson::value& args, picojson::object& out); + void NotificationManagerCreateNotificationFromTemplate(const picojson::value& args, picojson::object& out); }; } // namespace notification diff --git a/src/package/package_api.js b/src/package/package_api.js index fb89be0..20a9b86 100644 --- a/src/package/package_api.js +++ b/src/package/package_api.js @@ -101,7 +101,7 @@ function PackageInformation(obj) { set: function() {}, get: function() { if (undefined === totalSize) { - var result = native_.callSync('PackageManager_getTotalSize', { + var result = native_.callSync('PackageManagerGetTotalSize', { id: this.id }); if (native_.isSuccess(result)) { @@ -119,7 +119,7 @@ function PackageInformation(obj) { set: function() {}, get: function() { if (undefined === dataSize) { - var result = native_.callSync('PackageManager_getDataSize', { + var result = native_.callSync('PackageManagerGetDataSize', { id: this.id }); if (native_.isSuccess(result)) { @@ -161,7 +161,7 @@ var PackageManagerInstall = function() { progressCallbackId: progressCallbackId }; - var result = native_.call('PackageManager_install', nativeParam, function(result) { + var result = native_.call('PackageManagerInstall', nativeParam, function(result) { if (native_.isFailure(result)) { native_.callIfPossible(args.errorCallback, native_.getErrorObject(result)); delete callbacks[result['progressCallbackId']]; @@ -204,7 +204,7 @@ var PackageManagerUninstall = function() { var nativeParam = { id: args.id, progressCallbackId: progressCallbackId }; - var result = native_.call('PackageManager_uninstall', nativeParam, function(result) { + var result = native_.call('PackageManagerUninstall', nativeParam, function(result) { if (native_.isFailure(result)) { native_.callIfPossible(args.errorCallback, native_.getErrorObject(result)); delete callbacks[result['progressCallbackId']]; @@ -237,7 +237,7 @@ PackageManager.prototype.getPackagesInfo = function(successCallback, errorCallba } ]); - var result = native_.call('PackageManager_getPackagesInfo', {}, function(result) { + var result = native_.call('PackageManagerGetPackagesInfo', {}, function(result) { if (native_.isSuccess(result)) { for (var i = 0; i < result.informationArray.length; i++) { result.informationArray[i] = new PackageInformation( @@ -266,7 +266,7 @@ PackageManager.prototype.getPackageInfo = function() { nativeParam['id'] = args.id; } - var result = native_.callSync('PackageManager_getPackageInfo', nativeParam); + var result = native_.callSync('PackageManagerGetPackageInfo', nativeParam); if (native_.isSuccess(result)) { return new PackageInformation(native_.getResultObject(result)); } else { @@ -283,7 +283,7 @@ PackageManager.prototype.setPackageInfoEventListener = function(eventCallback) { } ]); - var result = native_.callSync('PackageManager_setPackageInfoEventListener', {}); + var result = native_.callSync('PackageManagerSetPackageInfoEventListener', {}); if (native_.isFailure(result)) { throw native_.getErrorObject(result); @@ -299,7 +299,7 @@ PackageManager.prototype.unsetPackageInfoEventListener = function() { var nativeParam = {}; var result = native_.callSync( - 'PackageManager_unsetPackageInfoEventListener', + 'PackageManagerUnsetPackageInfoEventListener', nativeParam ); diff --git a/src/package/package_instance.cc b/src/package/package_instance.cc index a1ca888..3c09122 100644 --- a/src/package/package_instance.cc +++ b/src/package/package_instance.cc @@ -244,18 +244,18 @@ PackageInstance::PackageInstance() { using std::placeholders::_1; using std::placeholders::_2; -#define REGISTER_SYNC(c, x) RegisterSyncHandler(c, std::bind(&PackageInstance::x, this, _1, _2)); - REGISTER_SYNC("PackageManager_setPackageInfoEventListener", - PackageManagerSetpackageinfoeventlistener); - REGISTER_SYNC("PackageManager_install", PackageManagerInstall); - REGISTER_SYNC("PackageManager_getPackagesInfo", PackageManagerGetpackagesinfo); - REGISTER_SYNC("PackageManager_uninstall", PackageManagerUninstall); - REGISTER_SYNC("PackageManager_unsetPackageInfoEventListener", - PackageManagerUnsetpackageinfoeventlistener); - REGISTER_SYNC("PackageManager_getPackageInfo", PackageManagerGetpackageinfo); - REGISTER_SYNC("PackageManager_getTotalSize", PackageManagerGetTotalSize); - REGISTER_SYNC("PackageManager_getDataSize", PackageManagerGetDataSize); -#undef REGISTER_SYNC + +#define REGISTER_METHOD(M) \ + RegisterSyncHandler(#M, std::bind(&PackageInstance::M, this, _1, _2)) + REGISTER_METHOD(PackageManagerSetPackageInfoEventListener); + REGISTER_METHOD(PackageManagerInstall); + REGISTER_METHOD(PackageManagerGetPackagesInfo); + REGISTER_METHOD(PackageManagerUninstall); + REGISTER_METHOD(PackageManagerUnsetPackageInfoEventListener); + REGISTER_METHOD(PackageManagerGetPackageInfo); + REGISTER_METHOD(PackageManagerGetTotalSize); + REGISTER_METHOD(PackageManagerGetDataSize); +#undef REGISTER_METHOD } PackageInstance::~PackageInstance() { @@ -394,7 +394,7 @@ void PackageInstance::PackageManagerUninstall(const picojson::value& args, picoj ReportSuccess(out); } -void PackageInstance::PackageManagerGetpackagesinfo(const picojson::value& args, +void PackageInstance::PackageManagerGetPackagesInfo(const picojson::value& args, picojson::object& out) { ScopeLogger(); @@ -408,7 +408,7 @@ void PackageInstance::PackageManagerGetpackagesinfo(const picojson::value& args, TaskQueue::GetInstance().Queue(PackageThreadWork, PackageAfterWork, userData); ReportSuccess(out); } -void PackageInstance::PackageManagerGetpackageinfo(const picojson::value& args, +void PackageInstance::PackageManagerGetPackageInfo(const picojson::value& args, picojson::object& out) { ScopeLogger(); @@ -454,7 +454,7 @@ void PackageInstance::InvokeListener(picojson::object& param) { Instance::PostMessage(this, result.serialize().c_str()); } -void PackageInstance::PackageManagerSetpackageinfoeventlistener(const picojson::value& args, +void PackageInstance::PackageManagerSetPackageInfoEventListener(const picojson::value& args, picojson::object& out) { ScopeLogger(); @@ -485,7 +485,7 @@ void PackageInstance::PackageManagerSetpackageinfoeventlistener(const picojson:: ReportSuccess(out); } -void PackageInstance::PackageManagerUnsetpackageinfoeventlistener(const picojson::value& args, +void PackageInstance::PackageManagerUnsetPackageInfoEventListener(const picojson::value& args, picojson::object& out) { ScopeLogger(); diff --git a/src/package/package_instance.h b/src/package/package_instance.h index 772d4cb..5654aab 100644 --- a/src/package/package_instance.h +++ b/src/package/package_instance.h @@ -48,13 +48,13 @@ class PackageInstance : public common::ParsedInstance { void PackageManagerInstall(const picojson::value& args, picojson::object& out); void PackageManagerUninstall(const picojson::value& args, picojson::object& out); - void PackageManagerGetpackagesinfo(const picojson::value& args, picojson::object& out); - void PackageManagerGetpackageinfo(const picojson::value& args, picojson::object& out); + void PackageManagerGetPackagesInfo(const picojson::value& args, picojson::object& out); + void PackageManagerGetPackageInfo(const picojson::value& args, picojson::object& out); void PackageManagerGetTotalSize(const picojson::value& args, picojson::object& out); void PackageManagerGetDataSize(const picojson::value& args, picojson::object& out); - void PackageManagerSetpackageinfoeventlistener(const picojson::value& args, + void PackageManagerSetPackageInfoEventListener(const picojson::value& args, picojson::object& out); - void PackageManagerUnsetpackageinfoeventlistener(const picojson::value& args, + void PackageManagerUnsetPackageInfoEventListener(const picojson::value& args, picojson::object& out); }; diff --git a/src/playerutil/playerutil_api.js b/src/playerutil/playerutil_api.js index c787457..bb59776 100644 --- a/src/playerutil/playerutil_api.js +++ b/src/playerutil/playerutil_api.js @@ -28,7 +28,7 @@ var LatencyMode = { function PlayerUtil() {} PlayerUtil.prototype.getLatencyMode = function() { - var result = native.callSync('PlayerUtil_getLatencyMode', {}); + var result = native.callSync('PlayerUtilGetLatencyMode', {}); if (native.isSuccess(result)) { return native.getResultObject(result); @@ -49,7 +49,7 @@ PlayerUtil.prototype.setLatencyMode = function() { var callArgs = {}; callArgs.latencyMode = args.latencyMode; - var result = native.callSync('PlayerUtil_setLatencyMode', callArgs); + var result = native.callSync('PlayerUtilSetLatencyMode', callArgs); if (native.isFailure(result)) { throw native.getErrorObject(result); diff --git a/src/playerutil/playerutil_instance.cc b/src/playerutil/playerutil_instance.cc index 65ffe8d..d66f1dc 100644 --- a/src/playerutil/playerutil_instance.cc +++ b/src/playerutil/playerutil_instance.cc @@ -34,18 +34,20 @@ PlayerUtilInstance::PlayerUtilInstance() { using std::placeholders::_1; using std::placeholders::_2; -#define REGISTER_SYNC(c, x) RegisterSyncHandler(c, std::bind(&PlayerUtilInstance::x, this, _1)) - REGISTER_SYNC("PlayerUtil_getLatencyMode", GetLatencyMode); - REGISTER_SYNC("PlayerUtil_setLatencyMode", SetLatencyMode); -#undef REGISTER_SYNC + +#define REGISTER_METHOD(M) \ + RegisterSyncHandler(#M, std::bind(&PlayerUtilInstance::M, this, _1)) + REGISTER_METHOD(PlayerUtilGetLatencyMode); + REGISTER_METHOD(PlayerUtilSetLatencyMode); +#undef REGISTER_METHOD } PlayerUtilInstance::~PlayerUtilInstance() { ScopeLogger(); } -common::TizenResult PlayerUtilInstance::GetLatencyMode(const picojson::object& args) { +common::TizenResult PlayerUtilInstance::PlayerUtilGetLatencyMode(const picojson::object& args) { ScopeLogger(); Ewk_Context* context = ewk_context_default_get(); @@ -59,7 +61,7 @@ common::TizenResult PlayerUtilInstance::GetLatencyMode(const picojson::object& a return common::TizenSuccess{picojson::value{PlayerUtilUtils::FromLatencyMode(latency_mode)}}; } -common::TizenResult PlayerUtilInstance::SetLatencyMode(const picojson::object& args) { +common::TizenResult PlayerUtilInstance::PlayerUtilSetLatencyMode(const picojson::object& args) { ScopeLogger(); CHECK_EXIST(args, kLatencyMode); diff --git a/src/playerutil/playerutil_instance.h b/src/playerutil/playerutil_instance.h index a8eba46..2fd69a0 100644 --- a/src/playerutil/playerutil_instance.h +++ b/src/playerutil/playerutil_instance.h @@ -28,8 +28,8 @@ class PlayerUtilInstance : public common::TizenInstance { virtual ~PlayerUtilInstance(); private: - common::TizenResult GetLatencyMode(const picojson::object& args); - common::TizenResult SetLatencyMode(const picojson::object& args); + common::TizenResult PlayerUtilGetLatencyMode(const picojson::object& args); + common::TizenResult PlayerUtilSetLatencyMode(const picojson::object& args); }; } // namespace playerutil diff --git a/src/power/power_api.js b/src/power/power_api.js index 7a93b53..baa1333 100755 --- a/src/power/power_api.js +++ b/src/power/power_api.js @@ -124,7 +124,7 @@ PowerManager.prototype.request = function() { state: args.state }; - var ret = native_.callSync('PowerManager_request', nativeParam); + var ret = native_.callSync('PowerManagerRequest', nativeParam); if (native_.isFailure(ret)) { throw native_.getErrorObject(ret); } @@ -148,7 +148,7 @@ PowerManager.prototype.release = function() { resource: args.resource }; - var ret = native_.callSync('PowerManager_release', nativeParam); + var ret = native_.callSync('PowerManagerRelease', nativeParam); if (native_.isFailure(ret)) { throw native_.getErrorObject(ret); } @@ -164,7 +164,7 @@ PowerManager.prototype.setScreenStateChangeListener = function() { ]); if (!screenStateChangeListener.isListenerSet()) { - var ret = native_.callSync('PowerManager_setScreenStateChangeListener', {}); + var ret = native_.callSync('PowerManagerSetScreenStateChangeListener', {}); if (native_.isFailure(ret)) { throw native_.getErrorObject(ret); } @@ -177,7 +177,7 @@ PowerManager.prototype.setScreenStateChangeListener = function() { */ PowerManager.prototype.unsetScreenStateChangeListener = function() { if (screenStateChangeListener.isListenerSet()) { - var ret = native_.callSync('PowerManager_unsetScreenStateChangeListener', {}); + var ret = native_.callSync('PowerManagerUnsetScreenStateChangeListener', {}); if (native_.isFailure(ret)) { throw native_.getErrorObject(ret); } @@ -190,7 +190,7 @@ PowerManager.prototype.unsetScreenStateChangeListener = function() { * @return {number} Current screen brightness value. */ PowerManager.prototype.getScreenBrightness = function() { - var ret = native_.callSync('PowerManager_getScreenBrightness', {}); + var ret = native_.callSync('PowerManagerGetScreenBrightness', {}); if (native_.isFailure(ret)) { throw native_.getErrorObject(ret); } else { @@ -211,7 +211,7 @@ PowerManager.prototype.setScreenBrightness = function() { throw new WebAPIException(WebAPIException.INVALID_VALUES_ERR); } - var ret = native_.callSync('PowerManager_setScreenBrightness', { + var ret = native_.callSync('PowerManagerSetScreenBrightness', { brightness: args.brightness }); if (native_.isFailure(ret)) { @@ -224,7 +224,7 @@ PowerManager.prototype.setScreenBrightness = function() { * @return {boolean} true if screen is on. */ PowerManager.prototype.isScreenOn = function() { - var ret = native_.callSync('PowerManager_isScreenOn', {}); + var ret = native_.callSync('PowerManagerIsScreenOn', {}); if (native_.isFailure(ret)) { throw native_.getErrorObject(ret); } else { @@ -236,7 +236,7 @@ PowerManager.prototype.isScreenOn = function() { * Restores the screen brightness to the system default setting value. */ PowerManager.prototype.restoreScreenBrightness = function() { - var ret = native_.callSync('PowerManager_restoreScreenBrightness', {}); + var ret = native_.callSync('PowerManagerRestoreScreenBrightness', {}); if (native_.isFailure(ret)) { throw native_.getErrorObject(ret); } @@ -251,7 +251,7 @@ PowerManager.prototype.turnScreenOn = function() { 'next release. Use request() instead.' ); - var ret = native_.callSync('PowerManager_turnScreenOn', {}); + var ret = native_.callSync('PowerManagerTurnScreenOn', {}); if (native_.isFailure(ret)) { throw native_.getErrorObject(ret); } @@ -266,7 +266,7 @@ PowerManager.prototype.turnScreenOff = function() { 'next release. Use release() instead.' ); - var ret = native_.callSync('PowerManager_turnScreenOff', {}); + var ret = native_.callSync('PowerManagerTurnScreenOff', {}); if (native_.isFailure(ret)) { throw native_.getErrorObject(ret); } diff --git a/src/power/power_instance.cc b/src/power/power_instance.cc index b4e6c8b..c4988b3 100644 --- a/src/power/power_instance.cc +++ b/src/power/power_instance.cc @@ -54,18 +54,19 @@ PowerInstance::PowerInstance() : manager_(*this) { using std::placeholders::_1; using std::placeholders::_2; -#define REGISTER_SYNC(c, x) RegisterSyncHandler(c, std::bind(&PowerInstance::x, this, _1, _2)); - REGISTER_SYNC("PowerManager_request", Request); - REGISTER_SYNC("PowerManager_release", Release); - REGISTER_SYNC("PowerManager_setScreenStateChangeListener", SetScreenStateChangeListener); - REGISTER_SYNC("PowerManager_unsetScreenStateChangeListener", UnsetScreenStateChangeListener); - REGISTER_SYNC("PowerManager_getScreenBrightness", GetScreenBrightness); - REGISTER_SYNC("PowerManager_setScreenBrightness", SetScreenBrightness); - REGISTER_SYNC("PowerManager_isScreenOn", IsScreenOn); - REGISTER_SYNC("PowerManager_restoreScreenBrightness", RestoreScreenBrightness); - REGISTER_SYNC("PowerManager_turnScreenOn", TurnScreenOn); - REGISTER_SYNC("PowerManager_turnScreenOff", TurnScreenOff); -#undef REGISTER_SYNC +#define REGISTER_METHOD(M) \ + RegisterSyncHandler(#M, std::bind(&PowerInstance::M, this, _1, _2)) + REGISTER_METHOD(PowerManagerRequest); + REGISTER_METHOD(PowerManagerRelease); + REGISTER_METHOD(PowerManagerSetScreenStateChangeListener); + REGISTER_METHOD(PowerManagerUnsetScreenStateChangeListener); + REGISTER_METHOD(PowerManagerGetScreenBrightness); + REGISTER_METHOD(PowerManagerSetScreenBrightness); + REGISTER_METHOD(PowerManagerIsScreenOn); + REGISTER_METHOD(PowerManagerRestoreScreenBrightness); + REGISTER_METHOD(PowerManagerTurnScreenOn); + REGISTER_METHOD(PowerManagerTurnScreenOff); +#undef REGISTER_METHOD } PowerInstance::~PowerInstance() { @@ -78,7 +79,7 @@ PowerInstance::~PowerInstance() { return; \ } -void PowerInstance::Request(const picojson::value& args, picojson::object& out) { +void PowerInstance::PowerManagerRequest(const picojson::value& args, picojson::object& out) { ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegePower, &out); @@ -94,7 +95,7 @@ void PowerInstance::Request(const picojson::value& args, picojson::object& out) } } -void PowerInstance::Release(const picojson::value& args, picojson::object& out) { +void PowerInstance::PowerManagerRelease(const picojson::value& args, picojson::object& out) { ScopeLogger(); const std::string& resource = args.get("resource").get(); PlatformResult result = manager_.Release(kPowerResourceMap.at(resource)); @@ -105,7 +106,7 @@ void PowerInstance::Release(const picojson::value& args, picojson::object& out) } } -void PowerInstance::SetScreenStateChangeListener(const picojson::value& args, +void PowerInstance::PowerManagerSetScreenStateChangeListener(const picojson::value& args, picojson::object& out) { ScopeLogger(); PlatformResult result = manager_.SetScreenStateChangeListener(); @@ -116,7 +117,7 @@ void PowerInstance::SetScreenStateChangeListener(const picojson::value& args, } } -void PowerInstance::UnsetScreenStateChangeListener(const picojson::value& args, +void PowerInstance::PowerManagerUnsetScreenStateChangeListener(const picojson::value& args, picojson::object& out) { ScopeLogger(); PlatformResult result = manager_.UnsetScreenStateChangeListener(); @@ -127,7 +128,7 @@ void PowerInstance::UnsetScreenStateChangeListener(const picojson::value& args, } } -void PowerInstance::GetScreenBrightness(const picojson::value& args, picojson::object& out) { +void PowerInstance::PowerManagerGetScreenBrightness(const picojson::value& args, picojson::object& out) { ScopeLogger(); double brightness; PlatformResult result = manager_.GetScreenBrightness(&brightness); @@ -138,7 +139,7 @@ void PowerInstance::GetScreenBrightness(const picojson::value& args, picojson::o } } -void PowerInstance::SetScreenBrightness(const picojson::value& args, picojson::object& out) { +void PowerInstance::PowerManagerSetScreenBrightness(const picojson::value& args, picojson::object& out) { ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegePower, &out); @@ -153,7 +154,7 @@ void PowerInstance::SetScreenBrightness(const picojson::value& args, picojson::o } } -void PowerInstance::IsScreenOn(const picojson::value& args, picojson::object& out) { +void PowerInstance::PowerManagerIsScreenOn(const picojson::value& args, picojson::object& out) { ScopeLogger(); bool state = false; PlatformResult result = manager_.IsScreenOn(&state); @@ -164,7 +165,7 @@ void PowerInstance::IsScreenOn(const picojson::value& args, picojson::object& ou } } -void PowerInstance::RestoreScreenBrightness(const picojson::value& args, picojson::object& out) { +void PowerInstance::PowerManagerRestoreScreenBrightness(const picojson::value& args, picojson::object& out) { ScopeLogger(); PlatformResult result = manager_.RestoreScreenBrightness(); if (result.IsError()) { @@ -174,7 +175,7 @@ void PowerInstance::RestoreScreenBrightness(const picojson::value& args, picojso } } -void PowerInstance::TurnScreenOn(const picojson::value& args, picojson::object& out) { +void PowerInstance::PowerManagerTurnScreenOn(const picojson::value& args, picojson::object& out) { ScopeLogger(); LoggerW( "DEPRECATION WARNING: turnScreenOn() is deprecated and will be removed from next release. " @@ -190,7 +191,7 @@ void PowerInstance::TurnScreenOn(const picojson::value& args, picojson::object& } } -void PowerInstance::TurnScreenOff(const picojson::value& args, picojson::object& out) { +void PowerInstance::PowerManagerTurnScreenOff(const picojson::value& args, picojson::object& out) { ScopeLogger(); LoggerW( "DEPRECATION WARNING: turnScreenOff() is deprecated and will be removed from next release. " diff --git a/src/power/power_instance.h b/src/power/power_instance.h index fb57d49..db07da4 100644 --- a/src/power/power_instance.h +++ b/src/power/power_instance.h @@ -30,16 +30,16 @@ class PowerInstance : public common::ParsedInstance { virtual ~PowerInstance(); private: - void Request(const picojson::value& args, picojson::object& out); - void Release(const picojson::value& args, picojson::object& out); - void SetScreenStateChangeListener(const picojson::value& args, picojson::object& out); - void UnsetScreenStateChangeListener(const picojson::value& args, picojson::object& out); - void GetScreenBrightness(const picojson::value& args, picojson::object& out); - void SetScreenBrightness(const picojson::value& args, picojson::object& out); - void IsScreenOn(const picojson::value& args, picojson::object& out); - void RestoreScreenBrightness(const picojson::value& args, picojson::object& out); - void TurnScreenOn(const picojson::value& args, picojson::object& out); - void TurnScreenOff(const picojson::value& args, picojson::object& out); + void PowerManagerRequest(const picojson::value& args, picojson::object& out); + void PowerManagerRelease(const picojson::value& args, picojson::object& out); + void PowerManagerSetScreenStateChangeListener(const picojson::value& args, picojson::object& out); + void PowerManagerUnsetScreenStateChangeListener(const picojson::value& args, picojson::object& out); + void PowerManagerGetScreenBrightness(const picojson::value& args, picojson::object& out); + void PowerManagerSetScreenBrightness(const picojson::value& args, picojson::object& out); + void PowerManagerIsScreenOn(const picojson::value& args, picojson::object& out); + void PowerManagerRestoreScreenBrightness(const picojson::value& args, picojson::object& out); + void PowerManagerTurnScreenOn(const picojson::value& args, picojson::object& out); + void PowerManagerTurnScreenOff(const picojson::value& args, picojson::object& out); PowerManager manager_; }; diff --git a/src/ppm/ppm_api.js b/src/ppm/ppm_api.js index 972b581..9f0dfcf 100644 --- a/src/ppm/ppm_api.js +++ b/src/ppm/ppm_api.js @@ -37,7 +37,7 @@ PPMManager.prototype.checkPermission = function() { privilege: args.privilege }; - var result = native_.callSync('PPMManager_checkPermission', callArgs); + var result = native_.callSync('PPMManagerCheckPermission', callArgs); if (native_.isFailure(result)) { throw native_.getErrorObject(result); @@ -55,7 +55,7 @@ PPMManager.prototype.checkPermissions = function() { privileges: args.privileges }; - var result = native_.callSync('PPMManager_checkPermissions', callArgs); + var result = native_.callSync('PPMManagerCheckPermissions', callArgs); var data = []; @@ -91,7 +91,7 @@ PPMManager.prototype.requestPermission = function() { privilege: args.privilege }; - var result = native_.call('PPMManager_requestPermission', callArgs, callback); + var result = native_.call('PPMManagerRequestPermission', callArgs, callback); if (native_.isFailure(result)) { throw native_.getErrorObject(result); @@ -123,7 +123,7 @@ PPMManager.prototype.requestPermissions = function() { privileges: args.privileges }; - var result = native_.call('PPMManager_requestPermissions', callArgs, callback); + var result = native_.call('PPMManagerRequestPermissions', callArgs, callback); if (native_.isFailure(result)) { throw native_.getErrorObject(result); diff --git a/src/ppm/ppm_instance.cc b/src/ppm/ppm_instance.cc index 039e430..41478f0 100644 --- a/src/ppm/ppm_instance.cc +++ b/src/ppm/ppm_instance.cc @@ -43,14 +43,16 @@ PPMInstance::PPMInstance() { using std::placeholders::_1; using std::placeholders::_2; -#define REGISTER(c, x) RegisterSyncHandler(c, std::bind(&PPMInstance::x, this, _1, _2)); - REGISTER("PPMManager_checkPermission", checkPermission); - REGISTER("PPMManager_checkPermissions", checkPermissions); - REGISTER("PPMManager_requestPermission", requestPermission); - REGISTER("PPMManager_requestPermissions", requestPermissions); -#undef REGISTER +#define REGISTER_METHOD(M) \ + RegisterSyncHandler(#M, std::bind(&PPMInstance::M, this, _1, _2)) + REGISTER_METHOD(PPMManagerCheckPermission); + REGISTER_METHOD(PPMManagerCheckPermissions); + REGISTER_METHOD(PPMManagerRequestPermission); + REGISTER_METHOD(PPMManagerRequestPermissions); +#undef REGISTER_METHOD + } PPMInstance::~PPMInstance() { @@ -163,7 +165,7 @@ void PPMInstance::ResponseMultipleCallback(ppm_call_cause_e cause, common::Instance::PostMessage(data->_instance, event.serialize().c_str()); } -void PPMInstance::checkPermission(const picojson::value& args, picojson::object& out) { +void PPMInstance::PPMManagerCheckPermission(const picojson::value& args, picojson::object& out) { ScopeLogger(); const std::string& privilege = args.get("privilege").get(); LoggerD("Checking privilege: %s ", privilege.c_str()); @@ -181,7 +183,7 @@ void PPMInstance::checkPermission(const picojson::value& args, picojson::object& ReportSuccess(picojson::value(CheckResultToString(result)), out); } -void PPMInstance::checkPermissions(const picojson::value& args, picojson::object& out) { +void PPMInstance::PPMManagerCheckPermissions(const picojson::value& args, picojson::object& out) { ScopeLogger(); const picojson::array& privileges = args.get("privileges").get(); @@ -219,7 +221,7 @@ void PPMInstance::checkPermissions(const picojson::value& args, picojson::object ReportSuccess(result_array, out); } -void PPMInstance::requestPermission(const picojson::value& args, picojson::object& out) { +void PPMInstance::PPMManagerRequestPermission(const picojson::value& args, picojson::object& out) { ScopeLogger(); const double callback_id = args.get("callbackId").get(); @@ -243,7 +245,7 @@ void PPMInstance::requestPermission(const picojson::value& args, picojson::objec ReportSuccess(out); } -void PPMInstance::requestPermissions(const picojson::value& args, picojson::object& out) { +void PPMInstance::PPMManagerRequestPermissions(const picojson::value& args, picojson::object& out) { ScopeLogger(); const double callback_id = args.get("callbackId").get(); diff --git a/src/ppm/ppm_instance.h b/src/ppm/ppm_instance.h index 1df853d..829f492 100644 --- a/src/ppm/ppm_instance.h +++ b/src/ppm/ppm_instance.h @@ -34,10 +34,10 @@ class PPMInstance : public common::ParsedInstance { virtual ~PPMInstance(); private: - void checkPermission(const picojson::value& args, picojson::object& out); - void checkPermissions(const picojson::value& args, picojson::object& out); - void requestPermission(const picojson::value& args, picojson::object& out); - void requestPermissions(const picojson::value& args, picojson::object& out); + void PPMManagerCheckPermission(const picojson::value& args, picojson::object& out); + void PPMManagerCheckPermissions(const picojson::value& args, picojson::object& out); + void PPMManagerRequestPermission(const picojson::value& args, picojson::object& out); + void PPMManagerRequestPermissions(const picojson::value& args, picojson::object& out); static common::PlatformResult convertError(int err, const std::string& message = ""); static std::string CheckResultToString(ppm_check_result_e result); diff --git a/src/preference/preference_api.js b/src/preference/preference_api.js index 9f9d821..9fafe2d 100644 --- a/src/preference/preference_api.js +++ b/src/preference/preference_api.js @@ -57,7 +57,7 @@ PreferenceManager.prototype.getAll = function() { } }; - var result = native_.call('PreferenceManager_getAll', {}, callback); + var result = native_.call('PreferenceManagerGetAll', {}, callback); if (native_.isFailure(result)) { throw native_.getErrorObject(result); } @@ -69,7 +69,7 @@ PreferenceManager.prototype.setValue = function() { { name: 'value', type: types_.SIMPLE_TYPE } ]); - var result = native_.callSync('PreferenceManager_setValue', { + var result = native_.callSync('PreferenceManagerSetValue', { key: args.key, value: args.value }); @@ -82,7 +82,7 @@ PreferenceManager.prototype.setValue = function() { PreferenceManager.prototype.getValue = function() { var args = validator_.validateArgs(arguments, [{ name: 'key', type: types_.STRING }]); - var result = native_.callSync('PreferenceManager_getValue', { key: args.key }); + var result = native_.callSync('PreferenceManagerGetValue', { key: args.key }); if (native_.isFailure(result)) { throw native_.getErrorObject(result); @@ -94,7 +94,7 @@ PreferenceManager.prototype.getValue = function() { PreferenceManager.prototype.remove = function() { var args = validator_.validateArgs(arguments, [{ name: 'key', type: types_.STRING }]); - var result = native_.callSync('PreferenceManager_remove', { key: args.key }); + var result = native_.callSync('PreferenceManagerRemove', { key: args.key }); if (native_.isFailure(result)) { throw native_.getErrorObject(result); @@ -102,7 +102,7 @@ PreferenceManager.prototype.remove = function() { }; PreferenceManager.prototype.removeAll = function() { - var result = native_.callSync('PreferenceManager_removeAll', {}); + var result = native_.callSync('PreferenceManagerRemoveAll', {}); if (native_.isFailure(result)) { throw native_.getErrorObject(result); @@ -112,7 +112,7 @@ PreferenceManager.prototype.removeAll = function() { PreferenceManager.prototype.exists = function() { var args = validator_.validateArgs(arguments, [{ name: 'key', type: types_.STRING }]); - var result = native_.callSync('PreferenceManager_exists', { key: args.key }); + var result = native_.callSync('PreferenceManagerExists', { key: args.key }); if (native_.isFailure(result)) { throw native_.getErrorObject(result); @@ -165,7 +165,7 @@ PreferenceManager.prototype.setChangeListener = function() { { name: 'listener', type: types_.FUNCTION } ]); - var result = native_.callSync('PreferenceManager_setChangeListener', { + var result = native_.callSync('PreferenceManagerSetChangeListener', { key: args.key }); if (native_.isFailure(result)) { @@ -178,7 +178,7 @@ PreferenceManager.prototype.setChangeListener = function() { PreferenceManager.prototype.unsetChangeListener = function() { var args = validator_.validateArgs(arguments, [{ name: 'key', type: types_.STRING }]); - var result = native_.callSync('PreferenceManager_unsetChangeListener', { + var result = native_.callSync('PreferenceManagerUnsetChangeListener', { key: args.key }); diff --git a/src/preference/preference_instance.cc b/src/preference/preference_instance.cc index f7a24a6..13ab66d 100644 --- a/src/preference/preference_instance.cc +++ b/src/preference/preference_instance.cc @@ -42,32 +42,35 @@ PreferenceInstance::PreferenceInstance() { using std::placeholders::_1; using std::placeholders::_2; -#define REGISTER(c, x) RegisterSyncHandler(c, std::bind(&PreferenceInstance::x, this, _1)); - REGISTER("PreferenceManager_setValue", SetValue); - REGISTER("PreferenceManager_getValue", GetValue); - REGISTER("PreferenceManager_remove", Remove); - REGISTER("PreferenceManager_removeAll", RemoveAll); - REGISTER("PreferenceManager_exists", Exists); - REGISTER("PreferenceManager_setChangeListener", SetChangeListener); - REGISTER("PreferenceManager_unsetChangeListener", UnsetChangeListener); -#undef REGISTER -#define REGISTER_ASYNC(c, x) RegisterHandler(c, std::bind(&PreferenceInstance::x, this, _1, _2)); - REGISTER_ASYNC("PreferenceManager_getAll", GetAll); -#undef REGISTER_ASYNC +#define REGISTER_METHOD(M) \ + RegisterSyncHandler(#M, std::bind(&PreferenceInstance::M, this, _1)) + REGISTER_METHOD(PreferenceManagerSetValue); + REGISTER_METHOD(PreferenceManagerGetValue); + REGISTER_METHOD(PreferenceManagerRemove); + REGISTER_METHOD(PreferenceManagerRemoveAll); + REGISTER_METHOD(PreferenceManagerExists); + REGISTER_METHOD(PreferenceManagerSetChangeListener); + REGISTER_METHOD(PreferenceManagerUnsetChangeListener); +#undef REGISTER_METHOD + +#define REGISTER_METHOD(M) \ + RegisterHandler(#M, std::bind(&PreferenceInstance::M, this, _1, _2)) + REGISTER_METHOD(PreferenceManagerGetAll); +#undef REGISTER_METHOD } PreferenceInstance::~PreferenceInstance() { ScopeLogger(); } -common::TizenResult PreferenceInstance::GetAll(const picojson::object& args, +common::TizenResult PreferenceInstance::PreferenceManagerGetAll(const picojson::object& args, const common::AsyncToken& token) { ScopeLogger(); return manager_.GetAll(SimplePost(token)); } -common::TizenResult PreferenceInstance::SetValue(const picojson::object& args) { +common::TizenResult PreferenceInstance::PreferenceManagerSetValue(const picojson::object& args) { ScopeLogger(); CHECK_EXIST(args, kKey) @@ -79,7 +82,7 @@ common::TizenResult PreferenceInstance::SetValue(const picojson::object& args) { return manager_.SetValue(key, value); } -common::TizenResult PreferenceInstance::GetValue(const picojson::object& args) { +common::TizenResult PreferenceInstance::PreferenceManagerGetValue(const picojson::object& args) { ScopeLogger(); CHECK_EXIST(args, kKey) @@ -87,7 +90,7 @@ common::TizenResult PreferenceInstance::GetValue(const picojson::object& args) { return manager_.GetValue(key); } -common::TizenResult PreferenceInstance::Remove(const picojson::object& args) { +common::TizenResult PreferenceInstance::PreferenceManagerRemove(const picojson::object& args) { ScopeLogger(); CHECK_EXIST(args, kKey) @@ -95,12 +98,12 @@ common::TizenResult PreferenceInstance::Remove(const picojson::object& args) { return manager_.Remove(key); } -common::TizenResult PreferenceInstance::RemoveAll(const picojson::object& args) { +common::TizenResult PreferenceInstance::PreferenceManagerRemoveAll(const picojson::object& args) { ScopeLogger(); return manager_.RemoveAll(); } -common::TizenResult PreferenceInstance::Exists(const picojson::object& args) { +common::TizenResult PreferenceInstance::PreferenceManagerExists(const picojson::object& args) { ScopeLogger(); CHECK_EXIST(args, kKey) @@ -108,7 +111,7 @@ common::TizenResult PreferenceInstance::Exists(const picojson::object& args) { return manager_.Exists(key); } -common::TizenResult PreferenceInstance::SetChangeListener(const picojson::object& args) { +common::TizenResult PreferenceInstance::PreferenceManagerSetChangeListener(const picojson::object& args) { ScopeLogger(); CHECK_EXIST(args, kKey) const auto& key = args.find(kKey)->second.get(); @@ -121,7 +124,7 @@ common::TizenResult PreferenceInstance::SetChangeListener(const picojson::object return manager_.SetChangeListener(key, callback); } -common::TizenResult PreferenceInstance::UnsetChangeListener(const picojson::object& args) { +common::TizenResult PreferenceInstance::PreferenceManagerUnsetChangeListener(const picojson::object& args) { ScopeLogger(); CHECK_EXIST(args, kKey) diff --git a/src/preference/preference_instance.h b/src/preference/preference_instance.h index 3b4bfe6..dfc5dde 100644 --- a/src/preference/preference_instance.h +++ b/src/preference/preference_instance.h @@ -29,14 +29,14 @@ class PreferenceInstance : public common::TizenInstance { virtual ~PreferenceInstance(); private: - common::TizenResult GetAll(const picojson::object& args, const common::AsyncToken& token); - common::TizenResult SetValue(const picojson::object& args); - common::TizenResult GetValue(const picojson::object& args); - common::TizenResult Remove(const picojson::object& args); - common::TizenResult RemoveAll(const picojson::object& args); - common::TizenResult Exists(const picojson::object& args); - common::TizenResult SetChangeListener(const picojson::object& args); - common::TizenResult UnsetChangeListener(const picojson::object& args); + common::TizenResult PreferenceManagerGetAll(const picojson::object& args, const common::AsyncToken& token); + common::TizenResult PreferenceManagerSetValue(const picojson::object& args); + common::TizenResult PreferenceManagerGetValue(const picojson::object& args); + common::TizenResult PreferenceManagerRemove(const picojson::object& args); + common::TizenResult PreferenceManagerRemoveAll(const picojson::object& args); + common::TizenResult PreferenceManagerExists(const picojson::object& args); + common::TizenResult PreferenceManagerSetChangeListener(const picojson::object& args); + common::TizenResult PreferenceManagerUnsetChangeListener(const picojson::object& args); PreferenceManager manager_; }; diff --git a/src/push/push_api.js b/src/push/push_api.js index 1e33f7d..2e76325 100644 --- a/src/push/push_api.js +++ b/src/push/push_api.js @@ -79,7 +79,7 @@ PushManager.prototype.registerService = function() { } ]); - var ret = native.call('Push_registerService', {}, function(msg) { + var ret = native.call('PushRegisterService', {}, function(msg) { if (msg.error) { if (validatorType.isFunction(data.errorCallback)) { data.errorCallback(native.getErrorObject(msg)); @@ -107,7 +107,7 @@ PushManager.prototype.register = function() { } ]); - var ret = native.call('Push_registerApplication', {}, function(msg) { + var ret = native.call('PushRegisterApplication', {}, function(msg) { if (msg.error) { if (validatorType.isFunction(data.errorCallback)) { data.errorCallback(native.getErrorObject(msg)); @@ -140,7 +140,7 @@ PushManager.prototype.unregisterService = function() { nullable: true } ]); - var result = native.call('Push_unregisterService', {}, function(msg) { + var result = native.call('PushUnregisterService', {}, function(msg) { if (msg.error) { if (validatorType.isFunction(data.errorCallback)) { data.errorCallback(native.getErrorObject(msg)); @@ -170,7 +170,7 @@ PushManager.prototype.unregister = function() { nullable: true } ]); - var result = native.call('Push_unregisterApplication', {}, function(msg) { + var result = native.call('PushUnregisterApplication', {}, function(msg) { if (msg.error) { if (validatorType.isFunction(data.errorCallback)) { data.errorCallback(native.getErrorObject(msg)); @@ -196,7 +196,7 @@ PushManager.prototype.connectService = function(notificationCallback) { type: validator.Types.FUNCTION } ]); - var ret = native.callSync('Push_connectService', {}); + var ret = native.callSync('PushConnectService', {}); if (native.isFailure(ret)) { throw native.getErrorObject(ret); } @@ -224,7 +224,7 @@ PushManager.prototype.connect = function(notificationCallback) { nullable: true } ]); - var result = native.call('Push_connect', {}, function(msg) { + var result = native.call('PushConnect', {}, function(msg) { // in case of error, call errorCallback if (msg.error) { if (validatorType.isFunction(data.errorCallback)) { @@ -257,7 +257,7 @@ PushManager.prototype.disconnectService = function() { 'DEPRECATION WARNING: disconnectService() is deprecated and will be removed' + 'from next release. Use disconnect() instead.' ); - var ret = native.callSync('Push_disconnectService', {}); + var ret = native.callSync('PushDisconnectService', {}); if (native.isFailure(ret)) { throw native.getErrorObject(ret); } @@ -266,7 +266,7 @@ PushManager.prototype.disconnectService = function() { }; PushManager.prototype.disconnect = function() { - var ret = native.callSync('Push_disconnect', {}); + var ret = native.callSync('PushDisconnect', {}); if (native.isFailure(ret)) { throw native.getErrorObject(ret); } @@ -275,7 +275,7 @@ PushManager.prototype.disconnect = function() { }; PushManager.prototype.getRegistrationId = function() { - var ret = native.callSync('Push_getRegistrationId', {}); + var ret = native.callSync('PushGetRegistrationId', {}); if (native.isFailure(ret)) { throw native.getErrorObject(ret); } @@ -283,14 +283,14 @@ PushManager.prototype.getRegistrationId = function() { }; PushManager.prototype.getUnreadNotifications = function() { - var ret = native.callSync('Push_getUnreadNotifications', {}); + var ret = native.callSync('PushGetUnreadNotifications', {}); if (native.isFailure(ret)) { throw native.getErrorObject(ret); } }; PushManager.prototype.getPushMessage = function() { - var ret = native.callSync('Push_getPushMessage', {}); + var ret = native.callSync('PushGetPushMessage', {}); if (native.isFailure(ret)) { throw native.getErrorObject(ret); } else { diff --git a/src/push/push_instance.cc b/src/push/push_instance.cc index f05e04b..06d728a 100644 --- a/src/push/push_instance.cc +++ b/src/push/push_instance.cc @@ -35,34 +35,25 @@ PushInstance::PushInstance() { using std::placeholders::_1; using std::placeholders::_2; -#define REGISTER_ASYNC(c, func) RegisterSyncHandler(c, func); -#define REGISTER_SYNC(c, func) RegisterSyncHandler(c, func); - - REGISTER_ASYNC("Push_registerService", std::bind(&PushInstance::registerService, this, _1, _2)); - REGISTER_ASYNC("Push_registerApplication", - std::bind(&PushInstance::registerApplication, this, _1, _2)); - REGISTER_ASYNC("Push_unregisterService", - std::bind(&PushInstance::unregisterService, this, _1, _2)); - REGISTER_ASYNC("Push_unregisterApplication", - std::bind(&PushInstance::unregisterApplication, this, _1, _2)); - REGISTER_SYNC("Push_connectService", std::bind(&PushInstance::connectService, this, _1, _2)); - REGISTER_SYNC("Push_connect", std::bind(&PushInstance::connect, this, _1, _2)); - REGISTER_SYNC("Push_disconnectService", - std::bind(&PushInstance::disconnectService, this, _1, _2)); - REGISTER_SYNC("Push_disconnect", std::bind(&PushInstance::disconnect, this, _1, _2)); - REGISTER_SYNC("Push_getRegistrationId", - std::bind(&PushInstance::getRegistrationId, this, _1, _2)); - REGISTER_SYNC("Push_getUnreadNotifications", - std::bind(&PushInstance::getUnreadNotifications, this, _1, _2)); - REGISTER_SYNC("Push_getPushMessage", std::bind(&PushInstance::getPushMessage, this, _1, _2)); - -#undef REGISTER_ASYNC -#undef REGISTER_SYNC +#define REGISTER_METHOD(M) \ + RegisterSyncHandler(#M, std::bind(&PushInstance::M, this, _1, _2)) + REGISTER_METHOD(PushRegisterService); + REGISTER_METHOD(PushRegisterApplication); + REGISTER_METHOD(PushUnregisterService); + REGISTER_METHOD(PushUnregisterApplication); + REGISTER_METHOD(PushConnectService); + REGISTER_METHOD(PushConnect); + REGISTER_METHOD(PushDisconnectService); + REGISTER_METHOD(PushDisconnect); + REGISTER_METHOD(PushGetRegistrationId); + REGISTER_METHOD(PushGetUnreadNotifications); + REGISTER_METHOD(PushGetPushMessage); +#undef REGISTER_METHOD impl = new PushManager(this); } -void PushInstance::registerService(const picojson::value& args, picojson::object& out) { +void PushInstance::PushRegisterService(const picojson::value& args, picojson::object& out) { ScopeLogger(); LoggerW( "DEPRECATION WARNING: registerService() is deprecated and will be removed from next release. " @@ -77,7 +68,7 @@ void PushInstance::registerService(const picojson::value& args, picojson::object } } -void PushInstance::registerApplication(const picojson::value& args, picojson::object& out) { +void PushInstance::PushRegisterApplication(const picojson::value& args, picojson::object& out) { ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegePush, &out); @@ -89,7 +80,7 @@ void PushInstance::registerApplication(const picojson::value& args, picojson::ob } } -void PushInstance::unregisterService(const picojson::value& args, picojson::object& out) { +void PushInstance::PushUnregisterService(const picojson::value& args, picojson::object& out) { ScopeLogger(); LoggerW( "DEPRECATION WARNING: unregisterService() is deprecated and will be removed from next " @@ -105,7 +96,7 @@ void PushInstance::unregisterService(const picojson::value& args, picojson::obje } } -void PushInstance::unregisterApplication(const picojson::value& args, picojson::object& out) { +void PushInstance::PushUnregisterApplication(const picojson::value& args, picojson::object& out) { ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegePush, &out); @@ -118,7 +109,7 @@ void PushInstance::unregisterApplication(const picojson::value& args, picojson:: } } -void PushInstance::connectService(const picojson::value& args, picojson::object& out) { +void PushInstance::PushConnectService(const picojson::value& args, picojson::object& out) { ScopeLogger(); LoggerW( "DEPRECATION WARNING: connectService() is deprecated and will be removed from next release. " @@ -134,7 +125,7 @@ void PushInstance::connectService(const picojson::value& args, picojson::object& } } -void PushInstance::connect(const picojson::value& args, picojson::object& out) { +void PushInstance::PushConnect(const picojson::value& args, picojson::object& out) { ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegePush, &out); @@ -147,7 +138,7 @@ void PushInstance::connect(const picojson::value& args, picojson::object& out) { } } -void PushInstance::disconnectService(const picojson::value& args, picojson::object& out) { +void PushInstance::PushDisconnectService(const picojson::value& args, picojson::object& out) { ScopeLogger(); LoggerW( "DEPRECATION WARNING: disconnectService() is deprecated and will be removed from next " @@ -163,7 +154,7 @@ void PushInstance::disconnectService(const picojson::value& args, picojson::obje } } -void PushInstance::disconnect(const picojson::value& args, picojson::object& out) { +void PushInstance::PushDisconnect(const picojson::value& args, picojson::object& out) { ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegePush, &out); @@ -176,7 +167,7 @@ void PushInstance::disconnect(const picojson::value& args, picojson::object& out } } -void PushInstance::getRegistrationId(const picojson::value& args, picojson::object& out) { +void PushInstance::PushGetRegistrationId(const picojson::value& args, picojson::object& out) { ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegePush, &out); @@ -193,7 +184,7 @@ void PushInstance::getRegistrationId(const picojson::value& args, picojson::obje } } -void PushInstance::getUnreadNotifications(const picojson::value& args, picojson::object& out) { +void PushInstance::PushGetUnreadNotifications(const picojson::value& args, picojson::object& out) { ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegePush, &out); @@ -206,7 +197,7 @@ void PushInstance::getUnreadNotifications(const picojson::value& args, picojson: } } -void PushInstance::getPushMessage(const picojson::value& args, picojson::object& out) { +void PushInstance::PushGetPushMessage(const picojson::value& args, picojson::object& out) { ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegePush, &out); diff --git a/src/push/push_instance.h b/src/push/push_instance.h index 860321f..9fdb336 100644 --- a/src/push/push_instance.h +++ b/src/push/push_instance.h @@ -35,17 +35,17 @@ class PushInstance : public common::ParsedInstance, public EventListener { virtual void onDeregister(double callbackId, common::PlatformResult result); private: - void registerService(const picojson::value& args, picojson::object& out); - void registerApplication(const picojson::value& args, picojson::object& out); - void unregisterService(const picojson::value& args, picojson::object& out); - void unregisterApplication(const picojson::value& args, picojson::object& out); - void connectService(const picojson::value& args, picojson::object& out); - void connect(const picojson::value& args, picojson::object& out); - void disconnectService(const picojson::value& args, picojson::object& out); - void disconnect(const picojson::value& args, picojson::object& out); - void getRegistrationId(const picojson::value& args, picojson::object& out); - void getUnreadNotifications(const picojson::value& args, picojson::object& out); - void getPushMessage(const picojson::value& args, picojson::object& out); + void PushRegisterService(const picojson::value& args, picojson::object& out); + void PushRegisterApplication(const picojson::value& args, picojson::object& out); + void PushUnregisterService(const picojson::value& args, picojson::object& out); + void PushUnregisterApplication(const picojson::value& args, picojson::object& out); + void PushConnectService(const picojson::value& args, picojson::object& out); + void PushConnect(const picojson::value& args, picojson::object& out); + void PushDisconnectService(const picojson::value& args, picojson::object& out); + void PushDisconnect(const picojson::value& args, picojson::object& out); + void PushGetRegistrationId(const picojson::value& args, picojson::object& out); + void PushGetUnreadNotifications(const picojson::value& args, picojson::object& out); + void PushGetPushMessage(const picojson::value& args, picojson::object& out); PushManager* impl; }; diff --git a/src/radio/radio_api.js b/src/radio/radio_api.js index 92f04c2..a472c90 100644 --- a/src/radio/radio_api.js +++ b/src/radio/radio_api.js @@ -128,7 +128,7 @@ function FMRadioManager() { }); function muteGetter() { - var ret = native_.callSync('FMRadio_MuteGetter'); + var ret = native_.callSync('FMRadioMuteGetter'); return native_.getResultObject(ret); } @@ -139,29 +139,29 @@ function FMRadioManager() { type: types_.BOOLEAN } ]); - native_.callSync('FMRadio_MuteSetter', args); + native_.callSync('FMRadioMuteSetter', args); } function radioStateGetter() { - var ret = native_.callSync('FMRadio_RadioStateGetter'); + var ret = native_.callSync('FMRadioRadioStateGetter'); return native_.getResultObject(ret); } function isAntennaConnectedGetter() { - var ret = native_.callSync('FMRadio_IsAntennaConnectedGetter'); + var ret = native_.callSync('FMRadioIsAntennaConnectedGetter'); return native_.getResultObject(ret); } function signalStrengthGetter() { - var ret = native_.callSync('FMRadio_SignalStrengthGetter'); + var ret = native_.callSync('FMRadioSignalStrengthGetter'); return native_.getResultObject(ret); } function frequencyGetter() { - var ret = native_.callSync('FMRadio_FrequencyGetter'); + var ret = native_.callSync('FMRadioFrequencyGetter'); return native_.getResultObject(ret); } @@ -191,7 +191,7 @@ FMRadioManager.prototype.seekUp = function() { } ]); - native_.call('FMRadio_SeekUp', {}, function(result) { + native_.call('FMRadioSeekUp', {}, function(result) { if (native_.isFailure(result)) { if (args.errorCallback) args.errorCallback(native_.getErrorObject(result)); } else { @@ -220,7 +220,7 @@ FMRadioManager.prototype.start = function() { 'Frequency out of bounds' ); } - var result = native_.callSync('FMRadio_Start', { + var result = native_.callSync('FMRadioStart', { frequency: args.frequency ? args.frequency : this.frequencyLowerBound }); if (native_.isFailure(result)) { @@ -244,7 +244,7 @@ FMRadioManager.prototype.seekDown = function() { } ]); - native_.call('FMRadio_SeekDown', {}, function(result) { + native_.call('FMRadioSeekDown', {}, function(result) { if (native_.isFailure(result)) { if (args.errorCallback) args.errorCallback(native_.getErrorObject(result)); } else { @@ -270,7 +270,7 @@ FMRadioManager.prototype.scanStart = function() { scanCBmanager.FMRadioScanSet(args.radioScanCallback.onfrequencyfound); - native_.call('FMRadio_ScanStart', {}, function(result) { + native_.call('FMRadioScanStart', {}, function(result) { if (native_.isFailure(result)) { if (args.errorCallback) args.errorCallback(native_.getErrorObject(result)); } else { @@ -281,7 +281,7 @@ FMRadioManager.prototype.scanStart = function() { }; FMRadioManager.prototype.stop = function() { - var ret = native_.callSync('FMRadio_Stop'); + var ret = native_.callSync('FMRadioStop'); if (native_.isFailure(ret)) { throw native_.getErrorObject(ret); } @@ -303,7 +303,7 @@ FMRadioManager.prototype.scanStop = function() { } ]); - native_.call('FMRadio_ScanStop', {}, function(result) { + native_.call('FMRadioScanStop', {}, function(result) { if (native_.isFailure(result)) { if (args.errorCallback) args.errorCallback(native_.getErrorObject(result)); } else { @@ -325,7 +325,7 @@ FMRadioManager.prototype.setFMRadioInterruptedListener = function() { args.interruptCallback.oninterruptfinished ); - var ret = native_.callSync('FMRadio_SetFMRadioInterruptedListener'); + var ret = native_.callSync('SetFMRadioInterruptedListener'); if (native_.isFailure(ret)) { throw native_.getErrorObject(ret); } @@ -333,7 +333,7 @@ FMRadioManager.prototype.setFMRadioInterruptedListener = function() { FMRadioManager.prototype.unsetFMRadioInterruptedListener = function() { interruptedCBmanager.FMRadioInterruptedUnset(); - var ret = native_.callSync('FMRadio_UnsetFMRadioInterruptedListener'); + var ret = native_.callSync('UnsetFMRadioInterruptedListener'); if (native_.isFailure(ret)) { throw native_.getErrorObject(ret); } @@ -348,7 +348,7 @@ FMRadioManager.prototype.setAntennaChangeListener = function() { ]); antennaCBmanager.FMRadioAntennaChangeSet(args.changeCallback); - var ret = native_.callSync('FMRadio_SetAntennaChangeListener'); + var ret = native_.callSync('FMRadioSetAntennaChangeListener'); if (native_.isFailure(ret)) { throw native_.getErrorObject(ret); } @@ -356,7 +356,7 @@ FMRadioManager.prototype.setAntennaChangeListener = function() { FMRadioManager.prototype.unsetAntennaChangeListener = function() { antennaCBmanager.FMRadioAntennaUnset(); - var ret = native_.callSync('FMRadio_UnsetAntennaChangeListener'); + var ret = native_.callSync('FMRadioUnsetAntennaChangeListener'); if (native_.isFailure(ret)) { throw native_.getErrorObject(ret); } diff --git a/src/radio/radio_instance.cc b/src/radio/radio_instance.cc index 1066c46..6dab47e 100644 --- a/src/radio/radio_instance.cc +++ b/src/radio/radio_instance.cc @@ -15,11 +15,8 @@ */ #include "radio/radio_instance.h" - #include - #include - #include "common/logger.h" namespace extension { @@ -33,77 +30,76 @@ RadioInstance::RadioInstance() : manager_(*this) { using std::placeholders::_1; using std::placeholders::_2; -#define REGISTER_SYNC(c, x) RegisterSyncHandler(c, std::bind(&RadioInstance::x, this, _1, _2)); - - REGISTER_SYNC("FMRadio_Start", Start); - REGISTER_SYNC("FMRadio_Stop", Stop); - REGISTER_SYNC("FMRadio_SetFMRadioInterruptedListener", SetFMRadioInterruptedListener); - REGISTER_SYNC("FMRadio_UnsetFMRadioInterruptedListener", UnsetFMRadioInterruptedListener); - REGISTER_SYNC("FMRadio_SetAntennaChangeListener", SetAntennaChangeListener); - REGISTER_SYNC("FMRadio_UnsetAntennaChangeListener", UnsetAntennaChangeListener); - REGISTER_SYNC("FMRadio_FrequencyGetter", FrequencyGetter); - REGISTER_SYNC("FMRadio_SignalStrengthGetter", SignalStrengthGetter); - REGISTER_SYNC("FMRadio_IsAntennaConnectedGetter", AntennaGetter); - REGISTER_SYNC("FMRadio_RadioStateGetter", StateGetter); - REGISTER_SYNC("FMRadio_MuteSetter", MuteSetter); - REGISTER_SYNC("FMRadio_MuteGetter", MuteGetter); -#undef REGISTER_SYNC -#define REGISTER_ASYNC(c, x) RegisterSyncHandler(c, std::bind(&RadioInstance::x, this, _1, _2)); - REGISTER_ASYNC("FMRadio_SeekUp", SeekUp); - REGISTER_ASYNC("FMRadio_SeekDown", SeekDown); - REGISTER_ASYNC("FMRadio_ScanStart", ScanStart); - REGISTER_ASYNC("FMRadio_ScanStop", ScanStop); -#undef REGISTER_ASYNC +#define REGISTER_METHOD(M) \ + RegisterSyncHandler(#M, std::bind(&RadioInstance::M, this, _1, _2)) + REGISTER_METHOD(FMRadioStart); + REGISTER_METHOD(FMRadioStop); + REGISTER_METHOD(SetFMRadioInterruptedListener); + REGISTER_METHOD(UnsetFMRadioInterruptedListener); + REGISTER_METHOD(FMRadioSetAntennaChangeListener); + REGISTER_METHOD(FMRadioUnsetAntennaChangeListener); + REGISTER_METHOD(FMRadioFrequencyGetter); + REGISTER_METHOD(FMRadioSignalStrengthGetter); + REGISTER_METHOD(FMRadioIsAntennaConnectedGetter); + REGISTER_METHOD(FMRadioRadioStateGetter); + REGISTER_METHOD(FMRadioMuteSetter); + REGISTER_METHOD(FMRadioMuteGetter); + + REGISTER_METHOD(FMRadioSeekUp); + REGISTER_METHOD(FMRadioSeekDown); + REGISTER_METHOD(FMRadioScanStart); + REGISTER_METHOD(FMRadioScanStop); +#undef REGISTER_METHOD } RadioInstance::~RadioInstance() { ScopeLogger(); } -void RadioInstance::MuteGetter(const picojson::value& args, picojson::object& out) { +void RadioInstance::FMRadioMuteGetter(const picojson::value& args, picojson::object& out) { ScopeLogger(); ReportSuccess(picojson::value(manager_.IsMuted()), out); } -void RadioInstance::MuteSetter(const picojson::value& args, picojson::object& out) { +void RadioInstance::FMRadioMuteSetter(const picojson::value& args, picojson::object& out) { ScopeLogger(); manager_.SetMute(args.get("mute").get()); ReportSuccess(out); } -void RadioInstance::AntennaGetter(const picojson::value& args, picojson::object& out) { +void RadioInstance::FMRadioIsAntennaConnectedGetter(const picojson::value& args, picojson::object& out) { ScopeLogger(); ReportSuccess(picojson::value(manager_.HasAntenna()), out); } -void RadioInstance::StateGetter(const picojson::value& args, picojson::object& out) { +void RadioInstance::FMRadioRadioStateGetter(const picojson::value& args, picojson::object& out) { ScopeLogger(); ReportSuccess(picojson::value(manager_.GetState()), out); } -void RadioInstance::FrequencyGetter(const picojson::value& args, picojson::object& out) { +void RadioInstance::FMRadioFrequencyGetter(const picojson::value& args, picojson::object& out) { ScopeLogger(); ReportSuccess(picojson::value(manager_.GetFrequency()), out); } -void RadioInstance::SignalStrengthGetter(const picojson::value& args, picojson::object& out) { +void RadioInstance::FMRadioSignalStrengthGetter(const picojson::value& args, picojson::object& out) { ScopeLogger(); ReportSuccess(picojson::value(manager_.GetSignalStrength()), out); } -void RadioInstance::SeekUp(const picojson::value& args, picojson::object& out) { +void RadioInstance::FMRadioSeekUp(const picojson::value& args, picojson::object& out) { ScopeLogger(); manager_.SeekUp(args.get("callbackId").get()); ReportSuccess(out); } -void RadioInstance::SeekDown(const picojson::value& args, picojson::object& out) { +void RadioInstance::FMRadioSeekDown(const picojson::value& args, picojson::object& out) { ScopeLogger(); manager_.SeekDown(args.get("callbackId").get()); ReportSuccess(out); } -void RadioInstance::Start(const picojson::value& args, picojson::object& out) { +void RadioInstance::FMRadioStart(const picojson::value& args, picojson::object& out) { ScopeLogger(); PlatformResult result = manager_.Start(args.get("frequency").get()); @@ -115,7 +111,7 @@ void RadioInstance::Start(const picojson::value& args, picojson::object& out) { } } -void RadioInstance::Stop(const picojson::value& args, picojson::object& out) { +void RadioInstance::FMRadioStop(const picojson::value& args, picojson::object& out) { ScopeLogger(); PlatformResult result = manager_.Stop(); @@ -127,13 +123,13 @@ void RadioInstance::Stop(const picojson::value& args, picojson::object& out) { } } -void RadioInstance::ScanStart(const picojson::value& args, picojson::object& out) { +void RadioInstance::FMRadioScanStart(const picojson::value& args, picojson::object& out) { ScopeLogger(); manager_.ScanStart(args.get("callbackId").get()); ReportSuccess(out); } -void RadioInstance::ScanStop(const picojson::value& args, picojson::object& out) { +void RadioInstance::FMRadioScanStop(const picojson::value& args, picojson::object& out) { ScopeLogger(); manager_.ScanStop(args.get("callbackId").get()); ReportSuccess(out); @@ -165,7 +161,7 @@ void RadioInstance::UnsetFMRadioInterruptedListener(const picojson::value& args, } } -void RadioInstance::SetAntennaChangeListener(const picojson::value& args, picojson::object& out) { +void RadioInstance::FMRadioSetAntennaChangeListener(const picojson::value& args, picojson::object& out) { ScopeLogger(); PlatformResult result = manager_.SetAntennaChangeListener(); @@ -177,7 +173,7 @@ void RadioInstance::SetAntennaChangeListener(const picojson::value& args, picojs } } -void RadioInstance::UnsetAntennaChangeListener(const picojson::value& args, picojson::object& out) { +void RadioInstance::FMRadioUnsetAntennaChangeListener(const picojson::value& args, picojson::object& out) { ScopeLogger(); PlatformResult result = manager_.UnsetAntennaChangeListener(); diff --git a/src/radio/radio_instance.h b/src/radio/radio_instance.h index 93ebf59..1057c35 100644 --- a/src/radio/radio_instance.h +++ b/src/radio/radio_instance.h @@ -31,22 +31,22 @@ class RadioInstance : public common::ParsedInstance { virtual ~RadioInstance(); private: - void MuteGetter(const picojson::value& args, picojson::object& out); - void MuteSetter(const picojson::value& args, picojson::object& out); - void FrequencyGetter(const picojson::value& args, picojson::object& out); - void SignalStrengthGetter(const picojson::value& args, picojson::object& out); - void AntennaGetter(const picojson::value& args, picojson::object& out); - void StateGetter(const picojson::value& args, picojson::object& out); - void SeekUp(const picojson::value& args, picojson::object& out); - void SeekDown(const picojson::value& args, picojson::object& out); - void ScanStart(const picojson::value& args, picojson::object& out); - void ScanStop(const picojson::value& args, picojson::object& out); - void Start(const picojson::value& args, picojson::object& out); - void Stop(const picojson::value& args, picojson::object& out); + void FMRadioMuteGetter(const picojson::value& args, picojson::object& out); + void FMRadioMuteSetter(const picojson::value& args, picojson::object& out); + void FMRadioFrequencyGetter(const picojson::value& args, picojson::object& out); + void FMRadioSignalStrengthGetter(const picojson::value& args, picojson::object& out); + void FMRadioIsAntennaConnectedGetter(const picojson::value& args, picojson::object& out); + void FMRadioRadioStateGetter(const picojson::value& args, picojson::object& out); + void FMRadioSeekUp(const picojson::value& args, picojson::object& out); + void FMRadioSeekDown(const picojson::value& args, picojson::object& out); + void FMRadioScanStart(const picojson::value& args, picojson::object& out); + void FMRadioScanStop(const picojson::value& args, picojson::object& out); + void FMRadioStart(const picojson::value& args, picojson::object& out); + void FMRadioStop(const picojson::value& args, picojson::object& out); void SetFMRadioInterruptedListener(const picojson::value& args, picojson::object& out); void UnsetFMRadioInterruptedListener(const picojson::value& args, picojson::object& out); - void SetAntennaChangeListener(const picojson::value& args, picojson::object& out); - void UnsetAntennaChangeListener(const picojson::value& args, picojson::object& out); + void FMRadioSetAntennaChangeListener(const picojson::value& args, picojson::object& out); + void FMRadioUnsetAntennaChangeListener(const picojson::value& args, picojson::object& out); FMRadioManager manager_; }; diff --git a/src/secureelement/secureelement_api.js b/src/secureelement/secureelement_api.js index 99a9460..4364034 100644 --- a/src/secureelement/secureelement_api.js +++ b/src/secureelement/secureelement_api.js @@ -63,7 +63,7 @@ ListenerManager.prototype.addListener = function(callback) { var id = this.nextId; if (!this.nativeSet) { this.native.addListener(this.listenerName, this.onListenerCalled.bind(this)); - var result = this.native.callSync('SEService_registerSEListener'); + var result = this.native.callSync('SEServiceRegisterSEListener'); if (this.native.isFailure(result)) { throw this.native.getErrorObject(result); } @@ -86,7 +86,7 @@ ListenerManager.prototype.removeListener = function(watchId) { } if (this.nativeSet && type_utils.isEmptyObject(this.listeners)) { - var result = this.native.callSync('SEService_unregisterSEListener'); + var result = this.native.callSync('SEServiceUnregisterSEListener'); if (this.native.isFailure(result)) { throw this.native.getErrorObject(result); } @@ -122,7 +122,7 @@ var SEServiceGetReaders = function() { } }; - var result = native_.call('SEService_getReaders', {}, callback); + var result = native_.call('SEServiceGetReaders', {}, callback); if (native_.isFailure(result)) { throw native_.getErrorObject(result); } @@ -167,7 +167,7 @@ SEService.prototype.unregisterSEListener = function() { var SEServiceShutdown = function() { xwalk.utils.checkPrivilegeAccess(xwalk.utils.privilege.SECUREELEMENT); - var result = native_.callSync('SEService_shutdown', {}); + var result = native_.callSync('SEServiceShutdown', {}); if (native_.isFailure(result)) { throw native_.getErrorObject(result); @@ -188,7 +188,7 @@ function Reader(reader_handle) { set: function() {}, get: function() { var callArgs = { handle: reader_handle }; - var result = native_.callSync('SEReader_isPresent', callArgs); + var result = native_.callSync('SEReaderIsPresent', callArgs); if (native_.isFailure(result)) { privUtils_.log( 'SEReader_isPresent error: ' + native_.getErrorObject(result) @@ -212,7 +212,7 @@ function Reader(reader_handle) { Reader.prototype.getName = function() { var callArgs = { handle: this._handle }; - var result = native_.callSync('SEReader_getName', callArgs); + var result = native_.callSync('SEReaderGetName', callArgs); if (native_.isFailure(result)) { throw native_.getErrorObject(result); @@ -239,7 +239,7 @@ Reader.prototype.openSession = function() { var callArgs = { handle: this._handle }; - var result = native_.call('SEReader_openSession', callArgs, callback); + var result = native_.call('SEReaderOpenSession', callArgs, callback); if (native_.isFailure(result)) { throw native_.getErrorObject(result); @@ -248,7 +248,7 @@ Reader.prototype.openSession = function() { Reader.prototype.closeSessions = function() { var callArgs = { handle: this._handle }; - var result = native_.callSync('SEReader_closeSessions', callArgs); + var result = native_.callSync('SEReaderCloseSessions', callArgs); if (native_.isFailure(result)) { throw native_.getErrorObject(result); } @@ -279,7 +279,7 @@ function Channel(channel_handle, is_basic_channel) { Channel.prototype.close = function() { var callArgs = { handle: this._handle }; - var result = native_.callSync('SEChannel_close', callArgs); + var result = native_.callSync('SEChannelClose', callArgs); if (native_.isFailure(result)) { throw native_.getErrorObject(result); @@ -306,7 +306,7 @@ Channel.prototype.transmit = function() { command: args.command }; - var result = native_.call('SEChannel_transmit', callArgs, callback); + var result = native_.call('SEChannelTransmit', callArgs, callback); if (native_.isFailure(result)) { throw native_.getErrorObject(result); @@ -315,7 +315,7 @@ Channel.prototype.transmit = function() { Channel.prototype.getSelectResponse = function() { var callArgs = { handle: this._handle }; - var result = native_.callSync('SEChannel_getSelectResponse', callArgs); + var result = native_.callSync('SEChannelGetSelectResponse', callArgs); if (native_.isFailure(result)) { throw native_.getErrorObject(result); @@ -332,7 +332,7 @@ function Session(session_handle) { set: function() {}, get: function() { var callArgs = { handle: session_handle }; - var result = native_.callSync('SESession_isClosed', callArgs); + var result = native_.callSync('SESessionIsClosed', callArgs); if (native_.isFailure(result)) { privUtils_.log( 'SESession_isClosed error: ' + native_.getErrorObject(result) @@ -376,7 +376,7 @@ Session.prototype.openBasicChannel = function() { aid: args.aid }; - var result = native_.call('SESession_openBasicChannel', callArgs, callback); + var result = native_.call('SESessionOpenBasicChannel', callArgs, callback); if (native_.isFailure(result)) { throw native_.getErrorObject(result); @@ -405,7 +405,7 @@ Session.prototype.openLogicalChannel = function() { aid: args.aid }; - var result = native_.call('SESession_openLogicalChannel', callArgs, callback); + var result = native_.call('SESessionOpenLogicalChannel', callArgs, callback); if (native_.isFailure(result)) { throw native_.getErrorObject(result); @@ -414,7 +414,7 @@ Session.prototype.openLogicalChannel = function() { Session.prototype.getATR = function() { var callArgs = { handle: this._handle }; - var result = native_.callSync('SESession_getATR', callArgs); + var result = native_.callSync('SESessionGetATR', callArgs); if (native_.isFailure(result)) { throw native_.getErrorObject(result); } else { @@ -424,7 +424,7 @@ Session.prototype.getATR = function() { Session.prototype.close = function() { var callArgs = { handle: this._handle }; - var result = native_.callSync('SESession_close', callArgs); + var result = native_.callSync('SESessionClose', callArgs); if (native_.isFailure(result)) { throw native_.getErrorObject(result); @@ -433,7 +433,7 @@ Session.prototype.close = function() { Session.prototype.closeChannels = function() { var callArgs = { handle: this._handle }; - var result = native_.callSync('SESession_closeChannels', callArgs); + var result = native_.callSync('SESessionCloseChannels', callArgs); if (native_.isFailure(result)) { throw native_.getErrorObject(result); diff --git a/src/secureelement/secureelement_instance.cc b/src/secureelement/secureelement_instance.cc index 75efd10..4b5821f 100644 --- a/src/secureelement/secureelement_instance.cc +++ b/src/secureelement/secureelement_instance.cc @@ -110,30 +110,30 @@ SecureElementInstance::SecureElementInstance() : is_initialized_(false), is_list using std::placeholders::_1; using std::placeholders::_2; -#define REGISTER_SYNC(c, x) RegisterSyncHandler(c, std::bind(&SecureElementInstance::x, this, _1)); - - REGISTER_SYNC("SEService_registerSEListener", RegisterSEListener); - REGISTER_SYNC("SEService_unregisterSEListener", UnregisterSEListener); - REGISTER_SYNC("SEService_shutdown", Shutdown); - REGISTER_SYNC("SEReader_getName", GetName); - REGISTER_SYNC("SEReader_isPresent", IsPresent); - REGISTER_SYNC("SEReader_closeSessions", CloseSessions); - REGISTER_SYNC("SESession_getATR", GetATR); - REGISTER_SYNC("SESession_isClosed", IsSessionClosed); - REGISTER_SYNC("SESession_close", CloseSession); - REGISTER_SYNC("SESession_closeChannels", CloseChannels); - REGISTER_SYNC("SEChannel_close", CloseChannel); - REGISTER_SYNC("SEChannel_getSelectResponse", GetSelectResponse); -#undef REGISTER_SYNC - -#define REGISTER(c, x) RegisterHandler(c, std::bind(&SecureElementInstance::x, this, _1, _2)); - - REGISTER("SEService_getReaders", GetReaders); - REGISTER("SEReader_openSession", OpenSession); - REGISTER("SESession_openBasicChannel", OpenBasicChannel); - REGISTER("SESession_openLogicalChannel", OpenLogicalChannel); - REGISTER("SEChannel_transmit", Transmit); -#undef REGISTER +#define REGISTER_METHOD(M) \ + RegisterSyncHandler(#M, std::bind(&SecureElementInstance::M, this, _1)) + REGISTER_METHOD(SEServiceRegisterSEListener); + REGISTER_METHOD(SEServiceUnregisterSEListener); + REGISTER_METHOD(SEServiceShutdown); + REGISTER_METHOD(SEReaderGetName); + REGISTER_METHOD(SEReaderIsPresent); + REGISTER_METHOD(SEReaderCloseSessions); + REGISTER_METHOD(SESessionGetATR); + REGISTER_METHOD(SESessionIsClosed); + REGISTER_METHOD(SESessionClose); + REGISTER_METHOD(SESessionCloseChannels); + REGISTER_METHOD(SEChannelClose); + REGISTER_METHOD(SEChannelGetSelectResponse); +#undef REGISTER_METHOD + +#define REGISTER_METHOD(M) \ + RegisterHandler(#M, std::bind(&SecureElementInstance::M, this, _1, _2)) + REGISTER_METHOD(SEServiceGetReaders); + REGISTER_METHOD(SEReaderOpenSession); + REGISTER_METHOD(SESessionOpenBasicChannel); + REGISTER_METHOD(SESessionOpenLogicalChannel); + REGISTER_METHOD(SEChannelTransmit); +#undef REGISTER_METHOD if (SMARTCARD_ERROR_NONE == smartcard_initialize()) { is_initialized_ = true; @@ -148,7 +148,7 @@ SecureElementInstance::~SecureElementInstance() { } // Service methods -TizenResult SecureElementInstance::GetReaders(picojson::object const& args, +TizenResult SecureElementInstance::SEServiceGetReaders(picojson::object const& args, const common::AsyncToken& token) { ScopeLogger(); @@ -192,7 +192,7 @@ TizenResult SecureElementInstance::GetReaders(picojson::object const& args, return TizenSuccess(); } -TizenResult SecureElementInstance::RegisterSEListener(picojson::object const& args) { +TizenResult SecureElementInstance::SEServiceRegisterSEListener(picojson::object const& args) { ScopeLogger(); CHECK_PRIVILEGE(kPrivilegeSecureElement); @@ -224,7 +224,7 @@ TizenResult SecureElementInstance::UnregisterListener() { return TizenSuccess(); } -TizenResult SecureElementInstance::UnregisterSEListener(picojson::object const& args) { +TizenResult SecureElementInstance::SEServiceUnregisterSEListener(picojson::object const& args) { ScopeLogger(); CHECK_PRIVILEGE(kPrivilegeSecureElement); @@ -249,7 +249,7 @@ TizenResult SecureElementInstance::Deinitialize() { return TizenSuccess(); } -TizenResult SecureElementInstance::Shutdown(picojson::object const& args) { +TizenResult SecureElementInstance::SEServiceShutdown(picojson::object const& args) { ScopeLogger(); UnregisterListener(); @@ -257,7 +257,7 @@ TizenResult SecureElementInstance::Shutdown(picojson::object const& args) { } // Reader methods -TizenResult SecureElementInstance::GetName(picojson::object const& args) { +TizenResult SecureElementInstance::SEReaderGetName(picojson::object const& args) { ScopeLogger(); CHECK_PRIVILEGE(kPrivilegeSecureElement); @@ -277,7 +277,7 @@ TizenResult SecureElementInstance::GetName(picojson::object const& args) { return TizenSuccess(picojson::value(name)); } -TizenResult SecureElementInstance::IsPresent(picojson::object const& args) { +TizenResult SecureElementInstance::SEReaderIsPresent(picojson::object const& args) { ScopeLogger(); int reader = static_cast(args.find(kHandle)->second.get()); @@ -292,7 +292,7 @@ TizenResult SecureElementInstance::IsPresent(picojson::object const& args) { return TizenSuccess(picojson::value(is_present)); } -TizenResult SecureElementInstance::OpenSession(picojson::object const& args, +TizenResult SecureElementInstance::SEReaderOpenSession(picojson::object const& args, const common::AsyncToken& token) { ScopeLogger(); @@ -325,7 +325,7 @@ TizenResult SecureElementInstance::OpenSession(picojson::object const& args, return TizenSuccess(); } -TizenResult SecureElementInstance::CloseSessions(picojson::object const& args) { +TizenResult SecureElementInstance::SEReaderCloseSessions(picojson::object const& args) { ScopeLogger(); CHECK_PRIVILEGE(kPrivilegeSecureElement); @@ -357,7 +357,7 @@ TizenResult SecureElementInstance::IsBasicChannel(int channel, picojson::value& return TizenSuccess(val); } -TizenResult SecureElementInstance::OpenBasicChannel(picojson::object const& args, +TizenResult SecureElementInstance::SESessionOpenBasicChannel(picojson::object const& args, const common::AsyncToken& token) { ScopeLogger(); @@ -402,7 +402,7 @@ TizenResult SecureElementInstance::OpenBasicChannel(picojson::object const& args return TizenSuccess(); } -TizenResult SecureElementInstance::OpenLogicalChannel(picojson::object const& args, +TizenResult SecureElementInstance::SESessionOpenLogicalChannel(picojson::object const& args, const common::AsyncToken& token) { ScopeLogger(); @@ -447,7 +447,7 @@ TizenResult SecureElementInstance::OpenLogicalChannel(picojson::object const& ar return TizenSuccess(); } -TizenResult SecureElementInstance::GetATR(picojson::object const& args) { +TizenResult SecureElementInstance::SESessionGetATR(picojson::object const& args) { ScopeLogger(); CHECK_PRIVILEGE(kPrivilegeSecureElement); @@ -475,7 +475,7 @@ TizenResult SecureElementInstance::GetATR(picojson::object const& args) { return TizenSuccess(response); } -TizenResult SecureElementInstance::IsSessionClosed(picojson::object const& args) { +TizenResult SecureElementInstance::SESessionIsClosed(picojson::object const& args) { ScopeLogger(); int session = static_cast(args.find(kHandle)->second.get()); @@ -489,7 +489,7 @@ TizenResult SecureElementInstance::IsSessionClosed(picojson::object const& args) return TizenSuccess(picojson::value(is_closed)); } -TizenResult SecureElementInstance::CloseSession(picojson::object const& args) { +TizenResult SecureElementInstance::SESessionClose(picojson::object const& args) { ScopeLogger(); CHECK_PRIVILEGE(kPrivilegeSecureElement); @@ -504,7 +504,7 @@ TizenResult SecureElementInstance::CloseSession(picojson::object const& args) { return TizenSuccess(); } -TizenResult SecureElementInstance::CloseChannels(picojson::object const& args) { +TizenResult SecureElementInstance::SESessionCloseChannels(picojson::object const& args) { ScopeLogger(); CHECK_PRIVILEGE(kPrivilegeSecureElement); @@ -520,7 +520,7 @@ TizenResult SecureElementInstance::CloseChannels(picojson::object const& args) { } // Channel methods -TizenResult SecureElementInstance::CloseChannel(picojson::object const& args) { +TizenResult SecureElementInstance::SEChannelClose(picojson::object const& args) { ScopeLogger(); CHECK_PRIVILEGE(kPrivilegeSecureElement); @@ -535,7 +535,7 @@ TizenResult SecureElementInstance::CloseChannel(picojson::object const& args) { return TizenSuccess(); } -TizenResult SecureElementInstance::Transmit(picojson::object const& args, +TizenResult SecureElementInstance::SEChannelTransmit(picojson::object const& args, const common::AsyncToken& token) { ScopeLogger(); @@ -588,7 +588,7 @@ TizenResult SecureElementInstance::Transmit(picojson::object const& args, return TizenSuccess(); } -TizenResult SecureElementInstance::GetSelectResponse(picojson::object const& args) { +TizenResult SecureElementInstance::SEChannelGetSelectResponse(picojson::object const& args) { ScopeLogger(); CHECK_PRIVILEGE(kPrivilegeSecureElement); diff --git a/src/secureelement/secureelement_instance.h b/src/secureelement/secureelement_instance.h index 0a08b31..631858d 100644 --- a/src/secureelement/secureelement_instance.h +++ b/src/secureelement/secureelement_instance.h @@ -29,32 +29,32 @@ class SecureElementInstance : public common::TizenInstance { private: /* Service methods */ - common::TizenResult GetReaders(picojson::object const& args, const common::AsyncToken& token); - common::TizenResult RegisterSEListener(picojson::object const& args); - common::TizenResult UnregisterSEListener(picojson::object const& args); - common::TizenResult Shutdown(picojson::object const& args); + common::TizenResult SEServiceGetReaders(picojson::object const& args, const common::AsyncToken& token); + common::TizenResult SEServiceRegisterSEListener(picojson::object const& args); + common::TizenResult SEServiceUnregisterSEListener(picojson::object const& args); + common::TizenResult SEServiceShutdown(picojson::object const& args); /* Reader methods */ - common::TizenResult GetName(picojson::object const& args); - common::TizenResult IsPresent(picojson::object const& args); - common::TizenResult OpenSession(picojson::object const& args, const common::AsyncToken& token); - common::TizenResult CloseSessions(picojson::object const& args); + common::TizenResult SEReaderGetName(picojson::object const& args); + common::TizenResult SEReaderIsPresent(picojson::object const& args); + common::TizenResult SEReaderOpenSession(picojson::object const& args, const common::AsyncToken& token); + common::TizenResult SEReaderCloseSessions(picojson::object const& args); /* Session methods */ common::TizenResult IsBasicChannel(int channel, picojson::value& val); - common::TizenResult OpenBasicChannel(picojson::object const& args, + common::TizenResult SESessionOpenBasicChannel(picojson::object const& args, const common::AsyncToken& token); - common::TizenResult OpenLogicalChannel(picojson::object const& args, + common::TizenResult SESessionOpenLogicalChannel(picojson::object const& args, const common::AsyncToken& token); - common::TizenResult GetATR(picojson::object const& args); - common::TizenResult IsSessionClosed(picojson::object const& args); - common::TizenResult CloseSession(picojson::object const& args); - common::TizenResult CloseChannels(picojson::object const& args); + common::TizenResult SESessionGetATR(picojson::object const& args); + common::TizenResult SESessionIsClosed(picojson::object const& args); + common::TizenResult SESessionClose(picojson::object const& args); + common::TizenResult SESessionCloseChannels(picojson::object const& args); /* Channel methods */ - common::TizenResult CloseChannel(picojson::object const& args); - common::TizenResult Transmit(picojson::object const& args, const common::AsyncToken& token); - common::TizenResult GetSelectResponse(picojson::object const& args); + common::TizenResult SEChannelClose(picojson::object const& args); + common::TizenResult SEChannelTransmit(picojson::object const& args, const common::AsyncToken& token); + common::TizenResult SEChannelGetSelectResponse(picojson::object const& args); common::TizenResult Deinitialize(); common::TizenResult UnregisterListener(); -- 2.7.4