Removing getXXX methods + properties. Adding getProperty feature to SmartThing(s)

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

diff --git a/TemperatureMeasurement/TemperatureMeasurement.groovy b/TemperatureMeasurement/TemperatureMeasurement.groovy
index 99afe6a3b117c3e5c616c48a7c97c0c70b0034ba..23933b59f102f0a974e9abac608809ce783cc3df 100644 (file)
--- a/TemperatureMeasurement/TemperatureMeasurement.groovy
+++ b/TemperatureMeasurement/TemperatureMeasurement.groovy
@@ -2,21 +2,16 @@
 package TemperatureMeasurement
 import SmartThing.SmartThing
 
-//Importing mutable integer class
-import MutableInteger.MutableInteger
-
 public class TemperatureMeasurement extends SmartThing {
        // id, label, and display name of the device
-       StringBuilder id = new StringBuilder()
-       StringBuilder label = new StringBuilder()
-       StringBuilder displayName = new StringBuilder()
-       // Features with numberical values
-       MutableInteger currentTemperature = new MutableInteger()
+       String id
+       String label
+       String displayName
        // Maps from features to values
-       HashMap<String, MutableInteger> deviceIntValuesMap = new HashMap<String, MutableInteger>()
+       HashMap<String, Integer> deviceIntValuesMap = new HashMap<String, Integer>()
 
-       TemperatureMeasurement(Closure sendEvent, StringBuilder id, StringBuilder label, StringBuilder displayName, MutableInteger currentTemperature) {
-               deviceIntValuesMap = deviceIntValueSmartThing
+       TemperatureMeasurement(Closure sendEvent, String id, String label, String displayName, Integer currentTemperature) {
+               deviceIntValueSmartThing = deviceIntValuesMap
                idSmartThing = id
                labelSmartThing = label
                displayNameSmartThing = displayName
@@ -26,14 +21,7 @@ public class TemperatureMeasurement extends SmartThing {
                this.id = id
                this.label = label
                this.displayName = displayName
-               this.currentTemperature = currentTemperature
 
                deviceIntValuesMap.put("temperature", currentTemperature)
        }
-
-       // Methods to return values
-       def getCurrentTemperature() {
-               return currentTemperature.getValue()
-       }
-
 }