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

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

Revision: 4995
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4995&view=rev
Author:   akirschbaum
Date:     2008-08-22 18:21:48 +0000 (Fri, 22 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-22 18:12:23 UTC (rev 4994)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-22 18:21:48 UTC (rev 4995)
@@ -369,11 +369,10 @@
     public void reloadFaces() {
     }
 
-    /** Invoked when user wants to exit from the program. */
-    public void exit() {
-        if (ScriptEditControlInstance.getInstance().closeAllTabs() && mapManager.closeAll() && pickmapChooserControl.canExit() && scriptControl.canExit()) {
-            doExit();
-        }
+    /** {@inheritDoc} */
+    @Override
+    public boolean canExit() {
+        return super.canExit() && scriptControl.canExit();
     }
 
     /** {@inheritDoc} */

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-08-22 18:12:23 UTC (rev 4994)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-08-22 18:21:48 UTC (rev 4995)
@@ -537,13 +537,6 @@
         FaceObjectProviders.reloadAll();
     }
 
-    /** Invoked when user wants to exit from the program. */
-    public void exit() {
-        if (ScriptEditControlInstance.getInstance().closeAllTabs() && mapManager.closeAll() && pickmapChooserControl.canExit()) {
-            doExit();
-        }
-    }
-
     /** {@inheritDoc} */
     public void doExit() {
         mainView.setEnabled(false);

Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-22 18:12:23 UTC (rev 4994)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-22 18:21:48 UTC (rev 4995)
@@ -680,4 +680,20 @@
     @NotNull
     protected abstract PreferencesGroup createPreferencesGroup();
 
+    /** Invoked when user wants to exit from the program. */
+    public void exit() {
+        if (canExit()) {
+            doExit();
+        }
+    }
+
+    /**
+     * Prepares existing the application: save modified data (possibly ask the
+     * user if applicable).
+     * @return whether all modified data has been saved
+     */
+    protected boolean canExit() {
+        return ScriptEditControlInstance.getInstance().closeAllTabs() && mapManager.closeAll() && pickmapChooserControl.canExit();
+    }
+
 } // class AbstractMainControl


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