summaryrefslogtreecommitdiffstats
path: root/mock/jrummikub/model
diff options
context:
space:
mode:
authorIda Massow <massow@informatik.uni-luebeck.de>2011-05-21 15:51:36 +0200
committerIda Massow <massow@informatik.uni-luebeck.de>2011-05-21 15:51:36 +0200
commit7354002de5e9e57db7a6086c78e65f89a3617849 (patch)
treea56b67ab0e4e20f4445cbeca0be9a1b97b2932a9 /mock/jrummikub/model
parentcb3f9cc011c29e713c14bee92c6bacbc3dbbf379 (diff)
downloadJRummikub-7354002de5e9e57db7a6086c78e65f89a3617849.tar
JRummikub-7354002de5e9e57db7a6086c78e65f89a3617849.zip
Rauskommen fertig und getestet
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@256 72836036-5685-4462-b002-a69064685172
Diffstat (limited to 'mock/jrummikub/model')
-rw-r--r--mock/jrummikub/model/MockPlayer.java7
-rw-r--r--mock/jrummikub/model/MockRoundState.java5
-rw-r--r--mock/jrummikub/model/MockTable.java2
3 files changed, 10 insertions, 4 deletions
diff --git a/mock/jrummikub/model/MockPlayer.java b/mock/jrummikub/model/MockPlayer.java
index a580a48..a7b57b4 100644
--- a/mock/jrummikub/model/MockPlayer.java
+++ b/mock/jrummikub/model/MockPlayer.java
@@ -13,7 +13,7 @@ public class MockPlayer implements IPlayer {
/**
* @param playerSettings
- * the player settings
+ * the player settings
*/
public MockPlayer(PlayerSettings playerSettings) {
hand = new Hand();
@@ -35,4 +35,9 @@ public class MockPlayer implements IPlayer {
public PlayerSettings getPlayerSettings() {
return playerSettings;
}
+
+ @Override
+ public void setLaidOut(boolean laidOut) {
+ this.laidOut = laidOut;
+ }
}
diff --git a/mock/jrummikub/model/MockRoundState.java b/mock/jrummikub/model/MockRoundState.java
index 7b58fab..fd5e5b1 100644
--- a/mock/jrummikub/model/MockRoundState.java
+++ b/mock/jrummikub/model/MockRoundState.java
@@ -19,7 +19,7 @@ public class MockRoundState implements IRoundState {
/** */
public StoneHeap gameHeap;
/** */
- public GameSettings gameSettings;
+ public IGameSettings gameSettings;
/** */
public MockRoundState() {
@@ -32,6 +32,7 @@ public class MockRoundState implements IRoundState {
activePlayer = 0;
gameHeap = new StoneHeap();
gameSettings = new GameSettings();
+ gameSettings.setInitialMeldThreshold(30);
}
@Override
@@ -71,7 +72,7 @@ public class MockRoundState implements IRoundState {
}
@Override
- public GameSettings getGameSettings() {
+ public IGameSettings getGameSettings() {
return gameSettings;
}
}
diff --git a/mock/jrummikub/model/MockTable.java b/mock/jrummikub/model/MockTable.java
index bfbf8e9..d5bf07b 100644
--- a/mock/jrummikub/model/MockTable.java
+++ b/mock/jrummikub/model/MockTable.java
@@ -23,7 +23,7 @@ public class MockTable implements ITable {
@Override
public void pickUpStone(Stone stone) {
- // TODO Auto-generated method stub
+ // TODO: Auto-generated method stub
}
@Override