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

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

Revision: 4619
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4619&view=rev
Author:   akirschbaum
Date:     2008-07-31 21:13:19 +0000 (Thu, 31 Jul 2008)

Log Message:
-----------
Remove calls to Abstract[CMainControl.getInstance() and MainControl.getScriptFileFilter().

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-07-31 21:07:38 UTC (rev 4618)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-07-31 21:13:19 UTC (rev 4619)
@@ -319,7 +319,7 @@
             log.error("Cannot read " + CommonConstants.TYPEDEF_FILE + ": " + ex.getMessage());
         }
 
-        AbstractScriptArchEditor.initEventTypeBoxes(".py", "Python", ScriptArchUtils.createEventTypeBox());
+        AbstractScriptArchEditor.initEventTypeBoxes(".py", "Python", ScriptArchUtils.createEventTypeBox(), pythonFileFilter);
 
         // Initialize the main view
         final LockedItemsControl<GameObject, MapArchObject, Archetype, CMapViewBasic> lockedItemsControl = new LockedItemsControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(getMapManager(), 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-07-31 21:07:38 UTC (rev 4618)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-07-31 21:13:19 UTC (rev 4619)
@@ -380,7 +380,7 @@
             log.error("Cannot read " + CommonConstants.TYPEDEF_FILE + ": " + ex.getMessage());
         }
 
-        AbstractScriptArchEditor.initEventTypeBoxes(".lua", "Lua", ScriptArchUtils.createEventTypeBox());
+        AbstractScriptArchEditor.initEventTypeBoxes(".lua", "Lua", ScriptArchUtils.createEventTypeBox(), luaFileFilter);
 
         // Initialize the main view
         final LockedItemsControl<GameObject, MapArchObject, Archetype, CMapViewBasic> lockedItemsControl = new LockedItemsControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(getMapManager(), 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-07-31 21:07:38 UTC (rev 4618)
+++ trunk/src/app/net/sf/gridarta/gameobject/scripts/AbstractScriptArchEditor.java	2008-07-31 21:13:19 UTC (rev 4619)
@@ -36,9 +36,11 @@
 import javax.swing.JPanel;
 import javax.swing.JTextField;
 import javax.swing.WindowConstants;
+import javax.swing.filechooser.FileFilter;
 import net.sf.gridarta.AbstractMainControl;
 import net.sf.gridarta.gameobject.GameObject;
 import org.apache.log4j.Logger;
+import org.jetbrains.annotations.NotNull;
 
 public abstract class AbstractScriptArchEditor {
 
@@ -50,6 +52,8 @@
 
     protected static JComboBox eventTypeBox;
 
+    private static FileFilter scriptFileFilter;
+
     protected static JComboBox pluginNameBox;
 
     // popup frame for new scripts:
@@ -74,13 +78,14 @@
      * @param eventTypeBox the <code>JComboBox</code> containing all event
      * types
      */
-    public static synchronized void initEventTypeBoxes(final String ending, final String name, final JComboBox eventTypeBox) {
+    public static synchronized void initEventTypeBoxes(final String ending, final String name, final JComboBox eventTypeBox, @NotNull final FileFilter scriptFileFilter) {
         scriptEnding = ending;
 
         pluginNameBox = new JComboBox(new String[] {name});
         pluginNameBox.setSelectedIndex(0);
 
         AbstractScriptArchEditor.eventTypeBox = eventTypeBox;
+        AbstractScriptArchEditor.scriptFileFilter = scriptFileFilter;
     }
 
     /**
@@ -144,7 +149,7 @@
                     fileChooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
                     fileChooser.setCurrentDirectory(home);
                     fileChooser.setMultiSelectionEnabled(false);
-                    fileChooser.setFileFilter(AbstractMainControl.getInstance().getScriptFileFilter());
+                    fileChooser.setFileFilter(scriptFileFilter);
 
                     if (fileChooser.showOpenDialog(newScriptFrame) == JFileChooser.APPROVE_OPTION) {
                         // user has selected a file


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