From: Erik V. <ev...@us...> - 2009-12-29 21:58:21
|
Update of /cvsroot/rails/18xx/rails/ui/swing In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv15007/rails/ui/swing Modified Files: ORWindow.java MessagePanel.java ORPanel.java Log Message: Cleanup help message at end of OR. Index: MessagePanel.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/ui/swing/MessagePanel.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** MessagePanel.java 4 Jun 2008 19:00:33 -0000 1.5 --- MessagePanel.java 29 Dec 2009 21:58:11 -0000 1.6 *************** *** 32,36 **** public void setMessage(String messageText) { ! if (Util.hasValue(messageText)) { int lines = messageText.split("<[Bb][Rr]>").length + 1; setLines(lines); --- 32,36 ---- public void setMessage(String messageText) { ! if (messageText != null) { int lines = messageText.split("<[Bb][Rr]>").length + 1; setLines(lines); Index: ORWindow.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/ui/swing/ORWindow.java,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** ORWindow.java 7 Dec 2009 17:48:32 -0000 1.29 --- ORWindow.java 29 Dec 2009 21:58:11 -0000 1.30 *************** *** 187,190 **** --- 187,191 ---- orPanel.finish(); upgradePanel.finish(); + messagePanel.setMessage(""); setTitle(LocalText.getText("MapWindowTitle")); } Index: ORPanel.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/ui/swing/ORPanel.java,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** ORPanel.java 15 Dec 2009 18:56:11 -0000 1.35 --- ORPanel.java 29 Dec 2009 21:58:11 -0000 1.36 *************** *** 510,513 **** --- 510,515 ---- button2.setEnabled(false); button3.setEnabled(false); + undoButton.setEnabled(false); + redoButton.setEnabled(false); round = orUIManager.gameUIManager.getCurrentRound(); |