[Rails-commits] 18xx/rails/game/move AddToList.java, 1.4, 1.5 CashMove.java, 1.6, 1.7 Move.java, 1.3, 1.4 MoveSet.java, 1.13, 1.14 MoveStack.java, 1.3, 1.4 ObjectMove.java, 1.7, 1.8 PriceTokenMove.java, 1.5, 1.6

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

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

Modified Files:
	AddToList.java CashMove.java Move.java MoveSet.java 
	MoveStack.java ObjectMove.java PriceTokenMove.java 
Log Message:
Fix indentation: Java files contain 4 spaces, not tabs

Index: PriceTokenMove.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/move/PriceTokenMove.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PriceTokenMove.java	7 Oct 2009 19:00:38 -0000	1.5
--- PriceTokenMove.java	31 Jan 2010 22:22:30 -0000	1.6
***************
*** 28,32 ****
  
      @Override
! 	public boolean execute() {
          stockMarket.processMove(company, from, to);
          return true;
--- 28,32 ----
  
      @Override
!     public boolean execute() {
          stockMarket.processMove(company, from, to);
          return true;
***************
*** 34,38 ****
  
      @Override
! 	public boolean undo() {
          stockMarket.processMove(company, to, from);
          return true;
--- 34,38 ----
  
      @Override
!     public boolean undo() {
          stockMarket.processMove(company, to, from);
          return true;
***************
*** 40,44 ****
  
      @Override
! 	public String toString() {
          return "PriceTokenMove: " + company.getName() + " from " + from
                 + " to " + to;
--- 40,44 ----
  
      @Override
!     public String toString() {
          return "PriceTokenMove: " + company.getName() + " from " + from
                 + " to " + to;

Index: MoveSet.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/move/MoveSet.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** MoveSet.java	26 Nov 2009 20:14:30 -0000	1.13
--- MoveSet.java	31 Jan 2010 22:22:30 -0000	1.14
***************
*** 31,35 ****
  
      protected void addMove (Move move) {
!     	moves.add(move);
          log.debug("Done: " + move);
      }
--- 31,35 ----
  
      protected void addMove (Move move) {
!         moves.add(move);
          log.debug("Done: " + move);
      }
***************
*** 46,51 ****
  
          // Create a reversed move list
!     	List<Move> reversedMoves = new ArrayList<Move>(moves);
!     	Collections.reverse(reversedMoves);
          for (Move move : reversedMoves) {
              move.undo();
--- 46,51 ----
  
          // Create a reversed move list
!         List<Move> reversedMoves = new ArrayList<Move>(moves);
!         Collections.reverse(reversedMoves);
          for (Move move : reversedMoves) {
              move.undo();
***************
*** 63,67 ****
  
      protected boolean isLinkedToPreviousMove() {
!     	return linkedToPreviousMoveSet;
      }
  
--- 63,67 ----
  
      protected boolean isLinkedToPreviousMove() {
!         return linkedToPreviousMoveSet;
      }
  
***************
*** 73,90 ****
  
      protected static void add (Move move) {
!     	move.execute();
  
!     	MoveStack moveStack = getMoveStack();
!     	if (moveStack != null) moveStack.addMove(move);
      }
  
      private static MoveStack getMoveStack () {
!     	GameManagerI gameManager = GameManager.getInstance();
!     	if (gameManager != null) {
!     		return gameManager.getMoveStack();
!     	} else {
!     		// No GM during game setup; no problem, as MoveSets are not yet enabled then.
!     		return null;
!     	}
      }
  
--- 73,90 ----
  
      protected static void add (Move move) {
!         move.execute();
  
!         MoveStack moveStack = getMoveStack();
!         if (moveStack != null) moveStack.addMove(move);
      }
  
      private static MoveStack getMoveStack () {
!         GameManagerI gameManager = GameManager.getInstance();
!         if (gameManager != null) {
!             return gameManager.getMoveStack();
!         } else {
!             // No GM during game setup; no problem, as MoveSets are not yet enabled then.
!             return null;
!         }
      }
  

Index: Move.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/move/Move.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Move.java	23 Sep 2009 21:38:57 -0000	1.3
--- Move.java	31 Jan 2010 22:22:30 -0000	1.4
***************
*** 18,25 ****
  public abstract class Move {
  
! 	/** Any ModelObjects that need be updated.
! 	 * Will only be used by subclasses where it matters.
! 	 */
! 	protected List<ModelObject> models = null;
  
      protected static Logger log =
--- 18,25 ----
  public abstract class Move {
  
!     /** Any ModelObjects that need be updated.
!      * Will only be used by subclasses where it matters.
!      */
!     protected List<ModelObject> models = null;
  
      protected static Logger log =
***************
*** 31,45 ****
  
      public void registerModelToUpdate (ModelObject model) {
!     	if (models == null) models = new ArrayList<ModelObject>(2);
!     	models.add(model);
      }
  
      // Could also be built into execute() and update()
      public void updateModels () {
!     	if (models != null) {
!     		for (ModelObject model : models) {
!     			model.update();
!     		}
!     	}
      }
  }
--- 31,45 ----
  
      public void registerModelToUpdate (ModelObject model) {
!         if (models == null) models = new ArrayList<ModelObject>(2);
!         models.add(model);
      }
  
      // Could also be built into execute() and update()
      public void updateModels () {
!         if (models != null) {
!             for (ModelObject model : models) {
!                 model.update();
!             }
!         }
      }
  }

Index: MoveStack.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/move/MoveStack.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MoveStack.java	22 Jan 2010 21:28:06 -0000	1.3
--- MoveStack.java	31 Jan 2010 22:22:30 -0000	1.4
***************
*** 107,112 ****
      public boolean undoMoveSet (boolean forced) {
          if (lastIndex >= 0 && lastIndex < moveStack.size()
!         		&& (forced || moveStack.get(lastIndex).isUndoableByPlayer())
!         		&& currentMoveSet == null) {
              MoveSet undoAction;
              do {
--- 107,112 ----
      public boolean undoMoveSet (boolean forced) {
          if (lastIndex >= 0 && lastIndex < moveStack.size()
!                 && (forced || moveStack.get(lastIndex).isUndoableByPlayer())
!                 && currentMoveSet == null) {
              MoveSet undoAction;
              do {

Index: AddToList.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/move/AddToList.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** AddToList.java	23 Sep 2009 21:38:57 -0000	1.4
--- AddToList.java	31 Jan 2010 22:22:29 -0000	1.5
***************
*** 34,38 ****
  
      @Override
! 	public boolean execute() {
          list.add(object);
          updateModels();
--- 34,38 ----
  
      @Override
!     public boolean execute() {
          list.add(object);
          updateModels();
***************
*** 41,45 ****
  
      @Override
! 	public boolean undo() {
          list.remove(object);
          updateModels();
--- 41,45 ----
  
      @Override
!     public boolean undo() {
          list.remove(object);
          updateModels();
***************
*** 48,52 ****
  
      @Override
! 	public String toString() {
          return "AddToList " + listName + ": " + object.toString();
      }
--- 48,52 ----
  
      @Override
!     public String toString() {
          return "AddToList " + listName + ": " + object.toString();
      }

Index: CashMove.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/move/CashMove.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CashMove.java	4 Nov 2009 20:33:22 -0000	1.6
--- CashMove.java	31 Jan 2010 22:22:30 -0000	1.7
***************
*** 36,40 ****
  
      @Override
! 	public boolean execute() {
  
          transferCash(from, to, amount);
--- 36,40 ----
  
      @Override
!     public boolean execute() {
  
          transferCash(from, to, amount);
***************
*** 43,47 ****
  
      @Override
! 	public boolean undo() {
  
          transferCash(to, from, amount);
--- 43,47 ----
  
      @Override
!     public boolean undo() {
  
          transferCash(to, from, amount);
***************
*** 55,59 ****
  
      @Override
! 	public String toString() {
          return "CashMove: " + Bank.format(amount) + " from " + from.getName()
                 + " to " + to.getName();
--- 55,59 ----
  
      @Override
!     public String toString() {
          return "CashMove: " + Bank.format(amount) + " from " + from.getName()
                 + " to " + to.getName();

Index: ObjectMove.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/move/ObjectMove.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ObjectMove.java	8 Jan 2010 21:31:00 -0000	1.7
--- ObjectMove.java	31 Jan 2010 22:22:30 -0000	1.8
***************
*** 41,52 ****
  
      @Override
! 	public boolean execute() {
  
!     	return (from == null || from.removeObject(moveableObject))
                 && to.addObject(moveableObject);
      }
  
      @Override
! 	public boolean undo() {
  
          return to.removeObject(moveableObject)
--- 41,52 ----
  
      @Override
!     public boolean execute() {
  
!         return (from == null || from.removeObject(moveableObject))
                 && to.addObject(moveableObject);
      }
  
      @Override
!     public boolean undo() {
  
          return to.removeObject(moveableObject)
***************
*** 55,59 ****
  
      @Override
! 	public String toString() {
          if (moveableObject == null) log.error("Token is null");
          if (from == null) log.warn("From is null");
--- 55,59 ----
  
      @Override
!     public String toString() {
          if (moveableObject == null) log.error("Token is null");
          if (from == null) log.warn("From is null");