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 caec87591a4e041efd6f47cd1aa5f6bfdf155157..1cb2839a3bc33d3b6c274c1b77e2ec59ed7209b8 100644 (file)
--- a/EnergyMeter/EnergyMeters.groovy
+++ b/EnergyMeter/EnergyMeters.groovy
@@ -1,59 +1,25 @@
 //Create a class for energy meter
 package EnergyMeter
-import Timer.SimulatedTimer
+import SmartThing.SmartThings
 
-public class EnergyMeters {
-       private int deviceNumbers
-       private List energyMeters
-       def sendEvent
+public class EnergyMeters extends SmartThings {
+       List energyMeters = new ArrayList()
 
-       //For one device(We cannot have obj.id)-> We should have obj[0].id
-       private String id = "energyMeterID0"
-       private String label = "energyMeter0"
-       private String displayName = "energyMeter0"
-       private int energy = 50
+       EnergyMeters(Closure sendEvent, boolean init) {
+               // Only initialize one time since we only have one device for each capability
+               energyMeters = smartThings
 
-               
-       EnergyMeters(Closure sendEvent, int deviceNumbers) {
-               this.sendEvent = sendEvent              
-               this.deviceNumbers = deviceNumbers
-               this.energyMeters = []
+               // Initialization
+               String id = "energyID0"
+               String label = "energy"
+               String displayName = "energyMeter"
+               Integer energy
 
-               energyMeters.add(new EnergyMeter(id, label, displayName, this.energy))
-       }
-
-       //By Model Checker
-       def setValue(LinkedHashMap eventDataMap) {
-               if (eventDataMap["value"] != energyMeters[0].energy) {
-                       energyMeters[0].setValue(eventDataMap["value"])
-                       this.energy = energyMeters[0].energy
-                       sendEvent(eventDataMap)
-               }
-       }
-
-       //Methods for closures
-       def count(Closure Input) {
-               energyMeters.count(Input)
-       }
-       def size() {
-               energyMeters.size()
-       }
-       def each(Closure Input) {
-               energyMeters.each(Input)
-       }
-       def find(Closure Input) {
-               energyMeters.find(Input)
-       }
-       def collect(Closure Input) {
-               energyMeters.collect(Input)
-       }
-
-
-       def currentValue(String deviceFeature) {
-               energyMeters[0].currentValue(deviceFeature)//It is called if we have only one device
-       }
+               if (init)
+                       energy = 50
+               else
+                       energy = 60
 
-       def getAt(int ix) {
-               energyMeters[ix]
+               energyMeters.add(new EnergyMeter(sendEvent, id, label, displayName, energy))
        }
 }