[Rails-commits] 18xx/rails/ui/swing MapPanel.java, 1.10, 1.11 GameSetupWindow.java, 1.13, 1.14 ORUIManager.java, 1.30, 1.31 ORWindow.java, 1.25, 1.26 GameUIManager.java, 1.20, 1.21

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

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

Modified Files:
	MapPanel.java GameSetupWindow.java ORUIManager.java 
	ORWindow.java GameUIManager.java 
Log Message:
More rationalising of static method usage

Index: GameUIManager.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/GameUIManager.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** GameUIManager.java	30 Oct 2009 21:53:04 -0000	1.20
--- GameUIManager.java	2 Nov 2009 23:30:35 -0000	1.21
***************
*** 28,32 ****
      public ORWindow orWindow; // TEMPORARY
      private StartRoundWindow startRoundWindow;
-     public GameSetupWindow gameSetupWindow;
      public static ImageLoader imageLoader;
  
--- 28,31 ----
***************
*** 56,63 ****
      }
  
!     public void init (GameSetupWindow gameSetupWindow) {
  
          instance = this;
!         this.gameSetupWindow = gameSetupWindow;
  
          saveDirectory = Config.get("save.directory");
--- 55,62 ----
      }
  
!     public void init (GameManagerI gameManager) {
  
          instance = this;
!         this.gameManager = gameManager;
  
          saveDirectory = Config.get("save.directory");
***************
*** 75,84 ****
          }
  
-         //gameSetupWindow = new GameSetupWindow(this);
- 
      }
  
      public void gameUIInit() {
-         gameManager = GameManager.getInstance();
          imageLoader = new ImageLoader();
          stockChart = new StockChart(this);
--- 74,80 ----
***************
*** 438,472 ****
      }
  
-     /*
-     public boolean loadGame() {
- 
-         JFileChooser jfc = new JFileChooser();
-         if (providedName != null) {
-             jfc.setSelectedFile(new File(providedName));
-         } else {
-             jfc.setCurrentDirectory(new File(saveDirectory));
-         }
- 
-         if (jfc.showOpenDialog(gameSetupWindow.getContentPane()) == JFileChooser.APPROVE_OPTION) {
-             File selectedFile = jfc.getSelectedFile();
-             String filepath = selectedFile.getPath();
-             saveDirectory = selectedFile.getParent();
- 
-             if (!Game.load(filepath)) {
-                 JOptionPane.showMessageDialog(gameSetupWindow,
-                         DisplayBuffer.get(), "", JOptionPane.ERROR_MESSAGE);
-                 return false;
-             }
-             DisplayBuffer.clear();
- 
-             gameUIInit();
-             processOnServer(null);
-             statusWindow.setGameActions();
-         }
- 
-         return true;
-     }
-     */
- 
      public PossibleAction getLastAction() {
          return lastAction;
--- 434,437 ----
***************
*** 481,484 ****
--- 446,457 ----
      }
  
+     public void setORUIManager(ORUIManager orUIManager) {
+         this.orUIManager = orUIManager;
+     }
+ 
+     public ORUIManager getORUIManager() {
+         return orUIManager;
+     }
+ 
      public RoundI getCurrentRound() {
          return gameManager.getCurrentRound();

Index: ORUIManager.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/ORUIManager.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** ORUIManager.java	30 Oct 2009 21:53:04 -0000	1.30
--- ORUIManager.java	2 Nov 2009 23:30:35 -0000	1.31
***************
*** 81,88 ****
      }
  
      public void init(ORWindow orWindow) {
  
          this.orWindow = orWindow;
-         gameUIManager = orWindow.getGameUIManager();
  
          orPanel = orWindow.getORPanel();
--- 81,91 ----
      }
  
+     public void setGameUIManager (GameUIManager gameUIManager) {
+     	this.gameUIManager = gameUIManager;
+     }
+ 
      public void init(ORWindow orWindow) {
  
          this.orWindow = orWindow;
  
          orPanel = orWindow.getORPanel();

Index: GameSetupWindow.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/GameSetupWindow.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** GameSetupWindow.java	4 May 2009 20:29:15 -0000	1.13
--- GameSetupWindow.java	2 Nov 2009 23:30:35 -0000	1.14
***************
*** 389,398 ****
      
      private void startGameUIManager(Game game) {
!         String gameUIManagerClassName = game.getGameManager().getClassName(Defs.ClassName.GAME_UI_MANAGER);
          try {
              Class<? extends GameUIManager> gameUIManagerClass =
                  Class.forName(gameUIManagerClassName).asSubclass(GameUIManager.class);
              gameUIManager = gameUIManagerClass.newInstance();
!             gameUIManager.init(this);
          } catch (Exception e) {
              log.fatal("Cannot instantiate class " + gameUIManagerClassName, e);
--- 389,399 ----
      
      private void startGameUIManager(Game game) {
!         GameManagerI gameManager = game.getGameManager();
!         String gameUIManagerClassName = gameManager.getClassName(Defs.ClassName.GAME_UI_MANAGER);
          try {
              Class<? extends GameUIManager> gameUIManagerClass =
                  Class.forName(gameUIManagerClassName).asSubclass(GameUIManager.class);
              gameUIManager = gameUIManagerClass.newInstance();
!             gameUIManager.init(gameManager);
          } catch (Exception e) {
              log.fatal("Cannot instantiate class " + gameUIManagerClassName, e);

Index: ORWindow.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/ORWindow.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** ORWindow.java	2 Sep 2009 21:47:47 -0000	1.25
--- ORWindow.java	2 Nov 2009 23:30:35 -0000	1.26
***************
*** 56,59 ****
--- 56,61 ----
              System.exit(1);
          }
+         gameUIManager.setORUIManager(orUIManager);
+         orUIManager.setGameUIManager(gameUIManager);
  
          getContentPane().setLayout(new BorderLayout());
***************
*** 62,66 ****
          getContentPane().add(messagePanel, BorderLayout.NORTH);
  
!         mapPanel = new MapPanel(orUIManager);
          getContentPane().add(mapPanel, BorderLayout.CENTER);
  
--- 64,68 ----
          getContentPane().add(messagePanel, BorderLayout.NORTH);
  
!         mapPanel = new MapPanel(gameUIManager);
          getContentPane().add(mapPanel, BorderLayout.CENTER);
  

Index: MapPanel.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/MapPanel.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** MapPanel.java	31 Oct 2009 17:08:26 -0000	1.10
--- MapPanel.java	2 Nov 2009 23:30:34 -0000	1.11
***************
*** 24,43 ****
      private HexMap map;
      private JScrollPane scrollPane;
!     private ORUIManager orUIManager;
  
      protected static Logger log =
              Logger.getLogger(MapPanel.class.getPackage().getName());
  
!     public MapPanel(ORUIManager orUIManager) {
!         this.orUIManager = orUIManager;
          Scale.set(15);
          setLayout(new BorderLayout());
  
!         //mmgr = orUIManager.getGameUIManager().getGameManager().getMapManager();
!         mmgr = MapManager.getInstance();
          try {
              map =
                      (HexMap) Class.forName(mmgr.getMapUIClassName()).newInstance();
!             map.setORUIManager(orUIManager);
          } catch (Exception e) {
              log.fatal("Map class instantiation error:", e);
--- 24,42 ----
      private HexMap map;
      private JScrollPane scrollPane;
!     private GameUIManager gameUIManager;
  
      protected static Logger log =
              Logger.getLogger(MapPanel.class.getPackage().getName());
  
!     public MapPanel(GameUIManager gameUIManager) {
!         this.gameUIManager = gameUIManager;
          Scale.set(15);
          setLayout(new BorderLayout());
  
!         mmgr = gameUIManager.getGameManager().getMapManager();
          try {
              map =
                      (HexMap) Class.forName(mmgr.getMapUIClassName()).newInstance();
!             map.init(gameUIManager.getORUIManager(), mmgr);
          } catch (Exception e) {
              log.fatal("Map class instantiation error:", e);
***************
*** 68,72 ****
      public void keyPressed(KeyEvent e) {
          if (e.getKeyCode() == KeyEvent.VK_F1) {
!             HelpWindow.displayHelp(orUIManager.gameUIManager.getHelp());
              e.consume();
          }
--- 67,71 ----
      public void keyPressed(KeyEvent e) {
          if (e.getKeyCode() == KeyEvent.VK_F1) {
!             HelpWindow.displayHelp(gameUIManager.getHelp());
              e.consume();
          }