Update of /cvsroot/rails/18xx/rails/game
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv24093/rails/game
Modified Files:
StockMarket.java StockMarketI.java StockSpace.java
StockSpaceI.java
Log Message:
Fix of undo problem: Stack position of token was not recovered correctly
Index: StockMarket.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/StockMarket.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** StockMarket.java 2 Feb 2010 20:00:20 -0000 1.26
--- StockMarket.java 10 Mar 2010 17:26:45 -0000 1.27
***************
*** 331,334 ****
--- 331,341 ----
}
+ public void processMoveToStackPosition(PublicCompanyI company, StockSpaceI from,
+ StockSpaceI to, int toStackPosition) {
+ if (from != null) from.removeToken(company);
+ if (to != null) to.addTokenAtStackPosition(company, toStackPosition);
+ company.updatePlayersWorth();
+ }
+
/**
* @return
Index: StockSpace.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/StockSpace.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** StockSpace.java 31 Jan 2010 22:22:28 -0000 1.10
--- StockSpace.java 10 Mar 2010 17:26:49 -0000 1.11
***************
*** 66,69 ****
--- 66,76 ----
}
+ public boolean addTokenAtStackPosition(PublicCompanyI company, int stackPosition) {
+ log.debug(company.getName() + " price token added to " + name + " at stack position "+stackPosition);
+ tokens.add(stackPosition, company);
+ update();
+ return true;
+ }
+
/**
* Remove a token from the pile.
Index: StockMarketI.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/StockMarketI.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** StockMarketI.java 9 Oct 2009 20:20:34 -0000 1.9
--- StockMarketI.java 10 Mar 2010 17:26:49 -0000 1.10
***************
*** 47,49 ****
--- 47,51 ----
StockSpaceI to);
+ public void processMoveToStackPosition(PublicCompanyI company, StockSpaceI from,
+ StockSpaceI to, int toStackPosition);
}
Index: StockSpaceI.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/StockSpaceI.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** StockSpaceI.java 13 Dec 2009 16:39:49 -0000 1.5
--- StockSpaceI.java 10 Mar 2010 17:26:49 -0000 1.6
***************
*** 148,151 ****
--- 148,153 ----
public boolean addToken(PublicCompanyI company);
+ public boolean addTokenAtStackPosition(PublicCompanyI company, int stackPosition);
+
public boolean removeToken(PublicCompanyI company);
|
