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

[smartthings-infrastructure.git] / appTouch / Touched.groovy

diff --git a/appTouch/Touched.groovy b/appTouch/Touched.groovy
index e2172cc44f7a70e371a7818d3e54df1d923e43bb..89d575e670ad99eb5125de3f85a66c24eb77bfc7 100644 (file)
--- a/appTouch/Touched.groovy
+++ b/appTouch/Touched.groovy
@@ -2,18 +2,25 @@
 package appTouch
 
 public class Touched{
-       def fun
+       def sendEvent
+       private String id
        private int isTouched
+       private String label
+       private String name
+
 
        Touched(Closure sendEvent, int isTouched) {
-               fun = sendEvent
+               this.sendEvent = sendEvent
                this.isTouched = isTouched
+               this.label = "app0"
+               this.id = "appID0"
+               this.name = "app0"
        }
 
        //By Model Checker
        def setValue(LinkedHashMap eventDataMap) {
                println("The application is Touched!")
                this.isTouched = 1 //Do we need this?
-               fun(eventDataMap)
+               sendEvent(eventDataMap)
        }
 }