Show player name labels
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@146 72836036-5685-4462-b002-a69064685172
This commit is contained in:
parent
63ffedd7b0
commit
b1fd03e366
5 changed files with 34 additions and 2 deletions
|
@ -51,4 +51,9 @@ public class MockGameState implements IGameState {
|
||||||
public StoneHeap getGameHeap() {
|
public StoneHeap getGameHeap() {
|
||||||
return gameHeap;
|
return gameHeap;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public IPlayer getNthNextPlayer(int i) {
|
||||||
|
return players.get((activePlayer + i) % players.size());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,8 +9,16 @@ import jrummikub.model.Stone;
|
||||||
import jrummikub.model.StoneSet;
|
import jrummikub.model.StoneSet;
|
||||||
import jrummikub.view.impl.View;
|
import jrummikub.view.impl.View;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The main class
|
||||||
|
*/
|
||||||
public class JRummikub {
|
public class JRummikub {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The main method
|
||||||
|
*
|
||||||
|
* @param args command line arguments
|
||||||
|
*/
|
||||||
public static void main(String[] args) {
|
public static void main(String[] args) {
|
||||||
String nativeLF = UIManager.getSystemLookAndFeelClassName();
|
String nativeLF = UIManager.getSystemLookAndFeelClassName();
|
||||||
|
|
||||||
|
|
|
@ -33,9 +33,21 @@ public class RoundControl {
|
||||||
startTurn();
|
startTurn();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
view.enableStartTurnPanel(true);
|
|
||||||
|
prepareTurn();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void prepareTurn() {
|
||||||
clonedTable = (ITable) gameState.getTable().clone();
|
clonedTable = (ITable) gameState.getTable().clone();
|
||||||
|
view.enableStartTurnPanel(true);
|
||||||
view.getTablePanel().setStoneSets(clonedTable);
|
view.getTablePanel().setStoneSets(clonedTable);
|
||||||
|
view.setCurrentPlayerName(gameState.getActivePlayer().getName());
|
||||||
|
view.getTablePanel().setRightPlayerName(
|
||||||
|
gameState.getNthNextPlayer(1).getName());
|
||||||
|
view.getTablePanel().setTopPlayerName(
|
||||||
|
gameState.getNthNextPlayer(2).getName());
|
||||||
|
view.getTablePanel().setLeftPlayerName(
|
||||||
|
gameState.getNthNextPlayer(3).getName());
|
||||||
}
|
}
|
||||||
|
|
||||||
private void startTurn() {
|
private void startTurn() {
|
||||||
|
|
|
@ -43,6 +43,11 @@ public class GameState implements IGameState {
|
||||||
activePlayer = (activePlayer + 1) % players.size();
|
activePlayer = (activePlayer + 1) % players.size();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public IPlayer getNthNextPlayer(int i) {
|
||||||
|
return players.get((activePlayer + i) % players.size());
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public IPlayer getActivePlayer() {
|
public IPlayer getActivePlayer() {
|
||||||
return players.get(activePlayer);
|
return players.get(activePlayer);
|
||||||
|
|
|
@ -15,4 +15,6 @@ public interface IGameState {
|
||||||
|
|
||||||
public StoneHeap getGameHeap();
|
public StoneHeap getGameHeap();
|
||||||
|
|
||||||
|
public IPlayer getNthNextPlayer(int i);
|
||||||
|
|
||||||
}
|
}
|
Reference in a new issue