[Rails-commits] 18xx/rails/game/action StartCompany.java, 1.8, 1.9 DiscardTrain.java, 1.9, 1.10 BuyTrain.java, 1.10, 1.11 BuyBonusToken.java, 1.2, 1.3 BuyCertificate.java, 1.11, 1.12

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

Update of /cvsroot/rails/18xx/rails/game/action
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv21355/rails/game/action

Modified Files:
	StartCompany.java DiscardTrain.java BuyTrain.java 
	BuyBonusToken.java BuyCertificate.java 
Log Message:
More rationalising of static method usage

Index: BuyBonusToken.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/action/BuyBonusToken.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** BuyBonusToken.java	29 Oct 2009 19:41:30 -0000	1.2
--- BuyBonusToken.java	4 Nov 2009 20:33:21 -0000	1.3
***************
*** 9,13 ****
  import java.io.ObjectInputStream;
  
! import rails.game.*;
  import rails.game.special.SellBonusToken;
  import rails.game.special.SpecialProperty;
--- 9,14 ----
  import java.io.ObjectInputStream;
  
! import rails.game.CashHolder;
! import rails.game.PrivateCompanyI;
  import rails.game.special.SellBonusToken;
  import rails.game.special.SpecialProperty;
***************
*** 118,122 ****
                  getCompanyManager().getPrivateCompany(privateCompanyName);
          if (sellerName.equalsIgnoreCase("Bank")) {
!         	seller = Bank.getInstance();
          } else if (sellerName != null) {
          	seller =
--- 119,123 ----
                  getCompanyManager().getPrivateCompany(privateCompanyName);
          if (sellerName.equalsIgnoreCase("Bank")) {
!         	seller = gameManager.getBank();
          } else if (sellerName != null) {
          	seller =

Index: BuyTrain.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/action/BuyTrain.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** BuyTrain.java	4 Jun 2008 19:00:29 -0000	1.10
--- BuyTrain.java	4 Nov 2009 20:33:21 -0000	1.11
***************
*** 222,232 ****
          in.defaultReadObject();
  
!         train = Train.getByUniqueId(trainUniqueId);
!         from = Portfolio.getByName(fromName);
          if (trainsForExchangeUniqueIds != null
              && trainsForExchangeUniqueIds.length > 0) {
              trainsForExchange = new ArrayList<TrainI>();
              for (int i = 0; i < trainsForExchangeUniqueIds.length; i++) {
!                 trainsForExchange.add(Train.getByUniqueId(trainsForExchangeUniqueIds[i]));
              }
          }
--- 222,235 ----
          in.defaultReadObject();
  
!         GameManagerI gameManager = GameManager.getInstance();
!         TrainManager trainManager = gameManager.getTrainManager();
! 
!         train = trainManager.getTrainByUniqueId(trainUniqueId);
!         from = gameManager.getPortfolioByName(fromName);
          if (trainsForExchangeUniqueIds != null
              && trainsForExchangeUniqueIds.length > 0) {
              trainsForExchange = new ArrayList<TrainI>();
              for (int i = 0; i < trainsForExchangeUniqueIds.length; i++) {
!                 trainsForExchange.add(trainManager.getTrainByUniqueId(trainsForExchangeUniqueIds[i]));
              }
          }
***************
*** 238,242 ****
  
          if (Util.hasValue(exchangedTrainUniqueId)) {
!             exchangedTrain = Train.getByUniqueId(exchangedTrainUniqueId);
          }
      }
--- 241,245 ----
  
          if (Util.hasValue(exchangedTrainUniqueId)) {
!             exchangedTrain = trainManager.getTrainByUniqueId(exchangedTrainUniqueId);
          }
      }

Index: BuyCertificate.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/action/BuyCertificate.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** BuyCertificate.java	2 Nov 2008 19:52:48 -0000	1.11
--- BuyCertificate.java	4 Nov 2009 20:33:22 -0000	1.12
***************
*** 9,16 ****
  import java.io.ObjectInputStream;
  
! import rails.game.Bank;
! import rails.game.Portfolio;
! import rails.game.PublicCertificate;
! import rails.game.PublicCertificateI;
  
  /**
--- 9,13 ----
  import java.io.ObjectInputStream;
  
! import rails.game.*;
  
  /**
***************
*** 125,130 ****
  
          in.defaultReadObject();
          certificate = PublicCertificate.getByUniqueId(certUniqueId);
!         from = Portfolio.getByName(fromName);
  
      }
--- 122,130 ----
  
          in.defaultReadObject();
+ 
+         GameManagerI gameManager = GameManager.getInstance();
+ 
          certificate = PublicCertificate.getByUniqueId(certUniqueId);
!         from = gameManager.getPortfolioByName(fromName);
  
      }

Index: StartCompany.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/action/StartCompany.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** StartCompany.java	25 Sep 2009 19:13:01 -0000	1.8
--- StartCompany.java	4 Nov 2009 20:33:21 -0000	1.9
***************
*** 1,6 ****
  package rails.game.action;
  
! import rails.game.Bank;
! import rails.game.PublicCertificateI;
  
  public class StartCompany extends BuyCertificate {
--- 1,5 ----
  package rails.game.action;
  
! import rails.game.*;
  
  public class StartCompany extends BuyCertificate {
***************
*** 13,17 ****
      public StartCompany(PublicCertificateI certificate, int[] prices,
              int maximumNumber) {
!         super(certificate, Bank.getInstance().getIpo(), 0, maximumNumber);
          this.startPrices = prices.clone();
      }
--- 12,16 ----
      public StartCompany(PublicCertificateI certificate, int[] prices,
              int maximumNumber) {
!         super(certificate, GameManager.getInstance().getBank().getIpo(), 0, maximumNumber);
          this.startPrices = prices.clone();
      }
***************
*** 23,27 ****
      public StartCompany(PublicCertificateI certificate, int price,
              int maximumNumber) {
!         super(certificate, Bank.getInstance().getIpo(), 0, maximumNumber);
          this.price = price;
      }
--- 22,26 ----
      public StartCompany(PublicCertificateI certificate, int price,
              int maximumNumber) {
!         super(certificate, GameManager.getInstance().getBank().getIpo(), 0, maximumNumber);
          this.price = price;
      }

Index: DiscardTrain.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/action/DiscardTrain.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** DiscardTrain.java	4 May 2009 20:29:15 -0000	1.9
--- DiscardTrain.java	4 Nov 2009 20:33:21 -0000	1.10
***************
*** 95,100 ****
          in.defaultReadObject();
  
          if (discardedTrainUniqueId != null) {
!             discardedTrain = Train.getByUniqueId(discardedTrainUniqueId);
          }
  
--- 95,102 ----
          in.defaultReadObject();
  
+         TrainManager trainManager = GameManager.getInstance().getTrainManager();
+ 
          if (discardedTrainUniqueId != null) {
!             discardedTrain = trainManager.getTrainByUniqueId(discardedTrainUniqueId);
          }
  
***************
*** 102,106 ****
              ownedTrains = new ArrayList<TrainI>();
              for (int i = 0; i < ownedTrainsUniqueIds.length; i++) {
!                 ownedTrains.add(Train.getByUniqueId(ownedTrainsUniqueIds[i]));
              }
          }
--- 104,108 ----
              ownedTrains = new ArrayList<TrainI>();
              for (int i = 0; i < ownedTrainsUniqueIds.length; i++) {
!                 ownedTrains.add(trainManager.getTrainByUniqueId(ownedTrainsUniqueIds[i]));
              }
          }