[Rails-commits] 18xx/rails/game/correct OperatingCost.java, 1.3, 1.4 CorrectCash.java, 1.2, 1.3 CorrectionAction.java, 1.2, 1.3 ClosePrivate.java, 1.1, 1.2

[Stefan F. <ste...@us...>]

Update of /cvsroot/rails/18xx/rails/game/correct
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv24165/rails/game/correct

Modified Files:
	OperatingCost.java CorrectCash.java CorrectionAction.java 
	ClosePrivate.java 
Log Message:
Minor fixes and improvements to NoMap OperatingCosts

Index: ClosePrivate.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/correct/ClosePrivate.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ClosePrivate.java	17 Feb 2010 22:02:46 -0000	1.1
--- ClosePrivate.java	22 Feb 2010 22:48:18 -0000	1.2
***************
*** 12,16 ****
   */
  
! public class ClosePrivate extends PossibleAction implements CorrectionAction {
  
      private static final long serialVersionUID = 1L;
--- 12,16 ----
   */
  
! public class ClosePrivate extends CorrectionAction {
  
      private static final long serialVersionUID = 1L;
***************
*** 18,24 ****
      /* Preconditions */
      
-     /** shows in correction menu */
-     private boolean inCorrectionMenu;
- 
      /** private company to close */
      private PrivateCompanyI privateCompany;
--- 18,21 ----
***************
*** 34,44 ****
      }
      
-     public boolean isInCorrectionMenu(){
-         return inCorrectionMenu;
-     }
-     public void setCorrectionMenu(boolean menu){
-         inCorrectionMenu = menu;
-     }
- 
      public PrivateCompanyI getPrivateCompany() {
          return privateCompany;
--- 31,34 ----

Index: CorrectionAction.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/correct/CorrectionAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CorrectionAction.java	17 Feb 2010 22:02:46 -0000	1.2
--- CorrectionAction.java	22 Feb 2010 22:48:18 -0000	1.3
***************
*** 1,8 ****
  package rails.game.correct;
  
! import rails.game.*;
  /**
!  * Interface to implement for all non-correction action.
!  * 
   * 
   * @author freystef
--- 1,8 ----
  package rails.game.correct;
  
! import rails.game.action.PossibleAction;;
  /**
!  * Base class for all actions that correct the state of the game
!  * that violate the ruleset.
   * 
   * @author freystef
***************
*** 10,16 ****
   */
  
! public interface CorrectionAction {
      
!     public boolean isInCorrectionMenu();
      
  }
--- 10,26 ----
   */
  
! public abstract class CorrectionAction extends PossibleAction {
      
!     /** shows in correction menu */
!     protected boolean inCorrectionMenu;
! 
!     
!     public boolean isInCorrectionMenu(){
!             return inCorrectionMenu;
!     }
!     
!     public void setCorrectionMenu(boolean menu){
!         inCorrectionMenu = menu;
!     }
      
  }

Index: OperatingCost.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/correct/OperatingCost.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** OperatingCost.java	17 Feb 2010 22:02:45 -0000	1.3
--- OperatingCost.java	22 Feb 2010 22:48:18 -0000	1.4
***************
*** 11,18 ****
   * Correction action that mirrors operating actions like tile and token lays, but
   * only changes the cash position of a cashholder.
-  * (Extends PossibleAction instead of PossibleORAction to allow for generalization)
   * @author Stefan Frey
   */
! public class OperatingCost extends PossibleAction implements CorrectCashI, CorrectionAction {
  
      public enum OCType {LAY_TILE, LAY_BASE_TOKEN};
--- 11,17 ----
   * Correction action that mirrors operating actions like tile and token lays, but
   * only changes the cash position of a cashholder.
   * @author Stefan Frey
   */
! public class OperatingCost extends CorrectionAction implements CorrectCashI {
  
      public enum OCType {LAY_TILE, LAY_BASE_TOKEN};
***************
*** 23,29 ****
      /* Preconditions */
      
-     /** shows in correction menu */
-     private boolean inCorrectionMenu;
-     
      /** operating Company */
      transient private PublicCompanyI operatingCompany; 
--- 22,25 ----
***************
*** 41,44 ****
--- 37,43 ----
      private int maximumCost;
      
+     /** allow free entry */
+     private boolean freeEntryAllowed;
+     
      /* Postconditions */
  
***************
*** 51,72 ****
      * @param pc Public Company
      */
!    public OperatingCost(PublicCompanyI pc, OCType ot, int ocCosts) {
         operatingCompany = pc;
         operatingCompanyName = pc.getName();
         operatingCostType = ot;
         suggestedCost = ocCosts;
         maximumCost = pc.getCash();
     }
     
-    
-    public boolean isInCorrectionMenu(){
-        return inCorrectionMenu;
-    }
- 
-    public void setCorrectionMenu(boolean menu){
-        inCorrectionMenu = menu;
-    }
- 
- 
     public CashHolder getCashHolder() {
         return operatingCompany;
--- 50,62 ----
      * @param pc Public Company
      */
!    public OperatingCost(PublicCompanyI pc, OCType ot, int ocCosts, boolean freeEntry) {
         operatingCompany = pc;
         operatingCompanyName = pc.getName();
         operatingCostType = ot;
         suggestedCost = ocCosts;
+        freeEntryAllowed = freeEntry;
         maximumCost = pc.getCash();
     }
     
     public CashHolder getCashHolder() {
         return operatingCompany;
***************
*** 76,79 ****
--- 66,73 ----
         return operatingCompanyName;
     }
+    
+    public boolean isFreeEntryAllowed() {
+        return freeEntryAllowed;
+    }
  
     public int getAmount() {

Index: CorrectCash.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/correct/CorrectCash.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CorrectCash.java	16 Feb 2010 20:17:14 -0000	1.2
--- CorrectCash.java	22 Feb 2010 22:48:18 -0000	1.3
***************
*** 14,18 ****
   * @author Stefan Frey
   */
! public class CorrectCash extends PossibleAction implements CorrectCashI, CorrectionAction {
  
      /** The Constant serialVersionUID. */
--- 14,18 ----
   * @author Stefan Frey
   */
! public class CorrectCash extends CorrectionAction implements CorrectCashI {
  
      /** The Constant serialVersionUID. */
***************
*** 20,27 ****
      
      /* Preconditions */
!     
!     /** shows in correction menu */
!     private boolean inCorrectionMenu;
!     
      /** cash holder */
      transient private CashHolder correctCashHolder; 
--- 20,24 ----
      
      /* Preconditions */
!    
      /** cash holder */
      transient private CashHolder correctCashHolder; 
***************
*** 63,73 ****
     
     
-    public boolean isInCorrectionMenu(){
-        return inCorrectionMenu;
-    }
-    public void setCorrectionMenu(boolean menu){
-        inCorrectionMenu = menu;
-    }
- 
     public CashHolder getCashHolder() {
         return correctCashHolder;
--- 60,63 ----