From: Erik V. <ev...@us...> - 2009-12-30 11:30:47
|
Update of /cvsroot/rails/18xx/rails/game/action In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv12952/rails/game/action Modified Files: ReachDestinations.java Log Message: Fix null "reached destination" created on an empty response. Index: ReachDestinations.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/action/ReachDestinations.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ReachDestinations.java 29 Oct 2009 19:41:29 -0000 1.3 --- ReachDestinations.java 30 Dec 2009 11:30:33 -0000 1.4 *************** *** 8,11 **** --- 8,12 ---- import rails.game.CompanyManagerI; import rails.game.PublicCompanyI; + import rails.util.Util; /** This class is needed until we have a means to determine reaching *************** *** 88,97 **** possibleCompanies = new ArrayList<PublicCompanyI>(); ! for (String cname : possibleCompanyNames.split(",")) { ! possibleCompanies.add(cmgr.getCompanyByName(cname)); } reachedCompanies = new ArrayList<PublicCompanyI>(); ! for (String cname : reachedCompanyNames.split(",")) { ! reachedCompanies.add(cmgr.getCompanyByName(cname)); } } --- 89,106 ---- possibleCompanies = new ArrayList<PublicCompanyI>(); ! if (Util.hasValue(possibleCompanyNames)) { ! for (String cname : possibleCompanyNames.split(",")) { ! if (!"".equals(cname)) { ! possibleCompanies.add(cmgr.getCompanyByName(cname)); ! } ! } } reachedCompanies = new ArrayList<PublicCompanyI>(); ! if (Util.hasValue(reachedCompanyNames)) { ! for (String cname : reachedCompanyNames.split(",")) { ! if (!"".equals(cname)) { ! reachedCompanies.add(cmgr.getCompanyByName(cname)); ! } ! } } } |