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

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

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

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

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/CMainControl.java
    trunk/daimonin/src/daieditor/CMainControl.java
    trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserControl.java

Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-01 22:43:48 UTC (rev 4681)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-01 22:46:48 UTC (rev 4682)
@@ -240,7 +240,7 @@
         PathManager.setGlobalSettings(globalSettings);
         final ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserControl = new ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, archetypeSet, false);
         newMapDialogFactory = new NewMapDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, gridartaObjectsFactory, IGUIConstants.DEF_MAPSIZE, IGUIConstants.DEF_MAPSIZE, 0, false, false, IGUIConstants.DEF_PICKMAP_WIDTH, IGUIConstants.DEF_PICKMAP_HEIGHT);
-        pickmapChooserControl = new PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(newMapDialogFactory, this, new File(globalSettings.getMapDir(), IGUIConstants.PICKMAP_DIR), mapManager);
+        pickmapChooserControl = new PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(newMapDialogFactory, this, gridartaObjectsFactory, new File(globalSettings.getMapDir(), IGUIConstants.PICKMAP_DIR), mapManager);
         newMapDialogFactory.setPickmapChooserControl(pickmapChooserControl);
         archetypeTypeSet = new ArchetypeTypeSet<GameObject, MapArchObject, Archetype>();
         objectChooser = new DefaultObjectChooser<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, archetypeSet, archetypeTypeSet, editTypes, selectedSquareView, archetypeChooserControl, pickmapChooserControl, getCopyBuffer());

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-08-01 22:43:48 UTC (rev 4681)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-08-01 22:46:48 UTC (rev 4682)
@@ -298,7 +298,7 @@
         PathManager.setGlobalSettings(globalSettings);
         final ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserControl = new ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, archetypeSet, true);
         newMapDialogFactory = new NewMapDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, gridartaObjectsFactory, IGUIConstants.DEF_MAPSIZE, IGUIConstants.DEF_MAPSIZE, IGUIConstants.DEF_MAPDIFFICULTY, true, true, IGUIConstants.DEF_PICKMAP_WIDTH, IGUIConstants.DEF_PICKMAP_HEIGHT);
-        pickmapChooserControl = new PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(newMapDialogFactory, this, new File(globalSettings.getArchDefaultFolder(), IGUIConstants.PICKMAP_DIR), mapManager);
+        pickmapChooserControl = new PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(newMapDialogFactory, this, gridartaObjectsFactory, new File(globalSettings.getArchDefaultFolder(), IGUIConstants.PICKMAP_DIR), mapManager);
         newMapDialogFactory.setPickmapChooserControl(pickmapChooserControl);
         archetypeTypeSet = new ArchetypeTypeSet<GameObject, MapArchObject, Archetype>();
         objectChooser = new DefaultObjectChooser<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, archetypeSet, archetypeTypeSet, editTypes, selectedSquareView, archetypeChooserControl, pickmapChooserControl, getCopyBuffer());

Modified: trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserControl.java	2008-08-01 22:43:48 UTC (rev 4681)
+++ trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserControl.java	2008-08-01 22:46:48 UTC (rev 4682)
@@ -29,6 +29,7 @@
 import javax.swing.JMenu;
 import javax.swing.JOptionPane;
 import javax.swing.JTabbedPane;
+import net.sf.gridarta.GridartaObjectsFactory;
 import net.sf.gridarta.MainControl;
 import net.sf.gridarta.MapManager;
 import net.sf.gridarta.MapManagerListener;
@@ -67,6 +68,12 @@
     @NotNull
     private final MainControl<G, A, R, V> mainControl;
 
+    /**
+     * The gridarta objects factory instance.
+     */
+    @NotNull
+    private final GridartaObjectsFactory<G, A, R, V> gridartaObjectsFactory;
+
     /** The view for this control. */
     @NotNull
     private final PickmapChooserView<G, A, R, V> view;
@@ -163,11 +170,13 @@
      * Create a PickmapChooserControl.
      * @param newMapDialogFactory the factory for creating new pickmaps
      * @param mainControl the main control
+     * @param gridartaObjectsFactory the gridarta objects factory instance
      * @param pickmapDir the pickmaps directory
      * @param mapManager the map manager instance
      */
-    public PickmapChooserControl(@NotNull final NewMapDialogFactory<G, A, R, V> newMapDialogFactory, @NotNull final MainControl<G, A, R, V> mainControl, @NotNull final File pickmapDir, @NotNull final MapManager<G, A, R, V> mapManager) {
+    public PickmapChooserControl(@NotNull final NewMapDialogFactory<G, A, R, V> newMapDialogFactory, @NotNull final MainControl<G, A, R, V> mainControl, @NotNull final GridartaObjectsFactory<G, A, R, V> gridartaObjectsFactory, @NotNull final File pickmapDir, @NotNull final MapManager<G, A, R, V> mapManager) {
         this.mainControl = mainControl;
+        this.gridartaObjectsFactory = gridartaObjectsFactory;
         model = new Model<G, A, R, V>(pickmapDir);
         currentPickmapActions = new CurrentPickmapActions<G, A, R, V>(newMapDialogFactory, this);
         folderListActions = new FolderListActions<G, A, R, V>(model, newMapDialogFactory);
@@ -199,7 +208,7 @@
      * Load all pickmaps and build the pickmap-panel.
      */
     public void loadPickmaps() {
-        new Loader<G, A, R, V>(model, mainControl.getGridartaObjectsFactory(), mainControl.getMainView()).load();
+        new Loader<G, A, R, V>(model, gridartaObjectsFactory, mainControl.getMainView()).load();
     }
 
     /**
@@ -240,7 +249,7 @@
             }
         }
 
-        final MapControl<G, A, R, V> mapControl = mainControl.getGridartaObjectsFactory().newPickmapControl(null, mapArchObject, mainControl.getMainView());
+        final MapControl<G, A, R, V> mapControl = gridartaObjectsFactory.newPickmapControl(null, mapArchObject, mainControl.getMainView());
         mapControl.setMapFile(mapFile);
         mapControl.setMapFileName(mapFile.getPath());
         mapControl.resetModified();
@@ -248,7 +257,7 @@
 
         final Pickmap<G, A, R, V> pickmap;
         try {
-            pickmap = activeFolder.addPickmap(pickmapName, mainControl.getGridartaObjectsFactory(), mainControl.getMainView());
+            pickmap = activeFolder.addPickmap(pickmapName, gridartaObjectsFactory, mainControl.getMainView());
         } catch (final InvalidNameException ex) {
             throw new AssertionError(); // the name has been checked before
         }


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