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

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

Revision: 4925
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4925&view=rev
Author:   akirschbaum
Date:     2008-08-20 20:15:53 +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:14:00 UTC (rev 4924)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-20 20:15:53 UTC (rev 4925)
@@ -80,7 +80,6 @@
 import net.sf.gridarta.gui.StatusBar;
 import net.sf.gridarta.gui.SystemIcons;
 import net.sf.gridarta.gui.connectionview.LockedItemsControl;
-import net.sf.gridarta.gui.gameobjectattributesdialog.GameObjectAttributesDialogFactory;
 import net.sf.gridarta.gui.gameobjectattributespanel.GameObjectAttributesModel;
 import net.sf.gridarta.gui.map.MapCursorControl;
 import net.sf.gridarta.gui.map.MapView;
@@ -200,7 +199,6 @@
      */
     public CMainControl() {
         super(new CrossfireObjectsFactory(), new DefaultRendererFactory(), "cfeditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory());
-        final GameObjectAttributesDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gameObjectAttributesDialogFactory = new GameObjectAttributesDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic>(archetypeTypeSet, archetypeSet, mapManager);
         archetypeChooserControl.init(false, gameObjectAttributesDialogFactory);
         mapViewManager = new MapViewManager<GameObject, MapArchObject, Archetype, CMapViewBasic>();
         SystemIcons.init();

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-08-20 20:14:00 UTC (rev 4924)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-08-20 20:15:53 UTC (rev 4925)
@@ -87,7 +87,6 @@
 import net.sf.gridarta.gui.StatusBar;
 import net.sf.gridarta.gui.SystemIcons;
 import net.sf.gridarta.gui.connectionview.LockedItemsControl;
-import net.sf.gridarta.gui.gameobjectattributesdialog.GameObjectAttributesDialogFactory;
 import net.sf.gridarta.gui.gameobjectattributespanel.GameObjectAttributesModel;
 import net.sf.gridarta.gui.map.MapCursorControl;
 import net.sf.gridarta.gui.map.MapView;
@@ -254,7 +253,6 @@
      */
     public CMainControl() {
         super(new DaimoninObjectsFactory(), new DefaultRendererFactory(), "daieditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory());
-        final GameObjectAttributesDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gameObjectAttributesDialogFactory = new GameObjectAttributesDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic>(archetypeTypeSet, archetypeSet, mapManager);
         archetypeChooserControl.init(true, gameObjectAttributesDialogFactory);
         final MapViewManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapViewManager = new MapViewManager<GameObject, MapArchObject, Archetype, CMapViewBasic>();
         SystemIcons.init();

Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-20 20:14:00 UTC (rev 4924)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-20 20:15:53 UTC (rev 4925)
@@ -44,6 +44,7 @@
 import net.sf.gridarta.gui.StatusBar;
 import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserControl;
 import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserModel;
+import net.sf.gridarta.gui.gameobjectattributesdialog.GameObjectAttributesDialogFactory;
 import net.sf.gridarta.gui.map.MapPreviewAccessory;
 import net.sf.gridarta.gui.map.MapView;
 import net.sf.gridarta.gui.map.MapViewBasic;
@@ -166,6 +167,9 @@
     @NotNull
     protected final ArchetypeTypeSet<G, A, R> archetypeTypeSet;
 
+    @NotNull
+    protected final GameObjectAttributesDialogFactory<G, A, R, V> gameObjectAttributesDialogFactory;
+
     /**
      * Creates a new instance.
      * @param gridartaObjectsFactory the gridarta objects factory
@@ -201,6 +205,7 @@
         pickmapChooserControl = new PickmapChooserControl<G, A, R, V>(newMapDialogFactory, this, gridartaObjectsFactory, mapControlFactory, globalSettings.getPickmapDir(), mapManager);
         newMapDialogFactory.setPickmapChooserControl(pickmapChooserControl);
         archetypeTypeSet = new ArchetypeTypeSet<G, A, R>();
+        gameObjectAttributesDialogFactory = new GameObjectAttributesDialogFactory<G, A, R, V>(archetypeTypeSet, archetypeSet, mapManager);
     }
 
     /**


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