rails-commits

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

 src/rails/algorithms/RevenueBonusTemplate.java               |    4 
 src/rails/algorithms/RevenueManager.java                     |   12 
 src/rails/common/parser/ComponentManager.java                |   16 
 src/rails/common/parser/ConfigurableComponent.java           |   37 
 src/rails/common/parser/ConfigurableComponentI.java          |   37 
 src/rails/common/parser/GameFileParser.java                  |    8 
 src/rails/game/AbstractRound.java                            |  545 -----------
 src/rails/game/Bank.java                                     |    6 
 src/rails/game/BonusToken.java                               |    4 
 src/rails/game/Company.java                                  |    4 
 src/rails/game/CompanyManager.java                           |   14 
 src/rails/game/CompanyManagerI.java                          |   70 -
 src/rails/game/CompanyType.java                              |    2 
 src/rails/game/EndOfGameRound.java                           |    2 
 src/rails/game/Game.java                                     |    2 
 src/rails/game/GameManager.java                              |   10 
 src/rails/game/MapHex.java                                   |    4 
 src/rails/game/MapManager.java                               |    4 
 src/rails/game/OperatingRound.java                           |    2 
 src/rails/game/Phase.java                                    |    4 
 src/rails/game/PhaseManager.java                             |    4 
 src/rails/game/PlayerManager.java                            |    4 
 src/rails/game/PrivateCompany.java                           |    2 
 src/rails/game/Round.java                                    |  543 ++++++++++
 src/rails/game/StartItem.java                                |    4 
 src/rails/game/StartRound.java                               |    2 
 src/rails/game/StockMarket.java                              |    6 
 src/rails/game/StockRound.java                               |    2 
 src/rails/game/SwitchableUIRound.java                        |    2 
 src/rails/game/TileManager.java                              |    4 
 src/rails/game/TrainManager.java                             |    6 
 src/rails/game/TrainType.java                                |    2 
 src/rails/game/action/BuyCertificate.java                    |    2 
 src/rails/game/action/BuyTrain.java                          |    4 
 src/rails/game/action/MergeCompanies.java                    |    2 
 src/rails/game/action/PossibleAction.java                    |    2 
 src/rails/game/action/ReachDestinations.java                 |    4 
 src/rails/game/action/SellShares.java                        |    2 
 src/rails/game/specific/_1835/FoldIntoPrussian.java          |    2 
 src/rails/game/specific/_18AL/NamedTrainRevenueModifier.java |    4 
 src/rails/game/specific/_18AL/NamedTrainToken.java           |    4 
 src/rails/game/specific/_18EU/StartCompany_18EU.java         |    2 
 src/rails/game/specific/_18Kaas/RuhrRevenueModifier.java     |    4 
 src/rails/ui/swing/ORPanel.java                              |    6 
 src/test/GameTestServlet.java                                |    4 
 src/test/StockMarketTestServlet.java                         |    4 
 src/test/StockTest.java                                      |    4 
 47 files changed, 660 insertions(+), 758 deletions(-)

New commits:
commit 7286b3efe40f2c6303b72c84a0740c12d6b57d6f
Author: Stefan Frey <ste...@we...>
Date:   Wed Jun 13 19:51:16 2012 +0200

    renamed ConfigurableCompenentI to ConfigurableComponent

diff --git a/src/rails/algorithms/RevenueBonusTemplate.java b/src/rails/algorithms/RevenueBonusTemplate.java
index c4ce053..69b535f 100644
--- a/src/rails/algorithms/RevenueBonusTemplate.java
+++ b/src/rails/algorithms/RevenueBonusTemplate.java
@@ -6,7 +6,7 @@ import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import rails.common.parser.ConfigurableComponentI;
+import rails.common.parser.ConfigurableComponent;
 import rails.common.parser.ConfigurationException;
 import rails.common.parser.Tag;
 import rails.game.GameManager;
@@ -21,7 +21,7 @@ import rails.game.TrainType;
  * will be converted to a true RevenueBonus object during each revenue calculation
  * @author freystef
  */
-public final class RevenueBonusTemplate implements ConfigurableComponentI {
+public final class RevenueBonusTemplate implements ConfigurableComponent {
 
     protected static Logger log =
         LoggerFactory.getLogger(RevenueBonusTemplate.class.getPackage().getName());
diff --git a/src/rails/algorithms/RevenueManager.java b/src/rails/algorithms/RevenueManager.java
index c367678..0c14e5d 100644
--- a/src/rails/algorithms/RevenueManager.java
+++ b/src/rails/algorithms/RevenueManager.java
@@ -9,7 +9,7 @@ import org.slf4j.LoggerFactory;
 
 
 import rails.common.LocalText;
-import rails.common.parser.ConfigurableComponentI;
+import rails.common.parser.ConfigurableComponent;
 import rails.common.parser.ConfigurationException;
 import rails.common.parser.Tag;
 import rails.game.GameManager;
@@ -27,12 +27,12 @@ import rails.game.state.Item;
  *
  */
 
-public final class RevenueManager extends AbstractItem implements ConfigurableComponentI {
+public final class RevenueManager extends AbstractItem implements ConfigurableComponent {
 
     protected static Logger log =
         LoggerFactory.getLogger(RevenueManager.class.getPackage().getName());
 
-    private final HashSet<ConfigurableComponentI> configurableModifiers = new HashSet<ConfigurableComponentI>();
+    private final HashSet<ConfigurableComponent> configurableModifiers = new HashSet<ConfigurableComponent>();
     
     private final ArrayListState<NetworkGraphModifier> graphModifiers = ArrayListState.create(); 
     private final ArrayListState<RevenueStaticModifier> staticModifiers = ArrayListState.create();
@@ -86,8 +86,8 @@ public final class RevenueManager extends AbstractItem implements ConfigurableCo
                     throw new ConfigurationException(LocalText.getText(
                             "ClassIsNotAModifier", className));
                 }
-                if (isModifier && modifier instanceof ConfigurableComponentI) {
-                    configurableModifiers.add((ConfigurableComponentI)modifier);
+                if (isModifier && modifier instanceof ConfigurableComponent) {
+                    configurableModifiers.add((ConfigurableComponent)modifier);
                 }
             }
         }
@@ -104,7 +104,7 @@ public final class RevenueManager extends AbstractItem implements ConfigurableCo
 
     public void finishConfiguration(GameManager parent)
             throws ConfigurationException {
-        for (ConfigurableComponentI modifier:configurableModifiers) {
+        for (ConfigurableComponent modifier:configurableModifiers) {
                 modifier.finishConfiguration(parent);
         }
     }
diff --git a/src/rails/common/parser/ComponentManager.java b/src/rails/common/parser/ComponentManager.java
index ffb19ff..daa7f30 100644
--- a/src/rails/common/parser/ComponentManager.java
+++ b/src/rails/common/parser/ComponentManager.java
@@ -25,8 +25,8 @@ public class ComponentManager {
     protected Logger log = LoggerFactory.getLogger(ComponentManager.class.getPackage().getName());
     protected List<String> directories = new ArrayList<String>();
     
-    private Map<String, ConfigurableComponentI> mComponentMap =
-            new HashMap<String, ConfigurableComponentI>();
+    private Map<String, ConfigurableComponent> mComponentMap =
+            new HashMap<String, ConfigurableComponent>();
     
     public ComponentManager(Context context, String gameName, Tag tag, Map<String, String> gameOptions)
             throws ConfigurationException {
@@ -64,13 +64,13 @@ public class ComponentManager {
         }
 
         // Now construct the component
-        ConfigurableComponentI component;
+        ConfigurableComponent component;
         try {
-            Class<? extends ConfigurableComponentI> compClass;
+            Class<? extends ConfigurableComponent> compClass;
             compClass =
                     Class.forName(clazz).asSubclass(
-                            ConfigurableComponentI.class);
-            Constructor<? extends ConfigurableComponentI> compCons =
+                            ConfigurableComponent.class);
+            Constructor<? extends ConfigurableComponent> compCons =
                 compClass.getConstructor(new Class[0]);
             component = compCons.newInstance(new Object[0]);
         } catch (Exception ex) {
@@ -110,8 +110,8 @@ public class ComponentManager {
      * @param componentName the of the component sought.
      * @return the component sought, or null if it has not been configured.
      */
-    public ConfigurableComponentI findComponent(String componentName) throws ConfigurationException {
-        ConfigurableComponentI comp = mComponentMap.get(componentName);
+    public ConfigurableComponent findComponent(String componentName) throws ConfigurationException {
+        ConfigurableComponent comp = mComponentMap.get(componentName);
         
         //FIXME: Revenue Manager is currently optional.
         if (comp == null && componentName != "RevenueManager") {
diff --git a/src/rails/common/parser/ConfigurableComponent.java b/src/rails/common/parser/ConfigurableComponent.java
new file mode 100644
index 0000000..02e67f1
--- /dev/null
+++ b/src/rails/common/parser/ConfigurableComponent.java
@@ -0,0 +1,37 @@
+/* $Header: /Users/blentz/rails_rcs/cvs/18xx/rails/game/ConfigurableComponentI.java,v 1.7 2009/10/31 17:08:26 evos Exp $ */
+package rails.common.parser;
+
+import rails.game.GameManager;
+
+/**
+ * Interface for rails.game components which can be configured from an XML
+ * element.
+ */
+public interface ConfigurableComponent {
+
+    /**
+     * Instructs the component to configure itself from the provided XML
+     * element.
+     * 
+     * @param element the XML element containing the configuration
+     * @throws ConfigurationException
+     */
+    void configureFromXML(Tag tag) throws ConfigurationException;
+    
+    /**
+     * This method is intended to be called for each configurable
+     * component, to perforn any initialisation activities that
+     * require any other components to be initialised first. 
+     * This includes creating any required relationships to other 
+     * configured components and objects. 
+     * <p>This method should be called where necessary after all 
+     * XML file parsing has completed, so that all objects that
+     * need to be related to do exist. 
+     * @param parent The 'parent' configurable component is passed to allow 
+     * the 'child' to access any other object without the need to resort to
+     * static calls where possible. 
+     */
+    void finishConfiguration (GameManager parent)
+    throws ConfigurationException;
+
+}
diff --git a/src/rails/common/parser/ConfigurableComponentI.java b/src/rails/common/parser/ConfigurableComponentI.java
deleted file mode 100644
index c0741f2..0000000
--- a/src/rails/common/parser/ConfigurableComponentI.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/* $Header: /Users/blentz/rails_rcs/cvs/18xx/rails/game/ConfigurableComponentI.java,v 1.7 2009/10/31 17:08:26 evos Exp $ */
-package rails.common.parser;
-
-import rails.game.GameManager;
-
-/**
- * Interface for rails.game components which can be configured from an XML
- * element.
- */
-public interface ConfigurableComponentI {
-
-    /**
-     * Instructs the component to configure itself from the provided XML
-     * element.
-     * 
-     * @param element the XML element containing the configuration
-     * @throws ConfigurationException
-     */
-    void configureFromXML(Tag tag) throws ConfigurationException;
-    
-    /**
-     * This method is intended to be called for each configurable
-     * component, to perforn any initialisation activities that
-     * require any other components to be initialised first. 
-     * This includes creating any required relationships to other 
-     * configured components and objects. 
-     * <p>This method should be called where necessary after all 
-     * XML file parsing has completed, so that all objects that
-     * need to be related to do exist. 
-     * @param parent The 'parent' configurable component is passed to allow 
-     * the 'child' to access any other object without the need to resort to
-     * static calls where possible. 
-     */
-    void finishConfiguration (GameManager parent)
-    throws ConfigurationException;
-
-}
diff --git a/src/rails/game/Bank.java b/src/rails/game/Bank.java
index fac4fe1..392c62c 100644
--- a/src/rails/game/Bank.java
+++ b/src/rails/game/Bank.java
@@ -7,7 +7,7 @@ import org.slf4j.LoggerFactory;
 
 import rails.common.LocalText;
 import rails.common.parser.Config;
-import rails.common.parser.ConfigurableComponentI;
+import rails.common.parser.ConfigurableComponent;
 import rails.common.parser.ConfigurationException;
 import rails.common.parser.Tag;
 import rails.game.model.CashMoneyModel;
@@ -18,7 +18,7 @@ import rails.game.state.BooleanState;
 import rails.game.state.Item;
 import rails.util.*;
 
-public class Bank extends AbstractItem implements CashOwner, ConfigurableComponentI {
+public class Bank extends AbstractItem implements CashOwner, ConfigurableComponent {
 
     private static Bank instance = null;
 
@@ -81,7 +81,7 @@ public class Bank extends AbstractItem implements CashOwner, ConfigurableCompone
     }
     
     /**
-     * @see rails.common.parser.ConfigurableComponentI#configureFromXML(org.w3c.dom.Element)
+     * @see rails.common.parser.ConfigurableComponent#configureFromXML(org.w3c.dom.Element)
      */
     public void configureFromXML(Tag tag) throws ConfigurationException {
 
diff --git a/src/rails/game/BonusToken.java b/src/rails/game/BonusToken.java
index 9c8f871..acfcfe7 100644
--- a/src/rails/game/BonusToken.java
+++ b/src/rails/game/BonusToken.java
@@ -1,6 +1,6 @@
 package rails.game;
 
-import rails.common.parser.ConfigurableComponentI;
+import rails.common.parser.ConfigurableComponent;
 import rails.common.parser.ConfigurationException;
 import rails.common.parser.Tag;
 import rails.game.state.Item;
@@ -15,7 +15,7 @@ import rails.util.Util;
  * @author Erik Vos
  */
 
-public final class BonusToken extends Token implements Closeable, ConfigurableComponentI  {
+public final class BonusToken extends Token implements Closeable, ConfigurableComponent  {
 
     private int value;
     private String name;
diff --git a/src/rails/game/Company.java b/src/rails/game/Company.java
index 58bc80f..04f9658 100644
--- a/src/rails/game/Company.java
+++ b/src/rails/game/Company.java
@@ -7,7 +7,7 @@ import org.slf4j.LoggerFactory;
 
 import com.google.common.collect.ImmutableList;
 
-import rails.common.parser.ConfigurableComponentI;
+import rails.common.parser.ConfigurableComponent;
 import rails.common.parser.ConfigurationException;
 import rails.common.parser.Tag;
 import rails.game.special.SpecialProperty;
@@ -17,7 +17,7 @@ import rails.game.state.Item;
 import rails.game.state.PortfolioList;
 import rails.util.Util;
 
-public abstract class Company extends AbstractItem implements ConfigurableComponentI,
+public abstract class Company extends AbstractItem implements ConfigurableComponent,
 Cloneable, Comparable<Company> {
 
     /** The name of the XML tag used to configure a company. */
diff --git a/src/rails/game/CompanyManager.java b/src/rails/game/CompanyManager.java
index 0adc9f1..399e514 100644
--- a/src/rails/game/CompanyManager.java
+++ b/src/rails/game/CompanyManager.java
@@ -9,12 +9,12 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import rails.common.LocalText;
-import rails.common.parser.ConfigurableComponentI;
+import rails.common.parser.ConfigurableComponent;
 import rails.common.parser.ConfigurationException;
 import rails.common.parser.Tag;
 import rails.game.state.AbstractItem;
 
-public class CompanyManager extends AbstractItem implements ConfigurableComponentI {
+public class CompanyManager extends AbstractItem implements ConfigurableComponent {
 
     /**
      * This is the name by which the CompanyManager should be registered with
@@ -71,7 +71,7 @@ public class CompanyManager extends AbstractItem implements ConfigurableComponen
     public CompanyManager() { }
 
     /**
-     * @see rails.common.parser.ConfigurableComponentI#configureFromXML(org.w3c.dom.Element)
+     * @see rails.common.parser.ConfigurableComponent#configureFromXML(org.w3c.dom.Element)
      */
     public void configureFromXML(Tag tag) throws ConfigurationException {
 
diff --git a/src/rails/game/CompanyType.java b/src/rails/game/CompanyType.java
index dad9339..cae1e49 100644
--- a/src/rails/game/CompanyType.java
+++ b/src/rails/game/CompanyType.java
@@ -63,7 +63,7 @@ public class CompanyType extends AbstractItem {
     }
 
     /**
-     * @see rails.common.parser.ConfigurableComponentI#configureFromXML(org.w3c.dom.Element)
+     * @see rails.common.parser.ConfigurableComponent#configureFromXML(org.w3c.dom.Element)
      */
     public void configureFromXML(Tag tag) throws ConfigurationException {
         //No longer needed.
diff --git a/src/rails/game/GameManager.java b/src/rails/game/GameManager.java
index 1b9bf81..2ba7b72 100644
--- a/src/rails/game/GameManager.java
+++ b/src/rails/game/GameManager.java
@@ -27,7 +27,7 @@ import rails.util.Util;
  * This class manages the playing rounds by supervising all implementations of
  * Round. Currently everything is hardcoded &agrave; la 1830.
  */
-public class GameManager extends AbstractItem implements ConfigurableComponentI {
+public class GameManager extends AbstractItem implements ConfigurableComponent {
     /** Version ID of the Save file header, as written in save() */
     private static final long saveFileHeaderVersionID = 3L;
     /**
diff --git a/src/rails/game/MapHex.java b/src/rails/game/MapHex.java
index 71f758e..e338c10 100644
--- a/src/rails/game/MapHex.java
+++ b/src/rails/game/MapHex.java
@@ -59,7 +59,7 @@ import rails.util.*;
  */
 
 // FIXME: MapHex was previous a model
-public class MapHex extends AbstractItem implements PortfolioHolder, ConfigurableComponentI,
+public class MapHex extends AbstractItem implements PortfolioHolder, ConfigurableComponent,
 StationHolder {
 
     private static final String[] ewOrNames =
@@ -193,7 +193,7 @@ StationHolder {
     }
     
     /**
-     * @see rails.common.parser.ConfigurableComponentI#configureFromXML(org.w3c.dom.Element)
+     * @see rails.common.parser.ConfigurableComponent#configureFromXML(org.w3c.dom.Element)
      */
     public void configureFromXML(Tag tag) throws ConfigurationException {
         Pattern namePattern = Pattern.compile("(\\D+?)(-?\\d+)");
diff --git a/src/rails/game/MapManager.java b/src/rails/game/MapManager.java
index f8f6d19..de07282 100644
--- a/src/rails/game/MapManager.java
+++ b/src/rails/game/MapManager.java
@@ -17,7 +17,7 @@ import rails.util.Util;
 /**
  * MapManager configures the map layout from XML
  */
-public class MapManager extends AbstractItem implements ConfigurableComponentI {
+public class MapManager extends AbstractItem implements ConfigurableComponent {
 
     private String mapUIClassName = null;
 
@@ -68,7 +68,7 @@ public class MapManager extends AbstractItem implements ConfigurableComponentI {
     }
 
     /**
-     * @see rails.common.parser.ConfigurableComponentI#configureFromXML(org.w3c.dom.Element)
+     * @see rails.common.parser.ConfigurableComponent#configureFromXML(org.w3c.dom.Element)
      */
     public void configureFromXML(Tag tag) throws ConfigurationException {
         String attr = tag.getAttributeAsString("tileOrientation");
diff --git a/src/rails/game/Phase.java b/src/rails/game/Phase.java
index 1b20e8d..7857bf7 100644
--- a/src/rails/game/Phase.java
+++ b/src/rails/game/Phase.java
@@ -10,13 +10,13 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import rails.common.LocalText;
-import rails.common.parser.ConfigurableComponentI;
+import rails.common.parser.ConfigurableComponent;
 import rails.common.parser.ConfigurationException;
 import rails.common.parser.Tag;
 import rails.game.state.Owner;
 import rails.util.Util;
 
-public class Phase implements ConfigurableComponentI {
+public class Phase implements ConfigurableComponent {
 
     protected int index;
 
diff --git a/src/rails/game/PhaseManager.java b/src/rails/game/PhaseManager.java
index 2b80119..0b2c1a0 100644
--- a/src/rails/game/PhaseManager.java
+++ b/src/rails/game/PhaseManager.java
@@ -5,7 +5,7 @@ import java.util.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import rails.common.parser.ConfigurableComponentI;
+import rails.common.parser.ConfigurableComponent;
 import rails.common.parser.ConfigurationException;
 import rails.common.parser.Tag;
 import rails.game.state.AbstractItem;
@@ -14,7 +14,7 @@ import rails.game.state.Item;
 import rails.game.state.Owner;
 import rails.game.state.State;
 
-public class PhaseManager extends AbstractItem implements ConfigurableComponentI {
+public class PhaseManager extends AbstractItem implements ConfigurableComponent {
 
     protected ArrayList<Phase> phaseList;
     protected HashMap<String, Phase> phaseMap;
diff --git a/src/rails/game/PlayerManager.java b/src/rails/game/PlayerManager.java
index ce1e653..a7329a2 100644
--- a/src/rails/game/PlayerManager.java
+++ b/src/rails/game/PlayerManager.java
@@ -3,13 +3,13 @@ package rails.game;
 import java.util.*;
 
 import rails.common.LocalText;
-import rails.common.parser.ConfigurableComponentI;
+import rails.common.parser.ConfigurableComponent;
 import rails.common.parser.ConfigurationException;
 import rails.common.parser.Tag;
 import rails.game.model.MoneyModel;
 import rails.game.state.AbstractItem;
 
-public class PlayerManager extends AbstractItem implements ConfigurableComponentI {
+public class PlayerManager extends AbstractItem implements ConfigurableComponent {
 
     private int numberOfPlayers;
     private List<Player> players;
diff --git a/src/rails/game/PrivateCompany.java b/src/rails/game/PrivateCompany.java
index 0d7aebe..87b47d6 100644
--- a/src/rails/game/PrivateCompany.java
+++ b/src/rails/game/PrivateCompany.java
@@ -93,7 +93,7 @@ public class PrivateCompany extends Company implements Ownable<PrivateCompany>,
     }
 
     /**
-     * @see rails.common.parser.ConfigurableComponentI#configureFromXML(org.w3c.dom.Element)
+     * @see rails.common.parser.ConfigurableComponent#configureFromXML(org.w3c.dom.Element)
      */
     @Override
     public void configureFromXML(Tag tag) throws ConfigurationException {
diff --git a/src/rails/game/StockMarket.java b/src/rails/game/StockMarket.java
index 72f09b3..d8a4c08 100644
--- a/src/rails/game/StockMarket.java
+++ b/src/rails/game/StockMarket.java
@@ -5,14 +5,14 @@ import java.util.HashMap;
 import java.util.List;
 
 import rails.common.LocalText;
-import rails.common.parser.ConfigurableComponentI;
+import rails.common.parser.ConfigurableComponent;
 import rails.common.parser.ConfigurationException;
 import rails.common.parser.Tag;
 import rails.game.state.AbstractItem;
 import rails.game.state.BooleanState;
 import rails.game.state.Item;
 
-public class StockMarket extends AbstractItem implements ConfigurableComponentI {
+public class StockMarket extends AbstractItem implements ConfigurableComponent {
 
      /**
      *  This is the name by which the CompanyManager should be registered with
@@ -62,7 +62,7 @@ public class StockMarket extends AbstractItem implements ConfigurableComponentI
     
 
     /**
-     * @see rails.common.parser.ConfigurableComponentI#configureFromXML(org.w3c.dom.Element)
+     * @see rails.common.parser.ConfigurableComponent#configureFromXML(org.w3c.dom.Element)
      */
     public void configureFromXML(Tag tag) throws ConfigurationException {
 
diff --git a/src/rails/game/TileManager.java b/src/rails/game/TileManager.java
index 6c68fab..c8e9465 100644
--- a/src/rails/game/TileManager.java
+++ b/src/rails/game/TileManager.java
@@ -16,7 +16,7 @@ import rails.game.Stop.Type;
 import rails.game.state.AbstractItem;
 import rails.util.Util;
 
-public class TileManager extends AbstractItem implements ConfigurableComponentI {
+public class TileManager extends AbstractItem implements ConfigurableComponent {
 
     protected Map<Integer, Tile> tileMap = new HashMap<Integer, Tile>();
     protected List<Integer> tileIds = new ArrayList<Integer>();
@@ -40,7 +40,7 @@ public class TileManager extends AbstractItem implements ConfigurableComponentI
     }
 
     /**
-     * @see rails.common.parser.ConfigurableComponentI#configureFromXML(org.w3c.dom.Element)
+     * @see rails.common.parser.ConfigurableComponent#configureFromXML(org.w3c.dom.Element)
      */
     public void configureFromXML(Tag tileSetTop) throws ConfigurationException {
         /*
diff --git a/src/rails/game/TrainManager.java b/src/rails/game/TrainManager.java
index 3b5bfc2..3138b08 100644
--- a/src/rails/game/TrainManager.java
+++ b/src/rails/game/TrainManager.java
@@ -11,7 +11,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import rails.common.LocalText;
-import rails.common.parser.ConfigurableComponentI;
+import rails.common.parser.ConfigurableComponent;
 import rails.common.parser.ConfigurationException;
 import rails.common.parser.Tag;
 import rails.game.model.PortfolioModel;
@@ -21,7 +21,7 @@ import rails.game.state.IntegerState;
 import rails.game.state.Item;
 import rails.game.state.Owner;
 
-public class TrainManager extends AbstractItem implements ConfigurableComponentI {
+public class TrainManager extends AbstractItem implements ConfigurableComponent {
     // Static attributes
     protected final List<TrainType> lTrainTypes = new ArrayList<TrainType>();
 
@@ -83,7 +83,7 @@ public class TrainManager extends AbstractItem implements ConfigurableComponentI
     public TrainManager() { }
 
     /**
-     * @see rails.common.parser.ConfigurableComponentI#configureFromXML(org.w3c.dom.Element)
+     * @see rails.common.parser.ConfigurableComponent#configureFromXML(org.w3c.dom.Element)
      */
     public void configureFromXML(Tag tag) throws ConfigurationException {
         
diff --git a/src/rails/game/TrainType.java b/src/rails/game/TrainType.java
index a9932cc..eb4be47 100644
--- a/src/rails/game/TrainType.java
+++ b/src/rails/game/TrainType.java
@@ -54,7 +54,7 @@ public class TrainType implements Cloneable {
     }
 
     /**
-     * @see rails.common.parser.ConfigurableComponentI#configureFromXML(org.w3c.dom.Element)
+     * @see rails.common.parser.ConfigurableComponent#configureFromXML(org.w3c.dom.Element)
      */
     public void configureFromXML(Tag tag) throws ConfigurationException {
 
diff --git a/src/rails/game/specific/_18AL/NamedTrainRevenueModifier.java b/src/rails/game/specific/_18AL/NamedTrainRevenueModifier.java
index 9471a5e..6f6bd83 100644
--- a/src/rails/game/specific/_18AL/NamedTrainRevenueModifier.java
+++ b/src/rails/game/specific/_18AL/NamedTrainRevenueModifier.java
@@ -10,14 +10,14 @@ import rails.algorithms.RevenueBonus;
 import rails.algorithms.RevenueDynamicModifier;
 import rails.algorithms.RevenueStaticModifier;
 import rails.algorithms.RevenueTrainRun;
-import rails.common.parser.ConfigurableComponentI;
+import rails.common.parser.ConfigurableComponent;
 import rails.common.parser.ConfigurationException;
 import rails.common.parser.Tag;
 import rails.game.GameManager;
 import rails.game.MapHex;
 import rails.game.Train;
 
-public class NamedTrainRevenueModifier implements RevenueStaticModifier, RevenueDynamicModifier, ConfigurableComponentI {
+public class NamedTrainRevenueModifier implements RevenueStaticModifier, RevenueDynamicModifier, ConfigurableComponent {
 
     private boolean dynamic;
     private List<RevenueBonus> bonuses;
diff --git a/src/rails/game/specific/_18AL/NamedTrainToken.java b/src/rails/game/specific/_18AL/NamedTrainToken.java
index f91f343..84c8720 100644
--- a/src/rails/game/specific/_18AL/NamedTrainToken.java
+++ b/src/rails/game/specific/_18AL/NamedTrainToken.java
@@ -10,14 +10,14 @@ import org.slf4j.LoggerFactory;
 //import rails.algorithms.RevenueBonus;
 //import rails.algorithms.RevenueManager;
 //import rails.algorithms.RevenueStaticModifier;
-import rails.common.parser.ConfigurableComponentI;
+import rails.common.parser.ConfigurableComponent;
 import rails.common.parser.ConfigurationException;
 import rails.common.parser.Tag;
 import rails.game.*;
 import rails.game.state.Item;
 import rails.util.Util;
 
-public class NamedTrainToken extends Token implements ConfigurableComponentI /*, RevenueStaticModifier */ {
+public class NamedTrainToken extends Token implements ConfigurableComponent /*, RevenueStaticModifier */ {
 
     protected static Logger log =
         LoggerFactory.getLogger(NamedTrainToken.class.getPackage().getName());
diff --git a/src/rails/game/specific/_18Kaas/RuhrRevenueModifier.java b/src/rails/game/specific/_18Kaas/RuhrRevenueModifier.java
index 4258d37..e75463c 100644
--- a/src/rails/game/specific/_18Kaas/RuhrRevenueModifier.java
+++ b/src/rails/game/specific/_18Kaas/RuhrRevenueModifier.java
@@ -10,12 +10,12 @@ import rails.algorithms.NetworkVertex;
 import rails.algorithms.RevenueAdapter;
 import rails.algorithms.RevenueBonus;
 import rails.algorithms.RevenueStaticModifier;
-import rails.common.parser.ConfigurableComponentI;
+import rails.common.parser.ConfigurableComponent;
 import rails.common.parser.ConfigurationException;
 import rails.common.parser.Tag;
 import rails.game.GameManager;
 
-public class RuhrRevenueModifier implements RevenueStaticModifier, ConfigurableComponentI {
+public class RuhrRevenueModifier implements RevenueStaticModifier, ConfigurableComponent {
 
     protected static Logger log =
         LoggerFactory.getLogger(RuhrRevenueModifier.class.getPackage().getName());


commit 5856b28b19d275b4255d1c090abfbcabeedd04d6
Author: Stefan Frey <ste...@we...>
Date:   Wed Jun 13 19:49:39 2012 +0200

    removed CompanyManagerI interface

diff --git a/src/rails/common/parser/GameFileParser.java b/src/rails/common/parser/GameFileParser.java
index 0462a7a..528892e 100644
--- a/src/rails/common/parser/GameFileParser.java
+...
 
[truncated message content]