X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=Event%2FEvent.groovy;h=60d7276f7ce4ad7e46452daaad4d70a198e81341;hb=622fbb619774231a71cb2a1dfd6df36f8f6659c9;hp=794dbca4387c59a98b08241e082f1ecba0e717f5;hpb=bd07590976e1951bd9f3cb48b02b0f8644b16662;p=smartthings-infrastructure.git

diff --git a/Event/Event.groovy b/Event/Event.groovy
index 794dbca..60d7276 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,9 +11,13 @@ public class Event {
 	private String descriptionText
 	private boolean isStateChange
 	private String unit
-	private ArrayList data
+	private String data
+	private int integerValue
+	private double doubleValue
+	private List integerValues = ["battery", "hue", "saturation", "energy", "level", "temperature", 
+				      "heatingSetpoint", "coolingSetpoint", "thermostatSetpoint", "illuminance"]
 	
-	Event(String value, String name, int deviceId, String descriptionText, boolean displayed, String linkText, String displayName, boolean isStateChange, String unit, ArrayList data) {
+	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
@@ -24,5 +28,9 @@ public class Event {
 		this.unit = unit
 		this.data = data
 		this.displayed = displayed
+		if (integerValues.contains(name)) {
+			this.integerValue = value.toInteger()
+			this.doubleValue = Double.parseDouble(value);		
+		}
 	}
 }