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

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

Revision: 4923
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4923&view=rev
Author:   akirschbaum
Date:     2008-08-20 20:12:00 +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:10:25 UTC (rev 4922)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-20 20:12:00 UTC (rev 4923)
@@ -201,7 +201,6 @@
      */
     public CMainControl() {
         super(new CrossfireObjectsFactory(), new DefaultRendererFactory(), "cfeditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory());
-        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);
         archetypeChooserControl.init(false, gameObjectAttributesDialogFactory);

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-08-20 20:10:25 UTC (rev 4922)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-08-20 20:12:00 UTC (rev 4923)
@@ -255,7 +255,6 @@
      */
     public CMainControl() {
         super(new DaimoninObjectsFactory(), new DefaultRendererFactory(), "daieditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory());
-        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);
         archetypeChooserControl.init(true, gameObjectAttributesDialogFactory);

Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-20 20:10:25 UTC (rev 4922)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-20 20:12:00 UTC (rev 4923)
@@ -195,6 +195,7 @@
         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);
+        newMapDialogFactory.setPickmapChooserControl(pickmapChooserControl);
     }
 
     /**


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