Cancelling the changes for field write.

[smartthings-infrastructure.git] / Lock / Locks.groovy

diff --git a/Lock/Locks.groovy b/Lock/Locks.groovy
index 6214b84d69dcaad46aa8e905dcfb7d7c64e88ace..ad297ab8ed2512c5740582a8fd28324443e5bdff 100644 (file)
--- a/Lock/Locks.groovy
+++ b/Lock/Locks.groovy
@@ -16,34 +16,67 @@ public class Locks{
        private String currentLock = "locked"
        private String lockLatestValue = "locked"
 
-       Locks(Closure sendEvent, int deviceNumbers) {
+       Locks(Closure sendEvent, int deviceNumbers, boolean init) {
                this.sendEvent = sendEvent
                this.timers = new SimulatedTimer()
                this.deviceNumbers = deviceNumbers
                this.locks = []
 
+               if (init) {
+                       this.lockState = "locked"
+                       this.currentLock = "locked"
+                       this.lockLatestValue = "locked"
+               } else {
+                       this.lockState = "unlocked"
+                       this.currentLock = "unlocked"
+                       this.lockLatestValue = "unlocked"
+               }
                locks.add(new Lock(sendEvent,id, label, displayName, this.lockState, this.lockLatestValue))
        }
 
        //By Apps
        def lock() {
-               locks[0].lock()
+               if (lockState != "locked") {
+                       //lockLatestValue = lockState
+                       lockLatestValue = "locked"
+                       lockState = "locked"
+                       currentLock = "locked"
+                       locks[0].lock()
+               }
        }
 
        def lock(LinkedHashMap metaData) {
-               def task = timers.runAfter(metaData["delay"]) {
-                       locks[0].lock()
+               if (lockState != "locked") {
+                       def task = timers.runAfter(metaData["delay"]) {
+                               //lockLatestValue = lockState
+                               lockLatestValue = "locked"
+                               lockState = "locked"
+                               currentLock = "locked"
+                               locks[0].lock()
+                       }
                }
        }
 
        def unlock() {
-               locks[0].unlock()
+               if (lockState != "unlocked") {
+                       //lockLatestValue = lockState
+                       lockLatestValue = "unlocked"
+                       lockState = "unlocked"
+                       currentLock = "unlocked"
+                       locks[0].unlock()
+               }
        }
 
 
        def unlock(LinkedHashMap metaData) {
-               def task = timers.runAfter(metaData["delay"]) {
-                       locks[0].unlock()
+               if (lockState != "unlocked") {
+                       def task = timers.runAfter(metaData["delay"]) {
+                               //lockLatestValue = lockState
+                               lockLatestValue = "unlocked"
+                               lockState = "unlocked"
+                               currentLock = "unlocked"
+                               locks[0].unlock()
+                       }
                }
        }
 
@@ -60,17 +93,22 @@ public class Locks{
        def find(Closure Input) {
                locks.find(Input)
        }
+       def sort(Closure Input) {
+               locks.sort(Input)
+       }
        def collect(Closure Input) {
                locks.collect(Input)
        }
 
        //By Model Checker
        def setValue(LinkedHashMap eventDataMap) {
-               locks[0].setValue(eventDataMap["value"])
-               this.lockState = locks[0].lockState
-               this.currentLock = locks[0].lockState
-               this.lockLatestValue = locks[0].lockLatestValue
-               sendEvent(eventDataMap)
+               if (eventDataMap["value"] != locks[0].lockState) {
+                       locks[0].setValue(eventDataMap["value"])
+                       this.lockState = locks[0].lockState
+                       this.currentLock = locks[0].lockState
+                       this.lockLatestValue = locks[0].lockLatestValue
+                       sendEvent(eventDataMap)
+               }
        }
 
        def currentValue(String deviceFeature) {