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

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

Revision: 4919
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4919&view=rev
Author:   akirschbaum
Date:     2008-08-20 19:59:20 +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:57:38 UTC (rev 4918)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-20 19:59:20 UTC (rev 4919)
@@ -81,7 +81,6 @@
 import net.sf.gridarta.gui.StatusBar;
 import net.sf.gridarta.gui.SystemIcons;
 import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserControl;
-import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserModel;
 import net.sf.gridarta.gui.connectionview.LockedItemsControl;
 import net.sf.gridarta.gui.gameobjectattributesdialog.GameObjectAttributesDialogFactory;
 import net.sf.gridarta.gui.gameobjectattributespanel.GameObjectAttributesModel;
@@ -207,7 +206,6 @@
      */
     public CMainControl() {
         super(new CrossfireObjectsFactory(), new DefaultRendererFactory(), "cfeditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory());
-        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);
         newMapDialogFactory.setPickmapChooserControl(pickmapChooserControl);

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-08-20 19:57:38 UTC (rev 4918)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-08-20 19:59:20 UTC (rev 4919)
@@ -88,7 +88,6 @@
 import net.sf.gridarta.gui.StatusBar;
 import net.sf.gridarta.gui.SystemIcons;
 import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserControl;
-import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserModel;
 import net.sf.gridarta.gui.connectionview.LockedItemsControl;
 import net.sf.gridarta.gui.gameobjectattributesdialog.GameObjectAttributesDialogFactory;
 import net.sf.gridarta.gui.gameobjectattributespanel.GameObjectAttributesModel;
@@ -261,7 +260,6 @@
      */
     public CMainControl() {
         super(new DaimoninObjectsFactory(), new DefaultRendererFactory(), "daieditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory());
-        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);
         newMapDialogFactory.setPickmapChooserControl(pickmapChooserControl);

Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-20 19:57:38 UTC (rev 4918)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-20 19:59:20 UTC (rev 4919)
@@ -41,6 +41,7 @@
 import net.sf.gridarta.gui.MapManagerActions;
 import net.sf.gridarta.gui.MapPreview;
 import net.sf.gridarta.gui.StatusBar;
+import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserModel;
 import net.sf.gridarta.gui.map.MapPreviewAccessory;
 import net.sf.gridarta.gui.map.MapView;
 import net.sf.gridarta.gui.map.MapViewBasic;
@@ -151,6 +152,8 @@
 
     protected final MapManagerActions<G, A, R, V> mapManagerActions;
 
+    protected final ArchetypeChooserModel<G, A, R, V> archetypeChooserModel;
+
     /**
      * Creates a new instance.
      * @param gridartaObjectsFactory the gridarta objects factory
@@ -181,6 +184,7 @@
         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);
+        archetypeChooserModel = new ArchetypeChooserModel<G, A, R, V>(archetypeSet);
     }
 
     /**


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