Menu
▾
▴
[Gridarta-commit] SF.net SVN: gridarta:[4976] trunk
|
From: <aki...@us...> - 2008-08-21 22:39:08
|
Revision: 4976
http://gridarta.svn.sourceforge.net/gridarta/?rev=4976&view=rev
Author: akirschbaum
Date: 2008-08-21 22:39:16 +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 22:36:51 UTC (rev 4975)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2008-08-21 22:39:16 UTC (rev 4976)
@@ -44,9 +44,7 @@
import java.io.FileReader;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
-import java.util.Collections;
import java.util.List;
-import java.util.Map;
import javax.swing.JMenu;
import javax.swing.SwingUtilities;
import net.sf.gridarta.AbstractMainControl;
@@ -89,9 +87,7 @@
import net.sf.gridarta.map.validation.checks.UnsetSlayingChecker;
import net.sf.gridarta.textedit.scripteditor.ScriptEditControlInstance;
import net.sf.gridarta.treasurelist.CFTreasureListTree;
-import net.sf.gridarta.treasurelist.TreasureListsParser;
import net.sf.gridarta.treasurelist.TreasureLocation;
-import net.sf.gridarta.treasurelist.TreasureTreeNode;
import net.sf.japi.swing.ActionFactory;
import net.sf.japi.swing.ActionMethod;
import net.sf.japi.swing.prefs.PreferencesGroup;
@@ -99,8 +95,6 @@
import net.sf.japi.util.ThrowableHandler;
import org.apache.log4j.Logger;
import org.jetbrains.annotations.NotNull;
-import org.w3c.dom.Document;
-import org.xml.sax.SAXException;
/**
* The main controller of the level editor. Basically the main application.
@@ -149,17 +143,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);
- Map<String, TreasureTreeNode> specialTreasureLists;
- try {
- final Document specialTreasureListsDocument = xmlHelper.getDocumentBuilder().parse(IOUtils.getResourceURLAsString(getConfigurationDirectory(), "TreasureLists.xml"));
- specialTreasureLists = TreasureListsParser.parseTreasureLists(specialTreasureListsDocument);
- } catch (final IOException ex) {
- log.warn("Cannot read TreasureLists.xml: " + ex.getMessage());
- specialTreasureLists = Collections.emptyMap();
- } catch (final SAXException ex) {
- log.warn("Cannot read TreasureLists.xml: " + ex.getMessage());
- specialTreasureLists = Collections.emptyMap();
- }
treasureListTree = new CFTreasureListTree<GameObject, MapArchObject, Archetype>(mainView, archetypeSet, specialTreasureLists,
new TreasureLocation(getCollectedDirectory(), IGUIConstants.TREASURES_FILE)
);
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2008-08-21 22:36:51 UTC (rev 4975)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2008-08-21 22:39:16 UTC (rev 4976)
@@ -47,9 +47,7 @@
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.util.Arrays;
-import java.util.Collections;
import java.util.List;
-import java.util.Map;
import javax.swing.JMenu;
import javax.swing.JOptionPane;
import javax.swing.SwingUtilities;
@@ -108,9 +106,7 @@
import net.sf.gridarta.spells.SpellsUtils;
import net.sf.gridarta.textedit.scripteditor.ScriptEditControlInstance;
import net.sf.gridarta.treasurelist.CFTreasureListTree;
-import net.sf.gridarta.treasurelist.TreasureListsParser;
import net.sf.gridarta.treasurelist.TreasureLocation;
-import net.sf.gridarta.treasurelist.TreasureTreeNode;
import net.sf.japi.io.args.ArgParser;
import net.sf.japi.swing.ActionFactory;
import net.sf.japi.swing.ActionMethod;
@@ -122,8 +118,6 @@
import net.sf.japi.util.filter.file.GlobFileFilter;
import org.apache.log4j.Logger;
import org.jetbrains.annotations.NotNull;
-import org.w3c.dom.Document;
-import org.xml.sax.SAXException;
/**
* The main controller of the level editor. Basically the main application.
@@ -211,17 +205,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);
- Map<String, TreasureTreeNode> specialTreasureLists;
- try {
- final Document specialTreasureListsDocument = xmlHelper.getDocumentBuilder().parse(IOUtils.getResourceURLAsString(getConfigurationDirectory(), "TreasureLists.xml"));
- specialTreasureLists = TreasureListsParser.parseTreasureLists(specialTreasureListsDocument);
- } catch (final IOException ex) {
- log.warn("Cannot read TreasureLists.xml: " + ex.getMessage());
- specialTreasureLists = Collections.emptyMap();
- } catch (final SAXException ex) {
- log.warn("Cannot read TreasureLists.xml: " + ex.getMessage());
- specialTreasureLists = Collections.emptyMap();
- }
treasureListTree = new CFTreasureListTree<GameObject, MapArchObject, Archetype>(mainView, archetypeSet, specialTreasureLists,
new TreasureLocation(getCollectedDirectory(), IGUIConstants.TREASURES_FILE),
new TreasureLocation(globalSettings.getMapDefaultFolder(), null)
Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-08-21 22:36:51 UTC (rev 4975)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-08-21 22:39:16 UTC (rev 4976)
@@ -22,6 +22,8 @@
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
+import java.util.Collections;
+import java.util.Map;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
import java.util.prefs.Preferences;
@@ -82,6 +84,8 @@
import net.sf.gridarta.spells.Spells;
import net.sf.gridarta.spells.XMLSpellLoader;
import net.sf.gridarta.textedit.scripteditor.ScriptEditControlInstance;
+import net.sf.gridarta.treasurelist.TreasureListsParser;
+import net.sf.gridarta.treasurelist.TreasureTreeNode;
import net.sf.gridarta.updater.UpdaterManager;
import net.sf.japi.swing.ActionFactory;
import net.sf.japi.swing.ActionMethod;
@@ -90,6 +94,8 @@
import org.apache.log4j.Logger;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
+import org.w3c.dom.Document;
+import org.xml.sax.SAXException;
/**
* MainControl is a central class that's used for access on global data
@@ -284,6 +290,9 @@
@NotNull
protected final MapActions mapActions;
+ @NotNull
+ protected Map<String, TreasureTreeNode> specialTreasureLists;
+
/**
* Creates a new instance.
* @param gridartaObjectsFactory the gridarta objects factory
@@ -393,6 +402,16 @@
throw new MissingResourceException("GameObjectMatcher 'exit' does not exist", null, null);
}
mapActions = init1();
+ try {
+ final Document specialTreasureListsDocument = xmlHelper.getDocumentBuilder().parse(IOUtils.getResourceURLAsString(getConfigurationDirectory(), "TreasureLists.xml"));
+ specialTreasureLists = TreasureListsParser.parseTreasureLists(specialTreasureListsDocument);
+ } catch (final IOException ex) {
+ log.warn("Cannot read TreasureLists.xml: " + ex.getMessage());
+ specialTreasureLists = Collections.emptyMap();
+ } catch (final SAXException ex) {
+ log.warn("Cannot read TreasureLists.xml: " + ex.getMessage());
+ specialTreasureLists = Collections.emptyMap();
+ }
}
@NotNull
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
