Changes in classes: new concept for latest value + all types of events generated...

[smartthings-infrastructure.git] / Valve / Valves.groovy

diff --git a/Valve/Valves.groovy b/Valve/Valves.groovy
index 7e8b22059925795a91e5446ce10b3cfc61d8e747..e5d0559bcd88b7bbe42b3ec930731448caf67254 100644 (file)
--- a/Valve/Valves.groovy
+++ b/Valve/Valves.groovy
@@ -37,32 +37,45 @@ public class Valves {
        def find(Closure Input) {
                valves.find(Input)
        }
+       def sort(Closure Input) {
+               valves.sort(Input)
+       }
        def collect(Closure Input) {
                valves.collect(Input)
        }
 
        //By Apps
        def open() {
-               if (valve != "open")
+               if (valve != "open") {
+                       this.valve = "open"
+                       this.valveLatestValue = "open"
                        valves[0].open()
+               }
        }
 
        def open(LinkedHashMap metaData) {
                if (valve != "open") {
                        def task = timers.runAfter(metaData["delay"]) {
+                               this.valve = "open"
+                               this.valveLatestValue = "open"
                                valves[0].open()
                        }
                }
        }
 
        def close() {
-               if (valve != "closed")
+               if (valve != "closed") {
+                       this.valve = "closed"
+                       this.valveLatestValue = "closed"                        
                        valves[0].close()
+               }
        }
 
        def close(LinkedHashMap metaData) {
                if (valve != "closed") {
                        def task = timers.runAfter(metaData["delay"]) {
+                               this.valve = "closed"
+                               this.valveLatestValue = "closed"
                                valves[0].close()
                        }
                }
@@ -71,8 +84,8 @@ public class Valves {
        //By Model Checker
        def setValue(LinkedHashMap eventDataMap) {
                if (eventDataMap["value"] != valves[0].valve) {
+                       this.valve = eventDataMap["value"]
                        valves[0].setValue(eventDataMap["value"])
-                       this.valve = valves[0].valve
                }
        }