[Rails-commits] 18xx/rails/ui/swing GameStatus.java, 1.27, 1.28 GameUIManager.java, 1.18, 1.19

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

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

Modified Files:
	GameStatus.java GameUIManager.java 
Log Message:
Rationalised Bank, removing statics
Removed two unnecessary Util methods

Index: GameStatus.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/GameStatus.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** GameStatus.java	12 Sep 2009 19:48:39 -0000	1.27
--- GameStatus.java	25 Sep 2009 19:13:01 -0000	1.28
***************
*** 103,106 ****
--- 103,107 ----
  
      protected GameUIManager gameUIManager;
+     protected Bank bank;
  
      protected PossibleActions possibleActions = PossibleActions.getInstance();
***************
*** 139,142 ****
--- 140,144 ----
          this.parent = parent;
          this.gameUIManager = gameUIManager;
+         bank = gameUIManager.getGameManager().getBank();
  
          gb = new GridBagLayout();
***************
*** 160,165 ****
          hasCompanyLoans = gameUIManager.getGameParameterAsBoolean(Defs.Parm.HAS_ANY_COMPANY_LOANS);
  
!         ipo = Bank.getIpo();
!         pool = Bank.getPool();
  
          certPerPlayer = new Field[nc][np];
--- 162,167 ----
          hasCompanyLoans = gameUIManager.getGameParameterAsBoolean(Defs.Parm.HAS_ANY_COMPANY_LOANS);
  
!         ipo = bank.getIpo();
!         pool = bank.getPool();
  
          certPerPlayer = new Field[nc][np];
***************
*** 326,330 ****
                          1, 1, 0);
              }
!             f = certInIPO[i] = new Field(Bank.getIpo().getShareModel(c));
              addField(f, certInIPOXOffset, certInIPOYOffset + i, 1, 1, WIDE_LEFT);
              f =
--- 328,332 ----
                          1, 1, 0);
              }
!             f = certInIPO[i] = new Field(ipo.getShareModel(c));
              addField(f, certInIPOXOffset, certInIPOYOffset + i, 1, 1, WIDE_LEFT);
              f =
***************
*** 339,343 ****
              certInIPO[i].setPreferredSize(certInIPOButton[i].getPreferredSize());
  
!             f = certInPool[i] = new Field(Bank.getPool().getShareModel(c));
              addField(f, certInPoolXOffset, certInPoolYOffset + i, 1, 1,
                      WIDE_RIGHT);
--- 341,345 ----
              certInIPO[i].setPreferredSize(certInIPOButton[i].getPreferredSize());
  
!             f = certInPool[i] = new Field(pool.getShareModel(c));
              addField(f, certInPoolXOffset, certInPoolYOffset + i, 1, 1,
                      WIDE_RIGHT);
***************
*** 475,479 ****
          addField(new Caption(LocalText.getText("CASH")), bankCashXOffset,
                  bankCashYOffset - 1, 1, 1, WIDE_TOP);
!         bankCash = new Field(Bank.getInstance().getCashModel());
          addField(bankCash, bankCashXOffset, bankCashYOffset, 1, 1, 0);
  
--- 477,481 ----
          addField(new Caption(LocalText.getText("CASH")), bankCashXOffset,
                  bankCashYOffset - 1, 1, 1, WIDE_TOP);
!         bankCash = new Field(bank.getCashModel());
          addField(bankCash, bankCashXOffset, bankCashYOffset, 1, 1, 0);
  
***************
*** 484,488 ****
          addField(new Caption(LocalText.getText("USED")), poolTrainsXOffset,
                  poolTrainsYOffset - 1, 1, 1, WIDE_TOP);
!         poolTrains = new Field(Bank.getPool().getTrainsModel());
          addField(poolTrains, poolTrainsXOffset, poolTrainsYOffset, 1, 1, 0);
  
--- 486,490 ----
          addField(new Caption(LocalText.getText("USED")), poolTrainsXOffset,
                  poolTrainsYOffset - 1, 1, 1, WIDE_TOP);
!         poolTrains = new Field(pool.getTrainsModel());
          addField(poolTrains, poolTrainsXOffset, poolTrainsYOffset, 1, 1, 0);
  
***************
*** 490,494 ****
          addField(new Caption(LocalText.getText("NEW")), newTrainsXOffset,
                  newTrainsYOffset - 1, 1, 1, WIDE_TOP);
!         newTrains = new Field(Bank.getIpo().getTrainsModel());
          addField(newTrains, newTrainsXOffset, newTrainsYOffset, 1, 1, 0);
  
--- 492,496 ----
          addField(new Caption(LocalText.getText("NEW")), newTrainsXOffset,
                  newTrainsYOffset - 1, 1, 1, WIDE_TOP);
!         newTrains = new Field(ipo.getTrainsModel());
          addField(newTrains, newTrainsXOffset, newTrainsYOffset, 1, 1, 0);
  
***************
*** 498,502 ****
          addField(new Caption(LocalText.getText("Future")), futureTrainsXOffset,
                  futureTrainsYOffset - 1, futureTrainsWidth, 1, WIDE_TOP);
!         futureTrains = new Field(Bank.getUnavailable().getTrainsModel());
          addField(futureTrains, futureTrainsXOffset, futureTrainsYOffset,
                  futureTrainsWidth, 1, 0);
--- 500,504 ----
          addField(new Caption(LocalText.getText("Future")), futureTrainsXOffset,
                  futureTrainsYOffset - 1, futureTrainsWidth, 1, WIDE_TOP);
!         futureTrains = new Field(bank.getUnavailable().getTrainsModel());
          addField(futureTrains, futureTrainsXOffset, futureTrainsYOffset,
                  futureTrainsWidth, 1, 0);

Index: GameUIManager.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/GameUIManager.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** GameUIManager.java	12 Sep 2009 19:48:39 -0000	1.18
--- GameUIManager.java	25 Sep 2009 19:13:01 -0000	1.19
***************
*** 137,141 ****
              return true;
  
!         } else if (Bank.isJustBroken()) {
  
              statusWindow.reportBankBroken();
--- 137,141 ----
              return true;
  
!         } else if (gameManager.getBank().isJustBroken()) {
  
              statusWindow.reportBankBroken();