X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=PowerMeter%2FPowerMeters.groovy;h=e0600f6782e801d33fb586f2ecaabccae1f5b0ab;hb=2d26e7af07daad1394408bdcf76150b5aacf3a8a;hp=330a4e3af6dd2053bb54e96fc80ef6cd4e92b4d5;hpb=83071d3bcfc33f015ece13868342644498a9dda3;p=smartthings-infrastructure.git

diff --git a/PowerMeter/PowerMeters.groovy b/PowerMeter/PowerMeters.groovy
index 330a4e3..e0600f6 100644
--- a/PowerMeter/PowerMeters.groovy
+++ b/PowerMeter/PowerMeters.groovy
@@ -2,9 +2,6 @@
 package PowerMeter
 import SmartThing.SmartThings
 
-//Importing mutable integer class
-import MutableInteger.MutableInteger
-
 public class PowerMeters extends SmartThings {
 	List powerMeters = new ArrayList()
 
@@ -13,23 +10,16 @@ public class PowerMeters extends SmartThings {
 		powerMeters = smartThings
 
 		// Initialization
-		StringBuilder id = new StringBuilder("powerMeterID0")
-		StringBuilder label = new StringBuilder("powerMeter")
-		StringBuilder displayName = new StringBuilder("powerMeter0")
-		MutableInteger power = new MutableInteger()
+		String id = "powerMeterID0"
+		String label = "powerMeter"
+		String displayName = "powerMeter"
+		Integer power
 
 		if (init)
-			power.setValue(50)
+			power = 50
 		else
-			power.setValue(60)
+			power = 60
 
 		powerMeters.add(new PowerMeter(sendEvent, id, label, displayName, power))
 	}
-
-	// Methods to return values
-	def getCurrentPower() {
-		List tmpValues = new ArrayList()
-		tmpValues.add(powerMeters[0].getCurrentPower())
-		return tmpValues
-	}
 }