[Rails-commits] 18xx/rails/game/specific/_1856 OperatingRound_1856.java, 1.14, 1.15

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

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

Modified Files:
	OperatingRound_1856.java 
Log Message:
Minor change in imports

Index: OperatingRound_1856.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/specific/_1856/OperatingRound_1856.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** OperatingRound_1856.java	28 Aug 2009 20:49:20 -0000	1.14
--- OperatingRound_1856.java	31 Aug 2009 22:35:21 -0000	1.15
***************
*** 1,8 ****
  package rails.game.specific._1856;
  
! import java.util.ArrayList;
! import java.util.Arrays;
! import java.util.Iterator;
! import java.util.List;
  
  import rails.game.*;
--- 1,5 ----
  package rails.game.specific._1856;
  
! import java.util.*;
  
  import rails.game.*;
***************
*** 455,462 ****
          // Find the first company that has not yet operated
          // and is not closed.
!         while (setNextOperatingCompany(false) 
                  && getOperatingCompany().isClosed());
!         
!         List<PublicCompanyI> companies 
                  = new ArrayList<PublicCompanyI>(Arrays.asList(operatingCompanyArray));
          PublicCompanyI company;
--- 452,459 ----
          // Find the first company that has not yet operated
          // and is not closed.
!         while (setNextOperatingCompany(false)
                  && getOperatingCompany().isClosed());
! 
!         List<PublicCompanyI> companies
                  = new ArrayList<PublicCompanyI>(Arrays.asList(operatingCompanyArray));
          PublicCompanyI company;
***************
*** 472,484 ****
              }
          }
!         
          if (operatingCompany != null) {
              operatingCompanyIndex = companies.indexOf(operatingCompany);
          }
!         
          for (PublicCompanyI c : companies) {
              log.debug("Now operating: "+c.getName());
          }
!         
          String message;
          if (cgr.hasStarted()) {
--- 469,481 ----
              }
          }
! 
          if (operatingCompany != null) {
              operatingCompanyIndex = companies.indexOf(operatingCompany);
          }
! 
          for (PublicCompanyI c : companies) {
              log.debug("Now operating: "+c.getName());
          }
! 
          String message;
          if (cgr.hasStarted()) {
***************
*** 499,505 ****
          operatingCompanyArray = companies.toArray(new PublicCompanyI[0]);
          operatingCompanyIndexObject.set(operatingCompanyIndex);
!         
          log.debug ("Next operating company: "+operatingCompany.getName());
!     }   
  
      @Override
--- 496,502 ----
          operatingCompanyArray = companies.toArray(new PublicCompanyI[0]);
          operatingCompanyIndexObject.set(operatingCompanyIndex);
! 
          log.debug ("Next operating company: "+operatingCompany.getName());
!     }
  
      @Override