summaryrefslogtreecommitdiffstats
path: root/mock/jrummikub
diff options
context:
space:
mode:
authorJannis Harder <harder@informatik.uni-luebeck.de>2011-05-24 01:51:49 +0200
committerJannis Harder <harder@informatik.uni-luebeck.de>2011-05-24 01:51:49 +0200
commit2446671f7ab832cca5e0412ae0301b901e0b69d5 (patch)
tree00dc3910836e3e84162ba8dfd997d013fad40b12 /mock/jrummikub
parent102299d0ffc15a08167f6eab8b9813c2f7dcda3b (diff)
downloadJRummikub-2446671f7ab832cca5e0412ae0301b901e0b69d5.tar
JRummikub-2446671f7ab832cca5e0412ae0301b901e0b69d5.zip
Cleaned up RoundControl tests
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@260 72836036-5685-4462-b002-a69064685172
Diffstat (limited to 'mock/jrummikub')
-rw-r--r--mock/jrummikub/model/MockGameSettings.java34
-rw-r--r--mock/jrummikub/model/MockRoundState.java4
2 files changed, 2 insertions, 36 deletions
diff --git a/mock/jrummikub/model/MockGameSettings.java b/mock/jrummikub/model/MockGameSettings.java
deleted file mode 100644
index 83b5fdc..0000000
--- a/mock/jrummikub/model/MockGameSettings.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package jrummikub.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.awt.Color;
-
-public class MockGameSettings implements IGameSettings {
- List<PlayerSettings> players = new ArrayList<PlayerSettings>();
- int initialMeldThreshold;
-
- public MockGameSettings() {
- players.add(new PlayerSettings("Bennet", Color.BLUE));
- players.add(new PlayerSettings("Matze", Color.BLACK));
- players.add(new PlayerSettings("Ida", Color.RED));
- players.add(new PlayerSettings("Jannis", Color.PINK));
- initialMeldThreshold=30;
- }
-
- @Override
- public List<PlayerSettings> getPlayerList() {
- return players;
- }
-
- @Override
- public void setInitialMeldThreshold(int value) {
- initialMeldThreshold = value;
- }
-
- @Override
- public int getInitialMeldThreshold() {
- return initialMeldThreshold;
- }
-
-}
diff --git a/mock/jrummikub/model/MockRoundState.java b/mock/jrummikub/model/MockRoundState.java
index fd5e5b1..5f478fb 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 IGameSettings gameSettings;
+ public GameSettings gameSettings;
/** */
public MockRoundState() {
@@ -72,7 +72,7 @@ public class MockRoundState implements IRoundState {
}
@Override
- public IGameSettings getGameSettings() {
+ public GameSettings getGameSettings() {
return gameSettings;
}
}