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

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

diff --git a/SmokeDetector/SmokeDetector.groovy b/SmokeDetector/SmokeDetector.groovy
index 9eb9e8a28b613f2b8b854fb240f002e45be50941..b9ebeced6cde48e402b0f147a3e3d186ae5c8d71 100644 (file)
--- a/SmokeDetector/SmokeDetector.groovy
+++ b/SmokeDetector/SmokeDetector.groovy
@@ -4,16 +4,14 @@ import SmartThing.SmartThing
 
 public class SmokeDetector extends SmartThing {
        // id, label, and display name of the device
-       StringBuilder id = new StringBuilder()
-       StringBuilder label = new StringBuilder()
-       StringBuilder displayName = new StringBuilder()
-       // Features with string values
-       StringBuilder currentSmoke = new StringBuilder()
+       String id
+       String label
+       String displayName
        // Maps from features to values
-       HashMap<String, StringBuilder> deviceValuesMap = new HashMap<String, StringBuilder>()
+       HashMap<String, String> deviceValuesMap = new HashMap<String, String>()
 
-       SmokeDetector(Closure sendEvent, StringBuilder id, StringBuilder label, StringBuilder displayName, StringBuilder currentSmoke) {
-               deviceValuesMap = deviceValueSmartThing
+       SmokeDetector(Closure sendEvent, String id, String label, String displayName, String currentSmoke) {
+               deviceValueSmartThing = deviceValuesMap
                idSmartThing = id
                labelSmartThing = label
                displayNameSmartThing = displayName
@@ -23,13 +21,7 @@ public class SmokeDetector extends SmartThing {
                this.id = id
                this.label = label
                this.displayName = displayName
-               this.currentSmoke = currentSmoke
 
                deviceValuesMap.put("smoke", currentSmoke)
        }
-
-       // Methods to return values
-       def getCurrentSmoke() {
-               return currentSmoke.toString()
-       }
 }