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

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

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

Log Message:
-----------
Remove calls to MainControl.getScriptFileFilter(), MainControl.getScriptSuffix(), and MainControl.getMainView().

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/CMainControl.java
    trunk/daimonin/src/daieditor/CMainControl.java
    trunk/src/app/net/sf/gridarta/textedit/scripteditor/ScriptEditControl.java
    trunk/src/app/net/sf/gridarta/textedit/scripteditor/ScriptEditControlInstance.java

Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java	2008-07-31 21:17:53 UTC (rev 4622)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-07-31 21:27:32 UTC (rev 4623)
@@ -253,7 +253,7 @@
         updaterManager.startup();
 
         // initialize the script-editor pad
-        ScriptEditControlInstance.init(this, new File(globalSettings.getMapDefaultFolder()));
+        ScriptEditControlInstance.init(pythonFileFilter, ".py", mainView, new File(globalSettings.getMapDefaultFolder()));
 
         // load the list with archtype-data from "types.xml"
         final XmlHelper xmlHelper;

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-07-31 21:17:53 UTC (rev 4622)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-07-31 21:27:32 UTC (rev 4623)
@@ -314,7 +314,7 @@
         MultiPositionData.init(getConfigurationDirectory());
 
         // initialize the script-editor pad
-        ScriptEditControlInstance.init(this, new File(globalSettings.getMapDefaultFolder()));
+        ScriptEditControlInstance.init(luaFileFilter, ".lua", mainView, new File(globalSettings.getMapDefaultFolder()));
 
         // load the list with archtype-data from "types.xml"
         final XmlHelper xmlHelper;

Modified: trunk/src/app/net/sf/gridarta/textedit/scripteditor/ScriptEditControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/textedit/scripteditor/ScriptEditControl.java	2008-07-31 21:17:53 UTC (rev 4622)
+++ trunk/src/app/net/sf/gridarta/textedit/scripteditor/ScriptEditControl.java	2008-07-31 21:27:32 UTC (rev 4623)
@@ -23,6 +23,7 @@
 
 package net.sf.gridarta.textedit.scripteditor;
 
+import java.awt.Frame;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
@@ -30,10 +31,11 @@
 import java.util.List;
 import javax.swing.JFileChooser;
 import javax.swing.JOptionPane;
-import net.sf.gridarta.MainControl;
+import javax.swing.filechooser.FileFilter;
 import net.sf.gridarta.textedit.textarea.JEditTextArea;
 import net.sf.japi.swing.ActionFactory;
 import org.apache.log4j.Logger;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -53,8 +55,6 @@
     // last active popup is stored here
     private static CFPythonPopup activePopup = null;
 
-    private final MainControl<?, ?, ?, ?> mainControl; // gridarta main control (is null in stand-alone configuration!)
-
     private final ScriptEditView view;    // view (window with textareas)
 
     private final List<String> tabs;          // open tabs, contains absolute filenames (or "<>") in order left to right
@@ -62,10 +62,17 @@
     /** JFileChooser for opening script files. */
     private final JFileChooser openFileChooser;
 
-    public ScriptEditControl(final MainControl<?, ?, ?, ?> mainControl, final File defaultScriptDir) {
+    @NotNull
+    private FileFilter scriptFileFilter;
+
+    @NotNull
+    private String scriptSuffix;
+
+    public ScriptEditControl(@NotNull final FileFilter scriptFileFilter, @NotNull final String scriptSuffix, @NotNull final Frame owner, final File defaultScriptDir) {
+        this.scriptFileFilter = scriptFileFilter;
+        this.scriptSuffix = scriptSuffix;
         tabs = new ArrayList<String>(); // start with empty vector
-        this.mainControl = mainControl;
-        view = new ScriptEditView(this, mainControl.getMainView()); // initialize window
+        view = new ScriptEditView(this, owner); // initialize window
         openFileChooser = createOpenFileChooser(defaultScriptDir);
     }
 
@@ -115,7 +122,7 @@
         final JFileChooser fileChooser = new JFileChooser();
         fileChooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
         fileChooser.setMultiSelectionEnabled(false);
-        fileChooser.setFileFilter(mainControl.getScriptFileFilter());
+        fileChooser.setFileFilter(scriptFileFilter);
 
         // set default folder for new scripts
         if (defaultScriptDir.exists() && defaultScriptDir.isDirectory()) {
@@ -221,9 +228,9 @@
         }
 
         File file = openFileChooser.getSelectedFile();
-        if (!file.getName().endsWith(mainControl.getScriptSuffix())) {
+        if (!file.getName().endsWith(scriptSuffix)) {
             final String fname = file.getAbsolutePath();
-            file = new File(fname + mainControl.getScriptSuffix());
+            file = new File(fname + scriptSuffix);
         }
 
         // now it is our duty to doublecheck if user attempts to overwrite

Modified: trunk/src/app/net/sf/gridarta/textedit/scripteditor/ScriptEditControlInstance.java
===================================================================
--- trunk/src/app/net/sf/gridarta/textedit/scripteditor/ScriptEditControlInstance.java	2008-07-31 21:17:53 UTC (rev 4622)
+++ trunk/src/app/net/sf/gridarta/textedit/scripteditor/ScriptEditControlInstance.java	2008-07-31 21:27:32 UTC (rev 4623)
@@ -23,8 +23,10 @@
 
 package net.sf.gridarta.textedit.scripteditor;
 
+import java.awt.Frame;
 import java.io.File;
-import net.sf.gridarta.MainControl;
+import javax.swing.filechooser.FileFilter;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Utility class holding the singleton {@link ScriptEditControl} instance.
@@ -45,12 +47,14 @@
     /**
      * Init method initializes static instance of this controller. Has to be
      * called before once using this class.
-     * @param mainControl the main control instance
+     * @param scriptFileFilter the file filter for selecting script files
+     * @param scriptSuffix the file suffix for script files
+     * @param owner the owner frame for the editor
      * @param defaultScriptDir map default folder
      */
-    public static void init(final MainControl<?, ?, ?, ?> mainControl, final File defaultScriptDir) {
+    public static void init(@NotNull final FileFilter scriptFileFilter, @NotNull final String scriptSuffix, @NotNull final Frame owner, final File defaultScriptDir) {
         if (instance == null) {
-            instance = new ScriptEditControl(mainControl, defaultScriptDir);
+            instance = new ScriptEditControl(scriptFileFilter, scriptSuffix, owner, defaultScriptDir);
         }
     }
 


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