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

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

Revision: 4922
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4922&view=rev
Author:   akirschbaum
Date:     2008-08-20 20:10:25 +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:07:13 UTC (rev 4921)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-20 20:10:25 UTC (rev 4922)
@@ -91,7 +91,6 @@
 import net.sf.gridarta.gui.objectchoicedisplay.ObjectChoiceDisplay;
 import net.sf.gridarta.gui.objectchooser.DefaultObjectChooser;
 import net.sf.gridarta.gui.objectchooser.ObjectChooser;
-import net.sf.gridarta.gui.pickmapchooser.PickmapChooserControl;
 import net.sf.gridarta.gui.prefs.MapValidatorPrefs;
 import net.sf.gridarta.gui.prefs.MiscPrefs;
 import net.sf.gridarta.gui.prefs.UpdatePrefs;
@@ -157,9 +156,6 @@
     /** The object chooser. */
     private final DefaultObjectChooser<GameObject, MapArchObject, Archetype> objectChooser;
 
-    /** The pickmap chooser control. */
-    private final PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> pickmapChooserControl;
-
     /** The main view. */
     private final MainView<GameObject, MapArchObject, Archetype, CMapViewBasic> mainView;
 
@@ -205,7 +201,6 @@
      */
     public CMainControl() {
         super(new CrossfireObjectsFactory(), new DefaultRendererFactory(), "cfeditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory());
-        pickmapChooserControl = new PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(newMapDialogFactory, this, gridartaObjectsFactory, mapControlFactory, globalSettings.getPickmapDir(), mapManager);
         newMapDialogFactory.setPickmapChooserControl(pickmapChooserControl);
         final ArchetypeTypeSet<GameObject, MapArchObject, Archetype> archetypeTypeSet = new ArchetypeTypeSet<GameObject, MapArchObject, Archetype>();
         final GameObjectAttributesDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gameObjectAttributesDialogFactory = new GameObjectAttributesDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic>(archetypeTypeSet, archetypeSet, mapManager);

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-08-20 20:07:13 UTC (rev 4921)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-08-20 20:10:25 UTC (rev 4922)
@@ -98,7 +98,6 @@
 import net.sf.gridarta.gui.objectchoicedisplay.ObjectChoiceDisplay;
 import net.sf.gridarta.gui.objectchooser.DefaultObjectChooser;
 import net.sf.gridarta.gui.objectchooser.ObjectChooser;
-import net.sf.gridarta.gui.pickmapchooser.PickmapChooserControl;
 import net.sf.gridarta.gui.prefs.MapValidatorPrefs;
 import net.sf.gridarta.gui.prefs.MiscPrefs;
 import net.sf.gridarta.gui.prefs.UpdatePrefs;
@@ -196,9 +195,6 @@
     /** The object chooser. */
     private final DefaultObjectChooser<GameObject, MapArchObject, Archetype> objectChooser;
 
-    /** The pickmap chooser control. */
-    private final PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> pickmapChooserControl;
-
     /** The main view. */
     private final MainView<GameObject, MapArchObject, Archetype, CMapViewBasic> mainView;
 
@@ -259,7 +255,6 @@
      */
     public CMainControl() {
         super(new DaimoninObjectsFactory(), new DefaultRendererFactory(), "daieditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory());
-        pickmapChooserControl = new PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(newMapDialogFactory, this, gridartaObjectsFactory, mapControlFactory, globalSettings.getPickmapDir(), mapManager);
         newMapDialogFactory.setPickmapChooserControl(pickmapChooserControl);
         final ArchetypeTypeSet<GameObject, MapArchObject, Archetype> archetypeTypeSet = new ArchetypeTypeSet<GameObject, MapArchObject, Archetype>();
         final GameObjectAttributesDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gameObjectAttributesDialogFactory = new GameObjectAttributesDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic>(archetypeTypeSet, archetypeSet, mapManager);

Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-20 20:07:13 UTC (rev 4921)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-20 20:10:25 UTC (rev 4922)
@@ -48,6 +48,7 @@
 import net.sf.gridarta.gui.map.MapViewBasic;
 import net.sf.gridarta.gui.map.RendererFactory;
 import net.sf.gridarta.gui.newmap.NewMapDialogFactory;
+import net.sf.gridarta.gui.pickmapchooser.PickmapChooserControl;
 import net.sf.gridarta.help.Help;
 import net.sf.gridarta.io.PathManager;
 import net.sf.gridarta.map.MapArchObject;
@@ -157,6 +158,10 @@
 
     protected final ArchetypeChooserControl<G, A, R, V> archetypeChooserControl;
 
+    /** The pickmap chooser control. */
+    @NotNull
+    protected final PickmapChooserControl<G, A, R, V> pickmapChooserControl;
+
     /**
      * Creates a new instance.
      * @param gridartaObjectsFactory the gridarta objects factory
@@ -189,6 +194,7 @@
         mapManagerActions = new MapManagerActions<G, A, R, V>(mapManager);
         archetypeChooserModel = new ArchetypeChooserModel<G, A, R, V>(archetypeSet);
         archetypeChooserControl = new ArchetypeChooserControl<G, A, R, V>(archetypeChooserModel);
+        pickmapChooserControl = new PickmapChooserControl<G, A, R, V>(newMapDialogFactory, this, gridartaObjectsFactory, mapControlFactory, globalSettings.getPickmapDir(), mapManager);
     }
 
     /**


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