diff options
author | Matthias Schiffer <mschiffer@universe-factory.net> | 2011-05-05 21:13:59 +0200 |
---|---|---|
committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2011-05-05 21:13:59 +0200 |
commit | 38f6f0dc24bd2755786f8a7947743feadb505b7f (patch) | |
tree | 4d8fbf1107dbeeceab0d332d4d5312a691a3ccbe /src/jrummikub/model | |
parent | 0b66e7d7631a0effca6fb03b8285e0d4372f5eef (diff) | |
download | JRummikub-38f6f0dc24bd2755786f8a7947743feadb505b7f.tar JRummikub-38f6f0dc24bd2755786f8a7947743feadb505b7f.zip |
Add some endOfTurn handling to RoundControl
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@155 72836036-5685-4462-b002-a69064685172
Diffstat (limited to 'src/jrummikub/model')
-rw-r--r-- | src/jrummikub/model/GameState.java | 5 | ||||
-rw-r--r-- | src/jrummikub/model/IGameState.java | 1 | ||||
-rw-r--r-- | src/jrummikub/model/StoneHeap.java | 7 |
3 files changed, 12 insertions, 1 deletions
diff --git a/src/jrummikub/model/GameState.java b/src/jrummikub/model/GameState.java index 0539ea0..d9f18b3 100644 --- a/src/jrummikub/model/GameState.java +++ b/src/jrummikub/model/GameState.java @@ -28,6 +28,11 @@ public class GameState implements IGameState { } @Override + public void setTable(ITable table) { + this.table = table; + } + + @Override public int getPlayerCount() { return players.size(); } diff --git a/src/jrummikub/model/IGameState.java b/src/jrummikub/model/IGameState.java index 46ea0b0..df98a2c 100644 --- a/src/jrummikub/model/IGameState.java +++ b/src/jrummikub/model/IGameState.java @@ -3,6 +3,7 @@ package jrummikub.model; public interface IGameState { public ITable getTable(); + public void setTable(ITable table); public int getPlayerCount(); diff --git a/src/jrummikub/model/StoneHeap.java b/src/jrummikub/model/StoneHeap.java index 42cb01e..ae84cef 100644 --- a/src/jrummikub/model/StoneHeap.java +++ b/src/jrummikub/model/StoneHeap.java @@ -1,6 +1,7 @@ package jrummikub.model; import java.util.ArrayList; +import java.util.Collection; import java.util.EnumSet; import java.util.List; import java.util.Random; @@ -42,7 +43,7 @@ public class StoneHeap { * Removes several {@link Stone}s from the heap and returns them * * @param number - * number of requested Stones + * number of requested Stones * @return list of drawn stones */ public List<Stone> drawStones(int number) { @@ -56,4 +57,8 @@ public class StoneHeap { public int getSize() { return heap.size(); } + + public void putBack(Collection<Stone> stones) { + heap.addAll(stones); + } } |