summaryrefslogtreecommitdiffstats
path: root/mock
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2011-05-05 16:56:35 +0200
committerMatthias Schiffer <mschiffer@universe-factory.net>2011-05-05 16:56:35 +0200
commit63ffedd7b0ecfbf690551b0e2fefac3058ff08c2 (patch)
treee5ce7b1e0d5df0f3365795d348b938b8b185281b /mock
parent7ee737f0d38bd815dc26a81a440148beebb17385 (diff)
downloadJRummikub-63ffedd7b0ecfbf690551b0e2fefac3058ff08c2.tar
JRummikub-63ffedd7b0ecfbf690551b0e2fefac3058ff08c2.zip
Add name to player model
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@145 72836036-5685-4462-b002-a69064685172
Diffstat (limited to 'mock')
-rw-r--r--mock/jrummikub/model/MockGameState.java8
-rw-r--r--mock/jrummikub/model/MockPlayer.java9
2 files changed, 12 insertions, 5 deletions
diff --git a/mock/jrummikub/model/MockGameState.java b/mock/jrummikub/model/MockGameState.java
index 102e9fb..1d4a7a2 100644
--- a/mock/jrummikub/model/MockGameState.java
+++ b/mock/jrummikub/model/MockGameState.java
@@ -13,10 +13,10 @@ public class MockGameState implements IGameState {
public MockGameState() {
table = new MockTable();
players = new ArrayList<MockPlayer>();
- players.add(new MockPlayer(Color.red));
- players.add(new MockPlayer(Color.yellow));
- players.add(new MockPlayer(Color.green));
- players.add(new MockPlayer(Color.black));
+ 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));
activePlayer = 0;
gameHeap = new StoneHeap();
}
diff --git a/mock/jrummikub/model/MockPlayer.java b/mock/jrummikub/model/MockPlayer.java
index adb9d85..2f573ca 100644
--- a/mock/jrummikub/model/MockPlayer.java
+++ b/mock/jrummikub/model/MockPlayer.java
@@ -5,12 +5,14 @@ import java.awt.Color;
public class MockPlayer implements IPlayer {
public MockHand hand;
+ public String name;
public Color color;
// private String name;
- public MockPlayer(Color color) {
+ public MockPlayer(String name, Color color) {
hand = new MockHand();
+ this.name = name;
this.color = color;
}
@@ -23,4 +25,9 @@ public class MockPlayer implements IPlayer {
public Color getColor() {
return color;
}
+
+ @Override
+ public String getName() {
+ return name;
+ }
}