[Rails-commits] 18xx/rails/game/specific/_18EU FinalMinorExchangeRound.java, 1.8, 1.9 StartCompany_18EU.java, 1.6, 1.7

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

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

Modified Files:
	FinalMinorExchangeRound.java StartCompany_18EU.java 
Log Message:
More rationalising of static method usage

Index: FinalMinorExchangeRound.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/specific/_18EU/FinalMinorExchangeRound.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** FinalMinorExchangeRound.java	7 Oct 2009 19:00:38 -0000	1.8
--- FinalMinorExchangeRound.java	29 Oct 2009 19:41:30 -0000	1.9
***************
*** 96,100 ****
          moveStack.start(false);
  
!         for (PublicCompanyI comp : Game.getCompanyManager().getAllPublicCompanies()) {
              if (comp.getTypeName().equals("Minor")) {
                  if (!comp.isClosed()) {
--- 96,100 ----
          moveStack.start(false);
  
!         for (PublicCompanyI comp : companyManager.getAllPublicCompanies()) {
              if (comp.getTypeName().equals("Minor")) {
                  if (!comp.isClosed()) {

Index: StartCompany_18EU.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/specific/_18EU/StartCompany_18EU.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** StartCompany_18EU.java	3 Oct 2009 14:02:28 -0000	1.6
--- StartCompany_18EU.java	29 Oct 2009 19:41:30 -0000	1.7
***************
*** 111,115 ****
          in.defaultReadObject();
  
!         CompanyManagerI cmgr = Game.getCompanyManager();
          if (minorsToMergeNames != null) {
              minorsToMerge = new ArrayList<PublicCompanyI>();
--- 111,115 ----
          in.defaultReadObject();
  
!         CompanyManagerI cmgr = getCompanyManager();
          if (minorsToMergeNames != null) {
              minorsToMerge = new ArrayList<PublicCompanyI>();
***************
*** 121,130 ****
              chosenMinor = cmgr.getPublicCompany(chosenMinorName);
          }
!         
          MapManager mapManager = MapManager.getInstance();
          if (availableHomeStationNames != null) {
              availableHomeStations = new ArrayList<City>();
              for (String cityName : availableHomeStationNames.split(",")) {
!                 String[] parts = parseStationName (cityName); 
                  MapHex hex = mapManager.getHex(parts[0]);
                  availableHomeStations.add (hex.getCity(Integer.parseInt(parts[1])));
--- 121,130 ----
              chosenMinor = cmgr.getPublicCompany(chosenMinorName);
          }
! 
          MapManager mapManager = MapManager.getInstance();
          if (availableHomeStationNames != null) {
              availableHomeStations = new ArrayList<City>();
              for (String cityName : availableHomeStationNames.split(",")) {
!                 String[] parts = parseStationName (cityName);
                  MapHex hex = mapManager.getHex(parts[0]);
                  availableHomeStations.add (hex.getCity(Integer.parseInt(parts[1])));
***************
*** 132,143 ****
          }
          if (selectedHomeStationName != null) {
!             String[] parts = parseStationName (selectedHomeStationName); 
              MapHex hex = mapManager.getHex(parts[0]);
              selectedHomeStation = hex.getCity(Integer.parseInt(parts[1]));
          }
      }
!     
      private String[] parseStationName (String name) {
!         
          if (name.contains(" on ")) {
              // Old style
--- 132,143 ----
          }
          if (selectedHomeStationName != null) {
!             String[] parts = parseStationName (selectedHomeStationName);
              MapHex hex = mapManager.getHex(parts[0]);
              selectedHomeStation = hex.getCity(Integer.parseInt(parts[1]));
          }
      }
! 
      private String[] parseStationName (String name) {
! 
          if (name.contains(" on ")) {
              // Old style