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

[smartthings-infrastructure.git] / Thermostat / Thermostats.groovy

diff --git a/Thermostat/Thermostats.groovy b/Thermostat/Thermostats.groovy
index 693ba939f6c2096bf165af1e4981ef042e1c41eb..b2d59811ad6ddd828a7461e8f34d5fe653c29c72 100644 (file)
--- a/Thermostat/Thermostats.groovy
+++ b/Thermostat/Thermostats.groovy
@@ -2,9 +2,6 @@
 package Thermostat
 import SmartThing.SmartThings
 
-//Importing mutable integer class
-import MutableInteger.MutableInteger
-
 class Thermostats extends SmartThings {
        List thermostats = new ArrayList()
 
@@ -13,34 +10,34 @@ class Thermostats extends SmartThings {
                thermostats = smartThings
 
                // Initialization
-               StringBuilder id = new StringBuilder("thermostatID0")
-               StringBuilder label = new StringBuilder("thermostat")
-               StringBuilder displayName = new StringBuilder("thermostat0")
-               StringBuilder climateName = new StringBuilder("climateName")
-               StringBuilder thermostatOperatingState = new StringBuilder()
-               StringBuilder thermostatFanMode = new StringBuilder()
-               StringBuilder thermostatMode = new StringBuilder()
-               MutableInteger temperature = new MutableInteger()
-               MutableInteger coolingSetpoint = new MutableInteger()
-               MutableInteger heatingSetpoint = new MutableInteger()
-               MutableInteger thermostatSetpoint = new MutableInteger()
+               String id = "thermostatID0"
+               String label = "thermostat"
+               String displayName = "thermostat"
+               String climateName "climateName"
+               String thermostatOperatingState
+               String thermostatFanMode
+               String thermostatMode
+               Integer temperature
+               Integer coolingSetpoint
+               Integer heatingSetpoint
+               Integer thermostatSetpoint
 
                if (init) {
-                       temperature.setValue(60)
-                       coolingSetpoint.setValue(70)
-                       heatingSetpoint.setValue(35)
-                       thermostatSetpoint.setValue(50)
-                       thermostatOperatingState.append("off")
-                       thermostatFanMode.append("off")
-                       thermostatMode.append("off")
+                       temperature = 60
+                       coolingSetpoint = 70
+                       heatingSetpoint = 35
+                       thermostatSetpoint = 50
+                       thermostatOperatingState = "off"
+                       thermostatFanMode = "off"
+                       thermostatMode = "off"
                } else {
-                       temperature.setValue(66)
-                       coolingSetpoint.setValue(80)
-                       heatingSetpoint.setValue(50)
-                       thermostatSetpoint.setValue(60)
-                       thermostatOperatingState.append("heating")
-                       thermostatFanMode.append("circulate")
-                       thermostatMode.append("auto")
+                       temperature = 66
+                       coolingSetpoint = 80
+                       heatingSetpoint = 50
+                       thermostatSetpoint = 60
+                       thermostatOperatingState = "heating"
+                       thermostatFanMode = "circulate"
+                       thermostatMode = "auto"
                }
 
                thermostats.add(new Thermostat(sendEvent, id, label, displayName, temperature, coolingSetpoint, 
@@ -49,6 +46,10 @@ class Thermostats extends SmartThings {
        }
 
        // Methods to set values
+       def setThermostatSetpoint(int thermostatSetpoint) {
+               thermostats[0].setThermostatSetpoint(thermostatSetpoint)
+       }
+
        def setCoolingSetpoint(int coolingSetpoint) {
                thermostats[0].setCoolingSetpoint(coolingSetpoint)
        }
@@ -73,6 +74,10 @@ class Thermostats extends SmartThings {
                thermostats[0].setThermostatMode(thermostatMode)
        }
 
+       def setThermostatOperatingState(String thermostatOperatingState) {
+               thermostats[0].setThermostatOperatingState(thermostatOperatingState)
+       }
+
        def setClimate(String info, String givenClimateName) {
                thermostats[0].setClimate(info, givenClimateName)
        }
@@ -101,53 +106,4 @@ class Thermostats extends SmartThings {
        def off() {
                thermostats[0].off()
        }
-
-       // Methods to return values
-       def getCurrentTemperature() {
-               List tmpValues = new ArrayList()
-               tmpValues.add(thermostats[0].getCurrentTemperature())
-               return tmpValues
-       }
-
-       def getCurrentCoolingSetpoint() {
-               List tmpValues = new ArrayList()
-               tmpValues.add(thermostats[0].getCurrentCoolingSetpoint())
-               return tmpValues
-       }
-       
-       def getCurrentHeatingSetpoint() {
-               List tmpValues = new ArrayList()
-               tmpValues.add(thermostats[0].getCurrentHeatingSetpoint())
-               return tmpValues
-       }
-
-       def getCurrentThermostatSetPoint() {
-               List tmpValues = new ArrayList()
-               tmpValues.add(thermostats[0].getCurrentThermostatSetPoint())
-               return tmpValues
-       }
-
-       def getCurrentThermostatOperatingState() {
-               List tmpValues = new ArrayList()
-               tmpValues.add(thermostats[0].getCurrentThermostatOperatingState())
-               return tmpValues
-       }
-
-       def getCurrentThermostatFanMode() {
-               List tmpValues = new ArrayList()
-               tmpValues.add(thermostats[0].getCurrentThermostatFanMode())
-               return tmpValues
-       }
-
-       def getCurrentThermostatMode() {
-               List tmpValues = new ArrayList()
-               tmpValues.add(thermostats[0].getCurrentThermostatMode())
-               return tmpValues
-       }
-
-       def getCurrentClimateName() {
-               List tmpValues = new ArrayList()
-               tmpValues.add(thermostats[0].getCurrentClimateName())
-               return tmpValues
-       }
 }