[Rails-commits] 18xx/rails/game/specific/_18AL NameTrains.java, 1.3, 1.4 AssignNamedTrains.java, 1.4, 1.5 NamedTrainToken.java, 1.2, 1.3

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

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

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

Index: NameTrains.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/specific/_18AL/NameTrains.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** NameTrains.java	23 Sep 2009 21:38:57 -0000	1.3
--- NameTrains.java	31 Oct 2009 17:08:27 -0000	1.4
***************
*** 5,8 ****
--- 5,9 ----
  
  import rails.game.ConfigurationException;
+ import rails.game.GameManagerI;
  import rails.game.move.Moveable;
  import rails.game.special.SpecialProperty;
***************
*** 65,68 ****
--- 66,77 ----
      }
  
+     public void finishConfiguration (GameManagerI gameManager) 
+     throws ConfigurationException {
+         
+         for (NamedTrainToken token : tokens) {
+             token.finishConfiguration(gameManager);
+         }
+     }
+ 
      public List<NamedTrainToken> getTokens() {
          return tokens;

Index: NamedTrainToken.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/specific/_18AL/NamedTrainToken.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** NamedTrainToken.java	4 Jun 2008 19:00:34 -0000	1.2
--- NamedTrainToken.java	31 Oct 2009 17:08:27 -0000	1.3
***************
*** 5,9 ****
--- 5,11 ----
  
  import rails.game.Bank;
+ import rails.game.ConfigurableComponentI;
  import rails.game.ConfigurationException;
+ import rails.game.GameManagerI;
  import rails.game.MapHex;
  import rails.game.MapManager;
***************
*** 12,16 ****
  import rails.util.Util;
  
! public class NamedTrainToken extends Token {
  
      private String name;
--- 14,18 ----
  import rails.util.Util;
  
! public class NamedTrainToken extends Token implements ConfigurableComponentI {
  
      private String name;
***************
*** 45,56 ****
  
          hexesString = tag.getAttributeAsString("ifRouteIncludes");
-         if (hexesString != null) {
-             MapHex hex;
-             hexes = new ArrayList<MapHex>(2);
-             for (String hexName : hexesString.split(",")) {
-                 hex = MapManager.getInstance().getHex(hexName);
-                 hexes.add(hex);
-             }
-         }
  
          description =
--- 47,50 ----
***************
*** 58,61 ****
--- 52,63 ----
      }
  
+     public void finishConfiguration (GameManagerI gameManager) 
+     throws ConfigurationException {
+         
+         if (hexesString != null) {
+             hexes = gameManager.getMapManager().parseLocations(hexesString);
+         }
+     }
+ 
      public String getName() {
          return name;

Index: AssignNamedTrains.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/specific/_18AL/AssignNamedTrains.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** AssignNamedTrains.java	4 Jun 2008 19:00:36 -0000	1.4
--- AssignNamedTrains.java	31 Oct 2009 17:08:27 -0000	1.5
***************
*** 56,60 ****
              for (NameableTrain train : nameableTrains) {
                  trainIds[trainIndex] = train.getUniqueId();
!                 NamedTrainToken token = ((NameableTrain) train).getNameToken();
                  if (token != null) {
                      preTrainPerToken.set(tokens.indexOf(token), train);
--- 56,60 ----
              for (NameableTrain train : nameableTrains) {
                  trainIds[trainIndex] = train.getUniqueId();
!                 NamedTrainToken token = train.getNameToken();
                  if (token != null) {
                      preTrainPerToken.set(tokens.indexOf(token), train);