[Convergence] Change the channelInfo interface name, ChannelInfo->ConvergenceChannelInfo

ACR : TWDAPI-143

Change-Id: I01b67fa814b2f19e87913fd4c4e33ff7686d7015

diff --git a/src/convergence/convergence_api.js b/src/convergence/convergence_api.js
index d8c1baf0a335cd15eed7ecd0cc393d9e5c9f6cd2..993c4472622b17ae8bac2a6b5c798d44d10e5dba 100644 (file)
--- a/src/convergence/convergence_api.js
+++ b/src/convergence/convergence_api.js
@@ -672,15 +672,15 @@ native_.addListener('APP_COMMUNICATION_SERVICE_LISTENER', function(result) {
     case 'onStart':
       var clientInfo = (result.clientInfo ? new ClientInfo(result.clientInfo) : null);
       native_.callIfPossible(s._startCallback,
-        new ChannelInfo(result.channel.uri, result.channel.id), clientInfo);
+        new ConvergenceChannelInfo(result.channel.uri, result.channel.id), clientInfo);
       break;
     case 'onPublish':
       native_.callIfPossible(s._sendCallback,
-        new ChannelInfo(result.channel.uri, result.channel.id), null);
+        new ConvergenceChannelInfo(result.channel.uri, result.channel.id), null);
       break;
     case 'onStop':
       native_.callIfPossible(s._stopCallback,
-        new ChannelInfo(result.channel.uri, result.channel.id), null);
+        new ConvergenceChannelInfo(result.channel.uri, result.channel.id), null);
       break;
     case 'onRead':
       var clients_array = [];
@@ -697,7 +697,7 @@ native_.addListener('APP_COMMUNICATION_SERVICE_LISTENER', function(result) {
     case 'onMessage': {
         var payload = result.payload;
         native_.callIfPossible(s._listenerCallback,
-          new ChannelInfo(result.channel.uri, result.channel.id),
+          new ConvergenceChannelInfo(result.channel.uri, result.channel.id),
           payload, result.senderId);
       }
       break;
@@ -712,7 +712,7 @@ AppCommunicationService.prototype.start = function(channel, successCallback, err
     {
       name: 'channel',
       type: types_.PLATFORM_OBJECT,
-      values: tizen.ChannelInfo,
+      values: tizen.ConvergenceChannelInfo,
       optional: false,
       nullable: false
     },
@@ -754,7 +754,7 @@ AppCommunicationService.prototype.stop = function(channel, successCallback, erro
     {
       name: 'channel',
       type: types_.PLATFORM_OBJECT,
-      values: tizen.ChannelInfo,
+      values: tizen.ConvergenceChannelInfo,
       optional: false,
       nullable: false
     },
@@ -799,7 +799,7 @@ AppCommunicationService.prototype.send = function(channel, payload, successCallb
     {
       name: 'channel',
       type: types_.PLATFORM_OBJECT,
-      values: tizen.ChannelInfo,
+      values: tizen.ConvergenceChannelInfo,
       optional: false,
       nullable: false
     },
@@ -847,7 +847,7 @@ AppCommunicationService.prototype.getClientList = function() {
   var args = validator_.validateArgs(arguments, [{
       name: 'channel',
       type: types_.PLATFORM_OBJECT,
-      values: tizen.ChannelInfo,
+      values: tizen.ConvergenceChannelInfo,
       optional: false,
       nullable: false
     }, {
@@ -1017,8 +1017,8 @@ AppCommunicationClientService.prototype.disconnect = function(successCallback, e
   }
 };
 
-function ChannelInfo(uri_, id_) {
-  validator_.isConstructorCall(this, ChannelInfo);
+function ConvergenceChannelInfo(uri_, id_) {
+  validator_.isConstructorCall(this, ConvergenceChannelInfo);
 
   var id = '';
   var uri = '';
@@ -1076,4 +1076,4 @@ function ClientInfo(data) {
 
 exports = new ConvergenceManager();
 tizen.AppCommunicationServerService = AppCommunicationServerService;
-tizen.ChannelInfo = ChannelInfo;
+tizen.ConvergenceChannelInfo = ConvergenceChannelInfo;

diff --git a/src/convergence/convergence_extension.cc b/src/convergence/convergence_extension.cc
index 6e39e0ca13120de99cce276f05a8b8ef93ec83fa..6952ef9724470e055e0a23df3024fc754f76f292 100644 (file)
--- a/src/convergence/convergence_extension.cc
+++ b/src/convergence/convergence_extension.cc
@@ -33,7 +33,7 @@ ConvergenceExtension::ConvergenceExtension() {
       "tizen.RemoteAppControlService",
       "tizen.AppCommunicationServerService",
       "tizen.AppCommunicationClientService",
-      "tizen.ChannelInfo",
+      "tizen.ConvergenceChannelInfo",
       nullptr
     };
   SetExtraJSEntryPoints(entry_points);