[Rails-commits] 18xx/rails/game StationHolder.java, NONE, 1.1 TokenHolder.java, NONE, 1.1 Company.java, 1.10, 1.11 City.java, 1.8, 1.9 StartRound.java, 1.32, 1.33 PublicCompanyI.java, 1.40, 1.41 Tile.java, 1.32, 1.33 Token.java, 1.6, 1.7 MapHex.java, 1.32, 1.33 GameManagerI.java, 1.23, 1.24 Train.java, 1.15, 1.16 PrivateCompanyI.java, 1.7, 1.8 Portfolio.java, 1.41, 1.42 PublicCertificate.java, 1.16, 1.17 PrivateCompany.java, 1.27, 1.28 TokenI.java, 1.4, 1.5 StationHolderI.java, 1.2, NONE TokenHolderI.java, 1.5, NONE

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

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

Modified Files:
	Company.java City.java StartRound.java PublicCompanyI.java 
	Tile.java Token.java MapHex.java GameManagerI.java Train.java 
	PrivateCompanyI.java Portfolio.java PublicCertificate.java 
	PrivateCompany.java TokenI.java 
Added Files:
	StationHolder.java TokenHolder.java 
Removed Files:
	StationHolderI.java TokenHolderI.java 
Log Message:
Renamed some interfaces

Index: Portfolio.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/Portfolio.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** Portfolio.java	5 Jan 2010 20:55:31 -0000	1.41
--- Portfolio.java	8 Jan 2010 21:30:46 -0000	1.42
***************
*** 21,25 ****
   * @author Erik
   */
! public class Portfolio implements TokenHolderI, MoveableHolderI {
  
      /** Owned private companies */
--- 21,25 ----
   * @author Erik
   */
! public class Portfolio implements TokenHolder, MoveableHolder {
  
      /** Owned private companies */

--- NEW FILE: TokenHolder.java ---
/* $Header: /cvsroot/rails/18xx/rails/game/TokenHolder.java,v 1.1 2010/01/08 21:30:46 evos Exp $ */
package rails.game;

import java.util.List;

import rails.game.move.MoveableHolder;

/**
 * Interface for implementing a TokenHolder
 *
 * A TokenHolder is any object that can have a token played upon it.
 */
public interface TokenHolder extends MoveableHolder {

    /**
     * Add a token. Subclasses may override this method to implement side
     * effects.
     *
     * @param token The token object to add.
     * @return True if successful.
     */
    public boolean addToken(TokenI token);

    /**
     * Remove a token. Subclasses may override this method to implement side
     * effects.
     *
     * @param token The token object to remove.
     * @return True if successful.
     */
    public boolean removeToken(TokenI token);

    /**
     * @return ArrayList of all tokens we have.
     */
    public List<TokenI> getTokens();

    /**
     * Do we have any tokens?
     *
     * @return Boolean
     */
    public boolean hasTokens();

    /**
     * Each station must have a name, which includes the tile Id (if on a tile)
     * or the hex name (if on a MapHex).
     *
     * @return
     */
    public String getName();
}

Index: PrivateCompanyI.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/PrivateCompanyI.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** PrivateCompanyI.java	15 Jan 2009 20:53:28 -0000	1.7
--- PrivateCompanyI.java	8 Jan 2010 21:30:46 -0000	1.8
***************
*** 4,11 ****
  import java.util.List;
  
! import rails.game.move.MoveableHolderI;
  import rails.game.special.SpecialPropertyI;
  
! public interface PrivateCompanyI extends CompanyI, Certificate, MoveableHolderI {
  
      public static final String TYPE_TAG = "Private";
--- 4,11 ----
  import java.util.List;
  
! import rails.game.move.MoveableHolder;
  import rails.game.special.SpecialPropertyI;
  
! public interface PrivateCompanyI extends CompanyI, Certificate, MoveableHolder {
  
      public static final String TYPE_TAG = "Private";

Index: StartRound.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/StartRound.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** StartRound.java	8 Dec 2009 19:32:44 -0000	1.32
--- StartRound.java	8 Jan 2010 21:30:46 -0000	1.33
***************
*** 10,14 ****
  import rails.util.LocalText;
  
! public abstract class StartRound extends Round implements StartRoundI {
  
      protected StartPacket startPacket = null;
--- 10,14 ----
  import rails.util.LocalText;
  
! public abstract class StartRound extends Round {
  
      protected StartPacket startPacket = null;

Index: PrivateCompany.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/PrivateCompany.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** PrivateCompany.java	26 Dec 2009 12:48:02 -0000	1.27
--- PrivateCompany.java	8 Jan 2010 21:30:46 -0000	1.28
***************
*** 131,135 ****
      }
  
!     public void moveTo(MoveableHolderI newHolder) {
          new ObjectMove(this, portfolio, newHolder);
      }
--- 131,135 ----
      }
  
!     public void moveTo(MoveableHolder newHolder) {
          new ObjectMove(this, portfolio, newHolder);
      }

Index: TokenI.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/TokenI.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TokenI.java	4 Jun 2008 19:00:32 -0000	1.4
--- TokenI.java	8 Jan 2010 21:30:46 -0000	1.5
***************
*** 13,21 ****
  public interface TokenI extends Moveable {
  
!     public void setHolder(TokenHolderI holder);
  
      public String getUniqueId();
  
!     public TokenHolderI getHolder();
  
      public String getName();
--- 13,21 ----
  public interface TokenI extends Moveable {
  
!     public void setHolder(TokenHolder holder);
  
      public String getUniqueId();
  
!     public TokenHolder getHolder();
  
      public String getName();

Index: PublicCompanyI.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/PublicCompanyI.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** PublicCompanyI.java	1 Jan 2010 13:59:29 -0000	1.40
--- PublicCompanyI.java	8 Jan 2010 21:30:46 -0000	1.41
***************
*** 10,14 ****
   * Interface to be used to access PublicCompany instances.
   */
! public interface PublicCompanyI extends CompanyI, CashHolder, TokenHolderI {
  
      public static final int CAPITALISE_FULL = 0;
--- 10,14 ----
   * Interface to be used to access PublicCompany instances.
   */
! public interface PublicCompanyI extends CompanyI, CashHolder, TokenHolder {
  
      public static final int CAPITALISE_FULL = 0;

Index: PublicCertificate.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/PublicCertificate.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** PublicCertificate.java	30 Aug 2009 18:15:18 -0000	1.16
--- PublicCertificate.java	8 Jan 2010 21:30:46 -0000	1.17
***************
*** 7,11 ****
  import org.apache.log4j.Logger;
  
! import rails.game.move.MoveableHolderI;
  import rails.game.move.ObjectMove;
  import rails.util.LocalText;
--- 7,11 ----
  import org.apache.log4j.Logger;
  
! import rails.game.move.MoveableHolder;
  import rails.game.move.ObjectMove;
  import rails.util.LocalText;
***************
*** 70,74 ****
      }
  
!     public void moveTo(MoveableHolderI newHolder) {
          new ObjectMove(this, portfolio, newHolder);
      }
--- 70,74 ----
      }
  
!     public void moveTo(MoveableHolder newHolder) {
          new ObjectMove(this, portfolio, newHolder);
      }
***************
*** 81,85 ****
      }
  
!     public MoveableHolderI getHolder() {
          return portfolio;
      }
--- 81,85 ----
      }
  
!     public MoveableHolder getHolder() {
          return portfolio;
      }

Index: Company.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/Company.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Company.java	4 Nov 2009 20:33:22 -0000	1.10
--- Company.java	8 Jan 2010 21:30:37 -0000	1.11
***************
*** 4,8 ****
  import org.apache.log4j.Logger;
  
! import rails.game.move.MoveableHolderI;
  import rails.game.state.BooleanState;
  
--- 4,8 ----
  import org.apache.log4j.Logger;
  
! import rails.game.move.MoveableHolder;
  import rails.game.state.BooleanState;
  
***************
*** 123,127 ****
      }
  
!     public MoveableHolderI getHolder() {
          return portfolio;
      }
--- 123,127 ----
      }
  
!     public MoveableHolder getHolder() {
          return portfolio;
      }

Index: Train.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/Train.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Train.java	4 Nov 2009 20:33:22 -0000	1.15
--- Train.java	8 Jan 2010 21:30:46 -0000	1.16
***************
*** 4,8 ****
  import org.apache.log4j.Logger;
  
! import rails.game.move.MoveableHolderI;
  import rails.game.move.ObjectMove;
  import rails.game.state.BooleanState;
--- 4,8 ----
  import org.apache.log4j.Logger;
  
! import rails.game.move.MoveableHolder;
  import rails.game.move.ObjectMove;
  import rails.game.state.BooleanState;
***************
*** 121,125 ****
      }
  
!     public void moveTo(MoveableHolderI to) {
  
          new ObjectMove(this, holder, to);
--- 121,125 ----
      }
  
!     public void moveTo(MoveableHolder to) {
  
          new ObjectMove(this, holder, to);

Index: City.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/City.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** City.java	4 May 2009 20:29:14 -0000	1.8
--- City.java	8 Jan 2010 21:30:46 -0000	1.9
***************
*** 26,30 ****
   * @author Erik Vos
   */
! public class City implements TokenHolderI {
      private int number;
      private String uniqueId;
--- 26,30 ----
   * @author Erik Vos
   */
! public class City implements TokenHolder {
      private int number;
      private String uniqueId;

Index: MapHex.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/MapHex.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** MapHex.java	7 Dec 2009 17:47:29 -0000	1.32
--- MapHex.java	8 Jan 2010 21:30:46 -0000	1.33
***************
*** 38,42 ****
   */
  public class MapHex extends ModelObject implements ConfigurableComponentI,
!         StationHolderI, TokenHolderI {
  
      public static final int EW = 0;
--- 38,42 ----
   */
  public class MapHex extends ModelObject implements ConfigurableComponentI,
!         StationHolder, TokenHolder {
  
      public static final int EW = 0;
***************
*** 582,587 ****
  
              // Move the tokens
!             Map<TokenI, TokenHolderI> tokenDestinations =
!                     new HashMap<TokenI, TokenHolderI>();
  
              for (City oldCity : cities) {
--- 582,587 ----
  
              // Move the tokens
!             Map<TokenI, TokenHolder> tokenDestinations =
!                     new HashMap<TokenI, TokenHolder>();
  
              for (City oldCity : cities) {

--- StationHolderI.java DELETED ---

--- TokenHolderI.java DELETED ---

Index: Token.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/Token.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Token.java	8 Sep 2009 21:48:59 -0000	1.6
--- Token.java	8 Jan 2010 21:30:46 -0000	1.7
***************
*** 9,13 ****
  import java.util.Map;
  
! import rails.game.move.MoveableHolderI;
  import rails.game.move.ObjectMove;
  
--- 9,13 ----
  import java.util.Map;
  
! import rails.game.move.MoveableHolder;
  import rails.game.move.ObjectMove;
  
***************
*** 17,21 ****
  public abstract class Token implements TokenI {
  
!     protected TokenHolderI holder = null;
      protected String description = "";
      protected String uniqueId;
--- 17,21 ----
  public abstract class Token implements TokenI {
  
!     protected TokenHolder holder = null;
      protected String description = "";
      protected String uniqueId;
***************
*** 38,51 ****
      }
  
!     public void setHolder(TokenHolderI holder) {
          this.holder = holder;
      }
  
!     public TokenHolderI getHolder() {
          return holder;
      }
  
!     public void moveTo(MoveableHolderI newHolder) {
!         if (newHolder instanceof TokenHolderI) {
              new ObjectMove(this, holder, newHolder);
          }
--- 38,51 ----
      }
  
!     public void setHolder(TokenHolder holder) {
          this.holder = holder;
      }
  
!     public TokenHolder getHolder() {
          return holder;
      }
  
!     public void moveTo(MoveableHolder newHolder) {
!         if (newHolder instanceof TokenHolder) {
              new ObjectMove(this, holder, newHolder);
          }
***************
*** 64,68 ****
       * @param to
       */
!     public static void transfer(TokenI token, TokenHolderI from, TokenHolderI to) {
          to.addToken(token);
          from.removeToken(token);
--- 64,68 ----
       * @param to
       */
!     public static void transfer(TokenI token, TokenHolder from, TokenHolder to) {
          to.addToken(token);
          from.removeToken(token);

Index: Tile.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/Tile.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** Tile.java	20 Dec 2009 14:58:24 -0000	1.32
--- Tile.java	8 Jan 2010 21:30:46 -0000	1.33
***************
*** 10,14 ****
  import rails.util.Tag;
  
! public class Tile extends ModelObject implements TileI, StationHolderI {
  
      /** The 'internal id', identifying the tile in the XML files */
--- 10,14 ----
  import rails.util.Tag;
  
! public class Tile extends ModelObject implements TileI, StationHolder {
  
      /** The 'internal id', identifying the tile in the XML files */

--- NEW FILE: StationHolder.java ---
/* $Header: /cvsroot/rails/18xx/rails/game/StationHolder.java,v 1.1 2010/01/08 21:30:46 evos Exp $
 *
 * Created on Jan 2, 2007
 * Change Log:
 */
package rails.game;

/**
 * @author Erik Vos
 */
public interface StationHolder {

    public String getName();

}

Index: GameManagerI.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/GameManagerI.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** GameManagerI.java	27 Nov 2009 20:35:18 -0000	1.23
--- GameManagerI.java	8 Jan 2010 21:30:46 -0000	1.24
***************
*** 8,15 ****
  import rails.game.model.ModelObject;
  import rails.game.move.MoveStack;
! import rails.game.move.MoveableHolderI;
  import rails.game.special.SpecialPropertyI;
  
! public interface GameManagerI extends MoveableHolderI, ConfigurableComponentI {
  
      /**
--- 8,15 ----
  import rails.game.model.ModelObject;
  import rails.game.move.MoveStack;
! import rails.game.move.MoveableHolder;
  import rails.game.special.SpecialPropertyI;
  
! public interface GameManagerI extends MoveableHolder, ConfigurableComponentI {
  
      /**