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

[Stefan F. <ste...@us...>]

Update of /cvsroot/rails/18xx/rails/game/specific/_18AL
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv7719/rails/game/specific/_18AL

Modified Files:
	AssignNamedTrains.java 
Log Message:
Fixed 18AL issues: Double scoring of 4D and save of named trains

Index: AssignNamedTrains.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/specific/_18AL/AssignNamedTrains.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** AssignNamedTrains.java	31 Jan 2010 22:22:32 -0000	1.7
--- AssignNamedTrains.java	25 May 2010 19:38:30 -0000	1.8
***************
*** 96,99 ****
--- 96,109 ----
      public void setPostTrainPerToken(List<NameableTrain> postTokensPerTrain) {
          this.postTrainPerToken = postTokensPerTrain;
+         // convert to postTrainIds
+         if (postTokensPerTrain != null) {
+             for (NameableTrain train : postTokensPerTrain) {
+                 if (train == null) {
+                     postTrainIds[postTokensPerTrain.indexOf(train)] = null;
+                 } else {
+                     postTrainIds[postTokensPerTrain.indexOf(train)] = train.getUniqueId();
+                 }
+             }
+         }
      }
  
***************
*** 117,121 ****
              for (String trainId : preTrainIds) {
                  if (trainId != null && trainId.length() > 0) {
!                     preTrainPerToken.add((NameableTrain) Token.getByUniqueId(trainId));
                  } else {
                      preTrainPerToken.add(null);
--- 127,132 ----
              for (String trainId : preTrainIds) {
                  if (trainId != null && trainId.length() > 0) {
! //                    preTrainPerToken.add((NameableTrain) Token.getByUniqueId(trainId));
!                   preTrainPerToken.add((NameableTrain) trainManager.getTrainByUniqueId(trainId));
                  } else {
                      preTrainPerToken.add(null);
***************
*** 128,132 ****
              for (String trainId : postTrainIds) {
                  if (trainId != null && trainId.length() > 0) {
!                     postTrainPerToken.add((NameableTrain) Token.getByUniqueId(trainId));
                  } else {
                      postTrainPerToken.add(null);
--- 139,144 ----
              for (String trainId : postTrainIds) {
                  if (trainId != null && trainId.length() > 0) {
! //                    postTrainPerToken.add((NameableTrain) Token.getByUniqueId(trainId));
!                     postTrainPerToken.add((NameableTrain) trainManager.getTrainByUniqueId(trainId));
                  } else {
                      postTrainPerToken.add(null);