[Rails-commits] 18xx/rails/game/action AssignNamedTrains.java, 1.3, 1.4 BuyBonusToken.java, 1.3, 1.4 BuyPrivate.java, 1.6, 1.7 BuyTrain.java, 1.16, 1.17 LayBaseToken.java, 1.5, 1.6 LayBonusToken.java, 1.8, 1.9 NullAction.java, 1.9, 1.10 PossibleAction.java, 1.15, 1.16 RequestTurn.java, 1.1, 1.2 SellShares.java, 1.6, 1.7

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

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

Modified Files:
	AssignNamedTrains.java BuyBonusToken.java BuyPrivate.java 
	BuyTrain.java LayBaseToken.java LayBonusToken.java 
	NullAction.java PossibleAction.java RequestTurn.java 
	SellShares.java 
Log Message:
Fix indentation: Java files contain 4 spaces, not tabs

Index: RequestTurn.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/action/RequestTurn.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RequestTurn.java	18 Jan 2010 18:49:12 -0000	1.1
--- RequestTurn.java	31 Jan 2010 22:22:29 -0000	1.2
***************
*** 13,45 ****
  
      public RequestTurn (Player player) {
! 		super();
! 		// Override player set by superclass
! 		if (player != null) {
! 			requestingPlayerName = player.getName();
! 		}
! 	}
  
!    	public String getRequestingPlayerName() {
! 		return requestingPlayerName;
! 	}
  
! 	@Override
! 	public boolean equals(PossibleAction pa) {
! 		return pa != null
! 				&& pa instanceof RequestTurn
! 				&& requestingPlayerName.equals(((RequestTurn)pa).requestingPlayerName);
! 	}
  
      private void readObject(ObjectInputStream in) throws IOException,
!     	ClassNotFoundException {
  
!     		in.defaultReadObject();
!     	}
  
  
! 	@Override
! 	public String toString() {
! 		return requestingPlayerName+" requests turn";
! 	}
  
  }
--- 13,45 ----
  
      public RequestTurn (Player player) {
!         super();
!         // Override player set by superclass
!         if (player != null) {
!             requestingPlayerName = player.getName();
!         }
!     }
  
!        public String getRequestingPlayerName() {
!         return requestingPlayerName;
!     }
  
!     @Override
!     public boolean equals(PossibleAction pa) {
!         return pa != null
!                 && pa instanceof RequestTurn
!                 && requestingPlayerName.equals(((RequestTurn)pa).requestingPlayerName);
!     }
  
      private void readObject(ObjectInputStream in) throws IOException,
!         ClassNotFoundException {
  
!             in.defaultReadObject();
!         }
  
  
!     @Override
!     public String toString() {
!         return requestingPlayerName+" requests turn";
!     }
  
  }

Index: PossibleAction.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/action/PossibleAction.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** PossibleAction.java	19 Jan 2010 19:54:42 -0000	1.15
--- PossibleAction.java	31 Jan 2010 22:22:29 -0000	1.16
***************
*** 38,42 ****
      public PossibleAction() {
  
!     	gameManager = GameManager.getInstance();
          Player player = gameManager.getCurrentPlayer();
          if (player != null) {
--- 38,42 ----
      public PossibleAction() {
  
!         gameManager = GameManager.getInstance();
          Player player = gameManager.getCurrentPlayer();
          if (player != null) {
***************
*** 76,89 ****
  
      protected GameManagerI getGameManager() {
!     	return GameManager.getInstance();
      }
  
      protected CompanyManagerI getCompanyManager () {
!     	return getGameManager().getCompanyManager();
      }
  
      /** Default version of an Menu item text. To be overridden where useful. */
      public String toMenu() {
!     	return toString();
      }
  
--- 76,89 ----
  
      protected GameManagerI getGameManager() {
!         return GameManager.getInstance();
      }
  
      protected CompanyManagerI getCompanyManager () {
!         return getGameManager().getCompanyManager();
      }
  
      /** Default version of an Menu item text. To be overridden where useful. */
      public String toMenu() {
!         return toString();
      }
  
***************
*** 91,95 ****
              ClassNotFoundException {
          in.defaultReadObject();
!     	gameManager = GameManager.getInstance();
  
      }
--- 91,95 ----
              ClassNotFoundException {
          in.defaultReadObject();
!         gameManager = GameManager.getInstance();
  
      }

Index: LayBaseToken.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/action/LayBaseToken.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** LayBaseToken.java	30 Oct 2009 21:53:04 -0000	1.5
--- LayBaseToken.java	31 Jan 2010 22:22:28 -0000	1.6
***************
*** 65,69 ****
  
      @Override
! 	public boolean equals(PossibleAction action) {
          if (!(action instanceof LayBaseToken)) return false;
          LayBaseToken a = (LayBaseToken) action;
--- 65,69 ----
  
      @Override
!     public boolean equals(PossibleAction action) {
          if (!(action instanceof LayBaseToken)) return false;
          LayBaseToken a = (LayBaseToken) action;
***************
*** 75,79 ****
  
      @Override
! 	public String toString() {
          StringBuffer b = new StringBuffer("LayBaseToken ");
          if (chosenHex == null) {
--- 75,79 ----
  
      @Override
!     public String toString() {
          StringBuffer b = new StringBuffer("LayBaseToken ");
          if (chosenHex == null) {

Index: SellShares.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/action/SellShares.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** SellShares.java	29 Oct 2009 19:41:29 -0000	1.6
--- SellShares.java	31 Jan 2010 22:22:29 -0000	1.7
***************
*** 93,97 ****
  
      @Override
! 	public boolean equals(PossibleAction action) {
          if (!(action instanceof SellShares)) return false;
          SellShares a = (SellShares) action;
--- 93,97 ----
  
      @Override
!     public boolean equals(PossibleAction action) {
          if (!(action instanceof SellShares)) return false;
          SellShares a = (SellShares) action;
***************
*** 103,107 ****
  
      @Override
! 	public String toString() {
          return "SellShares: "
                 + (numberSold > 0 ? numberSold : "max " + maximumNumber)
--- 103,107 ----
  
      @Override
!     public String toString() {
          return "SellShares: "
                 + (numberSold > 0 ? numberSold : "max " + maximumNumber)

Index: BuyBonusToken.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/action/BuyBonusToken.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** BuyBonusToken.java	4 Nov 2009 20:33:21 -0000	1.3
--- BuyBonusToken.java	31 Jan 2010 22:22:28 -0000	1.4
***************
*** 39,44 ****
      public BuyBonusToken(SellBonusToken specialProperty) {
  
!     	this.specialProperty = specialProperty;
!     	this.specialPropertyId = specialProperty.getUniqueId();
          this.privateCompany = specialProperty.getCompany();
          this.privateCompanyName = privateCompany.getName();
--- 39,44 ----
      public BuyBonusToken(SellBonusToken specialProperty) {
  
!         this.specialProperty = specialProperty;
!         this.specialPropertyId = specialProperty.getUniqueId();
          this.privateCompany = specialProperty.getCompany();
          this.privateCompanyName = privateCompany.getName();
***************
*** 59,99 ****
  
      public String getPrivateCompanyName() {
! 		return privateCompanyName;
! 	}
  
! 	public CashHolder getSeller() {
! 		return seller;
! 	}
  
! 	public String getSellerName() {
! 		return sellerName;
! 	}
  
! 	public SellBonusToken getSpecialProperty() {
! 		return specialProperty;
! 	}
  
! 	public String getName() {
! 		return name;
! 	}
  
! 	public int getValue() {
! 		return value;
! 	}
  
! 	public String getLocationString() {
! 		return locationString;
! 	}
  
! 	public int getPrice() {
          return price;
      }
  
      @Override
! 	public boolean equals(PossibleAction action) {
          if (!(action instanceof BuyBonusToken)) return false;
          BuyBonusToken a = (BuyBonusToken) action;
          return a.privateCompany == privateCompany
!         		&& a.name.equals(name)
                  && a.price == price
                  && a.value == value
--- 59,99 ----
  
      public String getPrivateCompanyName() {
!         return privateCompanyName;
!     }
  
!     public CashHolder getSeller() {
!         return seller;
!     }
  
!     public String getSellerName() {
!         return sellerName;
!     }
  
!     public SellBonusToken getSpecialProperty() {
!         return specialProperty;
!     }
  
!     public String getName() {
!         return name;
!     }
  
!     public int getValue() {
!         return value;
!     }
  
!     public String getLocationString() {
!         return locationString;
!     }
  
!     public int getPrice() {
          return price;
      }
  
      @Override
!     public boolean equals(PossibleAction action) {
          if (!(action instanceof BuyBonusToken)) return false;
          BuyBonusToken a = (BuyBonusToken) action;
          return a.privateCompany == privateCompany
!                 && a.name.equals(name)
                  && a.price == price
                  && a.value == value
***************
*** 102,111 ****
  
      @Override
! 	public String toString() {
          return "BuyBonusToken " + privateCompanyName
!         		+ " owner=" + sellerName
!         		+ " price=" + price
!         		+ " value=" + value
!         		+ " locations=" + locationString;
      }
  
--- 102,111 ----
  
      @Override
!     public String toString() {
          return "BuyBonusToken " + privateCompanyName
!                 + " owner=" + sellerName
!                 + " price=" + price
!                 + " value=" + value
!                 + " locations=" + locationString;
      }
  
***************
*** 119,126 ****
                  getCompanyManager().getPrivateCompany(privateCompanyName);
          if (sellerName.equalsIgnoreCase("Bank")) {
!         	seller = gameManager.getBank();
          } else if (sellerName != null) {
!         	seller =
!         		getCompanyManager().getPublicCompany(sellerName);
          }
          if (specialPropertyId > 0) {
--- 119,126 ----
                  getCompanyManager().getPrivateCompany(privateCompanyName);
          if (sellerName.equalsIgnoreCase("Bank")) {
!             seller = gameManager.getBank();
          } else if (sellerName != null) {
!             seller =
!                 getCompanyManager().getPublicCompany(sellerName);
          }
          if (specialPropertyId > 0) {

Index: BuyTrain.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/action/BuyTrain.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** BuyTrain.java	26 Jan 2010 20:09:39 -0000	1.16
--- BuyTrain.java	31 Jan 2010 22:22:28 -0000	1.17
***************
*** 87,92 ****
  
      public void setHasNoTrains(boolean hasNoTrains) {
! 		this.hasNoTrains = hasNoTrains;
! 	}
      
      public void setExtraMessage (String message) {
--- 87,92 ----
  
      public void setHasNoTrains(boolean hasNoTrains) {
!         this.hasNoTrains = hasNoTrains;
!     }
      
      public void setExtraMessage (String message) {
***************
*** 94,98 ****
      }
  
! 	public String getExtraMessage() {
          return extraMessage;
      }
--- 94,98 ----
      }
  
!     public String getExtraMessage() {
          return extraMessage;
      }
***************
*** 165,172 ****
  
      public boolean hasNoTrains() {
! 		return hasNoTrains;
! 	}
  
! 	public Portfolio getHolder() {
          return getTrain().getHolder();
      }
--- 165,172 ----
  
      public boolean hasNoTrains() {
!         return hasNoTrains;
!     }
  
!     public Portfolio getHolder() {
          return getTrain().getHolder();
      }

Index: BuyPrivate.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/action/BuyPrivate.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** BuyPrivate.java	29 Oct 2009 19:41:30 -0000	1.6
--- BuyPrivate.java	31 Jan 2010 22:22:28 -0000	1.7
***************
*** 69,73 ****
  
      @Override
! 	public boolean equals(PossibleAction action) {
          if (!(action instanceof BuyPrivate)) return false;
          BuyPrivate a = (BuyPrivate) action;
--- 69,73 ----
  
      @Override
!     public boolean equals(PossibleAction action) {
          if (!(action instanceof BuyPrivate)) return false;
          BuyPrivate a = (BuyPrivate) action;
***************
*** 78,82 ****
  
      @Override
! 	public String toString() {
          return "BuyPrivate " + privateCompany.getName() + " holder="
                 + privateCompany.getPortfolio().getName();
--- 78,82 ----
  
      @Override
!     public String toString() {
          return "BuyPrivate " + privateCompany.getName() + " holder="
                 + privateCompany.getPortfolio().getName();

Index: NullAction.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/action/NullAction.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** NullAction.java	20 Jan 2010 19:50:47 -0000	1.9
--- NullAction.java	31 Jan 2010 22:22:29 -0000	1.10
***************
*** 29,33 ****
  
      @Override
! 	public boolean equals(PossibleAction action) {
          if (!(action instanceof NullAction)) return false;
          NullAction a = (NullAction) action;
--- 29,33 ----
  
      @Override
!     public boolean equals(PossibleAction action) {
          if (!(action instanceof NullAction)) return false;
          NullAction a = (NullAction) action;
***************
*** 36,40 ****
  
      @Override
! 	public String toString() {
          return name[mode];
      }
--- 36,40 ----
  
      @Override
!     public String toString() {
          return name[mode];
      }

Index: LayBonusToken.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/action/LayBonusToken.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** LayBonusToken.java	19 Jan 2010 19:54:38 -0000	1.8
--- LayBonusToken.java	31 Jan 2010 22:22:28 -0000	1.9
***************
*** 37,41 ****
      public void finishConfiguration (GameManagerI gameManager)
      throws ConfigurationException {
!     	token.prepareForRemoval(gameManager.getPhaseManager());
      }
  
--- 37,41 ----
      public void finishConfiguration (GameManagerI gameManager)
      throws ConfigurationException {
!         token.prepareForRemoval(gameManager.getPhaseManager());
      }
  
***************
*** 45,49 ****
  
      @Override
! 	public boolean equals(PossibleAction action) {
          if (!(action instanceof LayBonusToken)) return false;
          LayBonusToken a = (LayBonusToken) action;
--- 45,49 ----
  
      @Override
!     public boolean equals(PossibleAction action) {
          if (!(action instanceof LayBonusToken)) return false;
          LayBonusToken a = (LayBonusToken) action;
***************
*** 53,57 ****
  
      @Override
! 	public String toString() {
          StringBuffer b = new StringBuffer("LayBonusToken ");
          if (chosenHex == null) {
--- 53,57 ----
  
      @Override
!     public String toString() {
          StringBuffer b = new StringBuffer("LayBonusToken ");
          if (chosenHex == null) {

Index: AssignNamedTrains.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/action/AssignNamedTrains.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AssignNamedTrains.java	11 Sep 2009 19:26:44 -0000	1.3
--- AssignNamedTrains.java	31 Jan 2010 22:22:28 -0000	1.4
***************
*** 22,26 ****
  
      @Override
! 	public String toString() {
          StringBuffer b = new StringBuffer("AssignNamedTrains ");
          for (NamedTrainToken token : namedTrainsSpecialProperty.getTokens()) {
--- 22,26 ----
  
      @Override
!     public String toString() {
          StringBuffer b = new StringBuffer("AssignNamedTrains ");
          for (NamedTrainToken token : namedTrainsSpecialProperty.getTokens()) {