[Rails-commits] 18xx/rails/game/special LocatedBonus.java, 1.2, 1.3 SellBonusToken.java, 1.5, 1.6 SpecialProperty.java, 1.21, 1.22 SpecialTileLay.java, 1.9, 1.10 SpecialTokenLay.java, 1.12, 1.13

[Freek D. <mac...@us...>]

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

Modified Files:
	LocatedBonus.java SellBonusToken.java SpecialProperty.java 
	SpecialTileLay.java SpecialTokenLay.java 
Log Message:
Fix indentation: Java files contain 4 spaces, not tabs

Index: SpecialTokenLay.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/special/SpecialTokenLay.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** SpecialTokenLay.java	19 Jan 2010 19:54:47 -0000	1.12
--- SpecialTokenLay.java	31 Jan 2010 22:22:30 -0000	1.13
***************
*** 19,23 ****
  
      @Override
! 	public void configureFromXML(Tag tag) throws ConfigurationException {
  
          super.configureFromXML(tag);
--- 19,23 ----
  
      @Override
!     public void configureFromXML(Tag tag) throws ConfigurationException {
  
          super.configureFromXML(tag);
***************
*** 68,80 ****
  
          if (tokenClass == BaseToken.class) {
!         	description = LocalText.getText("LayBaseTokenInfo",
!         			locationCodes,
!         			(extra ? LocalText.getText("extra"):LocalText.getText("notExtra")),
!         			(free ? LocalText.getText("noCost") : LocalText.getText("normalCost")));
          } else if (tokenClass == BonusToken.class) {
!         	description = LocalText.getText("LayBonusTokenInfo",
!         			tokenName,
!         			Bank.format(tokenValue),
!         			locationCodes);
          }
      }
--- 68,80 ----
  
          if (tokenClass == BaseToken.class) {
!             description = LocalText.getText("LayBaseTokenInfo",
!                     locationCodes,
!                     (extra ? LocalText.getText("extra"):LocalText.getText("notExtra")),
!                     (free ? LocalText.getText("noCost") : LocalText.getText("normalCost")));
          } else if (tokenClass == BonusToken.class) {
!             description = LocalText.getText("LayBonusTokenInfo",
!                     tokenName,
!                     Bank.format(tokenValue),
!                     locationCodes);
          }
      }
***************
*** 87,91 ****
  
          if (token instanceof BonusToken) {
!         	((BonusToken)token).prepareForRemoval(gameManager.getPhaseManager());
          }
      }
--- 87,91 ----
  
          if (token instanceof BonusToken) {
!             ((BonusToken)token).prepareForRemoval(gameManager.getPhaseManager());
          }
      }
***************
*** 128,132 ****
  
      @Override
! 	public String toString() {
          return "SpecialTokenLay comp=" + privateCompany.getName() + " type="
                 + tokenClass.getSimpleName() + ": "
--- 128,132 ----
  
      @Override
!     public String toString() {
          return "SpecialTokenLay comp=" + privateCompany.getName() + " type="
                 + tokenClass.getSimpleName() + ": "
***************
*** 136,146 ****
  
      @Override
! 	public String toMenu() {
!     	return description;
      }
  
      @Override
! 	public String getInfo() {
!     	return description;
      }
  }
--- 136,146 ----
  
      @Override
!     public String toMenu() {
!         return description;
      }
  
      @Override
!     public String getInfo() {
!         return description;
      }
  }

Index: SpecialProperty.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/special/SpecialProperty.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** SpecialProperty.java	19 Jan 2010 19:54:43 -0000	1.21
--- SpecialProperty.java	31 Jan 2010 22:22:30 -0000	1.22
***************
*** 160,164 ****
       */
      public void moveTo(MoveableHolder newHolder) {
!     	if (transferText.equals("")) return;
          //if (newHolder instanceof Portfolio) {
              new ObjectMove(this, holder, newHolder);
--- 160,164 ----
       */
      public void moveTo(MoveableHolder newHolder) {
!         if (transferText.equals("")) return;
          //if (newHolder instanceof Portfolio) {
              new ObjectMove(this, holder, newHolder);
***************
*** 167,171 ****
  
      @Override
! 	public String toString() {
          return getClass().getSimpleName() + " of private "
                 + privateCompany.getName();
--- 167,171 ----
  
      @Override
!     public String toString() {
          return getClass().getSimpleName() + " of private "
                 + privateCompany.getName();
***************
*** 182,191 ****
      /** Default Info text. To be overridden where useful. */
      public String getInfo() {
!     	return toString();
      }
  
      /** Default Help text: "You can " + the menu description */
      public String getHelp() {
!     	return LocalText.getText ("YouCan", Util.lowerCaseFirst(toMenu()));
  
      }
--- 182,191 ----
      /** Default Info text. To be overridden where useful. */
      public String getInfo() {
!         return toString();
      }
  
      /** Default Help text: "You can " + the menu description */
      public String getHelp() {
!         return LocalText.getText ("YouCan", Util.lowerCaseFirst(toMenu()));
  
      }

Index: LocatedBonus.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/special/LocatedBonus.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** LocatedBonus.java	31 Oct 2009 17:08:26 -0000	1.2
--- LocatedBonus.java	31 Jan 2010 22:22:30 -0000	1.3
***************
*** 23,27 ****
  
      @Override
! 	public void configureFromXML(Tag tag) throws ConfigurationException {
  
          super.configureFromXML(tag);
--- 23,27 ----
  
      @Override
!     public void configureFromXML(Tag tag) throws ConfigurationException {
  
          super.configureFromXML(tag);
***************
*** 70,75 ****
  
  
! 	@Override
! 	public String toString() {
          return "LocatedBonus "+name+" comp=" + privateCompany.getName() + " hex="
                 + locationCodes + " value=" + value;
--- 70,75 ----
  
  
!     @Override
!     public String toString() {
          return "LocatedBonus "+name+" comp=" + privateCompany.getName() + " hex="
                 + locationCodes + " value=" + value;

Index: SellBonusToken.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/special/SellBonusToken.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** SellBonusToken.java	28 Dec 2009 14:53:00 -0000	1.5
--- SellBonusToken.java	31 Jan 2010 22:22:30 -0000	1.6
***************
*** 22,26 ****
  
      @Override
! 	public void configureFromXML(Tag tag) throws ConfigurationException {
          super.configureFromXML(tag);
  
--- 22,26 ----
  
      @Override
!     public void configureFromXML(Tag tag) throws ConfigurationException {
          super.configureFromXML(tag);
  
***************
*** 60,65 ****
  
       @Override
! 	public void setExercised () {
!     	numberSold.add(1);
      }
       
--- 60,65 ----
  
       @Override
!     public void setExercised () {
!         numberSold.add(1);
      }
       
***************
*** 98,110 ****
  
      public CashHolder getSeller() {
! 		return (CashHolder) seller.getObject();
! 	}
  
! 	public void setSeller(CashHolder seller) {
! 		this.seller.set(seller);
! 	}
  
! 	@Override
! 	public String toString() {
          return "SellBonusToken comp=" + privateCompany.getName() + " hex="
                 + locationCodes + " value=" + value + " price=" + price
--- 98,110 ----
  
      public CashHolder getSeller() {
!         return (CashHolder) seller.getObject();
!     }
  
!     public void setSeller(CashHolder seller) {
!         this.seller.set(seller);
!     }
  
!     @Override
!     public String toString() {
          return "SellBonusToken comp=" + privateCompany.getName() + " hex="
                 + locationCodes + " value=" + value + " price=" + price

Index: SpecialTileLay.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/special/SpecialTileLay.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** SpecialTileLay.java	25 Jan 2010 20:51:59 -0000	1.9
--- SpecialTileLay.java	31 Jan 2010 22:22:30 -0000	1.10
***************
*** 19,23 ****
  
      @Override
! 	public void configureFromXML(Tag tag) throws ConfigurationException {
          super.configureFromXML(tag);
  
--- 19,23 ----
  
      @Override
!     public void configureFromXML(Tag tag) throws ConfigurationException {
          super.configureFromXML(tag);
  
***************
*** 41,55 ****
  
          if (tileNumber > 0) {
! 	    	description = LocalText.getText("LayNamedTileInfo",
! 	    			tileNumber,
! 	    			name != null ? name : "",
! 	    			locationCodes,
! 	    			(extra ? LocalText.getText("extra"):LocalText.getText("notExtra")),
! 	    			(free ? LocalText.getText("noCost") : LocalText.getText("normalCost")));
          } else {
! 	    	description = LocalText.getText("LayTileInfo",
! 	    			locationCodes,
! 	    			(extra ? LocalText.getText("extra"):LocalText.getText("notExtra")),
! 	    			(free ? LocalText.getText("noCost") : LocalText.getText("normalCost")));
          }
  
--- 41,55 ----
  
          if (tileNumber > 0) {
!             description = LocalText.getText("LayNamedTileInfo",
!                     tileNumber,
!                     name != null ? name : "",
!                     locationCodes,
!                     (extra ? LocalText.getText("extra"):LocalText.getText("notExtra")),
!                     (free ? LocalText.getText("noCost") : LocalText.getText("normalCost")));
          } else {
!             description = LocalText.getText("LayTileInfo",
!                     locationCodes,
!                     (extra ? LocalText.getText("extra"):LocalText.getText("notExtra")),
!                     (free ? LocalText.getText("noCost") : LocalText.getText("normalCost")));
          }
  
***************
*** 57,61 ****
  
      @Override
! 	public void finishConfiguration (GameManagerI gameManager)
      throws ConfigurationException {
  
--- 57,61 ----
  
      @Override
!     public void finishConfiguration (GameManagerI gameManager)
      throws ConfigurationException {
  
***************
*** 112,116 ****
  
      @Override
! 	public String toString() {
          return "SpecialTileLay comp=" + privateCompany.getName() + " hex="
                 + locationCodes + " extra=" + extra + " cost=" + free;
--- 112,116 ----
  
      @Override
!     public String toString() {
          return "SpecialTileLay comp=" + privateCompany.getName() + " hex="
                 + locationCodes + " extra=" + extra + " cost=" + free;
***************
*** 118,128 ****
  
      @Override
! 	public String toMenu() {
!     	return description;
      }
  
      @Override
! 	public String getInfo() {
!     	return description;
      }
  }
--- 118,128 ----
  
      @Override
!     public String toMenu() {
!         return description;
      }
  
      @Override
!     public String getInfo() {
!         return description;
      }
  }