neocturne/JRummikub
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Player Type in player settings verschoben

Browse source 
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@420 72836036-5685-4462-b002-a69064685172
This commit is contained in:
Ida Massow 2011-06-13 18:22:55 +02:00
parent a4faa8db23
commit 70d6ae6d74
9 changed files with 132 additions and 115 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
mock/jrummikub/view/MockSettingsPanel.java
View file

@ -4,9 +4,8 @@ import java.awt.Color;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import jrummikub.control.turn.TurnControlFactory;
import jrummikub.control.turn.TurnControlFactory.Type;
import jrummikub.model.GameSettings; import jrummikub.model.GameSettings;
import jrummikub.model.PlayerSettings.Type;
import jrummikub.model.StoneColor; import jrummikub.model.StoneColor;
import jrummikub.util.IEvent; import jrummikub.util.IEvent;
import jrummikub.util.IEvent1; import jrummikub.util.IEvent1;
@ -27,7 +26,7 @@ public class MockSettingsPanel implements ISettingsPanel {
/** */ /** */
public MockEvent2<Integer, String> changePlayerNameEvent = new MockEvent2<Integer, String>(); public MockEvent2<Integer, String> changePlayerNameEvent = new MockEvent2<Integer, String>();
/** */ /** */
public MockEvent2<Integer, TurnControlFactory.Type> changePlayerTypeEvent = new MockEvent2<Integer, TurnControlFactory.Type>(); public MockEvent2<Integer, Type> changePlayerTypeEvent = new MockEvent2<Integer, Type>();
/** */ /** */
public MockEvent startGameEvent = new MockEvent(); public MockEvent startGameEvent = new MockEvent();
/** */ /** */

2
src/jrummikub/control/RoundControl.java
View file

@ -1,6 +1,6 @@
package jrummikub.control; package jrummikub.control;
import static jrummikub.control.turn.TurnControlFactory.Type.*; import static jrummikub.model.PlayerSettings.Type.*;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashSet; import java.util.HashSet;

39
src/jrummikub/control/SettingsControl.java
View file

@ -6,10 +6,9 @@ import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import jrummikub.control.turn.TurnControlFactory;
import jrummikub.control.turn.TurnControlFactory.Type;
import jrummikub.model.GameSettings; import jrummikub.model.GameSettings;
import jrummikub.model.PlayerSettings; import jrummikub.model.PlayerSettings;
import jrummikub.model.PlayerSettings.Type;
import jrummikub.model.StoneColor; import jrummikub.model.StoneColor;
import jrummikub.util.Connection; import jrummikub.util.Connection;
import jrummikub.util.Event1; import jrummikub.util.Event1;
@ -34,9 +33,9 @@ public class SettingsControl {
* Create a new settings control * Create a new settings control
* *
* @param view * @param view
* the view to use * the view to use
* @param settings * @param settings
* initial game settings * initial game settings
*/ */
public SettingsControl(IView view, GameSettings settings) { public SettingsControl(IView view, GameSettings settings) {
this.view = view; this.view = view;
@ -44,8 +43,8 @@ public class SettingsControl {
} }
/** /**
* the start game event is emitted when the user wants to start a game and the * the start game event is emitted when the user wants to start a game and
* settings made are valid * the settings made are valid
* *
* @return the event * @return the event
*/ */
@ -78,7 +77,8 @@ public class SettingsControl {
private void addOptionListeners1() { private void addOptionListeners1() {
connections.add(view.getSettingsPanel() connections.add(view.getSettingsPanel()
.getChangeInitialMeldThresholdEvent().add(new IListener1<Integer>() { .getChangeInitialMeldThresholdEvent()
.add(new IListener1<Integer>() {
@Override @Override
public void handle(Integer value) { public void handle(Integer value) {
settings.setInitialMeldThreshold(value); settings.setInitialMeldThreshold(value);
@ -103,7 +103,8 @@ public class SettingsControl {
update(); update();
} }
})); }));
connections.add(view.getSettingsPanel().getChangeNumberOfStonesDealtEvent() connections.add(view.getSettingsPanel()
.getChangeNumberOfStonesDealtEvent()
.add(new IListener1<Integer>() { .add(new IListener1<Integer>() {
@Override @Override
public void handle(Integer value) { public void handle(Integer value) {
@ -206,9 +207,9 @@ public class SettingsControl {
} }
})); }));
connections.add(view.getSettingsPanel().getChangePlayerTypeEvent() connections.add(view.getSettingsPanel().getChangePlayerTypeEvent()
.add(new IListener2<Integer, TurnControlFactory.Type>() { .add(new IListener2<Integer, Type>() {
@Override @Override
public void handle(Integer i, TurnControlFactory.Type type) { public void handle(Integer i, Type type) {
setPlayerType(i, type); setPlayerType(i, type);
} }
})); }));
@ -246,7 +247,8 @@ public class SettingsControl {
break; break;
} }
settings.getPlayerList().add(new PlayerSettings("Spieler " + num, color)); settings.getPlayerList().add(
new PlayerSettings("Spieler " + num, color));
update(); update();
} }
@ -287,8 +289,9 @@ public class SettingsControl {
protected void update() { protected void update() {
view.getSettingsPanel().enableRemovePlayerButtons( view.getSettingsPanel().enableRemovePlayerButtons(
settings.getPlayerList().size() > 2); settings.getPlayerList().size() > 2);
view.getSettingsPanel().enableAddPlayerButton( view.getSettingsPanel()
settings.getPlayerList().size() < ISettingsPanel.PLAYER_COLORS.length); .enableAddPlayerButton(
settings.getPlayerList().size() < ISettingsPanel.PLAYER_COLORS.length);
checkSettings(); checkSettings();
@ -322,8 +325,9 @@ public class SettingsControl {
for (int j = i + 1; j < settings.getPlayerList().size(); ++j) { for (int j = i + 1; j < settings.getPlayerList().size(); ++j) {
if (settings.getPlayerList().get(j).getName().equals(name)) { if (settings.getPlayerList().get(j).getName().equals(name)) {
view.getSettingsPanel().setError( view.getSettingsPanel()
ISettingsPanel.SettingsError.DUPLICATE_PLAYER_NAME_ERROR); .setError(
ISettingsPanel.SettingsError.DUPLICATE_PLAYER_NAME_ERROR);
view.getSettingsPanel().enableStartGameButton(false); view.getSettingsPanel().enableStartGameButton(false);
return false; return false;
} }
@ -332,7 +336,8 @@ public class SettingsControl {
int totalStonesDealt = settings.getNumberOfStonesDealt() int totalStonesDealt = settings.getNumberOfStonesDealt()
* settings.getPlayerList().size(); * settings.getPlayerList().size();
int totalStones = settings.getHighestValue() * settings.getStoneSetNumber() int totalStones = settings.getHighestValue()
* settings.getStoneSetNumber()
* settings.getStoneColors().size() + settings.getJokerNumber(); * settings.getStoneColors().size() + settings.getJokerNumber();
if (totalStones <= totalStonesDealt) { if (totalStones <= totalStonesDealt) {
@ -361,7 +366,7 @@ public class SettingsControl {
boolean humanPlayerFound = false; boolean humanPlayerFound = false;
for (PlayerSettings player : settings.getPlayerList()) { for (PlayerSettings player : settings.getPlayerList()) {
if (player.getTurnControlType() == TurnControlFactory.Type.HUMAN) { if (player.getTurnControlType() == Type.HUMAN) {
humanPlayerFound = true; humanPlayerFound = true;
break; break;
} }

14
src/jrummikub/control/turn/TurnControlFactory.java
View file

@ -1,21 +1,13 @@
package jrummikub.control.turn; package jrummikub.control.turn;
import jrummikub.model.PlayerSettings;
/** /**
* Creates a turn control for the active player, regarding if layer is human or * Creates a turn control for the active player, regarding if layer is human or
* computer * computer
* *
*/ */
public abstract class TurnControlFactory { public abstract class TurnControlFactory {
/**
* Type of turn control.
*/
public enum Type {
/** */
HUMAN,
/** */
COMPUTER
};
/** /**
* Creates a new turn control instance * Creates a new turn control instance
* *
@ -30,7 +22,7 @@ public abstract class TurnControlFactory {
* Human or Computer * Human or Computer
* @return TurnControlFactory for the player kind * @return TurnControlFactory for the player kind
*/ */
static public TurnControlFactory getFactory(Type type) { static public TurnControlFactory getFactory(PlayerSettings.Type type) {
switch (type) { switch (type) {
case HUMAN: case HUMAN:
return HumanTurnControl.getFactory(); return HumanTurnControl.getFactory();

28
src/jrummikub/model/PlayerSettings.java
View file

@ -9,24 +9,34 @@ import jrummikub.control.turn.TurnControlFactory;
* The settings of a player * The settings of a player
*/ */
public class PlayerSettings implements Serializable { public class PlayerSettings implements Serializable {
/**
* Type of turn control.
*/
public enum Type {
/** */
HUMAN,
/** */
COMPUTER
}
private static final long serialVersionUID = 1963640115089275992L; private static final long serialVersionUID = 1963640115089275992L;
private String name; private String name;
private Color color; private Color color;
private TurnControlFactory.Type turnControlType; private Type turnControlType;
/** /**
* Create a new human player * Create a new human player
* *
* @param name * @param name
* the player's name * the player's name
* @param color * @param color
* the player's color * the player's color
*/ */
public PlayerSettings(String name, Color color) { public PlayerSettings(String name, Color color) {
this.name = name; this.name = name;
this.color = color; this.color = color;
this.turnControlType = TurnControlFactory.Type.HUMAN; this.turnControlType = Type.HUMAN;
} }
/** /**
@ -51,7 +61,7 @@ public class PlayerSettings implements Serializable {
* Sets the player's color * Sets the player's color
* *
* @param color * @param color
* the new color * the new color
*/ */
public void setColor(Color color) { public void setColor(Color color) {
this.color = color; this.color = color;
@ -61,7 +71,7 @@ public class PlayerSettings implements Serializable {
* Sets the player's name * Sets the player's name
* *
* @param name * @param name
* the new name * the new name
*/ */
public void setName(String name) { public void setName(String name) {
this.name = name; this.name = name;
@ -71,9 +81,9 @@ public class PlayerSettings implements Serializable {
* Set the player's TurnControlFactory type * Set the player's TurnControlFactory type
* *
* @param turnControlType * @param turnControlType
* player's TurnControlFactory type * player's TurnControlFactory type
*/ */
public void setTurnControlType(TurnControlFactory.Type turnControlType) { public void setTurnControlType(Type turnControlType) {
this.turnControlType = turnControlType; this.turnControlType = turnControlType;
} }
@ -82,7 +92,7 @@ public class PlayerSettings implements Serializable {
* *
* @return player's TurnControlFactory type * @return player's TurnControlFactory type
*/ */
public TurnControlFactory.Type getTurnControlType() { public Type getTurnControlType() {
return turnControlType; return turnControlType;
} }
} }

4
src/jrummikub/view/ISettingsPanel.java
View file

@ -3,8 +3,8 @@ package jrummikub.view;
import java.awt.Color; import java.awt.Color;
import java.util.Set; import java.util.Set;
import jrummikub.control.turn.TurnControlFactory;
import jrummikub.model.GameSettings; import jrummikub.model.GameSettings;
import jrummikub.model.PlayerSettings.Type;
import jrummikub.model.StoneColor; import jrummikub.model.StoneColor;
import jrummikub.util.IEvent; import jrummikub.util.IEvent;
import jrummikub.util.IEvent1; import jrummikub.util.IEvent1;
@ -73,7 +73,7 @@ public interface ISettingsPanel {
* *
* @return the event * @return the event
*/ */
public IEvent2<Integer, TurnControlFactory.Type> getChangePlayerTypeEvent(); public IEvent2<Integer, Type> getChangePlayerTypeEvent();
/** /**
* The change initial meld threshold event is emitted when the user wants * The change initial meld threshold event is emitted when the user wants

112
src/jrummikub/view/impl/SettingsPanel.java
View file

@ -48,9 +48,9 @@ import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener; import javax.swing.event.DocumentListener;
import jrummikub.control.turn.TurnControlFactory; import jrummikub.control.turn.TurnControlFactory;
import jrummikub.control.turn.TurnControlFactory.Type;
import jrummikub.model.GameSettings; import jrummikub.model.GameSettings;
import jrummikub.model.PlayerSettings; import jrummikub.model.PlayerSettings;
import jrummikub.model.PlayerSettings.Type;
import jrummikub.model.StoneColor; import jrummikub.model.StoneColor;
import jrummikub.util.Event; import jrummikub.util.Event;
import jrummikub.util.Event1; import jrummikub.util.Event1;
@ -93,7 +93,7 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
private Event1<Integer> removePlayerEvent = new Event1<Integer>(); private Event1<Integer> removePlayerEvent = new Event1<Integer>();
private Event2<Integer, Color> changePlayerColorEvent = new Event2<Integer, Color>(); private Event2<Integer, Color> changePlayerColorEvent = new Event2<Integer, Color>();
private Event2<Integer, String> changePlayerNameEvent = new Event2<Integer, String>(); private Event2<Integer, String> changePlayerNameEvent = new Event2<Integer, String>();
private Event2<Integer, TurnControlFactory.Type> changePlayerTypeEvent = new Event2<Integer, TurnControlFactory.Type>(); private Event2<Integer, Type> changePlayerTypeEvent = new Event2<Integer, Type>();
private Event1<Integer> changeInitialMeldThresholdEvent = new Event1<Integer>(); private Event1<Integer> changeInitialMeldThresholdEvent = new Event1<Integer>();
private Event1<Integer> changeJokerNumberEvent = new Event1<Integer>(); private Event1<Integer> changeJokerNumberEvent = new Event1<Integer>();
private Event1<Integer> changeStoneSetNumberEvent = new Event1<Integer>(); private Event1<Integer> changeStoneSetNumberEvent = new Event1<Integer>();
@ -196,37 +196,37 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
@Override @Override
public void setError(SettingsError error) { public void setError(SettingsError error) {
switch (error) { switch (error) {
case NO_ERROR: case NO_ERROR:
errorMessageLabel.setText(" "); errorMessageLabel.setText(" ");
break; break;
case DUPLICATE_PLAYER_NAME_ERROR: case DUPLICATE_PLAYER_NAME_ERROR:
errorMessageLabel errorMessageLabel
.setText("Jeder Spielername darf nur einmal verwendet werden."); .setText("Jeder Spielername darf nur einmal verwendet werden.");
errorMessageLabel.setForeground(Color.RED); errorMessageLabel.setForeground(Color.RED);
break; break;
case NO_PLAYER_NAME_ERROR: case NO_PLAYER_NAME_ERROR:
errorMessageLabel.setText("Jeder Spieler muss einen Namen haben."); errorMessageLabel.setText("Jeder Spieler muss einen Namen haben.");
errorMessageLabel.setForeground(Color.RED); errorMessageLabel.setForeground(Color.RED);
break; break;
case NOT_ENOUGH_STONES_ERROR: case NOT_ENOUGH_STONES_ERROR:
errorMessageLabel errorMessageLabel
.setText("Es gibt nicht genug Steine f\u00fcr die gew\u00e4hlte Spieleranzahl."); .setText("Es gibt nicht genug Steine f\u00fcr die gew\u00e4hlte Spieleranzahl.");
errorMessageLabel.setForeground(Color.RED); errorMessageLabel.setForeground(Color.RED);
break; break;
case NOT_ENOUGH_COLORS_ERROR: case NOT_ENOUGH_COLORS_ERROR:
errorMessageLabel errorMessageLabel
.setText("Es m\u00fcssen mindestens drei Farben ausgew\u00e4hlt werden."); .setText("Es m\u00fcssen mindestens drei Farben ausgew\u00e4hlt werden.");
errorMessageLabel.setForeground(Color.RED); errorMessageLabel.setForeground(Color.RED);
break; break;
case COMPUTER_PLAYERS_ONLY_WARNING: case COMPUTER_PLAYERS_ONLY_WARNING:
errorMessageLabel.setText("Es gibt keinen menschlichen Spieler."); errorMessageLabel.setText("Es gibt keinen menschlichen Spieler.");
errorMessageLabel.setForeground(Color.ORANGE.darker()); errorMessageLabel.setForeground(Color.ORANGE.darker());
break; break;
case TOO_HIGH_THRESHOLD_WARNING: case TOO_HIGH_THRESHOLD_WARNING:
errorMessageLabel errorMessageLabel
.setText("Die gew\u00e4hlte Schranke ist m\u00f6glicherweise zu hoch"); .setText("Die gew\u00e4hlte Schranke ist m\u00f6glicherweise zu hoch");
errorMessageLabel.setForeground(Color.ORANGE.darker()); errorMessageLabel.setForeground(Color.ORANGE.darker());
break; break;
} }
} }
@ -251,7 +251,8 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
@Override @Override
public void setGameSettings(GameSettings gameSettings) { public void setGameSettings(GameSettings gameSettings) {
while (playerSettingsPanels.size() > gameSettings.getPlayerList().size()) { while (playerSettingsPanels.size() > gameSettings.getPlayerList()
.size()) {
removePlayerSettingsPanel(); removePlayerSettingsPanel();
} }
@ -259,11 +260,12 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
updatePlayerSettingsPanel(i, gameSettings.getPlayerList().get(i)); updatePlayerSettingsPanel(i, gameSettings.getPlayerList().get(i));
} }
initialMeldThresholdSpinner initialMeldThresholdSpinner.setValue(gameSettings
.setValue(gameSettings.getInitialMeldThreshold()); .getInitialMeldThreshold());
stoneSetNumberSpinner.setValue(gameSettings.getStoneSetNumber()); stoneSetNumberSpinner.setValue(gameSettings.getStoneSetNumber());
highestValueSpinner.setValue(gameSettings.getHighestValue()); highestValueSpinner.setValue(gameSettings.getHighestValue());
numberOfStonesDealtSpinner.setValue(gameSettings.getNumberOfStonesDealt()); numberOfStonesDealtSpinner.setValue(gameSettings
.getNumberOfStonesDealt());
jokerNumberSpinner.setValue(gameSettings.getJokerNumber()); jokerNumberSpinner.setValue(gameSettings.getJokerNumber());
timeSpinner.setValue(gameSettings.getTotalTime()); timeSpinner.setValue(gameSettings.getTotalTime());
noLimitsBox.setSelected(gameSettings.isNoLimits()); noLimitsBox.setSelected(gameSettings.isNoLimits());
@ -292,8 +294,8 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
} }
private void removePlayerSettingsPanel() { private void removePlayerSettingsPanel() {
PlayerSettingsPanel p = playerSettingsPanels.remove(playerSettingsPanels PlayerSettingsPanel p = playerSettingsPanels
.size() - 1); .remove(playerSettingsPanels.size() - 1);
playerSettingsViewport.remove(p); playerSettingsViewport.remove(p);
} }
@ -315,7 +317,8 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
playerSettingsViewport.add(addPlayerPanel); playerSettingsViewport.add(addPlayerPanel);
addPlayerButton = new JButton("+"); addPlayerButton = new JButton("+");
addPlayerButton.setFont(addPlayerButton.getFont().deriveFont(Font.BOLD)); addPlayerButton
.setFont(addPlayerButton.getFont().deriveFont(Font.BOLD));
addPlayerButton.addActionListener(new ActionListener() { addPlayerButton.addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
@ -480,8 +483,8 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
c.insets = new Insets(2, 2, 2, 2); c.insets = new Insets(2, 2, 2, 2);
final JSpinner spinner = new JSpinner(); final JSpinner spinner = new JSpinner();
spinner.setModel(new SpinnerNumberModel(min, min, max, step)); spinner.setModel(new SpinnerNumberModel(min, min, max, step));
spinner spinner.setPreferredSize(new Dimension(60,
.setPreferredSize(new Dimension(60, spinner.getMinimumSize().height)); spinner.getMinimumSize().height));
spinner.addChangeListener(new ChangeListener() { spinner.addChangeListener(new ChangeListener() {
@Override @Override
public void stateChanged(ChangeEvent e) { public void stateChanged(ChangeEvent e) {
@ -544,8 +547,8 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
c.gridwidth = GridBagConstraints.REMAINDER; c.gridwidth = GridBagConstraints.REMAINDER;
addButton("Netzwerkspiel...", networkGameEvent, c); addButton("Netzwerkspiel...", networkGameEvent, c);
setBorder(new CompoundBorder(new LineBorder(Color.BLACK), new EmptyBorder( setBorder(new CompoundBorder(new LineBorder(Color.BLACK),
10, 10, 10, 10))); new EmptyBorder(10, 10, 10, 10)));
} }
void resetTabbedPane() { void resetTabbedPane() {
@ -577,13 +580,13 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
nameField.setText(settings.getName()); nameField.setText(settings.getName());
} }
// playerType.setSelectedIndex(0); // playerType.setSelectedIndex(0);
int index = Arrays.binarySearch(TurnControlFactory.Type.values(), int index = Arrays.binarySearch(Type.values(),
settings.getTurnControlType()); settings.getTurnControlType());
if (index != playerType.getSelectedIndex()) { if (index != playerType.getSelectedIndex()) {
playerType.setSelectedIndex(index); playerType.setSelectedIndex(index);
} }
colorButton colorButton.setIcon(ImageUtil.createColorIcon(settings.getColor(),
.setIcon(ImageUtil.createColorIcon(settings.getColor(), 16, 2)); 16, 2));
} }
public void enableRemoveButton(boolean enable) { public void enableRemoveButton(boolean enable) {
@ -631,7 +634,8 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
c.gridy = 0; c.gridy = 0;
add(colorButton, c); add(colorButton, c);
nameField.getDocument().addDocumentListener(new NameChangeListener()); nameField.getDocument().addDocumentListener(
new NameChangeListener());
c2.gridy = 0; c2.gridy = 0;
c2.weightx = 1; c2.weightx = 1;
c2.fill = GridBagConstraints.HORIZONTAL; c2.fill = GridBagConstraints.HORIZONTAL;
@ -664,8 +668,9 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
public Dimension getPreferredSize() { public Dimension getPreferredSize() {
Dimension preferredSize = super.getPreferredSize(); Dimension preferredSize = super.getPreferredSize();
for (Component component : this.getComponents()) { for (Component component : this.getComponents()) {
preferredSize preferredSize.setSize(
.setSize(preferredSize.width, Math.max(preferredSize.height, preferredSize.width,
Math.max(preferredSize.height,
component.getPreferredSize().height)); component.getPreferredSize().height));
} }
return preferredSize; return preferredSize;
@ -675,8 +680,9 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
public Dimension getMaximumSize() { public Dimension getMaximumSize() {
Dimension preferredSize = super.getPreferredSize(); Dimension preferredSize = super.getPreferredSize();
for (Component component : this.getComponents()) { for (Component component : this.getComponents()) {
preferredSize preferredSize.setSize(
.setSize(Integer.MAX_VALUE, Math.max(preferredSize.height, Integer.MAX_VALUE,
Math.max(preferredSize.height,
component.getPreferredSize().height)); component.getPreferredSize().height));
} }
return preferredSize; return preferredSize;
@ -692,7 +698,7 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
private void changeType() { private void changeType() {
changePlayerTypeEvent.emit(playerNumber, changePlayerTypeEvent.emit(playerNumber,
TurnControlFactory.Type.values()[playerType.getSelectedIndex()]); Type.values()[playerType.getSelectedIndex()]);
} }
private void remove() { private void remove() {

28
test/jrummikub/control/SettingsControlTest.java
View file

@ -9,6 +9,7 @@ import java.util.HashSet;
import jrummikub.control.turn.TurnControlFactory; import jrummikub.control.turn.TurnControlFactory;
import jrummikub.model.GameSettings; import jrummikub.model.GameSettings;
import jrummikub.model.PlayerSettings.Type;
import jrummikub.model.StoneColor; import jrummikub.model.StoneColor;
import jrummikub.util.IListener1; import jrummikub.util.IListener1;
import jrummikub.view.ISettingsPanel; import jrummikub.view.ISettingsPanel;
@ -41,7 +42,8 @@ public class SettingsControlTest {
/** */ /** */
@Test @Test
public void initialStateTest() { public void initialStateTest() {
assertSame(ISettingsPanel.SettingsError.NO_ERROR, view.settingsPanel.error); assertSame(ISettingsPanel.SettingsError.NO_ERROR,
view.settingsPanel.error);
view.settingsPanel.startGameEvent.emit(); view.settingsPanel.startGameEvent.emit();
assertNotNull(gameSettings); assertNotNull(gameSettings);
assertEquals(2, gameSettings.getPlayerList().size()); assertEquals(2, gameSettings.getPlayerList().size());
@ -162,7 +164,8 @@ public class SettingsControlTest {
view.settingsPanel.changePlayerNameEvent.emit(1, name2); view.settingsPanel.changePlayerNameEvent.emit(1, name2);
assertTrue(view.settingsPanel.startButtonEnabled); assertTrue(view.settingsPanel.startButtonEnabled);
assertSame(ISettingsPanel.SettingsError.NO_ERROR, view.settingsPanel.error); assertSame(ISettingsPanel.SettingsError.NO_ERROR,
view.settingsPanel.error);
view.settingsPanel.startGameEvent.emit(); view.settingsPanel.startGameEvent.emit();
assertNotNull(gameSettings); assertNotNull(gameSettings);
@ -243,8 +246,8 @@ public class SettingsControlTest {
assertEquals(initialSettings.getStoneColors(), assertEquals(initialSettings.getStoneColors(),
view.settingsPanel.stoneColors); view.settingsPanel.stoneColors);
view.settingsPanel.changeStoneColorsEvent.emit(new HashSet<StoneColor>(Arrays.asList( view.settingsPanel.changeStoneColorsEvent.emit(new HashSet<StoneColor>(
BLUE, RED, BLACK))); Arrays.asList(BLUE, RED, BLACK)));
view.settingsPanel.startGameEvent.emit(); view.settingsPanel.startGameEvent.emit();
assertEquals(new HashSet<StoneColor>(Arrays.asList(BLUE, RED, BLACK)), assertEquals(new HashSet<StoneColor>(Arrays.asList(BLUE, RED, BLACK)),
gameSettings.getStoneColors()); gameSettings.getStoneColors());
@ -253,19 +256,16 @@ public class SettingsControlTest {
/** */ /** */
@Test @Test
public void typeChangeTest() { public void typeChangeTest() {
view.settingsPanel.changePlayerTypeEvent.emit(0, view.settingsPanel.changePlayerTypeEvent.emit(0, Type.COMPUTER);
TurnControlFactory.Type.COMPUTER); view.settingsPanel.changePlayerTypeEvent.emit(1, Type.COMPUTER);
view.settingsPanel.changePlayerTypeEvent.emit(1, view.settingsPanel.changePlayerTypeEvent.emit(1, Type.HUMAN);
TurnControlFactory.Type.COMPUTER);
view.settingsPanel.changePlayerTypeEvent.emit(1,
TurnControlFactory.Type.HUMAN);
view.settingsPanel.startGameEvent.emit(); view.settingsPanel.startGameEvent.emit();
assertNotNull(gameSettings); assertNotNull(gameSettings);
assertEquals(2, gameSettings.getPlayerList().size()); assertEquals(2, gameSettings.getPlayerList().size());
assertSame(TurnControlFactory.Type.COMPUTER, gameSettings.getPlayerList() assertSame(Type.COMPUTER, gameSettings.getPlayerList().get(0)
.get(0).getTurnControlType()); .getTurnControlType());
assertSame(TurnControlFactory.Type.HUMAN, assertSame(Type.HUMAN, gameSettings.getPlayerList().get(1)
gameSettings.getPlayerList().get(1).getTurnControlType()); .getTurnControlType());
} }
} }

15
test/jrummikub/control/turn/BaseAIControlTest.java
View file

@ -10,6 +10,7 @@ import jrummikub.model.IPlayer;
import jrummikub.model.ITable; import jrummikub.model.ITable;
import jrummikub.model.Player; import jrummikub.model.Player;
import jrummikub.model.PlayerSettings; import jrummikub.model.PlayerSettings;
import jrummikub.model.PlayerSettings.Type;
import jrummikub.model.Position; import jrummikub.model.Position;
import jrummikub.model.Stone; import jrummikub.model.Stone;
import jrummikub.model.StoneColor; import jrummikub.model.StoneColor;
@ -36,8 +37,7 @@ public class BaseAIControlTest {
/** */ /** */
@Before @Before
public void setUp() { public void setUp() {
aiControl = TurnControlFactory.getFactory(TurnControlFactory.Type.COMPUTER) aiControl = TurnControlFactory.getFactory(Type.COMPUTER).create();
.create();
gameSettings = new GameSettings(); gameSettings = new GameSettings();
playerSettings = new PlayerSettings("ROBOT_01", Color.GRAY); playerSettings = new PlayerSettings("ROBOT_01", Color.GRAY);
player = new Player(playerSettings); player = new Player(playerSettings);
@ -75,7 +75,8 @@ public class BaseAIControlTest {
*/ */
@Test(timeout = 10000) @Test(timeout = 10000)
public void testTurnZeroRedealing() throws InterruptedException { public void testTurnZeroRedealing() throws InterruptedException {
aiControl.setup(new ITurnControl.TurnInfo(table, player.getHand(), player.getLaidOut(), TurnMode.MAY_REDEAL), gameSettings, view); aiControl.setup(new ITurnControl.TurnInfo(table, player.getHand(),
player.getLaidOut(), TurnMode.MAY_REDEAL), gameSettings, view);
aiControl.startTurn(); aiControl.startTurn();
while (!redealt) { while (!redealt) {
Thread.sleep(100); Thread.sleep(100);
@ -89,7 +90,10 @@ public class BaseAIControlTest {
*/ */
@Test(timeout = 10000) @Test(timeout = 10000)
public void testTurnZeroNotMelding() throws InterruptedException { public void testTurnZeroNotMelding() throws InterruptedException {
aiControl.setup(new ITurnControl.TurnInfo(table, player.getHand(), player.getLaidOut(), TurnMode.INSPECT_ONLY), gameSettings, view); aiControl
.setup(new ITurnControl.TurnInfo(table, player.getHand(),
player.getLaidOut(), TurnMode.INSPECT_ONLY),
gameSettings, view);
aiControl.startTurn(); aiControl.startTurn();
while (!turnEnded) { while (!turnEnded) {
Thread.sleep(100); Thread.sleep(100);
@ -103,7 +107,8 @@ public class BaseAIControlTest {
*/ */
@Test(timeout = 10000) @Test(timeout = 10000)
public void testNormalTurnMelding() throws InterruptedException { public void testNormalTurnMelding() throws InterruptedException {
aiControl.setup(new ITurnControl.TurnInfo(table, player.getHand(), player.getLaidOut(), TurnMode.NORMAL_TURN), gameSettings, view); aiControl.setup(new ITurnControl.TurnInfo(table, player.getHand(),
player.getLaidOut(), TurnMode.NORMAL_TURN), gameSettings, view);
aiControl.startTurn(); aiControl.startTurn();
while (!turnEnded) { while (!turnEnded) {
Thread.sleep(100); Thread.sleep(100);