summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mock/jrummikub/model/MockGameState.java8
-rw-r--r--mock/jrummikub/model/MockPlayer.java9
-rw-r--r--src/jrummikub/model/GameState.java8
-rw-r--r--src/jrummikub/model/IPlayer.java2
-rw-r--r--src/jrummikub/model/Player.java9
5 files changed, 26 insertions, 10 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;
+ }
}
diff --git a/src/jrummikub/model/GameState.java b/src/jrummikub/model/GameState.java
index 0e43a9c..3bd4d94 100644
--- a/src/jrummikub/model/GameState.java
+++ b/src/jrummikub/model/GameState.java
@@ -14,10 +14,10 @@ public class GameState implements IGameState {
public GameState() {
table = new Table();
players = new ArrayList<Player>();
- players.add(new Player(Color.red));
- players.add(new Player(Color.yellow));
- players.add(new Player(Color.green));
- players.add(new Player(Color.black));
+ players.add(new Player("Player 1", Color.RED));
+ players.add(new Player("Player 2", Color.YELLOW));
+ players.add(new Player("Player 3", Color.GREEN));
+ players.add(new Player("Player 4", Color.BLACK));
activePlayer = 0;
gameHeap = new StoneHeap();
}
diff --git a/src/jrummikub/model/IPlayer.java b/src/jrummikub/model/IPlayer.java
index 1ed0554..17e37e7 100644
--- a/src/jrummikub/model/IPlayer.java
+++ b/src/jrummikub/model/IPlayer.java
@@ -8,4 +8,6 @@ public interface IPlayer {
public Color getColor();
+ public String getName();
+
} \ No newline at end of file
diff --git a/src/jrummikub/model/Player.java b/src/jrummikub/model/Player.java
index d5bda32..623915d 100644
--- a/src/jrummikub/model/Player.java
+++ b/src/jrummikub/model/Player.java
@@ -6,12 +6,14 @@ import java.awt.Color;
public class Player implements IPlayer {
private IHand hand;
+ private String name;
private Color color;
// private String name;
- public Player(Color color) {
+ public Player(String name, Color color) {
hand = new Hand();
+ this.name = name;
this.color = color;
}
@@ -24,4 +26,9 @@ public class Player implements IPlayer {
public Color getColor() {
return color;
}
+
+ @Override
+ public String getName() {
+ return name;
+ }
}