Update of /cvsroot/rails/18xx/rails/game/action
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28591/rails/game/action
Modified Files:
MergeCompanies.java
Log Message:
Various 1835 fixes
Index: MergeCompanies.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/action/MergeCompanies.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** MergeCompanies.java 29 Oct 2009 19:41:29 -0000 1.6
--- MergeCompanies.java 16 Feb 2010 20:16:07 -0000 1.7
***************
*** 9,12 ****
--- 9,13 ----
import java.io.ObjectInputStream;
import java.util.ArrayList;
+ import java.util.Arrays;
import java.util.List;
***************
*** 59,62 ****
--- 60,68 ----
targetCompanyNames = b.toString();
}
+
+ public MergeCompanies(PublicCompanyI mergingCompany,
+ PublicCompanyI targetCompany) {
+ this (mergingCompany, Arrays.asList(new PublicCompanyI[] {targetCompany}));
+ }
/** Required for deserialization */
|
