Commit #9: extension to the infrastructure with more devices + minor changes in extra...

[smartthings-infrastructure.git] / DoorControl / DoorControls.groovy

diff --git a/DoorControl/DoorControls.groovy b/DoorControl/DoorControls.groovy
index f2f520dc8b900dd7c85be3add9476f5b564c8717..19cc18b8af5a13d6d7684b6bffea224f8384408f 100644 (file)
--- a/DoorControl/DoorControls.groovy
+++ b/DoorControl/DoorControls.groovy
@@ -9,9 +9,9 @@ public class DoorControls {
        def sendEvent
 
        //If we have only one device
-       private int id = 40
-       private String label = "DoorControl"
-       private String displayName = "DoorControl"
+       private String id = "DoorControlID0"
+       private String label = "DoorControl0"
+       private String displayName = "DoorControl0"
        private String doorState = "closed"
        private String doorLatestValue = "closed"
 
@@ -20,9 +20,8 @@ public class DoorControls {
                this.timers = new SimulatedTimer()
                this.deviceNumbers = deviceNumbers
                this.doorControls = []
-               for (int i = 0;i < deviceNumbers;i++) {
-                       doorControls.add(new DoorControl(sendEvent, i+60, label+i.toString(), displayName+i.toString(), this.doorState, this.doorLatestValue))
-               }
+               
+               doorControls.add(new DoorControl(sendEvent, id, label, displayName, this.doorState, this.doorLatestValue))
        }
 
        //Methods for closures
@@ -35,49 +34,48 @@ public class DoorControls {
        def each(Closure Input) {
                doorControls.each(Input)
        }
+       def find(Closure Input) {
+               doorControls.find(Input)
+       }
+       def collect(Closure Input) {
+               doorControls.collect(Input)
+       }
 
        //By Apps
        def open() {
-               doorControls*.on()
+               doorControls[0].on()
        }
 
        def open(LinkedHashMap metaData) {
                def task = timers.runAfter(metaData["delay"]) {
-                       doorControls*.on()
+                       doorControls[0].on()
                }
        }
 
        def close() {
-               doorControls*.off()
+               doorControls[0].off()
        }
 
        def close(LinkedHashMap metaData) {
                def task = timers.runAfter(metaData["delay"]) {
-                       doorControls*.off()
+                       doorControls[0].off()
                }
        }
 
        //By Model Checker
        def setValue(LinkedHashMap eventDataMap) {
-               doorControls[eventDataMap["deviceId"]].setValue(eventDataMap["value"])
-               if (deviceNumbers == 1)
-                       this.doorState = doorControls[eventDataMap["deviceId"]].doorState
+               doorControls[0].setValue(eventDataMap["value"])
+               this.doorState = doorControls[0].doorState
                sendEvent(eventDataMap)
        }
 
 
        def currentValue(String deviceFeature) {
-               if (deviceNumbers == 1)
-                       doorControls[0].currentValue(deviceFeature)
-               else
-                       doorControls*.currentValue(deviceFeature)
+               doorControls[0].currentValue(deviceFeature)
        }
 
        def latestValue(String deviceFeature) {
-               if (deviceNumbers == 1)
-                       doorControls[0].latestValue(deviceFeature)
-               else
-                       doorControls*.latestValue(deviceFeature)
+               doorControls[0].latestValue(deviceFeature)
        }
 
        def getAt(int ix) {