diff options
| author | Jannis Harder <harder@informatik.uni-luebeck.de> | 2011-05-25 17:10:43 +0200 |
|---|---|---|
| committer | Jannis Harder <harder@informatik.uni-luebeck.de> | 2011-05-25 17:10:43 +0200 |
| commit | a1c0cb89f67386738fc59426fd68737a393e1827 (patch) | |
| tree | 8f0603073d4ea10919ce74840bb1d7514553bcb2 /mock | |
| parent | 157bd4f60635dc27d2c9baebea5589455b05f17b (diff) | |
| download | JRummikub-a1c0cb89f67386738fc59426fd68737a393e1827.tar JRummikub-a1c0cb89f67386738fc59426fd68737a393e1827.zip | |
Added test and implementation for an inspection turn before the first
turn
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@273 72836036-5685-4462-b002-a69064685172
Diffstat (limited to 'mock')
| -rw-r--r-- | mock/jrummikub/model/MockRoundState.java | 14 | ||||
| -rw-r--r-- | mock/jrummikub/view/MockTablePanel.java | 3 |
2 files changed, 15 insertions, 2 deletions
diff --git a/mock/jrummikub/model/MockRoundState.java b/mock/jrummikub/model/MockRoundState.java index 1ebc575..bf2f475 100644 --- a/mock/jrummikub/model/MockRoundState.java +++ b/mock/jrummikub/model/MockRoundState.java @@ -22,8 +22,10 @@ public class MockRoundState implements IRoundState { public GameSettings gameSettings; /** */ public IPlayer lastPlayer; - /** */ + public int turnNumber; + /** */ + public MockRoundState() { table = new MockTable(); players = new ArrayList<MockPlayer>(); @@ -39,6 +41,7 @@ public class MockRoundState implements IRoundState { gameHeap = new StoneHeap(); gameSettings = new GameSettings(); gameSettings.setInitialMeldThreshold(30); + turnNumber = -3; } @Override @@ -113,4 +116,13 @@ public class MockRoundState implements IRoundState { } return players.get(j); } + + public int getTurnNumber() { + return turnNumber; + } + + @Override + public void nextTurn() { + turnNumber++; + } } diff --git a/mock/jrummikub/view/MockTablePanel.java b/mock/jrummikub/view/MockTablePanel.java index ca3db6e..212452c 100644 --- a/mock/jrummikub/view/MockTablePanel.java +++ b/mock/jrummikub/view/MockTablePanel.java @@ -7,6 +7,7 @@ import jrummikub.util.Event1; import jrummikub.util.Event2; import jrummikub.util.IEvent1; import jrummikub.util.IEvent2; +import jrummikub.util.MockEvent1; import jrummikub.util.Pair; /** @@ -21,7 +22,7 @@ public class MockTablePanel implements ITablePanel { /** */ public Event2<Stone, Boolean> rangeClickEvent = new Event2<Stone, Boolean>(); /** */ - public Event1<Position> clickEvent = new Event1<Position>(); + public MockEvent1<Position> clickEvent = new MockEvent1<Position>(); /** */ public Event1<StoneSet> leftConnectorClickEvent = new Event1<StoneSet>(); /** */ |