Replace MethodCallHandler::setCaller() with a parameterized constructor

Change-Id: Ie0ef9856666df4006c0e7b10189b8b33662e3981
Signed-off-by: Mu-Woong Lee <muwoong.lee@samsung.com>

diff --git a/include/private/JobSchedulerService.h b/include/private/JobSchedulerService.h
index 247e66731959bf4d753834d27e77ea7a90c4c5af..6f477a43b5d6c0eb76d340595ef1f640a0a8468f 100644 (file)
--- a/include/private/JobSchedulerService.h
+++ b/include/private/JobSchedulerService.h
@@ -19,6 +19,7 @@
 
 #include <IService.h>
 #include <IServiceRunner.h>
+#include <IClient.h>
 #include <IMethodCallHandler.h>
 
 namespace ctx {
@@ -41,7 +42,7 @@ namespace ctx {
                void onUserActivated();
                void onUserDeactivated();
 
-               IMethodCallHandler* createMethodCallHandler();
+               IMethodCallHandler* createMethodCallHandler(IClient* client);
 
        private:
                IServiceRunner* __serviceRunner;

diff --git a/src/server-dummy/JobSchedulerService.cpp b/src/server-dummy/JobSchedulerService.cpp
index 3c97c121a48fe517059ee3d2836e574f86c261d2..2f47bc4bab01aacce8cd3fd9e783c7eddc834c41 100644 (file)
--- a/src/server-dummy/JobSchedulerService.cpp
+++ b/src/server-dummy/JobSchedulerService.cpp
@@ -66,7 +66,7 @@ void JobSchedulerService::onUserDeactivated()
 {
 }
 
-IMethodCallHandler* JobSchedulerService::createMethodCallHandler()
+IMethodCallHandler* JobSchedulerService::createMethodCallHandler(IClient* client)
 {
        return NULL;
 }

diff --git a/src/server/JobSchedulerService.cpp b/src/server/JobSchedulerService.cpp
index d59a623f6f774a70a8f7cbe37d730680b3e3a6e8..0c6e10cb595a10b19e327f68d520e97625ee1075 100644 (file)
--- a/src/server/JobSchedulerService.cpp
+++ b/src/server/JobSchedulerService.cpp
@@ -65,7 +65,7 @@ void JobSchedulerService::onUserDeactivated()
 {
 }
 
-IMethodCallHandler* JobSchedulerService::createMethodCallHandler()
+IMethodCallHandler* JobSchedulerService::createMethodCallHandler(IClient* client)
 {
-       return new MethodCallHandler();
+       return new MethodCallHandler(client);
 }

diff --git a/src/server/MethodCallHandler.cpp b/src/server/MethodCallHandler.cpp
index 667506307017ee5ab8620b0289b781b8c5b319f2..eee8dcdd1a5d9d946cfad875745f3337bf1197a0 100644 (file)
--- a/src/server/MethodCallHandler.cpp
+++ b/src/server/MethodCallHandler.cpp
@@ -18,8 +18,8 @@
 
 using namespace ctx;
 
-MethodCallHandler::MethodCallHandler() :
-       __caller(NULL)
+MethodCallHandler::MethodCallHandler(IClient* client) :
+       __caller(client)
 {
 }
 
@@ -27,11 +27,6 @@ MethodCallHandler::~MethodCallHandler()
 {
 }
 
-void MethodCallHandler::setCaller(IClient* client)
-{
-       __caller = client;
-}
-
 void MethodCallHandler::onMethodCalled(IMethodCall* methodCall)
 {
        delete methodCall;

diff --git a/src/server/MethodCallHandler.h b/src/server/MethodCallHandler.h
index c40082502c075e47cb38576d452d19d295e514ab..ba2b5e875729be9a35f503f2e1237427c9748325 100644 (file)
--- a/src/server/MethodCallHandler.h
+++ b/src/server/MethodCallHandler.h
@@ -27,10 +27,9 @@ namespace ctx {
 
        class MethodCallHandler : public IMethodCallHandler {
        public:
-               MethodCallHandler();
+               MethodCallHandler(IClient* client);
                ~MethodCallHandler();
 
-               void setCaller(IClient* client);
                void onMethodCalled(IMethodCall* methodCall);
                void onDisconnected();