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

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

Revision: 5053
          http://gridarta.svn.sourceforge.net/gridarta/?rev=5053&view=rev
Author:   akirschbaum
Date:     2008-09-07 10:20:53 +0000 (Sun, 07 Sep 2008)

Log Message:
-----------
Move code to common code base.

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

Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java	2008-09-07 10:16:56 UTC (rev 5052)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-09-07 10:20:53 UTC (rev 5053)
@@ -106,12 +106,6 @@
     /** The Logger for printing log messages. */
     private static final Logger log = Logger.getLogger(CMainControl.class);
 
-    /** Preferences key for using System.exit(). */
-    public static final String PREFS_SYSTEM_EXIT = "systemExit";
-
-    /** Preferences default value for using System.exit(). */
-    public static final boolean PREFS_SYSTEM_EXIT_DEFAULT = true;
-
     /** The current script controller. */
     private ScriptController scriptControl;
 

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-09-07 10:16:56 UTC (rev 5052)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-09-07 10:20:53 UTC (rev 5053)
@@ -129,12 +129,6 @@
     /** The Logger for printing log messages. */
     private static final Logger log = Logger.getLogger(CMainControl.class);
 
-    /** Preferences key for using System.exit(). */
-    public static final String PREFS_SYSTEM_EXIT = "systemExit";
-
-    /** Preferences default value for using System.exit(). */
-    public static final boolean PREFS_SYSTEM_EXIT_DEFAULT = true;
-
     /** Preferences key for server application. */
     public static final String PREFS_APP_SERVER = "appServer";
 

Modified: trunk/daimonin/src/daieditor/gui/prefs/DevPrefs.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/prefs/DevPrefs.java	2008-09-07 10:16:56 UTC (rev 5052)
+++ trunk/daimonin/src/daieditor/gui/prefs/DevPrefs.java	2008-09-07 10:20:53 UTC (rev 5053)
@@ -19,7 +19,6 @@
 
 package daieditor.gui.prefs;
 
-import daieditor.CMainControl;
 import java.awt.Component;
 import java.util.prefs.Preferences;
 import javax.swing.Box;
@@ -27,6 +26,7 @@
 import javax.swing.border.Border;
 import javax.swing.border.CompoundBorder;
 import javax.swing.border.TitledBorder;
+import net.sf.gridarta.AbstractMainControl;
 import net.sf.gridarta.MainControl;
 import net.sf.gridarta.gui.GUIConstants;
 import net.sf.japi.swing.ActionFactory;
@@ -71,12 +71,12 @@
 
     /** {@inheritDoc} */
     public void apply() {
-        PREFS.putBoolean(CMainControl.PREFS_SYSTEM_EXIT, systemExit.isSelected());
+        PREFS.putBoolean(AbstractMainControl.PREFS_SYSTEM_EXIT, systemExit.isSelected());
     }
 
     /** {@inheritDoc} */
     public void revert() {
-        systemExit.setSelected(PREFS.getBoolean(CMainControl.PREFS_SYSTEM_EXIT, CMainControl.PREFS_SYSTEM_EXIT_DEFAULT));
+        systemExit.setSelected(PREFS.getBoolean(AbstractMainControl.PREFS_SYSTEM_EXIT, AbstractMainControl.PREFS_SYSTEM_EXIT_DEFAULT));
     }
 
     /** {@inheritDoc} */
@@ -87,7 +87,7 @@
     /** {@inheritDoc} */
     public boolean isChanged() {
         return !(
-                systemExit.isSelected() == PREFS.getBoolean(CMainControl.PREFS_SYSTEM_EXIT, CMainControl.PREFS_SYSTEM_EXIT_DEFAULT)
+                systemExit.isSelected() == PREFS.getBoolean(AbstractMainControl.PREFS_SYSTEM_EXIT, AbstractMainControl.PREFS_SYSTEM_EXIT_DEFAULT)
         );
     }
 
@@ -100,7 +100,7 @@
         miscPanel.setBorder(createTitledBorder("optionsMisc"));
 
         systemExit = new JCheckBox(ACTION_FACTORY.createAction(false, "optionsSystemExit"));
-        systemExit.setSelected(PREFS.getBoolean(CMainControl.PREFS_SYSTEM_EXIT, CMainControl.PREFS_SYSTEM_EXIT_DEFAULT));
+        systemExit.setSelected(PREFS.getBoolean(AbstractMainControl.PREFS_SYSTEM_EXIT, AbstractMainControl.PREFS_SYSTEM_EXIT_DEFAULT));
         miscPanel.add(systemExit);
         return miscPanel;
     }

Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-09-07 10:16:56 UTC (rev 5052)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-09-07 10:20:53 UTC (rev 5053)
@@ -130,6 +130,12 @@
     /** Preferences default value for username. */
     public static final String PREFS_USERNAME_DEFAULT = System.getProperty("user.name");
 
+    /** Preferences key for using System.exit(). */
+    public static final String PREFS_SYSTEM_EXIT = "systemExit";
+
+    /** Preferences default value for using System.exit(). */
+    public static final boolean PREFS_SYSTEM_EXIT_DEFAULT = true;
+
     /** The Logger for printing log messages. */
     private static final Logger log = Logger.getLogger(AbstractMainControl.class);
 


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