projects
/
smartthings-infrastructure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removing getXXX methods + properties. Adding getProperty feature to SmartThing(s)
[smartthings-infrastructure.git]
/
PowerMeter
/
PowerMeter.groovy
diff --git
a/PowerMeter/PowerMeter.groovy
b/PowerMeter/PowerMeter.groovy
index d960a3a1df8e4e3c5fc19f54dc469be5ec88552a..479e2b9b0b67e51d7f44bc4c0247fb9e98d3da82 100644
(file)
--- a/
PowerMeter/PowerMeter.groovy
+++ b/
PowerMeter/PowerMeter.groovy
@@
-2,21
+2,16
@@
package PowerMeter
import SmartThing.SmartThing
package PowerMeter
import SmartThing.SmartThing
-//Importing mutable integer class
-import MutableInteger.MutableInteger
-
public class PowerMeter extends SmartThing {
// id, label, and display name of the device
public class PowerMeter extends SmartThing {
// id, label, and display name of the device
- StringBuilder id = new StringBuilder()
- StringBuilder label = new StringBuilder()
- StringBuilder displayName = new StringBuilder()
- // Features with numberical values
- MutableInteger currentPower = new MutableInteger()
+ String id
+ String label
+ String displayName
// Maps from features to values
// Maps from features to values
- HashMap<String,
MutableInteger> deviceIntValuesMap = new HashMap<String, Mutable
Integer>()
+ HashMap<String,
Integer> deviceIntValuesMap = new HashMap<String,
Integer>()
- PowerMeter(Closure sendEvent, String
Builder id, StringBuilder label, StringBuilder displayName, Mutable
Integer currentPower) {
- deviceIntValue
sMap = deviceIntValueSmartThing
+ PowerMeter(Closure sendEvent, String
id, String label, String displayName,
Integer currentPower) {
+ deviceIntValue
SmartThing = deviceIntValuesMap
idSmartThing = id
labelSmartThing = label
displayNameSmartThing = displayName
idSmartThing = id
labelSmartThing = label
displayNameSmartThing = displayName
@@
-26,13
+21,7
@@
public class PowerMeter extends SmartThing {
this.id = id
this.label = label
this.displayName = displayName
this.id = id
this.label = label
this.displayName = displayName
- this.currentPower = currentPower
deviceIntValuesMap.put("power", currentPower)
}
deviceIntValuesMap.put("power", currentPower)
}
-
- // Methods to return values
- def getCurrentPower() {
- return currentPower.getValue()
- }
}
}