[Rails-commits] 18xx/rails/ui/swing ORPanel.java,1.64,1.65

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

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

Modified Files:
	ORPanel.java 
Log Message:
Added support for 18EU Pullman, introduced RevenueDynamicModifier

Index: ORPanel.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/ORPanel.java,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -d -r1.64 -r1.65
*** ORPanel.java	15 May 2010 16:36:09 -0000	1.64
--- ORPanel.java	20 May 2010 23:13:21 -0000	1.65
***************
*** 4,7 ****
--- 4,8 ----
  import java.awt.*;
  import java.awt.event.*;
+ import java.util.ArrayList;
  import java.util.List;
  
***************
*** 601,613 ****
              CompanyManagerI cm = gm.getCompanyManager();
              PublicCompanyI company = cm.getPublicCompany(companyName);
!             RevenueAdapter ra = new RevenueAdapter(gm, nwGraph, company, gm.getCurrentPhase());
!             ra.populateFromRails();
! 
              boolean anotherTrain = true;
              while (anotherTrain) {
!                 int revenueValue;
                  ra.initRevenueCalculator();
                  log.info("Revenue Adapter:" + ra);
!                 revenueValue = ra.calculateRevenue();
                  log.info("Revenue Value:" + revenueValue);
                  log.info("Revenue Run:" + ra.getOptimalRunPrettyPrint());
--- 602,617 ----
              CompanyManagerI cm = gm.getCompanyManager();
              PublicCompanyI company = cm.getPublicCompany(companyName);
!             List<String> addTrainList = new ArrayList<String>();
              boolean anotherTrain = true;
+             RevenueAdapter ra = null;
              while (anotherTrain) {
!                 ra = new RevenueAdapter(gm, nwGraph, company, gm.getCurrentPhase());
!                 ra.populateFromRails();
!                 for (String addTrain:addTrainList) {
!                     ra.addTrainByString(addTrain);
!                 }
                  ra.initRevenueCalculator();
                  log.info("Revenue Adapter:" + ra);
!                 int revenueValue = ra.calculateRevenue();
                  log.info("Revenue Value:" + revenueValue);
                  log.info("Revenue Run:" + ra.getOptimalRunPrettyPrint());
***************
*** 617,629 ****
                          "\nRevenueRun = \n" + ra.getOptimalRunPrettyPrint());
  
!                 String trainsToAdd =
                      JOptionPane.showInputDialog(orWindow, "Another train",
                      "Add another train to run?",
                      JOptionPane.QUESTION_MESSAGE);
!                 if (trainsToAdd == null || trainsToAdd.equals("")) {
                      anotherTrain = false;
                  } else {
!                     ra.addTrainByString(trainsToAdd);
                  }
              }
              revenueAdapter = ra;
--- 621,634 ----
                          "\nRevenueRun = \n" + ra.getOptimalRunPrettyPrint());
  
!                 String trainString =
                      JOptionPane.showInputDialog(orWindow, "Another train",
                      "Add another train to run?",
                      JOptionPane.QUESTION_MESSAGE);
!                 if (trainString == null || trainString.equals("")) {
                      anotherTrain = false;
                  } else {
!                     addTrainList.add(trainString);
                  }
+ 
              }
              revenueAdapter = ra;