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

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

Revision: 4875
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4875&view=rev
Author:   akirschbaum
Date:     2008-08-16 06:57:03 +0000 (Sat, 16 Aug 2008)

Log Message:
-----------
Move code from MainView to CMainControl.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/CMainControl.java
    trunk/daimonin/src/daieditor/CMainControl.java
    trunk/src/app/net/sf/gridarta/gui/MainView.java

Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-15 23:05:48 UTC (rev 4874)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-16 06:57:03 UTC (rev 4875)
@@ -99,6 +99,7 @@
 import net.sf.gridarta.gui.selectedsquare.SelectedSquareControl;
 import net.sf.gridarta.gui.selectedsquare.SelectedSquareView;
 import net.sf.gridarta.gui.undo.UndoControl;
+import net.sf.gridarta.help.Help;
 import net.sf.gridarta.io.IOUtils;
 import net.sf.gridarta.io.PathManager;
 import net.sf.gridarta.map.AutoValidator;
@@ -453,8 +454,9 @@
         fileControl.openFileWanted(false);
     }
 
+    /** Open the online help window. */
     public void onlineHelp() {
-        mainView.openHelpWindow();
+        new Help(mainView, null).setVisible(true);
     }
 
     /** Swing FileFilter for map files. */

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-08-15 23:05:48 UTC (rev 4874)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-08-16 06:57:03 UTC (rev 4875)
@@ -108,6 +108,7 @@
 import net.sf.gridarta.gui.selectedsquare.SelectedSquareView;
 import net.sf.gridarta.gui.undo.UndoControl;
 import net.sf.gridarta.gui.utils.GUIUtils;
+import net.sf.gridarta.help.Help;
 import net.sf.gridarta.io.IOUtils;
 import net.sf.gridarta.io.PathManager;
 import net.sf.gridarta.map.AutoValidator;
@@ -623,8 +624,9 @@
         mapManager.refreshCurrentMap();
     }
 
+    /** Open the online help window. */
     public void onlineHelp() {
-        mainView.openHelpWindow();
+        new Help(mainView, null).setVisible(true);
     }
 
     /** Swing FileFilter for map files. */

Modified: trunk/src/app/net/sf/gridarta/gui/MainView.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/MainView.java	2008-08-15 23:05:48 UTC (rev 4874)
+++ trunk/src/app/net/sf/gridarta/gui/MainView.java	2008-08-16 06:57:03 UTC (rev 4875)
@@ -56,7 +56,6 @@
 import net.sf.gridarta.gui.objectchooser.DefaultObjectChooser;
 import net.sf.gridarta.gui.utils.GUIUtils;
 import net.sf.gridarta.gui.utils.MenuUtils;
-import net.sf.gridarta.help.Help;
 import net.sf.gridarta.map.MapArchObject;
 import net.sf.gridarta.map.MapControl;
 import net.sf.japi.swing.ActionFactory;
@@ -282,11 +281,6 @@
         mapViewManager.addMapViewManagerListener(mapViewManagerListener);
     }
 
-    /** Open the online help window. */
-    public void openHelpWindow() {
-        new Help(this, null).setVisible(true);
-    }
-
     /**
      * Sets the given level view as the current one.
      * @param mapView The new current level view.


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