[Rails-commits] 18xx/rails/ui/swing ORWindow.java,1.20,1.21

[Mark J S. <kr...@us...>]

Update of /cvsroot/rails/18xx/rails/ui/swing
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv12432/18xx/rails/ui/swing

Modified Files:
	ORWindow.java 
Log Message:
Update OR Window Title to show 'Operating Round #.# of #, where the last # is the total number of Operating Rounds to be performed before going back to the Stock Round.

Index: ORWindow.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/ORWindow.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** ORWindow.java	11 Dec 2008 20:10:25 -0000	1.20
--- ORWindow.java	3 Jan 2009 22:51:16 -0000	1.21
***************
*** 16,19 ****
--- 16,20 ----
  import rails.common.Defs;
  import rails.game.DisplayBuffer;
+ import rails.game.GameManager;
  import rails.game.OperatingRound;
  import rails.game.action.*;
***************
*** 155,161 ****
  
      public void activate(OperatingRound or) {
          orPanel.recreate(or);
          setTitle(LocalText.getText("MapWindowORTitle",
!                 gameUIManager.getGameManager().getCompositeORNumber()));
          pack();
          if (lastBounds != null) {
--- 156,168 ----
  
      public void activate(OperatingRound or) {
+ 		GameManager gameManager = (GameManager) gameUIManager.getGameManager();
+ 		String compositeORNumber = gameManager.getCompositeORNumber ();
+ 		String numORs = gameManager.getNumOfORs ();
+ 		
          orPanel.recreate(or);
          setTitle(LocalText.getText("MapWindowORTitle",
! 								   new String [] {compositeORNumber, numORs} ));
! //								   gameManager.getCompositeORNumber(),
! //								   gameManager.getNumOfORs ()}));
          pack();
          if (lastBounds != null) {