From: Ryszard Matuszyk Date: Wed, 28 Jan 2015 11:02:44 +0000 (+0100) Subject: [DataSync] Changing function names to generator convention X-Git-Tag: submit/tizen_tv/20150603.064601~1^2~550 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=184c364ca837da78f789dddfe13a038dd9bbabf0;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git [DataSync] Changing function names to generator convention [Verification] code compiling Change-Id: I6ba3c3ef92f8cf456c43b0833f32a8c827d5f96f Signed-off-by: Ryszard Matuszyk --- diff --git a/src/datasync/datasync_api.js b/src/datasync/datasync_api.js index f069efc8..8cbb75a9 100644 --- a/src/datasync/datasync_api.js +++ b/src/datasync/datasync_api.js @@ -440,7 +440,7 @@ DataSynchronizationManager.prototype.add = function(profile) { if (!(profile instanceof tizen.SyncProfileInfo)) { throw new tizen.WebAPIException(tizen.WebAPIException.TYPE_MISMATCH_ERR); } - var msg = native_.callSync('Datasync_add', { + var msg = native_.callSync('DataSynchronizationManager_add', { arg: profile }); @@ -457,7 +457,7 @@ DataSynchronizationManager.prototype.update = function(profile) { if (!(profile instanceof tizen.SyncProfileInfo)) { throw new tizen.WebAPIException(tizen.WebAPIException.TYPE_MISMATCH_ERR); } - var msg = native_.callSync('Datasync_update', { + var msg = native_.callSync('DataSynchronizationManager_update', { arg: profile }); @@ -477,7 +477,7 @@ DataSynchronizationManager.prototype.remove = function() { {name: 'profileId', type: types_.STRING} ]); - var msg = native_.callSync('Datasync_remove', { + var msg = native_.callSync('DataSynchronizationManager_remove', { profileId: args.profileId }); @@ -488,7 +488,7 @@ DataSynchronizationManager.prototype.remove = function() { }; DataSynchronizationManager.prototype.getMaxProfilesNum = function() { - var msg = native_.callSync("Datasync_getMaxProfilesNum"); + var msg = native_.callSync("DataSynchronizationManager_getMaxProfilesNum"); if (native_.isFailure(msg)) { throw native_.getErrorObject(msg); } @@ -499,7 +499,7 @@ DataSynchronizationManager.prototype.getProfilesNum = function() { if (arguments.length > 0) { return; } - var msg = native_.callSync('Datasync_getProfilesNum'); + var msg = native_.callSync('DataSynchronizationManager_getProfilesNum'); if (native_.isFailure(msg)) { throw native_.getErrorObject(msg); } @@ -515,7 +515,7 @@ DataSynchronizationManager.prototype.get = function() { if (typeof(arguments[0]) !== 'string') { throw new tizen.WebAPIException(tizen.WebAPIException.NOT_FOUND_ERR); } - var msg = native_.callSync('Datasync_get', { + var msg = native_.callSync('DataSynchronizationManager_get', { profileId: args.profileId }); @@ -529,7 +529,7 @@ DataSynchronizationManager.prototype.getAll = function() { if (arguments.length > 0) { return; } - var msg = native_.callSync('Datasync_getAll'); + var msg = native_.callSync('DataSynchronizationManager_getAll'); if (native_.isFailure(msg)) { throw native_.getErrorObject(msg); } @@ -572,7 +572,7 @@ DataSynchronizationManager.prototype.startSync = function() { } } - var msg = native_.callSync('Datasync_startSync',{ + var msg = native_.callSync('DataSynchronizationManager_startSync',{ profileId: args.profileId }); if (native_.isFailure(msg)) { @@ -591,7 +591,7 @@ DataSynchronizationManager.prototype.stopSync = function() { var args = validator_.validateArgs(arguments, [ {name: 'profileId', type: types_.STRING} ]); - var msg = native_.callSync('Datasync_stopSync',{ + var msg = native_.callSync('DataSynchronizationManager_stopSync',{ profileId: args.profileId }); if (native_.isFailure(msg)) { @@ -610,7 +610,7 @@ DataSynchronizationManager.prototype.getLastSyncStatistics = function() { {name: 'profileId', type: types_.STRING} ]); - var msg = native_.callSync('Datasync_getLastSyncStatistics', { + var msg = native_.callSync('DataSynchronizationManager_getLastSyncStatistics', { profileId: args.profileId }); var result = native_.getResultObject(msg); diff --git a/src/datasync/datasync_extension.cc b/src/datasync/datasync_extension.cc index 95fb79f4..67340bd7 100644 --- a/src/datasync/datasync_extension.cc +++ b/src/datasync/datasync_extension.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2014 Samsung Electronics Co., Ltd All Rights Reserved +// Copyright 2015 Samsung Electronics Co, Ltd. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/src/datasync/datasync_extension.h b/src/datasync/datasync_extension.h index 9e6b864a..4a421502 100644 --- a/src/datasync/datasync_extension.h +++ b/src/datasync/datasync_extension.h @@ -1,4 +1,4 @@ -// Copyright (c) 2014 Samsung Electronics Co., Ltd All Rights Reserved +// Copyright 2015 Samsung Electronics Co, Ltd. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/src/datasync/datasync_instance.cc b/src/datasync/datasync_instance.cc index b5fd9c60..b3c06d2c 100644 --- a/src/datasync/datasync_instance.cc +++ b/src/datasync/datasync_instance.cc @@ -1,18 +1,25 @@ -// Copyright (c) 2014 Samsung Electronics Co., Ltd All Rights Reserved +// Copyright 2015 Samsung Electronics Co, Ltd. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // File copied from Crosswalk +#include "datasync/datasync_instance.h" + #include -#include "datasync/datasync_instance.h" #include "tizen/tizen.h" #include "common/task-queue.h" namespace extension { namespace datasync { +namespace { +// The privileges that required in Datasynchronization API +const std::string kPrivilegeDatasynchronization = "http://tizen.org/privilege/datasync"; + +} // namespace + using namespace common; DatasyncInstance &DatasyncInstance::GetInstance() { @@ -23,32 +30,38 @@ DatasyncInstance &DatasyncInstance::GetInstance() { DatasyncInstance::DatasyncInstance() { using namespace std::placeholders; #define REGISTER_SYNC(c, x) RegisterSyncHandler(c, std::bind(&DatasyncInstance::x, this, _1, _2)); - REGISTER_SYNC("Datasync_add", Add); - REGISTER_SYNC("Datasync_update", Update); - REGISTER_SYNC("Datasync_remove", Remove); - REGISTER_SYNC("Datasync_getMaxProfilesNum", GetMaxProfilesNum); - REGISTER_SYNC("Datasync_getProfilesNum", GetProfilesNum); - REGISTER_SYNC("Datasync_get", Get); - REGISTER_SYNC("Datasync_getAll", GetAll); - REGISTER_SYNC("Datasync_startSync", StartSync); - REGISTER_SYNC("Datasync_stopSync", StopSync); - REGISTER_SYNC("Datasync_getLastSyncStatistics", GetLastSyncStatistics); + REGISTER_SYNC("DataSynchronizationManager_add", DataSynchronizationManagerAdd); + REGISTER_SYNC("DataSynchronizationManager_update", DataSynchronizationManagerUpdate); + REGISTER_SYNC("DataSynchronizationManager_remove", DataSynchronizationManagerRemove); + REGISTER_SYNC("DataSynchronizationManager_getMaxProfilesNum", + DataSynchronizationManagerGetMaxProfilesNum); + REGISTER_SYNC("DataSynchronizationManager_getProfilesNum", + DataSynchronizationManagerGetProfilesNum); + REGISTER_SYNC("DataSynchronizationManager_get", DataSynchronizationManagerGet); + REGISTER_SYNC("DataSynchronizationManager_getAll", DataSynchronizationManagerGetAll); + REGISTER_SYNC("DataSynchronizationManager_startSync", DataSynchronizationManagerStartSync); + REGISTER_SYNC("DataSynchronizationManager_stopSync", DataSynchronizationManagerStopSync); + REGISTER_SYNC("DataSynchronizationManager_getLastSyncStatistics", + DataSynchronizationManagerGetLastSyncStatistics); #undef REGISTER_SYNC } DatasyncInstance::~DatasyncInstance() {} -void DatasyncInstance::GetMaxProfilesNum(const picojson::value &args, picojson::object &out) { +void DatasyncInstance::DataSynchronizationManagerGetMaxProfilesNum(const picojson::value &args, + picojson::object &out) { ReportSuccess( picojson::value(static_cast(DataSyncManager::Instance().GetMaxProfilesNum())), out); } -void DatasyncInstance::GetProfilesNum(const picojson::value &args, picojson::object &out) { +void DatasyncInstance::DataSynchronizationManagerGetProfilesNum(const picojson::value &args, + picojson::object &out) { ReportSuccess(picojson::value(static_cast(DataSyncManager::Instance().GetProfilesNum())), out); } -void DatasyncInstance::Get(const picojson::value &args, picojson::object &out) { +void DatasyncInstance::DataSynchronizationManagerGet(const picojson::value &args, + picojson::object &out) { picojson::value result = picojson::value(picojson::object()); DataSyncManager::Instance().Get(args.get("profileId").get(), @@ -56,14 +69,16 @@ void DatasyncInstance::Get(const picojson::value &args, picojson::object &out) { ReportSuccess(result, out); } -void DatasyncInstance::GetAll(const picojson::value &args, picojson::object &out) { +void DatasyncInstance::DataSynchronizationManagerGetAll(const picojson::value &args, + picojson::object &out) { picojson::value result = picojson::value(picojson::array()); DataSyncManager::Instance().GetAll(result.get()); ReportSuccess(result, out); } -void DatasyncInstance::GetLastSyncStatistics(const picojson::value &args, picojson::object &out) { +void DatasyncInstance::DataSynchronizationManagerGetLastSyncStatistics(const picojson::value &args, + picojson::object &out) { picojson::value result = picojson::value(picojson::array()); DataSyncManager::Instance().GetLastSyncStatistics(args.get("profileId").get(), @@ -72,34 +87,39 @@ void DatasyncInstance::GetLastSyncStatistics(const picojson::value &args, picojs ReportSuccess(result, out); } -void DatasyncInstance::Add(const picojson::value &args, picojson::object &out) { +void DatasyncInstance::DataSynchronizationManagerAdd(const picojson::value &args, + picojson::object &out) { ReportSuccess(picojson::value(static_cast( DataSyncManager::Instance().Add(args.get()))), out); } -void DatasyncInstance::Update(const picojson::value &args, picojson::object &out) { +void DatasyncInstance::DataSynchronizationManagerUpdate(const picojson::value &args, + picojson::object &out) { DataSyncManager::Instance().Update(args.get()); picojson::value val{picojson::object{}}; ReportSuccess(val, out); } -void DatasyncInstance::Remove(const picojson::value &args, picojson::object &out) { +void DatasyncInstance::DataSynchronizationManagerRemove(const picojson::value &args, + picojson::object &out) { DataSyncManager::Instance().Remove(args.get("profileId").get()); picojson::value val{picojson::object{}}; ReportSuccess(val, out); } -void DatasyncInstance::StartSync(const picojson::value &args, picojson::object &out) { +void DatasyncInstance::DataSynchronizationManagerStartSync(const picojson::value &args, + picojson::object &out) { DataSyncManager::Instance().StartSync(args.get()); picojson::value val{picojson::object{}}; ReportSuccess(val, out); } -void DatasyncInstance::StopSync(const picojson::value &args, picojson::object &out) { +void DatasyncInstance::DataSynchronizationManagerStopSync(const picojson::value &args, + picojson::object &out) { DataSyncManager::Instance().StopSync(args.get("profileId").get()); picojson::value val{picojson::object{}}; diff --git a/src/datasync/datasync_instance.h b/src/datasync/datasync_instance.h index bf3ab416..87336303 100644 --- a/src/datasync/datasync_instance.h +++ b/src/datasync/datasync_instance.h @@ -1,4 +1,4 @@ -// Copyright (c) 2014 Samsung Electronics Co., Ltd All Rights Reserved +// Copyright 2015 Samsung Electronics Co, Ltd. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -27,18 +27,20 @@ class DatasyncInstance : public common::ParsedInstance { // Synchronous message handlers // with result - void GetMaxProfilesNum(const picojson::value& args, picojson::object& out); - void GetProfilesNum(const picojson::value& args, picojson::object& out); - void Get(const picojson::value& args, picojson::object& out); - void GetAll(const picojson::value& args, picojson::object& out); - void GetLastSyncStatistics(const picojson::value& args, picojson::object& out); + void DataSynchronizationManagerGetMaxProfilesNum(const picojson::value& args, + picojson::object& out); + void DataSynchronizationManagerGetProfilesNum(const picojson::value& args, picojson::object& out); + void DataSynchronizationManagerGet(const picojson::value& args, picojson::object& out); + void DataSynchronizationManagerGetAll(const picojson::value& args, picojson::object& out); + void DataSynchronizationManagerGetLastSyncStatistics(const picojson::value& args, + picojson::object& out); // undefined result - void Add(const picojson::value& args, picojson::object& out); - void Update(const picojson::value& args, picojson::object& out); - void Remove(const picojson::value& args, picojson::object& out); - void StartSync(const picojson::value& args, picojson::object& out); - void StopSync(const picojson::value& args, picojson::object& out); + void DataSynchronizationManagerAdd(const picojson::value& args, picojson::object& out); + void DataSynchronizationManagerUpdate(const picojson::value& args, picojson::object& out); + void DataSynchronizationManagerRemove(const picojson::value& args, picojson::object& out); + void DataSynchronizationManagerStartSync(const picojson::value& args, picojson::object& out); + void DataSynchronizationManagerStopSync(const picojson::value& args, picojson::object& out); }; } // namespace datasync