[Rails-commits] 18xx/rails/game/specific/_18AL AssignNamedTrains.java, 1.5, 1.6

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

Update of /cvsroot/rails/18xx/rails/game/specific/_18AL
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv21355/rails/game/specific/_18AL

Modified Files:
	AssignNamedTrains.java 
Log Message:
More rationalising of static method usage

Index: AssignNamedTrains.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/specific/_18AL/AssignNamedTrains.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** AssignNamedTrains.java	31 Oct 2009 17:08:27 -0000	1.5
--- AssignNamedTrains.java	4 Nov 2009 20:33:22 -0000	1.6
***************
*** 6,15 ****
  import java.util.List;
  
! import rails.game.Token;
! import rails.game.Train;
! import rails.game.TrainI;
  import rails.game.action.UseSpecialProperty;
- import rails.game.specific._18AL.NamedTrainToken;
- import rails.game.specific._18AL.NameTrains;
  
  public class AssignNamedTrains extends UseSpecialProperty {
--- 6,11 ----
  import java.util.List;
  
! import rails.game.*;
  import rails.game.action.UseSpecialProperty;
  
  public class AssignNamedTrains extends UseSpecialProperty {
***************
*** 67,75 ****
      }
  
!     public String toMenu() {
          return ((NameTrains) specialProperty).toMenu();
      }
  
!     public String toString() {
          StringBuffer b = new StringBuffer("AssignNamedTrains ");
          for (NamedTrainToken token : ((NameTrains) getSpecialProperty()).getTokens()) {
--- 63,73 ----
      }
  
!     @Override
! 	public String toMenu() {
          return ((NameTrains) specialProperty).toMenu();
      }
  
!     @Override
! 	public String toString() {
          StringBuffer b = new StringBuffer("AssignNamedTrains ");
          for (NamedTrainToken token : ((NameTrains) getSpecialProperty()).getTokens()) {
***************
*** 106,113 ****
          in.defaultReadObject();
  
          nameableTrains = new ArrayList<NameableTrain>();
          if (trainIds != null) {
              for (String trainId : trainIds) {
!                 nameableTrains.add((NameableTrain) Train.getByUniqueId(trainId));
              }
          }
--- 104,113 ----
          in.defaultReadObject();
  
+         TrainManager trainManager = GameManager.getInstance().getTrainManager();
+ 
          nameableTrains = new ArrayList<NameableTrain>();
          if (trainIds != null) {
              for (String trainId : trainIds) {
!                 nameableTrains.add((NameableTrain) trainManager.getTrainByUniqueId(trainId));
              }
          }