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

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

Revision: 4663
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4663&view=rev
Author:   akirschbaum
Date:     2008-08-01 21:24:32 +0000 (Fri, 01 Aug 2008)

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

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/CMainControl.java
    trunk/daimonin/src/daieditor/CMainControl.java
    trunk/src/app/net/sf/gridarta/gameobject/scripts/AbstractScriptArchEditor.java

Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-01 21:20:43 UTC (rev 4662)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-01 21:24:32 UTC (rev 4663)
@@ -321,7 +321,7 @@
             log.error("Cannot read " + CommonConstants.TYPEDEF_FILE + ": " + ex.getMessage());
         }
 
-        AbstractScriptArchEditor.initEventTypeBoxes(".py", "Python", ScriptArchUtils.createEventTypeBox(), pythonFileFilter, globalSettings);
+        AbstractScriptArchEditor.initEventTypeBoxes(".py", "Python", ScriptArchUtils.createEventTypeBox(), pythonFileFilter, globalSettings, this);
 
         // Initialize the main view
         final LockedItemsControl<GameObject, MapArchObject, Archetype, CMapViewBasic> lockedItemsControl = new LockedItemsControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(mapManager, Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_TRIGGER_ALTAR, Archetype.TYPE_DETECTOR, Archetype.TYPE_TRIGGER_MARKER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_CONTAINER);

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-08-01 21:20:43 UTC (rev 4662)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-08-01 21:24:32 UTC (rev 4663)
@@ -382,7 +382,7 @@
             log.error("Cannot read " + CommonConstants.TYPEDEF_FILE + ": " + ex.getMessage());
         }
 
-        AbstractScriptArchEditor.initEventTypeBoxes(".lua", "Lua", ScriptArchUtils.createEventTypeBox(), luaFileFilter, globalSettings);
+        AbstractScriptArchEditor.initEventTypeBoxes(".lua", "Lua", ScriptArchUtils.createEventTypeBox(), luaFileFilter, globalSettings, this);
 
         // Initialize the main view
         final LockedItemsControl<GameObject, MapArchObject, Archetype, CMapViewBasic> lockedItemsControl = new LockedItemsControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(mapManager, Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_ALTAR_TRIGGER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_SPAWN_POINT, Archetype.TYPE_CONTAINER);

Modified: trunk/src/app/net/sf/gridarta/gameobject/scripts/AbstractScriptArchEditor.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/scripts/AbstractScriptArchEditor.java	2008-08-01 21:20:43 UTC (rev 4662)
+++ trunk/src/app/net/sf/gridarta/gameobject/scripts/AbstractScriptArchEditor.java	2008-08-01 21:24:32 UTC (rev 4663)
@@ -38,8 +38,8 @@
 import javax.swing.JTextField;
 import javax.swing.WindowConstants;
 import javax.swing.filechooser.FileFilter;
-import net.sf.gridarta.AbstractMainControl;
 import net.sf.gridarta.GlobalSettings;
+import net.sf.gridarta.MainControl;
 import net.sf.gridarta.gameobject.GameObject;
 import org.apache.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
@@ -59,6 +59,9 @@
     @NotNull
     private static GlobalSettings globalSettings;
 
+    @NotNull
+    private static MainControl<?, ?, ?, ?> mainControl;
+
     protected static JComboBox pluginNameBox;
 
     // popup frame for new scripts:
@@ -83,7 +86,7 @@
      * @param eventTypeBox the <code>JComboBox</code> containing all event
      * types
      */
-    public static synchronized void initEventTypeBoxes(final String scriptEnding, final String name, final JComboBox eventTypeBox, @NotNull final FileFilter scriptFileFilter, @NotNull final GlobalSettings globalSettings) {
+    public static synchronized void initEventTypeBoxes(final String scriptEnding, final String name, final JComboBox eventTypeBox, @NotNull final FileFilter scriptFileFilter, @NotNull final GlobalSettings globalSettings, @NotNull final MainControl<?, ?, ?, ?> mainControl) {
         AbstractScriptArchEditor.scriptEnding = scriptEnding;
 
         pluginNameBox = new JComboBox(new String[] {name});
@@ -92,6 +95,7 @@
         AbstractScriptArchEditor.eventTypeBox = eventTypeBox;
         AbstractScriptArchEditor.scriptFileFilter = scriptFileFilter;
         AbstractScriptArchEditor.globalSettings = globalSettings;
+        AbstractScriptArchEditor.mainControl = mainControl;
     }
 
     /**
@@ -149,7 +153,7 @@
             browseb.setMargin(new Insets(0, 10, 0, 10));
             browseb.addActionListener(new ActionListener() {
                 public void actionPerformed(final ActionEvent e) {
-                    final File home = AbstractMainControl.getInstance().getLocalMapDir();
+                    final File home = mainControl.getLocalMapDir();
 
                     final JFileChooser fileChooser = new JFileChooser();
                     fileChooser.setDialogTitle("Select Script File");


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