[Rails-commits] 18xx/rails/game PublicCompanyI.java, 1.42, 1.43 PublicCompany.java, 1.79, 1.80 StockMarket.java, 1.25, 1.26

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

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

Modified Files:
	PublicCompanyI.java PublicCompany.java StockMarket.java 
Log Message:
Player worth is now updated at each price token move (except Undo and Redo)

Index: StockMarket.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/StockMarket.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** StockMarket.java	31 Jan 2010 22:22:28 -0000	1.25
--- StockMarket.java	2 Feb 2010 20:00:20 -0000	1.26
***************
*** 326,332 ****
      public void processMove(PublicCompanyI company, StockSpaceI from,
              StockSpaceI to) {
-         // To be written to a log file in the future.
          if (from != null) from.removeToken(company);
          if (to != null) to.addToken(company);
      }
  
--- 326,332 ----
      public void processMove(PublicCompanyI company, StockSpaceI from,
              StockSpaceI to) {
          if (from != null) from.removeToken(company);
          if (to != null) to.addToken(company);
+         company.updatePlayersWorth();
      }
  

Index: PublicCompany.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/PublicCompany.java,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -d -r1.79 -r1.80
*** PublicCompany.java	31 Jan 2010 22:22:28 -0000	1.79
--- PublicCompany.java	2 Feb 2010 20:00:03 -0000	1.80
***************
*** 1033,1036 ****
--- 1033,1051 ----
      }
  
+     public void updatePlayersWorth() {
+         
+         Map<Player, Boolean> done = new HashMap<Player, Boolean>(8);
+         Player owner;
+         for (PublicCertificateI cert : certificates) {
+             if (cert.getHolder() instanceof Portfolio
+                     && ((Portfolio)cert.getHolder()).getOwner() instanceof Player) {
+                 owner = (Player)((Portfolio)cert.getHolder()).getOwner();
+                 if (!done.containsKey(owner)) {
+                     owner.updateWorth();
+                     done.put(owner, true);
+                 }
+             }
+         }
+     }
  
      /**

Index: PublicCompanyI.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/PublicCompanyI.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** PublicCompanyI.java	31 Jan 2010 22:22:28 -0000	1.42
--- PublicCompanyI.java	2 Feb 2010 19:59:43 -0000	1.43
***************
*** 253,256 ****
--- 253,258 ----
              StockMarketI stockMarket);
  
+     public void updatePlayersWorth();
+     
      public boolean isSplitAllowed();