[Rails-commits] 18xx/rails/game GameManagerI.java, 1.9, 1.10 GameManager.java, 1.51, 1.52

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

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

Modified Files:
	GameManagerI.java GameManager.java 
Log Message:
Simplified Defs.ClassName and Defs.Parm handling

Index: GameManager.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/GameManager.java,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** GameManager.java	11 Sep 2009 19:27:23 -0000	1.51
--- GameManager.java	12 Sep 2009 19:48:39 -0000	1.52
***************
*** 87,95 ****
      protected boolean gameOver = false;
      protected boolean endedByBankruptcy = false;
!     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;
--- 87,99 ----
      protected boolean gameOver = false;
      protected boolean endedByBankruptcy = false;
!     
!     /** Flags to be passed to the UI, aiding the layout definition */
!     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;
***************
*** 360,367 ****
  
          for (PublicCompanyI company : companyManager.getAllPublicCompanies()) {
!             hasAnyParPrice = hasAnyParPrice || company.hasParPrice();
!             canAnyCompanyBuyPrivates = canAnyCompanyBuyPrivates || company.canBuyPrivates();
!             canAnyCompanyHoldShares = canAnyCompanyHoldShares || company.canHoldOwnShares();
!             hasAnyCompanyLoans = hasAnyCompanyLoans || company.getMaxNumberOfLoans() != 0;
          }
  
--- 364,375 ----
  
          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);
          }
  
***************
*** 370,374 ****
                  if (sp instanceof SpecialTokenLay
                          && ((SpecialTokenLay)sp).getToken() instanceof BonusToken) {
!                     bonusTokensExist = true;
                      break loop;
                  }
--- 378,383 ----
                  if (sp instanceof SpecialTokenLay
                          && ((SpecialTokenLay)sp).getToken() instanceof BonusToken) {
!                     //bonusTokensExist = true;
!                     gameParameters.put(Defs.Parm.DO_BONUS_TOKENS_EXIST, true);
                      break loop;
                  }
***************
*** 973,977 ****
       */
      public boolean canAnyCompanyHoldShares() {
!         return canAnyCompanyHoldShares;
      }
  
--- 982,986 ----
       */
      public boolean canAnyCompanyHoldShares() {
!         return (Boolean) getGameParameter(Defs.Parm.CAN_ANY_COMPANY_HOLD_OWN_SHARES);
      }
  
***************
*** 1017,1036 ****
       * @see rails.game.GameManagerI#getCommonParameter(rails.common.Defs.Parm)
       */
!     public Object getCommonParameter (Defs.Parm key) {
!         switch (key) {
!         case HAS_ANY_PAR_PRICE:
!             return hasAnyParPrice;
!         case CAN_ANY_COMPANY_BUY_PRIVATES:
!             return canAnyCompanyBuyPrivates;
!         case CAN_ANY_COMPANY_HOLD_OWN_SHARES:
!             return canAnyCompanyHoldShares;
!         case DO_BONUS_TOKENS_EXIST:
!             return bonusTokensExist;
!         case HAS_ANY_COMPANY_LOANS:
!             return hasAnyCompanyLoans;
!         default:
!             return null;
          }
- 
      }
  
--- 1026,1035 ----
       * @see rails.game.GameManagerI#getCommonParameter(rails.common.Defs.Parm)
       */
!     public Object getGameParameter (Defs.Parm key) {
!         if (gameParameters.containsKey(key)) {
!             return gameParameters.get(key);
!         } else {
!             return false;
          }
      }
  

Index: GameManagerI.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/GameManagerI.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** GameManagerI.java	11 Sep 2009 19:27:23 -0000	1.9
--- GameManagerI.java	12 Sep 2009 19:48:39 -0000	1.10
***************
*** 168,172 ****
      public abstract int getTreasuryShareLimit();
  
!     public abstract Object getCommonParameter(Defs.Parm key);
  
      public RoundI getInterruptedRound();
--- 168,172 ----
      public abstract int getTreasuryShareLimit();
  
!     public abstract Object getGameParameter(Defs.Parm key);
  
      public RoundI getInterruptedRound();