Improve usability of ActionSet for Group Action Feature.

ActionSet structure is not show directly to developer.
Because there is the definition of ActionSet in GroupManager.h.
So we separate the definition of ActionSet from Groupmanager to ActionSet.h
And it is exposed to developer by one type of header file.

Change-Id: I2ccb93cf70ec42b122aaead4943aed56df161641
Signed-off-by: HyunJun Kim <hyunjun2.kim@samsung.com>

diff --git a/service/things-manager/sdk/inc/ActionSet.h b/service/things-manager/sdk/inc/ActionSet.h
new file mode 100644 (file)
index 0000000..0deba88
--- /dev/null
+++ b/service/things-manager/sdk/inc/ActionSet.h
@@ -0,0 +1,69 @@
+//******************************************************************
+//
+// Copyright 2014 Samsung Electronics All Rights Reserved.
+//
+//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+
+#ifndef __OC_ACTIONSET__
+#define __OC_ACTIONSET__
+
+#include <string>
+#include <vector>
+
+using namespace std;
+
+namespace OIC{
+       class Capability
+    {
+    public:
+        std::string capability;
+        std::string status;
+    };
+
+    class Action
+    {
+    public:
+        Action() :
+                target("")
+        {
+        }
+        ~Action()
+        {
+            listOfCapability.clear();
+        }
+        std::string target;
+
+        std::vector< Capability* > listOfCapability;
+    };
+
+    class ActionSet
+    {
+    public:
+        ActionSet() :
+                actionsetName("")
+        {
+        }
+        ~ActionSet()
+        {
+            listOfAction.clear();
+        }
+        std::string actionsetName;
+
+        std::vector< Action* > listOfAction;
+    };
+}
+#endif 

diff --git a/service/things-manager/sdk/inc/ThingsManager.h b/service/things-manager/sdk/inc/ThingsManager.h
index de7c365..8dd0a6f 100644 (file)
--- a/service/things-manager/sdk/inc/ThingsManager.h
+++ b/service/things-manager/sdk/inc/ThingsManager.h
@@ -30,6 +30,7 @@
 #include <vector>
 #include <map>
 #include <cstdlib>
+#include <ActionSet.h>
 #include "OCPlatform.h"
 #include "OCApi.h"
 #include "GroupManager.h"

diff --git a/service/things-manager/sdk/src/GroupManager.h b/service/things-manager/sdk/src/GroupManager.h
index 5a2d6cc..a77e881 100644 (file)
--- a/service/things-manager/sdk/src/GroupManager.h
+++ b/service/things-manager/sdk/src/GroupManager.h
@@ -29,6 +29,7 @@
 #include <vector>
 #include <map>
 #include <cstdlib>
+#include <ActionSet.h>
 #include "OCPlatform.h"
 #include "OCApi.h"
 
@@ -43,45 +44,6 @@ typedef std::function< void(const HeaderOptions&, const OCRepresentation&, const
 typedef std::function< void(const HeaderOptions&, const OCRepresentation&, const int) > PostCallback;
 typedef std::function< void(const HeaderOptions&, const OCRepresentation&, const int) > PutCallback;
 
-class Capability
-{
-public:
-    std::string capability;
-    std::string status;
-};
-
-class Action
-{
-public:
-    Action() :
-            target("")
-    {
-    }
-    ~Action()
-    {
-        listOfCapability.clear();
-    }
-    std::string target;
-
-    std::vector< Capability* > listOfCapability;
-};
-
-class ActionSet
-{
-public:
-    ActionSet() :
-            actionsetName("")
-    {
-    }
-    ~ActionSet()
-    {
-        listOfAction.clear();
-    }
-    std::string actionsetName;
-
-    std::vector< Action* > listOfAction;
-};
-
 class GroupManager
 {
 public: