Fix many comments, fix tests, fix complexity

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

1 files changed, 31 insertions, 27 deletions

diff --git a/src/jrummikub/control/network/NetworkControl.java b/src/jrummikub/control/network/NetworkControl.java
index 95f48a4..a8faac5 100644
--- a/src/jrummikub/control/network/NetworkControl.java
+++ b/src/jrummikub/control/network/NetworkControl.java
@@ -44,26 +44,27 @@ public class NetworkControl {
 		this.view = view;
 		connectionControl = new ConnectionControl(loginData);
 
+		addConnectionSetupListeners(loginData, view);
 		addConnectionControlListeners(loginData, view);
 
-		connections.add(view.getGameListPanel().getJoinEvent()
-				.add(new IListener1<GameData>() {
+		connections.add(view.getGameListPanel().getJoinEvent().add(
+				new IListener1<GameData>() {
 					@Override
 					public void handle(GameData gameData) {
 						join(gameData);
 					}
 				}));
 
-		connections.add(view.getGameListPanel().getOpenNewGameEvent()
-				.add(new IListener() {
+		connections.add(view.getGameListPanel().getOpenNewGameEvent().add(
+				new IListener() {
 					@Override
 					public void handle() {
 						createSettingsControl();
 					}
 				}));
 
-		connections.add(view.getGameListPanel().getCancelEvent()
-				.add(new IListener() {
+		connections.add(view.getGameListPanel().getCancelEvent().add(
+				new IListener() {
 					@Override
 					public void handle() {
 						abort();
@@ -87,25 +88,6 @@ public class NetworkControl {
 	 */
 	public void addConnectionControlListeners(final LoginData loginData,
 			final IView view) {
-		connections.add(connectionControl.getConnectedEvent().add(
-				new IListener() {
-					@Override
-					public void handle() {
-						view.getGameListPanel().setChannelName(
-								loginData.getChannelName());
-						view.showGameListPanel(true);
-					}
-				}));
-
-		connections.add(connectionControl.getConnectionFailedEvent().add(
-				new IListener() {
-					@Override
-					public void handle() {
-						// TODO Auto-generated method stub
-
-					}
-				}));
-
 		connections.add(connectionControl.getGameOfferEvent().add(
 				new IListener1<GameData>() {
 					@Override
@@ -149,6 +131,28 @@ 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.showGameListPanel(true);
+					}
+				}));
+
+		connections.add(connectionControl.getConnectionFailedEvent().add(
+				new IListener() {
+					@Override
+					public void handle() {
+						// TODO Auto-generated method stub
+
+					}
+				}));
+	}
+
 	private void updateGameList() {
 		List<GameData> gameList = new ArrayList<GameData>();
 
@@ -220,8 +224,8 @@ public class NetworkControl {
 		}
 		view.showGameListPanel(false);
 
-		settingsControl = new NetworkSettingsControl(
-				connectionControl.getNickname(), view, new GameSettings());
+		settingsControl = new NetworkSettingsControl(connectionControl
+				.getNickname(), view, new GameSettings());
 		settingsControl.getOfferGameEvent().add(new IListener1<GameSettings>() {
 			@Override
 			public void handle(GameSettings settings) {