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

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

Revision: 4881
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4881&view=rev
Author:   akirschbaum
Date:     2008-08-16 07:37:35 +0000 (Sat, 16 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-16 07:34:47 UTC (rev 4880)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-16 07:37:35 UTC (rev 4881)
@@ -99,7 +99,6 @@
 import net.sf.gridarta.gui.selectedsquare.SelectedSquareView;
 import net.sf.gridarta.gui.undo.UndoControl;
 import net.sf.gridarta.io.IOUtils;
-import net.sf.gridarta.io.PathManager;
 import net.sf.gridarta.map.AutoValidator;
 import net.sf.gridarta.map.InsertionMode;
 import net.sf.gridarta.map.MapControl;
@@ -215,7 +214,6 @@
         final boolean mapTileListBottom = prefs.getBoolean(MainView.MAP_TILE_LIST_BOTTOM_KEY, MainView.MAP_TILE_LIST_BOTTOM_DEFAULT);
         ACTION_FACTORY.createActions(true, this, "createNew", "open", "options", "exit", "newScript", "editScript", "zoom", "gc", "onlineHelp", "tod");
         final MapManagerActions<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManagerActions = new MapManagerActions<GameObject, MapArchObject, Archetype, CMapViewBasic>(mapManager);
-        PathManager.setGlobalSettings(globalSettings);
         final ArchetypeChooserModel<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserModel = new ArchetypeChooserModel<GameObject, MapArchObject, Archetype, CMapViewBasic>(archetypeSet);
         final ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserControl = new ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(archetypeChooserModel);
         newMapDialogFactory = new NewMapDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, mapManager, gridartaObjectsFactory, IGUIConstants.DEF_MAPSIZE, IGUIConstants.DEF_MAPSIZE, 0, false, false, IGUIConstants.DEF_PICKMAP_WIDTH, IGUIConstants.DEF_PICKMAP_HEIGHT);

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-08-16 07:34:47 UTC (rev 4880)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-08-16 07:37:35 UTC (rev 4881)
@@ -109,7 +109,6 @@
 import net.sf.gridarta.gui.undo.UndoControl;
 import net.sf.gridarta.gui.utils.GUIUtils;
 import net.sf.gridarta.io.IOUtils;
-import net.sf.gridarta.io.PathManager;
 import net.sf.gridarta.map.AutoValidator;
 import net.sf.gridarta.map.InsertionMode;
 import net.sf.gridarta.map.MapControl;
@@ -273,7 +272,6 @@
         ACTION_FACTORY.createToggles(true, this, "drawDouble");
         ACTION_FACTORY.createAction(true, "collectSpells", this);
         final MapManagerActions<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManagerActions = new MapManagerActions<GameObject, MapArchObject, Archetype, CMapViewBasic>(mapManager);
-        PathManager.setGlobalSettings(globalSettings);
         final ArchetypeChooserModel<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserModel = new ArchetypeChooserModel<GameObject, MapArchObject, Archetype, CMapViewBasic>(archetypeSet);
         final ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserControl = new ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(archetypeChooserModel);
         newMapDialogFactory = new NewMapDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, mapManager, gridartaObjectsFactory, IGUIConstants.DEF_MAPSIZE, IGUIConstants.DEF_MAPSIZE, IGUIConstants.DEF_MAPDIFFICULTY, true, true, IGUIConstants.DEF_PICKMAP_WIDTH, IGUIConstants.DEF_PICKMAP_HEIGHT);

Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-16 07:34:47 UTC (rev 4880)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-16 07:37:35 UTC (rev 4881)
@@ -42,6 +42,7 @@
 import net.sf.gridarta.gui.map.MapView;
 import net.sf.gridarta.gui.map.MapViewBasic;
 import net.sf.gridarta.help.Help;
+import net.sf.gridarta.io.PathManager;
 import net.sf.gridarta.map.MapArchObject;
 import net.sf.gridarta.map.MapControl;
 import net.sf.gridarta.textedit.scripteditor.ScriptEditControlInstance;
@@ -149,6 +150,7 @@
         ScriptedEventEditor.setGlobalSettings(globalSettings);
         archetypeSet = newArchetypeSet(globalSettings, editTypes, animationObjects, faceObjects, gridartaObjectsFactory);
         ScriptedEvent.init(archetypeSet);
+        PathManager.setGlobalSettings(globalSettings);
     }
 
     /**


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