[Rails-commits] 18xx/rails/ui/swing ORUIManager.java,1.69,1.70

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

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

Modified Files:
	ORUIManager.java 
Log Message:
Removed 'None' option on the "which train to exchange" question. 
Question suppressed if only one train available for exchange.

Index: ORUIManager.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/ORUIManager.java,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** ORUIManager.java	29 Apr 2010 22:15:11 -0000	1.69
--- ORUIManager.java	30 Apr 2010 09:30:40 -0000	1.70
***************
*** 1080,1105 ****
          if (train != null && buyAction.isForExchange()) {
              List<TrainI> oldTrains = buyAction.getTrainsForExchange();
!             List<String> oldTrainOptions =
!                     new ArrayList<String>(oldTrains.size());
!             String[] options = new String[oldTrains.size() + 1];
!             int jj = 0;
!             if (!buyAction.isForcedExchange()) {
!                 options[jj++] = LocalText.getText("None");
!             }
!             for (int j = 0; j < oldTrains.size(); j++) {
!                 options[jj + j] =
!                         LocalText.getText("N_Train", oldTrains.get(j).getName());
!                 oldTrainOptions.add(options[jj + j]);
!             }
!             String exchangedTrainName =
!                     (String) JOptionPane.showInputDialog(orWindow,
!                             LocalText.getText("WHICH_TRAIN_EXCHANGE_FOR",
!                                     Bank.format(price)),
!                             LocalText.getText("WHICH_TRAIN_EXCHANGE"),
!                             JOptionPane.QUESTION_MESSAGE, null, options,
!                             options[0]);
!             int index = oldTrainOptions.indexOf(exchangedTrainName);
!             if (index >= 0) {
!                 exchangedTrain = oldTrains.get(index);
              }
          }
--- 1080,1106 ----
          if (train != null && buyAction.isForExchange()) {
              List<TrainI> oldTrains = buyAction.getTrainsForExchange();
!             if (oldTrains.size() == 1) {
!                 exchangedTrain = oldTrains.get(0);
!             } else {
!                 List<String> oldTrainOptions =
!                         new ArrayList<String>(oldTrains.size());
!                 String[] options = new String[oldTrains.size() + 1];
!                 int jj = 0;
!                 for (int j = 0; j < oldTrains.size(); j++) {
!                     options[jj + j] =
!                             LocalText.getText("N_Train", oldTrains.get(j).getName());
!                     oldTrainOptions.add(options[jj + j]);
!                 }
!                 String exchangedTrainName =
!                         (String) JOptionPane.showInputDialog(orWindow,
!                                 LocalText.getText("WHICH_TRAIN_EXCHANGE_FOR",
!                                         Bank.format(price)),
!                                 LocalText.getText("WHICH_TRAIN_TO_EXCHANGE"),
!                                 JOptionPane.QUESTION_MESSAGE, null, options,
!                                 options[0]);
!                 int index = oldTrainOptions.indexOf(exchangedTrainName);
!                 if (index >= 0) {
!                     exchangedTrain = oldTrains.get(index);
!                 }
              }
          }