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

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

diff --git a/MobilePresence/MobilePresence.groovy b/MobilePresence/MobilePresence.groovy
index 4f9e4a9d5a28b42a6b6595d7519577b65a09145b..ddc1ba47a60dec0e8c5ef7b2e29158fff5cc9161 100644 (file)
--- a/MobilePresence/MobilePresence.groovy
+++ b/MobilePresence/MobilePresence.groovy
@@ -4,18 +4,14 @@ import SmartThing.SmartThing
 
 public class MobilePresence 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 deviceNetworkId = 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>()
        
-
-       MobilePresence(Closure sendEvent, StringBuilder id, StringBuilder label, StringBuilder displayName, StringBuilder deviceNetworkId) {
+       MobilePresence(Closure sendEvent, String id, String label, String displayName, String deviceNetworkId) {
                deviceValuesMap = deviceValueSmartThing
-               deviceIntValuesMap = deviceIntValueSmartThing
                idSmartThing = id
                labelSmartThing = label
                displayNameSmartThing = displayName
@@ -25,13 +21,7 @@ public class MobilePresence extends SmartThing {
                this.id = id
                this.label = label
                this.displayName = displayName
-               this.deviceNetworkId = deviceNetworkId
 
                deviceValuesMap.put("deviceNetworkId", deviceNetworkId)
        }
-
-       // Methods to return values
-       def getDeviceNetworkId() {
-               return deviceNetworkId.toString()
-       }
 }