Infrastruction modification

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

diff --git a/Battery/Battery.groovy b/Battery/Battery.groovy
index df4b01a4eb26b43ffc75fb59ab718711240000af..5be240d1cf3cd32be139aba44aa73633173c8431 100644 (file)
--- a/Battery/Battery.groovy
+++ b/Battery/Battery.groovy
@@ -1,42 +1,35 @@
 //Create a class for battery
 package Battery
-import Timer.SimulatedTimer
+import SmartThing.SmartThing
 
-public class Battery {
-       private String id
-       private String label
-       private String displayName
-       private int battery
-       private int currentBattery
-       private int batteryLatestValue
+public class Battery 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 currentBattery = new MutableInteger()
+       // Maps from features to values
+       HashMap<String, MutableInteger> deviceIntValuesMap = new HashMap<String, MutableInteger>()
 
-       Battery(String id, String label, String displayName, int battery) {
+       Battery(Closure sendEvent, StringBuilder id, StringBuilder label, StringBuilder displayName, MutableInteger currentBattery) {
+               deviceIntValuesMap = deviceIntValueSmartThing
+               idSmartThing = id
+               labelSmartThing = label
+               displayNameSmartThing = displayName
+               sendEventSmartThings = sendEvent
+
+               // Initialization
                this.id = id
                this.label = label
                this.displayName = displayName
-               this.battery = battery
-               this.currentBattery = battery
-               this.batteryLatestValue = battery
-       }
+               this.currentBattery = currentBattery
 
-       //By Model Checker
-       def setValue(String value) {
-               println("the battery level with id:$id is changed to $value!")
-               this.battery = value.toInteger()
-               this.currentBattery = value.toInteger()
-               this.batteryLatestValue = value.toInteger()
+               deviceIntValuesMap.put("battery", currentBattery)
        }
 
-       def currentValue(String deviceFeature) {
-               if (deviceFeature == "battery") {
-                       return battery
-               }
+       // Methods to return values
+       def getCurrentBattery() {
+               return currentBattery.toString()
        }
-
-       def latestValue(String deviceFeature) {
-               if (deviceFeature == "battery") {
-                       return batteryLatestValue
-               }
-       }
-
 }