X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=ColorTemperature%2FColorTemperatures.groovy;fp=ColorTemperature%2FColorTemperatures.groovy;h=c53ec3522c4eb7ba5285a06d99561b7cda3cb470;hb=d0b538d93e64c63d2673796db08570953b57f947;hp=d3826804318a6448eff9382233a52bfd1b0043e3;hpb=2932def9bb947d617975235763f7338360f0e5a4;p=smartthings-infrastructure.git

diff --git a/ColorTemperature/ColorTemperatures.groovy b/ColorTemperature/ColorTemperatures.groovy
index d382680..c53ec35 100644
--- a/ColorTemperature/ColorTemperatures.groovy
+++ b/ColorTemperature/ColorTemperatures.groovy
@@ -1,139 +1,37 @@
 //Create a class for color temperature
 package ColorTemperature
-import Timer.SimulatedTimer
+import SmartThing.SmartThings
 
-public class ColorTemperatures {
-	private int deviceNumbers
-	private List colorTemperatues
-	def sendEvent
+public class ColorTemperatures extends SmartThings {
+	List colorTemperatues = new ArrayList()
 
-	//For one device(We cannot have obj.id)-> We should have obj[0].id
-	private String id = "colorTemperatureID0"
-	private String label = "colorTemperature0"
-	private String displayName = "colorTemperature0"
-	private String currentSwitch = "on"
-	private int level = 50
-	private int currentLevel = 50
-	private int colorTemperature = 15000
-	
-
-	ColorTemperatures(Closure sendEvent, int deviceNumbers, boolean init) {
-		this.sendEvent = sendEvent
-		this.deviceNumbers = deviceNumbers
-		this.colorTemperatues = []
-
-		if (init) {
-			this.level = 30
-			this.currentLevel = 40
-			this.colorTemperature = 10000
-		} else {
-			this.level = 50
-			this.currentLevel = 50
-			this.colorTemperature = 15000
-		}
-
-		colorTemperatues.add(new ColorTemperature(sendEvent, id, label, displayName, this.level, this.currentSwitch, this.colorTemperature))
-	}
-
-	//Methods for closures
-	def count(Closure Input) {
-		colorTemperatues.count(Input)
-	}
-	def size() {
-		colorTemperatues.size()
-	}
-	def each(Closure Input) {
-		colorTemperatues.each(Input)
-	}
-	def find(Closure Input) {
-		colorTemperatues.find(Input)
-	}
-	def sort(Closure Input) {
-		colorTemperatues.sort(Input)
-	}
-	def collect(Closure Input) {
-		colorTemperatues.collect(Input)
-	}
+	ColorTemperatures(Closure sendEvent, boolean init) {
+		// Only initialize one time since we only have one device for each capability
+		colorTemperatues = smartThings
 
-	//By model checker
-	def setValue(LinkedHashMap eventDataMap) {
-		if (eventDataMap["name"] == "switch") {
-			if (eventDataMap["value"] != colorTemperatues[0].currentSwitch) {
-				this.currentSwitch = eventDataMap["value"]
-				colorTemperatues[0].setValue(eventDataMap["value"], "switch")
-				sendEvent(eventDataMap)
-			}
-		} else if (eventDataMap["name"] == "colorTemperature") {
-			if (eventDataMap["value"].toInteger() != colorTemperatues[0].colorTemperature) {
-				this.colorTemperature = eventDataMap["value"].toInteger()
-				colorTemperatues[0].setValue(eventDataMap["value"], "colorTemperature")
-				sendEvent(eventDataMap)
-			}
-		} else if (eventDataMap["name"] == "level") {
-			if (eventDataMap["value"].toInteger() != colorTemperatues[0].level) {
-				this.currentLevel = eventDataMap["value"].toInteger() 
-				this.level = eventDataMap["value"].toInteger()
-				colorTemperatues[0].setValue(eventDataMap["value"], "level")
-				sendEvent(eventDataMap)
-			}
-		}
-	}
-
-
-	//methods
-	def setLevel(long level) {
-		if (level != this.level) {
-			this.currentLevel = level
-			this.level = level
-			colorTemperatues[0].setLevel(level)
-		}
-	}
+		// Initialization
+		StringBuilder id = new StringBuilder("colorTemperatureID0")
+		StringBuilder label = new StringBuilder("colorTemperature")
+		StringBuilder displayName = new StringBuilder("colorTemperature0")
+		MutableInteger colorTemperatue = new MutableInteger()
 
-	def setLevel(int level) {
-		if (level != this.level) {
-			this.currentLevel = level
-			this.level = level
-			colorTemperatues[0].setLevel(level)
-		}
-	}
+		if (init)
+			colorTemperature = 10000
+		else
+			colorTemperatues = 15000
 
-	def setColorTemperature(String colorTemperature) {
-		if (colorTemperature != this.colorTemperature) {
-			this.colorTemperature = colorTemperature
-			colorTemperatues[0].setColorTemperature(colorTemperature)			
-		}
+		colorTemperatues.add(new ColorTemperature(sendEvent, id, label, displayName, colorTemperature))
 	}
 	
-	def setColorTemperature(int colorTemperature) {
-		if (colorTemperature != this.colorTemperature) {
-			this.colorTemperature = colorTemperature
-			colorTemperatues[0].setColorTemperature(colorTemperature)			
-		}
-	}
-
-	def on(String currentSwitch) {
-		if (currentSwitch != this.currentSwitch) {
-			this.currentSwitch = currentSwitch
-			colorTemperatues[0].on(currentSwitch)			
-		}
-	}
-
-	def off(String currentSwitch) {
-		if (currentSwitch != this.currentSwitch) {
-			this.currentSwitch = currentSwitch
-			colorTemperatues[0].off(currentSwitch)			
-		}
+	// Methods to set values
+	def setColorTemperature(int newValue) {
+		colorTemperatues[0].setColorTemperature(newValue)
 	}
 
-	def currentValue(String deviceFeature) {
-		colorTemperatues[0].currentValue(deviceFeature)
-	}
-
-	def latestValue(String deviceFeature) {
-		colorTemperatues[0].latestValue(deviceFeature)
-	}	
-
-	def getAt(int ix) {
-		colorTemperatues[ix]
+	// Methods to return values
+	def getCurrentColorTemperature() {
+		List tmpValues = new ArrayList()
+		tmpValues.add(colorTemperatues[0].getCurrentColorTemperature())
+		return tmpValues
 	}
 }