Infrastruction modification

[smartthings-infrastructure.git] / Event / Event.groovy

diff --git a/Event/Event.groovy b/Event/Event.groovy
index 7e834345ac2da8b4b09f47427e99c6f8e806cf4f..aac847b5ccd32d51d30b8581d35e418059f4403f 100644 (file)
--- a/Event/Event.groovy
+++ b/Event/Event.groovy
@@ -4,7 +4,7 @@ import groovy.json.JsonSlurper
 
 public class Event {
        private String deviceId
-       private String value
+       private Object value
        private String linkText
        private String displayName
        private boolean displayed
@@ -16,12 +16,10 @@ public class Event {
        private jsonData
        private int integerValue
        private double doubleValue
-       private List integerValues = ["battery", "hue", "saturation", "energy", "level", "temperature", 
-                                     "heatingSetpoint", "coolingSetpoint", "thermostatSetpoint", "illuminance"]
        private boolean physical
        private def date
        
-       Event(String value, String name, String deviceId, String descriptionText, boolean displayed, String linkText, String displayName, boolean isStateChange, String unit, String data) {
+       Event(Object 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
@@ -33,9 +31,9 @@ public class Event {
                this.data = data
                this.jsonData = new groovy.json.JsonSlurper().parseText(data)
                this.displayed = displayed
-               if (integerValues.contains(name)) {
-                       this.integerValue = value.toInteger()
-                       this.doubleValue = Double.parseDouble(value);           
+               if (["battery", "hue", "saturation", "energy", "level", "temperature", "heatingSetpoint", "coolingSetpoint", "thermostatSetpoint", "illuminance"].contains(name)) {
+                       this.integerValue = value
+                       this.doubleValue = value
                }
                this.physical = true
                this.date = new Date()