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

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

diff --git a/EnergyMeter/EnergyMeters.groovy b/EnergyMeter/EnergyMeters.groovy
index 3722a2ba8b3e6c8cd8a8edf56d5d042712d71ba8..1cb2839a3bc33d3b6c274c1b77e2ec59ed7209b8 100644 (file)
--- a/EnergyMeter/EnergyMeters.groovy
+++ b/EnergyMeter/EnergyMeters.groovy
@@ -2,9 +2,6 @@
 package EnergyMeter
 import SmartThing.SmartThings
 
-//Importing mutable integer class
-import MutableInteger.MutableInteger
-
 public class EnergyMeters extends SmartThings {
        List energyMeters = new ArrayList()
 
@@ -13,23 +10,16 @@ public class EnergyMeters extends SmartThings {
                energyMeters = smartThings
 
                // Initialization
-               StringBuilder id = new StringBuilder("energyID0")
-               StringBuilder label = new StringBuilder("energy")
-               StringBuilder displayName = new StringBuilder("energy0")
-               MutableInteger energy = new MutableInteger()
+               String id = "energyID0"
+               String label = "energy"
+               String displayName = "energyMeter"
+               Integer energy
 
                if (init)
-                       energy.setValue(50)
+                       energy = 50
                else
-                       energy.setValue(60)
+                       energy = 60
 
                energyMeters.add(new EnergyMeter(sendEvent, id, label, displayName, energy))
        }
-
-       // Methods to return values
-       def getCurrentEnergy() {
-               List tmpValues = new ArrayList()
-               tmpValues.add(energyMeters[0].getCurrentEnergy())
-               return tmpValues
-       }
 }