[Convergence] Change the channel interface name, Channel->ChannelInfo

SE TC Issue : Channel_notexist...(PASS)

Change-Id: I5e39d2d71c717c8934c8496a49ad52ca2c885435
Signed-off-by: sangrae.kim <sangrae.kim@samsung.com>

diff --git a/src/convergence/convergence.gyp b/src/convergence/convergence.gyp
index 1ab30fc..1f6f14b 100644 (file)
--- a/src/convergence/convergence.gyp
+++ b/src/convergence/convergence.gyp
@@ -27,8 +27,8 @@
         'convergence_remote_app_control_service.h',
         'convergence_app_communication_service.cc',
         'convergence_app_communication_service.h',
-        'convergence_channel.cc',
-        'convergence_channel.h',
+        'convergence_channel_info.cc',
+        'convergence_channel_info.h',
         'convergence_payload.cc',
         'convergence_payload.h',
         'convergence_client_info.cc',

diff --git a/src/convergence/convergence_api.js b/src/convergence/convergence_api.js
index 1d048f7..e570e07 100644 (file)
--- a/src/convergence/convergence_api.js
+++ b/src/convergence/convergence_api.js
@@ -540,15 +540,15 @@ native_.addListener('APP_COMMUNICATION_SERVICE_LISTENER', function(result) {
       break;
     case 'onStart':
       native_.callIfPossible(s._startCallback,
-        new Channel(result.channel.uri, result.channel.id), null);
+        new ChannelInfo(result.channel.uri, result.channel.id), null);
       break;
     case 'onPublish':
       native_.callIfPossible(s._sendCallback,
-        new Channel(result.channel.uri, result.channel.id), null);
+        new ChannelInfo(result.channel.uri, result.channel.id), null);
       break;
     case 'onStop':
       native_.callIfPossible(s._stopCallback,
-        new Channel(result.channel.uri, result.channel.id), null);
+        new ChannelInfo(result.channel.uri, result.channel.id), null);
       break;
     case 'onMessage': {
         var payload = [];
@@ -568,7 +568,7 @@ native_.addListener('APP_COMMUNICATION_SERVICE_LISTENER', function(result) {
         }
 
         native_.callIfPossible(s._listenerCallback,
-          new Channel(result.channel.uri, result.channel.id),
+          new ChannelInfo(result.channel.uri, result.channel.id),
           payload, result.senderId);
       }
       break;
@@ -595,7 +595,7 @@ AppCommunicationService.prototype.start = function(channel, successCallback, err
     {
       name: 'channel',
       type: types_.PLATFORM_OBJECT,
-      values: tizen.Channel,
+      values: tizen.ChannelInfo,
       optional: false,
       nullable: false
     },
@@ -641,7 +641,7 @@ AppCommunicationService.prototype.stop = function(channel, successCallback, erro
     {
       name: 'channel',
       type: types_.PLATFORM_OBJECT,
-      values: tizen.Channel,
+      values: tizen.ChannelInfo,
       optional: false,
       nullable: false
     },
@@ -690,7 +690,7 @@ AppCommunicationService.prototype.send = function(channel, payload, successCallb
     {
       name: 'channel',
       type: types_.PLATFORM_OBJECT,
-      values: tizen.Channel,
+      values: tizen.ChannelInfo,
       optional: false,
       nullable: false
     },
@@ -880,8 +880,8 @@ AppCommunicationClientService.prototype.disconnect = function(successCallback, e
   native_.callIfPossible(successCallback, this);
 };
 
-function Channel(uri, id) {
-  validator_.isConstructorCall(this, Channel);
+function ChannelInfo(uri, id) {
+  validator_.isConstructorCall(this, ChannelInfo);
   this.uri = uri;
   this.id = id;
 }
@@ -911,6 +911,6 @@ exports = new ConvergenceManager();
 tizen.RemoteAppControlService = RemoteAppControlService;
 tizen.AppCommunicationServerService = AppCommunicationServerService;
 tizen.AppCommunicationClientService = AppCommunicationClientService;
-tizen.Channel = Channel;
+tizen.ChannelInfo = ChannelInfo;
 tizen.PayloadString = PayloadString;
 tizen.PayloadRawBytes = PayloadRawBytes;

diff --git a/src/convergence/convergence_app_communication_service.cc b/src/convergence/convergence_app_communication_service.cc
index 0cc7bd6..0be7f1d 100644 (file)
--- a/src/convergence/convergence_app_communication_service.cc
+++ b/src/convergence/convergence_app_communication_service.cc
@@ -22,7 +22,7 @@
 #include <stdlib.h>
 
 #include "convergence/convergence_instance.h"
-#include "convergence/convergence_channel.h"
+#include "convergence/convergence_channel_info.h"
 #include "convergence/convergence_payload.h"
 #include "convergence/convergence_client_info.h"
 #include "common/logger.h"

diff --git a/src/convergence/convergence_channel.cc b/src/convergence/convergence_channel_info.cc
similarity index 98%
rename from src/convergence/convergence_channel.cc
rename to src/convergence/convergence_channel_info.cc
index 45e77c8..ef4d579 100644 (file)
--- a/src/convergence/convergence_channel.cc
+++ b/src/convergence/convergence_channel_info.cc
@@ -15,7 +15,7 @@
  */
 
 // TODO check includes
-#include "convergence/convergence_channel.h"
+#include "convergence/convergence_channel_info.h"
 
 #include <glib.h>
 #include <d2d_conv_internal.h>

diff --git a/src/convergence/convergence_channel.h b/src/convergence/convergence_channel_info.h
similarity index 100%
rename from src/convergence/convergence_channel.h
rename to src/convergence/convergence_channel_info.h

diff --git a/src/convergence/convergence_extension.cc b/src/convergence/convergence_extension.cc
index 6ddea57..0899933 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.Channel",
+      "tizen.ChannelInfo",
       "tizen.PayloadString",
       "tizen.PayloadRawBytes",
       nullptr

diff --git a/src/convergence/convergence_instance.cc b/src/convergence/convergence_instance.cc
index 22bd337..48b589b 100644 (file)
--- a/src/convergence/convergence_instance.cc
+++ b/src/convergence/convergence_instance.cc
@@ -22,7 +22,7 @@
 #include "convergence/convergence_manager.h"
 #include "convergence/convergence_remote_app_control_service.h"
 #include "convergence/convergence_app_communication_service.h"
-#include "convergence/convergence_channel.h"
+#include "convergence/convergence_channel_info.h"
 #include "convergence/convergence_payload.h"
 #include "common/logger.h"
 #include "common/picojson.h"