[Rails-commits] 18xx/rails/game/action ReachDestinations.java, 1.4, 1.5 MergeCompanies.java, 1.8, 1.9

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

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

Modified Files:
	ReachDestinations.java MergeCompanies.java 
Log Message:
Removed a redundant (because duplicate) method

Index: MergeCompanies.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/action/MergeCompanies.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** MergeCompanies.java	28 Feb 2010 21:38:06 -0000	1.8
--- MergeCompanies.java	15 Apr 2010 19:49:50 -0000	1.9
***************
*** 135,139 ****
          CompanyManagerI cmgr = getCompanyManager();
  
!         mergingCompany = cmgr.getCompanyByName(mergingCompanyName);
  
          targetCompanies = new ArrayList<PublicCompanyI>();
--- 135,139 ----
          CompanyManagerI cmgr = getCompanyManager();
  
!         mergingCompany = cmgr.getPublicCompany(mergingCompanyName);
  
          targetCompanies = new ArrayList<PublicCompanyI>();
***************
*** 142,146 ****
                  targetCompanies.add(null);
              } else {
!                 targetCompanies.add(cmgr.getCompanyByName(name));
              }
          }
--- 142,146 ----
                  targetCompanies.add(null);
              } else {
!                 targetCompanies.add(cmgr.getPublicCompany(name));
              }
          }
***************
*** 149,153 ****
              && !selectedTargetCompanyName.equals("null")) {
              selectedTargetCompany =
!                     cmgr.getCompanyByName(selectedTargetCompanyName);
          }
      }
--- 149,153 ----
              && !selectedTargetCompanyName.equals("null")) {
              selectedTargetCompany =
!                     cmgr.getPublicCompany(selectedTargetCompanyName);
          }
      }

Index: ReachDestinations.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/action/ReachDestinations.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ReachDestinations.java	30 Dec 2009 11:30:33 -0000	1.4
--- ReachDestinations.java	15 Apr 2010 19:49:50 -0000	1.5
***************
*** 92,96 ****
              for (String cname : possibleCompanyNames.split(",")) {
                  if (!"".equals(cname)) {
!                     possibleCompanies.add(cmgr.getCompanyByName(cname));
                  }
              }
--- 92,96 ----
              for (String cname : possibleCompanyNames.split(",")) {
                  if (!"".equals(cname)) {
!                     possibleCompanies.add(cmgr.getPublicCompany(cname));
                  }
              }
***************
*** 100,104 ****
              for (String cname : reachedCompanyNames.split(",")) {
                  if (!"".equals(cname)) {
!                     reachedCompanies.add(cmgr.getCompanyByName(cname));
                  }
              }
--- 100,104 ----
              for (String cname : reachedCompanyNames.split(",")) {
                  if (!"".equals(cname)) {
!                     reachedCompanies.add(cmgr.getPublicCompany(cname));
                  }
              }