Update of /cvsroot/rails/18xx/rails/game/specific/_1856
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5199/rails/game/specific/_1856
Modified Files:
CGRFormationRound.java
Log Message:
Set fixed text "MERGE" into loans model for merging companies
Index: CGRFormationRound.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/specific/_1856/CGRFormationRound.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** CGRFormationRound.java 28 Dec 2009 15:27:18 -0000 1.28
--- CGRFormationRound.java 1 Jan 2010 14:01:18 -0000 1.29
***************
*** 183,186 ****
--- 183,187 ----
currentCompany.getName()),
false);
+ currentCompany.getLoanValueModel().setText(LocalText.getText("MERGE"));
}
maxLoansToRepayByPresident = maxNumber;
***************
*** 189,192 ****
--- 190,194 ----
// President cannot help, this company will merge into CGR anyway
mergingCompanies.add(currentCompany);
+ currentCompany.getLoanValueModel().setText(LocalText.getText("MERGE"));
message = LocalText.getText("WillMergeInto",
currentCompany.getName(),
***************
*** 267,270 ****
--- 269,273 ----
if (action.getCompany().getCurrentNumberOfLoans() > 0) {
mergingCompanies.add(currentCompany);
+ currentCompany.getLoanValueModel().setText(LocalText.getText("MERGE"));
String message = LocalText.getText("WillMergeInto",
currentCompany.getName(),
|
