[Rails-commits] 18xx/rails/ui/swing RemainingTilesWindow.java, 1.6, 1.7 ORWindow.java, 1.26, 1.27 GameSetupWindow.java, 1.15, 1.16

[Erik V. <ev...@us...>]

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

Modified Files:
	RemainingTilesWindow.java ORWindow.java GameSetupWindow.java 
Log Message:
Fixed various bugs

Index: ORWindow.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/ORWindow.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** ORWindow.java	2 Nov 2009 23:30:35 -0000	1.26
--- ORWindow.java	17 Nov 2009 19:31:27 -0000	1.27
***************
*** 113,120 ****
      }
  
-     public ORUIManager getOrUIManager() {
-         return orUIManager;
-     }
- 
      public MessagePanel getMessagePanel() {
          return messagePanel;
--- 113,116 ----

Index: RemainingTilesWindow.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/RemainingTilesWindow.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** RemainingTilesWindow.java	30 Oct 2009 21:53:03 -0000	1.6
--- RemainingTilesWindow.java	17 Nov 2009 19:31:27 -0000	1.7
***************
*** 48,52 ****
          addWindowListener(this);
  
!         init();
  
          this.setDefaultCloseOperation(WindowConstants.HIDE_ON_CLOSE);
--- 48,52 ----
          addWindowListener(this);
  
!         init(orWindow.getGameUIManager());
  
          this.setDefaultCloseOperation(WindowConstants.HIDE_ON_CLOSE);
***************
*** 56,60 ****
      }
  
!     private void init() {
  
          TileManager tmgr = gameUIManager.getGameManager().getTileManager();
--- 56,60 ----
      }
  
!     private void init(GameUIManager gameUIManager) {
  
          TileManager tmgr = gameUIManager.getGameManager().getTileManager();

Index: GameSetupWindow.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/GameSetupWindow.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** GameSetupWindow.java	8 Nov 2009 10:45:49 -0000	1.15
--- GameSetupWindow.java	17 Nov 2009 19:31:28 -0000	1.16
***************
*** 4,7 ****
--- 4,11 ----
  import java.awt.*;
  import java.awt.event.*;
+ import java.io.File;
+ import java.util.*;
+ import java.util.List;
+ 
  import javax.swing.*;
  
***************
*** 10,19 ****
  import rails.common.Defs;
  import rails.game.*;
! import rails.ui.swing.GameUIManager;
! import rails.util.*;
! 
! import java.io.File;
! import java.util.*;
! import java.util.List;
  
  /**
--- 14,19 ----
  import rails.common.Defs;
  import rails.game.*;
! import rails.util.Config;
! import rails.util.LocalText;
  
  /**
***************
*** 371,375 ****
              System.exit(-1);
          } else {
!             game.start();
              startGameUIManager (game);
              gameUIManager.gameUIInit();
--- 371,380 ----
              System.exit(-1);
          } else {
!             String startError = game.start();
!             if (startError != null) {
!                 JOptionPane.showMessageDialog(this, startError, "",
!                         JOptionPane.ERROR_MESSAGE);
!             	System.exit(-1);
!             }
              startGameUIManager (game);
              gameUIManager.gameUIInit();
***************
*** 379,383 ****
          // XXX: object rather than just making it invisible
      }
!     
      private void startGameUIManager(Game game) {
          GameManagerI gameManager = game.getGameManager();
--- 384,388 ----
          // XXX: object rather than just making it invisible
      }
! 
      private void startGameUIManager(Game game) {
          GameManagerI gameManager = game.getGameManager();