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

[smartthings-infrastructure.git] / WaterSensor / WaterSensors.groovy

diff --git a/WaterSensor/WaterSensors.groovy b/WaterSensor/WaterSensors.groovy
index 10a4cfd6d145043f95622afcff3cb4214d7e07f1..adf0df9a3d25ae8b0baec2fbb589e315a9d1b29a 100644 (file)
--- a/WaterSensor/WaterSensors.groovy
+++ b/WaterSensor/WaterSensors.groovy
@@ -1,54 +1,25 @@
 //Create a class for water sensor
 package WaterSensor
-import Timer.SimulatedTimer
+import SmartThing.SmartThings
 
-public class WaterSensors {
-       private int deviceNumbers
-       private List waterSensors
-       def sendEvent
+public class WaterSensors extends SmartThings {
+       List waterSensors = new ArrayList()
 
-       //For one device(We cannot have obj.id)-> We should have obj[0].id
-       private String id = "waterSensorID0"
-       private String label = "waterSensor0"
-       private String displayName = "waterSensor0"
-       private String water = "dry"
+       WaterSensors(Closure sendEvent, boolean init) {
+               // Only initialize one time since we only have one device for each capability
+               waterSensors = smartThings
 
-               
-       WaterSensors(Closure sendEvent, int deviceNumbers) {
-               this.sendEvent = sendEvent              
-               this.deviceNumbers = deviceNumbers
-               this.waterSensors = []
+               // Initialization
+               String id = "waterSensorID0"
+               String label = "water"
+               String displayName = "waterSensor"
+               String water
 
-               waterSensors.add(new WaterSensor(id, label, displayName, this.water))
-       }
-
-       //By Model Checker
-       def setValue(LinkedHashMap eventDataMap) {
-               if (eventDataMap["value"] != waterSensors[0].water) {
-                       waterSensors[0].setValue(eventDataMap["value"])
-                       this.water = waterSensors[0].water
-                       sendEvent(eventDataMap)
-               }
-       }
-
-       //Methods for closures
-       def count(Closure Input) {
-               waterSensors.count(Input)
-       }
-       def size() {
-               waterSensors.size()
-       }
-       def each(Closure Input) {
-               waterSensors.each(Input)
-       }
-       def find(Closure Input) {
-               waterSensors.find(Input)
-       }
-       def collect(Closure Input) {
-               waterSensors.collect(Input)
-       }
+               if (init)
+                       water = "dry"
+               else
+                       water = "wet"
 
-       def getAt(int ix) {
-               waterSensors[ix]
+               waterSensors.add(new WaterSensor(sendEvent, id, label, displayName, water))
        }
 }