A small change in SwitchLevel class

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

diff --git a/SwitchLevel/SwitchLevel.groovy b/SwitchLevel/SwitchLevel.groovy
index a09a4505799233ef00b8f0c0108442526bcf9170..b4d09f7c9199e040e3788b7b21613974d616d331 100644 (file)
--- a/SwitchLevel/SwitchLevel.groovy
+++ b/SwitchLevel/SwitchLevel.groovy
@@ -1,42 +1,57 @@
 //Create a class for switch level
 package SwitchLevel
-import Timer.SimulatedTimer
+import SmartThing.SmartThing
 
-public class SwitchLevel {
-       private String id
-       private String label
-       private String displayName
-       private int level
-       private int rate
-       def sendEvent   
-       def timers
+//Importing mutable integer class
+import MutableInteger.MutableInteger
+
+public class SwitchLevel 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 currentLevel = new MutableInteger()
+       // Maps from features to values
+       HashMap<String, MutableInteger> deviceIntValuesMap = new HashMap<String, MutableInteger>()
        
+       SwitchLevel(Closure sendEvent, StringBuilder id, StringBuilder label, StringBuilder displayName, MutableInteger currentLevel) {
+               deviceIntValuesMap = deviceIntValueSmartThing
+               idSmartThing = id
+               labelSmartThing = label
+               displayNameSmartThing = displayName
+               sendEventSmartThings = sendEvent
 
-       SwitchLevel(Closure sendEvent, String id, String label, String displayName, int level) {
-               this.sendEvent = sendEvent
-               this.timers = new SimulatedTimer()
+               // Initialization
                this.id = id
                this.label = label
                this.displayName = displayName
-               this.level = level
-               this.rate = level
+               this.currentLevel = currentLevel
+
+               deviceIntValuesMap.put("level", currentLevel)
+       }
+
+       // Methods to set values
+       def setLevel(String newValue) {
+               setLevel(newValue.toInteger())
        }
 
-       //By Apps
-       def setLevel(int level) {
-               if (this.level != level) {
-                       println("the switch with id:$id is setted to level $level!")
-                       this.level = level
-                       this.rate = level
-                       sendEvent([name: "level", value: "50", deviceId: this.id, descriptionText: "",
+       def setLevel(long newValue) {
+               setLevel((int) newValue)
+       }
+
+       def setLevel(int newValue) {
+               if (!currentLevel.getValue().equals(newValue)) {
+                       String tmpID = id.toString()
+                       variable.setValue(newValue)
+                       println("the switch with id:$tmpID is setted to level $level!")
+                       sendEvent([name: "level", value: newValue, deviceId: tmpID, descriptionText: "",
                                   displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
                }
        }
-
-       //By Model Checker
-       def setValue(String value) {
-               println("the switch with id:$id is setted to level $value!")
-               this.level = value.toInteger()
-               this.rate = value.toInteger()
+       
+       // Methods to return values
+       def getCurrentLevel() {
+               return currentLevel.getValue()
        }
 }