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

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

Revision: 4966
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4966&view=rev
Author:   akirschbaum
Date:     2008-08-21 21:33:04 +0000 (Thu, 21 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-21 21:31:10 UTC (rev 4965)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-21 21:33:04 UTC (rev 4966)
@@ -62,7 +62,6 @@
 import net.sf.gridarta.archtype.ArchetypeTypeSetParser;
 import net.sf.gridarta.gameobject.anim.AnimationObject;
 import net.sf.gridarta.gameobject.match.GameObjectMatcher;
-import net.sf.gridarta.gameobject.match.GameObjectMatchers;
 import net.sf.gridarta.gameobject.match.GameObjectMatchersInstance;
 import net.sf.gridarta.gameobject.scripts.AbstractScriptArchEditor;
 import net.sf.gridarta.gui.LeftPanel;
@@ -167,7 +166,6 @@
         super(gridartaObjectsFactory, new DefaultRendererFactory(), "cfeditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory(gridartaObjectsFactory), false, CResourceLoader.getHomeFile("thumbnails"), null, "DaimoninEditor.jar", pythonFileFilter, ".py");
 
         // load the list with archtype-data from "types.xml"
-        final GameObjectMatchers gameObjectMatchers = new GameObjectMatchers(xmlHelper.getDocumentBuilder(), xmlHelper.getXPath());
         new ArchetypeSetSpellLoader<GameObject, MapArchObject, Archetype>().load(archetypeSet, Archetype.TYPE_SPELL, gameObjectSpells);
         gameObjectSpells.sort();
         numberSpells.sort();

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-08-21 21:31:10 UTC (rev 4965)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-08-21 21:33:04 UTC (rev 4966)
@@ -67,7 +67,6 @@
 import net.sf.gridarta.gameobject.anim.AnimationObject;
 import net.sf.gridarta.gameobject.face.FaceObjectProviders;
 import net.sf.gridarta.gameobject.match.GameObjectMatcher;
-import net.sf.gridarta.gameobject.match.GameObjectMatchers;
 import net.sf.gridarta.gameobject.match.GameObjectMatchersInstance;
 import net.sf.gridarta.gameobject.match.MutableOrGameObjectMatcher;
 import net.sf.gridarta.gameobject.match.ViewGameObjectMatcherManager;
@@ -227,7 +226,6 @@
         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");
 
         // load the list with archtype-data from "types.xml"
-        final GameObjectMatchers gameObjectMatchers = new GameObjectMatchers(xmlHelper.getDocumentBuilder(), xmlHelper.getXPath());
         gameObjectSpells.sort();
         XMLSpellLoader.load(getConfigurationDirectory(), CommonConstants.SPELL_FILE, xmlHelper.getDocumentBuilder(), numberSpells);
         numberSpells.sort();

Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-21 21:31:10 UTC (rev 4965)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-21 21:33:04 UTC (rev 4966)
@@ -36,6 +36,7 @@
 import net.sf.gridarta.gameobject.anim.AnimationObject;
 import net.sf.gridarta.gameobject.anim.AnimationObjects;
 import net.sf.gridarta.gameobject.face.FaceObjects;
+import net.sf.gridarta.gameobject.match.GameObjectMatchers;
 import net.sf.gridarta.gameobject.scripts.ScriptedEvent;
 import net.sf.gridarta.gameobject.scripts.ScriptedEventEditor;
 import net.sf.gridarta.gui.About;
@@ -233,6 +234,9 @@
     @NotNull
     protected final XmlHelper xmlHelper;
 
+    @NotNull
+    protected final GameObjectMatchers gameObjectMatchers;
+
     /**
      * Creates a new instance.
      * @param gridartaObjectsFactory the gridarta objects factory
@@ -302,6 +306,7 @@
             log.error("Cannot create XML parser: " + ex.getMessage());
             throw new MissingResourceException("Cannot create XML parser: " + ex.getMessage(), null, null);
         }
+        gameObjectMatchers = new GameObjectMatchers(xmlHelper.getDocumentBuilder(), xmlHelper.getXPath());
     }
 
     /**


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