Performed refactoring and code cleanup on service provider plug-in.

[platform/upstream/iotivity.git] / service / simulator / java / eclipse-plugin / ServiceProviderPlugin / src / oic / simulator / serviceprovider / resource / LocalResourceAttribute.java

diff --git a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/resource/LocalResourceAttribute.java b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/resource/LocalResourceAttribute.java
index ffd9499..1aea3e8 100644 (file)
--- a/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/resource/LocalResourceAttribute.java
+++ b/service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/resource/LocalResourceAttribute.java
@@ -1,11 +1,10 @@
 package oic.simulator.serviceprovider.resource;
 
-import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 
 import org.oic.simulator.AutomationType;
 import org.oic.simulator.ResourceAttribute;
+import org.oic.simulator.ResourceAttribute.Range;
 import org.oic.simulator.ResourceAttribute.Type;
 
 public class LocalResourceAttribute {
@@ -13,14 +12,8 @@ public class LocalResourceAttribute {
     // Native object reference
     private ResourceAttribute resourceAttribute;
 
-    private String            attributeName;
     private Object            attributeValue;
-    private Type              attValType;
-    private Type              attValBaseType;
-    private List<Object>      allowedValues;
-
-    private Object            minValue;
-    private Object            maxValue;
+    private List<String>      attValues;
 
     private int               automationId;
 
@@ -39,11 +32,7 @@ public class LocalResourceAttribute {
     }
 
     public String getAttributeName() {
-        return attributeName;
-    }
-
-    public void setAttributeName(String attributeName) {
-        this.attributeName = attributeName;
+        return resourceAttribute.getName();
     }
 
     public Object getAttributeValue() {
@@ -54,39 +43,16 @@ public class LocalResourceAttribute {
         this.attributeValue = attributeValue;
     }
 
-    public List<Object> getAllowedValues() {
-        return allowedValues;
-    }
-
-    public void setAllowedValues(List<Object> allowedValues) {
-        this.allowedValues = allowedValues;
-    }
-
-    public void setAllowedValues(String[] allowedValues) {
-        List<Object> allowedValueList = null;
-        if (null != allowedValues && allowedValues.length > 0) {
-            allowedValueList = new ArrayList<Object>();
-            for (String value : allowedValues) {
-                allowedValueList.add(value);
-            }
-        }
-        this.allowedValues = allowedValueList;
+    public Object[] getAllowedValues() {
+        return resourceAttribute.getAllowedValues();
     }
 
     public Object getMinValue() {
-        return minValue;
-    }
-
-    public void setMinValue(Object minValue) {
-        this.minValue = minValue;
+        return resourceAttribute.getRange().getMin();
     }
 
     public Object getMaxValue() {
-        return maxValue;
-    }
-
-    public void setMaxValue(Object maxValue) {
-        this.maxValue = maxValue;
+        return resourceAttribute.getRange().getMax();
     }
 
     public boolean isAutomationInProgress() {
@@ -122,81 +88,36 @@ public class LocalResourceAttribute {
     }
 
     public Type getAttValType() {
-        return attValType;
+        return resourceAttribute.getType();
     }
 
-    public void setAttValType(Type attValType) {
-        this.attValType = attValType;
+    public Type getAttValBaseType() {
+        return resourceAttribute.getBaseType();
     }
 
-    public Type getAttValBaseType() {
-        return attValBaseType;
-    }
-
-    public void setAttValBaseType(Type attValBaseType) {
-        this.attValBaseType = attValBaseType;
-    }
-
-    public static LocalResourceAttribute clone(LocalResourceAttribute attribute) {
-        LocalResourceAttribute clone = null;
-        if (null != attribute) {
-            clone = new LocalResourceAttribute();
-            clone.setAttributeName(attribute.getAttributeName());
-            clone.setAttributeValue(attribute.getAttributeValue());
-            clone.setAllowedValues(attribute.getAllowedValues());
-            clone.setMinValue(attribute.getMinValue());
-            clone.setMaxValue(attribute.getMaxValue());
-            clone.setAutomationInProgress(attribute.isAutomationInProgress());
-            clone.setAutomationType(attribute.getAutomationType());
-            clone.setAutomationUpdateInterval(attribute
-                    .getAutomationUpdateInterval());
-            clone.setResourceAttribute(null);
-        }
-        return clone;
-    }
-
-    // This method gives all known possible values of the attribute in string
-    // format. It takes allowed values or range of values whichever is available
-    public List<String> getAllValues() {
-        List<String> valueList = new ArrayList<String>();
-        if (null != allowedValues) {
-            System.out.println("In getAllValues() - AllowedValues available");
-            Iterator<Object> values = allowedValues.iterator();
-            Object value;
-            while (values.hasNext()) {
-                value = values.next();
-                if (null != value) {
-                    valueList.add(String.valueOf(value));
-                }
-            }
-        } else if (null != minValue && null != maxValue) {
-            System.out.println("In getAllValues() - Range available");
-            if (attValBaseType == Type.INT) {
-                int min = (Integer) minValue;
-                int max = (Integer) maxValue;
-                for (int value = min; value <= max; value++) {
-                    valueList.add(String.valueOf(value));
-                }
-            } else if (attValBaseType == Type.DOUBLE) {
-                double min = (Double) minValue;
-                double max = (Double) maxValue;
-                for (double value = min; value <= max; value++) {
-                    valueList.add(String.valueOf(value));
-                }
-            }
-        }
-        if (valueList.size() < 1 && null != attributeValue) {
-            valueList.add(String.valueOf(attributeValue));
-        }
-        return valueList;
+    public List<String> getAttValues() {
+        return attValues;
+    }
+
+    public void setAttValues(List<String> attValues) {
+        this.attValues = attValues;
     }
 
     public void printAttributeDetails() {
-        System.out.println("Attribute Name:" + attributeName);
-        System.out.println("Attribute Value:" + attributeValue);
-        System.out.println("Attribute Base Type:" + attValBaseType);
-        System.out.println("Attribute Type:" + attValType);
-        System.out.println("Allowed Values:" + allowedValues);
-        System.out.println("Range:" + minValue + " to " + maxValue);
+        System.out.println("Attribute Name:" + resourceAttribute.getName());
+        System.out.println("Attribute Value:" + resourceAttribute.getValue());
+        System.out.println("Attribute Base Type:"
+                + resourceAttribute.getBaseType());
+        System.out.println("Attribute Type:" + resourceAttribute.getType());
+        System.out.print("Allowed Values:");
+        Object[] values = getAllowedValues();
+        for (Object obj : values) {
+            System.out.print(obj);
+        }
+        Range range = resourceAttribute.getRange();
+        if (null != range) {
+            System.out.println("Range:" + range.getMin() + " to "
+                    + range.getMax());
+        }
     }
 }
\ No newline at end of file