[Rails-commits] 18xx/rails/game/specific/_1856 CGRFormationRound.java, 1.21, 1.22 StockRound_1856.java, 1.11, 1.12

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

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

Modified Files:
	CGRFormationRound.java StockRound_1856.java 
Log Message:
More rationalising of static method usage

Index: StockRound_1856.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/specific/_1856/StockRound_1856.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** StockRound_1856.java	7 Oct 2009 21:03:36 -0000	1.11
--- StockRound_1856.java	31 Oct 2009 17:08:26 -0000	1.12
***************
*** 54,58 ****
  
          if (price != 0
-                 && cert instanceof PublicCertificateI
                  && !cert.getCompany().getName().equalsIgnoreCase(PublicCompany_CGR.NAME)
                  && oldHolder == ipo) {
--- 54,57 ----

Index: CGRFormationRound.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/specific/_1856/CGRFormationRound.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** CGRFormationRound.java	7 Oct 2009 21:03:36 -0000	1.21
--- CGRFormationRound.java	31 Oct 2009 17:08:26 -0000	1.22
***************
*** 514,518 ****
  	            List<Bonus> bonuses = new ArrayList<Bonus> (comp.getBonuses());
  	            for (Bonus bonus : bonuses) {
! 	            	cgr.addBonus(new Bonus(cgr, bonus.getName(), bonus.getValue(), bonus.getLocationNameString()));
  	            	comp.removeBonus(bonus);
  	            }
--- 514,519 ----
  	            List<Bonus> bonuses = new ArrayList<Bonus> (comp.getBonuses());
  	            for (Bonus bonus : bonuses) {
! 	            	cgr.addBonus(new Bonus(cgr, bonus.getName(), bonus.getValue(), 
!                             bonus.getLocations()));
  	            	comp.removeBonus(bonus);
  	            }