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

Fix NullPointerException on pause mode

Browse source 
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@468 72836036-5685-4462-b002-a69064685172
This commit is contained in:
Matthias Schiffer 2011-06-18 18:07:48 +02:00
parent 6ffc2c38a2
commit 1bddf11ce0
1 changed files with 22 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/jrummikub/view/impl/StartTurnPanel.java
View file

@ -31,7 +31,7 @@ class StartTurnPanel extends JPanel {
private Event startTurnEvent = new Event(); private Event startTurnEvent = new Event();
private Event acknowledgeInvalidEvent = new Event(); private Event acknowledgeInvalidEvent = new Event();
private Event buttonEvent = startTurnEvent; private Event buttonEvent = startTurnEvent;
/** /**
@ -70,11 +70,12 @@ class StartTurnPanel extends JPanel {
void setCurrentPlayerName(String playerName) { void setCurrentPlayerName(String playerName) {
startTurnLabel.setText(playerName + " ist jetzt an der Reihe."); startTurnLabel.setText(playerName + " ist jetzt an der Reihe.");
} }
void setInitialMeldError(int points) { void setInitialMeldError(int points) {
startTurnLabel.setText("Es wurden weniger als " + points + " Punkte ausgelegt."); startTurnLabel.setText("Es wurden weniger als " + points
+ " Punkte ausgelegt.");
} }
void setInitialMeldFirstError() { void setInitialMeldFirstError() {
startTurnLabel.setText("Vor dem Rauskommen darf nicht angelegt werden."); startTurnLabel.setText("Vor dem Rauskommen darf nicht angelegt werden.");
} }
@ -82,7 +83,7 @@ class StartTurnPanel extends JPanel {
IEvent getStartTurnEvent() { IEvent getStartTurnEvent() {
return startTurnEvent; return startTurnEvent;
} }
IEvent getAcknowledgeInvalidEvent() { IEvent getAcknowledgeInvalidEvent() {
return acknowledgeInvalidEvent; return acknowledgeInvalidEvent;
} }
@ -111,17 +112,22 @@ class StartTurnPanel extends JPanel {
} }
public void setType(BottomPanelType type) { public void setType(BottomPanelType type) {
switch (type) { if (type == null) {
case START_TURN_PANEL: return;
startTurnButton.setText("Zug beginnen");
buttonEvent = startTurnEvent;
break;
case INVALID_TURN_PANEL:
startTurnLabel.setText("Es liegen ung\u00FCltige Serien auf dem Tisch.");
startTurnButton.setText("N\u00E4chster Spieler");
buttonEvent = acknowledgeInvalidEvent;
break;
} }
switch (type) {
case START_TURN_PANEL:
startTurnButton.setText("Zug beginnen");
buttonEvent = startTurnEvent;
break;
case INVALID_TURN_PANEL:
startTurnLabel
.setText("Es liegen ung\u00FCltige Serien auf dem Tisch.");
startTurnButton.setText("N\u00E4chster Spieler");
buttonEvent = acknowledgeInvalidEvent;
break;
}
} }
} }