1 files changed, 94 insertions, 68 deletions

diff --git a/src/jrummikub/control/network/NetworkControl.java b/src/jrummikub/control/network/NetworkControl.java
index ce46a0f..6e42f83 100644
--- a/src/jrummikub/control/network/NetworkControl.java
+++ b/src/jrummikub/control/network/NetworkControl.java
@@ -17,6 +17,7 @@ import jrummikub.util.IListener1;
 import jrummikub.util.LoginData;
 import jrummikub.view.IQuitWarningPanel.QuitMode;
 import jrummikub.view.IView;
+import jrummikub.view.IView.BottomPanelType;
 import jrummikub.view.LoginError;
 
 /**
@@ -45,13 +46,13 @@ public class NetworkControl {
 	 * Creates a new network control
 	 * 
 	 * @param loginData
-	 *            user's login data
+	 *          user's login data
 	 * @param connectionControl
-	 *            current connection for events and messages
+	 *          current connection for events and messages
 	 * @param saveControl
-	 *            save control if saving will ever be allowed
+	 *          save control if saving will ever be allowed
 	 * @param view
-	 *            for events and handlers
+	 *          for events and handlers
 	 */
 	public NetworkControl(final LoginData loginData,
 			IConnectionControl connectionControl, SaveControl saveControl,
@@ -132,28 +133,11 @@ public class NetworkControl {
 	 * Adds the listeners for connection control events
 	 * 
 	 * @param view
-	 *            view for events
+	 *          view for events
 	 */
 	public void addConnectionControlListeners(final IView view) {
-		connections.add(connectionControl.getGameOfferEvent().add(
-				new IListener1<GameData>() {
-					@Override
-					public void handle(GameData gameData) {
-						UUID uuid = gameData.getGameID();
-
-						GameData game = gameMap.get(uuid);
-
-						if (game == null) {
-							game = gameData;
-							gameMap.put(uuid, gameData);
-							games.add(uuid);
-						} else {
-							game.setGameSettings(gameData.getGameSettings());
-						}
+		addOfferUpdateListener();
 
-						updateGameList();
-					}
-				}));
 		connections.add(connectionControl.getGameWithdrawalEvent().add(
 				new IListener1<UUID>() {
 					@Override
@@ -164,6 +148,20 @@ public class NetworkControl {
 						updateGameList();
 					}
 				}));
+		connections.add(connectionControl.getParticipantLeftEvent().add(
+				new IListener1<String>() {
+					@Override
+					public void handle(String nickname) {
+						for (Map.Entry<UUID, GameData> entry : gameMap.entrySet()) {
+							if (entry.getValue().getHost().equals(nickname)) {
+								games.remove(entry.getKey());
+								gameMap.remove(entry.getKey());
+							}
+						}
+
+						updateGameList();
+					}
+				}));
 		connections.add(connectionControl.getGameJoinAckEvent().add(
 				new IListener1<Boolean>() {
 					@Override
@@ -177,18 +175,38 @@ public class NetworkControl {
 				}));
 	}
 
-	private void addConnectionSetupListeners(final LoginData loginData,
-			final IView view) {
-		connections.add(connectionControl.getConnectedEvent().add(
-				new IListener() {
+	private void addOfferUpdateListener() {
+		connections.add(connectionControl.getGameOfferEvent().add(
+				new IListener1<GameData>() {
 					@Override
-					public void handle() {
-						view.getGameListPanel().setChannelName(
-								loginData.getChannelName());
-						view.showConnectPanel(false);
-						view.showGameListPanel(true);
+					public void handle(GameData gameData) {
+						UUID uuid = gameData.getGameID();
+
+						GameData game = gameMap.get(uuid);
+
+						if (game == null) {
+							game = gameData;
+							gameMap.put(uuid, gameData);
+							games.add(uuid);
+						} else {
+							game.setGameSettings(gameData.getGameSettings());
+						}
+
+						updateGameList();
 					}
 				}));
+	}
+
+	private void addConnectionSetupListeners(final LoginData loginData,
+			final IView view) {
+		connections.add(connectionControl.getConnectedEvent().add(new IListener() {
+			@Override
+			public void handle() {
+				view.getGameListPanel().setChannelName(loginData.getChannelName());
+				view.showConnectPanel(false);
+				view.showGameListPanel(true);
+			}
+		}));
 
 		connections.add(connectionControl.getConnectionFailedEvent().add(
 				new IListener1<LoginError>() {
@@ -219,31 +237,6 @@ public class NetworkControl {
 		view.getGameListPanel().setGameList(gameList);
 	}
 
-	private void createGameJoinControl() {
-		if (gameJoinControl != null) {
-			return;
-		}
-
-		GameData gameData = connectionControl.getCurrentGame();
-		gameJoinControl = new GameJoinControl(connectionControl, gameData, view);
-		gameJoinControl.getBackEvent().add(new IListener() {
-			@Override
-			public void handle() {
-				gameJoinControl = null;
-				view.showGameListPanel(true);
-			}
-		});
-		gameJoinControl.getStartGameEvent().add(new IListener() {
-			@Override
-			public void handle() {
-				gameControl = new NetworkGameControl(null, saveControl, view,
-						connectionControl, false);
-				gameControl.startGame();
-			}
-		});
-		gameJoinControl.startGameJoin();
-	}
-
 	/**
 	 * Starts a new network connection with the specified data
 	 */
@@ -327,12 +320,34 @@ public class NetworkControl {
 		settingsControl.startSettings();
 	}
 
+	private void createGameJoinControl() {
+		if (gameJoinControl != null) {
+			return;
+		}
+
+		GameData gameData = connectionControl.getCurrentGame();
+		gameJoinControl = new GameJoinControl(connectionControl, gameData, view);
+		gameJoinControl.getBackEvent().add(new IListener() {
+			@Override
+			public void handle() {
+				gameJoinControl = null;
+				view.showGameListPanel(true);
+			}
+		});
+		gameJoinControl.getStartGameEvent().add(new IListener() {
+			@Override
+			public void handle() {
+				createGameControl(null, false);
+			}
+		});
+		gameJoinControl.startGameJoin();
+	}
+
 	private void createGameOfferControl(GameSettings settings) {
 		if (gameOfferControl != null) {
 			return;
 		}
-		gameOfferControl = new GameOfferControl(connectionControl, settings,
-				view);
+		gameOfferControl = new GameOfferControl(connectionControl, settings, view);
 		gameOfferControl.getBackEvent().add(new IListener() {
 			@Override
 			public void handle() {
@@ -340,16 +355,27 @@ public class NetworkControl {
 				view.showGameListPanel(true);
 			}
 		});
-		gameOfferControl.getStartGameEvent().add(
-				new IListener1<GameSettings>() {
-					@Override
-					public void handle(GameSettings settings) {
-						gameControl = new NetworkGameControl(settings,
-								saveControl, view, connectionControl, true);
-						gameControl.startGame();
-					}
-				});
+		gameOfferControl.getStartGameEvent().add(new IListener1<GameSettings>() {
+			@Override
+			public void handle(GameSettings settings) {
+				createGameControl(settings, true);
+			}
+		});
 		gameOfferControl.startGameOffer();
 	}
 
+	private void createGameControl(GameSettings settings, boolean host) {
+		gameControl = new NetworkGameControl(settings, saveControl, view,
+				connectionControl, host);
+		gameControl.getBackEvent().add(new IListener() {
+			@Override
+			public void handle() {
+				view.setBottomPanel(BottomPanelType.START_GAME_PANEL);
+				createSettingsControl();
+			}
+		});
+
+		gameControl.startGame();
+	}
+
 }