[Rails-commits] 18xx/rails/game/specific/_1856 OperatingRound_1856.java, 1.33, 1.34 StockRound_1856.java, 1.15, 1.16 CGRFormationRound.java, 1.33, 1.34

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

Update of /cvsroot/rails/18xx/rails/game/specific/_1856
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv19350/rails/game/specific/_1856

Modified Files:
	OperatingRound_1856.java StockRound_1856.java 
	CGRFormationRound.java 
Log Message:
Removed a redundant (because duplicate) method

Index: StockRound_1856.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/specific/_1856/StockRound_1856.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** StockRound_1856.java	27 Mar 2010 18:27:08 -0000	1.15
--- StockRound_1856.java	15 Apr 2010 19:49:50 -0000	1.16
***************
*** 154,158 ****
  
          PublicCompany_CGR cgr =
!             (PublicCompany_CGR)companyManager.getCompanyByName(PublicCompany_CGR.NAME);
          if (cgr.hasStarted() && cgr.getPresident() == currentPlayer
                  && cgr.hasTemporaryPresident()) {
--- 154,158 ----
  
          PublicCompany_CGR cgr =
!             (PublicCompany_CGR)companyManager.getPublicCompany(PublicCompany_CGR.NAME);
          if (cgr.hasStarted() && cgr.getPresident() == currentPlayer
                  && cgr.hasTemporaryPresident()) {

Index: CGRFormationRound.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/specific/_1856/CGRFormationRound.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** CGRFormationRound.java	16 Feb 2010 20:19:47 -0000	1.33
--- CGRFormationRound.java	15 Apr 2010 19:49:50 -0000	1.34
***************
*** 22,26 ****
      private String cgrName = PublicCompany_CGR.NAME;
      private PublicCompany_CGR cgr
!         = (PublicCompany_CGR)gameManager.getCompanyManager().getCompanyByName(cgrName);
      private List<TrainI> trainsToDiscardFrom = null;
      private boolean forcedTrainDiscard = true;
--- 22,26 ----
      private String cgrName = PublicCompany_CGR.NAME;
      private PublicCompany_CGR cgr
!         = (PublicCompany_CGR)gameManager.getCompanyManager().getPublicCompany(cgrName);
      private List<TrainI> trainsToDiscardFrom = null;
      private boolean forcedTrainDiscard = true;

Index: OperatingRound_1856.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/specific/_1856/OperatingRound_1856.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** OperatingRound_1856.java	23 Mar 2010 18:44:17 -0000	1.33
--- OperatingRound_1856.java	15 Apr 2010 19:49:50 -0000	1.34
***************
*** 486,490 ****
          List<PublicCompanyI> companies
                  = new ArrayList<PublicCompanyI>(Arrays.asList(operatingCompanyArray));
!         PublicCompanyI cgr = companyManager.getCompanyByName(PublicCompany_CGR.NAME);
          boolean cgrCanOperate = cgr.hasStarted();
  
--- 486,490 ----
          List<PublicCompanyI> companies
                  = new ArrayList<PublicCompanyI>(Arrays.asList(operatingCompanyArray));
!         PublicCompanyI cgr = companyManager.getPublicCompany(PublicCompany_CGR.NAME);
          boolean cgrCanOperate = cgr.hasStarted();