X-Git-Url: http://plrg.eecs.uci.edu/git/?p=smartthings-infrastructure.git;a=blobdiff_plain;f=Event%2FEvent.groovy;h=83ba658355e5d838fa72c10b92f1c184b57bba5b;hp=aac847b5ccd32d51d30b8581d35e418059f4403f;hb=13eaa2aa4abc92483f370cd74f1d79b4caafed55;hpb=a3f4618b470eb84dec709f3ea98104365543c6cb;ds=sidebyside

diff --git a/Event/Event.groovy b/Event/Event.groovy
index aac847b..83ba658 100644
--- a/Event/Event.groovy
+++ b/Event/Event.groovy
@@ -4,7 +4,7 @@ import groovy.json.JsonSlurper
 
 public class Event {
 	private String deviceId
-	private Object value
+	private String value
 	private String linkText
 	private String displayName
 	private boolean displayed
@@ -19,7 +19,7 @@ public class Event {
 	private boolean physical
 	private def date
 	
-	Event(Object value, String name, String deviceId, String descriptionText, boolean displayed, String linkText, String displayName, boolean isStateChange, String unit, String 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
@@ -32,8 +32,11 @@ public class Event {
 		this.jsonData = new groovy.json.JsonSlurper().parseText(data)
 		this.displayed = displayed
 		if (["battery", "hue", "saturation", "energy", "level", "temperature", "heatingSetpoint", "coolingSetpoint", "thermostatSetpoint", "illuminance"].contains(name)) {
-			this.integerValue = value
-			this.doubleValue = value
+			int dot = value.indexOf('.')
+			if (dot != -1)
+	      		value = value.substring(0, dot)
+			this.integerValue = value.toInteger()
+			this.doubleValue = Double.parseDouble(value);
 		}
 		this.physical = true
 		this.date = new Date()