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

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

Revision: 4931
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4931&view=rev
Author:   akirschbaum
Date:     2008-08-20 20:32:48 +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:30:07 UTC (rev 4930)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-20 20:32:48 UTC (rev 4931)
@@ -75,7 +75,6 @@
 import net.sf.gridarta.gui.MainView;
 import net.sf.gridarta.gui.MapFileFilter;
 import net.sf.gridarta.gui.RecentManager;
-import net.sf.gridarta.gui.ReplaceDialogManager;
 import net.sf.gridarta.gui.SystemIcons;
 import net.sf.gridarta.gui.connectionview.LockedItemsControl;
 import net.sf.gridarta.gui.gameobjectattributespanel.GameObjectAttributesModel;
@@ -188,7 +187,6 @@
      */
     public CMainControl() {
         super(new CrossfireObjectsFactory(), new DefaultRendererFactory(), "cfeditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory(), false, CResourceLoader.getHomeFile("thumbnails"));
-        final ReplaceDialogManager<GameObject, MapArchObject, Archetype, CMapViewBasic> replaceDialogManager = new ReplaceDialogManager<GameObject, MapArchObject, Archetype, CMapViewBasic>(mainView, archetypeSet, copyBuffer);
         objectChooser = new DefaultObjectChooser<GameObject, MapArchObject, Archetype>(archetypeChooserControl, pickmapChooserControl);
         final SelectedSquareControl<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareControl = new SelectedSquareControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(ACTION_FACTORY, gameObjectAttributesDialogFactory, objectChooser, mapManager, mapViewManager, editTypes, mapTileListBottom, null, archetypeSet);
         final SelectedSquareView<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareView = selectedSquareControl.getSelectedSquareView();

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-08-20 20:30:07 UTC (rev 4930)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-08-20 20:32:48 UTC (rev 4931)
@@ -82,7 +82,6 @@
 import net.sf.gridarta.gui.MainView;
 import net.sf.gridarta.gui.MapFileFilter;
 import net.sf.gridarta.gui.RecentManager;
-import net.sf.gridarta.gui.ReplaceDialogManager;
 import net.sf.gridarta.gui.SystemIcons;
 import net.sf.gridarta.gui.connectionview.LockedItemsControl;
 import net.sf.gridarta.gui.gameobjectattributespanel.GameObjectAttributesModel;
@@ -248,7 +247,6 @@
      */
     public CMainControl() {
         super(new DaimoninObjectsFactory(), new DefaultRendererFactory(), "daieditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory(), true, null);
-        final ReplaceDialogManager<GameObject, MapArchObject, Archetype, CMapViewBasic> replaceDialogManager = new ReplaceDialogManager<GameObject, MapArchObject, Archetype, CMapViewBasic>(mainView, archetypeSet, copyBuffer);
         objectChooser = new DefaultObjectChooser<GameObject, MapArchObject, Archetype>(archetypeChooserControl, pickmapChooserControl);
         final SelectedSquareControl<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareControl = new SelectedSquareControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(ACTION_FACTORY, gameObjectAttributesDialogFactory, objectChooser, mapManager, mapViewManager, editTypes, mapTileListBottom, GUIUtils.getSysIcon(IGUIConstants.TILE_NORTH), archetypeSet);
         final SelectedSquareView<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareView = selectedSquareControl.getSelectedSquareView();

Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-20 20:30:07 UTC (rev 4930)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-20 20:32:48 UTC (rev 4931)
@@ -42,6 +42,7 @@
 import net.sf.gridarta.gui.MapManagerActions;
 import net.sf.gridarta.gui.MapPreview;
 import net.sf.gridarta.gui.MapViewManager;
+import net.sf.gridarta.gui.ReplaceDialogManager;
 import net.sf.gridarta.gui.StatusBar;
 import net.sf.gridarta.gui.SystemIcons;
 import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserControl;
@@ -182,6 +183,9 @@
     @NotNull
     protected final MainView<G, A, R, V> mainView;
 
+    @NotNull
+    protected final ReplaceDialogManager<G, A, R, V> replaceDialogManager;
+
     /**
      * Creates a new instance.
      * @param gridartaObjectsFactory the gridarta objects factory
@@ -226,6 +230,7 @@
         SystemIcons.init();
         createMapImageCache(mapImageCacheDir, SystemIcons.getDefaultIcon(), SystemIcons.getDefaultPreview(), new StatusBar<G, A, R, V>(mapManager, mapViewManager, archetypeSet, faceObjects));
         mainView = new MainView<G, A, R, V>(this, editTypes, mapManager, mapViewManager, ACTION_FACTORY, mapManagerActions.getCloseAllAction(), statusBar);
+        replaceDialogManager = new ReplaceDialogManager<G, A, R, V>(mainView, archetypeSet, copyBuffer);
     }
 
     /**


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