[WidgetService] Adjusted to widl changes.

[Verification] Code compiles.

Change-Id: I06be32548c7c304ca6a08f9d478ee5e9c70a7343
Signed-off-by: Tomasz Marciniak <t.marciniak@samsung.com>

diff --git a/src/widgetservice/widgetservice_api.js b/src/widgetservice/widgetservice_api.js
index 9435b505a73dd1b975c2b730fc66e7a8bbcdc2ea..fa358f4dca2cc4788f08b0aa1f8e8b7d68c15409 100755 (executable)
--- a/src/widgetservice/widgetservice_api.js
+++ b/src/widgetservice/widgetservice_api.js
@@ -119,14 +119,14 @@ function WidgetInstance(data, widget) {
 
 WidgetInstance.prototype.changeUpdatePeriod = function() {
   var args = validator.validateMethod(arguments, [{
-    name : 'period',
+    name : 'seconds',
     type : types.DOUBLE,
   }]);
 
   var callArgs = {};
   callArgs.widgetId = this.widget.id;
   callArgs.instanceId = this.id;
-  callArgs.period = args.period;
+  callArgs.seconds = args.seconds;
 
   var ret = native.callSync('WidgetInstance_changeUpdatePeriod', callArgs);
 
@@ -140,7 +140,7 @@ WidgetInstance.prototype.sendContent = function() {
     name : 'data',
     type: types.DICTIONARY,
   }, {
-    name : 'force',
+    name : 'updateIfPaused',
     type : types.BOOLEAN,
   }]);
 
@@ -148,7 +148,7 @@ WidgetInstance.prototype.sendContent = function() {
   callArgs.widgetId = this.widget.id;
   callArgs.instanceId = this.id;
   callArgs.data = args.data;
-  callArgs.force = args.force;
+  callArgs.updateIfPaused = args.updateIfPaused;
 
   var ret = native.callSync('WidgetInstance_sendContent', callArgs);
 
@@ -174,7 +174,6 @@ WidgetInstance.prototype.getContent = function() {
     if (native.isFailure(result)) {
       args.errorCallback(native.getErrorObject(result));
     } else {
-      //TODO what is type of returned data
       args.successCallback(native.getResultObject(result));
     }
   };
@@ -217,7 +216,7 @@ function Widget(data) {
 
 Widget.prototype.getName = function() {
   var args = validator.validateMethod(arguments, [{
-    name : 'lang',
+    name : 'locale',
     type : types.STRING,
     optional : true,
     nullable : true
@@ -226,8 +225,8 @@ Widget.prototype.getName = function() {
   var callArgs = {};
   callArgs.widgetId = this.id;
 
-  if (args.lang) {
-    callArgs.lang = args.lang;
+  if (args.locale) {
+    callArgs.locale = args.locale;
   }
 
   var ret = native.callSync('Widget_getName', callArgs);
@@ -354,16 +353,16 @@ ListenerManager.prototype.removeListener = function(watchId) {
   }
 };
 
-var WIDGET_CHANGE_LISTENER = 'WidgetChangeCallback';
-var widgetChangeListener = new ListenerManager(native, WIDGET_CHANGE_LISTENER);
+var WIDGET_STATE_CHANGE_LISTENER = 'WidgetStateChangeCallback';
+var widgetStateChangeListener = new ListenerManager(native, WIDGET_STATE_CHANGE_LISTENER);
 
-Widget.prototype.addChangeListener = function() {
+Widget.prototype.addStateChangeListener = function() {
   var args = validator.validateMethod(arguments, [{
     name : 'eventCallback',
     type : types.FUNCTION,
   }]);
 
-  var result = native.callSync('Widget_addChangeListener', {widgetId : this.id});
+  var result = native.callSync('Widget_addStateChangeListener', {widgetId : this.id});
   if (native.isFailure(result)) {
     throw native.getErrorObject(result);
   }
@@ -374,18 +373,18 @@ Widget.prototype.addChangeListener = function() {
     }
   }.bind(this);
 
-  return widgetChangeListener.addListener(func);
+  return widgetStateChangeListener.addListener(func);
 };
 
-Widget.prototype.removeChangeListener = function() {
+Widget.prototype.removeStateChangeListener = function() {
   var args = validator.validateMethod(arguments, [{
     name : 'watchId',
     type : types.LONG,
   }]);
 
-  widgetChangeListener.removeListener(args.watchId);
+  widgetStateChangeListener.removeListener(args.watchId);
 
-  var result = native.callSync('Widget_removeChangeListener', {widgetId : this.id});
+  var result = native.callSync('Widget_removeStateChangeListener', {widgetId : this.id});
   if (native.isFailure(result)) {
     throw native.getErrorObject(result);
   }

diff --git a/src/widgetservice/widgetservice_instance.cc b/src/widgetservice/widgetservice_instance.cc
index be4d077a0ed7cf1e6a2e28238176a078d1065322..c60a3f5b32f63d3eb24a0bf0b7c9c7013950669f 100755 (executable)
--- a/src/widgetservice/widgetservice_instance.cc
+++ b/src/widgetservice/widgetservice_instance.cc
@@ -36,14 +36,14 @@ using common::TizenSuccess;
 std::mutex WidgetServiceInstance::listener_mutex_;
 
 namespace {
-const common::ListenerToken kWidgetChangeCallbackToken{"WidgetChangeCallback"};
+const common::ListenerToken kWidgetChangeCallbackToken{"WidgetStateChangeCallback"};
 
 const std::string kPrivilegeWidgetService = "http://tizen.org/privilege/widget.viewer";
 
-const std::string kLang = "lang";
+const std::string kLocale = "locale";
 const std::string kInstanceId = "instanceId";
-const std::string kPeriod = "period";
-const std::string kForce = "force";
+const std::string kSeconds = "seconds";
+const std::string kUpdateIfPaused = "updateIfPaused";
 const std::string kData = "data";
 const std::string kEvent = "event";
 
@@ -148,8 +148,8 @@ WidgetServiceInstance::WidgetServiceInstance() {
   REGISTER_SYNC("WidgetServiceManager_getSize", GetSize);
   REGISTER_SYNC("Widget_getName", GetName);
   REGISTER_SYNC("Widget_getVariant", GetVariant);
-  REGISTER_SYNC("Widget_addChangeListener", AddChangeListener);
-  REGISTER_SYNC("Widget_removeChangeListener", RemoveChangeListener);
+  REGISTER_SYNC("Widget_addStateChangeListener", AddStateChangeListener);
+  REGISTER_SYNC("Widget_removeStateChangeListener", RemoveStateChangeListener);
   REGISTER_SYNC("WidgetInstance_changeUpdatePeriod", ChangeUpdatePeriod);
   REGISTER_SYNC("WidgetInstance_sendContent", SendContent);
 
@@ -290,14 +290,14 @@ TizenResult WidgetServiceInstance::GetName(picojson::object const& args) {
   CHECK_EXIST(args, kWidgetId, out)
 
   const auto& widget_id = args.find(kWidgetId)->second.get<std::string>();
-  char* lang = nullptr;
+  char* locale = nullptr;
 
-  const auto lang_it = args.find(kLang);
-  if (args.end() != lang_it) {
-    lang = const_cast<char*>(lang_it->second.get<std::string>().c_str());
+  const auto locale_it = args.find(kLocale);
+  if (args.end() != locale_it) {
+    locale = const_cast<char*>(locale_it->second.get<std::string>().c_str());
   }
 
-  char* name = widget_service_get_name(widget_id.c_str(), lang);
+  char* name = widget_service_get_name(widget_id.c_str(), locale);
   if (!name) {
     LogAndReturnTizenError(
         WidgetServiceUtils::ConvertErrorCode(get_last_result()), ("widget_service_get_name() failed"));
@@ -449,7 +449,7 @@ void WidgetServiceInstance::CallWidgetLifecycleListener(const std::string& widge
   LoggerW("widget id was not found.");
 }
 
-TizenResult WidgetServiceInstance::AddChangeListener(picojson::object const& args) {
+TizenResult WidgetServiceInstance::AddStateChangeListener(picojson::object const& args) {
   ScopeLogger();
 
   CHECK_PRIVILEGE(kPrivilegeWidgetService);
@@ -476,7 +476,7 @@ TizenResult WidgetServiceInstance::AddChangeListener(picojson::object const& arg
   return TizenSuccess();
 }
 
-TizenResult WidgetServiceInstance::RemoveChangeListener(picojson::object const& args) {
+TizenResult WidgetServiceInstance::RemoveStateChangeListener(picojson::object const& args) {
   ScopeLogger();
 
   CHECK_EXIST(args, kWidgetId, out)
@@ -507,13 +507,13 @@ TizenResult WidgetServiceInstance::ChangeUpdatePeriod(picojson::object const& ar
 
   CHECK_EXIST(args, kWidgetId, out)
   CHECK_EXIST(args, kInstanceId, out)
-  CHECK_EXIST(args, kPeriod, out)
+  CHECK_EXIST(args, kSeconds, out)
 
   const auto& widget_id = args.find(kWidgetId)->second.get<std::string>();
   const auto& instance_id = args.find(kInstanceId)->second.get<std::string>();
-  const double period = args.find(kPeriod)->second.get<double>();
+  const double seconds = args.find(kSeconds)->second.get<double>();
 
-  int ret = widget_service_change_period(widget_id.c_str(), instance_id.c_str(), period);
+  int ret = widget_service_change_period(widget_id.c_str(), instance_id.c_str(), seconds);
 
   if (WIDGET_ERROR_NONE != ret) {
     LogAndReturnTizenError(
@@ -529,11 +529,11 @@ TizenResult WidgetServiceInstance::SendContent(picojson::object const& args) {
   CHECK_EXIST(args, kWidgetId, out)
   CHECK_EXIST(args, kInstanceId, out)
   CHECK_EXIST(args, kData, out)
-  CHECK_EXIST(args, kForce, out)
+  CHECK_EXIST(args, kUpdateIfPaused, out)
 
   const auto& widget_id = args.find(kWidgetId)->second.get<std::string>();
   const auto& instance_id = args.find(kInstanceId)->second.get<std::string>();
-  const int force = args.find(kForce)->second.get<bool>() ? 1 : 0;
+  const int force = args.find(kUpdateIfPaused)->second.get<bool>() ? 1 : 0;
 
   bundle* data = bundle_create();
   int ret = get_last_result();

diff --git a/src/widgetservice/widgetservice_instance.h b/src/widgetservice/widgetservice_instance.h
index 8aadbfaab119a777bef526e1e1ab683da2a5364f..747f100efcafe8f90f4ace9e50ed01167879da2f 100755 (executable)
--- a/src/widgetservice/widgetservice_instance.h
+++ b/src/widgetservice/widgetservice_instance.h
@@ -41,8 +41,8 @@ class WidgetServiceInstance : public common::TizenInstance {
   common::TizenResult GetInstances(picojson::object const& args, const common::AsyncToken& token);
   common::TizenResult GetVariant(picojson::object const& args);
   common::TizenResult GetVariants(picojson::object const& args, const common::AsyncToken& token);
-  common::TizenResult AddChangeListener(picojson::object const& args);
-  common::TizenResult RemoveChangeListener(picojson::object const& args);
+  common::TizenResult AddStateChangeListener(picojson::object const& args);
+  common::TizenResult RemoveStateChangeListener(picojson::object const& args);
   //WidgetInstance
   common::TizenResult ChangeUpdatePeriod(picojson::object const& args);
   common::TizenResult SendContent(picojson::object const& args);