summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mock/jrummikub/view/MockTablePanel.java3
-rw-r--r--src/jrummikub/control/RoundControl.java6
-rw-r--r--test/jrummikub/control/RoundControlTest.java2
3 files changed, 7 insertions, 4 deletions
diff --git a/mock/jrummikub/view/MockTablePanel.java b/mock/jrummikub/view/MockTablePanel.java
index 969ece6..c1d839c 100644
--- a/mock/jrummikub/view/MockTablePanel.java
+++ b/mock/jrummikub/view/MockTablePanel.java
@@ -68,8 +68,7 @@ public class MockTablePanel implements ITablePanel {
@Override
public IStoneCollectionPanel getStoneCollectionPanel() {
- // TODO Auto-generated method stub
- return null;
+ return stoneCollectionPanel;
}
@Override
diff --git a/src/jrummikub/control/RoundControl.java b/src/jrummikub/control/RoundControl.java
index 00ebb6e..4949e2b 100644
--- a/src/jrummikub/control/RoundControl.java
+++ b/src/jrummikub/control/RoundControl.java
@@ -116,7 +116,11 @@ public class RoundControl {
}
private void dealStone() {
- // gameState.getActivePlayer().getHand().drop(object, position)
+ gameState
+ .getActivePlayer()
+ .getHand()
+ .drop(gameState.getGameHeap().drawStone(),
+ new Position(7 + (int) (Math.random() * 6), 0.5f));
}
private void dealPenalty(int count) {
diff --git a/test/jrummikub/control/RoundControlTest.java b/test/jrummikub/control/RoundControlTest.java
index f716e27..116786e 100644
--- a/test/jrummikub/control/RoundControlTest.java
+++ b/test/jrummikub/control/RoundControlTest.java
@@ -67,7 +67,7 @@ public class RoundControlTest {
private void checkTableDisplay() {
Iterator<Pair<StoneSet, Position>> stoneSetsView = view.tablePanel.stoneSets
.iterator();
- Iterator<Pair<StoneSet, Position>> stoneSetsModel = testGameState.table.sets
+ Iterator<Pair<StoneSet, Position>> stoneSetsModel = testGameState.table.clone().sets
.iterator();
while (stoneSetsView.hasNext()) {