[Gridarta-commit] SF.net SVN: gridarta:[4679] trunk

[<aki...@us...>]

Revision: 4679
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4679&view=rev
Author:   akirschbaum
Date:     2008-08-01 22:37:10 +0000 (Fri, 01 Aug 2008)

Log Message:
-----------
Remove calls to MainControl.getGridartaObjectsFactory().

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/CMainControl.java
    trunk/crossfire/src/cfeditor/MapActions.java
    trunk/crossfire/src/cfeditor/gui/map/MapPropertiesDialog.java
    trunk/crossfire/src/cfeditor/gui/map/MapTilePane.java
    trunk/daimonin/src/daieditor/CMainControl.java
    trunk/daimonin/src/daieditor/MapActions.java
    trunk/daimonin/src/daieditor/gui/map/MapPropertiesDialog.java
    trunk/daimonin/src/daieditor/gui/map/MapTilePane.java
    trunk/src/app/net/sf/gridarta/gui/map/AbstractMapTilePane.java

Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-01 22:25:29 UTC (rev 4678)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-01 22:37:10 UTC (rev 4679)
@@ -294,7 +294,7 @@
             log.fatal("GameObjectMatcher 'exit' does not exist");
             throw new MissingResourceException("GameObjectMatcher 'exit' does not exist", null, null);
         }
-        final MapActions mapActions = new MapActions(mainView, this, globalSettings, mapManager, exitMatcher, mapFileFilter, selectedSquareView);
+        final MapActions mapActions = new MapActions(mainView, this, gridartaObjectsFactory, globalSettings, mapManager, exitMatcher, mapFileFilter, selectedSquareView);
         archetypeTypeSet.getListTable().put("event", ScriptArchUtils.getEventTypes());
         Map<String, TreasureTreeNode> specialTreasureLists;
         try {

Modified: trunk/crossfire/src/cfeditor/MapActions.java
===================================================================
--- trunk/crossfire/src/cfeditor/MapActions.java	2008-08-01 22:25:29 UTC (rev 4678)
+++ trunk/crossfire/src/cfeditor/MapActions.java	2008-08-01 22:37:10 UTC (rev 4679)
@@ -37,6 +37,7 @@
 import net.sf.gridarta.CommonConstants;
 import net.sf.gridarta.CurrentMapListener;
 import net.sf.gridarta.GlobalSettings;
+import net.sf.gridarta.GridartaObjectsFactory;
 import net.sf.gridarta.MainControl;
 import net.sf.gridarta.MapManager;
 import net.sf.gridarta.gameobject.match.GameObjectMatcher;
@@ -111,6 +112,12 @@
     /** The main control to use. */
     private final CMainControl mainControl;
 
+    /**
+     * The gridarta objects factory instance.
+     */
+    @NotNull
+    private final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory;
+
     /** The global settings instance. */
     @NotNull
     private final GlobalSettings globalSettings;
@@ -137,15 +144,17 @@
      * Create a new instance.
      * @param parent the component for showing dialog boxes
      * @param mainControl the main control to use
+     * @param gridartaObjectsFactory the gridarta objects factory instance
      * @param globalSettings the global settings instance
      * @param mapManager the map manager
      * @param exitMatcher the game object matcher selecting exit objects
      * @param mapFileFilter the Swing file filter to use
      * @param selectedSquareView the selected square vuew to use
      */
-    public MapActions(@NotNull final Component parent, final CMainControl mainControl, @NotNull final GlobalSettings globalSettings,final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager, final GameObjectMatcher exitMatcher, final FileFilter mapFileFilter, @NotNull final SelectedSquareView<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareView) {
+    public MapActions(@NotNull final Component parent, final CMainControl mainControl, @NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory, @NotNull final GlobalSettings globalSettings,final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager, final GameObjectMatcher exitMatcher, final FileFilter mapFileFilter, @NotNull final SelectedSquareView<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareView) {
         this.parent = parent;
         this.mainControl = mainControl;
+        this.gridartaObjectsFactory = gridartaObjectsFactory;
         this.globalSettings = globalSettings;
         this.mapManager = mapManager;
         this.exitMatcher = exitMatcher;
@@ -242,7 +251,7 @@
     public void mapProperties() {
         final MapView<GameObject, MapArchObject, Archetype, CMapViewBasic> mapView = getMapPropertiesEnabled();
         if (mapView != null) {
-            MapPropertiesDialog.showDialog(mapView.getComponent(), mainControl, globalSettings, mapView.getMapControl(), mapFileFilter);
+            MapPropertiesDialog.showDialog(mapView.getComponent(), mainControl, gridartaObjectsFactory, globalSettings, mapView.getMapControl(), mapFileFilter);
         }
     }
 

Modified: trunk/crossfire/src/cfeditor/gui/map/MapPropertiesDialog.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/map/MapPropertiesDialog.java	2008-08-01 22:25:29 UTC (rev 4678)
+++ trunk/crossfire/src/cfeditor/gui/map/MapPropertiesDialog.java	2008-08-01 22:37:10 UTC (rev 4679)
@@ -41,6 +41,7 @@
 import javax.swing.border.EmptyBorder;
 import javax.swing.filechooser.FileFilter;
 import net.sf.gridarta.GlobalSettings;
+import net.sf.gridarta.GridartaObjectsFactory;
 import net.sf.gridarta.Size2D;
 import net.sf.gridarta.help.Help;
 import net.sf.gridarta.map.MapControl;
@@ -169,11 +170,12 @@
     /**
      * Creates a map-options dialog.
      * @param mainControl The controller of this dialog.
+     * @param gridartaObjectsFactory the gridarta objects factory instance
      * @param globalSettings the global settings instance
      * @param mapControl The level whose properties are shown/edited.
      * @param mapFileFilter the Swing file filter to use
      */
-    private MapPropertiesDialog(final CMainControl mainControl, @NotNull final GlobalSettings globalSettings, final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl, final FileFilter mapFileFilter) {
+    private MapPropertiesDialog(final CMainControl mainControl, @NotNull final GridartaObjectsFactory<?, MapArchObject, ?, ?> gridartaObjectsFactory, @NotNull final GlobalSettings globalSettings, final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl, final FileFilter mapFileFilter) {
         okButton.setDefaultCapable(true);
         setOptions(new Object[] {helpButton, okButton, restoreButton, cancelButton});
 
@@ -217,7 +219,7 @@
         final JPanel weatherPanel = createWeatherPanel(map);
         tabs.add(ACTION_FACTORY.getString("mapWeatherTabTitle"), weatherPanel);
 
-        mapTilePane = new MapTilePane(mainControl, globalSettings, mapControl, mapFileFilter);
+        mapTilePane = new MapTilePane(mainControl, gridartaObjectsFactory, globalSettings, mapControl, mapFileFilter);
         final JPanel tilePanel = createTilePathPanel(mapTilePane);
         tabs.add(ACTION_FACTORY.getString("mapTilesTabTitle"), tilePanel);
 
@@ -627,12 +629,13 @@
      * Show a dialog querying the user for map properties.
      * @param parent the parent component to show dialog on
      * @param mainControl CMainControl with information
+     * @param gridartaObjectsFactory the gridarta objects factory instance
      * @param globalSettings the global settings instance
      * @param level map to show dialog about
      * @param mapFileFilter the Swing file filter to use
      */
-    public static void showDialog(final Component parent, final CMainControl mainControl, @NotNull final GlobalSettings globalSettings, final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> level, final FileFilter mapFileFilter) {
-        final MapPropertiesDialog pane = new MapPropertiesDialog(mainControl, globalSettings, level, mapFileFilter);
+    public static void showDialog(final Component parent, @NotNull final CMainControl mainControl, @NotNull final GridartaObjectsFactory<?, MapArchObject, ?, ?> gridartaObjectsFactory, @NotNull final GlobalSettings globalSettings, final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> level, final FileFilter mapFileFilter) {
+        final MapPropertiesDialog pane = new MapPropertiesDialog(mainControl, gridartaObjectsFactory, globalSettings, level, mapFileFilter);
         final JDialog dialog = pane.createDialog(parent, ACTION_FACTORY.format("mapTitle", level.getMapModel().getMapArchObject().getMapDisplayName(), level.getMapFileName()));
         pane.dialog = dialog;
         dialog.getRootPane().setDefaultButton(pane.okButton);

Modified: trunk/crossfire/src/cfeditor/gui/map/MapTilePane.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/map/MapTilePane.java	2008-08-01 22:25:29 UTC (rev 4678)
+++ trunk/crossfire/src/cfeditor/gui/map/MapTilePane.java	2008-08-01 22:37:10 UTC (rev 4679)
@@ -25,6 +25,7 @@
 import cfeditor.map.MapArchObject;
 import javax.swing.filechooser.FileFilter;
 import net.sf.gridarta.GlobalSettings;
+import net.sf.gridarta.GridartaObjectsFactory;
 import net.sf.gridarta.gui.DirectionLayout;
 import net.sf.gridarta.gui.map.AbstractMapTilePane;
 import net.sf.gridarta.map.MapControl;
@@ -58,13 +59,14 @@
      * Create a MapTilePane.
      * @param mainControl CMainControl to use for displaying dialogs, getting
      * paths etc..
+     * @param gridartaObjectsFactory the gridarta objects factory instance
      * @param globalSettings the global settings instance
      * @param mapControl MapControl of the map that's tiles are to be viewed /
      * controlled
      * @param mapFileFilter the Swing file filter to use
      */
-    public MapTilePane(final CMainControl mainControl, @NotNull final GlobalSettings globalSettings, final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl, final FileFilter mapFileFilter) {
-        super(mainControl, globalSettings, mapControl, tileLink, directionMapping, nextFocus, mapFileFilter);
+    public MapTilePane(final CMainControl mainControl, @NotNull final GridartaObjectsFactory<?, MapArchObject, ?, ?>gridartaObjectsFactory, @NotNull final GlobalSettings globalSettings, final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl, final FileFilter mapFileFilter) {
+        super(mainControl, gridartaObjectsFactory, globalSettings, mapControl, tileLink, directionMapping, nextFocus, mapFileFilter);
     }
 
 } // class MapTilePane

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-08-01 22:25:29 UTC (rev 4678)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-08-01 22:37:10 UTC (rev 4679)
@@ -355,7 +355,7 @@
             log.fatal("GameObjectMatcher 'exit' does not exist");
             throw new MissingResourceException("GameObjectMatcher 'exit' does not exist", null, null);
         }
-        final MapActions mapActions = new MapActions(mainView, this, (GlobalSettingsImpl) globalSettings, mapManager, exitMatcher, mapFileFilter, selectedSquareView);
+        final MapActions mapActions = new MapActions(mainView, this, gridartaObjectsFactory, (GlobalSettingsImpl) globalSettings, mapManager, exitMatcher, mapFileFilter, selectedSquareView);
         Map<String, TreasureTreeNode> specialTreasureLists;
         try {
             final Document specialTreasureListsDocument = xmlHelper.getDocumentBuilder().parse(IOUtils.getResourceURLAsString(getConfigurationDirectory(), "TreasureLists.xml"));

Modified: trunk/daimonin/src/daieditor/MapActions.java
===================================================================
--- trunk/daimonin/src/daieditor/MapActions.java	2008-08-01 22:25:29 UTC (rev 4678)
+++ trunk/daimonin/src/daieditor/MapActions.java	2008-08-01 22:37:10 UTC (rev 4679)
@@ -36,6 +36,7 @@
 import javax.swing.filechooser.FileFilter;
 import net.sf.gridarta.CommonConstants;
 import net.sf.gridarta.CurrentMapListener;
+import net.sf.gridarta.GridartaObjectsFactory;
 import net.sf.gridarta.MainControl;
 import net.sf.gridarta.MapManager;
 import net.sf.gridarta.gameobject.match.GameObjectMatcher;
@@ -106,6 +107,12 @@
     /** The main control to use. */
     private final CMainControl mainControl;
 
+    /**
+     * The gridarta objects factory instance.
+     */
+    @NotNull
+    private final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory;
+
     /** The global settings instance. */
     @NotNull
     private final GlobalSettingsImpl globalSettings;
@@ -132,15 +139,17 @@
      * Create a new instance.
      * @param parent the component for showing dialog boxes
      * @param mainControl the main control to use
+     * @param gridartaObjectsFactory the gridarta objects factory instance
      * @param globalSettings the global settings instance
      * @param mapManager the map manager
      * @param exitMatcher the game object matcher selecting exit objects
      * @param mapFileFilter the Swing file filter to use
      * @param selectedSquareView the selected square vuew to use
      */
-    public MapActions(@NotNull final Component parent, final CMainControl mainControl, @NotNull final GlobalSettingsImpl globalSettings, final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager, final GameObjectMatcher exitMatcher, final FileFilter mapFileFilter, @NotNull final SelectedSquareView<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareView) {
+    public MapActions(@NotNull final Component parent, @NotNull final CMainControl mainControl, @NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory, @NotNull final GlobalSettingsImpl globalSettings, final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager, final GameObjectMatcher exitMatcher, final FileFilter mapFileFilter, @NotNull final SelectedSquareView<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareView) {
         this.parent = parent;
         this.mainControl = mainControl;
+        this.gridartaObjectsFactory = gridartaObjectsFactory;
         this.globalSettings = globalSettings;
         this.mapManager = mapManager;
         this.exitMatcher = exitMatcher;
@@ -237,7 +246,7 @@
     public void mapProperties() {
         final MapView<GameObject, MapArchObject, Archetype, CMapViewBasic> mapView = getMapPropertiesEnabled();
         if (mapView != null) {
-            MapPropertiesDialog.showDialog(mapView.getComponent(), mainControl, globalSettings, mapView.getMapControl(), mapFileFilter);
+            MapPropertiesDialog.showDialog(mapView.getComponent(), mainControl, gridartaObjectsFactory, globalSettings, mapView.getMapControl(), mapFileFilter);
         }
     }
 

Modified: trunk/daimonin/src/daieditor/gui/map/MapPropertiesDialog.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/map/MapPropertiesDialog.java	2008-08-01 22:25:29 UTC (rev 4678)
+++ trunk/daimonin/src/daieditor/gui/map/MapPropertiesDialog.java	2008-08-01 22:37:10 UTC (rev 4679)
@@ -51,6 +51,7 @@
 import javax.swing.border.Border;
 import javax.swing.border.EmptyBorder;
 import javax.swing.filechooser.FileFilter;
+import net.sf.gridarta.GridartaObjectsFactory;
 import net.sf.gridarta.Size2D;
 import net.sf.gridarta.gui.GUIConstants;
 import net.sf.gridarta.help.Help;
@@ -155,11 +156,12 @@
     /**
      * Creates a map-options dialog.
      * @param mainControl The controller of this dialog.
+     * @param gridartaObjectsFactory the gridarta objects factory instance
      * @param globalSettings the global settings instance
      * @param mapControl The level whose properties are shown/edited.
      * @param mapFileFilter the Swing file filter to use
      */
-    private MapPropertiesDialog(final CMainControl mainControl, @NotNull final GlobalSettingsImpl globalSettings, final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl, final FileFilter mapFileFilter) {
+    private MapPropertiesDialog(@NotNull final CMainControl mainControl, @NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory, @NotNull final GlobalSettingsImpl globalSettings, final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl, final FileFilter mapFileFilter) {
         okButton.setDefaultCapable(true);
         setOptions(new Object[] {helpButton, okButton, restoreButton, cancelButton});
 
@@ -174,7 +176,7 @@
         final JPanel mainPanel = createMainPanel(map);
         tabs.add(ACTION_FACTORY.getString("mapMapTabTitle"), mainPanel);
 
-        mapTilePane = new MapTilePane(mainControl, globalSettings, mapControl, mapFileFilter);
+        mapTilePane = new MapTilePane(mainControl, gridartaObjectsFactory, globalSettings, mapControl, mapFileFilter);
         final JPanel tilePanel = createTilePathPanel(mapTilePane);
         tabs.add(ACTION_FACTORY.getString("mapTilesTabTitle"), tilePanel);
 
@@ -558,12 +560,13 @@
      * Show a dialog querying the user for map properties.
      * @param parent the parent component to show dialog on
      * @param mainControl CMainControl with information
+     * @param gridartaObjectsFactory the gridarta objects factory instance
      * @param globalSettings the global settings instance
      * @param level map to show dialog about
      * @param mapFileFilter the Swing file filter to use
      */
-    public static void showDialog(final Component parent, final CMainControl mainControl, @NotNull final GlobalSettingsImpl globalSettings, final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> level, final FileFilter mapFileFilter) {
-        final MapPropertiesDialog pane = new MapPropertiesDialog(mainControl, globalSettings, level, mapFileFilter);
+    public static void showDialog(final Component parent, final CMainControl mainControl, @NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory, @NotNull final GlobalSettingsImpl globalSettings, final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> level, final FileFilter mapFileFilter) {
+        final MapPropertiesDialog pane = new MapPropertiesDialog(mainControl, gridartaObjectsFactory, globalSettings, level, mapFileFilter);
         final JDialog dialog = pane.createDialog(parent, ACTION_FACTORY.format("mapTitle", level.getMapModel().getMapArchObject().getMapDisplayName(), level.getMapFileName()));
         pane.dialog = dialog;
         dialog.getRootPane().setDefaultButton(pane.okButton);

Modified: trunk/daimonin/src/daieditor/gui/map/MapTilePane.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/map/MapTilePane.java	2008-08-01 22:25:29 UTC (rev 4678)
+++ trunk/daimonin/src/daieditor/gui/map/MapTilePane.java	2008-08-01 22:37:10 UTC (rev 4679)
@@ -26,6 +26,7 @@
 import javax.swing.filechooser.FileFilter;
 import net.sf.gridarta.CommonConstants;
 import net.sf.gridarta.GlobalSettings;
+import net.sf.gridarta.GridartaObjectsFactory;
 import net.sf.gridarta.gui.DirectionLayout;
 import net.sf.gridarta.gui.map.AbstractMapTilePane;
 import net.sf.gridarta.map.MapControl;
@@ -106,13 +107,14 @@
      * Create a MapTilePane.
      * @param mainControl CMainControl to use for displaying dialogs, getting
      * paths etc..
+     * @param gridartaObjectsFactory the gridarta objects factory instance
      * @param globalSettings the global settings instance
      * @param mapControl MapControl of the map that's tiles are to be viewed /
      * controlled
      * @param mapFileFilter the Swing file filter to use
      */
-    public MapTilePane(final CMainControl mainControl, @NotNull final GlobalSettings globalSettings, final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl, final FileFilter mapFileFilter) {
-        super(mainControl, globalSettings, mapControl, tileLink, directionMapping, nextFocus, mapFileFilter);
+    public MapTilePane(final CMainControl mainControl, @NotNull final GridartaObjectsFactory<?, MapArchObject, ?, ?> gridartaObjectsFactory, @NotNull final GlobalSettings globalSettings, final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl, final FileFilter mapFileFilter) {
+        super(mainControl, gridartaObjectsFactory, globalSettings, mapControl, tileLink, directionMapping, nextFocus, mapFileFilter);
     }
 
 } // class MapTilePane

Modified: trunk/src/app/net/sf/gridarta/gui/map/AbstractMapTilePane.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/AbstractMapTilePane.java	2008-08-01 22:25:29 UTC (rev 4678)
+++ trunk/src/app/net/sf/gridarta/gui/map/AbstractMapTilePane.java	2008-08-01 22:37:10 UTC (rev 4679)
@@ -39,6 +39,7 @@
 import javax.swing.filechooser.FileFilter;
 import net.sf.gridarta.CommonConstants;
 import net.sf.gridarta.GlobalSettings;
+import net.sf.gridarta.GridartaObjectsFactory;
 import net.sf.gridarta.MainControl;
 import net.sf.gridarta.Size2D;
 import net.sf.gridarta.gui.DirectionLayout;
@@ -70,6 +71,12 @@
     private final MainControl<?, A, ?, ?> mainControl;
 
     /**
+     * The gridarta objects factory instance.
+     */
+    @NotNull
+    private final GridartaObjectsFactory<?, A, ?, ?> gridartaObjectsFactory;
+
+    /**
      * The global settings instance.
      */
     @NotNull
@@ -124,10 +131,12 @@
      * Create an AbstractMapTilePane.
      * @param mainControl MainControl to use for displaying dialogs, getting
      * paths etc..
+     * @param gridartaObjectsFactory the gridarta objects factory instance
      * @param globalSettings the global settings instance
      */
-    private AbstractMapTilePane(final MainControl<?, A, ?, ?> mainControl, @NotNull final GlobalSettings globalSettings, final int[][][] tileLink, final DirectionLayout.Direction[] directionMapping, final int[] nextFocus, final FileFilter mapFileFilter) {
+    private AbstractMapTilePane(final MainControl<?, A, ?, ?> mainControl, @NotNull final GridartaObjectsFactory<?, A, ?, ?> gridartaObjectsFactory, @NotNull final GlobalSettings globalSettings, final int[][][] tileLink, final DirectionLayout.Direction[] directionMapping, final int[] nextFocus, final FileFilter mapFileFilter) {
         this.mainControl = mainControl;
+        this.gridartaObjectsFactory = gridartaObjectsFactory;
         this.globalSettings = globalSettings;
         this.tileLink = tileLink;
         this.directionMapping = directionMapping;
@@ -141,12 +150,13 @@
      * Create an AbstractMapTilePane.
      * @param mainControl MainControl to use for displaying dialogs, getting
      * paths etc..
+     * @param gridartaObjectsFactory the gridarta objects factory instance
      * @param globalSettings the global settings instance
      * @param mapControl MapControl of the map that's tiles are to be viewed /
      * controlled
      */
-    protected AbstractMapTilePane(final MainControl<?, A, ?, ?> mainControl, @NotNull final GlobalSettings globalSettings, final MapControl<?, A, ?, ?> mapControl, final int[][][] tileLink, final DirectionLayout.Direction[] directionMapping, final int[] nextFocus, final FileFilter mapFileFilter) {
-        this(mainControl, globalSettings, tileLink, directionMapping, nextFocus, mapFileFilter);
+    protected AbstractMapTilePane(final MainControl<?, A, ?, ?> mainControl, @NotNull final GridartaObjectsFactory<?, A, ?, ?> gridartaObjectsFactory, @NotNull final GlobalSettings globalSettings, final MapControl<?, A, ?, ?> mapControl, final int[][][] tileLink, final DirectionLayout.Direction[] directionMapping, final int[] nextFocus, final FileFilter mapFileFilter) {
+        this(mainControl, gridartaObjectsFactory, globalSettings, tileLink, directionMapping, nextFocus, mapFileFilter);
         setMapControl(mapControl);
     }
 
@@ -408,7 +418,7 @@
                 try {
                     final BufferedWriter bufferedWriter = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(tileHeader.mapfile), IOUtils.MAP_ENCODING));
                     try {
-                        mainControl.getGridartaObjectsFactory().newMapArchObjectParser().save(bufferedWriter, (A) tileHeader.mapArchObject);
+                        gridartaObjectsFactory.newMapArchObjectParser().save(bufferedWriter, (A) tileHeader.mapArchObject);
                         final String tail = tileHeader.maptail.toString().trim();
                         if (tail.length() > 0) {
                             bufferedWriter.write(tail);
@@ -545,8 +555,8 @@
             final BufferedReader myInput = new BufferedReader(new InputStreamReader(new FileInputStream(file), IOUtils.MAP_ENCODING));
             try {
                 // first of all we read the map arch (if that fails we throw an exception)
-                final A mapArchObject = mainControl.getGridartaObjectsFactory().newMapArchObject(false);
-                mainControl.getGridartaObjectsFactory().newMapArchObjectParser().load(myInput, mapArchObject);
+                final A mapArchObject = gridartaObjectsFactory.newMapArchObject(false);
+                gridartaObjectsFactory.newMapArchObjectParser().load(myInput, mapArchObject);
 
                 maphead = new TileMapHeader(mapArchObject);
                 // now we store the map arches as tail


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.