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

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

Revision: 4879
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4879&view=rev
Author:   akirschbaum
Date:     2008-08-16 07:12:25 +0000 (Sat, 16 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-16 07:09:21 UTC (rev 4878)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-16 07:12:25 UTC (rev 4879)
@@ -46,7 +46,6 @@
 import java.util.MissingResourceException;
 import java.util.prefs.Preferences;
 import javax.swing.JMenu;
-import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
 import javax.swing.filechooser.FileFilter;
 import javax.xml.parsers.ParserConfigurationException;
@@ -73,7 +72,6 @@
 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;
 import net.sf.gridarta.gui.RecentManager;
 import net.sf.gridarta.gui.ReplaceDialogManager;
@@ -590,16 +588,6 @@
         mainView.handleThrowable(t);
     }
 
-    /** Calls for zooming preview tool. */
-    public void zoom() {
-        final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> currentMap = mapManager.getCurrentMap();
-        if (currentMap == null) {
-            JOptionPane.showMessageDialog(mainView, "No map loaded! Please load a map!!", "Error", JOptionPane.ERROR_MESSAGE);
-            return;
-        }
-        new MapPreview(gridartaObjectsFactory.newSimpleLevelRenderer(currentMap.getMapModel()).getFullImage());
-    }
-
     /** {@inheritDoc} */
     @NotNull
     public String getConfigurationDirectory() {

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-08-16 07:09:21 UTC (rev 4878)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-08-16 07:12:25 UTC (rev 4879)
@@ -81,7 +81,6 @@
 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;
 import net.sf.gridarta.gui.RecentManager;
 import net.sf.gridarta.gui.ReplaceDialogManager;
@@ -790,16 +789,6 @@
         mainView.handleThrowable(t);
     }
 
-    /** Calls for zooming preview tool. */
-    public void zoom() {
-        final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> currentMap = mapManager.getCurrentMap();
-        if (currentMap == null) {
-            JOptionPane.showMessageDialog(mainView, "No map loaded! Please load a map!!", "Error", JOptionPane.ERROR_MESSAGE);
-            return;
-        }
-        new MapPreview(gridartaObjectsFactory.newSimpleLevelRenderer(currentMap.getMapModel()).getFullImage());
-    }
-
     /** {@inheritDoc} */
     @NotNull
     public String getConfigurationDirectory() {

Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-16 07:09:21 UTC (rev 4878)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-16 07:12:25 UTC (rev 4879)
@@ -36,12 +36,14 @@
 import net.sf.gridarta.gameobject.scripts.ScriptedEvent;
 import net.sf.gridarta.gameobject.scripts.ScriptedEventEditor;
 import net.sf.gridarta.gui.HideFileFilterProxy;
+import net.sf.gridarta.gui.MapPreview;
 import net.sf.gridarta.gui.StatusBar;
 import net.sf.gridarta.gui.map.MapPreviewAccessory;
 import net.sf.gridarta.gui.map.MapView;
 import net.sf.gridarta.gui.map.MapViewBasic;
 import net.sf.gridarta.help.Help;
 import net.sf.gridarta.map.MapArchObject;
+import net.sf.gridarta.map.MapControl;
 import net.sf.gridarta.textedit.scripteditor.ScriptEditControlInstance;
 import net.sf.gridarta.updater.UpdaterManager;
 import net.sf.japi.swing.ActionFactory;
@@ -269,4 +271,14 @@
         TipOfTheDayManager.show(getMainView());
     }
 
+    /** Calls for zooming preview tool. */
+    public void zoom() {
+        final MapControl<G, A, R, V> currentMap = mapManager.getCurrentMap();
+        if (currentMap == null) {
+            JOptionPane.showMessageDialog(getMainView(), "No map loaded! Please load a map!!", "Error", JOptionPane.ERROR_MESSAGE);
+            return;
+        }
+        new MapPreview(gridartaObjectsFactory.newSimpleLevelRenderer(currentMap.getMapModel()).getFullImage());
+    }
+
 } // class AbstractMainControl


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