[Rails-commits] 18xx/rails/game/move PriceTokenMove.java,1.3,1.4

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

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

Modified Files:
	PriceTokenMove.java 
Log Message:
Removed statics from StockMarket (no longer a singleton)

Index: PriceTokenMove.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/move/PriceTokenMove.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PriceTokenMove.java	4 Jun 2008 19:00:33 -0000	1.3
--- PriceTokenMove.java	25 Sep 2009 19:29:56 -0000	1.4
***************
*** 8,11 ****
--- 8,12 ----
  import rails.game.PublicCompanyI;
  import rails.game.StockMarket;
+ import rails.game.StockMarketI;
  import rails.game.StockSpaceI;
  
***************
*** 17,26 ****
      private PublicCompanyI company;
      private StockSpaceI from, to;
  
      public PriceTokenMove(PublicCompanyI company, StockSpaceI from,
!             StockSpaceI to) {
          this.company = company;
          this.from = from;
          this.to = to;
  
          MoveSet.add(this);
--- 18,29 ----
      private PublicCompanyI company;
      private StockSpaceI from, to;
+     private StockMarketI stockMarket = null;
  
      public PriceTokenMove(PublicCompanyI company, StockSpaceI from,
!             StockSpaceI to, StockMarketI stockMarket) {
          this.company = company;
          this.from = from;
          this.to = to;
+         this.stockMarket = stockMarket;
  
          MoveSet.add(this);
***************
*** 28,37 ****
  
      public boolean execute() {
!         StockMarket.getInstance().processMove(company, from, to);
          return true;
      }
  
      public boolean undo() {
!         StockMarket.getInstance().processMove(company, to, from);
          return true;
      }
--- 31,40 ----
  
      public boolean execute() {
!         stockMarket.processMove(company, from, to);
          return true;
      }
  
      public boolean undo() {
!         stockMarket.processMove(company, to, from);
          return true;
      }