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

[smartthings-infrastructure.git] / IlluminanceMeasurement / IlluminanceMeasurements.groovy

diff --git a/IlluminanceMeasurement/IlluminanceMeasurements.groovy b/IlluminanceMeasurement/IlluminanceMeasurements.groovy
index 6d4e38da6bb70f35691069f2413d2a7e8e9b266a..5977e4682b9fd8b70968137b5dbbf84cbf4ef315 100644 (file)
--- a/IlluminanceMeasurement/IlluminanceMeasurements.groovy
+++ b/IlluminanceMeasurement/IlluminanceMeasurements.groovy
@@ -1,68 +1,24 @@
 //Create a class for illuminance measurement
 package IlluminanceMeasurement
-import Timer.SimulatedTimer
-
-public class IlluminanceMeasurements {
-       private int deviceNumbers
-       private List illuminanceMeasurements
-       def sendEvent
-
-       //For one device(We cannot have obj.id)-> We should have obj[0].id
-       private String id = "illuminanceMeasurementsID0"
-       private String label = "illuminanceMeasurements0"
-       private String displayName = "illuminanceMeasurements0"
-       private int illuminance = 50000
-       private int currentIlluminance = 50000
+import SmartThing.SmartThings
 
+public class IlluminanceMeasurements extends SmartThings {
+       List illuminanceMeasurements = new ArrayList()
                
-       IlluminanceMeasurements(Closure sendEvent, int deviceNumbers) {
-               this.sendEvent = sendEvent              
-               this.deviceNumbers = deviceNumbers
-               this.illuminanceMeasurements = []
-
-               illuminanceMeasurements.add(new IlluminanceMeasurement(id, label, displayName, this.illuminance))
-       }
-
-       //By Model Checker
-       def setValue(LinkedHashMap eventDataMap) {
-               if (eventDataMap["value"].toInteger() != illuminanceMeasurements[0].illuminance) {
-                       this.illuminance = eventDataMap["value"].toInteger()
-                       this.currentIlluminance = eventDataMap["value"].toInteger()
-                       illuminanceMeasurements[0].setValue(eventDataMap["value"])
-                       sendEvent(eventDataMap)
-               }
-       }
-
-       //Methods for closures
-       def count(Closure Input) {
-               illuminanceMeasurements.count(Input)
-       }
-       def size() {
-               illuminanceMeasurements.size()
-       }
-       def each(Closure Input) {
-               illuminanceMeasurements.each(Input)
-       }
-       def find(Closure Input) {
-               illuminanceMeasurements.find(Input)
-       }
-       def sort(Closure Input) {
-               illuminanceMeasurements.sort(Input)
-       }
-       def collect(Closure Input) {
-               illuminanceMeasurements.collect(Input)
-       }
-
+       IlluminanceMeasurements(Closure sendEvent, boolean init) {
+               illuminanceMeasurements = smartThings
 
-       def currentValue(String deviceFeature) {
-               illuminanceMeasurements[0].currentValue(deviceFeature)//It is called if we have only one device
-       }
+               // Initialization
+               String id = "illuminanceID0"
+               String label = "illuminance"
+               String displayName = "illuminanceSensor"
+               Integer illuminance
 
-       def latestValue(String deviceFeature) {
-               illuminanceMeasurements[0].latestValue(deviceFeature)//It is called if we have only one device
-       }
+               if (init)
+                       illuminance = 20000
+               else
+                       illuminance = 5
 
-       def getAt(int ix) {
-               illuminanceMeasurements[ix]
+               illuminanceMeasurements.add(new IlluminanceMeasurement(sendEvent, id, label, displayName, illuminance))
        }
 }