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

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

Revision: 5035
          http://gridarta.svn.sourceforge.net/gridarta/?rev=5035&view=rev
Author:   akirschbaum
Date:     2008-09-07 09:32:38 +0000 (Sun, 07 Sep 2008)

Log Message:
-----------
Unify code.

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:29:56 UTC (rev 5034)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-09-07 09:32:38 UTC (rev 5035)
@@ -244,6 +244,11 @@
     }
 
     /** {@inheritDoc} */
+    @Override
+    protected void init4() {
+    }
+
+    /** {@inheritDoc} */
     @NotNull
     @Override
     protected DelegatingMapValidator<GameObject, MapArchObject, Archetype> createMapValidators() {

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-09-07 09:29:56 UTC (rev 5034)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-09-07 09:32:38 UTC (rev 5035)
@@ -191,9 +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, });
-        // initialize & load
-        MultiPositionData.init(getConfigurationDirectory());
-
         archetypeSet.loadArchetypes(archetypeParser);
 
         if (globalSettings.isAutoPopupDocu()) {
@@ -315,6 +312,12 @@
     }
 
     /** {@inheritDoc} */
+    @Override
+    protected void init4() {
+        MultiPositionData.init(getConfigurationDirectory());
+    }
+
+    /** {@inheritDoc} */
     @NotNull
     @Override
     protected DelegatingMapValidator<GameObject, MapArchObject, Archetype> createMapValidators() {

Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-09-07 09:29:56 UTC (rev 5034)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-09-07 09:32:38 UTC (rev 5035)
@@ -449,6 +449,7 @@
         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());
+        init4();
     }
 
     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);
@@ -471,6 +472,8 @@
 
     protected abstract void init3();
 
+    protected abstract void init4();
+
     /**
      * The file control instance.
      */


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