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 83f2283c3bdae185c2f27dd7ae8373717c863dbe..f41c7412d53711c92b2989bfe604af9fb5352dd3 100644 (file)
--- a/EnergyMeter/EnergyMeter.groovy
+++ b/EnergyMeter/EnergyMeter.groovy
@@ -1,53 +1,27 @@
 //Create a class for energy meter
 package EnergyMeter
-import Timer.SimulatedTimer
+import SmartThing.SmartThing
 
-public class EnergyMeter {
-       private String id
-       private String label
-       private String displayName
-       private int energy
-       private int currentEnergy
-       private String status
+public class EnergyMeter extends SmartThing {
+       // id, label, and display name of the device
+       String id
+       String label
+       String displayName
+       // Maps from features to values
+       HashMap<String, Integer> deviceIntValuesMap = new HashMap<String, Integer>()
 
-       EnergyMeter(String id, String label, String displayName, int energy, String status) {
+       EnergyMeter(Closure sendEvent, String id, String label, String displayName, Integer currentEnergy) {
+               deviceIntValueSmartThing = deviceIntValuesMap
+               idSmartThing = id
+               labelSmartThing = label
+               displayNameSmartThing = displayName
+               sendEventSmartThings = sendEvent
+
+               // Initialization
                this.id = id
                this.label = label
                this.displayName = displayName
-               this.energy = energy
-               this.status = status
-       }
-
-       //By Model Checker
-       def setValue(String value) {
-               println("the enery is changed to $value!")
-               this.energy = value.toInteger()
-               this.currentEnergy = value.toInteger()
-       }
-
-       def reset() {
-               if (status != "on") {
-                       status = "on"
-                       println("the energy meter is on!")
-               }
-       }
-
-       def off() {
-               if (status != "off") {
-                       status = "off"
-                       println("the energy meter is off!")
-               }
-       }
-
-       def currentValue(String deviceFeature) {
-               if (deviceFeature == "energy") {
-                       return energy
-               }
-       }
 
-       def latestValue(String deviceFeature) {
-               if (deviceFeature == "energy") {
-                       return energy
-               }
+               deviceIntValuesMap.put("energy", currentEnergy)
        }
 }