[Rails-commits] 18xx/rails/game/special SpecialTileLay.java, 1.11, 1.12 SellBonusToken.java, 1.6, 1.7 SpecialTrainBuy.java, 1.3, 1.4 LocatedBonus.java, 1.3, 1.4 SpecialProperty.java, 1.24, 1.25 ExchangeForShare.java, 1.16, 1.17 SpecialPropertyI.java, 1.9, 1.10 SpecialTokenLay.java, 1.13, 1.14

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

Update of /cvsroot/rails/18xx/rails/game/special
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv7856/rails/game/special

Modified Files:
	SpecialTileLay.java SellBonusToken.java SpecialTrainBuy.java 
	LocatedBonus.java SpecialProperty.java ExchangeForShare.java 
	SpecialPropertyI.java SpecialTokenLay.java 
Log Message:
1835 Prussian start & side effects

Index: LocatedBonus.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/special/LocatedBonus.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** LocatedBonus.java	31 Jan 2010 22:22:30 -0000	1.3
--- LocatedBonus.java	28 Feb 2010 21:38:05 -0000	1.4
***************
*** 72,76 ****
      @Override
      public String toString() {
!         return "LocatedBonus "+name+" comp=" + privateCompany.getName() + " hex="
                 + locationCodes + " value=" + value;
      }
--- 72,76 ----
      @Override
      public String toString() {
!         return "LocatedBonus "+name+" comp=" + originalCompany.getName() + " hex="
                 + locationCodes + " value=" + value;
      }

Index: SpecialTokenLay.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/special/SpecialTokenLay.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** SpecialTokenLay.java	31 Jan 2010 22:22:30 -0000	1.13
--- SpecialTokenLay.java	28 Feb 2010 21:38:05 -0000	1.14
***************
*** 129,133 ****
      @Override
      public String toString() {
!         return "SpecialTokenLay comp=" + privateCompany.getName() + " type="
                 + tokenClass.getSimpleName() + ": "
                 + (token != null ? token.toString() : "") + " hex="
--- 129,133 ----
      @Override
      public String toString() {
!         return "SpecialTokenLay comp=" + originalCompany.getName() + " type="
                 + tokenClass.getSimpleName() + ": "
                 + (token != null ? token.toString() : "") + " hex="

Index: SpecialPropertyI.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/special/SpecialPropertyI.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** SpecialPropertyI.java	6 Feb 2010 23:48:26 -0000	1.9
--- SpecialPropertyI.java	28 Feb 2010 21:38:05 -0000	1.10
***************
*** 2,5 ****
--- 2,6 ----
  package rails.game.special;
  
+ import rails.game.CompanyI;
  import rails.game.ConfigurableComponentI;
  import rails.game.PrivateCompanyI;
***************
*** 9,15 ****
  public interface SpecialPropertyI extends ConfigurableComponentI, Moveable {
  
!     public void setCompany(PrivateCompanyI company);
  
!     public PrivateCompanyI getCompany();
  
      public boolean isExecutionable();
--- 10,16 ----
  public interface SpecialPropertyI extends ConfigurableComponentI, Moveable {
  
!     public void setCompany(CompanyI company);
  
!     public CompanyI getOriginalCompany();
  
      public boolean isExecutionable();

Index: SpecialTileLay.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/special/SpecialTileLay.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** SpecialTileLay.java	3 Feb 2010 05:37:55 -0000	1.11
--- SpecialTileLay.java	28 Feb 2010 21:38:05 -0000	1.12
***************
*** 125,129 ****
      @Override
  	public String toString() {
!         return "SpecialTileLay comp=" + privateCompany.getName() + " hex="
                 + locationCodes + " extra=" + extra + " cost=" + free + " connected=" + connected;
      }
--- 125,129 ----
      @Override
  	public String toString() {
!         return "SpecialTileLay comp=" + originalCompany.getName() + " hex="
                 + locationCodes + " extra=" + extra + " cost=" + free + " connected=" + connected;
      }

Index: SpecialProperty.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/special/SpecialProperty.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** SpecialProperty.java	6 Feb 2010 23:48:26 -0000	1.24
--- SpecialProperty.java	28 Feb 2010 21:38:05 -0000	1.25
***************
*** 15,19 ****
  public abstract class SpecialProperty implements SpecialPropertyI {
  
!     protected PrivateCompanyI privateCompany;
      protected MoveableHolder holder = null;
      protected int closingValue = 0;
--- 15,19 ----
  public abstract class SpecialProperty implements SpecialPropertyI {
  
!     protected CompanyI originalCompany;
      protected MoveableHolder holder = null;
      protected int closingValue = 0;
***************
*** 97,102 ****
      }
  
!     public void setCompany(PrivateCompanyI company) {
!         privateCompany = company;
          holder = company;
          exercised =
--- 97,102 ----
      }
  
!     public void setCompany(CompanyI company) {
!         originalCompany = company;
          holder = company;
          exercised =
***************
*** 105,110 ****
      }
  
!     public PrivateCompanyI getCompany() {
!         return privateCompany;
      }
  
--- 105,110 ----
      }
  
!     public CompanyI getOriginalCompany() {
!         return originalCompany;
      }
  
***************
*** 181,185 ****
          if (permanent) return; // sfy 1889 
          exercised.set(value);
!         if (value) privateCompany.checkClosingIfExercised(false);
      }
  
--- 181,187 ----
          if (permanent) return; // sfy 1889 
          exercised.set(value);
!         if (value && originalCompany instanceof PrivateCompanyI) {
!             ((PrivateCompanyI)originalCompany).checkClosingIfExercised(false);
!         }
      }
  
***************
*** 218,222 ****
      public String toString() {
          return getClass().getSimpleName() + " of private "
!                + privateCompany.getName();
      }
  
--- 220,224 ----
      public String toString() {
          return getClass().getSimpleName() + " of private "
!                + originalCompany.getName();
      }
  

Index: SpecialTrainBuy.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/special/SpecialTrainBuy.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SpecialTrainBuy.java	3 Oct 2009 14:00:06 -0000	1.3
--- SpecialTrainBuy.java	28 Feb 2010 21:38:05 -0000	1.4
***************
*** 110,114 ****
  
      public String toString() {
!         return "SpecialTrainBuy comp=" + privateCompany.getName() + " extra="
                 + extra + " deduction=" + deductionString;
      }
--- 110,114 ----
  
      public String toString() {
!         return "SpecialTrainBuy comp=" + originalCompany.getName() + " extra="
                 + extra + " deduction=" + deductionString;
      }

Index: ExchangeForShare.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/special/ExchangeForShare.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** ExchangeForShare.java	4 Feb 2010 21:27:59 -0000	1.16
--- ExchangeForShare.java	28 Feb 2010 21:38:05 -0000	1.17
***************
*** 32,43 ****
      public boolean isExecutionable() {
  
!         return privateCompany.getPortfolio().getOwner() instanceof Player;
!     }
! 
!     /**
!      * @return Returns the privateCompany.
!      */
!     public PrivateCompanyI getPrivateCompany() {
!         return privateCompany;
      }
  
--- 32,36 ----
      public boolean isExecutionable() {
  
!         return holder instanceof Player;
      }
  
***************
*** 62,66 ****
      @Override
      public String toString() {
!         return "Swap " + privateCompany.getName() + " for " + share
                 + "% share of " + publicCompanyName;
      }
--- 55,59 ----
      @Override
      public String toString() {
!         return "Swap " + originalCompany.getName() + " for " + share
                 + "% share of " + publicCompanyName;
      }
***************
*** 69,73 ****
      public String toMenu() {
          return LocalText.getText("SwapPrivateForCertificate",
!                 privateCompany.getName(),
                  share,
                  publicCompanyName );
--- 62,66 ----
      public String toMenu() {
          return LocalText.getText("SwapPrivateForCertificate",
!                 originalCompany.getName(),
                  share,
                  publicCompanyName );

Index: SellBonusToken.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/special/SellBonusToken.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** SellBonusToken.java	31 Jan 2010 22:22:30 -0000	1.6
--- SellBonusToken.java	28 Feb 2010 21:38:05 -0000	1.7
***************
*** 107,111 ****
      @Override
      public String toString() {
!         return "SellBonusToken comp=" + privateCompany.getName() + " hex="
                 + locationCodes + " value=" + value + " price=" + price
                 + " max="+maxNumberToSell+" sold="+numberSold.intValue();
--- 107,111 ----
      @Override
      public String toString() {
!         return "SellBonusToken comp=" + originalCompany.getName() + " hex="
                 + locationCodes + " value=" + value + " price=" + price
                 + " max="+maxNumberToSell+" sold="+numberSold.intValue();