Removing getXXX methods + properties. Adding getProperty feature to SmartThing(s)

[smartthings-infrastructure.git] / AccelerationSensor / AccelerationSensors.groovy

diff --git a/AccelerationSensor/AccelerationSensors.groovy b/AccelerationSensor/AccelerationSensors.groovy
index 0d3c14f84f607d41b00ac83debd27893bf49857c..c218c2f813d0a7b637337f7c00a90034f97ab841 100644 (file)
--- a/AccelerationSensor/AccelerationSensors.groovy
+++ b/AccelerationSensor/AccelerationSensors.groovy
@@ -1,71 +1,25 @@
 //Create a class for acceleration sensor
 package AccelerationSensor
-import Timer.SimulatedTimer
-
-public class AccelerationSensors {
-       private int deviceNumbers
-       private List accelerationSensors
-       def sendEvent
-
-       //For one device(We cannot have obj.id)-> We should have obj[0].id
-       private String id = "accelerationSensorID0"
-       private String label = "accelerationSensor0"
-       private String displayName = "accelerationSensor0"
-       private String acceleration = "inactive"
-       private String currentAcceleration = "inactive"
-       private String accelerationLatestValue = "inactive"
+import SmartThing.SmartThings
 
+public class AccelerationSensors extends SmartThings {
+       List accelerationSensors = new ArrayList()
                
-       AccelerationSensors(Closure sendEvent, int deviceNumbers) {
-               this.sendEvent = sendEvent              
-               this.deviceNumbers = deviceNumbers
-               this.accelerationSensors = []
-
-               accelerationSensors.add(new AccelerationSensor(id, label, displayName, this.acceleration, this.accelerationLatestValue))
-       }
-
-       //By Model Checker
-       def setValue(LinkedHashMap eventDataMap) {
-               if (eventDataMap["value"] != accelerationSensors[0].acceleration) {
-                       accelerationSensors[0].setValue(eventDataMap["value"])
-                       this.accelerationLatestValue = accelerationSensors[0].accelerationLatestValue
-                       this.acceleration = accelerationSensors[0].acceleration
-                       this.currentAcceleration = accelerationSensors[0].acceleration
-                       sendEvent(eventDataMap)
-               }
-       }
-
-       //Methods for closures
-       def count(Closure Input) {
-               accelerationSensors.count(Input)
-       }
-       def size() {
-               accelerationSensors.size()
-       }
-       def each(Closure Input) {
-               accelerationSensors.each(Input)
-       }
-       def find(Closure Input) {
-               accelerationSensors.find(Input)
-       }
-       def collect(Closure Input) {
-               accelerationSensors.collect(Input)
-       }
-
-
-       def currentValue(String deviceFeature) {
-               accelerationSensors[0].currentValue(deviceFeature)//It is called if we have only one device
-       }
-
-       def latestValue(String deviceFeature) {
-               accelerationSensors[0].latestValue(deviceFeature)//It is called if we have only one device
-       }
-
-       def statesSince(String info, Date dateObj) {
-               return accelerationSensors[0].statesSince(info, dateObj)
-       }
-
-       def getAt(int ix) {
-               accelerationSensors[ix]
+       AccelerationSensors(Closure sendEvent, boolean init) {
+               accelerationSensors = smartThings
+
+               // Initialize
+               String id = "accelerationID0"
+               String label = "acceleration"
+               String displayName = "accelerationSensor"
+               String acceleration
+
+               // Initialization
+               if (init)
+                       acceleration = "inactive"
+               else
+                       acceleration = "active"
+
+               accelerationSensors.add(new AccelerationSensor(sendEvent, id, label, displayName, acceleration))
        }
 }