Update of /cvsroot/rails/18xx/rails/ui/swing
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16347/rails/ui/swing
Modified Files:
GameUIManager.java
Log Message:
Moved nonmodal message display to end of updating UI
Index: GameUIManager.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/GameUIManager.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** GameUIManager.java 20 Jan 2010 19:52:44 -0000 1.36
--- GameUIManager.java 22 Jan 2010 21:29:34 -0000 1.37
***************
*** 168,171 ****
--- 168,172 ----
log.debug("==Result from server: " + result);
reportWindow.addLog();
+ /*
if (DisplayBuffer.getAutoDisplay()) {
if (displayServerMessage()) {
***************
*** 174,178 ****
return true;
}
! }
}
--- 175,179 ----
return true;
}
! }*/
}
***************
*** 196,199 ****
--- 197,209 ----
statusWindow.setGameActions();
+ // Is this perhaps the right place to display messages...?
+ if (DisplayBuffer.getAutoDisplay()) {
+ if (displayServerMessage()) {
+ // Interrupt processing.
+ // Will be continued via dialogActionPerformed().
+ return true;
+ }
+ }
+
if (!result) return false;
|
