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

Move some static player data to a player settings class

Browse source 
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@252 72836036-5685-4462-b002-a69064685172
This commit is contained in:
Matthias Schiffer 2011-05-18 17:01:10 +02:00
parent 5169f31af0
commit b5397d5aa7
8 changed files with 80 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

26
mock/jrummikub/model/MockPlayer.java
View file

@ -1,7 +1,5 @@
package jrummikub.model;
import java.awt.Color;
/**
* Mock class for {@link Player}
*/
@ -9,22 +7,17 @@ public class MockPlayer implements IPlayer {
/** */
public Hand hand;
/** */
public String name;
/** */
public Color color;
public PlayerSettings playerSettings;
/** */
public boolean laidOut;
/**
* @param name
* the player name
* @param color
* the player color
* @param playerSettings
* the player settings
*/
public MockPlayer(String name, Color color) {
public MockPlayer(PlayerSettings playerSettings) {
hand = new Hand();
this.name = name;
this.color = color;
this.playerSettings = playerSettings;
laidOut = false;
}
@ -39,12 +32,7 @@ public class MockPlayer implements IPlayer {
}
@Override
public Color getColor() {
return color;
}
@Override
public String getName() {
return name;
public PlayerSettings getPlayerSettings() {
return playerSettings;
}
}

8
mock/jrummikub/model/MockRoundState.java
View file

@ -25,10 +25,10 @@ public class MockRoundState implements IRoundState {
public MockRoundState() {
table = new MockTable();
players = new ArrayList<MockPlayer>();
players.add(new MockPlayer("Player 1", Color.RED));
players.add(new MockPlayer("Player 2", Color.YELLOW));
players.add(new MockPlayer("Player 3", Color.GREEN));
players.add(new MockPlayer("Player 4", Color.BLACK));
players.add(new MockPlayer(new PlayerSettings("Player 1", Color.RED)));
players.add(new MockPlayer(new PlayerSettings("Player 2", Color.YELLOW)));
players.add(new MockPlayer(new PlayerSettings("Player 3", Color.GREEN)));
players.add(new MockPlayer(new PlayerSettings("Player 4", Color.BLACK)));
activePlayer = 0;
gameHeap = new StoneHeap();
gameSettings = new GameSettings();