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

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

Revision: 4918
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4918&view=rev
Author:   akirschbaum
Date:     2008-08-20 19:57:38 +0000 (Wed, 20 Aug 2008)

Log Message:
-----------
Move code to common code base.

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

Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-20 19:55:50 UTC (rev 4917)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-20 19:57:38 UTC (rev 4918)
@@ -75,7 +75,6 @@
 import net.sf.gridarta.gui.MainActions;
 import net.sf.gridarta.gui.MainView;
 import net.sf.gridarta.gui.MapFileFilter;
-import net.sf.gridarta.gui.MapManagerActions;
 import net.sf.gridarta.gui.MapViewManager;
 import net.sf.gridarta.gui.RecentManager;
 import net.sf.gridarta.gui.ReplaceDialogManager;
@@ -208,7 +207,6 @@
      */
     public CMainControl() {
         super(new CrossfireObjectsFactory(), new DefaultRendererFactory(), "cfeditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory());
-        final MapManagerActions<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManagerActions = new MapManagerActions<GameObject, MapArchObject, Archetype, CMapViewBasic>(mapManager);
         final ArchetypeChooserModel<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserModel = new ArchetypeChooserModel<GameObject, MapArchObject, Archetype, CMapViewBasic>(archetypeSet);
         final ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserControl = new ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(archetypeChooserModel);
         pickmapChooserControl = new PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(newMapDialogFactory, this, gridartaObjectsFactory, mapControlFactory, new File(globalSettings.getMapDir(), IGUIConstants.PICKMAP_DIR), mapManager);

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-08-20 19:55:50 UTC (rev 4917)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-08-20 19:57:38 UTC (rev 4918)
@@ -82,7 +82,6 @@
 import net.sf.gridarta.gui.MainActions;
 import net.sf.gridarta.gui.MainView;
 import net.sf.gridarta.gui.MapFileFilter;
-import net.sf.gridarta.gui.MapManagerActions;
 import net.sf.gridarta.gui.MapViewManager;
 import net.sf.gridarta.gui.RecentManager;
 import net.sf.gridarta.gui.ReplaceDialogManager;
@@ -262,7 +261,6 @@
      */
     public CMainControl() {
         super(new DaimoninObjectsFactory(), new DefaultRendererFactory(), "daieditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory());
-        final MapManagerActions<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManagerActions = new MapManagerActions<GameObject, MapArchObject, Archetype, CMapViewBasic>(mapManager);
         final ArchetypeChooserModel<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserModel = new ArchetypeChooserModel<GameObject, MapArchObject, Archetype, CMapViewBasic>(archetypeSet);
         final ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserControl = new ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(archetypeChooserModel);
         pickmapChooserControl = new PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(newMapDialogFactory, this, gridartaObjectsFactory, mapControlFactory, new File(globalSettings.getArchDefaultFolder(), IGUIConstants.PICKMAP_DIR), mapManager);

Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-20 19:55:50 UTC (rev 4917)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-20 19:57:38 UTC (rev 4918)
@@ -38,6 +38,7 @@
 import net.sf.gridarta.gameobject.scripts.ScriptedEventEditor;
 import net.sf.gridarta.gui.HideFileFilterProxy;
 import net.sf.gridarta.gui.MainView;
+import net.sf.gridarta.gui.MapManagerActions;
 import net.sf.gridarta.gui.MapPreview;
 import net.sf.gridarta.gui.StatusBar;
 import net.sf.gridarta.gui.map.MapPreviewAccessory;
@@ -148,6 +149,8 @@
 
     protected final boolean mapTileListBottom;
 
+    protected final MapManagerActions<G, A, R, V> mapManagerActions;
+
     /**
      * Creates a new instance.
      * @param gridartaObjectsFactory the gridarta objects factory
@@ -177,6 +180,7 @@
         PathManager.setGlobalSettings(globalSettings);
         newMapDialogFactory = newNewMapDialogFactory(mapManager, gridartaObjectsFactory);
         mapTileListBottom = prefs.getBoolean(MainView.MAP_TILE_LIST_BOTTOM_KEY, MainView.MAP_TILE_LIST_BOTTOM_DEFAULT);
+        mapManagerActions = new MapManagerActions<G, A, R, V>(mapManager);
     }
 
     /**


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