[Rails-commits] 18xx/rails/ui/swing ImageLoader.java, 1.11, 1.12 ORUIManager.java, 1.24, 1.25 StartRoundWindow.java, 1.29, 1.30 GameStatus.java, 1.22, 1.23 ORWindow.java, 1.21, 1.22

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

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

Modified Files:
	ImageLoader.java ORUIManager.java StartRoundWindow.java 
	GameStatus.java ORWindow.java 
Log Message:
Fixed code to remove compiler warnings

Index: ImageLoader.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/ImageLoader.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** ImageLoader.java	4 Jun 2008 19:00:33 -0000	1.11
--- ImageLoader.java	15 Jan 2009 20:53:28 -0000	1.12
***************
*** 2,18 ****
  package rails.ui.swing;
  
! import java.awt.image.*;
! import java.io.*;
  import java.util.*;
  
  import javax.imageio.ImageIO;
  
- import rails.ui.swing.hexmap.GUIHex;
- import rails.util.*;
- 
  import org.apache.batik.transcoder.*;
  import org.apache.batik.transcoder.image.ImageTranscoder;
  
! import org.apache.log4j.*;
  
  /**
--- 2,17 ----
  package rails.ui.swing;
  
! import java.awt.image.BufferedImage;
! import java.io.InputStream;
  import java.util.*;
  
  import javax.imageio.ImageIO;
  
  import org.apache.batik.transcoder.*;
  import org.apache.batik.transcoder.image.ImageTranscoder;
+ import org.apache.log4j.Logger;
  
! import rails.ui.swing.hexmap.GUIHex;
! import rails.util.*;
  
  /**
***************
*** 30,34 ****
      private static String tileRootDir = Config.get("tile.root_directory");
      private static String preference = Config.get("tile.format_preference");
!     private static ArrayList<String> directories = new ArrayList<String>();
  
      static {
--- 29,33 ----
      private static String tileRootDir = Config.get("tile.root_directory");
      private static String preference = Config.get("tile.format_preference");
!     private static List<String> directories = new ArrayList<String>();
  
      static {
***************
*** 50,57 ****
--- 49,58 ----
          private BufferedImage image;
  
+         @Override
          public BufferedImage createImage(int width, int height) {
              return new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);
          }
  
+         @Override
          public void writeImage(BufferedImage image, TranscoderOutput output)
                  throws TranscoderException {
***************
*** 140,144 ****
          if (!tileMap.containsKey(Integer.toString(tileID))) loadTile(tileID);
  
!         return (BufferedImage) tileMap.get(Integer.toString(tileID));
      }
  
--- 141,145 ----
          if (!tileMap.containsKey(Integer.toString(tileID))) loadTile(tileID);
  
!         return tileMap.get(Integer.toString(tileID));
      }
  

Index: StartRoundWindow.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/StartRoundWindow.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** StartRoundWindow.java	8 Jan 2009 19:59:39 -0000	1.29
--- StartRoundWindow.java	15 Jan 2009 20:53:28 -0000	1.30
***************
*** 594,600 ****
              StockSpace sp =
                      (StockSpace) JOptionPane.showInputDialog(this,
!                             LocalText.getText("WHICH_START_PRICE", new String[] {
                                      activeItem.getPlayerName(),
!                                     compName}),
                              LocalText.getText("WHICH_PRICE"),
                              JOptionPane.QUESTION_MESSAGE, null, options,
--- 594,600 ----
              StockSpace sp =
                      (StockSpace) JOptionPane.showInputDialog(this,
!                             LocalText.getText("WHICH_START_PRICE",
                                      activeItem.getPlayerName(),
!                                     compName),
                              LocalText.getText("WHICH_PRICE"),
                              JOptionPane.QUESTION_MESSAGE, null, options,

Index: ORUIManager.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/ORUIManager.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** ORUIManager.java	14 Jan 2009 20:45:07 -0000	1.24
--- ORUIManager.java	15 Jan 2009 20:53:28 -0000	1.25
***************
*** 237,243 ****
              if (specialTiles.length() > 1) {
                  extraMessage +=
!                         LocalText.getText("SpecialTile", new String[] {
                                  specialTiles.toString(),
!                                 extraTileMessage.toString() });
              } else if (extraTileMessage.length() > 1) {
                  extraMessage +=
--- 237,243 ----
              if (specialTiles.length() > 1) {
                  extraMessage +=
!                         LocalText.getText("SpecialTile",
                                  specialTiles.toString(),
!                                 extraTileMessage.toString() );
              } else if (extraTileMessage.length() > 1) {
                  extraMessage +=
***************
*** 341,347 ****
  
                  reachDestinations ((ReachDestinations) actions.get(0));
!                 
              } else if (actionType == TakeLoans.class) {
!                 
                  takeLoans ((TakeLoans)actions.get(0));
              }
--- 341,347 ----
  
                  reachDestinations ((ReachDestinations) actions.get(0));
! 
              } else if (actionType == TakeLoans.class) {
! 
                  takeLoans ((TakeLoans)actions.get(0));
              }
***************
*** 605,617 ****
                  for (City city : stations) {
                      if (city.hasTokenSlotsLeft()) {
!                         prompt =
!                                 LocalText.getText(
!                                         "SelectStationForTokenOption",
!                                         new String[] {
!                                                 String.valueOf(city.getNumber()),
!                                                 ((MapHex) selectedHex.getModel()).getConnectionString(
!                                                         selectedHex.getCurrentTile(),
!                                                         ((MapHex) selectedHex.getModel()).getCurrentTileRotation(),
!                                                         city.getNumber()) });
                          prompts.add(prompt);
                          promptToCityMap.put(prompt, city);
--- 605,615 ----
                  for (City city : stations) {
                      if (city.hasTokenSlotsLeft()) {
!                         prompt = LocalText.getText(
!                                 "SelectStationForTokenOption",
!                                         city.getNumber(),
!                                         ((MapHex) selectedHex.getModel()).getConnectionString(
!                                         selectedHex.getCurrentTile(),
!                                         ((MapHex) selectedHex.getModel()).getCurrentTileRotation(),
!                                         city.getNumber())) ;
                          prompts.add(prompt);
                          promptToCityMap.put(prompt, city);
***************
*** 674,686 ****
                  for (Station newStation : newTile.getStations()) {
                      if (newStation.getBaseSlots() > 0) {
!                         prompt =
!                                 LocalText.getText(
!                                         "SelectStationForTokenOption",
!                                         new String[] {
!                                                 String.valueOf(newStation.getNumber()),
!                                                 hex.getConnectionString(
!                                                         newTile,
!                                                         action.getOrientation(),
!                                                         newStation.getNumber()) });
                          prompts.add(prompt);
                          promptToCityMap.put(prompt, newStation.getNumber());
--- 672,681 ----
                  for (Station newStation : newTile.getStations()) {
                      if (newStation.getBaseSlots() > 0) {
!                         prompt = LocalText.getText("SelectStationForTokenOption",
!                                 newStation.getNumber(),
!                                 hex.getConnectionString(
!                                     newTile,
!                                     action.getOrientation(),
!                                     newStation.getNumber()) );
                          prompts.add(prompt);
                          promptToCityMap.put(prompt, newStation.getNumber());
***************
*** 757,762 ****
              b = new StringBuffer();
  
!             b.append(LocalText.getText("BUY_TRAIN_FROM", new String[] {
!                     train.getName(), from.getName() }));
              if (bTrain.isForExchange()) {
                  b.append(" (").append(LocalText.getText("EXCHANGED")).append(
--- 752,758 ----
              b = new StringBuffer();
  
!             b.append(LocalText.getText("BUY_TRAIN_FROM",
!                     train.getName(),
!                     from.getName() ));
              if (bTrain.isForExchange()) {
                  b.append(" (").append(LocalText.getText("EXCHANGED")).append(
***************
*** 820,827 ****
  
          if (price == 0 && seller.getOwner() instanceof PublicCompanyI) {
!             prompt =
!                     LocalText.getText("WHICH_TRAIN_PRICE",
!                             new String[] { orComp.getName(), train.getName(),
!                                     seller.getName() });
              String response;
              for (;;) {
--- 816,823 ----
  
          if (price == 0 && seller.getOwner() instanceof PublicCompanyI) {
!             prompt = LocalText.getText("WHICH_TRAIN_PRICE",
!                             orComp.getName(),
!                             train.getName(),
!                             seller.getName() );
              String response;
              for (;;) {
***************
*** 913,918 ****
                              (String) JOptionPane.showInputDialog(orWindow,
                                      LocalText.getText("HAS_TOO_MANY_TRAINS",
!                                             new String[] { playerName,
!                                                     c.getName() }),
                                      LocalText.getText("WhichTrainToDiscard"),
                                      JOptionPane.QUESTION_MESSAGE, null,
--- 909,914 ----
                              (String) JOptionPane.showInputDialog(orWindow,
                                      LocalText.getText("HAS_TOO_MANY_TRAINS",
!                                             playerName,
!                                             c.getName() ),
                                      LocalText.getText("WhichTrainToDiscard"),
                                      JOptionPane.QUESTION_MESSAGE, null,
***************
*** 949,959 ****
  
          for (BuyPrivate action : privates) {
!             privatesForSale.add(LocalText.getText(
!                     "BuyPrivatePrompt",
!                     new String[] {
!                             action.getPrivateCompany().getName(),
!                             action.getPrivateCompany().getPortfolio().getName(),
!                             Bank.format(action.getMinimumPrice()),
!                             Bank.format(action.getMaximumPrice()) }));
          }
  
--- 945,953 ----
  
          for (BuyPrivate action : privates) {
!             privatesForSale.add(LocalText.getText("BuyPrivatePrompt",
!                     action.getPrivateCompany().getName(),
!                     action.getPrivateCompany().getPortfolio().getName(),
!                     Bank.format(action.getMinimumPrice()),
!                     Bank.format(action.getMaximumPrice()) ));
          }
  
***************
*** 973,979 ****
                          JOptionPane.showInputDialog(orWindow,
                                  LocalText.getText("WHICH_PRIVATE_PRICE",
!                                         new String[] { chosenOption,
!                                                 Bank.format(minPrice),
!                                                 Bank.format(maxPrice) }),
                                  LocalText.getText("WHICH_PRICE"),
                                  JOptionPane.QUESTION_MESSAGE);
--- 967,973 ----
                          JOptionPane.showInputDialog(orWindow,
                                  LocalText.getText("WHICH_PRIVATE_PRICE",
!                                         chosenOption,
!                                         Bank.format(minPrice),
!                                         Bank.format(maxPrice) ),
                                  LocalText.getText("WHICH_PRICE"),
                                  JOptionPane.QUESTION_MESSAGE);
***************
*** 1038,1045 ****
  
          if (action.getMaxNumber() == 1) {
!             
              String message = LocalText.getText("PleaseConfirm");
!             String prompt = LocalText.getText("TakeLoanPrompt", 
!                     action.getCompanyName(), 
                      Bank.format(action.getPrice()));
              if (JOptionPane.showConfirmDialog(orWindow, prompt,
--- 1032,1039 ----
  
          if (action.getMaxNumber() == 1) {
! 
              String message = LocalText.getText("PleaseConfirm");
!             String prompt = LocalText.getText("TakeLoanPrompt",
!                     action.getCompanyName(),
                      Bank.format(action.getPrice()));
              if (JOptionPane.showConfirmDialog(orWindow, prompt,
***************
*** 1143,1147 ****
  
              orPanel.initRevenueEntryStep(orCompIndex, action);
!             
              String message = LocalText.getText("EnterRevenue");
              if (action.getRequiredCash() > 0) {
--- 1137,1141 ----
  
              orPanel.initRevenueEntryStep(orCompIndex, action);
! 
              String message = LocalText.getText("EnterRevenue");
              if (action.getRequiredCash() > 0) {
***************
*** 1166,1172 ****
  
              // discardTrain();
!             
          } else if (possibleActions.contains(TakeLoans.class)) {
!             
              orPanel.enableLoanTaking (possibleActions.getType(TakeLoans.class).get(0));
  
--- 1160,1166 ----
  
              // discardTrain();
! 
          } else if (possibleActions.contains(TakeLoans.class)) {
! 
              orPanel.enableLoanTaking (possibleActions.getType(TakeLoans.class).get(0));
  
***************
*** 1229,1234 ****
                  BonusToken token = (BonusToken) stl.getToken();
                  String text =
!                         LocalText.getText("LayBonusToken", new String[] {
!                                 token.toString(), stl.getLocationCodeString() });
                  orPanel.addSpecialAction(btAction, text);
              }
--- 1223,1229 ----
                  BonusToken token = (BonusToken) stl.getToken();
                  String text =
!                         LocalText.getText("LayBonusToken",
!                                 token.toString(),
!                                 stl.getLocationCodeString() );
                  orPanel.addSpecialAction(btAction, text);
              }

Index: GameStatus.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/GameStatus.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** GameStatus.java	11 Jan 2009 17:24:46 -0000	1.22
--- GameStatus.java	15 Jan 2009 20:53:28 -0000	1.23
***************
*** 559,567 ****
                      for (int i = 1; i <= sale.getMaximumNumber(); i++) {
                          options.add(LocalText.getText("SellShares",
!                                 new String[] {
!                                         String.valueOf(i * sale.getShare()),
!                                         sale.getCompanyName(),
!                                         Bank.format(i * sale.getShareUnits()
!                                                     * sale.getPrice()) }));
                          sellActions.add(sale);
                          sellAmounts.add(i);
--- 559,566 ----
                      for (int i = 1; i <= sale.getMaximumNumber(); i++) {
                          options.add(LocalText.getText("SellShares",
!                                 (i * sale.getShare()),
!                                 sale.getCompanyName(),
!                                 Bank.format(i * sale.getShareUnits()
!                                                     * sale.getPrice()) ));
                          sellActions.add(sale);
                          sellAmounts.add(i);
***************
*** 620,628 ****
                              for (int i = 0; i < startPrices.length; i++) {
                                  options.add(LocalText.getText("StartCompany",
!                                         new String[] {
!                                                 Bank.format(startPrices[i]),
!                                                 String.valueOf(cert.getShare()),
!                                                 Bank.format(cert.getShares()
!                                                             * startPrices[i]) }));
                                  buyActions.add(buy);
                                  buyAmounts.add(startPrices[i]);
--- 619,626 ----
                              for (int i = 0; i < startPrices.length; i++) {
                                  options.add(LocalText.getText("StartCompany",
!                                         Bank.format(startPrices[i]),
!                                         cert.getShare(),
!                                         Bank.format(cert.getShares()
!                                                             * startPrices[i]) ));
                                  buyActions.add(buy);
                                  buyAmounts.add(startPrices[i]);
***************
*** 630,637 ****
                          } else {
                              startPrices = new int[] {((StartCompany) buy).getPrice()};
!                             options.add(LocalText.getText("StartCompanyFixed", new String[]{
                                      companyName,
!                                     String.valueOf(cert.getShare()),
!                                     Bank.format(startPrices[0])}));
                              buyActions.add(buy);
                              buyAmounts.add(startPrices[0]);
--- 628,635 ----
                          } else {
                              startPrices = new int[] {((StartCompany) buy).getPrice()};
!                             options.add(LocalText.getText("StartCompanyFixed",
                                      companyName,
!                                     cert.getShare(),
!                                     Bank.format(startPrices[0]) ));
                              buyActions.add(buy);
                              buyAmounts.add(startPrices[0]);
***************
*** 641,661 ****
  
                          options.add(LocalText.getText("BuyCertificate",
!                                 new String[] {
!                                         String.valueOf(cert.getShare()),
!                                         cert.getCompany().getName(),
!                                         cert.getPortfolio().getName(),
!                                         Bank.format(cert.getShares()
!                                                     * buy.getPrice()) }));
                          buyActions.add(buy);
                          buyAmounts.add(1);
                          for (int i = 2; i <= buy.getMaximumNumber(); i++) {
                              options.add(LocalText.getText("BuyCertificates",
!                                     new String[] {
!                                             String.valueOf(i),
!                                             String.valueOf(cert.getShare()),
!                                             cert.getCompany().getName(),
!                                             cert.getPortfolio().getName(),
!                                             Bank.format(i * cert.getShares()
!                                                         * buy.getPrice()) }));
                              buyActions.add(buy);
                              buyAmounts.add(i);
--- 639,657 ----
  
                          options.add(LocalText.getText("BuyCertificate",
!                                 cert.getShare(),
!                                 cert.getCompany().getName(),
!                                 cert.getPortfolio().getName(),
!                                 Bank.format(cert.getShares()
!                                                     * buy.getPrice()) ));
                          buyActions.add(buy);
                          buyAmounts.add(1);
                          for (int i = 2; i <= buy.getMaximumNumber(); i++) {
                              options.add(LocalText.getText("BuyCertificates",
!                                     i,
!                                     cert.getShare(),
!                                     cert.getCompany().getName(),
!                                     cert.getPortfolio().getName(),
!                                     Bank.format(i * cert.getShares()
!                                                         * buy.getPrice()) ));
                              buyActions.add(buy);
                              buyAmounts.add(i);
***************
*** 669,675 ****
                                  new RadioButtonDialog(this,
                                          LocalText.getText("PleaseSelect"),
!                                         LocalText.getText("WHICH_START_PRICE", new String[] {
                                                  playerName,
!                                                 companyName}),
                                          options.toArray(new String[0]), -1).getSelectedOption();
                      } else {
--- 665,671 ----
                                  new RadioButtonDialog(this,
                                          LocalText.getText("PleaseSelect"),
!                                         LocalText.getText("WHICH_START_PRICE",
                                                  playerName,
!                                                 companyName),
                                          options.toArray(new String[0]), -1).getSelectedOption();
                      } else {

Index: ORWindow.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/ORWindow.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** ORWindow.java	3 Jan 2009 22:51:16 -0000	1.21
--- ORWindow.java	15 Jan 2009 20:53:28 -0000	1.22
***************
*** 15,21 ****
  
  import rails.common.Defs;
! import rails.game.DisplayBuffer;
! import rails.game.GameManager;
! import rails.game.OperatingRound;
  import rails.game.action.*;
  import rails.util.LocalText;
--- 15,19 ----
  
  import rails.common.Defs;
! import rails.game.*;
  import rails.game.action.*;
  import rails.util.LocalText;
***************
*** 159,168 ****
  		String compositeORNumber = gameManager.getCompositeORNumber ();
  		String numORs = gameManager.getNumOfORs ();
! 		
          orPanel.recreate(or);
          setTitle(LocalText.getText("MapWindowORTitle",
! 								   new String [] {compositeORNumber, numORs} ));
! //								   gameManager.getCompositeORNumber(),
! //								   gameManager.getNumOfORs ()}));
          pack();
          if (lastBounds != null) {
--- 157,165 ----
  		String compositeORNumber = gameManager.getCompositeORNumber ();
  		String numORs = gameManager.getNumOfORs ();
! 
          orPanel.recreate(or);
          setTitle(LocalText.getText("MapWindowORTitle",
! 								   compositeORNumber,
! 								   numORs ));
          pack();
          if (lastBounds != null) {