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

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

Revision: 4917
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4917&view=rev
Author:   akirschbaum
Date:     2008-08-20 19:55:50 +0000 (Wed, 20 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-20 19:50:17 UTC (rev 4916)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-20 19:55:50 UTC (rev 4917)
@@ -48,7 +48,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.MissingResourceException;
-import java.util.prefs.Preferences;
 import javax.swing.JMenu;
 import javax.swing.SwingUtilities;
 import javax.swing.filechooser.FileFilter;
@@ -59,7 +58,6 @@
 import net.sf.gridarta.FileControl;
 import net.sf.gridarta.GlobalSettings;
 import net.sf.gridarta.GridartaObjectsFactory;
-import net.sf.gridarta.MainControl;
 import net.sf.gridarta.MapManager;
 import net.sf.gridarta.XmlHelper;
 import net.sf.gridarta.archtype.ArchetypeAttributeParser;
@@ -153,9 +151,6 @@
     /** The Logger for printing log messages. */
     private static final Logger log = Logger.getLogger(CMainControl.class);
 
-    /** Preferences. */
-    private static final Preferences prefs = Preferences.userNodeForPackage(MainControl.class);
-
     /** Preferences key for using System.exit(). */
     public static final String PREFS_SYSTEM_EXIT = "systemExit";
 
@@ -213,7 +208,6 @@
      */
     public CMainControl() {
         super(new CrossfireObjectsFactory(), new DefaultRendererFactory(), "cfeditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory());
-        final boolean mapTileListBottom = prefs.getBoolean(MainView.MAP_TILE_LIST_BOTTOM_KEY, MainView.MAP_TILE_LIST_BOTTOM_DEFAULT);
         final MapManagerActions<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManagerActions = new MapManagerActions<GameObject, MapArchObject, Archetype, CMapViewBasic>(mapManager);
         final ArchetypeChooserModel<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserModel = new ArchetypeChooserModel<GameObject, MapArchObject, Archetype, CMapViewBasic>(archetypeSet);
         final ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserControl = new ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(archetypeChooserModel);

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-08-20 19:50:17 UTC (rev 4916)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-08-20 19:55:50 UTC (rev 4917)
@@ -51,7 +51,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.MissingResourceException;
-import java.util.prefs.Preferences;
 import javax.swing.JMenu;
 import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
@@ -63,7 +62,6 @@
 import net.sf.gridarta.FileControl;
 import net.sf.gridarta.GlobalSettings;
 import net.sf.gridarta.GridartaObjectsFactory;
-import net.sf.gridarta.MainControl;
 import net.sf.gridarta.MapManager;
 import net.sf.gridarta.XmlHelper;
 import net.sf.gridarta.archtype.ArchetypeAttributeParser;
@@ -174,9 +172,6 @@
     /** The Logger for printing log messages. */
     private static final Logger log = Logger.getLogger(CMainControl.class);
 
-    /** Preferences. */
-    private static final Preferences prefs = Preferences.userNodeForPackage(MainControl.class);
-
     /** Preferences key for using System.exit(). */
     public static final String PREFS_SYSTEM_EXIT = "systemExit";
 
@@ -267,7 +262,6 @@
      */
     public CMainControl() {
         super(new DaimoninObjectsFactory(), new DefaultRendererFactory(), "daieditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory());
-        final boolean mapTileListBottom = prefs.getBoolean(MainView.MAP_TILE_LIST_BOTTOM_KEY, MainView.MAP_TILE_LIST_BOTTOM_DEFAULT);
         final MapManagerActions<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManagerActions = new MapManagerActions<GameObject, MapArchObject, Archetype, CMapViewBasic>(mapManager);
         final ArchetypeChooserModel<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserModel = new ArchetypeChooserModel<GameObject, MapArchObject, Archetype, CMapViewBasic>(archetypeSet);
         final ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserControl = new ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(archetypeChooserModel);

Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-20 19:50:17 UTC (rev 4916)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-20 19:55:50 UTC (rev 4917)
@@ -23,6 +23,7 @@
 import java.io.IOException;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
+import java.util.prefs.Preferences;
 import javax.swing.ImageIcon;
 import javax.swing.JFileChooser;
 import javax.swing.JOptionPane;
@@ -36,6 +37,7 @@
 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.MainView;
 import net.sf.gridarta.gui.MapPreview;
 import net.sf.gridarta.gui.StatusBar;
 import net.sf.gridarta.gui.map.MapPreviewAccessory;
@@ -74,6 +76,9 @@
     /** The Logger for printing log messages. */
     private static final Logger log = Logger.getLogger(AbstractMainControl.class);
 
+    /** Preferences. */
+    protected static final Preferences prefs = Preferences.userNodeForPackage(MainControl.class);
+
     /** Action Factory. */
     private static final ActionFactory ACTION_FACTORY = ActionFactory.getFactory("net.sf.gridarta");
 
@@ -141,6 +146,8 @@
     @NotNull
     protected final NewMapDialogFactory<G, A, R, V> newMapDialogFactory;
 
+    protected final boolean mapTileListBottom;
+
     /**
      * Creates a new instance.
      * @param gridartaObjectsFactory the gridarta objects factory
@@ -169,6 +176,7 @@
         ScriptedEvent.init(archetypeSet);
         PathManager.setGlobalSettings(globalSettings);
         newMapDialogFactory = newNewMapDialogFactory(mapManager, gridartaObjectsFactory);
+        mapTileListBottom = prefs.getBoolean(MainView.MAP_TILE_LIST_BOTTOM_KEY, MainView.MAP_TILE_LIST_BOTTOM_DEFAULT);
     }
 
     /**


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