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

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

Revision: 4981
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4981&view=rev
Author:   akirschbaum
Date:     2008-08-22 07:42:16 +0000 (Fri, 22 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-22 07:40:20 UTC (rev 4980)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-22 07:42:16 UTC (rev 4981)
@@ -54,7 +54,6 @@
 import net.sf.gridarta.GlobalSettings;
 import net.sf.gridarta.GridartaObjectsFactory;
 import net.sf.gridarta.MapManager;
-import net.sf.gridarta.archtype.ArchetypeTypeSetParser;
 import net.sf.gridarta.gameobject.anim.AnimationObject;
 import net.sf.gridarta.gameobject.scripts.AbstractScriptArchEditor;
 import net.sf.gridarta.gui.LeftPanel;
@@ -138,7 +137,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", Archetype.TYPE_SPELL, null, Archetype.TYPE_EVENT_CONNECTOR, false, 0);
-        final ArchetypeTypeSetParser<GameObject, MapArchObject, Archetype> archetypeTypeSetParser = new ArchetypeTypeSetParser<GameObject, MapArchObject, Archetype>(xmlHelper.getDocumentBuilder(), xmlHelper.getXPath(), archetypeTypeSet, archetypeTypeParser);
         try {
             final String filename = IOUtils.getResourceURLAsString(getConfigurationDirectory(), CommonConstants.TYPEDEF_FILE);
             archetypeTypeSetParser.loadTypesFromXML(filename);

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-08-22 07:40:20 UTC (rev 4980)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-08-22 07:42:16 UTC (rev 4981)
@@ -58,7 +58,6 @@
 import net.sf.gridarta.GlobalSettings;
 import net.sf.gridarta.GridartaObjectsFactory;
 import net.sf.gridarta.MapManager;
-import net.sf.gridarta.archtype.ArchetypeTypeSetParser;
 import net.sf.gridarta.gameobject.anim.AnimationObject;
 import net.sf.gridarta.gameobject.face.FaceObjectProviders;
 import net.sf.gridarta.gameobject.match.MutableOrGameObjectMatcher;
@@ -200,7 +199,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", 0, IGUIConstants.SPELL_FILE, 0, true, -1);
-        final ArchetypeTypeSetParser<GameObject, MapArchObject, Archetype> archetypeTypeSetParser = new ArchetypeTypeSetParser<GameObject, MapArchObject, Archetype>(xmlHelper.getDocumentBuilder(), xmlHelper.getXPath(), archetypeTypeSet, archetypeTypeParser);
         try {
             final String filename = IOUtils.getResourceURLAsString(getConfigurationDirectory(), CommonConstants.TYPEDEF_FILE);
             archetypeTypeSetParser.loadTypesFromXML(filename);

Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-22 07:40:20 UTC (rev 4980)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-22 07:42:16 UTC (rev 4981)
@@ -35,6 +35,7 @@
 import net.sf.gridarta.archtype.ArchetypeAttributeParser;
 import net.sf.gridarta.archtype.ArchetypeTypeParser;
 import net.sf.gridarta.archtype.ArchetypeTypeSet;
+import net.sf.gridarta.archtype.ArchetypeTypeSetParser;
 import net.sf.gridarta.gameobject.Archetype;
 import net.sf.gridarta.gameobject.ArchetypeSet;
 import net.sf.gridarta.gameobject.GameObject;
@@ -305,6 +306,9 @@
 
     @NotNull
     protected final ArchetypeTypeParser<G, A, R> archetypeTypeParser;
+
+    @NotNull
+    protected final ArchetypeTypeSetParser<G, A, R> archetypeTypeSetParser;
     
     /**
      * Creates a new instance.
@@ -431,6 +435,7 @@
         treasureListTree = createTreasureListTree();
         archetypeAttributeParser = new ArchetypeAttributeParser<G, A, R>(typeNoEventConnector, includeFaceText, globalSettings, mapFileFilter, luaFileFilter, faceObjects, animationObjects, numberSpells, gameObjectSpells, undefinedSpellIndex, archetypeTypeSet, treasureListTree);
         archetypeTypeParser = new ArchetypeTypeParser<G, A, R>(archetypeAttributeParser);
+        archetypeTypeSetParser = new ArchetypeTypeSetParser<G, A, R>(xmlHelper.getDocumentBuilder(), xmlHelper.getXPath(), archetypeTypeSet, archetypeTypeParser);
     }
 
     @NotNull


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