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

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

Revision: 4968
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4968&view=rev
Author:   akirschbaum
Date:     2008-08-21 21:51:50 +0000 (Thu, 21 Aug 2008)

Log Message:
-----------
Remove CommonConstants.SPELL_FILE from common code base since it is Daimonin only.

Modified Paths:
--------------
    trunk/daimonin/src/daieditor/CMainControl.java
    trunk/daimonin/src/daieditor/IGUIConstants.java
    trunk/daimonin/src/daieditor/spells/Spells.java
    trunk/src/app/net/sf/gridarta/CommonConstants.java

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-08-21 21:39:46 UTC (rev 4967)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-08-21 21:51:50 UTC (rev 4968)
@@ -221,7 +221,7 @@
         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);
 
         // load the list with archtype-data from "types.xml"
-        XMLSpellLoader.load(getConfigurationDirectory(), CommonConstants.SPELL_FILE, xmlHelper.getDocumentBuilder(), numberSpells);
+        XMLSpellLoader.load(getConfigurationDirectory(), IGUIConstants.SPELL_FILE, xmlHelper.getDocumentBuilder(), numberSpells);
         numberSpells.sort();
         try {
             final String filename = IOUtils.getResourceURLAsString(getConfigurationDirectory(), "GameObjectMatchers.xml");

Modified: trunk/daimonin/src/daieditor/IGUIConstants.java
===================================================================
--- trunk/daimonin/src/daieditor/IGUIConstants.java	2008-08-21 21:39:46 UTC (rev 4967)
+++ trunk/daimonin/src/daieditor/IGUIConstants.java	2008-08-21 21:51:50 UTC (rev 4968)
@@ -86,4 +86,7 @@
 
     String TILE_NORTH = "north.png";
 
+    /** Name of the files the spell information (names and numbers). */
+    String SPELL_FILE = "spells.xml";
+
 } // interface IGUIConstants

Modified: trunk/daimonin/src/daieditor/spells/Spells.java
===================================================================
--- trunk/daimonin/src/daieditor/spells/Spells.java	2008-08-21 21:39:46 UTC (rev 4967)
+++ trunk/daimonin/src/daieditor/spells/Spells.java	2008-08-21 21:51:50 UTC (rev 4968)
@@ -19,6 +19,7 @@
 
 package daieditor.spells;
 
+import daieditor.IGUIConstants;
 import java.awt.Component;
 import java.io.BufferedReader;
 import java.io.EOFException;
@@ -34,7 +35,6 @@
 import java.util.TreeMap;
 import javax.swing.JFileChooser;
 import javax.swing.filechooser.FileFilter;
-import net.sf.gridarta.CommonConstants;
 import net.sf.gridarta.io.IOUtils;
 import net.sf.gridarta.spells.NumberSpell;
 import net.sf.japi.swing.ActionFactory;
@@ -139,9 +139,9 @@
                     new File("resource").mkdir();
                     new File(baseDir).mkdir();
                 }
-                dfile = new File(baseDir, CommonConstants.SPELL_FILE);
+                dfile = new File(baseDir, IGUIConstants.SPELL_FILE);
             } else {
-                dfile = new File(CommonConstants.SPELL_FILE);
+                dfile = new File(IGUIConstants.SPELL_FILE);
             }
 
             try {

Modified: trunk/src/app/net/sf/gridarta/CommonConstants.java
===================================================================
--- trunk/src/app/net/sf/gridarta/CommonConstants.java	2008-08-21 21:39:46 UTC (rev 4967)
+++ trunk/src/app/net/sf/gridarta/CommonConstants.java	2008-08-21 21:51:50 UTC (rev 4968)
@@ -41,9 +41,6 @@
 
     public static final Color INT_COLOR = new Color(74, 70, 156);
 
-    /** Name of the files the spell information (names and numbers). */
-    public static final String SPELL_FILE = "spells.xml";
-
     /** Name of the file that contains the type definitions. */
     public static final String TYPEDEF_FILE = "types.xml";
 


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