[Rails-commits] 18xx/rails/game Round.java, 1.23, 1.24 StartRound.java, 1.25, 1.26 PublicCompany.java, 1.61, 1.62 StockRound.java, 1.43, 1.44 StockMarket.java, 1.17, 1.18

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

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

Modified Files:
	Round.java StartRound.java PublicCompany.java StockRound.java 
	StockMarket.java 
Log Message:
Removed statics from StockMarket (no longer a singleton)

Index: StockMarket.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/StockMarket.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** StockMarket.java	6 Sep 2009 12:27:33 -0000	1.17
--- StockMarket.java	25 Sep 2009 19:29:56 -0000	1.18
***************
*** 21,26 ****
      protected int[] startPrices;
  
-     protected static StockMarketI instance;
- 
      /* Game-specific flags */
      protected boolean upOrDownRight = false; /*
--- 21,24 ----
***************
*** 37,48 ****
      ArrayList<PublicCertificate> ipoPile;
  
-     // ArrayList companiesStarted;
- 
      public StockMarket() {
-         instance = this;
-     }
- 
-     public static StockMarketI getInstance() {
-         return instance;
      }
  
--- 35,39 ----
***************
*** 317,321 ****
          }
          company.setCurrentSpace(to);
!         new PriceTokenMove(company, from, to);
      }
  
--- 308,312 ----
          }
          company.setCurrentSpace(to);
!         new PriceTokenMove(company, from, to, this);
      }
  

Index: PublicCompany.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/PublicCompany.java,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** PublicCompany.java	25 Sep 2009 19:13:01 -0000	1.61
--- PublicCompany.java	25 Sep 2009 19:29:56 -0000	1.62
***************
*** 243,246 ****
--- 243,247 ----
      protected GameManagerI gameManager;
      protected Bank bank;
+     protected StockMarketI stockMarket;
  
      /**
***************
*** 643,649 ****
          this.gameManager = gameManager;
          bank = gameManager.getBank();
  
          if (hasStockPrice && Util.hasValue(startSpace)) {
!             parPrice.setPrice(StockMarket.getInstance().getStockSpace(
                      startSpace));
              if (parPrice.getPrice() == null)
--- 644,651 ----
          this.gameManager = gameManager;
          bank = gameManager.getBank();
+         stockMarket = gameManager.getStockMarket();
  
          if (hasStockPrice && Util.hasValue(startSpace)) {
!             parPrice.setPrice(stockMarket.getStockSpace(
                      startSpace));
              if (parPrice.getPrice() == null)
***************
*** 794,798 ****
          setParSpace(startSpace);
          // The current price is set via the Stock Market
!         StockMarket.getInstance().start(this, startSpace);
  
          /* Final initialisations */
--- 796,800 ----
          setParSpace(startSpace);
          // The current price is set via the Stock Market
!         stockMarket.start(this, startSpace);
  
          /* Final initialisations */
***************
*** 809,813 ****
  
      public void start(int price) {
!         StockSpaceI startSpace = StockMarket.getInstance().getStartSpace(price);
          if (startSpace == null) {
              log.error("Invalid start price " + Bank.format(price));
--- 811,815 ----
  
      public void start(int price) {
!         StockSpaceI startSpace = stockMarket.getStartSpace(price);
          if (startSpace == null) {
              log.error("Invalid start price " + Bank.format(price));
***************
*** 908,912 ****
  
          Util.moveObjects(laidBaseTokens, this);
!         StockMarket.getInstance().close(this);
  
      }
--- 910,914 ----
  
          Util.moveObjects(laidBaseTokens, this);
!         stockMarket.close(this);
  
      }

Index: Round.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/Round.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** Round.java	25 Sep 2009 19:13:01 -0000	1.23
--- Round.java	25 Sep 2009 19:29:56 -0000	1.24
***************
*** 35,38 ****
--- 35,39 ----
      protected Portfolio unavailable = null;
      protected Portfolio scrapHeap = null;
+     protected StockMarketI stockMarket;
  
      protected Class<? extends RoundI> roundTypeForUI = null;
***************
*** 59,62 ****
--- 60,64 ----
              unavailable = bank.getUnavailable();
              scrapHeap = bank.getScrapHeap();
+             stockMarket = aGameManager.getStockMarket();
          }
  

Index: StartRound.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/StartRound.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** StartRound.java	19 Jul 2009 19:24:21 -0000	1.25
--- StartRound.java	25 Sep 2009 19:29:56 -0000	1.26
***************
*** 208,212 ****
                      break;
                  }
!                 if ((StockMarket.getInstance().getStartSpace(sharePrice)) == null) {
                      errMsg =
                              LocalText.getText("InvalidStartPrice",
--- 208,212 ----
                      break;
                  }
!                 if ((stockMarket.getStartSpace(sharePrice)) == null) {
                      errMsg =
                              LocalText.getText("InvalidStartPrice",

Index: StockRound.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/StockRound.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** StockRound.java	25 Sep 2009 19:13:01 -0000	1.43
--- StockRound.java	25 Sep 2009 19:29:56 -0000	1.44
***************
*** 49,55 ****
      static public final int SOLD = 1;
  
-     /* Permanent memory */
-     static protected StockMarketI stockMarket;
- 
      /* Rules */
      protected int sequenceRule;
--- 49,52 ----
***************
*** 69,73 ****
          if (numberOfPlayers == 0)
              numberOfPlayers = gameManager.getPlayers().size();
-         if (stockMarket == null) stockMarket = StockMarket.getInstance();
  
          sequenceRule = gameManager.getStockRoundSequenceRule();
--- 66,69 ----