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

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

Revision: 5045
          http://gridarta.svn.sourceforge.net/gridarta/?rev=5045&view=rev
Author:   akirschbaum
Date:     2008-09-07 09:53:04 +0000 (Sun, 07 Sep 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-09-07 09:52:05 UTC (rev 5044)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-09-07 09:53:04 UTC (rev 5045)
@@ -135,7 +135,6 @@
      */
     public CMainControl(@NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory) {
         super(gridartaObjectsFactory, new DefaultRendererFactory(), "cfeditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory(gridartaObjectsFactory), false, CResourceLoader.getHomeFile("thumbnails"), null, "DaimoninEditor.jar", pythonFileFilter, ".py", "Python", Archetype.TYPE_SPELL, null, Archetype.TYPE_EVENT_CONNECTOR, false, 0, new int[] { Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_TRIGGER_ALTAR, Archetype.TYPE_DETECTOR, Archetype.TYPE_TRIGGER_MARKER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_CONTAINER, });
-        recentManager.initRecent();
         new AutoValidator<GameObject, MapArchObject, Archetype, CMapViewBasic>(validators, mapManager, PREFS_VALIDATOR_AUTO_DEFAULT);
         fileControl = new FileControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(globalSettings, archetypeSet, mapPreviewAccessory, mapManager, mainView, mapFileFilter, pythonFileFilter, newMapDialogFactory, ".py");
     }

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-09-07 09:52:05 UTC (rev 5044)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-09-07 09:53:04 UTC (rev 5045)
@@ -189,7 +189,6 @@
      */
     public CMainControl(@NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory) {
         super(gridartaObjectsFactory, new DefaultRendererFactory(), "daieditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory(gridartaObjectsFactory), true, null, GUIUtils.getSysIcon(IGUIConstants.TILE_NORTH), "CrossfireEditor.jar", luaFileFilter, ".lua", "Lua", 0, IGUIConstants.SPELL_FILE, 0, true, -1, new int[] { Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_ALTAR_TRIGGER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_SPAWN_POINT, Archetype.TYPE_CONTAINER, });
-        recentManager.initRecent();
         new AutoValidator<GameObject, MapArchObject, Archetype, CMapViewBasic>(validators, mapManager, PREFS_VALIDATOR_AUTO_DEFAULT);
         fileControl = new FileControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(globalSettings, archetypeSet, mapPreviewAccessory, mapManager, mainView, mapFileFilter, luaFileFilter, newMapDialogFactory, ".lua");
     }

Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-09-07 09:52:05 UTC (rev 5044)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-09-07 09:53:04 UTC (rev 5045)
@@ -480,6 +480,7 @@
                 objectChooser.movePickmapChooserToFront();
             }
         }
+        recentManager.initRecent();
     }
 
     protected abstract AbstractArchetypeParser<G, A, R> newArchetypeParser(final GridartaObjectsFactory<G, A, R, V> gridartaObjectsFactory, final ArchetypeChooserControl<G, A, R, V> archetypeChooserControl, final net.sf.gridarta.gameobject.anim.AnimationObjects<? extends AnimationObject> animationObjects, final net.sf.gridarta.gameobject.ArchetypeSet<G, A, R> archetypeSet);


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