[Rails-commits] 18xx/rails/game/move PriceTokenMove.java,1.6,1.7

[Stefan F. <ste...@us...>]

Update of /cvsroot/rails/18xx/rails/game/move
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv24093/rails/game/move

Modified Files:
	PriceTokenMove.java 
Log Message:
Fix of undo problem: Stack position of token was not recovered correctly

Index: PriceTokenMove.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/move/PriceTokenMove.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** PriceTokenMove.java	31 Jan 2010 22:22:30 -0000	1.6
--- PriceTokenMove.java	10 Mar 2010 17:26:49 -0000	1.7
***************
*** 15,18 ****
--- 15,19 ----
      private PublicCompanyI company;
      private StockSpaceI from, to;
+     private int fromStackPosition;
      private StockMarketI stockMarket = null;
  
***************
*** 22,25 ****
--- 23,30 ----
          this.from = from;
          this.to = to;
+         if (from != null) 
+             fromStackPosition = from.getStackPosition(company);
+         else
+             fromStackPosition = 0;
          this.stockMarket = stockMarket;
  
***************
*** 35,39 ****
      @Override
      public boolean undo() {
!         stockMarket.processMove(company, to, from);
          return true;
      }
--- 40,44 ----
      @Override
      public boolean undo() {
!         stockMarket.processMoveToStackPosition(company, to, from, fromStackPosition);
          return true;
      }
***************
*** 41,46 ****
      @Override
      public String toString() {
!         return "PriceTokenMove: " + company.getName() + " from " + from
!                + " to " + to;
      }
  
--- 46,51 ----
      @Override
      public String toString() {
!         return "PriceTokenMove: " + company.getName() + " from " + from + " (at stack "
!             + fromStackPosition + ") to " + to;
      }