X-Git-Url: http://plrg.eecs.uci.edu/git/?p=smartthings-infrastructure.git;a=blobdiff_plain;f=RelativeHumidityMeasurement%2FRelativeHumidityMeasurement.groovy;fp=RelativeHumidityMeasurement%2FRelativeHumidityMeasurement.groovy;h=9faad86be1cac222e099d3deff13ad7cbcb09c7a;hp=8d7c4e06028571d75ba28150718f1c485e076595;hb=2d26e7af07daad1394408bdcf76150b5aacf3a8a;hpb=83071d3bcfc33f015ece13868342644498a9dda3

diff --git a/RelativeHumidityMeasurement/RelativeHumidityMeasurement.groovy b/RelativeHumidityMeasurement/RelativeHumidityMeasurement.groovy
index 8d7c4e0..9faad86 100644
--- a/RelativeHumidityMeasurement/RelativeHumidityMeasurement.groovy
+++ b/RelativeHumidityMeasurement/RelativeHumidityMeasurement.groovy
@@ -2,21 +2,16 @@
 package RelativeHumidityMeasurement
 import SmartThing.SmartThing
 
-//Importing mutable integer class
-import MutableInteger.MutableInteger
-
 public class RelativeHumidityMeasurement 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 currentHumidity = 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>()
 
-	RelativeHumidityMeasurement(Closure sendEvent, StringBuilder id, StringBuilder label, StringBuilder displayName, MutableInteger currentHumidity) {
-		deviceIntValuesMap = deviceIntValueSmartThing
+	RelativeHumidityMeasurement(Closure sendEvent, String id, String label, String displayName, Integer currentHumidity) {
+		deviceIntValueSmartThing = deviceIntValuesMap
 		idSmartThing = id
 		labelSmartThing = label
 		displayNameSmartThing = displayName
@@ -26,13 +21,7 @@ public class RelativeHumidityMeasurement extends SmartThing {
 		this.id = id
 		this.label = label
 		this.displayName = displayName
-		this.currentHumidity = currentHumidity
 
 		deviceIntValuesMap.put("humidity", currentHumidity)
 	}
-
-	// Methods to return values
-	def getCurrentHumidity() {
-		return currentHumidity.getValue()
-	}
 }