[Rails-commits] 18xx/rails/game/specific/_18EU FinalMinorExchangeRound.java, 1.6, 1.7 StartRound_18EU.java, 1.6, 1.7 StockRound_18EU.java, 1.19, 1.20

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

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

Modified Files:
	FinalMinorExchangeRound.java StartRound_18EU.java 
	StockRound_18EU.java 
Log Message:
Fixed code to remove compiler warnings

Index: StockRound_18EU.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/specific/_18EU/StockRound_18EU.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** StockRound_18EU.java	23 Dec 2008 20:00:03 -0000	1.19
--- StockRound_18EU.java	15 Jan 2009 20:53:28 -0000	1.20
***************
*** 326,331 ****
              if ((startSpace = stockMarket.getStartSpace(price)) == null) {
                  errMsg =
!                         LocalText.getText("InvalidStartPrice", new String[] {
!                                 Bank.format(price), company.getName() });
                  break;
              }
--- 326,332 ----
              if ((startSpace = stockMarket.getStartSpace(price)) == null) {
                  errMsg =
!                         LocalText.getText("InvalidStartPrice",
!                                 Bank.format(price),
!                                 company.getName() );
                  break;
              }
***************
*** 344,349 ****
                              minor.getName()) == null) {
                      errMsg =
!                             LocalText.getText("PlayerDoesNotOwn", new String[] {
!                                     currentPlayer.getName(), minor.getName() });
                      break;
                  }
--- 345,351 ----
                              minor.getName()) == null) {
                      errMsg =
!                             LocalText.getText("PlayerDoesNotOwn",
!                                     currentPlayer.getName(),
!                                     minor.getName() );
                      break;
                  }
***************
*** 353,359 ****
                  if (selectedHomeCity.getSlots() <= selectedHomeCity.getTokens().size()) {
                      errMsg =
!                             LocalText.getText("InvalidHomeBase", new String[] {
                                      selectedHomeCity.toString(),
!                                     company.getName() });
                      break;
                  }
--- 355,361 ----
                  if (selectedHomeCity.getSlots() <= selectedHomeCity.getTokens().size()) {
                      errMsg =
!                             LocalText.getText("InvalidHomeBase",
                                      selectedHomeCity.toString(),
!                                     company.getName() );
                      break;
                  }
***************
*** 366,371 ****
  
          if (errMsg != null) {
!             DisplayBuffer.add(LocalText.getText("CantStart", new String[] {
!                     playerName, companyName, Bank.format(price), errMsg }));
              return false;
          }
--- 368,376 ----
  
          if (errMsg != null) {
!             DisplayBuffer.add(LocalText.getText("CantStart",
!                     playerName,
!                     companyName,
!                     Bank.format(price),
!                     errMsg ));
              return false;
          }
***************
*** 387,394 ****
  
          company.start(startSpace);
!         ReportBuffer.add(LocalText.getText("START_COMPANY_LOG", new String[] {
!                 playerName, companyName, Bank.format(price),
!                 Bank.format(shares * price), String.valueOf(shares),
!                 String.valueOf(cert.getShare()), company.getName() }));
  
          // Transfer the President's certificate
--- 392,403 ----
  
          company.start(startSpace);
!         ReportBuffer.add(LocalText.getText("START_COMPANY_LOG",
!                 playerName,
!                 companyName,
!                 Bank.format(price),
!                 Bank.format(shares * price),
!                 shares,
!                 cert.getShare(),
!                 company.getName() ));
  
          // Transfer the President's certificate
***************
*** 406,421 ****
              company.transferAssetsFrom(minor);
              minor.setClosed();
!             ReportBuffer.add(LocalText.getText("MERGE_MINOR_LOG", new String[] {
!                     currentPlayer.getName(), minor.getName(),
!                     company.getName(), Bank.format(minorCash),
!                     String.valueOf(minorTrains) }));
              ReportBuffer.add(LocalText.getText("GetShareForMinor",
!                     new String[] { currentPlayer.getName(),
!                             String.valueOf(cert2.getShare()),
!                             company.getName(), minor.getName() }));
          } else {
              ReportBuffer.add(LocalText.getText("SelectedHomeBase",
!                     new String[] { company.getName(), homeHex.getName(),
!                             selectedHomeCity.toString() }));
          }
  
--- 415,434 ----
              company.transferAssetsFrom(minor);
              minor.setClosed();
!             ReportBuffer.add(LocalText.getText("MERGE_MINOR_LOG",
!                     currentPlayer.getName(),
!                     minor.getName(),
!                     company.getName(),
!                     Bank.format(minorCash),
!                     minorTrains ));
              ReportBuffer.add(LocalText.getText("GetShareForMinor",
!                     currentPlayer.getName(),
!                     cert2.getShare(),
!                     company.getName(),
!                     minor.getName() ));
          } else {
              ReportBuffer.add(LocalText.getText("SelectedHomeBase",
!                     company.getName(),
!                     homeHex.getName(),
!                     selectedHomeCity.toString() ));
          }
  
***************
*** 424,437 ****
                  company.getPortfolio());
  
!         ReportBuffer.add(LocalText.getText("SharesPutInTreasury", new String[] {
!                 String.valueOf(company.getPortfolio().getShare(company)),
!                 company.getName() }));
  
          // TODO must get this amount from XML
          int tokensCost = 100;
          new CashMove(company, null, tokensCost);
!         ReportBuffer.add(LocalText.getText("PaysForTokens", new String[] {
!                 company.getName(), Bank.format(100),
!                 String.valueOf(company.getNumberOfBaseTokens()) }));
  
          companyBoughtThisTurnWrapper.set(company);
--- 437,451 ----
                  company.getPortfolio());
  
!         ReportBuffer.add(LocalText.getText("SharesPutInTreasury",
!                 company.getPortfolio().getShare(company),
!                 company.getName() ));
  
          // TODO must get this amount from XML
          int tokensCost = 100;
          new CashMove(company, null, tokensCost);
!         ReportBuffer.add(LocalText.getText("PaysForTokens",
!                 company.getName(),
!                 Bank.format(100),
!                 company.getNumberOfBaseTokens() ));
  
          companyBoughtThisTurnWrapper.set(company);
***************
*** 524,541 ****
  
          if (cert != null) {
!             ReportBuffer.add(LocalText.getText("MERGE_MINOR_LOG", new String[] {
!                     currentPlayer.getName(), minor.getName(), major.getName(),
!                     Bank.format(minorCash), String.valueOf(minorTrains) }));
              ReportBuffer.add(LocalText.getText("GetShareForMinor",
!                     new String[] { currentPlayer.getName(),
!                             String.valueOf(cert.getShare()), major.getName(),
!                             cert.getPortfolio().getName(), minor.getName() }));
              cert.moveTo(currentPlayer.getPortfolio());
              ReportBuffer.add(LocalText.getText("MinorCloses", minor.getName()));
              checkFlotation(major);
          } else {
!             ReportBuffer.add(LocalText.getText("CLOSE_MINOR_LOG", new String[] {
!                     currentPlayer.getName(), minor.getName(),
!                     Bank.format(minorCash), String.valueOf(minorTrains) }));
          }
          hasActed.set(true);
--- 538,562 ----
  
          if (cert != null) {
!             ReportBuffer.add(LocalText.getText("MERGE_MINOR_LOG",
!                     currentPlayer.getName(),
!                     minor.getName(),
!                     major.getName(),
!                     Bank.format(minorCash),
!                     minorTrains ));
              ReportBuffer.add(LocalText.getText("GetShareForMinor",
!                     currentPlayer.getName(),
!                     cert.getShare(),
!                     major.getName(),
!                     cert.getPortfolio().getName(),
!                     minor.getName() ));
              cert.moveTo(currentPlayer.getPortfolio());
              ReportBuffer.add(LocalText.getText("MinorCloses", minor.getName()));
              checkFlotation(major);
          } else {
!             ReportBuffer.add(LocalText.getText("CLOSE_MINOR_LOG",
!                     currentPlayer.getName(),
!                     minor.getName(),
!                     Bank.format(minorCash),
!                     minorTrains ));
          }
          hasActed.set(true);
***************
*** 566,570 ****
              new CashMove(null, company, cash);
              ReportBuffer.add(LocalText.getText("MonetiseTreasuryShares",
!                     new String[] { company.getName(), Bank.format(cash) }));
  
          }
--- 587,592 ----
              new CashMove(null, company, cash);
              ReportBuffer.add(LocalText.getText("MonetiseTreasuryShares",
!                     company.getName(),
!                     Bank.format(cash) ));
  
          }
***************
*** 598,603 ****
                  errMsg =
                          LocalText.getText("CompanyDoesNotOwnTrain",
!                                 new String[] { company.getName(),
!                                         train.getName() });
                  break;
              }
--- 620,625 ----
                  errMsg =
                          LocalText.getText("CompanyDoesNotOwnTrain",
!                                 company.getName(),
!                                 train.getName() );
                  break;
              }
***************
*** 607,611 ****
          if (errMsg != null) {
              DisplayBuffer.add(LocalText.getText("CannotDiscardTrain",
!                     new String[] { companyName, train.getName(), errMsg }));
              return false;
          }
--- 629,635 ----
          if (errMsg != null) {
              DisplayBuffer.add(LocalText.getText("CannotDiscardTrain",
!                     companyName,
!                     train.getName(),
!                     errMsg ));
              return false;
          }
***************
*** 618,622 ****
          Bank.getPool().buyTrain(train, 0);
          ReportBuffer.add(LocalText.getText("CompanyDiscardsTrain",
!                 new String[] { companyName, train.getName() }));
  
          finishTurn();
--- 642,647 ----
          Bank.getPool().buyTrain(train, 0);
          ReportBuffer.add(LocalText.getText("CompanyDiscardsTrain",
!                 companyName,
!                 train.getName() ));
  
          finishTurn();

Index: StartRound_18EU.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/specific/_18EU/StartRound_18EU.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** StartRound_18EU.java	8 Jan 2009 19:59:39 -0000	1.6
--- StartRound_18EU.java	15 Jan 2009 20:53:28 -0000	1.7
***************
*** 138,143 ****
  
          if (errMsg != null) {
!             DisplayBuffer.add(LocalText.getText("CantBuyItem", new String[] {
!                     playerName, item.getName(), errMsg }));
              return false;
          }
--- 138,145 ----
  
          if (errMsg != null) {
!             DisplayBuffer.add(LocalText.getText("CantBuyItem",
!                     playerName,
!                     item.getName(),
!                     errMsg ));
              return false;
          }
***************
*** 184,189 ****
                      && !item.equals(auctionedItem)) {
                      errMsg =
!                             LocalText.getText("WrongStartItem", new String[] {
!                                     item.getName(), auctionedItem.getName() });
                      break;
                  }
--- 186,192 ----
                      && !item.equals(auctionedItem)) {
                      errMsg =
!                             LocalText.getText("WrongStartItem",
!                                     item.getName(),
!                                     auctionedItem.getName() );
                      break;
                  }
***************
*** 199,208 ****
                  // Bid must be a multiple of the modulus
                  if (bidAmount % startPacket.getModulus() != 0) {
!                     errMsg =
!                             LocalText.getText(
                                      "BidMustBeMultipleOf",
!                                     new String[] {
!                                             String.valueOf(bidAmount),
!                                             String.valueOf(startPacket.getMinimumIncrement()) });
                      break;
                  }
--- 202,209 ----
                  // Bid must be a multiple of the modulus
                  if (bidAmount % startPacket.getModulus() != 0) {
!                     errMsg = LocalText.getText(
                                      "BidMustBeMultipleOf",
!                                     bidAmount,
!                                     startPacket.getMinimumIncrement() );
                      break;
                  }
***************
*** 221,226 ****
  
          if (errMsg != null) {
!             DisplayBuffer.add(LocalText.getText("InvalidBid", new String[] {
!                     playerName, item.getName(), errMsg }));
              return false;
          }
--- 222,229 ----
  
          if (errMsg != null) {
!             DisplayBuffer.add(LocalText.getText("InvalidBid",
!                     playerName,
!                     item.getName(),
!                     errMsg ));
              return false;
          }
***************
*** 241,246 ****
              }
  
!             ReportBuffer.add(LocalText.getText("SELECT_ITEM", new String[] {
!                     playerName, item.getName() }));
          }
  
--- 244,250 ----
              }
  
!             ReportBuffer.add(LocalText.getText("SELECT_ITEM",
!                     playerName,
!                     item.getName() ));
          }
  
***************
*** 250,255 ****
              setStep(BID_STEP);
  
!             ReportBuffer.add(LocalText.getText("BID_ITEM", new String[] {
!                     playerName, Bank.format(bidAmount), item.getName() }));
          }
  
--- 254,261 ----
              setStep(BID_STEP);
  
!             ReportBuffer.add(LocalText.getText("BID_ITEM",
!                     playerName,
!                     Bank.format(bidAmount),
!                     item.getName() ));
          }
  
***************
*** 301,306 ****
                  auctionedItem.setMinimumBid(currentBuyPrice.intValue());
                  ReportBuffer.add(LocalText.getText("ITEM_PRICE_REDUCED",
!                         new String[] { auctionedItem.getName(),
!                                 Bank.format(currentBuyPrice.intValue()) }));
                  setStep(BUY_STEP);
                  //if (auctionedItem.getStatus() != StartItem.BUYABLE) {
--- 307,312 ----
                  auctionedItem.setMinimumBid(currentBuyPrice.intValue());
                  ReportBuffer.add(LocalText.getText("ITEM_PRICE_REDUCED",
!                         auctionedItem.getName(),
!                         Bank.format(currentBuyPrice.intValue()) ));
                  setStep(BUY_STEP);
                  //if (auctionedItem.getStatus() != StartItem.BUYABLE) {

Index: FinalMinorExchangeRound.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/specific/_18EU/FinalMinorExchangeRound.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** FinalMinorExchangeRound.java	23 Dec 2008 20:02:18 -0000	1.6
--- FinalMinorExchangeRound.java	15 Jan 2009 20:53:28 -0000	1.7
***************
*** 21,25 ****
          super (aGameManager);
      }
!     
      public void start(Player playerToStartFMERound) {
          ReportBuffer.add("\n"
--- 21,25 ----
          super (aGameManager);
      }
! 
      public void start(Player playerToStartFMERound) {
          ReportBuffer.add("\n"
***************
*** 29,33 ****
          initPlayer();
          ReportBuffer.add(LocalText.getText("HasFirstTurn",
!                 new String[] { playerToStartFMERound.getName() }));
      }
  
--- 29,33 ----
          initPlayer();
          ReportBuffer.add(LocalText.getText("HasFirstTurn",
!                 playerToStartFMERound.getName() ));
      }