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

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

diff --git a/ContactSensor/ContactSensor.groovy b/ContactSensor/ContactSensor.groovy
index 4a10a5731b291639b34dbad81a34a00156682ba9..e93ce58909cddc0ca60f90064f305a358b764fc8 100644 (file)
--- a/ContactSensor/ContactSensor.groovy
+++ b/ContactSensor/ContactSensor.groovy
@@ -1,111 +1,32 @@
 //Create a class for contact sensor
 package ContactSensor
-import Timer.SimulatedTimer
-
-//JPF's Verify API
-import gov.nasa.jpf.vm.Verify
-
-public class ContactSensor {
-       private String id
-       private String label
-       private String displayName
-       private String contactState
-       private String currentContact   
-       private String latestValue
-       private String alarmState
-       private List events = []
-       private List timeOfEvents = []
-       
-
-       ContactSensor(String id, String label, String displayName, String contactState, String currentContact, String alarmState, String latestValue) {
+import SmartThing.SmartThing
+
+public class ContactSensor extends SmartThing {
+       // id, label, and display name of the device
+       String id
+       String label
+       String displayName
+       // Maps from features to values
+       HashMap<String, String> deviceValuesMap = new HashMap<String, String>()
+       // Possible values for eventsSince method
+       List<String> possibleValues = new ArrayList<String>();
+
+       ContactSensor(Closure sendEvent, String id, String label, String displayName, String currentContact) {
+               deviceValueSmartThing = deviceValuesMap
+               idSmartThing = id
+               labelSmartThing = label
+               displayNameSmartThing = displayName
+               sendEventSmartThings = sendEvent
+               possibleValuesSmartThings = possibleValues
+
+               // Initialization
                this.id = id
                this.label = label
                this.displayName = displayName
-               this.contactState = contactState
-               this.currentContact = currentContact
-               this.latestValue = latestValue
-               this.alarmState = alarmState
-       }
-
-       def eventsSince() {
-               def evtOpen = [[name: "contact.open", value: "open", deviceId: "contactSensorID0", descriptionText: "",
-                               displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'],
-                              [name: "contact", value: "open", deviceId: "contactSensorID0", descriptionText: "",
-                               displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'],
-                              [name: "tamper.tampered", value: "open", deviceId: "contactSensorID0", descriptionText: "",
-                               displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}']]
-               def evtClosed = [[name: "contact.closed", value: "closed", deviceId: "contactSensorID0", descriptionText: "",
-                                 displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'],
-                                [name: "contact", value: "closed", deviceId: "contactSensorID0", descriptionText: "",
-                                 displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'],
-                                [name: "tamper.tampered", value: "closed", deviceId: "contactSensorID0", descriptionText: "",
-                                 displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}']]
-               def init = Verify.getInt(0,4)
-               def evtToSend = []
-               if (init == 0) {//return empty set
-                       return evtToSend
-               } else if (init == 1) {//send one open event
-                       evtOpen.each{
-                               evtToSend.add(it)
-                       }
-                       return evtToSend
-               } else if (init == 2) {//send two open events
-                       evtOpen.each{
-                               evtToSend.add(it)
-                       }
-                       evtOpen.each{
-                               evtToSend.add(it)
-                       }
-                       return evtToSend
-               } else if (init == 3) {//send one closed event
-                       evtClosed.each{
-                               evtToSend.add(it)
-                       }
-                       return evtToSend
-               } else if (init == 4) {//send two closed events
-                       evtClosed.each{
-                               evtToSend.add(it)
-                       }
-                       evtClosed.each{
-                               evtToSend.add(it)
-                       }
-                       return evtToSend
-               }
-       }
-
-       def setValue(String value) {
-               println("the contact sensor with id:$id is triggered to $value!")
-               this.contactState = value
-               this.currentContact = value
-               this.latestValue = value
-       }
-
-       
-       def on() {
-               println("the contact sensor with id:$id is armed!")
-               this.alarmState = "armed"
-       }
-
-       def off() {
-               println("the contact sensor with id:$id is not armed!")
-               this.alarmState = "not armed"
-       }
-       
-       def currentValue(String deviceFeature) {
-               if (deviceFeature == "contact") {
-                       return contactState
-               }
-       }
-
-       def currentState(String deviceFeature) {
-               if (deviceFeature == "contact") {
-                       return contactState
-               }
-       }
+               possibleValues.add("closed")
+               possibleValues.add("open")
 
-       def latestValue(String deviceFeature) {
-               if (deviceFeature == "contact") {
-                       return latestValue
-               }
+               deviceValuesMap.put("contact", currentContact)
        }
 }