X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=Methods%2Fsubscribe.groovy;h=730b76ac60bdc542a28f290a0e5b6f96c2cfa6c6;hb=3de3a90422a04058becf03dd39555943c1770f9f;hp=c7104fc2e1b9094386308f4732684c85c541b47a;hpb=4c11bc74dad5814ff9ba94fa21894ff0f90dc291;p=smartthings-infrastructure.git

diff --git a/Methods/subscribe.groovy b/Methods/subscribe.groovy
index c7104fc..730b76a 100644
--- a/Methods/subscribe.groovy
+++ b/Methods/subscribe.groovy
@@ -1,19 +1,31 @@
 /////////////////////////////////////////////////////////////////////
-////subscribe(app, func)
-def subscribe(Object Obj, Closure Input) {
-	ObjectList.add(Obj)
-	EventList.add("Touched")
-	FunctionList.add(Input)
+////subscribe(obj, func)
+def subscribe(Object obj, Closure FunctionToCall) {
+	if (obj == app) {
+		objectList.add(obj)
+		eventList.add("Touched")
+		functionList.add(FunctionToCall)
+	} else if (obj == location) {
+		objectList.add(obj)
+		eventList.add("Location")
+		functionList.add(FunctionToCall)
+	}
 }
-////subscribe(obj, string, func)
-def subscribe(Object Obj, String S, Closure Input) {
-	ObjectList.add(Obj)
-	EventList.add(S)
-	FunctionList.add(Input)
+////subscribe(obj, event, func)
+def subscribe(Object obj, String event, Closure FunctionToCall) {
+	objectList.add(obj)
+	eventList.add(event)
+	functionList.add(FunctionToCall)
 }
-////subscribe(obj, string, func, hashmap)
-def subscribe(Object Obj, String S, Closure Input, LinkedHashMap LHM) {
-	ObjectList.add(Obj)	
-	EventList.add(S)
-	FunctionList.add(Input)
+////subscribe(obj, event, nameOfFunc)
+def subscribe(Object obj, String event, String nameOfFunction) {
+	objectList.add(obj)
+	eventList.add(event)
+	functionList.add(nameOfFunction)
+}
+////subscribe(obj, event, func, data)
+def subscribe(Object obj, String event, Closure FunctionToCall, LinkedHashMap metaData) {
+	objectList.add(obj)	
+	eventList.add(event)
+	functionList.add(FunctionToCall)
 }