rails-commits

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

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

Modified Files:
	OperatingCost.java CorrectionAction.java 
Added Files:
	ClosePrivate.java 
Log Message:
Added noMap support for 1856
(includes ClosePrivate actions)
some minor fixes to corrections

--- NEW FILE: ClosePrivate.java ---
package rails.game.correct;

import java.io.IOException;
import java.io.ObjectInputStream;

import rails.game.*;
import rails.game.action.PossibleAction;
import rails.util.Util;

/**
 * Correction action that allows the closure of a private company.
 */

public class ClosePrivate extends PossibleAction implements CorrectionAction {

    private static final long serialVersionUID = 1L;

    /* Preconditions */
    
    /** shows in correction menu */
    private boolean inCorrectionMenu;

    /** private company to close */
    private PrivateCompanyI privateCompany;
    
    /** converted to name */
    private String privateCompanyName; 

    /* Postconditions: None */
    
    public ClosePrivate(PrivateCompanyI priv) {
        privateCompany = priv;
        privateCompanyName = priv.getName();
    }
    
    public boolean isInCorrectionMenu(){
        return inCorrectionMenu;
    }
    public void setCorrectionMenu(boolean menu){
        inCorrectionMenu = menu;
    }

    public PrivateCompanyI getPrivateCompany() {
        return privateCompany;
    }
    public String getPrivateCompanyName () {
        return privateCompanyName;
    }
    
    public String getInfo(){
        return ("Close Private " + privateCompanyName);
    }
    
    @Override
    public boolean equals(PossibleAction action) {
        if (!(action instanceof ClosePrivate)) return false;
        ClosePrivate a = (ClosePrivate) action;
        return (a.privateCompany == this.privateCompany &&
                a.inCorrectionMenu == this.inCorrectionMenu
        );
    }

    @Override
    public String toString() {
        StringBuffer b = new StringBuffer("ClosePrivate");
        if (!acted) {
            b.append(" (not acted)");
            if (privateCompany != null)
                b.append(", privateCompany="+privateCompany);
            b.append(", inCorrectionMenu="+inCorrectionMenu);
        } else {
            b.append(" (acted)");
            if (privateCompany != null)
                b.append(", privateCompany="+privateCompany);
        }
        return b.toString();
    }

    /** Deserialize */
    private void readObject(ObjectInputStream in) throws IOException,
            ClassNotFoundException {
        in.defaultReadObject();
        if (Util.hasValue(privateCompanyName))
                privateCompany = getCompanyManager().getPrivateCompany(privateCompanyName);
    }
}

Index: CorrectionAction.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/correct/CorrectionAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CorrectionAction.java	14 Feb 2010 20:48:15 -0000	1.1
--- CorrectionAction.java	17 Feb 2010 22:02:46 -0000	1.2
***************
*** 10,14 ****
   */
  
! interface CorrectionAction {
      
      public boolean isInCorrectionMenu();
--- 10,14 ----
   */
  
! public interface CorrectionAction {
      
      public boolean isInCorrectionMenu();

Index: OperatingCost.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/correct/OperatingCost.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** OperatingCost.java	16 Feb 2010 20:17:09 -0000	1.2
--- OperatingCost.java	17 Feb 2010 22:02:45 -0000	1.3
***************
*** 9,14 ****
  
  /**
!  * Correction action that changes the cash position of a cashholder.
!  * 
   * @author Stefan Frey
   */
--- 9,15 ----
  
  /**
!  * 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
   */
***************
*** 62,69 ****
--- 63,72 ----
         return inCorrectionMenu;
     }
+ 
     public void setCorrectionMenu(boolean menu){
         inCorrectionMenu = menu;
     }
  
+ 
     public CashHolder getCashHolder() {
         return operatingCompany;
***************
*** 74,78 ****
     }
  
!     public int getAmount() {
         if (acted)
             return -operatingCost;
--- 77,81 ----
     }
  
!    public int getAmount() {
         if (acted)
             return -operatingCost;