summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIda Massow <massow@informatik.uni-luebeck.de>2011-05-18 15:31:37 +0200
committerIda Massow <massow@informatik.uni-luebeck.de>2011-05-18 15:31:37 +0200
commit0b252810c9eb0f822c50d144b2ef0c652202d871 (patch)
tree887ab9c3efc5df7e720dbe0a000004a84eaa31d8
parentb3c903a2ad86aa803fe9bcf83aea947c452241b5 (diff)
downloadJRummikub-0b252810c9eb0f822c50d144b2ef0c652202d871.tar
JRummikub-0b252810c9eb0f822c50d144b2ef0c652202d871.zip
Keine Fehler mehr, sorry für das davor
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@250 72836036-5685-4462-b002-a69064685172
-rw-r--r--mock/jrummikub/model/MockPlayer.java16
-rw-r--r--src/jrummikub/model/IPlayer.java2
-rw-r--r--src/jrummikub/model/Player.java6
3 files changed, 15 insertions, 9 deletions
diff --git a/mock/jrummikub/model/MockPlayer.java b/mock/jrummikub/model/MockPlayer.java
index cb9adaa..a6dfe01 100644
--- a/mock/jrummikub/model/MockPlayer.java
+++ b/mock/jrummikub/model/MockPlayer.java
@@ -12,27 +12,27 @@ public class MockPlayer implements IPlayer {
public String name;
/** */
public Color color;
- /** */
- public boolean cameOut;
+ /** */
+ public boolean laidOut;
/**
* @param name
- * the player name
+ * the player name
* @param color
- * the player color
+ * the player color
*/
public MockPlayer(String name, Color color) {
hand = new Hand();
this.name = name;
this.color = color;
- this.cameOut=false;
+ laidOut = false;
}
@Override
- public boolean getCameOut() {
- return cameOut;
+ public boolean getLaidOut() {
+ return laidOut;
}
-
+
@Override
public IHand getHand() {
return hand;
diff --git a/src/jrummikub/model/IPlayer.java b/src/jrummikub/model/IPlayer.java
index 1a51e65..ebe77fa 100644
--- a/src/jrummikub/model/IPlayer.java
+++ b/src/jrummikub/model/IPlayer.java
@@ -28,6 +28,6 @@ public interface IPlayer {
*/
public String getName();
- boolean getCameOut();
+ boolean getLaidOut();
} \ No newline at end of file
diff --git a/src/jrummikub/model/Player.java b/src/jrummikub/model/Player.java
index ddd10e4..9444b5a 100644
--- a/src/jrummikub/model/Player.java
+++ b/src/jrummikub/model/Player.java
@@ -8,6 +8,7 @@ public class Player implements IPlayer {
private IHand hand;
private String name;
private Color color;
+ private boolean laidOut;
/**
* Create a new player with a given name and color
@@ -27,6 +28,11 @@ public class Player implements IPlayer {
public IHand getHand() {
return hand;
}
+
+ @Override
+ public boolean getLaidOut() {
+ return laidOut;
+ }
@Override
public Color getColor() {