rails-commits

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

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

Modified Files:
	StatusWindow_1835.java 
Log Message:
Moved hardcoded company IDs to GameManager_1835

Index: StatusWindow_1835.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/gamespecific/_1835/StatusWindow_1835.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** StatusWindow_1835.java	28 Mar 2010 20:14:20 -0000	1.3
--- StatusWindow_1835.java	8 Apr 2010 21:24:02 -0000	1.4
***************
*** 27,31 ****
  	public void init (GameUIManager gameUIManager) {
          super.init(gameUIManager);
!         prussian = gameUIManager.getGameManager().getCompanyManager().getCompanyByName(StockRound_1835.PR_ID);
      }
  
--- 27,31 ----
  	public void init (GameUIManager gameUIManager) {
          super.init(gameUIManager);
!         prussian = gameUIManager.getGameManager().getCompanyManager().getCompanyByName(GameManager_1835.PR_ID);
      }
  
***************
*** 70,74 ****
                      LocalText.getText("MergeMinorConfirm",
                              getCurrentPlayer().getName(),
!                             PrussianFormationRound.M2_ID, StockRound_1835.PR_ID),
                      "Yes",
                      "No");
--- 70,74 ----
                      LocalText.getText("MergeMinorConfirm",
                              getCurrentPlayer().getName(),
!                             GameManager_1835.M2_ID, GameManager_1835.PR_ID),
                      "Yes",
                      "No");