[Rails-commits] 18xx/rails/ui/swing/gamespecific/_18EU StatusWindow_18EU.java, 1.4, 1.5 GameStatus_18EU.java, 1.6, 1.7

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

Update of /cvsroot/rails/18xx/rails/ui/swing/gamespecific/_18EU
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv14080/rails/ui/swing/gamespecific/_18EU

Modified Files:
	StatusWindow_18EU.java GameStatus_18EU.java 
Log Message:
Fixed code to remove compiler warnings

Index: StatusWindow_18EU.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/gamespecific/_18EU/StatusWindow_18EU.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** StatusWindow_18EU.java	30 Jun 2008 20:35:29 -0000	1.4
--- StatusWindow_18EU.java	15 Jan 2009 20:53:28 -0000	1.5
***************
*** 7,11 ****
  import javax.swing.JOptionPane;
  
! import rails.game.*;
  import rails.game.action.DiscardTrain;
  import rails.game.action.PossibleAction;
--- 7,12 ----
  import javax.swing.JOptionPane;
  
! import rails.game.PublicCompanyI;
! import rails.game.TrainI;
  import rails.game.action.DiscardTrain;
  import rails.game.action.PossibleAction;
***************
*** 68,72 ****
                                  LocalText.getText(
                                          "HAS_TOO_MANY_TRAINS",
!                                         new String[] { playerName, c.getName() }),
                                  LocalText.getText("WhichTrainToDiscard"),
                                  JOptionPane.QUESTION_MESSAGE, null, options,
--- 69,74 ----
                                  LocalText.getText(
                                          "HAS_TOO_MANY_TRAINS",
!                                         playerName,
!                                         c.getName() ),
                                  LocalText.getText("WhichTrainToDiscard"),
                                  JOptionPane.QUESTION_MESSAGE, null, options,

Index: GameStatus_18EU.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/gamespecific/_18EU/GameStatus_18EU.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** GameStatus_18EU.java	24 Dec 2008 14:55:11 -0000	1.6
--- GameStatus_18EU.java	15 Jan 2009 20:53:28 -0000	1.7
***************
*** 85,91 ****
                  boolean replaceToken =
                          JOptionPane.showConfirmDialog(this, LocalText.getText(
!                                 "WantToReplaceToken", new String[] {
!                                         minor.getName(), //
!                                         major.getName() }),
                                  LocalText.getText("PleaseSelect"),
                                  JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION;
--- 85,91 ----
                  boolean replaceToken =
                          JOptionPane.showConfirmDialog(this, LocalText.getText(
!                                     "WantToReplaceToken",
!                                     minor.getName(),
!                                     major.getName() ),
                                  LocalText.getText("PleaseSelect"),
                                  JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION;
***************
*** 95,125 ****
              }
  
-             // TODO MOVE THIS TO A LATER STEP - MAY BE ANOTHER PLAYER!!!
-             /*
-              * List<TrainI> trains = action.getMinorTrains();
-              * trains.addAll(action.getMajorTrains().get(choice)); int
-              * trainLimit = action.getMajorTrainLimit(); List<TrainI>
-              * discardedTrains = new ArrayList<TrainI>();
-              * 
-              * while (trains.size() > trainLimit) {
-              * 
-              * List<String> trainOptions = new ArrayList<String>(trains.size());
-              * options = new String[trains.size()];
-              * 
-              * for (int j=0; j<options.length; j++) { options[j] =
-              * LocalText.getText("N_Train", trains.get(j).getName());
-              * trainOptions.add(options[j]); } String discardedTrainName =
-              * (String) JOptionPane.showInputDialog (this,
-              * LocalText.getText("HasTooManyTrains", new String[] {
-              * major.getName(), String.valueOf(trains.size()),
-              * String.valueOf(trainLimit) }),
-              * LocalText.getText("WhichTrainToDiscard"),
-              * JOptionPane.QUESTION_MESSAGE, null, options, options[0]); if
-              * (discardedTrainName != null) { TrainI train =
-              * trains.get(trainOptions.indexOf(discardedTrainName));
-              * discardedTrains.add(train); trains.remove(train); } } if
-              * (!discardedTrains.isEmpty()) {
-              * action.setDiscardedTrains(discardedTrains); }
-              */
          }
          return chosenAction;
--- 95,98 ----
***************
*** 146,152 ****
                                  LocalText.getText(
                                          "MergeMinorConfirm",
!                                         new String[] {
!                                                 minor.getName(),
!                                                 action.getCertificate().getCompany().getName() }),
                                  LocalText.getText("PleaseConfirm"),
                                  JOptionPane.OK_CANCEL_OPTION,
--- 119,124 ----
                                  LocalText.getText(
                                          "MergeMinorConfirm",
!                                         minor.getName(),
!                                         action.getCertificate().getCompany().getName() ),
                                  LocalText.getText("PleaseConfirm"),
                                  JOptionPane.OK_CANCEL_OPTION,