[Rails-commits] 18xx/rails/game/action BuyTrain.java,1.13,1.14

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

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

Modified Files:
	BuyTrain.java 
Log Message:
Fixes to 18EU Pullmann problems

Index: BuyTrain.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/action/BuyTrain.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** BuyTrain.java	25 Nov 2009 18:45:28 -0000	1.13
--- BuyTrain.java	24 Jan 2010 16:21:29 -0000	1.14
***************
*** 37,40 ****
--- 37,42 ----
      transient private SpecialTrainBuy specialProperty = null;
      private int specialPropertyId = 0;
+     
+     private String extraMessage = null;
  
      // User settings
***************
*** 61,71 ****
              for (int i = 0; i < trains.size(); i++) {
                  trainsForExchangeUniqueIds[i] = trains.get(i).getName();
!                 // TODO:
!                 // Must
!                 // be
!                 // replaced
!                 // by
!                 // unique
!                 // Ids
              }
          }
--- 63,67 ----
              for (int i = 0; i < trains.size(); i++) {
                  trainsForExchangeUniqueIds[i] = trains.get(i).getName();
!                 // TODO: Must be replaced by unique Ids
              }
          }
***************
*** 93,98 ****
  		this.hasNoTrains = hasNoTrains;
  	}
  
! 	/**
       * @return Returns the specialProperty.
       */
--- 89,102 ----
  		this.hasNoTrains = hasNoTrains;
  	}
+     
+     public void setExtraMessage (String message) {
+         extraMessage = message;
+     }
  
! 	public String getExtraMessage() {
!         return extraMessage;
!     }
! 
!     /**
       * @return Returns the specialProperty.
       */
***************
*** 230,235 ****
          //in.defaultReadObject();
          // TEMPORARY Custom reading for backwards compatibility
-     	// TODO We need this code only until route checking is implemented,
-     	// as then it will be possible to detect route existence.
          ObjectInputStream.GetField fields = in.readFields();
          trainUniqueId = (String) fields.get("trainUniqueId", trainUniqueId);
--- 234,237 ----
***************
*** 246,249 ****
--- 248,252 ----
          addedCash = fields.get("addedCash", addedCash);
          exchangedTrainUniqueId = (String) fields.get("exchangedTrainUniqueId", exchangedTrainUniqueId);
+         extraMessage = (String) fields.get("extraMessage", extraMessage);
  
          GameManagerI gameManager = GameManager.getInstance();