X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=Event%2FEvent.groovy;h=816ea92a584c4c8870b3d9cf4543043ca27a456e;hb=80926f3aabeeeebd4eaf401a1bdff8d51cdbbb9d;hp=a1d5e71d1b5b80f55eada67cf6dbe136254e1e3b;hpb=e967e66f8e5a414c24bc87c5146bade90e1759cc;p=smartthings-infrastructure.git

diff --git a/Event/Event.groovy b/Event/Event.groovy
index a1d5e71..816ea92 100644
--- a/Event/Event.groovy
+++ b/Event/Event.groovy
@@ -2,7 +2,7 @@
 package Event
 
 public class Event {
-	private int deviceId
+	private String deviceId
 	private String value
 	private String linkText
 	private String displayName
@@ -11,18 +11,23 @@ public class Event {
 	private String descriptionText
 	private boolean isStateChange
 	private String unit
-	private LinkedHashMap data
+	private String data
+	private int integerValue
+	private List integerValues = ["battery", "hue", "saturation", "energy", "level", "temperature", 
+				      "heatingSetpoint", "coolingSetpoint", "thermostatSetpoint", "illuminance"]
 	
-	Event() {
-		this.deviceId = 0
-		this.linkText = ""
-		this.value = ""
-		this.displayName = ""
-		this.name = ""
-		this.descriptionText = ""
-		this.isStateChange = false
-		this.unit = ""
-		this.data = []
-		this.displayed = false
+	Event(String value, String name, String deviceId, String descriptionText, boolean displayed, String linkText, String displayName, boolean isStateChange, String unit, String data) {
+		this.deviceId = deviceId
+		this.linkText = linkText
+		this.value = value
+		this.displayName = displayName
+		this.name = name
+		this.descriptionText = descriptionText
+		this.isStateChange = isStateChange
+		this.unit = unit
+		this.data = data
+		this.displayed = displayed
+		if (integerValues.contains(name))
+			this.integerValue = value.toInteger()
 	}
 }