Allow setting stone colors to use

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

src/jrummikub/control/SettingsControl.java

@@ -46,8 +46,8 @@ public class SettingsControl {
 	}
 
 	/**
-	 * the start game event is emitted when the user wants to start a game and
+	 * the start game event is emitted when the user wants to start a game and the
-	 * the settings made are valid
+	 * settings made are valid
 	 * 
 	 * @return the event
 	 */
@@ -59,9 +59,25 @@ public class SettingsControl {
 	 * Start the operation of the settings control
 	 */
 	public void startSettings() {
+		addPlayerSettingsListeners();
+
+		addOptionListeners1();
+		addOptionListeners2();
+
+		connections.add(view.getSettingsPanel().getStartGameEvent()
+				.add(new IListener() {
+					@Override
+					public void handle() {
+						startGame();
+					}
+				}));
+
+		view.showSettingsPanel(true);
+	}
+
+	private void addOptionListeners1() {
 		connections.add(view.getSettingsPanel()
-				.getChangeInitialMeldThresholdEvent()
+				.getChangeInitialMeldThresholdEvent().add(new IListener1<Integer>() {
-				.add(new IListener1<Integer>() {
 					@Override
 					public void handle(Integer value) {
 						settings.setInitialMeldThreshold(value);
@@ -94,6 +110,9 @@ public class SettingsControl {
 						update();
 					}
 				}));
+	}
+
+	private void addOptionListeners2() {
 		connections.add(view.getSettingsPanel().getChangeHighestValueEvent()
 				.add(new IListener1<Integer>() {
 					@Override
@@ -110,20 +129,9 @@ public class SettingsControl {
 						update();
 					}
 				}));
-
-		addPlayerSettingsListeners();
-
-		view.showSettingsPanel(true);
 	}
 
 	private void addPlayerSettingsListeners() {
-		connections.add(view.getSettingsPanel().getStartGameEvent()
-				.add(new IListener() {
-					@Override
-					public void handle() {
-						startGame();
-					}
-				}));
 		connections.add(view.getSettingsPanel().getAddPlayerEvent()
 				.add(new IListener() {
 					@Override
@@ -193,8 +201,7 @@ public class SettingsControl {
 			break;
 		}
 
-		settings.getPlayerList().add(
+		settings.getPlayerList().add(new PlayerSettings("Spieler " + num, color));
-				new PlayerSettings("Spieler " + num, color));
 
 		update();
 	}
@@ -235,8 +242,7 @@ public class SettingsControl {
 	private void update() {
 		view.getSettingsPanel().enableRemovePlayerButtons(
 				settings.getPlayerList().size() > 2);
-		view.getSettingsPanel()
+		view.getSettingsPanel().enableAddPlayerButton(
-				.enableAddPlayerButton(
 				settings.getPlayerList().size() < ISettingsPanel.PLAYER_COLORS.length);
 
 		checkSettings();
@@ -258,8 +264,7 @@ public class SettingsControl {
 
 			for (int j = i + 1; j < settings.getPlayerList().size(); ++j) {
 				if (settings.getPlayerList().get(j).getName().equals(name)) {
-					view.getSettingsPanel()
+					view.getSettingsPanel().setError(
-							.setError(
 							ISettingsPanel.SettingsError.DUPLICATE_PLAYER_NAME_ERROR);
 					view.getSettingsPanel().enableStartGameButton(false);
 					return false;
@@ -269,8 +274,7 @@ public class SettingsControl {
 
 		int totalStonesDealt = settings.getNumberOfStonesDealt()
 				* settings.getPlayerList().size();
-		int totalStones = settings.getHighestValue()
+		int totalStones = settings.getHighestValue() * settings.getStoneSetNumber()
-				* settings.getStoneSetNumber()
 				* settings.getStoneColors().size() + settings.getJokerNumber();
 
 		if (totalStones <= totalStonesDealt) {
@@ -280,13 +284,26 @@ public class SettingsControl {
 			return false;
 		}
 
+		if (settings.getStoneColors().size() < 3) {
+			view.getSettingsPanel().setError(
+					ISettingsPanel.SettingsError.NOT_ENOUGH_COLORS_ERROR);
+			view.getSettingsPanel().enableStartGameButton(false);
+			return false;
+		}
+
 		view.getSettingsPanel().setError(ISettingsPanel.SettingsError.NO_ERROR);
 		view.getSettingsPanel().enableStartGameButton(true);
 
+		checkWarnings();
+
+		return true;
+	}
+
+	private void checkWarnings() {
 		if (settings.getInitialMeldThreshold() >= 100) {
 			view.getSettingsPanel().setError(
 					ISettingsPanel.SettingsError.TOO_HIGH_THRESHOLD_WARNING);
-			return true;
+			return;
 		}
 
 		boolean humanPlayerFound = false;
@@ -300,10 +317,8 @@ public class SettingsControl {
 		if (!humanPlayerFound) {
 			view.getSettingsPanel().setError(
 					ISettingsPanel.SettingsError.COMPUTER_PLAYERS_ONLY_WARNING);
-			return true;
+			return;
 		}
-
-		return true;
 	}
 
 	private void startGame() {

src/jrummikub/model/StoneColor.java

@@ -15,7 +15,7 @@ public enum StoneColor {
 	/** */
 	VIOLET,
 	/** */
-	BROWN,
+	AQUA,
 	/** */
-	WHITE
+	GRAY
 }

src/jrummikub/view/ISettingsPanel.java

@@ -158,6 +158,8 @@ public interface ISettingsPanel {
 		NO_PLAYER_NAME_ERROR,
 		/** More Stones than present would be dealed */
 		NOT_ENOUGH_STONES_ERROR,
+		/** Less than 3 colors are selected */
+		NOT_ENOUGH_COLORS_ERROR,
 
 		// warnings
 		/** threshold higher 100 */

src/jrummikub/view/impl/SettingsPanel.java

@@ -16,7 +16,10 @@ import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 import javax.swing.Box;
@@ -32,6 +35,7 @@ import javax.swing.JScrollPane;
 import javax.swing.JSpinner;
 import javax.swing.JTabbedPane;
 import javax.swing.JTextField;
+import javax.swing.JToggleButton;
 import javax.swing.SpinnerNumberModel;
 import javax.swing.border.CompoundBorder;
 import javax.swing.border.EmptyBorder;
@@ -72,6 +76,9 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
 	private JSpinner numberOfStonesDealtSpinner;
 	private JSpinner jokerNumberSpinner;
 
+	private JPanel colorSelectionPanel;
+	private Map<StoneColor, JToggleButton> colorButtons = new HashMap<StoneColor, JToggleButton>();
+
 	private Event startGameEvent = new Event();
 	private Event addPlayerEvent = new Event();
 	private Event1<Integer> removePlayerEvent = new Event1<Integer>();
@@ -155,6 +162,11 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
 						.setText("Es gibt nicht genug Steine f\u00fcr die gew\u00e4hlte Spieleranzahl.");
 				errorMessageLabel.setForeground(Color.RED);
 				break;
+			case NOT_ENOUGH_COLORS_ERROR:
+				errorMessageLabel
+						.setText("Es m\u00fcssen mindestens drei Farben ausgew\u00e4hlt werden.");
+				errorMessageLabel.setForeground(Color.RED);
+				break;
 			case COMPUTER_PLAYERS_ONLY_WARNING:
 				errorMessageLabel.setText("Es gibt keinen menschlichen Spieler.");
 				errorMessageLabel.setForeground(Color.ORANGE.darker());
@@ -188,8 +200,7 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
 
 	@Override
 	public void setGameSettings(GameSettings gameSettings) {
-		while (playerSettingsPanels.size() > gameSettings.getPlayerList()
+		while (playerSettingsPanels.size() > gameSettings.getPlayerList().size()) {
-				.size()) {
 			removePlayerSettingsPanel();
 		}
 
@@ -197,13 +208,18 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
 			updatePlayerSettingsPanel(i, gameSettings.getPlayerList().get(i));
 		}
 
-		initialMeldThresholdSpinner.setValue(gameSettings
+		initialMeldThresholdSpinner
-				.getInitialMeldThreshold());
+				.setValue(gameSettings.getInitialMeldThreshold());
 		stoneSetNumberSpinner.setValue(gameSettings.getStoneSetNumber());
 		highestValueSpinner.setValue(gameSettings.getHighestValue());
 		numberOfStonesDealtSpinner.setValue(gameSettings.getNumberOfStonesDealt());
 		jokerNumberSpinner.setValue(gameSettings.getJokerNumber());
 
+		for (StoneColor color : StoneColor.values()) {
+			colorButtons.get(color).getModel()
+					.setSelected(gameSettings.getStoneColors().contains(color));
+		}
+
 		playerSettingsViewport.revalidate();
 	}
 
@@ -223,8 +239,8 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
 	}
 
 	private void removePlayerSettingsPanel() {
-		PlayerSettingsPanel p = playerSettingsPanels
+		PlayerSettingsPanel p = playerSettingsPanels.remove(playerSettingsPanels
-				.remove(playerSettingsPanels.size() - 1);
+				.size() - 1);
 		playerSettingsViewport.remove(p);
 	}
 
@@ -246,8 +262,7 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
 		playerSettingsViewport.add(addPlayerPanel);
 
 		addPlayerButton = new JButton("+");
-		addPlayerButton
+		addPlayerButton.setFont(addPlayerButton.getFont().deriveFont(Font.BOLD));
-				.setFont(addPlayerButton.getFont().deriveFont(Font.BOLD));
 		addPlayerButton.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
@@ -284,18 +299,62 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
 				changeNumberOfStonesDealtEvent);
 
 		makeOptionLabel(4, "Jokeranzahl:");
-		jokerNumberSpinner = makeOptionSpinner(4, 1, 999, 1,
+		jokerNumberSpinner = makeOptionSpinner(4, 1, 999, 1, changeJokerNumberEvent);
-				changeJokerNumberEvent);
+
+		makeOptionLabel(5, "Steinfarben:");
+		createColorSelectionPanel(5);
 
 		GridBagConstraints c = new GridBagConstraints();
 		c.gridx = 1;
-		c.gridy = 5;
+		c.gridy = 6;
 		c.fill = GridBagConstraints.BOTH;
 		c.weightx = 1;
 		c.weighty = 1;
 		optionsPanel.add(makeFiller(), c);
 	}
 
+	private void createColorSelectionPanel(int row) {
+		GridBagConstraints c = new GridBagConstraints();
+		c.anchor = GridBagConstraints.WEST;
+		c.gridx = 1;
+		c.gridy = row;
+
+		colorSelectionPanel = new JPanel();
+		optionsPanel.add(colorSelectionPanel, c);
+
+		for (StoneColor color : StoneColor.values()) {
+			createColorButton(color);
+		}
+	}
+
+	private void createColorButton(final StoneColor color) {
+		JToggleButton button = new JToggleButton(ImageUtil.createColorIcon(
+				StonePainter.getColor(color), 12, 1));
+		button.addChangeListener(new ChangeListener() {
+
+			@Override
+			public void stateChanged(ChangeEvent e) {
+				emitColorChangeEvent();
+			}
+		});
+
+		colorSelectionPanel.add(button);
+
+		colorButtons.put(color, button);
+	}
+
+	private void emitColorChangeEvent() {
+		Set<StoneColor> colors = new HashSet<StoneColor>();
+
+		for (StoneColor color : StoneColor.values()) {
+			if (colorButtons.get(color).getModel().isSelected()) {
+				colors.add(color);
+			}
+		}
+
+		changeStoneColorsEvent.emit(colors);
+	}
+
 	private JSpinner makeOptionSpinner(int row, int min, int max, int step,
 			final Event1<Integer> targetEvent) {
 		GridBagConstraints c = new GridBagConstraints();
@@ -305,8 +364,8 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
 		c.insets = new Insets(2, 2, 2, 2);
 		final JSpinner spinner = new JSpinner();
 		spinner.setModel(new SpinnerNumberModel(min, min, max, step));
-		spinner.setPreferredSize(new Dimension(60,
+		spinner
-				spinner.getMinimumSize().height));
+				.setPreferredSize(new Dimension(60, spinner.getMinimumSize().height));
 		spinner.addChangeListener(new ChangeListener() {
 			@Override
 			public void stateChanged(ChangeEvent e) {
@@ -359,8 +418,8 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
 		});
 		add(startButton, c);
 
-		setBorder(new CompoundBorder(new LineBorder(Color.BLACK),
+		setBorder(new CompoundBorder(new LineBorder(Color.BLACK), new EmptyBorder(
-				new EmptyBorder(10, 10, 10, 10)));
+				10, 10, 10, 10)));
 	}
 
 	private class PlayerSettingsPanel extends JPanel {
@@ -380,8 +439,8 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
 			if (index != playerType.getSelectedIndex()) {
 				playerType.setSelectedIndex(index);
 			}
-			colorButton.setIcon(ImageUtil.createColorIcon(settings.getColor(),
+			colorButton
-					16, 2));
+					.setIcon(ImageUtil.createColorIcon(settings.getColor(), 16, 2));
 		}
 
 		public void enableRemoveButton(boolean enable) {
@@ -429,8 +488,7 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
 			c.gridy = 0;
 			add(colorButton, c);
 
-			nameField.getDocument().addDocumentListener(
+			nameField.getDocument().addDocumentListener(new NameChangeListener());
-					new NameChangeListener());
 			c2.gridy = 0;
 			c2.weightx = 1;
 			c2.fill = GridBagConstraints.HORIZONTAL;
@@ -463,9 +521,8 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
 		public Dimension getPreferredSize() {
 			Dimension preferredSize = super.getPreferredSize();
 			for (Component component : this.getComponents()) {
-				preferredSize.setSize(
+				preferredSize
-						preferredSize.width,
+						.setSize(preferredSize.width, Math.max(preferredSize.height,
-						Math.max(preferredSize.height,
 								component.getPreferredSize().height));
 			}
 			return preferredSize;
@@ -475,9 +532,8 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
 		public Dimension getMaximumSize() {
 			Dimension preferredSize = super.getPreferredSize();
 			for (Component component : this.getComponents()) {
-				preferredSize.setSize(
+				preferredSize
-						Integer.MAX_VALUE,
+						.setSize(Integer.MAX_VALUE, Math.max(preferredSize.height,
-						Math.max(preferredSize.height,
 								component.getPreferredSize().height));
 			}
 			return preferredSize;
@@ -492,8 +548,8 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
 		}
 
 		private void changeType() {
-			changePlayerTypeEvent.emit(playerNumber, TurnControlFactory.Type
+			changePlayerTypeEvent.emit(playerNumber,
-					.values()[playerType.getSelectedIndex()]);
+					TurnControlFactory.Type.values()[playerType.getSelectedIndex()]);
 		}
 
 		private void remove() {

src/jrummikub/view/impl/StonePainter.java

@@ -71,24 +71,24 @@ class StonePainter {
 		return new Color(r > 255 ? 255 : r, g > 255 ? 255 : g, b > 255 ? 255 : b);
 	}
 
-	private static Color getColor(StoneColor color) {
+	public static Color getColor(StoneColor color) {
 		switch (color) {
 			case BLACK:
-				return new Color(0.15f, 0.15f, 0.15f);
+				return new Color(0.0f, 0.0f, 0.0f);
 			case BLUE:
 				return new Color(0.0f, 0.0f, 1.0f);
 			case ORANGE:
 				return new Color(1.0f, 0.4f, 0.0f);
 			case RED:
 				return new Color(0.9f, 0.0f, 0.25f);
-			case BROWN:
+			case AQUA:
-				return new Color(0.5f, 0.25f, 0.0f);
+				return new Color(0.0f, 0.85f, 0.75f);
 			case GREEN:
-				return new Color(0.0f, 0.75f, 0.0f);
+				return new Color(0.0f, 0.65f, 0.0f);
 			case VIOLET:
 				return new Color(0.75f, 0.325f, 0.75f);
-			case WHITE:
+			case GRAY:
-				return new Color(1.0f, 1.0f, 1.0f);
+				return new Color(0.5f, 0.5f, 0.5f);
 		}
 
 		return null;

test/jrummikub/model/StoneSetTest.java

@@ -113,7 +113,7 @@ public class StoneSetTest {
 				new Stone(1, BLACK), new Stone(1, BLUE), new Stone(1, ORANGE)),
 				defaultSettings);
 		assertSet(GROUP, 6, Arrays.asList(new Stone(1, RED),
-				new Stone(1, GREEN), new Stone(1, WHITE), new Stone(1, BLACK),
+				new Stone(1, GREEN), new Stone(1, GRAY), new Stone(1, BLACK),
 				new Stone(1, BLUE), new Stone(1, ORANGE)), moreColorSettings);
 	}
 
@@ -164,7 +164,7 @@ public class StoneSetTest {
 		// More than 4 stones
 		assertSet(INVALID, 0, Arrays.asList(new Stone(1, RED), new Stone(1,
 				BLUE), new Stone(1, GREEN), new Stone(1, BLACK), new Stone(1,
-				VIOLET), new Stone(1, ORANGE), new Stone(1, BROWN), new Stone(
+				VIOLET), new Stone(1, ORANGE), new Stone(1, AQUA), new Stone(
 				BLACK), new Stone(RED)), moreColorSettings);
 	}
 
@@ -191,8 +191,8 @@ public class StoneSetTest {
 				new Stone(RED)), defaultSettings);
 		assertSet(INVALID, 0, Arrays.asList(new Stone(1, RED), new Stone(1,
 				BLUE), new Stone(1, GREEN), new Stone(1, BLACK), new Stone(1,
-				VIOLET), new Stone(1, WHITE), new Stone(1, ORANGE), new Stone(
+				VIOLET), new Stone(1, GRAY), new Stone(1, ORANGE), new Stone(
-				1, BROWN), new Stone(RED)), moreColorSettings);
+				1, AQUA), new Stone(RED)), moreColorSettings);
 	}
 
 	/** */