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

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

Revision: 4982
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4982&view=rev
Author:   akirschbaum
Date:     2008-08-22 07:43:48 +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:42:16 UTC (rev 4981)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-22 07:43:48 UTC (rev 4982)
@@ -40,7 +40,6 @@
 import cfeditor.script.parameter.PluginParameterFactory;
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
@@ -48,7 +47,6 @@
 import javax.swing.JMenu;
 import javax.swing.SwingUtilities;
 import net.sf.gridarta.AbstractMainControl;
-import net.sf.gridarta.CommonConstants;
 import net.sf.gridarta.EditTypes;
 import net.sf.gridarta.FileControl;
 import net.sf.gridarta.GlobalSettings;
@@ -70,7 +68,6 @@
 import net.sf.gridarta.gui.prefs.MapValidatorPrefs;
 import net.sf.gridarta.gui.prefs.MiscPrefs;
 import net.sf.gridarta.gui.prefs.UpdatePrefs;
-import net.sf.gridarta.io.IOUtils;
 import net.sf.gridarta.map.AutoValidator;
 import net.sf.gridarta.map.MapControl;
 import net.sf.gridarta.map.validation.DelegatingMapValidator;
@@ -137,13 +134,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);
-        try {
-            final String filename = IOUtils.getResourceURLAsString(getConfigurationDirectory(), CommonConstants.TYPEDEF_FILE);
-            archetypeTypeSetParser.loadTypesFromXML(filename);
-        } catch (final FileNotFoundException ex) {
-            log.error("Cannot read " + CommonConstants.TYPEDEF_FILE + ": " + ex.getMessage());
-        }
-
         AbstractScriptArchEditor.initEventTypeBoxes(".py", "Python", ScriptArchUtils.createEventTypeBox(), pythonFileFilter, globalSettings, mapManager);
 
         // Initialize the main view

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-08-22 07:42:16 UTC (rev 4981)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-08-22 07:43:48 UTC (rev 4982)
@@ -42,7 +42,6 @@
 import java.awt.Point;
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
@@ -52,7 +51,6 @@
 import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
 import net.sf.gridarta.AbstractMainControl;
-import net.sf.gridarta.CommonConstants;
 import net.sf.gridarta.EditTypes;
 import net.sf.gridarta.FileControl;
 import net.sf.gridarta.GlobalSettings;
@@ -78,7 +76,6 @@
 import net.sf.gridarta.gui.prefs.MiscPrefs;
 import net.sf.gridarta.gui.prefs.UpdatePrefs;
 import net.sf.gridarta.gui.utils.GUIUtils;
-import net.sf.gridarta.io.IOUtils;
 import net.sf.gridarta.map.AutoValidator;
 import net.sf.gridarta.map.MapControl;
 import net.sf.gridarta.map.MapModel;
@@ -199,13 +196,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);
-        try {
-            final String filename = IOUtils.getResourceURLAsString(getConfigurationDirectory(), CommonConstants.TYPEDEF_FILE);
-            archetypeTypeSetParser.loadTypesFromXML(filename);
-        } catch (final FileNotFoundException ex) {
-            log.error("Cannot read " + CommonConstants.TYPEDEF_FILE + ": " + ex.getMessage());
-        }
-
         AbstractScriptArchEditor.initEventTypeBoxes(".lua", "Lua", ScriptArchUtils.createEventTypeBox(), luaFileFilter, globalSettings, mapManager);
 
         // Initialize the main view

Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-22 07:42:16 UTC (rev 4981)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-22 07:43:48 UTC (rev 4982)
@@ -436,6 +436,12 @@
         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);
+        try {
+            final String filename = IOUtils.getResourceURLAsString(getConfigurationDirectory(), CommonConstants.TYPEDEF_FILE);
+            archetypeTypeSetParser.loadTypesFromXML(filename);
+        } catch (final FileNotFoundException ex) {
+            log.error("Cannot read " + CommonConstants.TYPEDEF_FILE + ": " + ex.getMessage());
+        }
     }
 
     @NotNull


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