X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=MusicPlayer%2FMusicPlayers.groovy;fp=MusicPlayer%2FMusicPlayers.groovy;h=c10978eb2f6bce6b83691eb466fb19988eae35f1;hb=2d26e7af07daad1394408bdcf76150b5aacf3a8a;hp=0e88a88a01f3bbc788d44ae388b8f7f534063147;hpb=83071d3bcfc33f015ece13868342644498a9dda3;p=smartthings-infrastructure.git

diff --git a/MusicPlayer/MusicPlayers.groovy b/MusicPlayer/MusicPlayers.groovy
index 0e88a88..c10978e 100644
--- a/MusicPlayer/MusicPlayers.groovy
+++ b/MusicPlayer/MusicPlayers.groovy
@@ -2,9 +2,6 @@
 package MusicPlayer
 import SmartThing.SmartThings
 
-//Importing mutable integer class
-import MutableInteger.MutableInteger
-
 public class MusicPlayers extends SmartThings {
 	List musicPlayers = new ArrayList()
 	
@@ -13,27 +10,27 @@ public class MusicPlayers extends SmartThings {
 		musicPlayers = smartThings
 
 		// Initialization
-		StringBuilder id = new StringBuilder("musicPlayerID0")
-		StringBuilder label = new StringBuilder("status")
-		StringBuilder displayName = new StringBuilder("musicPlayer0")
-		StringBuilder mute = new StringBuilder()
-		StringBuilder status = new StringBuilder()
-		StringBuilder trackData = new StringBuilder()
-		StringBuilder trackDescription = new StringBuilder()
-		MutableInteger level = new MutableInteger()
+		String id = "musicPlayerID0"
+		String label = "status"
+		String displayName = "musicPlayer"
+		String mute
+		String status
+		String trackData
+		String trackDescription
+		Integer level
 
 		if (init) {
-			level.setValue(20)
-			mute.append("unmuted")
-			status.append("paused")
-			trackData.append("someTrack")
-			trackDescription.append("someDescriptions")
+			level = 20
+			mute = "unmuted"
+			status = "paused"
+			trackData = "someTrack"
+			trackDescription = "someDescriptions"
 		} else {
-			level.setValue(30)
-			mute.append("muted")
-			status.append("play")
-			trackData.append("someTrack")
-			trackDescription.append("someDescriptions")
+			level = 30
+			mute = "muted"
+			status = "play"
+			trackData = "someTrack"
+			trackDescription = "someDescriptions"
 		}
 
 		musicPlayers.add(new MusicPlayer(sendEvent, id, label, displayName, level, mute, status, trackData, trackDescription))
@@ -151,35 +148,4 @@ public class MusicPlayers extends SmartThings {
 	def stop() {
 		musicPlayers[0].stop()
 	}
-
-	// Methods to return values
-	def getCurrentLevel() {
-		List tmpValues = new ArrayList()
-		tmpValues.add(musicPlayers[0].getCurrentLevel())
-		return tmpValues
-	}
-
-	def getCurrentMute() {
-		List tmpValues = new ArrayList()
-		tmpValues.add(musicPlayers[0].getCurrentMute())
-		return tmpValues
-	}
-	
-	def getCurrentStatus() {
-		List tmpValues = new ArrayList()
-		tmpValues.add(musicPlayers[0].getCurrentStatus())
-		return tmpValues
-	}
-
-	def getCurrentTrackData() {
-		List tmpValues = new ArrayList()
-		tmpValues.add(musicPlayers[0].getCurrentTrackData())
-		return tmpValues
-	}
-
-	def getCurrentTrackDescription() {
-		List tmpValues = new ArrayList()
-		tmpValues.add(musicPlayers[0].getCurrentTrackDescription())
-		return tmpValues
-	}
 }