Add concurrent composite states

src/soon/PlayZustand.java

 package soon;
 
-public class PlayZustand extends PowerOnZustand {
+public class PlayZustand extends PlayerZustand {
 	
 	public PlayZustand(Soon s, PowerOn p) {
 		super(s, p);
@@ -8,8 +8,8 @@ public class PlayZustand extends PowerOnZustand {
 	
 	public void stopButton() {
 		exit();
-		p.setZustand(p.getStopZustand());
-		p.getZustand().entry();
+		p.setPlayerZustand(p.getStopZustand());
+		p.getPlayerZustand().entry();
 	}
 
 	public void volumeUpButton() {

src/soon/PowerOnZustand.java → src/soon/PlayerZustand.java

 package soon;
 
-public abstract class PowerOnZustand {
+public abstract class PlayerZustand {
 	Soon s;
 	PowerOn p;
 	
-	public PowerOnZustand(Soon s, PowerOn p) {
+	public PlayerZustand(Soon s, PowerOn p) {
 		this.s = s;
 		this.p = p;
 	}

src/soon/PowerOff.java

@@ -7,9 +7,9 @@ public class PowerOff extends Zustand {
 	}
 	
 	public void powerButton() {
+		System.out.println("Power Button: Anschalten");
 		exit();
 		s.setZustand(s.getPowerOnZustand());
-		System.out.println("Anschalten");
 		s.getZustand().entry();
 	}
 }

src/soon/PowerOn.java

 package soon;
 
 public class PowerOn extends Zustand {
-	PowerOnZustand playZustand;
-	PowerOnZustand stopZustand;
+	PlayerZustand playZustand;
+	PlayerZustand stopZustand;
+	SpeakerZustand stereoZustand;
+	SpeakerZustand surroundZustand;
 
-	PowerOnZustand zustand;
+	PlayerZustand playerZustand;
+	SpeakerZustand speakerZustand;
 	
 	public PowerOn(Soon s) {
 		super(s);
 		stopZustand = new StopZustand(s, this);
 		playZustand = new PlayZustand(s, this);
-		zustand = stopZustand;
+		stereoZustand = new StereoZustand(s,this);
+		surroundZustand = new SurroundZustand(s,this);
+		playerZustand = stopZustand;
+		speakerZustand = stereoZustand;
 	}
 	
-	public PowerOnZustand getStopZustand() {
+	public PlayerZustand getStopZustand() {
 		return stopZustand;
 	}
 
-	public PowerOnZustand getPlayZustand() {
+	public PlayerZustand getPlayZustand() {
 		return playZustand;
 	}
 
-	public PowerOnZustand getZustand() {
-		return zustand;
+	public SpeakerZustand getStereoZustand() {
+		return stereoZustand;
 	}
 	
-	public void setZustand(PowerOnZustand zustand) {
-		this.zustand = zustand;
+	public SpeakerZustand getSurroundZustand() {
+		return surroundZustand;
+	}
+	
+	public PlayerZustand getPlayerZustand() {
+		return playerZustand;
+	}
+
+	public void setPlayerZustand(PlayerZustand zustand) {
+		this.playerZustand = zustand;
+	}
+	
+	public SpeakerZustand getSpeakerZustand() {
+		return speakerZustand;
+	}
+
+	public void setSpeakerZustand(SpeakerZustand zustand) {
+		this.speakerZustand = zustand;
 	}
 
 	public void playButton() {
-		zustand.playButton();
+		System.out.println("Play Button");
+		playerZustand.playButton();
 	}
 	
 	public void stopButton() {
-		zustand.stopButton();
+		System.out.println("Stop Button"); 
+		playerZustand.stopButton();
 	}
 	
 	public void volumeUpButton() {
-		zustand.volumeUpButton();
+		System.out.println("Volume Up Button"); 
+		playerZustand.volumeUpButton();
 	}
 	
 	public void volumeDownButton() {
-		zustand.volumeDownButton();
+		System.out.println("Volume Down Button"); 
+		playerZustand.volumeDownButton();
 	}
 
 	public void powerButton() {
+		System.out.println("Power Button: Ausschalten");
 		exit();
 		s.setZustand(s.getPowerOffZustand());
-		System.out.println("Ausschalten");
 		s.getZustand().entry();
 	}
 	
+	public void speakerButton() {
+		System.out.println("Speaker Button"); 
+		speakerZustand.speakerButton();
+	}
+	
+	
 	public void entry() {
 		s.powerLED_On();
-		zustand.entry();
+		playerZustand.entry();
 	}
 	
 	public void exit() {
 		s.powerLED_Off();
-		zustand.exit();
+		playerZustand.exit();
 	}
 }

src/soon/Soon.java

@@ -3,12 +3,16 @@ package soon;
 public class Soon {
 	Zustand powerOnZustand;
 	Zustand powerOffZustand;
+	PlayerZustand playerHistory;
+	SpeakerZustand speakerHistory;
 	
 	Zustand zustand;
 	
 	public Soon () {
 		powerOnZustand = new PowerOn(this);
 		powerOffZustand = new PowerOff(this);
+		playerHistory = ((PowerOn)powerOnZustand).getStopZustand();
+		speakerHistory = ((PowerOn)powerOnZustand).getStereoZustand();
 		zustand = powerOffZustand;
 	}
 
@@ -48,28 +52,40 @@ public class Soon {
 		zustand.powerButton();
 	}
 
+	public void speakerButton() {
+		zustand.speakerButton();
+	}
+	
 	public void startPlay() {
-		System.out.println("Musik an");
+		System.out.println("Soon: Musik an");
 	}
 	
 	public void stopPlay() {
-		System.out.println("Musik aus");
+		System.out.println("Soon: Musik aus");
 	}
 
 	public void volumeUp() {
-		System.out.println("Lauter");
+		System.out.println("Soon: Lauter");
 	}
 	
 	public void volumeDown() {
-		System.out.println("Leiser");
+		System.out.println("Soon: Leiser");
 	}
 
 	public void powerLED_On() {
-		System.out.println("LED on");
+		System.out.println("Soon: LED on");
 	}
 	
 	public void powerLED_Off() {
-		System.out.println("LED off");
+		System.out.println("Soon: LED off");
+	}
+
+	public void setStereo() {
+		System.out.println("Soon: Stereo sound");
+	}
+	
+	public void setSurround() {
+		System.out.println("Soon: Surround sound");
 	}
 	
 	public String toString() {

src/soon/SoonTestDrive.java

@@ -9,8 +9,12 @@ public class SoonTestDrive {
 		
 		player.powerButton();
 		player.playButton();
+		player.speakerButton();
 		player.volumeUpButton();
+		player.powerButton();
+		player.powerButton();
 		player.volumeDownButton();
+		player.speakerButton();
 		player.stopButton();
 		player.powerButton();
 	}

src/soon/SpeakerZustand.java

+package soon;
+
+public abstract class SpeakerZustand {
+	Soon s;
+	PowerOn p;
+	
+	public SpeakerZustand(Soon s, PowerOn p) {
+		this.s = s;
+		this.p = p;
+	}
+	
+	public void speakerButton() {};
+}

src/soon/StereoZustand.java

+package soon;
+
+public class StereoZustand extends SpeakerZustand {
+
+	public StereoZustand(Soon s, PowerOn p) {
+		super(s, p);
+	}
+
+	public void speakerButton() {
+		s.setSurround();
+		p.setSpeakerZustand(p.getSurroundZustand());
+	}
+}

src/soon/StopZustand.java

 package soon;
 
-public class StopZustand extends PowerOnZustand {
+public class StopZustand extends PlayerZustand {
 	
 	public StopZustand(Soon s, PowerOn p) {
 		super(s, p);
@@ -8,7 +8,7 @@ public class StopZustand extends PowerOnZustand {
 	
 	public void playButton() {
 		exit();
-		p.setZustand(p.getPlayZustand());
-		p.getZustand().entry();
+		p.setPlayerZustand(p.getPlayZustand());
+		p.getPlayerZustand().entry();
 	}
 }

src/soon/SurroundZustand.java

+package soon;
+
+public class SurroundZustand extends SpeakerZustand {
+
+	public SurroundZustand(Soon s, PowerOn p) {
+		super(s, p);
+	}
+
+	public void speakerButton() {
+		s.setStereo();
+		p.setSpeakerZustand(p.getStereoZustand());
+	}
+
+}

src/soon/Zustand.java

@@ -14,4 +14,5 @@ public abstract class Zustand {
 	public void entry() {};
 	public void exit() {};
 	public void powerButton() {};
+	public void speakerButton() {};
 }