From: Michal Michalski Date: Fri, 4 Oct 2019 09:58:33 +0000 (+0200) Subject: [datacontrol][common] Simplify instance methods registration (2) X-Git-Tag: accepted/tizen/5.5/unified/20191106.124827~8 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git;a=commitdiff_plain;h=ae981f5f0201e299107b226cb4808915f516b0da [datacontrol][common] Simplify instance methods registration (2) 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-datacontrol-tizen-tests 100% pass rate. + tct-download-tizen-tests 100% pass rate. + tct-exif-tizen-tests 100% pass rate. + tct-feedback-tizen-tests 100% pass rate. + tct-filesystem-tizen-tests 100% pass rate. Signed-off-by: Michal Michalski Change-Id: Idb2ce6c9aa15743822aed405a3be5d2156102d60 --- diff --git a/src/datacontrol/datacontrol_api.js b/src/datacontrol/datacontrol_api.js index 0c1a711..1fe2d8a 100755 --- a/src/datacontrol/datacontrol_api.js +++ b/src/datacontrol/datacontrol_api.js @@ -124,7 +124,7 @@ var DataControlListenersManager = (function() { } }; var result = native_.call( - 'DataControlConsumerObject_addChangeListener', + 'DataControlConsumerObjectAddChangeListener', { providerId: providerId, dataId: dataId, @@ -207,7 +207,7 @@ var DataControlListenersManager = (function() { } if (0 != _realWatchId) { - native_.call('DataControlConsumerObject_removeChangeListener', { + native_.call('DataControlConsumerObjectRemoveChangeListener', { watchId: _realWatchId }); @@ -345,7 +345,7 @@ SQLDataControlConsumer.prototype.insert = function() { insertionData: args.insertionData }; - var syncResult = native_.call('SQLDataControlConsumer_insert', nativeParam, function( + var syncResult = native_.call('SQLDataControlConsumerInsert', nativeParam, function( result ) { if (result.status == 'success') { @@ -389,7 +389,7 @@ SQLDataControlConsumer.prototype.update = function() { updateData: args.updateData }; - var syncResult = native_.call('SQLDataControlConsumer_update', nativeParam, function( + var syncResult = native_.call('SQLDataControlConsumerUpdate', nativeParam, function( result ) { if (result.status == 'success') { @@ -431,7 +431,7 @@ SQLDataControlConsumer.prototype.remove = function() { where: args.where }; - var syncResult = native_.call('SQLDataControlConsumer_remove', nativeParam, function( + var syncResult = native_.call('SQLDataControlConsumerRemove', nativeParam, function( result ) { if (result.status == 'success') { @@ -482,7 +482,7 @@ SQLDataControlConsumer.prototype.select = function() { nativeParam['order'] = args.order; } - var syncResult = native_.call('SQLDataControlConsumer_select', nativeParam, function( + var syncResult = native_.call('SQLDataControlConsumerSelect', nativeParam, function( result ) { if (result.status == 'success') { @@ -532,7 +532,7 @@ MappedDataControlConsumer.prototype.addValue = function() { }; var syncResult = native_.call( - 'MappedDataControlConsumer_addValue', + 'MappedDataControlConsumerAddValue', nativeParam, function(result) { if (result.status == 'success') { @@ -573,7 +573,7 @@ MappedDataControlConsumer.prototype.removeValue = function() { }; var syncResult = native_.call( - 'MappedDataControlConsumer_removeValue', + 'MappedDataControlConsumerRemoveValue', nativeParam, function(result) { if (result.status == 'success') { @@ -610,7 +610,7 @@ MappedDataControlConsumer.prototype.getValue = function() { }; var syncResult = native_.call( - 'MappedDataControlConsumer_getValue', + 'MappedDataControlConsumerGetValue', nativeParam, function(result) { if (result.status == 'success') { @@ -651,7 +651,7 @@ MappedDataControlConsumer.prototype.updateValue = function() { }; var syncResult = native_.call( - 'MappedDataControlConsumer_updateValue', + 'MappedDataControlConsumerUpdateValue', nativeParam, function(result) { if (result.status == 'success') { diff --git a/src/datacontrol/datacontrol_instance.cc b/src/datacontrol/datacontrol_instance.cc index a0104d4..d7617c3 100644 --- a/src/datacontrol/datacontrol_instance.cc +++ b/src/datacontrol/datacontrol_instance.cc @@ -82,24 +82,23 @@ DatacontrolInstance::DatacontrolInstance() { ScopeLogger(); using std::placeholders::_1; using std::placeholders::_2; -#define REGISTER_SYNC(c, x) \ - RegisterSyncHandler(c, std::bind(&DatacontrolInstance::x, this, _1, _2)); - REGISTER_SYNC("SQLDataControlConsumer_update", SQLDataControlConsumerUpdate); - REGISTER_SYNC("MappedDataControlConsumer_addValue", MappedDataControlConsumerAddvalue); - REGISTER_SYNC("SQLDataControlConsumer_select", SQLDataControlConsumerSelect); - REGISTER_SYNC("SQLDataControlConsumer_remove", SQLDataControlConsumerRemove); - REGISTER_SYNC("MappedDataControlConsumer_removeValue", MappedDataControlConsumerRemovevalue); - REGISTER_SYNC("MappedDataControlConsumer_updateValue", MappedDataControlConsumerUpdatevalue); - REGISTER_SYNC("DataControlManager_getDataControlConsumer", - DataControlManagerGetdatacontrolconsumer); - REGISTER_SYNC("SQLDataControlConsumer_insert", SQLDataControlConsumerInsert); - REGISTER_SYNC("MappedDataControlConsumer_getValue", MappedDataControlConsumerGetvalue); - REGISTER_SYNC("DataControlConsumerObject_removeChangeListener", RemoveChangeListener); -#undef REGISTER_SYNC -#define REGISTER_ASYNC(c, x) \ - RegisterSyncHandler(c, std::bind(&DatacontrolInstance::x, this, _1, _2)); - REGISTER_ASYNC("DataControlConsumerObject_addChangeListener", AddChangeListener); -#undef REGISTER_ASYNC + +#define REGISTER_METHOD(M) \ + RegisterSyncHandler(#M, std::bind(&DatacontrolInstance::M, this, _1, _2)) + + REGISTER_METHOD(SQLDataControlConsumerUpdate); + REGISTER_METHOD(MappedDataControlConsumerAddValue); + REGISTER_METHOD(SQLDataControlConsumerSelect); + REGISTER_METHOD(SQLDataControlConsumerRemove); + REGISTER_METHOD(MappedDataControlConsumerRemoveValue); + REGISTER_METHOD(MappedDataControlConsumerUpdateValue); + REGISTER_METHOD(DataControlManagerGetConsumer); + REGISTER_METHOD(SQLDataControlConsumerInsert); + REGISTER_METHOD(MappedDataControlConsumerGetValue); + REGISTER_METHOD(DataControlConsumerObjectRemoveChangeListener); + REGISTER_METHOD(DataControlConsumerObjectAddChangeListener); + +#undef REGISTER_METHOD } DatacontrolInstance::~DatacontrolInstance() { @@ -110,7 +109,7 @@ DatacontrolInstance::~DatacontrolInstance() { LoggerD("Deleting callback number %d", item.first); int result = ::data_control_remove_data_change_cb(handle, watch_id); if (DATA_CONTROL_ERROR_NONE != result) { - LoggerE("RemoveChangeListener %d failed: %d (%s)", watch_id, result, + LoggerE("data_control_remove_data_change_cb %d failed: %d (%s)", watch_id, result, get_error_message(result)); } } @@ -494,7 +493,7 @@ int DatacontrolInstance::RunSQLDataControlJob(const std::string& providerId, return; \ } -void DatacontrolInstance::DataControlManagerGetdatacontrolconsumer(const picojson::value& args, +void DatacontrolInstance::DataControlManagerGetConsumer(const picojson::value& args, picojson::object& out) { ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeDatacontrol, &out); @@ -760,7 +759,7 @@ void DatacontrolInstance::SQLDataControlConsumerSelect(const picojson::value& ar } } } -void DatacontrolInstance::MappedDataControlConsumerAddvalue(const picojson::value& args, +void DatacontrolInstance::MappedDataControlConsumerAddValue(const picojson::value& args, picojson::object& out) { ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeDatacontrol, &out); @@ -800,7 +799,7 @@ void DatacontrolInstance::MappedDataControlConsumerAddvalue(const picojson::valu } } } -void DatacontrolInstance::MappedDataControlConsumerRemovevalue(const picojson::value& args, +void DatacontrolInstance::MappedDataControlConsumerRemoveValue(const picojson::value& args, picojson::object& out) { ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeDatacontrol, &out); @@ -839,7 +838,7 @@ void DatacontrolInstance::MappedDataControlConsumerRemovevalue(const picojson::v } } } -void DatacontrolInstance::MappedDataControlConsumerGetvalue(const picojson::value& args, +void DatacontrolInstance::MappedDataControlConsumerGetValue(const picojson::value& args, picojson::object& out) { ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeDatacontrol, &out); @@ -875,7 +874,7 @@ void DatacontrolInstance::MappedDataControlConsumerGetvalue(const picojson::valu } } } -void DatacontrolInstance::MappedDataControlConsumerUpdatevalue(const picojson::value& args, +void DatacontrolInstance::MappedDataControlConsumerUpdateValue(const picojson::value& args, picojson::object& out) { ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeDatacontrol, &out); @@ -1087,7 +1086,7 @@ void DatacontrolInstance::result_callback(data_control_h provider, data_control_ obj.insert(std::make_pair("callbackId", picojson::value(std::to_string(data->callbackId)))); // According to native documentation only IOError can be returned to webapi, other errors are // handled earlier - LogAndReportError(IOException("AddChangeListener failed"), obj); + LogAndReportError(IOException("DataControlConsumerObjectAddChangeListener failed"), obj); Instance::PostMessage(data->_instance, event.serialize().c_str()); if (0 != callback_id) { data->_instance->EraseMap(callback_id); @@ -1095,7 +1094,7 @@ void DatacontrolInstance::result_callback(data_control_h provider, data_control_ } } -void DatacontrolInstance::AddChangeListener(const picojson::value& args, picojson::object& out) { +void DatacontrolInstance::DataControlConsumerObjectAddChangeListener(const picojson::value& args, picojson::object& out) { ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeDatasharing, &out); @@ -1120,8 +1119,8 @@ void DatacontrolInstance::AddChangeListener(const picojson::value& args, picojso } if (DATA_CONTROL_ERROR_NONE != result) { - LogAndReportError(ServiceNotAvailableException("AddChangeListener failed"), out, - ("AddChangeListener failed: %d (%s)", result, get_error_message(result))); + LogAndReportError(ServiceNotAvailableException("DataControlConsumerObjectAddChangeListener failed"), out, + ("DataControlConsumerObjectAddChangeListener failed: %d (%s)", result, get_error_message(result))); return; } @@ -1136,8 +1135,8 @@ void DatacontrolInstance::AddChangeListener(const picojson::value& args, picojso user_data.get(), &watch_id); if (DATA_CONTROL_ERROR_NONE != result) { - LogAndReportError(ServiceNotAvailableException("AddChangeListener failed"), out, - ("AddChangeListener failed: %d (%s)", result, get_error_message(result))); + LogAndReportError(ServiceNotAvailableException("DataControlConsumerObjectAddChangeListener failed"), out, + ("DataControlConsumerObjectAddChangeListener failed: %d (%s)", result, get_error_message(result))); return; } @@ -1150,7 +1149,7 @@ void DatacontrolInstance::AddChangeListener(const picojson::value& args, picojso ReportSuccess(return_value, out); } -void DatacontrolInstance::RemoveChangeListener(const picojson::value& args, picojson::object& out) { +void DatacontrolInstance::DataControlConsumerObjectRemoveChangeListener(const picojson::value& args, picojson::object& out) { ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeDatasharing, &out); @@ -1160,8 +1159,8 @@ void DatacontrolInstance::RemoveChangeListener(const picojson::value& args, pico int watch_id = static_cast(args.get("watchId").get()); if (reply_map.end() == reply_map.find(watch_id)) { - LogAndReportError(IOException("RemoveChangeListener failed"), out, - ("RemoveChangeListener failed, watch_id: %d", watch_id)); + LogAndReportError(IOException("DataControlConsumerObjectRemoveChangeListener failed"), out, + ("DataControlConsumerObjectRemoveChangeListener failed, watch_id: %d", watch_id)); return; } data_control_h handle = reply_map[watch_id]->handle; @@ -1171,8 +1170,8 @@ void DatacontrolInstance::RemoveChangeListener(const picojson::value& args, pico if (DATA_CONTROL_ERROR_NONE != result) { // According to native documentation only IOError can be returned to webapi, other errors are // handled earlier - LogAndReportError(IOException("RemoveChangeListener failed"), out, - ("RemoveChangeListener failed: %d (%s)", result, get_error_message(result))); + LogAndReportError(IOException("DataControlConsumerObjectRemoveChangeListener failed"), out, + ("DataControlConsumerObjectRemoveChangeListener failed: %d (%s)", result, get_error_message(result))); return; } diff --git a/src/datacontrol/datacontrol_instance.h b/src/datacontrol/datacontrol_instance.h index 2412774..1a4f200 100644 --- a/src/datacontrol/datacontrol_instance.h +++ b/src/datacontrol/datacontrol_instance.h @@ -70,17 +70,17 @@ class DatacontrolInstance : public common::ParsedInstance { std::string* type); private: - void DataControlManagerGetdatacontrolconsumer(const picojson::value& args, picojson::object& out); + void DataControlManagerGetConsumer(const picojson::value& args, picojson::object& out); void SQLDataControlConsumerInsert(const picojson::value& args, picojson::object& out); void SQLDataControlConsumerUpdate(const picojson::value& args, picojson::object& out); void SQLDataControlConsumerRemove(const picojson::value& args, picojson::object& out); void SQLDataControlConsumerSelect(const picojson::value& args, picojson::object& out); - void MappedDataControlConsumerAddvalue(const picojson::value& args, picojson::object& out); - void MappedDataControlConsumerRemovevalue(const picojson::value& args, picojson::object& out); - void MappedDataControlConsumerGetvalue(const picojson::value& args, picojson::object& out); - void MappedDataControlConsumerUpdatevalue(const picojson::value& args, picojson::object& out); - void AddChangeListener(const picojson::value& args, picojson::object& out); - void RemoveChangeListener(const picojson::value& args, picojson::object& out); + void MappedDataControlConsumerAddValue(const picojson::value& args, picojson::object& out); + void MappedDataControlConsumerRemoveValue(const picojson::value& args, picojson::object& out); + void MappedDataControlConsumerGetValue(const picojson::value& args, picojson::object& out); + void MappedDataControlConsumerUpdateValue(const picojson::value& args, picojson::object& out); + void DataControlConsumerObjectAddChangeListener(const picojson::value& args, picojson::object& out); + void DataControlConsumerObjectRemoveChangeListener(const picojson::value& args, picojson::object& out); ReplyCallbackDataMap reply_map; }; diff --git a/src/download/download_api.js b/src/download/download_api.js index 2abd9a8..5ea0cf7 100755 --- a/src/download/download_api.js +++ b/src/download/download_api.js @@ -187,7 +187,7 @@ DownloadManager.prototype.start = function() { this.setListener(nativeParam.downloadId, args.downloadCallback); } - var result = native_.callSync('DownloadManager_start', nativeParam); + var result = native_.callSync('DownloadManagerStart', nativeParam); if (native_.isFailure(result)) { if ('NetworkError' === result.error.name) { @@ -216,7 +216,7 @@ DownloadManager.prototype.cancel = function() { 'the identifier does not match any download operation in progress' ); - var result = native_.callSync('DownloadManager_cancel', nativeParam); + var result = native_.callSync('DownloadManagerCancel', nativeParam); if (native_.isFailure(result)) { throw native_.getErrorObject(result); @@ -238,7 +238,7 @@ DownloadManager.prototype.pause = function() { 'the identifier does not match any download operation in progress' ); - var result = native_.callSync('DownloadManager_pause', nativeParam); + var result = native_.callSync('DownloadManagerPause', nativeParam); if (native_.isFailure(result)) { throw native_.getErrorObject(result); @@ -260,7 +260,7 @@ DownloadManager.prototype.abandon = function() { 'the identifier does not match any download operation in progress' ); - var result = native_.callSync('DownloadManager_abandon', nativeParam); + var result = native_.callSync('DownloadManagerAbandon', nativeParam); if (native_.isFailure(result)) { throw native_.getErrorObject(result); @@ -284,7 +284,7 @@ DownloadManager.prototype.resume = function() { 'the identifier does not match any download operation in progress' ); - var result = native_.callSync('DownloadManager_resume', nativeParam); + var result = native_.callSync('DownloadManagerResume', nativeParam); if (native_.isFailure(result)) { throw native_.getErrorObject(result); @@ -306,7 +306,7 @@ DownloadManager.prototype.getState = function() { 'the identifier does not match any download operation in progress' ); - var result = native_.callSync('DownloadManager_getState', nativeParam); + var result = native_.callSync('DownloadManagerGetState', nativeParam); if (native_.isSuccess(result)) { return native_.getResultObject(result); @@ -344,7 +344,7 @@ DownloadManager.prototype.getMIMEType = function() { 'the identifier does not match any download operation in progress' ); - var result = native_.callSync('DownloadManager_getMIMEType', nativeParam); + var result = native_.callSync('DownloadManagerGetMimeType', nativeParam); if (native_.isSuccess(result)) { return native_.getResultObject(result); diff --git a/src/download/download_instance.cc b/src/download/download_instance.cc index 02bd21b..0625e22 100644 --- a/src/download/download_instance.cc +++ b/src/download/download_instance.cc @@ -44,15 +44,21 @@ DownloadInstance::DownloadInstance() { ScopeLogger(); using std::placeholders::_1; using std::placeholders::_2; -#define REGISTER_SYNC(c, x) RegisterSyncHandler(c, std::bind(&DownloadInstance::x, this, _1, _2)); - REGISTER_SYNC("DownloadManager_getMIMEType", DownloadManagerGetmimetype); - REGISTER_SYNC("DownloadManager_start", DownloadManagerStart); - REGISTER_SYNC("DownloadManager_cancel", DownloadManagerCancel); - REGISTER_SYNC("DownloadManager_pause", DownloadManagerPause); - REGISTER_SYNC("DownloadManager_abandon", DownloadManagerAbandon); - REGISTER_SYNC("DownloadManager_resume", DownloadManagerResume); - REGISTER_SYNC("DownloadManager_getState", DownloadManagerGetstate); -#undef REGISTER_SYNC + + +#define REGISTER_METHOD(M) \ + RegisterSyncHandler(#M, std::bind(&DownloadInstance::M, this, _1, _2)) + + REGISTER_METHOD(DownloadManagerGetMimeType); + REGISTER_METHOD(DownloadManagerStart); + REGISTER_METHOD(DownloadManagerCancel); + REGISTER_METHOD(DownloadManagerPause); + REGISTER_METHOD(DownloadManagerAbandon); + REGISTER_METHOD(DownloadManagerResume); + REGISTER_METHOD(DownloadManagerGetState); + +#undef REGISTER_METHOD + std::lock_guard lock(instances_mutex_); instances_.push_back(this); @@ -840,7 +846,7 @@ void DownloadInstance::DownloadManagerResume(const picojson::value& args, picojs } } -void DownloadInstance::DownloadManagerGetstate(const picojson::value& args, picojson::object& out) { +void DownloadInstance::DownloadManagerGetState(const picojson::value& args, picojson::object& out) { ScopeLogger(); CHECK_EXIST(args, "downloadId", out) int downloadId, ret; @@ -899,7 +905,7 @@ void DownloadInstance::DownloadManagerGetstate(const picojson::value& args, pico } } -void DownloadInstance::DownloadManagerGetmimetype(const picojson::value& args, +void DownloadInstance::DownloadManagerGetMimeType(const picojson::value& args, picojson::object& out) { ScopeLogger(); CHECK_EXIST(args, "downloadId", out) diff --git a/src/download/download_instance.h b/src/download/download_instance.h index 7b4d772..ba2ad98 100644 --- a/src/download/download_instance.h +++ b/src/download/download_instance.h @@ -79,8 +79,8 @@ class DownloadInstance : public common::ParsedInstance { void DownloadManagerPause(const picojson::value& args, picojson::object& out); void DownloadManagerAbandon(const picojson::value& args, picojson::object& out); void DownloadManagerResume(const picojson::value& args, picojson::object& out); - void DownloadManagerGetstate(const picojson::value& args, picojson::object& out); - void DownloadManagerGetmimetype(const picojson::value& args, picojson::object& out); + void DownloadManagerGetState(const picojson::value& args, picojson::object& out); + void DownloadManagerGetMimeType(const picojson::value& args, picojson::object& out); bool GetDownloadID(const int download_id, int& native_download_id); diff --git a/src/exif/exif_api.js b/src/exif/exif_api.js index 841ad21..0c611c1 100644 --- a/src/exif/exif_api.js +++ b/src/exif/exif_api.js @@ -231,7 +231,7 @@ ExifManager.prototype.getExifInfo = function() { } }; - var result = native_.call('ExifManager_getExifInfo', { uri: args.uri }, callback); + var result = native_.call('ExifManagerGetExifInfo', { uri: args.uri }, callback); if (native_.isFailure(result)) { // since tizen 5.0 the only possible error type here is SecurityError @@ -282,7 +282,7 @@ ExifManager.prototype.saveExifInfo = function() { } }; - var result = native_.call('ExifManager_saveExifInfo', json, callback); + var result = native_.call('ExifManagerSaveExifInfo', json, callback); if (native_.isFailure(result)) { // since tizen 5.0 the only possible error type here is SecurityError @@ -331,7 +331,7 @@ ExifManager.prototype.getThumbnail = function() { } }; - var result = native_.call('ExifManager_getThumbnail', { uri: args.uri }, _callback); + var result = native_.call('ExifManagerGetThumbnail', { uri: args.uri }, _callback); if (native_.isFailure(result)) { // since tizen 5.0 the only possible error type here is SecurityError diff --git a/src/exif/exif_instance.cc b/src/exif/exif_instance.cc index 28ae74c..6454370 100644 --- a/src/exif/exif_instance.cc +++ b/src/exif/exif_instance.cc @@ -46,11 +46,14 @@ ExifInstance::ExifInstance() { using std::placeholders::_1; using std::placeholders::_2; -#define REGISTER_ASYNC(c, x) RegisterSyncHandler(c, std::bind(&ExifInstance::x, this, _1, _2)); - REGISTER_ASYNC("ExifManager_getExifInfo", ExifManagerGetExifInfo); - REGISTER_ASYNC("ExifManager_saveExifInfo", ExifManagerSaveExifInfo); - REGISTER_ASYNC("ExifManager_getThumbnail", ExifManagerGetThumbnail); -#undef REGISTER_ASYNC +#define REGISTER_METHOD(M) \ + RegisterSyncHandler(#M, std::bind(&ExifInstance::M, this, _1, _2)) + + REGISTER_METHOD(ExifManagerGetExifInfo); + REGISTER_METHOD(ExifManagerSaveExifInfo); + REGISTER_METHOD(ExifManagerGetThumbnail); + +#undef REGISTER_METHOD } ExifInstance::~ExifInstance() { diff --git a/src/feedback/feedback_api.js b/src/feedback/feedback_api.js index 378d91c..ff4eaf0 100755 --- a/src/feedback/feedback_api.js +++ b/src/feedback/feedback_api.js @@ -77,7 +77,7 @@ FeedbackManager.prototype.isPatternSupported = function(pattern, type) { { name: 'type', type: types_.ENUM, values: Object.keys(FeedbackType) } ]); - var result = native_.callSync('FeedbackManager_isPatternSupported', args); + var result = native_.callSync('FeedbackManagerIsPatternSupported', args); if (native_.isFailure(result)) { throw native_.getErrorObject(result); } @@ -105,7 +105,7 @@ FeedbackManager.prototype.play = function(pattern, type) { type: args.type ? args.type : 'any' }; - var result = native_.callSync('FeedbackManager_play', nativeParam); + var result = native_.callSync('FeedbackManagerPlay', nativeParam); if (native_.isFailure(result)) { throw native_.getErrorObject(result); } @@ -114,7 +114,7 @@ FeedbackManager.prototype.play = function(pattern, type) { FeedbackManager.prototype.stop = function() { var args = validator_.validateArgs(arguments, []); - var result = native_.callSync('FeedbackManager_stop', args); + var result = native_.callSync('FeedbackManagerStop', args); if (native_.isFailure(result)) { throw native_.getErrorObject(result); } diff --git a/src/feedback/feedback_instance.cc b/src/feedback/feedback_instance.cc index ac06ef5..c1fa714 100644 --- a/src/feedback/feedback_instance.cc +++ b/src/feedback/feedback_instance.cc @@ -48,18 +48,24 @@ FeedbackInstance::FeedbackInstance() ScopeLogger(); using std::placeholders::_1; using std::placeholders::_2; -#define REGISTER_SYNC(c, x) RegisterSyncHandler(c, std::bind(&FeedbackInstance::x, this, _1, _2)); - REGISTER_SYNC("FeedbackManager_isPatternSupported", IsPatternSupported); - REGISTER_SYNC("FeedbackManager_play", Play); - REGISTER_SYNC("FeedbackManager_stop", Stop); -#undef REGISTER_SYNC + + +#define REGISTER_METHOD(M) \ + RegisterSyncHandler(#M, std::bind(&FeedbackInstance::M, this, _1, _2)) + + REGISTER_METHOD(FeedbackManagerIsPatternSupported); + REGISTER_METHOD(FeedbackManagerPlay); + REGISTER_METHOD(FeedbackManagerStop); + +#undef REGISTER_METHOD + } FeedbackInstance::~FeedbackInstance() { ScopeLogger(); } -void FeedbackInstance::IsPatternSupported(const picojson::value& args, picojson::object& out) { +void FeedbackInstance::FeedbackManagerIsPatternSupported(const picojson::value& args, picojson::object& out) { ScopeLogger(); const auto pattern = args.get("pattern").get(); @@ -74,7 +80,7 @@ void FeedbackInstance::IsPatternSupported(const picojson::value& args, picojson: } } -void FeedbackInstance::Play(const picojson::value& args, picojson::object& out) { +void FeedbackInstance::FeedbackManagerPlay(const picojson::value& args, picojson::object& out) { ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeHaptic, &out); @@ -90,7 +96,7 @@ void FeedbackInstance::Play(const picojson::value& args, picojson::object& out) } } -void FeedbackInstance::Stop(const picojson::value& args, picojson::object& out) { +void FeedbackInstance::FeedbackManagerStop(const picojson::value& args, picojson::object& out) { ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeHaptic, &out); diff --git a/src/feedback/feedback_instance.h b/src/feedback/feedback_instance.h index 1978e2d..0799fe2 100644 --- a/src/feedback/feedback_instance.h +++ b/src/feedback/feedback_instance.h @@ -34,9 +34,9 @@ class FeedbackInstance : public common::ParsedInstance { private: std::shared_ptr m_feedbackMapsPtr; std::unique_ptr m_feedbackManagerPtr; - void IsPatternSupported(const picojson::value& args, picojson::object& out); - void Play(const picojson::value& args, picojson::object& out); - void Stop(const picojson::value& args, picojson::object& out); + void FeedbackManagerIsPatternSupported(const picojson::value& args, picojson::object& out); + void FeedbackManagerPlay(const picojson::value& args, picojson::object& out); + void FeedbackManagerStop(const picojson::value& args, picojson::object& out); }; } // namespace feedback diff --git a/src/filesystem/filesystem_instance.cc b/src/filesystem/filesystem_instance.cc index 1e93b7f..d52caf8 100644 --- a/src/filesystem/filesystem_instance.cc +++ b/src/filesystem/filesystem_instance.cc @@ -103,54 +103,60 @@ FilesystemInstance::FilesystemInstance() { using std::placeholders::_1; using std::placeholders::_2; -#define REGISTER_SYNC(c, x) RegisterSyncHandler(c, std::bind(&FilesystemInstance::x, this, _1, _2)); - - REGISTER_SYNC("File_stat", FileStat); - REGISTER_SYNC("File_statSync", FileStatSync); - REGISTER_SYNC("File_createSync", FileCreateSync); - REGISTER_SYNC("File_readDir", ReadDir); - REGISTER_SYNC("File_rename", FileRename); - REGISTER_SYNC("File_readBytes", FileReadBytes); - REGISTER_SYNC("File_readString", FileReadString); - REGISTER_SYNC("File_writeBytes", FileWriteBytes); - REGISTER_SYNC("File_writeBase64", FileWriteBase64); - REGISTER_SYNC("File_writeString", FileWriteString); - REGISTER_SYNC("Filesystem_fetchAllStorages", FilesystemFetchAllStorages) - REGISTER_SYNC("FileSystemManager_addStorageStateChangeListener", StartListening); - REGISTER_SYNC("FileSystemManager_removeStorageStateChangeListener", StopListening); - REGISTER_SYNC("FileSystemManager_fetchStorages", FileSystemManagerFetchStorages); - REGISTER_SYNC("FileSystemManager_mkdir", FileSystemManagerMakeDirectory); - REGISTER_SYNC("FileSystemManager_mkdirSync", FileSystemManagerMakeDirectorySync); - REGISTER_SYNC("File_unlinkFile", UnlinkFile); - REGISTER_SYNC("File_removeDirectory", RemoveDirectory); - REGISTER_SYNC("File_copyTo", CopyTo); - REGISTER_SYNC("FileSystemManager_getCanonicalPath", FileSystemManagerGetCanonicalPath); - - REGISTER_SYNC("FileSystemManager_openFile", FileSystemManagerOpenFile); - REGISTER_SYNC("FileSystemManager_createDirectory", FileSystemManagerCreateDirectory); - REGISTER_SYNC("FileSystemManager_deleteFile", FileSystemManagerDeleteFile); - REGISTER_SYNC("FileSystemManager_deleteDirectory", FileSystemManagerDeleteDirectory); - REGISTER_SYNC("FileSystemManager_copyFile", FileSystemManagerCopyFile); - REGISTER_SYNC("FileSystemManager_copyDirectory", FileSystemManagerCopyDirectory); - REGISTER_SYNC("FileSystemManager_moveFile", FileSystemManagerMoveFile); - REGISTER_SYNC("FileSystemManager_moveDirectory", FileSystemManagerMoveDirectory); - REGISTER_SYNC("FileSystemManager_rename", FileSystemManagerRename); - REGISTER_SYNC("FileSystemManager_listDirectory", FileSystemManagerListDirectory); - REGISTER_SYNC("FileSystemManager_isFile", FileSystemManagerIsFile); - REGISTER_SYNC("FileSystemManager_isDirectory", FileSystemManagerIsDirectory); - REGISTER_SYNC("FileSystemManager_pathExists", FileSystemManagerPathExists); - REGISTER_SYNC("FileSystemManager_getLimits", FileSystemManagerGetLimits); - - REGISTER_SYNC("FileHandle_seek", FileHandleSeek); - REGISTER_SYNC("FileHandle_readString", FileHandleReadString); - REGISTER_SYNC("FileHandle_writeString", FileHandleWriteString); - REGISTER_SYNC("FileHandle_readData", FileHandleReadData); - REGISTER_SYNC("FileHandle_writeData", FileHandleWriteData); - REGISTER_SYNC("FileHandle_flush", FileHandleFlush); - REGISTER_SYNC("FileHandle_sync", FileHandleSync); - REGISTER_SYNC("FileHandle_close", FileHandleClose); - -#undef REGISTER_SYNC + + + +#define REGISTER_METHOD(M) \ + RegisterSyncHandler(#M, std::bind(&FilesystemInstance::M, this, _1, _2)) + + REGISTER_METHOD(FileStat); + REGISTER_METHOD(FileStatSync); + REGISTER_METHOD(FileCreateSync); + REGISTER_METHOD(FileReadDir); + REGISTER_METHOD(FileRename); + REGISTER_METHOD(FileReadBytes); + REGISTER_METHOD(FileReadString); + REGISTER_METHOD(FileWriteBytes); + REGISTER_METHOD(FileWriteBase64); + REGISTER_METHOD(FileWriteString); + REGISTER_METHOD(FilesystemFetchAllStorages); + REGISTER_METHOD(FileSystemManagerAddStorageStateChangeListener); + REGISTER_METHOD(FileSystemManagerRemoveStorageStateChangeListener); + REGISTER_METHOD(FileSystemManagerFetchStorages); + REGISTER_METHOD(FileSystemManagerMakeDirectory); + REGISTER_METHOD(FileSystemManagerMakeDirectorySync); + REGISTER_METHOD(FileUnlinkFile); + REGISTER_METHOD(FileRemoveDirectory); + REGISTER_METHOD(FileCopyTo); + REGISTER_METHOD(FileSystemManagerGetCanonicalPath); + + REGISTER_METHOD(FileSystemManagerOpenFile); + REGISTER_METHOD(FileSystemManagerCreateDirectory); + REGISTER_METHOD(FileSystemManagerDeleteFile); + REGISTER_METHOD(FileSystemManagerDeleteDirectory); + REGISTER_METHOD(FileSystemManagerCopyFile); + REGISTER_METHOD(FileSystemManagerCopyDirectory); + REGISTER_METHOD(FileSystemManagerMoveFile); + REGISTER_METHOD(FileSystemManagerMoveDirectory); + REGISTER_METHOD(FileSystemManagerRename); + REGISTER_METHOD(FileSystemManagerListDirectory); + REGISTER_METHOD(FileSystemManagerIsFile); + REGISTER_METHOD(FileSystemManagerIsDirectory); + REGISTER_METHOD(FileSystemManagerPathExists); + REGISTER_METHOD(FileSystemManagerGetLimits); + + REGISTER_METHOD(FileHandleSeek); + REGISTER_METHOD(FileHandleReadString); + REGISTER_METHOD(FileHandleWriteString); + REGISTER_METHOD(FileHandleReadData); + REGISTER_METHOD(FileHandleWriteData); + REGISTER_METHOD(FileHandleFlush); + REGISTER_METHOD(FileHandleSync); + REGISTER_METHOD(FileHandleClose); + +#undef REGISTER_METHOD + + FilesystemManager::GetInstance().AddListener(this); } @@ -926,14 +932,14 @@ void FilesystemInstance::FileSystemManagerFetchStorages(const picojson::value& a FilesystemManager::GetInstance().FetchStorages(onSuccess, onError); } -void FilesystemInstance::StartListening(const picojson::value& args, picojson::object& out) { +void FilesystemInstance::FileSystemManagerAddStorageStateChangeListener(const picojson::value& args, picojson::object& out) { ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeFilesystemWrite, &out); FilesystemManager::GetInstance().StartListening(); ReportSuccess(out); } -void FilesystemInstance::StopListening(const picojson::value& args, picojson::object& out) { +void FilesystemInstance::FileSystemManagerRemoveStorageStateChangeListener(const picojson::value& args, picojson::object& out) { ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeFilesystemWrite, &out); FilesystemManager::GetInstance().StopListening(); @@ -1014,7 +1020,7 @@ void FilesystemInstance::FileSystemManagerMakeDirectorySync(const picojson::valu FilesystemManager::GetInstance().MakeDirectory(location, onResult); } -void FilesystemInstance::ReadDir(const picojson::value& args, picojson::object& out) { +void FilesystemInstance::FileReadDir(const picojson::value& args, picojson::object& out) { ScopeLogger(); LoggerW( "DEPRECATION WARNING: File.listFiles() is deprecated since Tizen 5.0. Use " @@ -1063,7 +1069,7 @@ void FilesystemInstance::ReadDir(const picojson::value& args, picojson::object& std::bind(&FilesystemManager::ReadDir, &fm, pathToDir, onSuccess, onError)); } -void FilesystemInstance::UnlinkFile(const picojson::value& args, picojson::object& out) { +void FilesystemInstance::FileUnlinkFile(const picojson::value& args, picojson::object& out) { ScopeLogger(); LoggerW( "DEPRECATION WARNING: File.deleteFile() is deprecated since Tizen 5.0. Use " @@ -1099,7 +1105,7 @@ void FilesystemInstance::UnlinkFile(const picojson::value& args, picojson::objec std::bind(&FilesystemManager::UnlinkFile, &fm, pathToFile, onSuccess, onError)); } -void FilesystemInstance::RemoveDirectory(const picojson::value& args, picojson::object& out) { +void FilesystemInstance::FileRemoveDirectory(const picojson::value& args, picojson::object& out) { ScopeLogger(); LoggerW( "DEPRECATION WARNING: File.deleteDirectory() is deprecated since Tizen 5.0. Use " @@ -1135,7 +1141,7 @@ void FilesystemInstance::RemoveDirectory(const picojson::value& args, picojson:: std::bind(&FilesystemManager::RemoveDirectory, &fm, pathToDelete, onSuccess, onError)); } -void FilesystemInstance::CopyTo(const picojson::value& args, picojson::object& out) { +void FilesystemInstance::FileCopyTo(const picojson::value& args, picojson::object& out) { ScopeLogger(); LoggerW( "DEPRECATION WARNING: File.copyTo() is deprecated since Tizen 5.0. Use " diff --git a/src/filesystem/filesystem_instance.h b/src/filesystem/filesystem_instance.h index f3a6730..60526f2 100644 --- a/src/filesystem/filesystem_instance.h +++ b/src/filesystem/filesystem_instance.h @@ -70,12 +70,12 @@ class FilesystemInstance : public common::ParsedInstance, FilesystemStateChangeL void FileSystemManagerFetchStorages(const picojson::value& args, picojson::object& out); void FileSystemManagerMakeDirectory(const picojson::value& args, picojson::object& out); void FileSystemManagerMakeDirectorySync(const picojson::value& args, picojson::object& out); - void ReadDir(const picojson::value& args, picojson::object& out); - void UnlinkFile(const picojson::value& args, picojson::object& out); - void RemoveDirectory(const picojson::value& args, picojson::object& out); - void StartListening(const picojson::value& args, picojson::object& out); - void StopListening(const picojson::value& args, picojson::object& out); - void CopyTo(const picojson::value& args, picojson::object& out); + void FileReadDir(const picojson::value& args, picojson::object& out); + void FileUnlinkFile(const picojson::value& args, picojson::object& out); + void FileRemoveDirectory(const picojson::value& args, picojson::object& out); + void FileSystemManagerAddStorageStateChangeListener(const picojson::value& args, picojson::object& out); + void FileSystemManagerRemoveStorageStateChangeListener(const picojson::value& args, picojson::object& out); + void FileCopyTo(const picojson::value& args, picojson::object& out); void onFilesystemStateChangeErrorCallback(); void onFilesystemStateChangeSuccessCallback(const common::Storage& storage); void PrepareError(const FilesystemError& error, picojson::object& out); diff --git a/src/filesystem/js/common.js b/src/filesystem/js/common.js index 2a62d99..bf097b1 100644 --- a/src/filesystem/js/common.js +++ b/src/filesystem/js/common.js @@ -114,7 +114,7 @@ var commonFS_ = (function() { if (cacheReady) { return; } - var result = native_.callSync('Filesystem_fetchAllStorages', {}); + var result = native_.callSync('FilesystemFetchAllStorages', {}); if (native_.isFailure(result)) { throw native_.getErrorObject(result); } @@ -132,7 +132,7 @@ var commonFS_ = (function() { // (global paths usage issue workaround) initHomeDir(); - var result = native_.callSync('FileSystemManager_fetchStorages', {}); + var result = native_.callSync('FileSystemManagerFetchStorages', {}); if (native_.isFailure(result)) { throw native_.getErrorObject(result); } @@ -380,7 +380,7 @@ var commonFS_ = (function() { } function toCanonicalPath(path) { - var result = native_.callSync('FileSystemManager_getCanonicalPath', { + var result = native_.callSync('FileSystemManagerGetCanonicalPath', { path: path }); if (native_.isFailure(result)) { diff --git a/src/filesystem/js/file.js b/src/filesystem/js/file.js index 23a6105..63933cc 100644 --- a/src/filesystem/js/file.js +++ b/src/filesystem/js/file.js @@ -17,7 +17,7 @@ function File(data) { function fileSizeGetter() { var _realPath = commonFS_.toRealPath(this.fullPath); - var _result = native_.callSync('File_statSync', { location: _realPath }); + var _result = native_.callSync('FileStatSync', { location: _realPath }); var _aStatObj = native_.getResultObject(_result); return _aStatObj.isFile ? _aStatObj.size : undefined; } @@ -30,7 +30,7 @@ function File(data) { // prevent recursive - only one parent var _parentPath = data.path; var _location = { location: commonFS_.toRealPath(_parentPath) }; - var _result = native_.callSync('File_statSync', _location); + var _result = native_.callSync('FileStatSync', _location); var _statObj = native_.getResultObject(_result); var _info = commonFS_.getFileInfo(_statObj, true); return new File(_info); @@ -233,7 +233,7 @@ function listFiles() { native_.callIfPossible(args.onsuccess, _result); }; - native_.call('File_readDir', data, callback); + native_.call('FileReadDir', data, callback); } File.prototype.listFiles = function() { @@ -302,7 +302,7 @@ function openStream() { args.encoding = _checkEncoding(args.encoding); var _realPath = commonFS_.toRealPath(this.fullPath); - var _result = native_.callSync('File_statSync', { location: _realPath }); + var _result = native_.callSync('FileStatSync', { location: _realPath }); if (native_.isFailure(_result)) { setTimeout(function() { native_.callIfPossible( @@ -362,7 +362,7 @@ function readAsText() { function readFile() { var result; - result = native_.callSync('File_readString', data); + result = native_.callSync('FileReadString', data); if (native_.isFailure(result)) { setTimeout(function() { native_.callIfPossible(args.onerror, native_.getErrorObject(result)); @@ -464,7 +464,7 @@ function copyTo() { return; } - var resultOldPath = native_.callSync('File_statSync', { + var resultOldPath = native_.callSync('FileStatSync', { location: _realOriginalPath }); if (native_.isFailure(resultOldPath)) { @@ -478,7 +478,7 @@ function copyTo() { var addFileName = false; var lastChar = _realDestinationPath.substr(_realDestinationPath.length - 1); - var resultNewPath = native_.callSync('File_statSync', { + var resultNewPath = native_.callSync('FileStatSync', { location: _realDestinationPath }); if (native_.isSuccess(resultNewPath)) { @@ -499,7 +499,7 @@ function copyTo() { _realDestinationPath.lastIndexOf('/') + 1 ); - var resultDestinationDirectory = native_.callSync('File_statSync', { + var resultDestinationDirectory = native_.callSync('FileStatSync', { location: destinationDirectoryPath }); if (native_.isFailure(resultDestinationDirectory)) { @@ -522,7 +522,7 @@ function copyTo() { } if (!args.overwrite) { - var resultPath = native_.callSync('File_statSync', { + var resultPath = native_.callSync('FileStatSync', { location: _realDestinationPath }); if (native_.isSuccess(resultPath)) { @@ -578,7 +578,7 @@ function copyTo() { native_.callIfPossible(args.onsuccess); }; - native_.call('File_copyTo', data, callback); + native_.call('FileCopyTo', data, callback); } File.prototype.copyTo = function() { @@ -662,7 +662,7 @@ function moveTo() { return; } - var resultOldPath = native_.callSync('File_statSync', { + var resultOldPath = native_.callSync('FileStatSync', { location: _realOriginalPath }); if (native_.isFailure(resultOldPath)) { @@ -679,7 +679,7 @@ function moveTo() { } if (!args.overwrite) { - var resultNewPath = native_.callSync('File_statSync', { + var resultNewPath = native_.callSync('FileStatSync', { location: _realDestinationPath }); if (native_.isSuccess(resultNewPath)) { @@ -734,7 +734,7 @@ function moveTo() { native_.callIfPossible(args.onsuccess); }; - native_.call('File_rename', data, callback); + native_.call('FileRename', data, callback); } File.prototype.moveTo = function() { @@ -789,7 +789,7 @@ function createDirectory() { ); } - var _resultExist = native_.callSync('File_statSync', { location: _realNewPath }); + var _resultExist = native_.callSync('FileStatSync', { location: _realNewPath }); if (native_.isSuccess(_resultExist)) { throw new WebAPIException( WebAPIException.INVALID_VALUES_ERR, @@ -797,7 +797,7 @@ function createDirectory() { ); } - var result = native_.callSync('FileSystemManager_mkdirSync', { + var result = native_.callSync('FileSystemManagerMakeDirectorySync', { location: _realNewPath }); if (native_.isFailure(result)) { @@ -807,7 +807,7 @@ function createDirectory() { ); } - var _result = native_.callSync('File_statSync', { location: _realNewPath }); + var _result = native_.callSync('FileStatSync', { location: _realNewPath }); _statObj = native_.getResultObject(_result); _fileInfo = commonFS_.getFileInfo(_statObj, false, this.mode); @@ -874,18 +874,18 @@ function createFile() { ); } - var _resultExist = native_.callSync('File_statSync', { location: _outputRealPath }); + var _resultExist = native_.callSync('FileStatSync', { location: _outputRealPath }); if (native_.isSuccess(_resultExist)) { throw new WebAPIException(WebAPIException.IO_ERR, 'Overwrite is not allowed'); } - var result = native_.callSync('File_createSync', { location: _outputRealPath }); + var result = native_.callSync('FileCreateSync', { location: _outputRealPath }); if (native_.isFailure(result)) { throw native_.getErrorObject(result); } - var _result = native_.callSync('File_statSync', { location: _outputRealPath }); + var _result = native_.callSync('FileStatSync', { location: _outputRealPath }); var _statObj = native_.getResultObject(_result); var _fileInfo = commonFS_.getFileInfo(_statObj, false, this.mode); @@ -944,7 +944,7 @@ function resolveFile() { ); } - var _result = native_.callSync('File_statSync', { location: _realPath }); + var _result = native_.callSync('FileStatSync', { location: _realPath }); if (native_.isFailure(_result)) { throw new WebAPIException( WebAPIException.NOT_FOUND_ERR, @@ -1020,7 +1020,7 @@ function deleteDirectory() { return; } - var _result = native_.callSync('File_statSync', { location: _myPath }); + var _result = native_.callSync('FileStatSync', { location: _myPath }); if (native_.isFailure(_result)) { setTimeout(function() { native_.callIfPossible( @@ -1076,7 +1076,7 @@ function deleteDirectory() { native_.callIfPossible(args.onsuccess); }; - native_.call('File_removeDirectory', data, callback); + native_.call('FileRemoveDirectory', data, callback); }, function() { native_.callIfPossible( @@ -1144,7 +1144,7 @@ function deleteFile() { var _fileRealPath = commonFS_.toRealPath(args.filePath); - var _result = native_.callSync('File_statSync', { location: _fileRealPath }); + var _result = native_.callSync('FileStatSync', { location: _fileRealPath }); if (native_.isFailure(_result)) { setTimeout(function() { native_.callIfPossible( @@ -1199,7 +1199,7 @@ function deleteFile() { native_.callIfPossible(args.onsuccess); }; - native_.call('File_unlinkFile', data, callback); + native_.call('FileUnlinkFile', data, callback); } File.prototype.deleteFile = function() { diff --git a/src/filesystem/js/file_handle.js b/src/filesystem/js/file_handle.js index 47ab983..3356350 100644 --- a/src/filesystem/js/file_handle.js +++ b/src/filesystem/js/file_handle.js @@ -43,7 +43,7 @@ FileHandle.prototype.seek = function() { } else { data.whence = args.whence; } - var result = native_.callSync('FileHandle_seek', data); + var result = native_.callSync('FileHandleSeek', data); if (native_.isFailure(result)) { throw native_.getErrorObject(result); } @@ -92,7 +92,7 @@ FileHandle.prototype.seekNonBlocking = function() { } }; - var result = native_.call('FileHandle_seek', data, callback); + var result = native_.call('FileHandleSeek', data, callback); if (native_.isFailure(result)) { setTimeout(function() { native_.callIfPossible(args.errorCallback, native_.getErrorObject(result)); @@ -118,7 +118,7 @@ FileHandle.prototype.readString = function() { if (!type_.isNullOrUndefined(args.count)) { data.count = args.count; } - var result = native_.callSync('FileHandle_readString', data); + var result = native_.callSync('FileHandleReadString', data); if (native_.isFailure(result)) { throw native_.getErrorObject(result); @@ -172,7 +172,7 @@ FileHandle.prototype.readStringNonBlocking = function() { } }; - var result = native_.call('FileHandle_readString', data, callback); + var result = native_.call('FileHandleReadString', data, callback); if (native_.isFailure(result)) { var err = native_.getErrorObject(result); @@ -201,7 +201,7 @@ FileHandle.prototype.writeString = function() { ); } var data = { id: this.id, string: args.string, encoding: args.outputEncoding }; - var result = native_.callSync('FileHandle_writeString', data); + var result = native_.callSync('FileHandleWriteString', data); if (native_.isFailure(result)) { throw native_.getErrorObject(result); @@ -257,7 +257,7 @@ FileHandle.prototype.writeStringNonBlocking = function() { } }; - var result = native_.call('FileHandle_writeString', data, callback); + var result = native_.call('FileHandleWriteString', data, callback); if (native_.isFailure(result)) { var err = native_.getErrorObject(result); @@ -289,7 +289,7 @@ FileHandle.prototype.readBlob = function() { if (!type_.isNullOrUndefined(args.size)) { data.size = args.size; } - var result = native_.call('FileHandle_readData', data); + var result = native_.call('FileHandleReadData', data); if (native_.isFailure(result)) { throw native_.getErrorObject(result); @@ -335,7 +335,7 @@ FileHandle.prototype.readBlobNonBlocking = function() { } }; - var result = native_.call('FileHandle_readData', data, callback); + var result = native_.call('FileHandleReadData', data, callback); if (native_.isFailure(result)) { var err = native_.getErrorObject(result); @@ -381,7 +381,7 @@ FileHandle.prototype.writeBlob = function() { var encodedData = ArrayToString(blobToUint8Array(args.blob)); var data = { id: this.id, data: encodedData }; - var result = native_.callSync('FileHandle_writeData', data); + var result = native_.callSync('FileHandleWriteData', data); if (native_.isFailure(result)) { throw native_.getErrorObject(result); } @@ -429,7 +429,7 @@ FileHandle.prototype.writeBlobNonBlocking = function() { } }; - var result = native_.call('FileHandle_writeData', data, callback); + var result = native_.call('FileHandleWriteData', data, callback); // Only IOError is possible to be returned synchronously, so it is passed to // errorCallback in each case. @@ -458,7 +458,7 @@ FileHandle.prototype.readData = function() { if (!type_.isNullOrUndefined(args.size)) { data.size = args.size; } - var result = native_.callSync('FileHandle_readData', data); + var result = native_.callSync('FileHandleReadData', data); if (native_.isFailure(result)) { throw native_.getErrorObject(result); @@ -517,7 +517,7 @@ FileHandle.prototype.readDataNonBlocking = function() { } }; - var result = native_.call('FileHandle_readData', data, callback); + var result = native_.call('FileHandleReadData', data, callback); if (native_.isFailure(result)) { var err = native_.getErrorObject(result); @@ -545,7 +545,7 @@ FileHandle.prototype.writeData = function() { } var encodedData = ArrayToString(args.data); var data = { id: this.id, data: encodedData }; - var result = native_.callSync('FileHandle_writeData', data); + var result = native_.callSync('FileHandleWriteData', data); if (native_.isFailure(result)) { throw native_.getErrorObject(result); @@ -596,7 +596,7 @@ FileHandle.prototype.writeDataNonBlocking = function() { } }; - var result = native_.call('FileHandle_writeData', data, callback); + var result = native_.call('FileHandleWriteData', data, callback); // Only IOError is possible to be returned synchronously, so it is passed to // errorCallback in each case. @@ -618,7 +618,7 @@ FileHandle.prototype.flush = function() { ); } var data = { id: this.id }; - var result = native_.callSync('FileHandle_flush', data); + var result = native_.callSync('FileHandleFlush', data); if (native_.isFailure(result)) { throw native_.getErrorObject(result); @@ -666,7 +666,7 @@ FileHandle.prototype.flushNonBlocking = function() { } }; - var result = native_.call('FileHandle_flush', data, callback); + var result = native_.call('FileHandleFlush', data, callback); // Only IOError is possible to be returned synchronously, so it is passed to // errorCallback in each case. @@ -689,7 +689,7 @@ FileHandle.prototype.sync = function() { } var data = { id: this.id }; - var result = native_.callSync('FileHandle_sync', data); + var result = native_.callSync('FileHandleSync', data); if (native_.isFailure(result)) { throw native_.getErrorObject(result); @@ -737,7 +737,7 @@ FileHandle.prototype.syncNonBlocking = function() { } }; - var result = native_.call('FileHandle_sync', data, callback); + var result = native_.call('FileHandleSync', data, callback); // Only IOError is possible to be returned synchronously, so it is passed to // errorCallback in each case. @@ -753,7 +753,7 @@ FileHandle.prototype.close = function() { throw new WebAPIException(WebAPIException.IO_ERR, 'FileHandle is not opened'); } var data = { id: this.id }; - var result = native_.callSync('FileHandle_close', data); + var result = native_.callSync('FileHandleClose', data); this.state = 'closed'; if (native_.isFailure(result)) { throw native_.getErrorObject(result); @@ -789,7 +789,7 @@ FileHandle.prototype.closeNonBlocking = function() { } }; - var result = native_.call('FileHandle_close', data, callback); + var result = native_.call('FileHandleClose', data, callback); this.state = 'closed'; // Only IOError is possible to be returned synchronously, so it is passed to diff --git a/src/filesystem/js/file_stream.js b/src/filesystem/js/file_stream.js index 61add68..dda1f5d 100644 --- a/src/filesystem/js/file_stream.js +++ b/src/filesystem/js/file_stream.js @@ -134,7 +134,7 @@ function read() { length: args.charCount > _count ? _count : args.charCount }; - var result = native_.callSync('File_readString', data); + var result = native_.callSync('FileReadString', data); if (native_.isFailure(result)) { throw new WebAPIException(WebAPIException.IO_ERR, 'Could not read'); } @@ -178,7 +178,7 @@ function readBytes() { length: args.byteCount > _count ? _count : args.byteCount }; - var result = native_.callSync('File_readBytes', data); + var result = native_.callSync('FileReadBytes', data); if (native_.isFailure(result)) { throw new WebAPIException(WebAPIException.INVALID_VALUES_ERR, 'Could not read'); } @@ -259,7 +259,7 @@ function write() { check_characters_outside_latin1(data.data); } - var result = native_.callSync('File_writeString', data); + var result = native_.callSync('FileWriteString', data); if (native_.isFailure(result)) { throw new WebAPIException(WebAPIException.IO_ERR, 'Could not write'); @@ -306,7 +306,7 @@ function writeBytes() { truncate: this._truncate }; - var result = native_.callSync('File_writeBytes', data); + var result = native_.callSync('FileWriteBytes', data); if (native_.isFailure(result)) { throw new WebAPIException(WebAPIException.IO_ERR, 'Could not write'); @@ -342,7 +342,7 @@ function writeBase64() { truncate: this._truncate }; - var result = native_.callSync('File_writeBase64', data); + var result = native_.callSync('FileWriteBase64', data); if (native_.isFailure(result)) { throw native_.getErrorObject(result); diff --git a/src/filesystem/js/file_system_manager.js b/src/filesystem/js/file_system_manager.js index 31ac065..37d65b4 100644 --- a/src/filesystem/js/file_system_manager.js +++ b/src/filesystem/js/file_system_manager.js @@ -33,7 +33,7 @@ FileStreamManager.prototype.getNextFileHandleId = function() { var fileStreamManager = new FileStreamManager(); function FileSystemManager() { - var limits = native_.getResultObject(native_.callSync('FileSystemManager_getLimits')); + var limits = native_.getResultObject(native_.callSync('FileSystemManagerGetLimits')); Object.defineProperties(this, { maxNameLength: { value: limits[0], writable: false, enumerable: true }, maxPathLength: { value: limits[1], writable: false, enumerable: true } @@ -65,7 +65,7 @@ FileSystemManager.prototype.openFile = function() { ); } - var result = native_.callSync('FileSystemManager_openFile', data); + var result = native_.callSync('FileSystemManagerOpenFile', data); if (native_.isFailure(result)) { throw native_.getErrorObject(result); } else { @@ -108,7 +108,7 @@ FileSystemManager.prototype.createDirectory = function() { } }; - var result = native_.call('FileSystemManager_createDirectory', data, callback); + var result = native_.call('FileSystemManagerCreateDirectory', data, callback); if (native_.isFailure(result)) { throw native_.getErrorObject(result); } @@ -144,7 +144,7 @@ FileSystemManager.prototype.deleteFile = function() { } }; - var result = native_.call('FileSystemManager_deleteFile', data, callback); + var result = native_.call('FileSystemManagerDeleteFile', data, callback); if (native_.isFailure(result)) { throw native_.getErrorObject(result); } @@ -183,7 +183,7 @@ FileSystemManager.prototype.deleteDirectory = function() { } }; - var result = native_.call('FileSystemManager_deleteDirectory', data, callback); + var result = native_.call('FileSystemManagerDeleteDirectory', data, callback); if (native_.isFailure(result)) { throw native_.getErrorObject(result); } @@ -235,7 +235,7 @@ FileSystemManager.prototype.copyFile = function() { } }; - var result = native_.call('FileSystemManager_copyFile', data, callback); + var result = native_.call('FileSystemManagerCopyFile', data, callback); if (native_.isFailure(result)) { throw native_.getErrorObject(result); } @@ -280,7 +280,7 @@ FileSystemManager.prototype.copyDirectory = function() { } }; - var result = native_.call('FileSystemManager_copyDirectory', data, callback); + var result = native_.call('FileSystemManagerCopyDirectory', data, callback); if (native_.isFailure(result)) { throw native_.getErrorObject(result); } @@ -325,7 +325,7 @@ FileSystemManager.prototype.moveFile = function() { } }; - var result = native_.call('FileSystemManager_moveFile', data, callback); + var result = native_.call('FileSystemManagerMoveFile', data, callback); if (native_.isFailure(result)) { throw native_.getErrorObject(result); } @@ -370,7 +370,7 @@ FileSystemManager.prototype.moveDirectory = function() { } }; - var result = native_.call('FileSystemManager_moveDirectory', data, callback); + var result = native_.call('FileSystemManagerMoveDirectory', data, callback); if (native_.isFailure(result)) { throw native_.getErrorObject(result); } @@ -412,7 +412,7 @@ FileSystemManager.prototype.rename = function() { } }; - var result = native_.call('FileSystemManager_rename', data, callback); + var result = native_.call('FileSystemManagerRename', data, callback); if (native_.isFailure(result)) { throw native_.getErrorObject(result); } @@ -488,7 +488,7 @@ FileSystemManager.prototype.listDirectory = function() { } }; - var result = native_.call('FileSystemManager_listDirectory', data, callback); + var result = native_.call('FileSystemManagerListDirectory', data, callback); if (native_.isFailure(result)) { throw native_.getErrorObject(result); } @@ -526,7 +526,7 @@ FileSystemManager.prototype.isFile = function() { var data = { path: realPath }; - var result = native_.callSync('FileSystemManager_isFile', data); + var result = native_.callSync('FileSystemManagerIsFile', data); if (native_.isFailure(result)) { throw native_.getErrorObject(result); } else { @@ -549,7 +549,7 @@ FileSystemManager.prototype.isDirectory = function() { var data = { path: realPath }; - var result = native_.callSync('FileSystemManager_isDirectory', data); + var result = native_.callSync('FileSystemManagerIsDirectory', data); if (native_.isFailure(result)) { throw native_.getErrorObject(result); } else { @@ -571,7 +571,7 @@ FileSystemManager.prototype.pathExists = function() { } var data = { path: realPath }; - var result = native_.callSync('FileSystemManager_pathExists', data); + var result = native_.callSync('FileSystemManagerPathExists', data); if (native_.isFailure(result)) { throw native_.getErrorObject(result); } else { @@ -713,7 +713,7 @@ function resolve() { } }; - var ret = native_.call('File_stat', data, callback); + var ret = native_.call('FileStat', data, callback); if (native_.isFailure(ret)) { throw native_.getErrorObject(ret); } @@ -803,7 +803,7 @@ function addStorageStateChangeListener() { if (register) { native_.addListener('StorageStateChangeListener', _StorageStateChangeListener); var result = native_.callSync( - 'FileSystemManager_addStorageStateChangeListener', + 'FileSystemManagerAddStorageStateChangeListener', {} ); @@ -837,7 +837,7 @@ function removeStorageStateChangeListener() { if (type_.isEmptyObject(callbacks)) { var result = native_.callSync( - 'FileSystemManager_removeStorageStateChangeListener', + 'FileSystemManagerRemoveStorageStateChangeListener', {} ); if (native_.isFailure(result)) { diff --git a/src/humanactivitymonitor/humanactivitymonitor_api.js b/src/humanactivitymonitor/humanactivitymonitor_api.js index 92b9fc5..f023dea 100755 --- a/src/humanactivitymonitor/humanactivitymonitor_api.js +++ b/src/humanactivitymonitor/humanactivitymonitor_api.js @@ -286,7 +286,7 @@ HumanActivityMonitorManager.prototype.getHumanActivityData = function( }; var result = native_.call( - 'HumanActivityMonitorManager_getHumanActivityData', + 'HumanActivityMonitorManagerGetHumanActivityData', data, callback ); @@ -311,7 +311,7 @@ function startListener(listenerId, listener, method, data) { function checkPrivilegesForMethod(method, type) { utils_.checkPrivilegeAccess(utils_.privilege.HEALTHINFO); - if ('HumanActivityMonitorManager_stop' === method && 'GPS' === type) { + if ('HumanActivityMonitorManagerStop' === method && 'GPS' === type) { utils_.checkPrivilegeAccess(utils_.privilege.LOCATION); } } @@ -432,7 +432,7 @@ HumanActivityMonitorManager.prototype.start = function(type, changedCallback) { utils_.log( 'callbackInterval = ' + callbackInterval + ', sampleInterval = ' + sampleInterval ); - startListener(listenerId, listener, 'HumanActivityMonitorManager_start', { + startListener(listenerId, listener, 'HumanActivityMonitorManagerStart', { type: args.type, listenerId: listenerId, callbackInterval: callbackInterval, @@ -485,7 +485,7 @@ HumanActivityMonitorManager.prototype.stop = function(type) { if (HumanActivityType.PEDOMETER === args.type) { stopListener( 'HumanActivityMonitor_PEDOMETER', - 'HumanActivityMonitorManager_stop', + 'HumanActivityMonitorManagerStop', { type: HumanActivityType.PEDOMETER }, pedometerListener && !accumulativePedometerListener ); @@ -493,7 +493,7 @@ HumanActivityMonitorManager.prototype.stop = function(type) { } else { stopListener( 'HumanActivityMonitor_' + args.type, - 'HumanActivityMonitorManager_stop', + 'HumanActivityMonitorManagerStop', { type: args.type }, true ); @@ -525,7 +525,7 @@ HumanActivityMonitorManager.prototype.setAccumulativePedometerListener = functio HumanActivityMonitorManager.prototype.unsetAccumulativePedometerListener = function() { stopListener( 'HumanActivityMonitor_PEDOMETER', - 'HumanActivityMonitorManager_stop', + 'HumanActivityMonitorManagerStop', { type: HumanActivityType.PEDOMETER }, accumulativePedometerListener && !pedometerListener ); @@ -540,7 +540,7 @@ HumanActivityMonitorManager.prototype.addActivityRecognitionListener = function( ]); var result = native_.call( - 'HumanActivityMonitorManager_addActivityRecognitionListener', + 'HumanActivityMonitorManagerAddActivityRecognitionListener', { type: args.type, listenerId: activityRecognitionListener.listenerName } ); if (native_.isFailure(result)) { @@ -560,7 +560,7 @@ HumanActivityMonitorManager.prototype.removeActivityRecognitionListener = functi ]); var result = native_.call( - 'HumanActivityMonitorManager_removeActivityRecognitionListener', + 'HumanActivityMonitorManagerRemoveActivityRecognitionListener', { watchId: args.watchId } ); if (native_.isFailure(result)) { @@ -600,7 +600,7 @@ HumanActivityMonitorManager.prototype.startRecorder = function() { callArgs.type = args.type; - var result = native_.callSync('HumanActivityMonitorManager_startRecorder', callArgs); + var result = native_.callSync('HumanActivityMonitorManagerStartRecorder', callArgs); if (native_.isFailure(result)) { throw native_.getErrorObject(result); @@ -619,7 +619,7 @@ HumanActivityMonitorManager.prototype.stopRecorder = function() { var callArgs = {}; callArgs.type = args.type; - var result = native_.callSync('HumanActivityMonitorManager_stopRecorder', callArgs); + var result = native_.callSync('HumanActivityMonitorManagerStopRecorder', callArgs); if (native_.isFailure(result)) { throw native_.getErrorObject(result); @@ -674,7 +674,7 @@ HumanActivityMonitorManager.prototype.readRecorderData = function() { }; var result = native_.call( - 'HumanActivityMonitorManager_readRecorderData', + 'HumanActivityMonitorManagerReadRecorderData', callArgs, callback ); @@ -696,7 +696,7 @@ HumanActivityMonitorManager.prototype.isGestureSupported = function() { var callArgs = {}; callArgs.type = args.type; - var result = native_.callSync('GestureManager_isGestureSupported', callArgs); + var result = native_.callSync('GestureManagerIsGestureSupported', callArgs); if (native_.isFailure(result)) { throw native_.getErrorObject(result); } @@ -764,7 +764,7 @@ GestureListenerManager.prototype.addListener = function( var typeCountMap = alwaysOn ? this.typeCountMapAlwaysOn : this.typeCountMapDefault; if (typeCountMap[type] === 0) { var result = this.native.callSync( - 'GestureManager_addGestureRecognitionListener', + 'GestureManagerAddGestureRecognitionListener', listener ); if (this.native.isFailure(result)) { @@ -793,7 +793,7 @@ GestureListenerManager.prototype.removeListener = function(watchId) { if (typeCountMap[listener.type] === 1) { var result = this.native.callSync( - 'GestureManager_removeGestureRecognitionListener', + 'GestureManagerRemoveGestureRecognitionListener', listener ); if (this.native.isFailure(result)) { diff --git a/src/humanactivitymonitor/humanactivitymonitor_instance.cc b/src/humanactivitymonitor/humanactivitymonitor_instance.cc index 39fceb7..ca17b35 100644 --- a/src/humanactivitymonitor/humanactivitymonitor_instance.cc +++ b/src/humanactivitymonitor/humanactivitymonitor_instance.cc @@ -48,28 +48,25 @@ HumanActivityMonitorInstance::HumanActivityMonitorInstance() : gesture_manager_( using std::placeholders::_1; using std::placeholders::_2; -#define REGISTER_SYNC(c, x) \ - RegisterSyncHandler(c, std::bind(&HumanActivityMonitorInstance::x, this, _1, _2)); - REGISTER_SYNC("HumanActivityMonitorManager_getHumanActivityData", - HumanActivityMonitorManagerGetHumanActivityData); - REGISTER_SYNC("HumanActivityMonitorManager_start", HumanActivityMonitorManagerStart); - REGISTER_SYNC("HumanActivityMonitorManager_stop", HumanActivityMonitorManagerStop); - REGISTER_SYNC("HumanActivityMonitorManager_addActivityRecognitionListener", - HumanActivityMonitorManagerAddActivityRecognitionListener); - REGISTER_SYNC("HumanActivityMonitorManager_removeActivityRecognitionListener", - HumanActivityMonitorManagerRemoveActivityRecognitionListener); - REGISTER_SYNC("HumanActivityMonitorManager_startRecorder", - HumanActivityMonitorManagerStartRecorder); - REGISTER_SYNC("HumanActivityMonitorManager_stopRecorder", - HumanActivityMonitorManagerStopRecorder); - REGISTER_SYNC("HumanActivityMonitorManager_readRecorderData", - HumanActivityMonitorManagerReadRecorderData); - REGISTER_SYNC("GestureManager_isGestureSupported", GestureManagerIsGestureSupported); - REGISTER_SYNC("GestureManager_addGestureRecognitionListener", - GestureManagerAddGestureRecognitionListener); - REGISTER_SYNC("GestureManager_removeGestureRecognitionListener", - GestureManagerRemoveGestureRecognitionListener); -#undef REGISTER_SYNC + + +#define REGISTER_METHOD(M) \ + RegisterSyncHandler(#M, std::bind(&HumanActivityMonitorInstance::M, this, _1, _2)) + + REGISTER_METHOD(HumanActivityMonitorManagerGetHumanActivityData); + REGISTER_METHOD(HumanActivityMonitorManagerStart); + REGISTER_METHOD(HumanActivityMonitorManagerStop); + REGISTER_METHOD(HumanActivityMonitorManagerAddActivityRecognitionListener); + REGISTER_METHOD(HumanActivityMonitorManagerRemoveActivityRecognitionListener); + REGISTER_METHOD(HumanActivityMonitorManagerStartRecorder); + REGISTER_METHOD(HumanActivityMonitorManagerStopRecorder); + REGISTER_METHOD(HumanActivityMonitorManagerReadRecorderData); + REGISTER_METHOD(GestureManagerIsGestureSupported); + REGISTER_METHOD(GestureManagerAddGestureRecognitionListener); + REGISTER_METHOD(GestureManagerRemoveGestureRecognitionListener); + +#undef REGISTER_METHOD + } HumanActivityMonitorInstance::~HumanActivityMonitorInstance() {