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

[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-serv17094/rails/ui/swing/gamespecific/_1835

Modified Files:
	StatusWindow_1835.java 
Log Message:
Various changes for 1835

Index: StatusWindow_1835.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/gamespecific/_1835/StatusWindow_1835.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** StatusWindow_1835.java	28 Feb 2010 21:38:06 -0000	1.1
--- StatusWindow_1835.java	4 Mar 2010 22:08:35 -0000	1.2
***************
*** 6,12 ****
  
  import rails.game.*;
! import rails.game.specific._1835.FoldIntoPrussian;
! import rails.game.specific._1835.PrussianFormationRound;
! import rails.game.specific._1835.StockRound_1835;
  import rails.ui.swing.GameUIManager;
  import rails.ui.swing.StatusWindow;
--- 6,11 ----
  
  import rails.game.*;
! import rails.game.special.ExchangeForShare;
! import rails.game.specific._1835.*;
  import rails.ui.swing.GameUIManager;
  import rails.ui.swing.StatusWindow;
***************
*** 16,20 ****
  
  public class StatusWindow_1835 extends StatusWindow {
!     
      PublicCompanyI prussian;
  
--- 15,19 ----
  
  public class StatusWindow_1835 extends StatusWindow {
! 
      PublicCompanyI prussian;
  
***************
*** 24,29 ****
          super();
      }
!     
!     public void init (GameUIManager gameUIManager) {
          super.init(gameUIManager);
          prussian = gameUIManager.getGameManager().getCompanyManager().getCompanyByName(StockRound_1835.PR_ID);
--- 23,29 ----
          super();
      }
! 
!     @Override
! 	public void init (GameUIManager gameUIManager) {
          super.init(gameUIManager);
          prussian = gameUIManager.getGameManager().getCompanyManager().getCompanyByName(StockRound_1835.PR_ID);
***************
*** 63,72 ****
          List<CompanyI> foldables = action.getFoldableCompanies();
          JDialog currentDialog;
!         
          if (foldables.get(0).getName().equals("M2")) {
              // Ask if the Prussian should be started
              currentDialog = new ConfirmationDialog (gameUIManager,
                      LocalText.getText("Select"),
!                     LocalText.getText("MergeMinorConfirm", 
                              "M2", StockRound_1835.PR_ID),
                      "Yes",
--- 63,72 ----
          List<CompanyI> foldables = action.getFoldableCompanies();
          JDialog currentDialog;
! 
          if (foldables.get(0).getName().equals("M2")) {
              // Ask if the Prussian should be started
              currentDialog = new ConfirmationDialog (gameUIManager,
                      LocalText.getText("Select"),
!                     LocalText.getText("MergeMinorConfirm",
                              "M2", StockRound_1835.PR_ID),
                      "Yes",
***************
*** 75,80 ****
              // Ask if any other prePrussians should be folded
              String[] options = new String[foldables.size()];
!             for (int i=0; i<=options.length; i++) {
!                 options[i] = foldables.get(i).getName();
              }
              currentDialog = new CheckBoxDialog (gameUIManager,
--- 75,87 ----
              // Ask if any other prePrussians should be folded
              String[] options = new String[foldables.size()];
!             CompanyI company;
!             for (int i=0; i<options.length; i++) {
!             	company = foldables.get(i);
!             	options[i] = LocalText.getText("MergeOption",
!             			company.getName(),
!             			company.getLongName(),
!             			prussian.getName(),
!             			((ExchangeForShare)(company.getSpecialProperties().get(0))).getShare()
!             			);
              }
              currentDialog = new CheckBoxDialog (gameUIManager,