[Rails-commits] 18xx/rails/game/special SpecialPropertyI.java, 1.11, 1.12 SpecialProperty.java, 1.25, 1.26 ExchangeForShare.java, 1.17, 1.18

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

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

Modified Files:
	SpecialPropertyI.java SpecialProperty.java 
	ExchangeForShare.java 
Log Message:
Fixed problem with use of ExchangeForShare caused by a previous change.
Corrected setting of 'holder' in SpecialProperty (even though it's not acually used).

Index: SpecialProperty.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/special/SpecialProperty.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** SpecialProperty.java	28 Feb 2010 21:38:05 -0000	1.25
--- SpecialProperty.java	16 Mar 2010 21:22:13 -0000	1.26
***************
*** 109,112 ****
--- 109,116 ----
      }
  
+     public void setHolder(MoveableHolder holder) {
+         this.holder = holder;
+     }
+ 
      public MoveableHolder getHolder() {
          return holder;

Index: ExchangeForShare.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/special/ExchangeForShare.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** ExchangeForShare.java	28 Feb 2010 21:38:05 -0000	1.17
--- ExchangeForShare.java	16 Mar 2010 21:22:13 -0000	1.18
***************
*** 32,36 ****
      public boolean isExecutionable() {
  
!         return holder instanceof Player;
      }
  
--- 32,36 ----
      public boolean isExecutionable() {
  
!         return originalCompany.getPortfolio().getOwner() instanceof Player;
      }
  

Index: SpecialPropertyI.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/special/SpecialPropertyI.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** SpecialPropertyI.java	2 Mar 2010 22:15:13 -0000	1.11
--- SpecialPropertyI.java	16 Mar 2010 21:21:59 -0000	1.12
***************
*** 13,16 ****
--- 13,19 ----
      public CompanyI getOriginalCompany();
  
+     public void setHolder(MoveableHolder holder);
+     public MoveableHolder getHolder();
+     
      public boolean isExecutionable();