[Rails-commits] Branch 'rails1.7.x' - 2 commits - rails/game rails/ui

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

 rails/game/TrainManager.java        |    2 +-
 rails/ui/swing/GameSetupWindow.java |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 1cb73edf9ec9657eaac3665cf7db57908556e88f
Author: Stefan Frey <ste...@we...>
Date:   Mon Sep 17 18:47:13 2012 +0200

    fixed problem of obsoleting trains in the pool, as reported by arne oestlund

diff --git a/rails/game/TrainManager.java b/rails/game/TrainManager.java
index b99b128..be27fa9 100644
--- a/rails/game/TrainManager.java
+++ b/rails/game/TrainManager.java
@@ -1 +1 @@
-/* $Header: /Users/blentz/rails_rcs/cvs/18xx/rails/game/TrainManager.java,v 1.28 2010/04/21 21:25:50 evos Exp $ */
package rails.game;

import java.util.*;

import org.apache.log4j.Logger;

import rails.common.LocalText;
import rails.common.parser.ConfigurableComponentI;
import rails.common.parser.ConfigurationException;
import rails.common.parser.Tag;
import rails.game.move.ObjectMove;
import rails.game.state.BooleanState;
import rails.game.state.IntegerState;
import rails.util.Util;

public class TrainManager implements ConfigurableComponentI {
    // Static attributes
    protected List<TrainType> lTrainTypes = new ArrayList<TrainType>();

    protected Map<String, TrainType> mTrainTypes
            = new HashMap<String, TrainType>();

    protected List<TrainCertificateType> trainCertTypes 
            = new ArrayList<TrainCertificateType>();

    protected Map<String, TrainCertificateType> trainCertTypeMap
            = new HashMap<String, TrainCertificateType>();

    protected Map<String, TrainI> trainMap
            = new HashMap<String, TrainI>();
    
    protected Map<TrainCertificateType, List<TrainI>> trainsPerCertType 
            = new HashMap<TrainCertificateType, List<TrainI>>();
    
    protected TrainType defaultType = null; // Only required locally and in ChoiceType
    
    private boolean removeTrain = false;

    // defines obsolescence
    public enum ObsoleteTrainForType {ALL, EXCEPT_TRIGGERING}
    protected ObsoleteTrainForType obsoleteTrainFor = ObsoleteTrainForType.EXCEPT_TRIGGERING; // default is ALL

    // Dynamic attributes
    protected IntegerState newTypeIndex;
    
    protected Map<String, Integer> lastIndexPerType = new HashMap<String, Integer>();

    protected boolean trainsHaveRusted = false;
    protected boolean phaseHasChanged = false;

    protected boolean trainAvailabilityChanged = false;

    protected List<PublicCompanyI> companiesWithExcessTrains;

    protected GameManagerI gameManager = null;
    protected Bank bank = null;
    
    /** Required for the sell-