[Rails-commits] 18xx/rails/ui/swing/gamespecific/_1835 StatusWindow_1835.java, 1.2, 1.3

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

Update of /cvsroot/rails/18xx/rails/ui/swing/gamespecific/_1835
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv14243/rails/ui/swing/gamespecific/_1835

Modified Files:
	StatusWindow_1835.java 
Log Message:
Fixes to get excess train discard before prussion formation on buying the first 4-train in 1835.
And personalizing the Prussian formation prompts.

Index: StatusWindow_1835.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/gamespecific/_1835/StatusWindow_1835.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** StatusWindow_1835.java	4 Mar 2010 22:08:35 -0000	1.2
--- StatusWindow_1835.java	28 Mar 2010 20:14:20 -0000	1.3
***************
*** 69,75 ****
                      LocalText.getText("Select"),
                      LocalText.getText("MergeMinorConfirm",
!                             "M2", StockRound_1835.PR_ID),
                      "Yes",
!                     "No" );
          } else {
              // Ask if any other prePrussians should be folded
--- 69,76 ----
                      LocalText.getText("Select"),
                      LocalText.getText("MergeMinorConfirm",
!                             getCurrentPlayer().getName(),
!                             PrussianFormationRound.M2_ID, StockRound_1835.PR_ID),
                      "Yes",
!                     "No");
          } else {
              // Ask if any other prePrussians should be folded
***************
*** 87,91 ****
              currentDialog = new CheckBoxDialog (gameUIManager,
                      LocalText.getText("Select"),
!                     LocalText.getText("SelectCompaniesToFold", prussian.getLongName()),
                      options);
          }
--- 88,94 ----
              currentDialog = new CheckBoxDialog (gameUIManager,
                      LocalText.getText("Select"),
!                     LocalText.getText("SelectCompaniesToFold", 
!                             getCurrentPlayer().getName(),
!                             prussian.getLongName()),
                      options);
          }