[Rails-commits] 18xx/rails/game StartRound_1830.java, 1.21, 1.22 StartRound.java, 1.27, 1.28 PublicCompany.java, 1.65, 1.66 OperatingRound.java, 1.71, 1.72 GameManager.java, 1.57, 1.58

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

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

Modified Files:
	StartRound_1830.java StartRound.java PublicCompany.java 
	OperatingRound.java GameManager.java 
Log Message:
Dead code removal

Index: OperatingRound.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/OperatingRound.java,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** OperatingRound.java	7 Oct 2009 19:00:38 -0000	1.71
--- OperatingRound.java	7 Oct 2009 21:03:36 -0000	1.72
***************
*** 138,142 ****
          for (PrivateCompanyI priv : companyManager.getAllPrivateCompanies()) {
              if (!priv.isClosed()) {
-                 //priv.payOut();
                  if (((Portfolio)priv.getHolder()).getOwner().getClass() != Bank.class) {
                      CashHolder recipient = ((Portfolio)priv.getHolder()).getOwner();
--- 138,141 ----
***************
*** 177,181 ****
          ReportBuffer.add(text);
          DisplayBuffer.add(text);
-         //gameManager.nextRound(this);
          finishRound();
      }
--- 176,179 ----
***************
*** 963,976 ****
              if (step == STEP_CALC_REVENUE) {
  
-                 //if (operatingCompany.getPortfolio().getNumberOfTrains() == 0) {
                  if (!operatingCompany.canRunTrains()) {
                      // No trains, then the revenue is zero.
-                     /*
-                     operatingCompany.setLastRevenue(0);
-                     operatingCompany.setLastRevenueAllocation(SetDividend.UNKNOWN);
-                     ReportBuffer.add(LocalText.getText("CompanyRevenue",
-                             new String[] { operatingCompany.getName(),
-                                     Bank.format(0) }));
-                                     */
                      executeSetRevenueAndDividend (
                              new SetDividend (0, false, new int[] {SetDividend.WITHHOLD}));
--- 961,966 ----
***************
*** 1274,1278 ****
          // OR done. Inform GameManager.
          ReportBuffer.add(LocalText.getText("EndOfOperatingRound", thisOrNumber));
-         //gameManager.nextRound(this);
          finishRound();
      }
--- 1264,1267 ----

Index: StartRound_1830.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/StartRound_1830.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** StartRound_1830.java	7 Oct 2009 19:00:38 -0000	1.21
--- StartRound_1830.java	7 Oct 2009 21:03:36 -0000	1.22
***************
*** 97,101 ****
                              item.setStatus(StartItem.AUCTIONED);
                              auctionItemState.set(item);
-                             // numBidders = item.getBidders();
                          }
                          if (currentPlayer.getFreeCash()
--- 97,100 ----
***************
*** 290,294 ****
  
          numPasses.add(1);
- 
          if (auctionItem != null) {
  
--- 289,292 ----

Index: PublicCompany.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/PublicCompany.java,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** PublicCompany.java	7 Oct 2009 19:00:38 -0000	1.65
--- PublicCompany.java	7 Oct 2009 21:03:36 -0000	1.66
***************
*** 1482,1486 ****
              int price) {
  
-         //portfolio.buyPrivate(privateCompany, from, price);
          if (from != bank.getIpo()) {
              // The initial buy is reported from StartRound. This message should also
--- 1482,1485 ----
***************
*** 1711,1716 ****
          if (object instanceof TokenI) {
              return addToken((TokenI) object);
-         } else if (object instanceof LocatedBonus) {
-         	return addBonus ((Bonus) object);
          } else {
              return false;
--- 1710,1713 ----
***************
*** 1721,1727 ****
          if (object instanceof BaseToken) {
              return removeToken((TokenI) object);
-         } else if (object instanceof Bonus) {
-             removeBonus((Bonus) object);
-             return true;
          } else {
              return false;
--- 1718,1721 ----

Index: StartRound.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/StartRound.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** StartRound.java	7 Oct 2009 19:00:38 -0000	1.27
--- StartRound.java	7 Oct 2009 21:03:36 -0000	1.28
***************
*** 145,149 ****
               * ultimately be possible.
               */
-             //gameManager.nextRound(this);
              finishRound();
          }
--- 145,148 ----

Index: GameManager.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/GameManager.java,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** GameManager.java	7 Oct 2009 19:00:38 -0000	1.57
--- GameManager.java	7 Oct 2009 21:03:36 -0000	1.58
***************
*** 92,104 ****
      protected EnumMap<Defs.Parm, Boolean> gameParameters =
          new EnumMap<Defs.Parm, Boolean>(Defs.Parm.class);
-     //protected boolean hasAnyParPrice = false;
-     //protected boolean canAnyCompanyBuyPrivates = false;
-     //protected boolean canAnyCompanyHoldShares = false;
-     //protected boolean bonusTokensExist = false;
-     //protected boolean hasAnyCompanyLoans = false;
  
      protected int stockRoundSequenceRule = StockRound.SELL_BUY_SELL;
  
-     //protected static GameManager instance;
      /**
       * Map of GameManager instances.
--- 92,98 ----
***************
*** 169,179 ****
       */
      public GameManager() {
-         //instance = this;
      	gameManagerMap.put(GM_KEY, this);
      }
  
-     /* (non-Javadoc)
-      * @see rails.game.GameManagerI#configureFromXML(rails.util.Tag)
-      */
      public void configureFromXML(Tag tag) throws ConfigurationException {
          /* Get the rails.game name as configured */
--- 163,169 ----
***************
*** 412,422 ****
  
          for (PublicCompanyI company : companyManager.getAllPublicCompanies()) {
-             //hasAnyParPrice = hasAnyParPrice || company.hasParPrice();
              if (company.hasParPrice()) gameParameters.put(Defs.Parm.HAS_ANY_PAR_PRICE, true);
-             //canAnyCompanyBuyPrivates = canAnyCompanyBuyPrivates || company.canBuyPrivates();
              if (company.canBuyPrivates()) gameParameters.put(Defs.Parm.CAN_ANY_COMPANY_BUY_PRIVATES, true);
-             //canAnyCompanyHoldShares = canAnyCompanyHoldShares || company.canHoldOwnShares();
              if (company.canHoldOwnShares()) gameParameters.put(Defs.Parm.CAN_ANY_COMPANY_HOLD_OWN_SHARES, true);
-             //hasAnyCompanyLoans = hasAnyCompanyLoans || company.getMaxNumberOfLoans() != 0;
              if (company.getMaxNumberOfLoans() != 0) gameParameters.put(Defs.Parm.HAS_ANY_COMPANY_LOANS, true);
          }
--- 402,408 ----
***************
*** 426,430 ****
                  if (sp instanceof SpecialTokenLay
                          && ((SpecialTokenLay)sp).getToken() instanceof BonusToken) {
-                     //bonusTokensExist = true;
                      gameParameters.put(Defs.Parm.DO_BONUS_TOKENS_EXIST, true);
                      break loop;
--- 412,415 ----