Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/smartthings-infrastructure

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

diff --git a/DoorControl/DoorControls.groovy b/DoorControl/DoorControls.groovy
index e8e067a5e7966060e586e2b6a65f07374fc2f72b..ac6decc59c64343620a1f696cca6c5322a53c8cc 100644 (file)
--- a/DoorControl/DoorControls.groovy
+++ b/DoorControl/DoorControls.groovy
@@ -23,19 +23,15 @@ public class DoorControls {
                this.timers = new SimulatedTimer()
                this.deviceNumbers = deviceNumbers
                this.doorControls = []
-<<<<<<< HEAD
                
-=======
-
->>>>>>> e378d6a65b25030f8914dc97f04b81ddff351d9c
-               def init = Verify.getBoolean()
+               /*def init = Verify.getBoolean()
                if (init) {
                        this.doorState = "closed"
                        this.doorLatestValue = "closed"
                } else {
                        this.doorState = "open"
                        this.doorLatestValue = "open"
-               }
+               }*/
                doorControls.add(new DoorControl(sendEvent, id, label, displayName, this.doorState, this.doorLatestValue))
        }
 
@@ -52,6 +48,9 @@ public class DoorControls {
        def find(Closure Input) {
                doorControls.find(Input)
        }
+       def sort(Closure Input) {
+               doorControls.sort(Input)
+       }
        def collect(Closure Input) {
                doorControls.collect(Input)
        }
@@ -86,8 +85,9 @@ public class DoorControls {
        //By Model Checker
        def setValue(LinkedHashMap eventDataMap) {
                if (eventDataMap["value"] != doorControls[0].doorState) {
+                       this.doorState = eventDataMap["value"]
+                       this.doorLatestValue = eventDataMap["value"]
                        doorControls[0].setValue(eventDataMap["value"])
-                       this.doorState = doorControls[0].doorState
                        sendEvent(eventDataMap)
                }
        }