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

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

Revision: 4658
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4658&view=rev
Author:   akirschbaum
Date:     2008-08-01 20:57:29 +0000 (Fri, 01 Aug 2008)

Log Message:
-----------
Remove call to AbstractMainControl.getInstance().

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/CMainControl.java
    trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptArchEditor.java
    trunk/daimonin/src/daieditor/CMainControl.java
    trunk/daimonin/src/daieditor/gameobject/scripts/ScriptArchEditor.java

Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-01 20:44:39 UTC (rev 4657)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-01 20:57:29 UTC (rev 4658)
@@ -226,7 +226,7 @@
         super(new CrossfireObjectsFactory(), "cfeditor", new GlobalSettingsImpl());
         CMainControlInstance.instance = this;
         globalSettings.readGlobalSettings();
-        ScriptArchEditor.setGlobalSettings(globalSettings);
+        ScriptArchEditor.setGlobalSettings(globalSettings, this);
         ScriptedEventEditor.setGlobalSettings(globalSettings);
         animationObjects = new cfeditor.gameobject.anim.AnimationObjects();
         archetypeSet = new ArchetypeSet(this, globalSettings, editTypes, animationObjects, faceObjects, ((GlobalSettingsImpl) globalSettings).getImageSet());

Modified: trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptArchEditor.java
===================================================================
--- trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptArchEditor.java	2008-08-01 20:44:39 UTC (rev 4657)
+++ trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptArchEditor.java	2008-08-01 20:57:29 UTC (rev 4658)
@@ -19,13 +19,16 @@
 
 package cfeditor.gameobject.scripts;
 
+import cfeditor.gameobject.Archetype;
 import cfeditor.gameobject.GameObject;
+import cfeditor.gui.map.CMapViewBasic;
+import cfeditor.map.MapArchObject;
 import java.io.File;
 import java.io.IOException;
 import javax.swing.JDialog;
 import javax.swing.JOptionPane;
-import net.sf.gridarta.AbstractMainControl;
 import net.sf.gridarta.GlobalSettings;
+import net.sf.gridarta.MainControl;
 import net.sf.gridarta.gameobject.scripts.AbstractScriptArchEditor;
 import net.sf.gridarta.gameobject.scripts.UndefinedEventArchetypeException;
 import net.sf.gridarta.textedit.scripteditor.ScriptEditControlInstance;
@@ -43,13 +46,20 @@
     private static final ActionFactory ACTION_FACTORY = ActionFactory.getFactory("cfeditor");
 
     /**
+     * The main control instance.
+     */
+    @Nullable
+    private static MainControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mainControl = null;
+
+    /**
      * The global settings instance.
      */
     @Nullable
     private static GlobalSettings globalSettings = null;
 
-    public static void setGlobalSettings(@NotNull final GlobalSettings globalSettings) {
+    public static void setGlobalSettings(@NotNull final GlobalSettings globalSettings, @NotNull final MainControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mainControl) {
         ScriptArchEditor.globalSettings = globalSettings;
+        ScriptArchEditor.mainControl = mainControl;
     }
 
     public static boolean createNewEvent(final JDialog frame, final ScriptArchData scriptArchData) {
@@ -58,7 +68,7 @@
         final int eventType = ScriptArchUtils.indexToEventType(eventTypeBox.getSelectedIndex());
         final String pluginName = ((String) pluginNameBox.getSelectedItem()).trim();
 
-        final File localMapDir = AbstractMainControl.getInstance().getLocalMapDir();
+        final File localMapDir = mainControl.getLocalMapDir();
 
         scriptArchData.setChanged(false);
 

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-08-01 20:44:39 UTC (rev 4657)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-08-01 20:57:29 UTC (rev 4658)
@@ -281,7 +281,7 @@
         super(new DaimoninObjectsFactory(), "daieditor", new GlobalSettingsImpl());
         CMainControlInstance.instance = this;
         globalSettings.readGlobalSettings();
-        ScriptArchEditor.setGlobalSettings(globalSettings);
+        ScriptArchEditor.setGlobalSettings(globalSettings, this);
         ScriptedEventEditor.setGlobalSettings(globalSettings);
         animationObjects = new daieditor.gameobject.anim.AnimationObjects();
         GameObject.setAnimationObjects(animationObjects);

Modified: trunk/daimonin/src/daieditor/gameobject/scripts/ScriptArchEditor.java
===================================================================
--- trunk/daimonin/src/daieditor/gameobject/scripts/ScriptArchEditor.java	2008-08-01 20:44:39 UTC (rev 4657)
+++ trunk/daimonin/src/daieditor/gameobject/scripts/ScriptArchEditor.java	2008-08-01 20:57:29 UTC (rev 4658)
@@ -19,13 +19,16 @@
 
 package daieditor.gameobject.scripts;
 
+import daieditor.gameobject.Archetype;
 import daieditor.gameobject.GameObject;
+import daieditor.gui.map.CMapViewBasic;
+import daieditor.map.MapArchObject;
 import java.io.File;
 import java.io.IOException;
 import javax.swing.JDialog;
 import javax.swing.JOptionPane;
-import net.sf.gridarta.AbstractMainControl;
 import net.sf.gridarta.GlobalSettings;
+import net.sf.gridarta.MainControl;
 import net.sf.gridarta.gameobject.scripts.AbstractScriptArchEditor;
 import net.sf.gridarta.gameobject.scripts.UndefinedEventArchetypeException;
 import net.sf.gridarta.textedit.scripteditor.ScriptEditControlInstance;
@@ -48,8 +51,15 @@
     @Nullable
     private static GlobalSettings globalSettings = null;
 
-    public static void setGlobalSettings(@NotNull final GlobalSettings globalSettings) {
+    /**
+     * The main control instance.
+     */
+    @Nullable
+    private static MainControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mainControl = null;
+
+    public static void setGlobalSettings(@NotNull final GlobalSettings globalSettings, @NotNull final MainControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mainControl) {
         ScriptArchEditor.globalSettings = globalSettings;
+        ScriptArchEditor.mainControl = mainControl;
     }
 
     public static boolean createNewEvent(final JDialog frame, final ScriptArchData scriptArchData) {
@@ -58,7 +68,7 @@
         final int eventType = ScriptArchUtils.indexToEventType(eventTypeBox.getSelectedIndex());
         final String pluginName = ((String) pluginNameBox.getSelectedItem()).trim();
 
-        final File localMapDir = AbstractMainControl.getInstance().getLocalMapDir();
+        final File localMapDir = mainControl.getLocalMapDir();
 
         scriptArchData.setChanged(false);
 


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