Merge master to cloud-interface branch

[platform/upstream/iotivity.git] / service / soft-sensor-manager / SDK / java / org / iotivity / service / ssm / ModelData.java

diff --git a/service/soft-sensor-manager/SDK/java/org/iotivity/service/ssm/ModelData.java b/service/soft-sensor-manager/SDK/java/org/iotivity/service/ssm/ModelData.java
index 501dfdf..fc408da 100644 (file)
--- a/service/soft-sensor-manager/SDK/java/org/iotivity/service/ssm/ModelData.java
+++ b/service/soft-sensor-manager/SDK/java/org/iotivity/service/ssm/ModelData.java
@@ -36,9 +36,9 @@ package org.iotivity.service.ssm;
 public class ModelData
 {
 
-        private int pIModelDataInstance;
+        private long pIModelDataInstance;
 
-        public ModelData(int iModelDataInstance)
+        private ModelData(long iModelDataInstance)
         {
             pIModelDataInstance = iModelDataInstance;
         }
@@ -50,9 +50,9 @@ public class ModelData
          * @return int - the affected DataId
          * 
          */
-        public int GetDataId()
+        public int getDataId()
         {
-            return CoreController.getInstance().GetDataId(pIModelDataInstance);
+            return CoreController.getInstance().getDataId(pIModelDataInstance);
         }
 
         /**
@@ -62,9 +62,9 @@ public class ModelData
          * @return int - number of properties
          * 
          */
-        public int GetPropertyCount()
+        public int getPropertyCount()
         {
-            return CoreController.getInstance().GetPropertyCount(
+            return CoreController.getInstance().getPropertyCount(
                        pIModelDataInstance);
         }
 
@@ -77,9 +77,9 @@ public class ModelData
          * @return String - property name
          * 
          */
-        public String GetPropertyName(int propertyIndex)
+        public String getPropertyName(int propertyIndex)
         {
-            return CoreController.getInstance().GetPropertyName(
+            return CoreController.getInstance().getPropertyName(
                        pIModelDataInstance, propertyIndex);
         }
 
@@ -92,9 +92,9 @@ public class ModelData
          * @return String - property value
          * 
          */
-        public String GetPropertyValue(int propertyIndex)
+        public String getPropertyValue(int propertyIndex)
         {
-            return CoreController.getInstance().GetPropertyValue(
+            return CoreController.getInstance().getPropertyValue(
                        pIModelDataInstance, propertyIndex);
         }
-}
\ No newline at end of file
+}