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

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

Revision: 4973
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4973&view=rev
Author:   akirschbaum
Date:     2008-08-21 22:17:00 +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:14:53 UTC (rev 4972)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-21 22:17:00 UTC (rev 4973)
@@ -47,7 +47,6 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.MissingResourceException;
 import javax.swing.JMenu;
 import javax.swing.SwingUtilities;
 import net.sf.gridarta.AbstractMainControl;
@@ -61,7 +60,6 @@
 import net.sf.gridarta.archtype.ArchetypeTypeParser;
 import net.sf.gridarta.archtype.ArchetypeTypeSetParser;
 import net.sf.gridarta.gameobject.anim.AnimationObject;
-import net.sf.gridarta.gameobject.match.GameObjectMatcher;
 import net.sf.gridarta.gameobject.scripts.AbstractScriptArchEditor;
 import net.sf.gridarta.gui.LeftPanel;
 import net.sf.gridarta.gui.MainView;
@@ -70,7 +68,6 @@
 import net.sf.gridarta.gui.connectionview.LockedItemsControl;
 import net.sf.gridarta.gui.gameobjectattributespanel.GameObjectAttributesModel;
 import net.sf.gridarta.gui.map.MapView;
-import net.sf.gridarta.gui.map.tools.DeletionTool;
 import net.sf.gridarta.gui.map.tools.ToolPalette;
 import net.sf.gridarta.gui.newmap.NewMapDialogFactory;
 import net.sf.gridarta.gui.objectchoicedisplay.ObjectChoiceDisplay;
@@ -80,7 +77,6 @@
 import net.sf.gridarta.gui.prefs.UpdatePrefs;
 import net.sf.gridarta.io.IOUtils;
 import net.sf.gridarta.map.AutoValidator;
-import net.sf.gridarta.map.InsertionMode;
 import net.sf.gridarta.map.MapControl;
 import net.sf.gridarta.map.validation.DelegatingMapValidator;
 import net.sf.gridarta.map.validation.checks.AttributeRangeChecker;
@@ -154,13 +150,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);
 
-        DeletionTool.init(floorMatcher, wallMatcher, monsterMatcher);
-        InsertionMode.init(floorMatcher, wallMatcher, belowFloorMatcher);
-        final GameObjectMatcher exitMatcher = gameObjectMatchers.getMatcher("exit");
-        if (exitMatcher == null) {
-            log.fatal("GameObjectMatcher 'exit' does not exist");
-            throw new MissingResourceException("GameObjectMatcher 'exit' does not exist", null, null);
-        }
         final MapActions mapActions = new MapActions(mainView, mainView, gridartaObjectsFactory, globalSettings, mapManager, mapViewManager, exitMatcher, mapFileFilter, selectedSquareView);
         archetypeTypeSet.getListTable().put("event", ScriptArchUtils.getEventTypes());
         Map<String, TreasureTreeNode> specialTreasureLists;

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-08-21 22:14:53 UTC (rev 4972)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-08-21 22:17:00 UTC (rev 4973)
@@ -50,7 +50,6 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.MissingResourceException;
 import javax.swing.JMenu;
 import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
@@ -66,7 +65,6 @@
 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.GameObjectMatcher;
 import net.sf.gridarta.gameobject.match.MutableOrGameObjectMatcher;
 import net.sf.gridarta.gameobject.match.ViewGameObjectMatcherManager;
 import net.sf.gridarta.gameobject.scripts.AbstractScriptArchEditor;
@@ -77,7 +75,6 @@
 import net.sf.gridarta.gui.connectionview.LockedItemsControl;
 import net.sf.gridarta.gui.gameobjectattributespanel.GameObjectAttributesModel;
 import net.sf.gridarta.gui.map.MapView;
-import net.sf.gridarta.gui.map.tools.DeletionTool;
 import net.sf.gridarta.gui.map.tools.ToolPalette;
 import net.sf.gridarta.gui.newmap.NewMapDialogFactory;
 import net.sf.gridarta.gui.objectchoicedisplay.ObjectChoiceDisplay;
@@ -88,7 +85,6 @@
 import net.sf.gridarta.gui.utils.GUIUtils;
 import net.sf.gridarta.io.IOUtils;
 import net.sf.gridarta.map.AutoValidator;
-import net.sf.gridarta.map.InsertionMode;
 import net.sf.gridarta.map.MapControl;
 import net.sf.gridarta.map.MapModel;
 import net.sf.gridarta.map.MapSquare;
@@ -216,13 +212,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);
 
-        DeletionTool.init(floorMatcher, wallMatcher, monsterMatcher);
-        InsertionMode.init(floorMatcher, wallMatcher, belowFloorMatcher);
-        final GameObjectMatcher exitMatcher = gameObjectMatchers.getMatcher("exit");
-        if (exitMatcher == null) {
-            log.fatal("GameObjectMatcher 'exit' does not exist");
-            throw new MissingResourceException("GameObjectMatcher 'exit' does not exist", null, null);
-        }
         final MapActions mapActions = new MapActions(mainView, mainView, gridartaObjectsFactory, (GlobalSettingsImpl) globalSettings, mapManager, mapViewManager, exitMatcher, mapFileFilter, selectedSquareView);
         Map<String, TreasureTreeNode> specialTreasureLists;
         try {

Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-21 22:14:53 UTC (rev 4972)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-21 22:17:00 UTC (rev 4973)
@@ -61,6 +61,7 @@
 import net.sf.gridarta.gui.map.MapView;
 import net.sf.gridarta.gui.map.MapViewBasic;
 import net.sf.gridarta.gui.map.RendererFactory;
+import net.sf.gridarta.gui.map.tools.DeletionTool;
 import net.sf.gridarta.gui.newmap.NewMapDialogFactory;
 import net.sf.gridarta.gui.objectchooser.DefaultObjectChooser;
 import net.sf.gridarta.gui.pickmapchooser.PickmapChooserControl;
@@ -70,6 +71,7 @@
 import net.sf.gridarta.help.Help;
 import net.sf.gridarta.io.IOUtils;
 import net.sf.gridarta.io.PathManager;
+import net.sf.gridarta.map.InsertionMode;
 import net.sf.gridarta.map.MapArchObject;
 import net.sf.gridarta.map.MapControl;
 import net.sf.gridarta.map.MapControlFactory;
@@ -270,6 +272,9 @@
     @NotNull
     protected final GameObjectMatcher belowFloorMatcher;
 
+    @NotNull
+    protected final GameObjectMatcher exitMatcher;
+
     /**
      * Creates a new instance.
      * @param gridartaObjectsFactory the gridarta objects factory
@@ -370,6 +375,13 @@
         if (belowFloorMatcher == null) {
             log.warn("GameObjectMatcher 'below_floor' does not exist");
         }
+        DeletionTool.init(floorMatcher, wallMatcher, monsterMatcher);
+        InsertionMode.init(floorMatcher, wallMatcher, belowFloorMatcher);
+        exitMatcher = gameObjectMatchers.getMatcher("exit");
+        if (exitMatcher == null) {
+            log.fatal("GameObjectMatcher 'exit' does not exist");
+            throw new MissingResourceException("GameObjectMatcher 'exit' does not exist", null, null);
+        }
     }
 
     /**


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