From 70645bb7214cc956acbbe7e0c930aac492bbde78 Mon Sep 17 00:00:00 2001 From: Tomasz Marciniak Date: Mon, 11 Apr 2016 15:03:27 +0200 Subject: [PATCH] [WidgetService] Changed Widget into WidgetService. [Verification] Code compiles. Change-Id: Ifd388ae5e985af02d0692dc9b926f69e74ac1fa9 Signed-off-by: Tomasz Marciniak --- packaging/webapi-plugins.spec | 8 +- src/tizen-wrt.gyp | 4 +- .../widgetservice.gyp} | 16 +-- .../widgetservice_api.js} | 20 ++-- .../widgetservice_extension.cc} | 12 +-- .../widgetservice_extension.h} | 6 +- .../widgetservice_instance.cc} | 100 +++++++++--------- .../widgetservice_instance.h} | 16 +-- .../widgetservice_utils.cc} | 20 ++-- .../widgetservice_utils.h} | 12 +-- 10 files changed, 107 insertions(+), 107 deletions(-) rename src/{widget/widget.gyp => widgetservice/widgetservice.gyp} (58%) rename src/{widget/widget_api.js => widgetservice/widgetservice_api.js} (94%) rename src/{widget/widget_extension.cc => widgetservice/widgetservice_extension.cc} (75%) rename src/{widget/widget_extension.h => widgetservice/widgetservice_extension.h} (87%) rename src/{widget/widget_instance.cc => widgetservice/widgetservice_instance.cc} (79%) rename src/{widget/widget_instance.h => widgetservice/widgetservice_instance.h} (86%) rename src/{widget/widget_utils.cc => widgetservice/widgetservice_utils.cc} (92%) rename src/{widget/widget_utils.h => widgetservice/widgetservice_utils.h} (88%) diff --git a/packaging/webapi-plugins.spec b/packaging/webapi-plugins.spec index e897ae64..6e4de040 100644 --- a/packaging/webapi-plugins.spec +++ b/packaging/webapi-plugins.spec @@ -97,7 +97,7 @@ Source0: %{name}-%{version}.tar.gz %endif %define tizen_feature_time_support 1 %define tizen_feature_web_setting_support 1 -%define tizen_feature_widget_support 0 +%define tizen_feature_widget_service_support 0 %if 0%{?tizen_is_emulator} %define tizen_feature_wi_fi_support 0 %else @@ -194,7 +194,7 @@ Source0: %{name}-%{version}.tar.gz %define tizen_feature_telephony_support 0 %define tizen_feature_time_support 1 %define tizen_feature_web_setting_support 0 -%define tizen_feature_widget_support 0 +%define tizen_feature_widget_service_support 0 %define tizen_feature_wi_fi_support 1 %define tizen_feature_inputdevice_support 1 %define tizen_feature_tvinputdevice_support 0 @@ -259,7 +259,7 @@ Source0: %{name}-%{version}.tar.gz %define tizen_feature_telephony_support 0 %define tizen_feature_time_support 1 %define tizen_feature_web_setting_support 1 -%define tizen_feature_widget_support 0 +%define tizen_feature_widget_service_support 0 %define tizen_feature_wi_fi_support 1 %define tizen_feature_inputdevice_support 0 %define tizen_feature_tvinputdevice_support 1 @@ -500,7 +500,7 @@ GYP_OPTIONS="$GYP_OPTIONS -Dtizen_feature_telephony_support=%{?tizen_feature_tel GYP_OPTIONS="$GYP_OPTIONS -Dtizen_feature_time_support=%{?tizen_feature_time_support}" GYP_OPTIONS="$GYP_OPTIONS -Dtizen_feature_inputdevice_support=%{?tizen_feature_inputdevice_support}" GYP_OPTIONS="$GYP_OPTIONS -Dtizen_feature_web_setting_support=%{?tizen_feature_web_setting_support}" -GYP_OPTIONS="$GYP_OPTIONS -Dtizen_feature_widget_support=%{?tizen_feature_widget_support}" +GYP_OPTIONS="$GYP_OPTIONS -Dtizen_feature_widget_service_support=%{?tizen_feature_widget_service_support}" GYP_OPTIONS="$GYP_OPTIONS -Dtizen_feature_wi_fi_support=%{?tizen_feature_wi_fi_support}" GYP_OPTIONS="$GYP_OPTIONS -Dtizen_feature_tvinputdevice_support=%{?tizen_feature_tvinputdevice_support}" diff --git a/src/tizen-wrt.gyp b/src/tizen-wrt.gyp index 1f1f240c..3505a137 100755 --- a/src/tizen-wrt.gyp +++ b/src/tizen-wrt.gyp @@ -295,9 +295,9 @@ }, ], [ - 'tizen_feature_widget_support==1', { + 'tizen_feature_widget_service_support==1', { 'dependencies': [ - 'widget/widget.gyp:*', + 'widgetservice/widgetservice.gyp:*', ], }, ], diff --git a/src/widget/widget.gyp b/src/widgetservice/widgetservice.gyp similarity index 58% rename from src/widget/widget.gyp rename to src/widgetservice/widgetservice.gyp index ddd48849..371f8eb2 100644 --- a/src/widget/widget.gyp +++ b/src/widgetservice/widgetservice.gyp @@ -4,19 +4,19 @@ ], 'targets': [ { - 'target_name': 'tizen_widget', + 'target_name': 'tizen_widgetservice', 'type': 'loadable_module', 'dependencies': [ '../common/common.gyp:tizen_common', ], 'sources': [ - 'widget_api.js', - 'widget_extension.cc', - 'widget_extension.h', - 'widget_instance.cc', - 'widget_instance.h', - 'widget_utils.cc', - 'widget_utils.h', + 'widgetservice_api.js', + 'widgetservice_extension.cc', + 'widgetservice_extension.h', + 'widgetservice_instance.cc', + 'widgetservice_instance.h', + 'widgetservice_utils.cc', + 'widgetservice_utils.h', ], 'conditions': [ ['tizen == 1', { diff --git a/src/widget/widget_api.js b/src/widgetservice/widgetservice_api.js similarity index 94% rename from src/widget/widget_api.js rename to src/widgetservice/widgetservice_api.js index f714d287..9435b505 100755 --- a/src/widget/widget_api.js +++ b/src/widgetservice/widgetservice_api.js @@ -391,10 +391,10 @@ Widget.prototype.removeChangeListener = function() { } }; -function WidgetManager() { +function WidgetServiceManager() { }; -WidgetManager.prototype.getWidget = function() { +WidgetServiceManager.prototype.getWidget = function() { var args = validator.validateMethod(arguments, [{ name : 'widgetId', type : types.STRING, @@ -403,7 +403,7 @@ WidgetManager.prototype.getWidget = function() { var callArgs = {}; callArgs.widgetId = args.widgetId; - var ret = native.callSync('WidgetManager_getWidget', callArgs); + var ret = native.callSync('WidgetServiceManager_getWidget', callArgs); if (native.isFailure(ret)) { throw native.getErrorObject(ret); @@ -412,7 +412,7 @@ WidgetManager.prototype.getWidget = function() { } }; -WidgetManager.prototype.getWidgets = function() { +WidgetServiceManager.prototype.getWidgets = function() { var args = validator.validateMethod(arguments, [{ name : 'successCallback', type : types.FUNCTION, @@ -442,13 +442,13 @@ WidgetManager.prototype.getWidgets = function() { callArgs.packageId = args.packageId; } - var result = native.call('WidgetManager_getWidgets', callArgs, callback); + var result = native.call('WidgetServiceManager_getWidgets', callArgs, callback); if (native.isFailure(result)) { throw native.getErrorObject(result); } }; -WidgetManager.prototype.getPrimaryWidgetId = function() { +WidgetServiceManager.prototype.getPrimaryWidgetId = function() { var args = validator.validateMethod(arguments, [{ name : 'id', type : types.STRING, @@ -457,7 +457,7 @@ WidgetManager.prototype.getPrimaryWidgetId = function() { var callArgs = {}; callArgs.id = args.id; - var ret = native.callSync('WidgetManager_getPrimaryWidgetId', callArgs); + var ret = native.callSync('WidgetServiceManager_getPrimaryWidgetId', callArgs); if (native.isFailure(ret)) { throw native.getErrorObject(ret); @@ -466,7 +466,7 @@ WidgetManager.prototype.getPrimaryWidgetId = function() { } }; -WidgetManager.prototype.getSize = function() { +WidgetServiceManager.prototype.getSize = function() { var args = validator.validateMethod(arguments, [{ name : 'sizeType', type: types.ENUM, @@ -476,7 +476,7 @@ WidgetManager.prototype.getSize = function() { var callArgs = {}; callArgs.sizeType = args.sizeType; - var ret = native.callSync('WidgetManager_getSize', callArgs); + var ret = native.callSync('WidgetServiceManager_getSize', callArgs); if (native.isFailure(ret)) { throw native.getErrorObject(ret); @@ -486,4 +486,4 @@ WidgetManager.prototype.getSize = function() { }; //Exports -exports = new WidgetManager(); +exports = new WidgetServiceManager(); diff --git a/src/widget/widget_extension.cc b/src/widgetservice/widgetservice_extension.cc similarity index 75% rename from src/widget/widget_extension.cc rename to src/widgetservice/widgetservice_extension.cc index 9381b492..9bdbfcad 100755 --- a/src/widget/widget_extension.cc +++ b/src/widgetservice/widgetservice_extension.cc @@ -14,24 +14,24 @@ * limitations under the License. */ -#include "widget/widget_extension.h" +#include "widgetservice/widgetservice_extension.h" -#include "widget/widget_instance.h" +#include "widgetservice/widgetservice_instance.h" // This will be generated from widget_api.js -extern const char kSource_widget_api[]; +extern const char kSource_widgetservice_api[]; common::Extension* CreateExtension() { return new WidgetExtension; } WidgetExtension::WidgetExtension() { - SetExtensionName("tizen.widget"); - SetJavaScriptAPI(kSource_widget_api); + SetExtensionName("tizen.widgetservice"); + SetJavaScriptAPI(kSource_widgetservice_api); } WidgetExtension::~WidgetExtension() {} common::Instance* WidgetExtension::CreateInstance() { - return new extension::widget::WidgetInstance(); + return new extension::widgetservice::WidgetServiceInstance(); } diff --git a/src/widget/widget_extension.h b/src/widgetservice/widgetservice_extension.h similarity index 87% rename from src/widget/widget_extension.h rename to src/widgetservice/widgetservice_extension.h index 0d9d4610..db83db28 100755 --- a/src/widget/widget_extension.h +++ b/src/widgetservice/widgetservice_extension.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef WIDGET_WIDGET_EXTENSION_H_ -#define WIDGET_WIDGET_EXTENSION_H_ +#ifndef WIDGETSERVICE_WIDGET_EXTENSION_H_ +#define WIDGETSERVICE_WIDGET_EXTENSION_H_ #include "common/extension.h" @@ -28,4 +28,4 @@ class WidgetExtension : public common::Extension { virtual common::Instance* CreateInstance(); }; -#endif // WIDGET_WIDGET_EXTENSION_H_ +#endif // WIDGETSERVICE_WIDGET_EXTENSION_H_ diff --git a/src/widget/widget_instance.cc b/src/widgetservice/widgetservice_instance.cc similarity index 79% rename from src/widget/widget_instance.cc rename to src/widgetservice/widgetservice_instance.cc index 120e52d4..81ac3c95 100755 --- a/src/widget/widget_instance.cc +++ b/src/widgetservice/widgetservice_instance.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "widget/widget_instance.h" +#include "widgetservice/widgetservice_instance.h" #include @@ -23,16 +23,16 @@ #include #include -#include "widget/widget_utils.h" +#include "widgetservice/widgetservice_utils.h" #include "common/scope_exit.h" namespace extension { -namespace widget { +namespace widgetservice { using common::TizenResult; using common::TizenSuccess; -std::mutex WidgetInstance::listener_mutex_; +std::mutex WidgetServiceInstance::listener_mutex_; namespace { const common::ListenerToken kWidgetChangeCallbackToken{"WidgetChangeCallback"}; @@ -59,7 +59,7 @@ int WidgetListCb(const char* pkgid, const char* widget_id, int is_primary, void* picojson::value val = picojson::value(picojson::object()); - auto result = WidgetUtils::WidgetToJson(widget_id, &val.get(), pkgid); + auto result = WidgetServiceUtils::WidgetToJson(widget_id, &val.get(), pkgid); if (result) { array->push_back(val); } @@ -80,7 +80,7 @@ int WidgetListByPkgIdCb(const char* widget_id, int is_primary, void* data) { picojson::value val = picojson::value(picojson::object()); - auto result = WidgetUtils::WidgetToJson(widget_id, &val.get()); + auto result = WidgetServiceUtils::WidgetToJson(widget_id, &val.get()); if (result) { array->push_back(val); } @@ -113,7 +113,7 @@ int WidgetLifecycleCb(const char* widget_id, widget_lifecycle_event_e lifecycle_ return WIDGET_ERROR_NONE; } - WidgetInstance* instance = static_cast(data); + WidgetServiceInstance* instance = static_cast(data); if (!instance) { LoggerW("User data is null"); @@ -125,7 +125,7 @@ int WidgetLifecycleCb(const char* widget_id, widget_lifecycle_event_e lifecycle_ obj.insert(std::make_pair(kWidgetId, picojson::value(widget_id))); obj.insert(std::make_pair(kInstanceId, picojson::value(widget_instance_id))); - obj.insert(std::make_pair(kEvent, picojson::value(WidgetUtils::FromEventType(lifecycle_event)))); + obj.insert(std::make_pair(kEvent, picojson::value(WidgetServiceUtils::FromEventType(lifecycle_event)))); instance->CallWidgetLifecycleListener(widget_id, response); @@ -134,17 +134,17 @@ int WidgetLifecycleCb(const char* widget_id, widget_lifecycle_event_e lifecycle_ } // namespace -WidgetInstance::WidgetInstance() { +WidgetServiceInstance::WidgetServiceInstance() { ScopeLogger(); using std::placeholders::_1; using std::placeholders::_2; #define REGISTER_SYNC(c, x) \ - RegisterSyncHandler(c, std::bind(&WidgetInstance::x, this, _1)); + RegisterSyncHandler(c, std::bind(&WidgetServiceInstance::x, this, _1)); - REGISTER_SYNC("WidgetManager_getWidget", GetWidget); - REGISTER_SYNC("WidgetManager_getPrimaryWidgetId", GetPrimaryWidgetId); - REGISTER_SYNC("WidgetManager_getSize", GetSize); + REGISTER_SYNC("WidgetServiceManager_getWidget", GetWidget); + REGISTER_SYNC("WidgetServiceManager_getPrimaryWidgetId", GetPrimaryWidgetId); + REGISTER_SYNC("WidgetServiceManager_getSize", GetSize); REGISTER_SYNC("Widget_getName", GetName); REGISTER_SYNC("Widget_getVariant", GetVariant); REGISTER_SYNC("Widget_addChangeListener", AddChangeListener); @@ -155,16 +155,16 @@ WidgetInstance::WidgetInstance() { #undef REGISTER_SYNC #define REGISTER_ASYNC(c, x) \ - RegisterHandler(c, std::bind(&WidgetInstance::x, this, _1, _2)); + RegisterHandler(c, std::bind(&WidgetServiceInstance::x, this, _1, _2)); - REGISTER_ASYNC("WidgetManager_getWidgets", GetWidgets); + REGISTER_ASYNC("WidgetServiceManager_getWidgets", GetWidgets); REGISTER_ASYNC("Widget_getInstances", GetInstances); REGISTER_ASYNC("Widget_getVariants", GetVariants); REGISTER_ASYNC("WidgetInstance_getContent", GetContent); #undef REGISTER_ASYNC } -WidgetInstance::~WidgetInstance() { +WidgetServiceInstance::~WidgetServiceInstance() { ScopeLogger(); std::lock_guard lock(listener_mutex_); @@ -178,7 +178,7 @@ WidgetInstance::~WidgetInstance() { listener_map_.clear(); } -TizenResult WidgetInstance::GetWidget(const picojson::object& args) { +TizenResult WidgetServiceInstance::GetWidget(const picojson::object& args) { ScopeLogger(); //CHECK_PRIVILEGE_ACCESS(kPrivilegeWidget, &out); @@ -189,7 +189,7 @@ TizenResult WidgetInstance::GetWidget(const picojson::object& args) { picojson::value value {picojson::object{}}; auto* obj = &value.get(); - auto result = WidgetUtils::WidgetToJson(widget_id.c_str(), obj); + auto result = WidgetServiceUtils::WidgetToJson(widget_id.c_str(), obj); if (!result) { LogAndReturnTizenError(result, ("GetWidget() failed")); } @@ -197,7 +197,7 @@ TizenResult WidgetInstance::GetWidget(const picojson::object& args) { return TizenSuccess(value); } -TizenResult WidgetInstance::GetWidgets(const picojson::object& args, +TizenResult WidgetServiceInstance::GetWidgets(const picojson::object& args, const common::AsyncToken& token) { ScopeLogger(); @@ -224,7 +224,7 @@ TizenResult WidgetInstance::GetWidgets(const picojson::object& args, if (WIDGET_ERROR_NONE != ret) { LoggerE("widget_service_get_widget_list() failed"); - result = WidgetUtils::ConvertErrorCode(ret); + result = WidgetServiceUtils::ConvertErrorCode(ret); } else { result = TizenSuccess{response}; } @@ -237,7 +237,7 @@ TizenResult WidgetInstance::GetWidgets(const picojson::object& args, return TizenSuccess(); } -TizenResult WidgetInstance::GetPrimaryWidgetId(const picojson::object& args) { +TizenResult WidgetServiceInstance::GetPrimaryWidgetId(const picojson::object& args) { ScopeLogger(); //CHECK_PRIVILEGE_ACCESS(kPrivilegeWidget, &out); @@ -248,7 +248,7 @@ TizenResult WidgetInstance::GetPrimaryWidgetId(const picojson::object& args) { char* widget_id = widget_service_get_widget_id(id.c_str()); if (!widget_id) { LogAndReturnTizenError( - WidgetUtils::ConvertErrorCode(get_last_result()), ("widget_service_get_widget_id() failed")); + WidgetServiceUtils::ConvertErrorCode(get_last_result()), ("widget_service_get_widget_id() failed")); } SCOPE_EXIT { @@ -258,12 +258,12 @@ TizenResult WidgetInstance::GetPrimaryWidgetId(const picojson::object& args) { return TizenSuccess(picojson::value(widget_id)); } -TizenResult WidgetInstance::GetSize(const picojson::object& args) { +TizenResult WidgetServiceInstance::GetSize(const picojson::object& args) { ScopeLogger(); CHECK_EXIST(args, kSizeType, out) - widget_size_type_e type = WidgetUtils::ToSizeType(args.find(kSizeType)->second.get()); + widget_size_type_e type = WidgetServiceUtils::ToSizeType(args.find(kSizeType)->second.get()); if (WIDGET_SIZE_TYPE_UNKNOWN == type) { LogAndReturnTizenError(common::InvalidValuesError(), ("incorrect size type")); } @@ -271,7 +271,7 @@ TizenResult WidgetInstance::GetSize(const picojson::object& args) { picojson::value value{picojson::object{}}; auto* obj = &value.get(); - auto result = WidgetUtils::SizeToJson(type, obj); + auto result = WidgetServiceUtils::SizeToJson(type, obj); if (!result) { LogAndReturnTizenError(result, ("GetSize() failed")); } @@ -279,7 +279,7 @@ TizenResult WidgetInstance::GetSize(const picojson::object& args) { return TizenSuccess(value); } -TizenResult WidgetInstance::GetName(picojson::object const& args) { +TizenResult WidgetServiceInstance::GetName(picojson::object const& args) { ScopeLogger(); //CHECK_PRIVILEGE_ACCESS(kPrivilegeWidget, &out); @@ -296,7 +296,7 @@ TizenResult WidgetInstance::GetName(picojson::object const& args) { char* name = widget_service_get_name(widget_id.c_str(), lang); if (!name) { LogAndReturnTizenError( - WidgetUtils::ConvertErrorCode(get_last_result()), ("widget_service_get_name() failed")); + WidgetServiceUtils::ConvertErrorCode(get_last_result()), ("widget_service_get_name() failed")); } SCOPE_EXIT { @@ -306,7 +306,7 @@ TizenResult WidgetInstance::GetName(picojson::object const& args) { return TizenSuccess(picojson::value(name)); } -TizenResult WidgetInstance::GetInstances(picojson::object const& args, const common::AsyncToken& token) { +TizenResult WidgetServiceInstance::GetInstances(picojson::object const& args, const common::AsyncToken& token) { ScopeLogger(); CHECK_EXIST(args, kWidgetId, out) @@ -323,7 +323,7 @@ TizenResult WidgetInstance::GetInstances(picojson::object const& args, const com if (WIDGET_ERROR_NONE != ret) { LoggerE("widget_service_get_widget_instance_list() failed"); - result = WidgetUtils::ConvertErrorCode(ret); + result = WidgetServiceUtils::ConvertErrorCode(ret); } else { result = TizenSuccess{response}; } @@ -336,7 +336,7 @@ TizenResult WidgetInstance::GetInstances(picojson::object const& args, const com return TizenSuccess(); } -TizenResult WidgetInstance::GetVariant(picojson::object const& args) { +TizenResult WidgetServiceInstance::GetVariant(picojson::object const& args) { ScopeLogger(); CHECK_EXIST(args, kWidgetId, out) @@ -345,7 +345,7 @@ TizenResult WidgetInstance::GetVariant(picojson::object const& args) { const auto& widget_id = args.find(kWidgetId)->second.get(); const auto& type = args.find(kSizeType)->second.get(); - widget_size_type_e size_type = WidgetUtils::ToSizeType(type); + widget_size_type_e size_type = WidgetServiceUtils::ToSizeType(type); if (WIDGET_SIZE_TYPE_UNKNOWN == size_type) { LogAndReturnTizenError(common::InvalidValuesError(), ("incorrect size type")); } @@ -353,12 +353,12 @@ TizenResult WidgetInstance::GetVariant(picojson::object const& args) { picojson::value value{picojson::object{}}; auto* obj = &value.get(); - auto result = WidgetUtils::SizeToJson(size_type, obj); + auto result = WidgetServiceUtils::SizeToJson(size_type, obj); if (!result) { LogAndReturnTizenError(result, ("GetVariant() failed")); } - result = WidgetUtils::WidgetVariantToJson(widget_id.c_str(), size_type, obj); + result = WidgetServiceUtils::WidgetVariantToJson(widget_id.c_str(), size_type, obj); if (!result) { LogAndReturnTizenError(result, ("GetVariant() failed")); } @@ -369,7 +369,7 @@ TizenResult WidgetInstance::GetVariant(picojson::object const& args) { return TizenSuccess(value); } -TizenResult WidgetInstance::GetVariants(picojson::object const& args, const common::AsyncToken& token) { +TizenResult WidgetServiceInstance::GetVariants(picojson::object const& args, const common::AsyncToken& token) { ScopeLogger(); //CHECK_PRIVILEGE_ACCESS(kPrivilegeWidget, &out); @@ -384,7 +384,7 @@ TizenResult WidgetInstance::GetVariants(picojson::object const& args, const comm if (WIDGET_ERROR_NONE != ret) { LoggerE("widget_service_get_supported_size_types() failed"); - this->Post(token, WidgetUtils::ConvertErrorCode(ret)); + this->Post(token, WidgetServiceUtils::ConvertErrorCode(ret)); return; } @@ -404,17 +404,17 @@ TizenResult WidgetInstance::GetVariants(picojson::object const& args, const comm picojson::object* obj = &val.get(); widget_size_type_e size_type = static_cast(type_array[i]); - result = WidgetUtils::SizeToJson(size_type, obj); + result = WidgetServiceUtils::SizeToJson(size_type, obj); if (!result) { break; } - result = WidgetUtils::WidgetVariantToJson(widget_id.c_str(), size_type, obj); + result = WidgetServiceUtils::WidgetVariantToJson(widget_id.c_str(), size_type, obj); if (!result) { break; } - obj->insert(std::make_pair(kSizeType, picojson::value(WidgetUtils::FromSizeType(size_type)))); + obj->insert(std::make_pair(kSizeType, picojson::value(WidgetServiceUtils::FromSizeType(size_type)))); array.push_back(val); } @@ -430,7 +430,7 @@ TizenResult WidgetInstance::GetVariants(picojson::object const& args, const comm return TizenSuccess(); } -void WidgetInstance::CallWidgetLifecycleListener(const std::string& widget_id, +void WidgetServiceInstance::CallWidgetLifecycleListener(const std::string& widget_id, const picojson::value& response) { ScopeLogger(); @@ -444,7 +444,7 @@ void WidgetInstance::CallWidgetLifecycleListener(const std::string& widget_id, LoggerW("widget id was not found."); } -TizenResult WidgetInstance::AddChangeListener(picojson::object const& args) { +TizenResult WidgetServiceInstance::AddChangeListener(picojson::object const& args) { ScopeLogger(); //CHECK_PRIVILEGE_ACCESS(kPrivilegeWidget, &out); @@ -462,7 +462,7 @@ TizenResult WidgetInstance::AddChangeListener(picojson::object const& args) { int ret = widget_service_set_lifecycle_event_cb(widget_id.c_str(), WidgetLifecycleCb , this); if (WIDGET_ERROR_NONE != ret) { LogAndReturnTizenError( - WidgetUtils::ConvertErrorCode(ret), ("widget_service_set_lifecycle_event_cb() failed")); + WidgetServiceUtils::ConvertErrorCode(ret), ("widget_service_set_lifecycle_event_cb() failed")); } listener_map_[widget_id]++; @@ -470,7 +470,7 @@ TizenResult WidgetInstance::AddChangeListener(picojson::object const& args) { return TizenSuccess(); } -TizenResult WidgetInstance::RemoveChangeListener(picojson::object const& args) { +TizenResult WidgetServiceInstance::RemoveChangeListener(picojson::object const& args) { ScopeLogger(); CHECK_EXIST(args, kWidgetId, out) @@ -488,7 +488,7 @@ TizenResult WidgetInstance::RemoveChangeListener(picojson::object const& args) { int ret = widget_service_unset_lifecycle_event_cb(widget_id.c_str(), nullptr); if (WIDGET_ERROR_NONE != ret) { LogAndReturnTizenError( - WidgetUtils::ConvertErrorCode(ret), ("widget_service_unset_lifecycle_event_cb() failed")); + WidgetServiceUtils::ConvertErrorCode(ret), ("widget_service_unset_lifecycle_event_cb() failed")); } listener_map_.erase(it); } @@ -496,7 +496,7 @@ TizenResult WidgetInstance::RemoveChangeListener(picojson::object const& args) { return TizenSuccess(); } -TizenResult WidgetInstance::ChangeUpdatePeriod(picojson::object const& args) { +TizenResult WidgetServiceInstance::ChangeUpdatePeriod(picojson::object const& args) { ScopeLogger(); CHECK_EXIST(args, kWidgetId, out) @@ -511,13 +511,13 @@ TizenResult WidgetInstance::ChangeUpdatePeriod(picojson::object const& args) { if (WIDGET_ERROR_NONE != ret) { LogAndReturnTizenError( - WidgetUtils::ConvertErrorCode(ret), ("widget_service_change_period() failed")); + WidgetServiceUtils::ConvertErrorCode(ret), ("widget_service_change_period() failed")); } return TizenSuccess(); } -TizenResult WidgetInstance::SendContent(picojson::object const& args) { +TizenResult WidgetServiceInstance::SendContent(picojson::object const& args) { ScopeLogger(); CHECK_EXIST(args, kWidgetId, out) @@ -547,13 +547,13 @@ TizenResult WidgetInstance::SendContent(picojson::object const& args) { ret = widget_service_trigger_update(widget_id.c_str(), instance_id.c_str(), data, force); if (WIDGET_ERROR_NONE != ret) { LogAndReturnTizenError( - WidgetUtils::ConvertErrorCode(ret), ("widget_service_trigger_update() failed")); + WidgetServiceUtils::ConvertErrorCode(ret), ("widget_service_trigger_update() failed")); } return TizenSuccess(); } -TizenResult WidgetInstance::GetContent(picojson::object const& args, const common::AsyncToken& token) { +TizenResult WidgetServiceInstance::GetContent(picojson::object const& args, const common::AsyncToken& token) { ScopeLogger(); CHECK_EXIST(args, kWidgetId, out) @@ -580,7 +580,7 @@ TizenResult WidgetInstance::GetContent(picojson::object const& args, const commo instance_id.c_str(), &bundle_data); if (WIDGET_ERROR_NONE != ret) { LoggerE("widget_service_get_content_of_widget_instance() failed"); - this->Post(token, WidgetUtils::ConvertErrorCode(ret)); + this->Post(token, WidgetServiceUtils::ConvertErrorCode(ret)); return; } @@ -609,5 +609,5 @@ TizenResult WidgetInstance::GetContent(picojson::object const& args, const commo return TizenSuccess(); } -} // namespace widget +} // namespace widgetservice } // namespace extension diff --git a/src/widget/widget_instance.h b/src/widgetservice/widgetservice_instance.h similarity index 86% rename from src/widget/widget_instance.h rename to src/widgetservice/widgetservice_instance.h index 313421cd..8aadbfaa 100755 --- a/src/widget/widget_instance.h +++ b/src/widgetservice/widgetservice_instance.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef WIDGET_WIDGET_INSTANCE_H_ -#define WIDGET_WIDGET_INSTANCE_H_ +#ifndef WIDGETSERVICE_WIDGET_INSTANCE_H_ +#define WIDGETSERVICE_WIDGET_INSTANCE_H_ #include #include @@ -23,12 +23,12 @@ #include "common/tizen_instance.h" namespace extension { -namespace widget { +namespace widgetservice { -class WidgetInstance : public common::TizenInstance { +class WidgetServiceInstance : public common::TizenInstance { public: - WidgetInstance(); - virtual ~WidgetInstance(); + WidgetServiceInstance(); + virtual ~WidgetServiceInstance(); void CallWidgetLifecycleListener(const std::string& widget_id, const picojson::value& response); private: //WidgetManager @@ -52,7 +52,7 @@ class WidgetInstance : public common::TizenInstance { std::map listener_map_; }; -} // namespace widget +} // namespace widgetservice } // namespace extension -#endif // WIDGET_WIDGET_INSTANCE_H_ +#endif // WIDGETSERVICE_WIDGET_INSTANCE_H_ diff --git a/src/widget/widget_utils.cc b/src/widgetservice/widgetservice_utils.cc similarity index 92% rename from src/widget/widget_utils.cc rename to src/widgetservice/widgetservice_utils.cc index 41de85c9..7ba52e0a 100644 --- a/src/widget/widget_utils.cc +++ b/src/widgetservice/widgetservice_utils.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "widget_utils.h" +#include "widgetservice_utils.h" #include namespace extension { -namespace widget { +namespace widgetservice { namespace { @@ -65,7 +65,7 @@ const std::string kPreviewImagePath = "previewImagePath"; using common::TizenResult; using common::TizenSuccess; -TizenResult WidgetUtils::ConvertErrorCode(int error) { +TizenResult WidgetServiceUtils::ConvertErrorCode(int error) { switch (error) { case WIDGET_ERROR_NONE: return TizenSuccess(); @@ -95,7 +95,7 @@ TizenResult WidgetUtils::ConvertErrorCode(int error) { } } -TizenResult WidgetUtils::WidgetToJson(const char* id, picojson::object* out, const char* pkgid) { +TizenResult WidgetServiceUtils::WidgetToJson(const char* id, picojson::object* out, const char* pkgid) { ScopeLogger(); //applicationId @@ -144,7 +144,7 @@ TizenResult WidgetUtils::WidgetToJson(const char* id, picojson::object* out, con return TizenSuccess(); } -TizenResult WidgetUtils::SizeToJson(widget_size_type_e type, picojson::object* out) { +TizenResult WidgetServiceUtils::SizeToJson(widget_size_type_e type, picojson::object* out) { ScopeLogger(); int width = 0; @@ -161,7 +161,7 @@ TizenResult WidgetUtils::SizeToJson(widget_size_type_e type, picojson::object* o return TizenSuccess(); } -TizenResult WidgetUtils::WidgetVariantToJson( +TizenResult WidgetServiceUtils::WidgetVariantToJson( const char* id, widget_size_type_e type, picojson::object* out) { ScopeLogger(); @@ -209,7 +209,7 @@ TizenResult WidgetUtils::WidgetVariantToJson( LoggerE("Unknown value: %d, returning default: %s", e, s); \ return s; -std::string WidgetUtils::FromSizeType(widget_size_type_e e) { +std::string WidgetServiceUtils::FromSizeType(widget_size_type_e e) { ScopeLogger(); switch (e) { @@ -217,7 +217,7 @@ std::string WidgetUtils::FromSizeType(widget_size_type_e e) { } } -std::string WidgetUtils::FromEventType(widget_lifecycle_event_e e) { +std::string WidgetServiceUtils::FromEventType(widget_lifecycle_event_e e) { ScopeLogger(); switch (e) { @@ -233,7 +233,7 @@ std::string WidgetUtils::FromEventType(widget_lifecycle_event_e e) { LoggerE("Unknown value: %s, returning default: %d", e.c_str(), v); \ return v; -widget_size_type_e WidgetUtils::ToSizeType(const std::string& e) { +widget_size_type_e WidgetServiceUtils::ToSizeType(const std::string& e) { ScopeLogger(); WIDGET_SIZE_TYPE_E @@ -242,5 +242,5 @@ widget_size_type_e WidgetUtils::ToSizeType(const std::string& e) { #undef X #undef XD -} // widget +} // widgetservice } // extension diff --git a/src/widget/widget_utils.h b/src/widgetservice/widgetservice_utils.h similarity index 88% rename from src/widget/widget_utils.h rename to src/widgetservice/widgetservice_utils.h index a82eedeb..5f6a2644 100644 --- a/src/widget/widget_utils.h +++ b/src/widgetservice/widgetservice_utils.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef WEBAPI_PLUGINS_WIDGET_WIDGET_UTILS_H__ -#define WEBAPI_PLUGINS_WIDGET_WIDGET_UTILS_H__ +#ifndef WEBAPI_PLUGINS_WIDGETSERVICE_WIDGET_UTILS_H__ +#define WEBAPI_PLUGINS_WIDGETSERVICE_WIDGET_UTILS_H__ #include @@ -24,7 +24,7 @@ #include "common/tizen_result.h" namespace extension { -namespace widget { +namespace widgetservice { #define CHECK_EXIST(args, name, out) \ if (args.end() == args.find(name)) { \ @@ -38,7 +38,7 @@ extern const std::string kSizeType; extern const std::string kWidth; extern const std::string kHeight; -class WidgetUtils { +class WidgetServiceUtils { public: static widget_size_type_e ToSizeType(const std::string& e); static std::string FromSizeType(widget_size_type_e e); @@ -50,7 +50,7 @@ class WidgetUtils { }; -} // widget +} // widgetservice } // extension -#endif // WEBAPI_PLUGINS_WIDGET_WIDGET_UTILS_H__ +#endif // WEBAPI_PLUGINS_WIDGETSERVICE_WIDGET_UTILS_H__ -- 2.34.1