1 files changed, 31 insertions, 22 deletions

diff --git a/src/jrummikub/control/network/NetworkControl.java b/src/jrummikub/control/network/NetworkControl.java
index a9b889f..ce46a0f 100644
--- a/src/jrummikub/control/network/NetworkControl.java
+++ b/src/jrummikub/control/network/NetworkControl.java
@@ -45,11 +45,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
 	 * @param view
-	 *          for events and handlers
+	 *            for events and handlers
 	 */
 	public NetworkControl(final LoginData loginData,
 			IConnectionControl connectionControl, SaveControl saveControl,
@@ -79,6 +81,10 @@ public class NetworkControl {
 				}
 			}
 		}));
+		addViewEventListeners();
+	}
+
+	private void addViewEventListeners() {
 		connections.add(view.getQuitWarningPanel().getCancelEvent()
 				.add(new IListener() {
 					@Override
@@ -126,7 +132,7 @@ 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(
@@ -165,7 +171,6 @@ public class NetworkControl {
 						if (ack) {
 							createGameJoinControl();
 						} else {
-							// TODO Error message
 							view.showGameListPanel(true);
 						}
 					}
@@ -174,14 +179,16 @@ public class NetworkControl {
 
 	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.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>() {
@@ -324,7 +331,8 @@ public class NetworkControl {
 		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() {
@@ -332,14 +340,15 @@ 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) {
+						gameControl = new NetworkGameControl(settings,
+								saveControl, view, connectionControl, true);
+						gameControl.startGame();
+					}
+				});
 		gameOfferControl.startGameOffer();
 	}