projects
/
smartthings-infrastructure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
A bit of cleaning up.
[smartthings-infrastructure.git]
/
AccelerationSensor
/
AccelerationSensors.groovy
diff --git
a/AccelerationSensor/AccelerationSensors.groovy
b/AccelerationSensor/AccelerationSensors.groovy
index d7a9f99275d7892b676b8bbee4a9472064af2051..7cfe1d08094f25c1fbcbb25186df96ce349ca1ab 100644
(file)
--- a/
AccelerationSensor/AccelerationSensors.groovy
+++ b/
AccelerationSensor/AccelerationSensors.groovy
@@
-2,9
+2,6
@@
package AccelerationSensor
import Timer.SimulatedTimer
package AccelerationSensor
import Timer.SimulatedTimer
-//JPF's Verify API
-import gov.nasa.jpf.vm.Verify
-
public class AccelerationSensors {
private int deviceNumbers
private List accelerationSensors
public class AccelerationSensors {
private int deviceNumbers
private List accelerationSensors
@@
-20,12
+17,11
@@
public class AccelerationSensors {
- AccelerationSensors(Closure sendEvent, int deviceNumbers) {
+ AccelerationSensors(Closure sendEvent, int deviceNumbers
, boolean init
) {
this.sendEvent = sendEvent
this.deviceNumbers = deviceNumbers
this.accelerationSensors = []
this.sendEvent = sendEvent
this.deviceNumbers = deviceNumbers
this.accelerationSensors = []
- def init = Verify.getBoolean()
if (init) {
this.acceleration = "inactive"
this.accelerationLatestValue = "inactive"
if (init) {
this.acceleration = "inactive"
this.accelerationLatestValue = "inactive"
@@
-47,6
+43,15
@@
public class AccelerationSensors {
}
}
}
}
+ //methods
+ def eventsSince(Date dateObj) {
+ return accelerationSensors[0].eventsSince()
+ }
+
+ def statesSince(String info, Date dateObj) {
+ return accelerationSensors[0].statesSince()
+ }
+
//Methods for closures
def count(Closure Input) {
accelerationSensors.count(Input)
//Methods for closures
def count(Closure Input) {
accelerationSensors.count(Input)
@@
-76,10
+81,6
@@
public class AccelerationSensors {
accelerationSensors[0].latestValue(deviceFeature)//It is called if we have only one device
}
accelerationSensors[0].latestValue(deviceFeature)//It is called if we have only one device
}
- def statesSince(String info, Date dateObj) {
- return accelerationSensors[0].statesSince(info, dateObj)
- }
-
def getAt(int ix) {
accelerationSensors[ix]
}
def getAt(int ix) {
accelerationSensors[ix]
}