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

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

Revision: 4965
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4965&view=rev
Author:   akirschbaum
Date:     2008-08-21 21:31:10 +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:28:37 UTC (rev 4964)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-21 21:31:10 UTC (rev 4965)
@@ -50,7 +50,6 @@
 import java.util.MissingResourceException;
 import javax.swing.JMenu;
 import javax.swing.SwingUtilities;
-import javax.xml.parsers.ParserConfigurationException;
 import net.sf.gridarta.AbstractMainControl;
 import net.sf.gridarta.CommonConstants;
 import net.sf.gridarta.EditTypes;
@@ -58,7 +57,6 @@
 import net.sf.gridarta.GlobalSettings;
 import net.sf.gridarta.GridartaObjectsFactory;
 import net.sf.gridarta.MapManager;
-import net.sf.gridarta.XmlHelper;
 import net.sf.gridarta.archtype.ArchetypeAttributeParser;
 import net.sf.gridarta.archtype.ArchetypeTypeParser;
 import net.sf.gridarta.archtype.ArchetypeTypeSetParser;
@@ -169,13 +167,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 XmlHelper xmlHelper;
-        try {
-            xmlHelper = new XmlHelper(mainView);
-        } catch (final ParserConfigurationException ex) {
-            log.error("Cannot create XML parser: " + ex.getMessage());
-            throw new MissingResourceException("Cannot create XML parser: " + ex.getMessage(), null, null);
-        }
         final GameObjectMatchers gameObjectMatchers = new GameObjectMatchers(xmlHelper.getDocumentBuilder(), xmlHelper.getXPath());
         new ArchetypeSetSpellLoader<GameObject, MapArchObject, Archetype>().load(archetypeSet, Archetype.TYPE_SPELL, gameObjectSpells);
         gameObjectSpells.sort();

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-08-21 21:28:37 UTC (rev 4964)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-08-21 21:31:10 UTC (rev 4965)
@@ -54,7 +54,6 @@
 import javax.swing.JMenu;
 import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
-import javax.xml.parsers.ParserConfigurationException;
 import net.sf.gridarta.AbstractMainControl;
 import net.sf.gridarta.CommonConstants;
 import net.sf.gridarta.EditTypes;
@@ -62,7 +61,6 @@
 import net.sf.gridarta.GlobalSettings;
 import net.sf.gridarta.GridartaObjectsFactory;
 import net.sf.gridarta.MapManager;
-import net.sf.gridarta.XmlHelper;
 import net.sf.gridarta.archtype.ArchetypeAttributeParser;
 import net.sf.gridarta.archtype.ArchetypeTypeParser;
 import net.sf.gridarta.archtype.ArchetypeTypeSetParser;
@@ -229,13 +227,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 XmlHelper xmlHelper;
-        try {
-            xmlHelper = new XmlHelper(mainView);
-        } catch (final ParserConfigurationException ex) {
-            log.error("Cannot create XML parser: " + ex.getMessage());
-            throw new MissingResourceException("Cannot create XML parser: " + ex.getMessage(), null, null);
-        }
         final GameObjectMatchers gameObjectMatchers = new GameObjectMatchers(xmlHelper.getDocumentBuilder(), xmlHelper.getXPath());
         gameObjectSpells.sort();
         XMLSpellLoader.load(getConfigurationDirectory(), CommonConstants.SPELL_FILE, xmlHelper.getDocumentBuilder(), numberSpells);

Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-21 21:28:37 UTC (rev 4964)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-21 21:31:10 UTC (rev 4965)
@@ -28,6 +28,7 @@
 import javax.swing.JFileChooser;
 import javax.swing.JOptionPane;
 import javax.swing.filechooser.FileFilter;
+import javax.xml.parsers.ParserConfigurationException;
 import net.sf.gridarta.archtype.ArchetypeTypeSet;
 import net.sf.gridarta.gameobject.Archetype;
 import net.sf.gridarta.gameobject.ArchetypeSet;
@@ -229,6 +230,9 @@
     @NotNull
     protected final MainActions<G, A, R, V> mainActions;
 
+    @NotNull
+    protected final XmlHelper xmlHelper;
+
     /**
      * Creates a new instance.
      * @param gridartaObjectsFactory the gridarta objects factory
@@ -292,6 +296,12 @@
         updaterManager = new UpdaterManager(key, this, mapManager, mainView, gridartaJarFilename);
         updaterManager.startup();
         ScriptEditControlInstance.init(scriptFileFilter, scriptExtension, mainView, new File(globalSettings.getMapDefaultFolder()));
+        try {
+            xmlHelper = new XmlHelper(mainView);
+        } catch (final ParserConfigurationException ex) {
+            log.error("Cannot create XML parser: " + ex.getMessage());
+            throw new MissingResourceException("Cannot create XML parser: " + ex.getMessage(), null, null);
+        }
     }
 
     /**


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