Thread: [Gridarta-commit] SF.net SVN: gridarta:[5152] trunk (Page 15)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 5152
          http://gridarta.svn.sourceforge.net/gridarta/?rev=5152&view=rev
Author:   akirschbaum
Date:     2008-09-16 20:50:47 +0000 (Tue, 16 Sep 2008)

Log Message:
-----------
Remove dependency NewMapDialogFactory -> MainControl.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/CMainControl.java
    trunk/daimonin/src/daieditor/CMainControl.java
    trunk/src/app/net/sf/gridarta/AbstractMainControl.java
    trunk/src/app/net/sf/gridarta/gui/newmap/NewMapDialogFactory.java

Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================

--- trunk/crossfire/src/cfeditor/CMainControl.java	2008-09-16 20:40:44 UTC (rev 5151)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-09-16 20:50:47 UTC (rev 5152)
@@ -162,7 +162,7 @@
     @NotNull
     @Override
     protected NewMapDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> newNewMapDialogFactory(@NotNull final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager, @NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory) {
-        return new NewMapDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, mapManager, gridartaObjectsFactory, IGUIConstants.DEF_MAPSIZE, IGUIConstants.DEF_MAPSIZE, 0, false, false, IGUIConstants.DEF_PICKMAP_WIDTH, IGUIConstants.DEF_PICKMAP_HEIGHT);
+        return new NewMapDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic>(mapManager, gridartaObjectsFactory, IGUIConstants.DEF_MAPSIZE, IGUIConstants.DEF_MAPSIZE, 0, false, false, IGUIConstants.DEF_PICKMAP_WIDTH, IGUIConstants.DEF_PICKMAP_HEIGHT);
     }
 
     /** {@inheritDoc} */

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-09-16 20:40:44 UTC (rev 5151)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-09-16 20:50:47 UTC (rev 5152)
@@ -222,7 +222,7 @@
     @NotNull
     @Override
     protected NewMapDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> newNewMapDialogFactory(@NotNull final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager, @NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory) {
-        return new NewMapDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, mapManager, gridartaObjectsFactory, IGUIConstants.DEF_MAPSIZE, IGUIConstants.DEF_MAPSIZE, IGUIConstants.DEF_MAPDIFFICULTY, true, true, IGUIConstants.DEF_PICKMAP_WIDTH, IGUIConstants.DEF_PICKMAP_HEIGHT);
+        return new NewMapDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic>(mapManager, gridartaObjectsFactory, IGUIConstants.DEF_MAPSIZE, IGUIConstants.DEF_MAPSIZE, IGUIConstants.DEF_MAPDIFFICULTY, true, true, IGUIConstants.DEF_PICKMAP_WIDTH, IGUIConstants.DEF_PICKMAP_HEIGHT);
     }
 
     /** {@inheritDoc} */

Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-09-16 20:40:44 UTC (rev 5151)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-09-16 20:50:47 UTC (rev 5152)
@@ -313,6 +313,7 @@
         final ActionFactory actionFactory = ActionFactory.getFactory(key);
         new MapFileActions<G, A, R, V>(this, mapManager, mapViewManager, null);
         mainView = new MainView<G, A, R, V>(this, editTypes, mapManager, mapViewManager, actionFactory, mapManagerActions.getCloseAllAction(), statusBar, getBuildNumberAsString());
+        newMapDialogFactory.setParent(mainView);
         pickmapChooserControl.setParent(mainView);
         final GameObjectAttributesDialogFactory<G, A, R, V> gameObjectAttributesDialogFactory = new GameObjectAttributesDialogFactory<G, A, R, V>(archetypeTypeSet, archetypeSet, mapManager, mainView);
         final ArchetypeChooserControl<G, A, R, V> archetypeChooserControl = new ArchetypeChooserControl<G, A, R, V>(archetypeChooserModel, createDirectionPane, gameObjectAttributesDialogFactory);

Modified: trunk/src/app/net/sf/gridarta/gui/newmap/NewMapDialogFactory.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/newmap/NewMapDialogFactory.java	2008-09-16 20:40:44 UTC (rev 5151)
+++ trunk/src/app/net/sf/gridarta/gui/newmap/NewMapDialogFactory.java	2008-09-16 20:50:47 UTC (rev 5152)
@@ -19,8 +19,8 @@
 
 package net.sf.gridarta.gui.newmap;
 
+import java.awt.Component;
 import net.sf.gridarta.GridartaObjectsFactory;
-import net.sf.gridarta.MainControl;
 import net.sf.gridarta.MapManager;
 import net.sf.gridarta.gameobject.Archetype;
 import net.sf.gridarta.gameobject.GameObject;
@@ -40,10 +40,6 @@
  */
 public final class NewMapDialogFactory<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R, V>> {
 
-    /** The main control instance. */
-    @NotNull
-    private final MainControl<G, A, R, V> mainControl;
-
     /**
      * The map manager to use.
      */
@@ -85,9 +81,12 @@
     @NotNull
     private ObjectChooser<G, A, R> objectChooser;
 
+    /** The parent component for dialog windows. */
+    @NotNull
+    private Component parent;
+
     /**
      * Creates a new instance.
-     * @param mainControl the main control instance
      * @param mapManager the map manager to use
      * @param gridartaObjectsFactory the gridarta objects factory instance
      * @param defaultMapWidth the default width for new maps
@@ -98,8 +97,7 @@
      * @param defaultPickmapWidth the default width for new pickmaps
      * @param defaultPickmapHeight the default height for new pickmaps
      */
-    public NewMapDialogFactory(@NotNull final MainControl<G, A, R, V> mainControl, @NotNull final MapManager<G, A, R, V> mapManager, @NotNull final GridartaObjectsFactory<G, A, R, V> gridartaObjectsFactory, final int defaultMapWidth, final int defaultMapHeight, final int defaultMapDifficulty, final boolean showMapDifficulty, final boolean showMapSizeDefault, final int defaultPickmapWidth, final int defaultPickmapHeight) {
-        this.mainControl = mainControl;
+    public NewMapDialogFactory(@NotNull final MapManager<G, A, R, V> mapManager, @NotNull final GridartaObjectsFactory<G, A, R, V> gridartaObjectsFactory, final int defaultMapWidth, final int defaultMapHeight, final int defaultMapDifficulty, final boolean showMapDifficulty, final boolean showMapSizeDefault, final int defaultPickmapWidth, final int defaultPickmapHeight) {
         this.mapManager = mapManager;
         this.gridartaObjectsFactory = gridartaObjectsFactory;
         this.defaultMapWidth = defaultMapWidth;
@@ -111,6 +109,14 @@
         this.defaultPickmapHeight = defaultPickmapHeight;
     }
 
+    /**
+     * Sets the parent component for dialog windows.
+     * @param parent the parent component
+     */
+    public void setParent(@NotNull final Component parent) {
+        this.parent = parent;
+    }
+
     public void setPickmapChooserControl(@NotNull final PickmapChooserControl<G, A, R, V> pickmapChooserControl) {
         this.pickmapChooserControl = pickmapChooserControl;
     }
@@ -125,12 +131,12 @@
      * unknown
      */
     public void showNewMapDialog(final String filename) {
-        new NewMapDialog<G, A, R, V>(mapManager, gridartaObjectsFactory, mainControl.getMainView(), filename, showMapSizeDefault, showMapDifficulty, defaultMapWidth, defaultMapHeight, defaultMapDifficulty);
+        new NewMapDialog<G, A, R, V>(mapManager, gridartaObjectsFactory, parent, filename, showMapSizeDefault, showMapDifficulty, defaultMapWidth, defaultMapHeight, defaultMapDifficulty);
     }
 
     /** Shows a dialog for creating a new pickmap. */
     public void showNewPickmapDialog() {
-        new NewPickmapDialog<G, A, R, V>(objectChooser, mainControl.getMainView(), defaultPickmapWidth, defaultPickmapHeight, pickmapChooserControl);
+        new NewPickmapDialog<G, A, R, V>(objectChooser, parent, defaultPickmapWidth, defaultPickmapHeight, pickmapChooserControl);
     }
 
     /**
@@ -139,7 +145,7 @@
      * @param parent the parent folder to add the pickmap folder to
      */
     public void showNewPickmapFolderDialog(@NotNull final MapFolderTree<G, A, R, V> mapFolderTree, @Nullable final MapFolder<G, A, R, V> parent) {
-        new NewPickmapFolderDialog<G, A, R, V>(mainControl.getMainView(), mapFolderTree, parent);
+        new NewPickmapFolderDialog<G, A, R, V>(this.parent, mapFolderTree, parent);
     }
 
 } // class NewMapDialogFactory


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




Thread: [Gridarta-commit] SF.net SVN: gridarta:[5152] trunk (Page 15)

gridarta-commit