Man kann ein Spiel joinen und auch wieder verlassen

git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@451 72836036-5685-4462-b002-a69064685172

1 files changed, 29 insertions, 19 deletions

diff --git a/src/jrummikub/control/network/GameJoinControl.java b/src/jrummikub/control/network/GameJoinControl.java
index fbc18c6..83df0ed 100644
--- a/src/jrummikub/control/network/GameJoinControl.java
+++ b/src/jrummikub/control/network/GameJoinControl.java
@@ -35,7 +35,6 @@ public class GameJoinControl {
 		this.gameData = gameData;
 		this.view = view;
 		
-
 		view.getSettingsPanel().setSettingsMode(SettingsMode.NETWORK_JOIN);
 		view.getSettingsPanel().enableAddPlayerButton(false);
 		view.getSettingsPanel().setGameSettings(gameData.getGameSettings());
@@ -55,22 +54,21 @@ public class GameJoinControl {
 						}
 					}
 				}));
-		connections.add(view.getSettingsPanel().getBackEvent().add(new IListener() {
-			@Override
-			public void handle() {
-				//TODO mit game offer control und game data reden (spieler werden nich wieder entfernt)
-				
-				abort();				
-			}
-		}));
-		connections.add(view.getSettingsPanel().getChangePlayerColorEvent().add(new IListener2<Integer, Color>() {
-			@Override
-			public void handle(Integer playerNumber, Color color) {
-				// TODO Auto-generated method stub
-				
-				
-			}
-		}));
+		connections.add(view.getSettingsPanel().getBackEvent().add(
+				new IListener() {
+					@Override
+					public void handle() {
+						goBack();
+					}
+				}));
+		connections.add(view.getSettingsPanel().getChangePlayerColorEvent()
+				.add(new IListener2<Integer, Color>() {
+					@Override
+					public void handle(Integer playerNumber, Color color) {
+						// TODO Auto-generated method stub
+
+					}
+				}));
 	}
 
 	private void updateSettingsPanel(GameSettings settings) {
@@ -96,6 +94,10 @@ public class GameJoinControl {
 			}
 		}
 	}
+	
+	public Event getBackEvent(){
+		return backEvent;
+	}
 
 	public void startGameJoin() {
 		view.showSettingsPanel(true);
@@ -104,9 +106,17 @@ public class GameJoinControl {
 	/**
 	 * Aborts joining and goes back to game list
 	 */
-	public void abort() {
+	private void goBack() {
+		abort();
+		connectionControl.leaveGame(gameData.getGameID());
 		view.showSettingsPanel(false);
-		view.showGameListPanel(true);
+		backEvent.emit();
+	}
+
+	/**
+	 * Aborts joining
+	 */
+	public void abort() {
 		for (Connection c : connections) {
 			c.remove();
 		}