From ce7d43e3654f7f33357c51e578378a7b996bd587 Mon Sep 17 00:00:00 2001
From: Ida Massow <massow@informatik.uni-luebeck.de>
Date: Mon, 13 Jun 2011 16:29:09 +0200
Subject: Viele viele Kommentare, einige zu lange oder zu komplexe Methoden
 gefixt

git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@417 72836036-5685-4462-b002-a69064685172
---
 src/jrummikub/control/SettingsControl.java | 44 ++++++++++++++++++++----------
 1 file changed, 30 insertions(+), 14 deletions(-)

(limited to 'src/jrummikub/control/SettingsControl.java')

diff --git a/src/jrummikub/control/SettingsControl.java b/src/jrummikub/control/SettingsControl.java
index 4ad30ce..17d37a9 100644
--- a/src/jrummikub/control/SettingsControl.java
+++ b/src/jrummikub/control/SettingsControl.java
@@ -34,9 +34,9 @@ public class SettingsControl {
 	 * Create a new settings control
 	 * 
 	 * @param view
-	 *          the view to use
+	 *            the view to use
 	 * @param settings
-	 *          initial game settings
+	 *            initial game settings
 	 */
 	public SettingsControl(IView view, GameSettings settings) {
 		this.view = view;
@@ -44,8 +44,8 @@ public class SettingsControl {
 	}
 
 	/**
-	 * the start game event is emitted when the user wants to start a game and the
-	 * settings made are valid
+	 * the start game event is emitted when the user wants to start a game and
+	 * the settings made are valid
 	 * 
 	 * @return the event
 	 */
@@ -78,7 +78,8 @@ public class SettingsControl {
 
 	private void addOptionListeners1() {
 		connections.add(view.getSettingsPanel()
-				.getChangeInitialMeldThresholdEvent().add(new IListener1<Integer>() {
+				.getChangeInitialMeldThresholdEvent()
+				.add(new IListener1<Integer>() {
 					@Override
 					public void handle(Integer value) {
 						settings.setInitialMeldThreshold(value);
@@ -103,7 +104,8 @@ public class SettingsControl {
 						update();
 					}
 				}));
-		connections.add(view.getSettingsPanel().getChangeNumberOfStonesDealtEvent()
+		connections.add(view.getSettingsPanel()
+				.getChangeNumberOfStonesDealtEvent()
 				.add(new IListener1<Integer>() {
 					@Override
 					public void handle(Integer value) {
@@ -126,7 +128,7 @@ public class SettingsControl {
 				.add(new IListener1<Integer>() {
 					@Override
 					public void handle(Integer value) {
-						settings.setTime(value);
+						settings.setTotalTime(value);
 						update();
 					}
 				}));
@@ -147,6 +149,13 @@ public class SettingsControl {
 						update();
 					}
 				}));
+		addVariantListeners();
+	}
+
+	/**
+	 * Add event listeners for variants, e.g. standard or children
+	 */
+	public void addVariantListeners() {
 		connections.add(view.getSettingsPanel().getSetVariantDefaultEvent()
 				.add(new IListener() {
 					@Override
@@ -162,7 +171,7 @@ public class SettingsControl {
 						settings.reset();
 						settings.setHighestValue(10);
 						settings.setJokerNumber(6);
-						settings.setTime(120);
+						settings.setTotalTime(120);
 						settings.setInitialMeldThreshold(20);
 						update();
 					}
@@ -239,7 +248,8 @@ public class SettingsControl {
 			break;
 		}
 
-		settings.getPlayerList().add(new PlayerSettings("Spieler " + num, color));
+		settings.getPlayerList().add(
+				new PlayerSettings("Spieler " + num, color));
 
 		update();
 	}
@@ -280,8 +290,9 @@ public class SettingsControl {
 	protected void update() {
 		view.getSettingsPanel().enableRemovePlayerButtons(
 				settings.getPlayerList().size() > 2);
-		view.getSettingsPanel().enableAddPlayerButton(
-				settings.getPlayerList().size() < ISettingsPanel.PLAYER_COLORS.length);
+		view.getSettingsPanel()
+				.enableAddPlayerButton(
+						settings.getPlayerList().size() < ISettingsPanel.PLAYER_COLORS.length);
 
 		checkSettings();
 
@@ -302,8 +313,9 @@ public class SettingsControl {
 
 			for (int j = i + 1; j < settings.getPlayerList().size(); ++j) {
 				if (settings.getPlayerList().get(j).getName().equals(name)) {
-					view.getSettingsPanel().setError(
-							ISettingsPanel.SettingsError.DUPLICATE_PLAYER_NAME_ERROR);
+					view.getSettingsPanel()
+							.setError(
+									ISettingsPanel.SettingsError.DUPLICATE_PLAYER_NAME_ERROR);
 					view.getSettingsPanel().enableStartGameButton(false);
 					return false;
 				}
@@ -312,7 +324,8 @@ public class SettingsControl {
 
 		int totalStonesDealt = settings.getNumberOfStonesDealt()
 				* settings.getPlayerList().size();
-		int totalStones = settings.getHighestValue() * settings.getStoneSetNumber()
+		int totalStones = settings.getHighestValue()
+				* settings.getStoneSetNumber()
 				* settings.getStoneColors().size() + settings.getJokerNumber();
 
 		if (totalStones <= totalStonesDealt) {
@@ -368,6 +381,9 @@ public class SettingsControl {
 		startGameEvent.emit(settings);
 	}
 
+	/**
+	 * Abort settings control once settings are set
+	 */
 	public void abort() {
 		view.showSettingsPanel(false);
 		for (Connection c : connections) {
-- 
cgit v1.2.3