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

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

Revision: 4963
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4963&view=rev
Author:   akirschbaum
Date:     2008-08-21 21:19:46 +0000 (Thu, 21 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-21 21:10:22 UTC (rev 4962)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-21 21:19:46 UTC (rev 4963)
@@ -50,7 +50,6 @@
 import java.util.MissingResourceException;
 import javax.swing.JMenu;
 import javax.swing.SwingUtilities;
-import javax.swing.filechooser.FileFilter;
 import javax.xml.parsers.ParserConfigurationException;
 import net.sf.gridarta.AbstractMainControl;
 import net.sf.gridarta.CommonConstants;
@@ -68,10 +67,8 @@
 import net.sf.gridarta.gameobject.match.GameObjectMatchers;
 import net.sf.gridarta.gameobject.match.GameObjectMatchersInstance;
 import net.sf.gridarta.gameobject.scripts.AbstractScriptArchEditor;
-import net.sf.gridarta.gui.HideFileFilterProxy;
 import net.sf.gridarta.gui.LeftPanel;
 import net.sf.gridarta.gui.MainView;
-import net.sf.gridarta.gui.MapFileFilter;
 import net.sf.gridarta.gui.RecentManager;
 import net.sf.gridarta.gui.SystemIcons;
 import net.sf.gridarta.gui.connectionview.LockedItemsControl;
@@ -112,7 +109,6 @@
 import net.sf.japi.swing.prefs.PreferencesGroup;
 import net.sf.japi.swing.prefs.PreferencesPane;
 import net.sf.japi.util.ThrowableHandler;
-import net.sf.japi.util.filter.file.EndingFileFilter;
 import org.apache.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
 import org.w3c.dom.Document;
@@ -383,12 +379,6 @@
         fileControl.openFileWanted(false);
     }
 
-    /** Swing FileFilter for map files. */
-    private static final FileFilter mapFileFilter = new HideFileFilterProxy(MapFileFilter.getInstance());
-
-    /** Swing FileFilter for Python scripts. */
-    public static final FileFilter pythonFileFilter = new HideFileFilterProxy(new EndingFileFilter(true, ACTION_FACTORY.getString("fileDialog.filter.python"), ".py"));
-
     /**
      * Returns the main view.
      * @return the main view

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-08-21 21:10:22 UTC (rev 4962)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-08-21 21:19:46 UTC (rev 4963)
@@ -54,7 +54,6 @@
 import javax.swing.JMenu;
 import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
-import javax.swing.filechooser.FileFilter;
 import javax.xml.parsers.ParserConfigurationException;
 import net.sf.gridarta.AbstractMainControl;
 import net.sf.gridarta.CommonConstants;
@@ -75,10 +74,8 @@
 import net.sf.gridarta.gameobject.match.MutableOrGameObjectMatcher;
 import net.sf.gridarta.gameobject.match.ViewGameObjectMatcherManager;
 import net.sf.gridarta.gameobject.scripts.AbstractScriptArchEditor;
-import net.sf.gridarta.gui.HideFileFilterProxy;
 import net.sf.gridarta.gui.LeftPanel;
 import net.sf.gridarta.gui.MainView;
-import net.sf.gridarta.gui.MapFileFilter;
 import net.sf.gridarta.gui.RecentManager;
 import net.sf.gridarta.gui.SystemIcons;
 import net.sf.gridarta.gui.connectionview.LockedItemsControl;
@@ -131,7 +128,6 @@
 import net.sf.japi.swing.prefs.PreferencesGroup;
 import net.sf.japi.swing.prefs.PreferencesPane;
 import net.sf.japi.util.ThrowableHandler;
-import net.sf.japi.util.filter.file.EndingFileFilter;
 import net.sf.japi.util.filter.file.Factory;
 import net.sf.japi.util.filter.file.GlobFileFilter;
 import org.apache.log4j.Logger;
@@ -558,21 +554,6 @@
         mapManager.refreshCurrentMap();
     }
 
-    /** Swing FileFilter for map files. */
-    private static final FileFilter mapFileFilter = new HideFileFilterProxy(MapFileFilter.getInstance());
-
-    /** Swing FileFilter for Lua scripts. */
-    public static final FileFilter luaFileFilter = new HideFileFilterProxy(new EndingFileFilter(true, ACTION_FACTORY.getString("fileDialog.filter.lua"), ".lua"));
-
-    /** Swing FileFilter for .arc files. */
-    public static final FileFilter arcFileFilter = new HideFileFilterProxy(new EndingFileFilter(true, ACTION_FACTORY.getString("fileDialog.filter.arc"), ".arc"));
-
-    /** Swing FileFilter for .anim files. */
-    public static final FileFilter animFileFilter = new HideFileFilterProxy(new EndingFileFilter(true, ACTION_FACTORY.getString("fileDialog.filter.anim"), ".anim"));
-
-    /** Swing FileFilter for all unignored files. */
-    public static final FileFilter unignoredFilter = new HideFileFilterProxy(new EndingFileFilter(true, ACTION_FACTORY.getString("fileDialog.filter.unignored"), ""));
-
     /**
      * Returns the main view.
      * @return the main view

Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-21 21:10:22 UTC (rev 4962)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-21 21:19:46 UTC (rev 4963)
@@ -41,6 +41,7 @@
 import net.sf.gridarta.gui.HideFileFilterProxy;
 import net.sf.gridarta.gui.MainActions;
 import net.sf.gridarta.gui.MainView;
+import net.sf.gridarta.gui.MapFileFilter;
 import net.sf.gridarta.gui.MapManagerActions;
 import net.sf.gridarta.gui.MapPreview;
 import net.sf.gridarta.gui.MapViewManager;
@@ -102,6 +103,24 @@
     /** Swing FileFilter for png graphics. */
     public static final FileFilter pngFileFilter = new HideFileFilterProxy(new EndingFileFilter(true, ACTION_FACTORY.getString("fileDialog.filter.png"), ".png"));
 
+    /** Swing FileFilter for map files. */
+    protected static final FileFilter mapFileFilter = new HideFileFilterProxy(MapFileFilter.getInstance());
+
+    /** Swing FileFilter for Python scripts. */
+    public static final FileFilter pythonFileFilter = new HideFileFilterProxy(new EndingFileFilter(true, ACTION_FACTORY.getString("fileDialog.filter.python"), ".py"));
+
+    /** Swing FileFilter for Lua scripts. */
+    public static final FileFilter luaFileFilter = new HideFileFilterProxy(new EndingFileFilter(true, ACTION_FACTORY.getString("fileDialog.filter.lua"), ".lua"));
+
+    /** Swing FileFilter for .arc files. */
+    public static final FileFilter arcFileFilter = new HideFileFilterProxy(new EndingFileFilter(true, ACTION_FACTORY.getString("fileDialog.filter.arc"), ".arc"));
+
+    /** Swing FileFilter for .anim files. */
+    public static final FileFilter animFileFilter = new HideFileFilterProxy(new EndingFileFilter(true, ACTION_FACTORY.getString("fileDialog.filter.anim"), ".anim"));
+
+    /** Swing FileFilter for all unignored files. */
+    public static final FileFilter unignoredFilter = new HideFileFilterProxy(new EndingFileFilter(true, ACTION_FACTORY.getString("fileDialog.filter.unignored"), ""));
+
     /** The map control factory. */
     protected final MapControlFactory<G, A, R, V> mapControlFactory;
 


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