Implemented stone display in both controls, tested (weniger Mock-Mist)

git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@140 72836036-5685-4462-b002-a69064685172
This commit is contained in:
Bennet Gerlach 2011-05-05 01:33:58 +02:00
parent 866197f315
commit 121afdf6c6
4 changed files with 43 additions and 24 deletions

View file

@ -2,9 +2,11 @@ package jrummikub;
import javax.swing.UIManager;
import jrummikub.control.TurnControl;
import jrummikub.control.RoundControl;
import jrummikub.model.GameState;
import jrummikub.model.Position;
import jrummikub.model.Stone;
import jrummikub.model.StoneSet;
import jrummikub.view.impl.View;
public class JRummikub {
@ -20,11 +22,12 @@ public class JRummikub {
GameState gameState = new GameState();
View view = new View();
gameState.getActivePlayer().getHand()
.drop(gameState.getGameHeap().drawStone(), new Position(0, 0));
for (Stone stone : gameState.getGameHeap().drawStones(5)) {
gameState.getTable().drop(new StoneSet(stone), new Position(0, 0));
}
TurnControl turnControl = new TurnControl(gameState.getActivePlayer()
.getHand(), gameState.getTable(), view);
RoundControl roundControl = new RoundControl(gameState, view);
roundControl.startRound();
}

View file

@ -2,8 +2,8 @@ package jrummikub.control;
import jrummikub.model.IGameState;
import jrummikub.model.IHand;
import jrummikub.model.Player;
import jrummikub.model.Position;
import jrummikub.util.IListener;
import jrummikub.view.IView;
public class RoundControl {
@ -16,17 +16,33 @@ public class RoundControl {
}
public void startRound() {
deal();
view.getStartTurnEvent().add(new IListener() {
@Override
public void handle() {
startTurn();
}
});
view.enableStartTurnPanel(true);
view.getTablePanel().setStoneSets(gameState.getTable().clone());
}
private void startTurn() {
TurnControl turnControl = new TurnControl(gameState.getActivePlayer()
.getHand(), gameState.getTable(), view);
}
void deal() {
for (int i = 0; i < gameState.getPlayerCount(); i++) {
IHand hand = gameState.getPlayer(i).getHand();
for (int j = 0; j < 7; j++) {
hand.drop(gameState.getGameHeap().drawStone(), new Position(j,
0));
hand.drop(gameState.getGameHeap().drawStone(), new Position(j,
1));
hand.drop(gameState.getGameHeap().drawStone(), new Position(j, 0));
hand.drop(gameState.getGameHeap().drawStone(), new Position(j, 1));
}
}
}