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

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

diff --git a/EnergyMeter/EnergyMeter.groovy b/EnergyMeter/EnergyMeter.groovy
index 9324ca3629fcd3d6dc1bc40e157f902f5169c507..f41c7412d53711c92b2989bfe604af9fb5352dd3 100644 (file)
--- a/EnergyMeter/EnergyMeter.groovy
+++ b/EnergyMeter/EnergyMeter.groovy
@@ -2,21 +2,16 @@
 package EnergyMeter
 import SmartThing.SmartThing
 
-//Importing mutable integer class
-import MutableInteger.MutableInteger
-
 public class EnergyMeter 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 currentEnergy = 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>()
 
-       EnergyMeter(Closure sendEvent, StringBuilder id, StringBuilder label, StringBuilder displayName, MutableInteger currentEnergy) {
-               deviceIntValuesMap = deviceIntValueSmartThing
+       EnergyMeter(Closure sendEvent, String id, String label, String displayName, Integer currentEnergy) {
+               deviceIntValueSmartThing = deviceIntValuesMap
                idSmartThing = id
                labelSmartThing = label
                displayNameSmartThing = displayName
@@ -26,13 +21,7 @@ public class EnergyMeter extends SmartThing {
                this.id = id
                this.label = label
                this.displayName = displayName
-               this.currentEnergy = currentEnergy
 
                deviceIntValuesMap.put("energy", currentEnergy)
        }
-
-       // Methods to return values
-       def getCurrentEnergy() {
-               return currentEnergy.getValue()
-       }
 }