[Rails-commits] 18xx/rails/game/specific/_1835 StockRound_1835.java, 1.2, 1.3

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

Update of /cvsroot/rails/18xx/rails/game/specific/_1835
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv27301/rails/game/specific/_1835

Modified Files:
	StockRound_1835.java 
Log Message:
Apply new round initialisation logic

Index: StockRound_1835.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/specific/_1835/StockRound_1835.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** StockRound_1835.java	4 Dec 2008 00:55:48 -0000	1.2
--- StockRound_1835.java	23 Dec 2008 20:00:03 -0000	1.3
***************
*** 5,22 ****
  package rails.game.specific._1835;
  
! import rails.game.CompanyManagerI;
! import rails.game.GameManager;
! import rails.game.Portfolio;
! import rails.game.PublicCompanyI;
! import rails.game.ReportBuffer;
! import rails.game.StockRound;
  import rails.util.LocalText;
  
  public class StockRound_1835 extends StockRound {
      
-     //Portfolio ipo = Bank.getIpo();
-     //Portfolio unavailable = Bank.getUnavailable();
-     CompanyManagerI compMgr;
- 
  	/**
  	 * Constructor with the GameManager, will call super class (StockRound's) Constructor to initialize
--- 5,13 ----
  package rails.game.specific._1835;
  
! import rails.game.*;
  import rails.util.LocalText;
  
  public class StockRound_1835 extends StockRound {
      
  	/**
  	 * Constructor with the GameManager, will call super class (StockRound's) Constructor to initialize
***************
*** 25,29 ****
  	 *
  	 */
! 	public StockRound_1835 (GameManager aGameManager) {
  		super (aGameManager);
  	}
--- 16,20 ----
  	 *
  	 */
! 	public StockRound_1835 (GameManagerI aGameManager) {
  		super (aGameManager);
  	}
***************
*** 44,50 ****
          if (boughtFrom != ipo) return;
          
-         if (compMgr == null) compMgr = gameManager.getCompanyManager();
- 
-         
          String name = company.getName();
          int sharesInIPO = ipo.getShare(company);
--- 35,38 ----
***************
*** 53,69 ****
          if (sharesInIPO == 0) {
              if (name.equals("Sax") && 
!                 ipo.getShare(compMgr.getCompanyByName("Bay")) == 0
              || name.equals("Bay") && 
!                 ipo.getShare(compMgr.getCompanyByName("Sax")) == 0) {
                  // Group 1 sold out: release Badische
!                 releaseCompanyShares (compMgr.getCompanyByName("Bad"));
                  ReportBuffer.add (LocalText.getText("SharesReleased",
                          new String[] {"All", "Bad"}));
              } else if (name.equals("Bad") || name.equals("Wrt") || name.equals("Hes")) {
!                 if (ipo.getShare(compMgr.getCompanyByName("Bad")) == 0
!                         && ipo.getShare(compMgr.getCompanyByName("Wrt")) == 0
!                         && ipo.getShare(compMgr.getCompanyByName("Hes")) == 0) {
                      // Group 2 sold out: release MS
!                     releaseCompanyShares (compMgr.getCompanyByName("MS"));
                      ReportBuffer.add (LocalText.getText("SharesReleased",
                              new String[] {"All", "MS"}));
--- 41,57 ----
          if (sharesInIPO == 0) {
              if (name.equals("Sax") && 
!                 ipo.getShare(companyManager.getCompanyByName("Bay")) == 0
              || name.equals("Bay") && 
!                 ipo.getShare(companyManager.getCompanyByName("Sax")) == 0) {
                  // Group 1 sold out: release Badische
!                 releaseCompanyShares (companyManager.getCompanyByName("Bad"));
                  ReportBuffer.add (LocalText.getText("SharesReleased",
                          new String[] {"All", "Bad"}));
              } else if (name.equals("Bad") || name.equals("Wrt") || name.equals("Hes")) {
!                 if (ipo.getShare(companyManager.getCompanyByName("Bad")) == 0
!                         && ipo.getShare(companyManager.getCompanyByName("Wrt")) == 0
!                         && ipo.getShare(companyManager.getCompanyByName("Hes")) == 0) {
                      // Group 2 sold out: release MS
!                     releaseCompanyShares (companyManager.getCompanyByName("MS"));
                      ReportBuffer.add (LocalText.getText("SharesReleased",
                              new String[] {"All", "MS"}));
***************
*** 78,82 ****
          if (name.equals("Bad")) {
              if (sharesInIPO == 50) {  // 50% sold: release Wurttemberg
!                 releaseCompanyShares (compMgr.getCompanyByName("Wrt"));
                  ReportBuffer.add (LocalText.getText("SharesReleased",
                          new String[] {"All", "Wrt"}));
--- 66,70 ----
          if (name.equals("Bad")) {
              if (sharesInIPO == 50) {  // 50% sold: release Wurttemberg
!                 releaseCompanyShares (companyManager.getCompanyByName("Wrt"));
                  ReportBuffer.add (LocalText.getText("SharesReleased",
                          new String[] {"All", "Wrt"}));
***************
*** 91,95 ****
          } else if (name.equals("Wrt")) { //Wurttembergische
              if (sharesInIPO == 50) {  // 50% sold: release Hessische
!                 releaseCompanyShares (compMgr.getCompanyByName("Hes"));
                  ReportBuffer.add (LocalText.getText("SharesReleased",
                          new String[] {"All", "Hes"}));
--- 79,83 ----
          } else if (name.equals("Wrt")) { //Wurttembergische
              if (sharesInIPO == 50) {  // 50% sold: release Hessische
!                 releaseCompanyShares (companyManager.getCompanyByName("Hes"));
                  ReportBuffer.add (LocalText.getText("SharesReleased",
                          new String[] {"All", "Hes"}));
***************
*** 97,101 ****
          } else if (name.equals("MS")) { // Mecklenburg/Schwerin
              if (sharesInIPO == 40) {  // 60% sold: release Oldenburg
!                 releaseCompanyShares (compMgr.getCompanyByName("Old"));
                  ReportBuffer.add (LocalText.getText("SharesReleased",
                          new String[] {"All", "Old"}));
--- 85,89 ----
          } else if (name.equals("MS")) { // Mecklenburg/Schwerin
              if (sharesInIPO == 40) {  // 60% sold: release Oldenburg
!                 releaseCompanyShares (companyManager.getCompanyByName("Old"));
                  ReportBuffer.add (LocalText.getText("SharesReleased",
                          new String[] {"All", "Old"}));