[Rails-commits] 18xx/rails/game/action SellShares.java, 1.5, 1.6 ReachDestinations.java, 1.2, 1.3 P

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	SellShares.java ReachDestinations.java PossibleORAction.java 
	MergeCompanies.java SetDividend.java TakeLoans.java 
	BuyBonusToken.java RepayLoans.java BuyPrivate.java 
	PossibleAction.java 
Log Message:
More rationalising of static method usage

Index: PossibleAction.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/action/PossibleAction.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** PossibleAction.java	30 Jun 2008 20:35:30 -0000	1.12
--- PossibleAction.java	29 Oct 2009 19:41:30 -0000	1.13
***************
*** 1,4 ****
  /* $Header$
!  * 
   * Created on 14-Sep-2006
   * Change Log:
--- 1,4 ----
  /* $Header$
!  *
   * Created on 14-Sep-2006
   * Change Log:
***************
*** 6,17 ****
  package rails.game.action;

! import java.io.IOException;
! import java.io.ObjectInputStream;
! import java.io.Serializable;

  import org.apache.log4j.Logger;

! import rails.game.GameManager;
! import rails.game.Player;

  /**
--- 6,14 ----
  package rails.game.action;

! import java.io.*;

  import org.apache.log4j.Logger;

! import rails.game.*;

  /**
***************
*** 19,23 ****
   * action (such as laying a tile or dropping a token on a specific hex, buying a
   * train etc.).
!  * 
   * @author Erik Vos
   */
--- 16,20 ----
   * action (such as laying a tile or dropping a token on a specific hex, buying a
   * train etc.).
!  *
   * @author Erik Vos
   */
***************
*** 36,40 ****

      /**
!      * 
       */
      public PossibleAction() {
--- 33,37 ----

      /**
!      *
       */
      public PossibleAction() {
***************
*** 59,63 ****
       * the player who was <b>allowed</b> to do the action, which is the one set
       * in the constructor).
!      * 
       * @param playerName
       */
--- 56,60 ----
       * the player who was <b>allowed</b> to do the action, which is the one set
       * in the constructor).
!      *
       * @param playerName
       */
***************
*** 76,79 ****
--- 73,84 ----
      public abstract boolean equals(PossibleAction pa);

+     protected GameManagerI getGameManager() {
+     	return GameManager.getInstance();
+     }
+ 
+     protected CompanyManagerI getCompanyManager () {
+     	return getGameManager().getCompanyManager();
+     }
+ 
      private void readObject(ObjectInputStream in) throws IOException,
              ClassNotFoundException {

Index: SellShares.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/action/SellShares.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** SellShares.java	4 Jun 2008 19:00:29 -0000	1.5
--- SellShares.java	29 Oct 2009 19:41:29 -0000	1.6
***************
*** 1,4 ****
  /* $Header$
!  * 
   * Created on 17-Sep-2006
   * Change Log:
--- 1,4 ----
  /* $Header$
!  *
   * Created on 17-Sep-2006
   * Change Log:
***************
*** 10,14 ****

  import rails.game.Bank;
- import rails.game.Game;
  import rails.game.PublicCompanyI;
  import rails.util.Util;
--- 10,13 ----
***************
*** 34,38 ****

      /**
!      * 
       */
      public SellShares(String companyName, int shareUnits, int maximumNumber,
--- 33,37 ----

      /**
!      *
       */
      public SellShares(String companyName, int shareUnits, int maximumNumber,
***************
*** 43,47 ****
          this.maximumNumber = maximumNumber;

!         company = Game.getCompanyManager().getPublicCompany(companyName);
          shareUnit = company.getShareUnit();
          share = shareUnits * shareUnit;
--- 42,46 ----
          this.maximumNumber = maximumNumber;

!         company = getCompanyManager().getPublicCompany(companyName);
          shareUnit = company.getShareUnit();
          share = shareUnits * shareUnit;
***************
*** 70,74 ****

      public PublicCompanyI getCompany() {
!         return Game.getCompanyManager().getPublicCompany(companyName);
      }

--- 69,73 ----

      public PublicCompanyI getCompany() {
!         return getCompanyManager().getPublicCompany(companyName);
      }

***************
*** 93,97 ****
      }

!     public boolean equals(PossibleAction action) {
          if (!(action instanceof SellShares)) return false;
          SellShares a = (SellShares) action;
--- 92,97 ----
      }

!     @Override
! 	public boolean equals(PossibleAction action) {
          if (!(action instanceof SellShares)) return false;
          SellShares a = (SellShares) action;
***************
*** 102,106 ****
      }

!     public String toString() {
          return "SellShares: "
                 + (numberSold > 0 ? numberSold : "max " + maximumNumber)
--- 102,107 ----
      }

!     @Override
! 	public String toString() {
          return "SellShares: "
                 + (numberSold > 0 ? numberSold : "max " + maximumNumber)
***************
*** 116,120 ****

          if (Util.hasValue(companyName))
!             company = Game.getCompanyManager().getPublicCompany(companyName);
      }
  }
--- 117,121 ----

          if (Util.hasValue(companyName))
!             company = getCompanyManager().getPublicCompany(companyName);
      }
  }

Index: TakeLoans.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/action/TakeLoans.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TakeLoans.java	11 Jan 2009 17:24:46 -0000	1.1
--- TakeLoans.java	29 Oct 2009 19:41:29 -0000	1.2
***************
*** 9,13 ****
  import java.io.ObjectInputStream;

- import rails.game.Game;
  import rails.game.PublicCompanyI;

--- 9,12 ----
***************
*** 95,99 ****

          company =
!                 Game.getCompanyManager().getPublicCompany(companyName);
      }

--- 94,98 ----

          company =
!                 getCompanyManager().getPublicCompany(companyName);
      }

Index: BuyBonusToken.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/action/BuyBonusToken.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BuyBonusToken.java	23 Sep 2009 21:38:58 -0000	1.1
--- BuyBonusToken.java	29 Oct 2009 19:41:30 -0000	1.2
***************
*** 116,125 ****

          privateCompany =
!                 Game.getCompanyManager().getPrivateCompany(privateCompanyName);
          if (sellerName.equalsIgnoreCase("Bank")) {
          	seller = Bank.getInstance();
          } else if (sellerName != null) {
          	seller =
!         		Game.getCompanyManager().getPublicCompany(sellerName);
          }
          if (specialPropertyId > 0) {
--- 116,125 ----

          privateCompany =
!                 getCompanyManager().getPrivateCompany(privateCompanyName);
          if (sellerName.equalsIgnoreCase("Bank")) {
          	seller = Bank.getInstance();
          } else if (sellerName != null) {
          	seller =
!         		getCompanyManager().getPublicCompany(sellerName);
          }
          if (specialPropertyId > 0) {

Index: RepayLoans.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/action/RepayLoans.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** RepayLoans.java	4 May 2009 20:29:15 -0000	1.4
--- RepayLoans.java	29 Oct 2009 19:41:30 -0000	1.5
***************
*** 9,13 ****
  import java.io.ObjectInputStream;

- import rails.game.Game;
  import rails.game.PublicCompanyI;

--- 9,12 ----
***************
*** 109,113 ****

          company =
!                 Game.getCompanyManager().getPublicCompany(companyName);
      }

--- 108,112 ----

          company =
!                 getCompanyManager().getPublicCompany(companyName);
      }

Index: BuyPrivate.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/action/BuyPrivate.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** BuyPrivate.java	4 Jun 2008 19:00:29 -0000	1.5
--- BuyPrivate.java	29 Oct 2009 19:41:30 -0000	1.6
***************
*** 1,4 ****
  /* $Header$
!  * 
   * Created on 17-Sep-2006
   * Change Log:
--- 1,4 ----
  /* $Header$
!  *
   * Created on 17-Sep-2006
   * Change Log:
***************
*** 9,13 ****
  import java.io.ObjectInputStream;

- import rails.game.Game;
  import rails.game.PrivateCompanyI;

--- 9,12 ----
***************
*** 29,33 ****

      /**
!      * 
       */
      public BuyPrivate(PrivateCompanyI privateCompany, int minimumPrice,
--- 28,32 ----

      /**
!      *
       */
      public BuyPrivate(PrivateCompanyI privateCompany, int minimumPrice,
***************
*** 69,73 ****
      }

!     public boolean equals(PossibleAction action) {
          if (!(action instanceof BuyPrivate)) return false;
          BuyPrivate a = (BuyPrivate) action;
--- 68,73 ----
      }

!     @Override
! 	public boolean equals(PossibleAction action) {
          if (!(action instanceof BuyPrivate)) return false;
          BuyPrivate a = (BuyPrivate) action;
***************
*** 77,81 ****
      }

!     public String toString() {
          return "BuyPrivate " + privateCompany.getName() + " holder="
                 + privateCompany.getPortfolio().getName();
--- 77,82 ----
      }

!     @Override
! 	public String toString() {
          return "BuyPrivate " + privateCompany.getName() + " holder="
                 + privateCompany.getPortfolio().getName();
***************
*** 89,93 ****

          privateCompany =
!                 Game.getCompanyManager().getPrivateCompany(privateCompanyName);
      }

--- 90,94 ----

          privateCompany =
!                 getCompanyManager().getPrivateCompany(privateCompanyName);
      }

Index: SetDividend.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/action/SetDividend.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** SetDividend.java	14 Jan 2009 20:45:07 -0000	1.5
--- SetDividend.java	29 Oct 2009 19:41:29 -0000	1.6
***************
*** 6,10 ****

  import rails.game.Bank;
- import rails.game.Game;
  import rails.util.Util;

--- 6,9 ----
***************
*** 201,205 ****

          if (Util.hasValue(companyName)) {
!             company = Game.getCompanyManager().getPublicCompany(companyName);
          }
      }
--- 200,204 ----

          if (Util.hasValue(companyName)) {
!             company = getCompanyManager().getPublicCompany(companyName);
          }
      }

Index: MergeCompanies.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/action/MergeCompanies.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MergeCompanies.java	24 Dec 2008 22:02:20 -0000	1.5
--- MergeCompanies.java	29 Oct 2009 19:41:29 -0000	1.6
***************
*** 53,57 ****
                      && (!hex.hasTokenOfCompany(target)
                          || hex.getCurrentTile().allowsMultipleBasesOfOneCompany()
!                             && hex.getCityOfBaseToken(mergingCompany) 
                                  != hex.getCityOfBaseToken(target)));
              }
--- 53,57 ----
                      && (!hex.hasTokenOfCompany(target)
                          || hex.getCurrentTile().allowsMultipleBasesOfOneCompany()
!                             && hex.getCityOfBaseToken(mergingCompany)
                                  != hex.getCityOfBaseToken(target)));
              }
***************
*** 126,130 ****
          replaceToken = fields.get("replaceToken", replaceToken);

!         CompanyManagerI cmgr = Game.getCompanyManager();

          mergingCompany = cmgr.getCompanyByName(mergingCompanyName);
--- 126,130 ----
          replaceToken = fields.get("replaceToken", replaceToken);

!         CompanyManagerI cmgr = getCompanyManager();

          mergingCompany = cmgr.getCompanyByName(mergingCompanyName);

Index: PossibleORAction.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/action/PossibleORAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PossibleORAction.java	4 Jun 2008 19:00:29 -0000	1.3
--- PossibleORAction.java	29 Oct 2009 19:41:29 -0000	1.4
***************
*** 1,4 ****
  /* $Header$
!  * 
   * Created on 14-Sep-2006
   * Change Log:
--- 1,4 ----
  /* $Header$
!  *
   * Created on 14-Sep-2006
   * Change Log:
***************
*** 9,17 ****
  import java.io.ObjectInputStream;

! import rails.game.Game;
! import rails.game.GameManager;
! import rails.game.OperatingRound;
! import rails.game.PublicCompanyI;
! import rails.game.RoundI;
  import rails.util.Util;

--- 9,13 ----
  import java.io.ObjectInputStream;

! import rails.game.*;
  import rails.util.Util;

***************
*** 20,24 ****
   * action (such as laying a tile or dropping a token on a specific hex, buying a
   * train etc.).
!  * 
   * @author Erik Vos
   */
--- 16,20 ----
   * action (such as laying a tile or dropping a token on a specific hex, buying a
   * train etc.).
!  *
   * @author Erik Vos
   */
***************
*** 30,34 ****

      /**
!      * 
       */
      public PossibleORAction() {
--- 26,30 ----

      /**
!      *
       */
      public PossibleORAction() {
***************
*** 63,67 ****

          if (Util.hasValue(companyName))
!             company = Game.getCompanyManager().getPublicCompany(companyName);
      }
  }
--- 59,63 ----

          if (Util.hasValue(companyName))
!             company = getCompanyManager().getPublicCompany(companyName);
      }
  }

Index: ReachDestinations.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/action/ReachDestinations.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ReachDestinations.java	2 Dec 2008 20:29:15 -0000	1.2
--- ReachDestinations.java	29 Oct 2009 19:41:29 -0000	1.3
***************
*** 7,11 ****

  import rails.game.CompanyManagerI;
- import rails.game.Game;
  import rails.game.PublicCompanyI;

--- 7,10 ----
***************
*** 26,33 ****

      public static final long serialVersionUID = 1L;
!     
      public ReachDestinations (List<PublicCompanyI> companies) {
          possibleCompanies = companies;
!         StringBuffer b = new StringBuffer(); 
          for (PublicCompanyI company : companies) {
              if (b.length() > 0) b.append(",");
--- 25,32 ----

      public static final long serialVersionUID = 1L;
! 
      public ReachDestinations (List<PublicCompanyI> companies) {
          possibleCompanies = companies;
!         StringBuffer b = new StringBuffer();
          for (PublicCompanyI company : companies) {
              if (b.length() > 0) b.append(",");
***************
*** 36,40 ****
          possibleCompanyNames = b.toString();
      }
!     
      /** Required for deserialization */
      public ReachDestinations() {}
--- 35,39 ----
          possibleCompanyNames = b.toString();
      }
! 
      /** Required for deserialization */
      public ReachDestinations() {}
***************
*** 43,53 ****
          return possibleCompanies;
      }
!     
      public String getPossibleCompanyNames () {
          return possibleCompanyNames;
      }
!     
      public void addReachedCompany (PublicCompanyI company) {
!         if (reachedCompanies == null) 
              reachedCompanies = new ArrayList<PublicCompanyI>();
          reachedCompanies.add (company);
--- 42,52 ----
          return possibleCompanies;
      }
! 
      public String getPossibleCompanyNames () {
          return possibleCompanyNames;
      }
! 
      public void addReachedCompany (PublicCompanyI company) {
!         if (reachedCompanies == null)
              reachedCompanies = new ArrayList<PublicCompanyI>();
          reachedCompanies.add (company);
***************
*** 61,66 ****
          return reachedCompanies;
      }
!     
!    

      @Override
--- 60,65 ----
          return reachedCompanies;
      }
! 
! 

      @Override
***************
*** 86,90 ****
          in.defaultReadObject();

!         CompanyManagerI cmgr = Game.getCompanyManager();

          possibleCompanies = new ArrayList<PublicCompanyI>();
--- 85,89 ----
          in.defaultReadObject();

!         CompanyManagerI cmgr = getCompanyManager();

          possibleCompanies = new ArrayList<PublicCompanyI>();