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

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

@ -72,7 +72,8 @@ class StartTurnPanel extends JPanel {
} }
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() {
@ -111,13 +112,18 @@ class StartTurnPanel extends JPanel {
} }
public void setType(BottomPanelType type) { public void setType(BottomPanelType type) {
if (type == null) {
return;
}
switch (type) { switch (type) {
case START_TURN_PANEL: case START_TURN_PANEL:
startTurnButton.setText("Zug beginnen"); startTurnButton.setText("Zug beginnen");
buttonEvent = startTurnEvent; buttonEvent = startTurnEvent;
break; break;
case INVALID_TURN_PANEL: case INVALID_TURN_PANEL:
startTurnLabel.setText("Es liegen ung\u00FCltige Serien auf dem Tisch."); startTurnLabel
.setText("Es liegen ung\u00FCltige Serien auf dem Tisch.");
startTurnButton.setText("N\u00E4chster Spieler"); startTurnButton.setText("N\u00E4chster Spieler");
buttonEvent = acknowledgeInvalidEvent; buttonEvent = acknowledgeInvalidEvent;
break; break;