[Rails-commits] Branch 'specific_1880' - rails/common rails/game

[Dr. M. B. <neu...@us...>]

 rails/common/ConfigProfile.java |    4 ----
 rails/game/TrainManager.java    |    2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 81327fddb721925d55762c3f827e4ce12e24ce44
Author: Martin Brumm <Dr....@t-...>
Date:   Thu Apr 12 17:28:50 2012 +0200

    Fixing Merge Conflicts part II

diff --git a/rails/common/ConfigProfile.java b/rails/common/ConfigProfile.java
index ecc8bb7..b4338c0 100644
--- a/rails/common/ConfigProfile.java
+++ b/rails/common/ConfigProfile.java
@@ -2,16 +2,12 @@ package rails.common;
 
 import java.io.File;
 import java.io.FilenameFilter;
-<<<<<<< HEAD
-import java.util.*;
-=======
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
->>>>>>> refs/remotes/origin/rails1.7.x
 
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.IOCase;
diff --git a/rails/game/TrainManager.java b/rails/game/TrainManager.java
index 454f6e9..a9b381a 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-