neocturne/JRummikub
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Renamed win() and fixed end of round tests

Browse source 
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@267 72836036-5685-4462-b002-a69064685172
This commit is contained in:
Jannis Harder 2011-05-24 22:16:16 +02:00
parent 8c3c66f361
commit 81ca3e174a
3 changed files with 32 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/jrummikub/control/GameControl.java
View file

@ -63,7 +63,7 @@ public class GameControl {
roundState.setActivePlayerNumber(gameState.getFirstRoundFirstPlayer());
roundControl = new RoundControl(roundState, view);
roundControl.getEndRoundEvent().add(new IListener() {
roundControl.getEndOfRoundEvent().add(new IListener() {
@Override
public void handle() {

16
src/jrummikub/control/RoundControl.java
View file

@ -26,7 +26,7 @@ public class RoundControl {
private IRoundState roundState;
private IView view;
private ITable clonedTable;
private Event endRoundEvent = new Event();
private Event endOfRoundEvent = new Event();
private List<Connection> connections = new ArrayList<Connection>();
private boolean roundFinished;
@ -46,10 +46,10 @@ public class RoundControl {
/**
* End the round
*
* @return endRoundEvent
* @return endOfRoundEvent
*/
public IEvent getEndRoundEvent() {
return endRoundEvent;
public IEvent getEndOfRoundEvent() {
return endOfRoundEvent;
}
/**
@ -134,7 +134,7 @@ public class RoundControl {
} else {
if (roundState.getActivePlayer() == roundState.getLastPlayer()) {
// TODO check who has won
win();
endOfRound();
} else {
roundState.nextPlayer();
}
@ -171,7 +171,7 @@ public class RoundControl {
} else {
roundState.getActivePlayer().setLaidOut(true);
if (roundState.getActivePlayer().getHand().getSize() == 0) {
win();
endOfRound();
}
}
}
@ -235,11 +235,11 @@ public class RoundControl {
dealStones(count + 3);
}
private void win() {
private void endOfRound() {
for (Connection c : connections) {
c.remove();
}
endRoundEvent.emit();
endOfRoundEvent.emit();
view.enableWinPanel(true);
roundFinished = true;
}