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

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

Revision: 4927
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4927&view=rev
Author:   akirschbaum
Date:     2008-08-20 20:21:35 +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 20:18:58 UTC (rev 4926)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-20 20:21:35 UTC (rev 4927)
@@ -74,7 +74,6 @@
 import net.sf.gridarta.gui.MainActions;
 import net.sf.gridarta.gui.MainView;
 import net.sf.gridarta.gui.MapFileFilter;
-import net.sf.gridarta.gui.MapViewManager;
 import net.sf.gridarta.gui.RecentManager;
 import net.sf.gridarta.gui.ReplaceDialogManager;
 import net.sf.gridarta.gui.StatusBar;
@@ -182,12 +181,6 @@
     private final GameObjectAttributesControl gameObjectAttributesControl;
 
     /**
-     * The map view manager instance.
-     */
-    @NotNull
-    private final MapViewManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapViewManager;
-
-    /**
      * The file control instance.
      */
     @NotNull
@@ -199,7 +192,6 @@
      */
     public CMainControl() {
         super(new CrossfireObjectsFactory(), new DefaultRendererFactory(), "cfeditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory(), false);
-        mapViewManager = new MapViewManager<GameObject, MapArchObject, Archetype, CMapViewBasic>();
         SystemIcons.init();
         createMapImageCache(CResourceLoader.getHomeFile("thumbnails"), SystemIcons.getDefaultIcon(), SystemIcons.getDefaultPreview(), new StatusBar<GameObject, MapArchObject, Archetype, CMapViewBasic>(mapManager, mapViewManager, archetypeSet, faceObjects));
         mainView = new MainView<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, editTypes, mapManager, mapViewManager, ACTION_FACTORY, mapManagerActions.getCloseAllAction(), statusBar);

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-08-20 20:18:58 UTC (rev 4926)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-08-20 20:21:35 UTC (rev 4927)
@@ -81,7 +81,6 @@
 import net.sf.gridarta.gui.MainActions;
 import net.sf.gridarta.gui.MainView;
 import net.sf.gridarta.gui.MapFileFilter;
-import net.sf.gridarta.gui.MapViewManager;
 import net.sf.gridarta.gui.RecentManager;
 import net.sf.gridarta.gui.ReplaceDialogManager;
 import net.sf.gridarta.gui.StatusBar;
@@ -253,7 +252,6 @@
      */
     public CMainControl() {
         super(new DaimoninObjectsFactory(), new DefaultRendererFactory(), "daieditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory(), true);
-        final MapViewManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapViewManager = new MapViewManager<GameObject, MapArchObject, Archetype, CMapViewBasic>();
         SystemIcons.init();
         createMapImageCache(null, SystemIcons.getDefaultIcon(), SystemIcons.getDefaultPreview(), new StatusBar<GameObject, MapArchObject, Archetype, CMapViewBasic>(mapManager, mapViewManager, archetypeSet, faceObjects));
         mainView = new MainView<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, editTypes, mapManager, mapViewManager, ACTION_FACTORY, mapManagerActions.getCloseAllAction(), statusBar);

Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-20 20:18:58 UTC (rev 4926)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-20 20:21:35 UTC (rev 4927)
@@ -41,6 +41,7 @@
 import net.sf.gridarta.gui.MainView;
 import net.sf.gridarta.gui.MapManagerActions;
 import net.sf.gridarta.gui.MapPreview;
+import net.sf.gridarta.gui.MapViewManager;
 import net.sf.gridarta.gui.StatusBar;
 import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserControl;
 import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserModel;
@@ -171,6 +172,12 @@
     protected final GameObjectAttributesDialogFactory<G, A, R, V> gameObjectAttributesDialogFactory;
 
     /**
+     * The map view manager instance.
+     */
+    @NotNull
+    protected final MapViewManager<G, A, R, V> mapViewManager;
+
+    /**
      * Creates a new instance.
      * @param gridartaObjectsFactory the gridarta objects factory
      * @param rendererFactory the renderer factory
@@ -208,6 +215,7 @@
         archetypeTypeSet = new ArchetypeTypeSet<G, A, R>();
         gameObjectAttributesDialogFactory = new GameObjectAttributesDialogFactory<G, A, R, V>(archetypeTypeSet, archetypeSet, mapManager);
         archetypeChooserControl.init(createDirectionPane, gameObjectAttributesDialogFactory);
+        mapViewManager = new MapViewManager<G, A, R, V>();
     }
 
     /**


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