Move some code to AbstractSettingsControl for consistency

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

1 files changed, 8 insertions, 15 deletions

diff --git a/src/jrummikub/control/SettingsControl.java b/src/jrummikub/control/SettingsControl.java
index e54fa6d..6576101 100644
--- a/src/jrummikub/control/SettingsControl.java
+++ b/src/jrummikub/control/SettingsControl.java
@@ -1,10 +1,8 @@
 package jrummikub.control;
 
-import java.awt.Color;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.List;
 
 import jrummikub.model.GameSettings;
@@ -22,21 +20,18 @@ import jrummikub.view.IView;
  */
 public class SettingsControl extends AbstractSettingsControl {
 	private Event1<GameSettings> startGameEvent = new Event1<GameSettings>();
-	
+
 	/**
 	 * 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) {
 		super(view, settings);
 		view.getSettingsPanel().setSettingsMode(SettingsMode.DEFAULT);
-		view.getSettingsPanel().setPlayerNamesEditable(
-				Collections.<Boolean> emptyList());
-		view.getSettingsPanel().setPlayerColors(new HashSet<Color>(Arrays.asList(ISettingsPanel.PLAYER_COLORS)));
 
 		addPlayer();
 		addPlayer();
@@ -52,17 +47,16 @@ public class SettingsControl extends AbstractSettingsControl {
 				}));
 	}
 
-
 	/**
-	 * 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
 	 */
 	public IEvent1<GameSettings> getStartGameEvent() {
 		return startGameEvent;
 	}
-	
+
 	@Override
 	protected void addPlayer() {
 		if (settings.getPlayerList().size() >= ISettingsPanel.PLAYER_COLORS.length) {
@@ -102,9 +96,8 @@ public class SettingsControl extends AbstractSettingsControl {
 		view.getSettingsPanel().enableRemovePlayerButtons(
 				Collections.nCopies(settings.getPlayerList().size(),
 						enableRemoveButtons));
-		view.getSettingsPanel()
-				.enableAddPlayerButton(
-						settings.getPlayerList().size() < ISettingsPanel.PLAYER_COLORS.length);
+		view.getSettingsPanel().enableAddPlayerButton(
+				settings.getPlayerList().size() < ISettingsPanel.PLAYER_COLORS.length);
 
 		checkSettings();