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

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

Revision: 4697
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4697&view=rev
Author:   akirschbaum
Date:     2008-08-02 07:50:03 +0000 (Sat, 02 Aug 2008)

Log Message:
-----------
Remove AbstractMainControl.getMapPreviewAccessory() and AbstractMainControl.attachToMapPreviewAccessory().

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-02 07:42:50 UTC (rev 4696)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-02 07:50:03 UTC (rev 4697)
@@ -348,7 +348,7 @@
         copyBuffer.init(gridartaObjectsFactory.newMapArchObject(false));
         mainActions.init();
 
-        final RecentManager recentManager = new RecentManager(mapManager, (JMenu) ACTION_FACTORY.find(mainView.getJMenuBar(), "recent"), globalSettings, getMapPreviewAccessory());
+        final RecentManager recentManager = new RecentManager(mapManager, (JMenu) ACTION_FACTORY.find(mainView.getJMenuBar(), "recent"), globalSettings, mapPreviewAccessory);
         mapManager.setRecentManager(recentManager);
 
         // browse arch archive
@@ -514,7 +514,7 @@
         if (globalSettings.getMapDir().exists()) {
             fileChooser.setCurrentDirectory(globalSettings.getMapDir());
         }
-        attachToMapPreviewAccessory(fileChooser);
+        mapPreviewAccessory.attachTo(fileChooser);
     }
 
     /**

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-08-02 07:42:50 UTC (rev 4696)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-08-02 07:50:03 UTC (rev 4697)
@@ -129,7 +129,6 @@
 import net.sf.gridarta.map.validation.checks.UndefinedArchetypeChecker;
 import net.sf.gridarta.map.validation.checks.UnsetSlayingChecker;
 import net.sf.gridarta.spells.GameObjectSpell;
-import net.sf.gridarta.spells.NumberSpell;
 import net.sf.gridarta.spells.Spells;
 import net.sf.gridarta.spells.XMLSpellLoader;
 import net.sf.gridarta.textedit.scripteditor.ScriptEditControlInstance;
@@ -432,7 +431,7 @@
             }
         }
 
-        final RecentManager recentManager = new RecentManager(mapManager, (JMenu) ACTION_FACTORY.find(mainView.getJMenuBar(), "recent"), globalSettings, getMapPreviewAccessory());
+        final RecentManager recentManager = new RecentManager(mapManager, (JMenu) ACTION_FACTORY.find(mainView.getJMenuBar(), "recent"), globalSettings, mapPreviewAccessory);
         mapManager.setRecentManager(recentManager);
 
         // browse arch archive
@@ -697,7 +696,7 @@
         if (globalSettings.getMapDir().exists()) {
             fileChooser.setCurrentDirectory(globalSettings.getMapDir());
         }
-        attachToMapPreviewAccessory(fileChooser);
+        mapPreviewAccessory.attachTo(fileChooser);
     }
 
     /**

Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-02 07:42:50 UTC (rev 4696)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-02 07:50:03 UTC (rev 4697)
@@ -86,7 +86,7 @@
     protected MapImageCache<G, A, R, V> mapImageCache = null;
 
     /** MapPreviewAccessory. */
-    private MapPreviewAccessory mapPreviewAccessory;
+    protected MapPreviewAccessory mapPreviewAccessory;
 
     /** The autojoin lists. */
     protected final AutojoinLists<G, A, R> autojoinLists = new AutojoinLists<G, A, R>();
@@ -132,22 +132,6 @@
 
     }
 
-    /**
-     * Return the map preview accessory.
-     * @return the map preview accessory
-     */
-    protected MapPreviewAccessory getMapPreviewAccessory() {
-        return mapPreviewAccessory;
-    }
-
-    /**
-     * Attach the given file chooser to the map preview accessory.
-     * @param fileChooser The file chooser to modify.
-     */
-    protected void attachToMapPreviewAccessory(@NotNull final JFileChooser fileChooser) {
-        mapPreviewAccessory.attachTo(fileChooser);
-    }
-
     /** {@inheritDoc} */
     public File getLocalMapDir() {
         final MapControl<G, A, R, V> mapControl = mapManager.getCurrentMap();


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