X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=PowerMeter%2FPowerMeter.groovy;fp=PowerMeter%2FPowerMeter.groovy;h=479e2b9b0b67e51d7f44bc4c0247fb9e98d3da82;hb=2d26e7af07daad1394408bdcf76150b5aacf3a8a;hp=d960a3a1df8e4e3c5fc19f54dc469be5ec88552a;hpb=83071d3bcfc33f015ece13868342644498a9dda3;p=smartthings-infrastructure.git

diff --git a/PowerMeter/PowerMeter.groovy b/PowerMeter/PowerMeter.groovy
index d960a3a..479e2b9 100644
--- a/PowerMeter/PowerMeter.groovy
+++ b/PowerMeter/PowerMeter.groovy
@@ -2,21 +2,16 @@
 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
-	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
-	HashMap<String, MutableInteger> deviceIntValuesMap = new HashMap<String, MutableInteger>()
+	HashMap<String, Integer> deviceIntValuesMap = new HashMap<String, Integer>()
 
-	PowerMeter(Closure sendEvent, StringBuilder id, StringBuilder label, StringBuilder displayName, MutableInteger currentPower) {
-		deviceIntValuesMap = deviceIntValueSmartThing
+	PowerMeter(Closure sendEvent, String id, String label, String displayName, Integer currentPower) {
+		deviceIntValueSmartThing = deviceIntValuesMap
 		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.currentPower = currentPower
 
 		deviceIntValuesMap.put("power", currentPower)
 	}
-
-	// Methods to return values
-	def getCurrentPower() {
-		return currentPower.getValue()
-	}
 }