[Rails-commits] 18xx/rails/ui/swing ORUIManager.java,1.55,1.56

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

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

Modified Files:
	ORUIManager.java 
Log Message:
Minor fixes and improvements to NoMap OperatingCosts

Index: ORUIManager.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/ORUIManager.java,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** ORUIManager.java	17 Feb 2010 22:02:56 -0000	1.55
--- ORUIManager.java	22 Feb 2010 22:48:20 -0000	1.56
***************
*** 764,773 ****
          for (OperatingCost ac:actionOC) {
              
-             int suggestedCost = ac.getAmount();
              String suggestedCostText;
!             if (suggestedCost == 0)
                  suggestedCostText = LocalText.getText("OCAmountEntry");
              else
!                 suggestedCostText = Bank.format(suggestedCost);
              
              OperatingCost.OCType t = ac.getOCType();
--- 764,772 ----
          for (OperatingCost ac:actionOC) {
              
              String suggestedCostText;
!             if (ac.isFreeEntryAllowed())
                  suggestedCostText = LocalText.getText("OCAmountEntry");
              else
!                 suggestedCostText = Bank.format(ac.getAmount());
              
              OperatingCost.OCType t = ac.getOCType();
***************
*** 790,794 ****
                  int index = textOC.indexOf(chosenOption);
                  OperatingCost chosenAction = actionOC.get(index);
!                 if (chosenAction.getAmount() == 0) {
                      String costString = (String) JOptionPane.showInputDialog(orWindow,
                              LocalText.getText("OCDialogMessage", chosenOption),
--- 789,793 ----
                  int index = textOC.indexOf(chosenOption);
                  OperatingCost chosenAction = actionOC.get(index);
!                 if (chosenAction.isFreeEntryAllowed()) {
                      String costString = (String) JOptionPane.showInputDialog(orWindow,
                              LocalText.getText("OCDialogMessage", chosenOption),
***************
*** 1161,1165 ****
      protected void processCorrectionAction(CorrectionAction action) {
  
!         gameUIManager.processOnServer((PossibleAction)action);
          
      }
--- 1160,1164 ----
      protected void processCorrectionAction(CorrectionAction action) {
  
!         gameUIManager.processOnServer(action);
          
      }