[Rails-commits] 18xx/rails/ui/swing/gamespecific/_1856 StatusWindow_1856.java, 1.7, 1.8

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

Update of /cvsroot/rails/18xx/rails/ui/swing/gamespecific/_1856
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv23280/rails/ui/swing/gamespecific/_1856

Modified Files:
	StatusWindow_1856.java 
Log Message:
Fixed previous fix

Index: StatusWindow_1856.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/gamespecific/_1856/StatusWindow_1856.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** StatusWindow_1856.java	15 Jun 2010 20:16:54 -0000	1.7
--- StatusWindow_1856.java	15 Jun 2010 22:04:11 -0000	1.8
***************
*** 28,33 ****
              immediateAction = possibleActions.getType(RepayLoans.class).get(0);
          // Moved up
!         //} else if (possibleActions.contains(DiscardTrain.class)) {
!         //    immediateAction = possibleActions.getType(DiscardTrain.class).get(0);
          } else if (possibleActions.contains(ExchangeTokens.class)) {
              immediateAction = possibleActions.getType(ExchangeTokens.class).get(0);
--- 28,33 ----
              immediateAction = possibleActions.getType(RepayLoans.class).get(0);
          // Moved up
!         } else if (possibleActions.contains(DiscardTrain.class)) {
!             immediateAction = possibleActions.getType(DiscardTrain.class).get(0);
          } else if (possibleActions.contains(ExchangeTokens.class)) {
              immediateAction = possibleActions.getType(ExchangeTokens.class).get(0);