Fixed some comment and metrics warnings

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

1 files changed, 56 insertions, 46 deletions

diff --git a/src/jrummikub/control/ApplicationControl.java b/src/jrummikub/control/ApplicationControl.java
index 58d1690..7f5cf6d 100644
--- a/src/jrummikub/control/ApplicationControl.java
+++ b/src/jrummikub/control/ApplicationControl.java
@@ -38,22 +38,41 @@ public class ApplicationControl {
 		this.view = view;
 		saveControl = new SaveControl(view);
 
+		addQuitGameHandlers();
+
+		view.getNetworkGameEvent().add(new IListener() {
+			@Override
+			public void handle() {
+				abortControls();
+
+				createLoginControl(true);
+			}
+		});
+
+		saveControl.getLoadEvent().add(
+				new IListener3<GameSettings, GameState, IRoundState>() {
+					@Override
+					public void handle(GameSettings settings, GameState gameState,
+							IRoundState roundState) {
+						abortControls();
+						gameControl = new GameControl(settings, saveControl, view);
+						addGameControlListeners(gameControl);
+						gameControl.continueGame(gameState, roundState);
+					}
+				});
+		saveControl.getLoadErrorEvent().add(new IListener() {
+			@Override
+			public void handle() {
+				view.showLoadingError();
+			}
+		});
+	}
+
+	private void addQuitGameHandlers() {
 		view.getMenuNewGameEvent().add(new IListener() {
 			@Override
 			public void handle() {
-				view.getQuitWarningPanel().setMode(QuitMode.QUIT_GAME);
-				view.showQuitWarningPanel(true);
-				tempConnection = view.getQuitWarningPanel().getQuitEvent()
-						.add(new IListener() {
-							@Override
-							public void handle() {
-								abortControls();
-								startApplication();
-								view.showQuitWarningPanel(false);
-								tempConnection.remove();
-								tempConnection = null;
-							}
-						});
+				showRestartWarning();
 			}
 		});
 		view.getQuitEvent().add(new IListener() {
@@ -62,23 +81,13 @@ public class ApplicationControl {
 				if (networkControl != null) {
 					return;
 				}
-
 				if (gameControl == null) {
 					System.exit(0);
 				} else {
-					view.getQuitWarningPanel().setMode(QuitMode.QUIT_PROCESS);
-					view.showQuitWarningPanel(true);
-					tempConnection = view.getQuitWarningPanel().getQuitEvent()
-							.add(new IListener() {
-								@Override
-								public void handle() {
-									System.exit(0);
-								}
-							});
+					showQuitWarning();
 				}
 			}
 		});
-
 		view.getQuitWarningPanel().getCancelEvent().add(new IListener() {
 			@Override
 			public void handle() {
@@ -89,33 +98,34 @@ public class ApplicationControl {
 				}
 			}
 		});
+	}
 
-		view.getNetworkGameEvent().add(new IListener() {
-			@Override
-			public void handle() {
-				abortControls();
-
-				createLoginControl(true);
-			}
-		});
-
-		saveControl.getLoadEvent().add(
-				new IListener3<GameSettings, GameState, IRoundState>() {
+	private void showRestartWarning() {
+		view.getQuitWarningPanel().setMode(QuitMode.QUIT_GAME);
+		view.showQuitWarningPanel(true);
+		tempConnection = view.getQuitWarningPanel().getQuitEvent()
+				.add(new IListener() {
 					@Override
-					public void handle(GameSettings settings, GameState gameState,
-							IRoundState roundState) {
+					public void handle() {
 						abortControls();
-						gameControl = new GameControl(settings, saveControl, view);
-						addGameControlListeners(gameControl);
-						gameControl.continueGame(gameState, roundState);
+						startApplication();
+						view.showQuitWarningPanel(false);
+						tempConnection.remove();
+						tempConnection = null;
+					}
+				});
+	}
+
+	private void showQuitWarning() {
+		view.getQuitWarningPanel().setMode(QuitMode.QUIT_PROCESS);
+		view.showQuitWarningPanel(true);
+		tempConnection = view.getQuitWarningPanel().getQuitEvent()
+				.add(new IListener() {
+					@Override
+					public void handle() {
+						System.exit(0);
 					}
 				});
-		saveControl.getLoadErrorEvent().add(new IListener() {
-			@Override
-			public void handle() {
-				view.showLoadingError();
-			}
-		});
 	}
 
 	/**