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

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

Revision: 5034
          http://gridarta.svn.sourceforge.net/gridarta/?rev=5034&view=rev
Author:   akirschbaum
Date:     2008-09-07 09:29:56 +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:27:57 UTC (rev 5033)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-09-07 09:29:56 UTC (rev 5034)
@@ -60,7 +60,6 @@
 import net.sf.gridarta.gui.MainView;
 import net.sf.gridarta.gui.MapViewManager;
 import net.sf.gridarta.gui.RecentManager;
-import net.sf.gridarta.gui.SystemIcons;
 import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserControl;
 import net.sf.gridarta.gui.connectionview.LockedItemsControl;
 import net.sf.gridarta.gui.gameobjectattributesdialog.GameObjectAttributesDialogFactory;
@@ -137,10 +136,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, });
-        gridartaObjectsFactory.init(faceObjects, archetypeChooserModel, selectedSquareView, this, mainView, editTypes, mapImageCache, mapActions, archetypeParser, archetypeSet, toolPalette, autojoinLists, exitMatcher);
-        ((DefaultMapControlFactory) mapControlFactory).init(gridartaObjectsFactory, rendererFactory, mapActions, archetypeChooserModel, mapImageCache, autojoinLists, exitMatcher);
-        net.sf.gridarta.gameobject.GameObject.initialize(archetypeSet, archetypeTypeSet, gameObjectMatchers, animationObjects, SystemIcons.getNofaceTileIcon());
-
         archetypeSet.loadArchetypes(archetypeParser);
 
         if (globalSettings.isAutoPopupDocu()) {

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-09-07 09:27:57 UTC (rev 5033)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-09-07 09:29:56 UTC (rev 5034)
@@ -67,7 +67,6 @@
 import net.sf.gridarta.gui.MainView;
 import net.sf.gridarta.gui.MapViewManager;
 import net.sf.gridarta.gui.RecentManager;
-import net.sf.gridarta.gui.SystemIcons;
 import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserControl;
 import net.sf.gridarta.gui.connectionview.LockedItemsControl;
 import net.sf.gridarta.gui.gameobjectattributesdialog.GameObjectAttributesDialogFactory;
@@ -192,10 +191,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, });
-        gridartaObjectsFactory.init(faceObjects, archetypeChooserModel, selectedSquareView, this, mainView, editTypes, mapImageCache, mapActions, archetypeParser, archetypeSet, toolPalette, autojoinLists, exitMatcher);
-        ((DefaultMapControlFactory) mapControlFactory).init(gridartaObjectsFactory, rendererFactory, mapActions, archetypeChooserModel, mapImageCache, autojoinLists, exitMatcher);
-        net.sf.gridarta.gameobject.GameObject.initialize(archetypeSet, archetypeTypeSet, gameObjectMatchers, animationObjects, SystemIcons.getNofaceTileIcon());
-
         // initialize & load
         MultiPositionData.init(getConfigurationDirectory());
 

Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-09-07 09:27:57 UTC (rev 5033)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-09-07 09:29:56 UTC (rev 5034)
@@ -446,6 +446,9 @@
         mapActions.updateMenuState();
         init3();
         archetypeParser = newArchetypeParser(gridartaObjectsFactory, archetypeChooserControl, animationObjects, archetypeSet);
+        gridartaObjectsFactory.init(faceObjects, archetypeChooserModel, selectedSquareView, this, mainView, editTypes, mapImageCache, mapActions, archetypeParser, archetypeSet, toolPalette, autojoinLists, exitMatcher);
+        mapControlFactory.init(gridartaObjectsFactory, rendererFactory, mapActions, archetypeChooserModel, mapImageCache, autojoinLists, exitMatcher);
+        GameObject.initialize(archetypeSet, archetypeTypeSet, gameObjectMatchers, animationObjects, SystemIcons.getNofaceTileIcon());
     }
 
     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.