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

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

Revision: 4932
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4932&view=rev
Author:   akirschbaum
Date:     2008-08-20 20:34:41 +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 20:32:48 UTC (rev 4931)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-20 20:34:41 UTC (rev 4932)
@@ -84,7 +84,6 @@
 import net.sf.gridarta.gui.map.tools.ToolPalette;
 import net.sf.gridarta.gui.newmap.NewMapDialogFactory;
 import net.sf.gridarta.gui.objectchoicedisplay.ObjectChoiceDisplay;
-import net.sf.gridarta.gui.objectchooser.DefaultObjectChooser;
 import net.sf.gridarta.gui.objectchooser.ObjectChooser;
 import net.sf.gridarta.gui.prefs.MapValidatorPrefs;
 import net.sf.gridarta.gui.prefs.MiscPrefs;
@@ -148,9 +147,6 @@
     /** Preferences default value for using System.exit(). */
     public static final boolean PREFS_SYSTEM_EXIT_DEFAULT = true;
 
-    /** The object chooser. */
-    private final DefaultObjectChooser<GameObject, MapArchObject, Archetype> objectChooser;
-
     /** The Spells. */
     private final Spells<NumberSpell> numberSpells = new Spells<NumberSpell>();
 
@@ -187,7 +183,6 @@
      */
     public CMainControl() {
         super(new CrossfireObjectsFactory(), new DefaultRendererFactory(), "cfeditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory(), false, CResourceLoader.getHomeFile("thumbnails"));
-        objectChooser = new DefaultObjectChooser<GameObject, MapArchObject, Archetype>(archetypeChooserControl, pickmapChooserControl);
         final SelectedSquareControl<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareControl = new SelectedSquareControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(ACTION_FACTORY, gameObjectAttributesDialogFactory, objectChooser, mapManager, mapViewManager, editTypes, mapTileListBottom, null, archetypeSet);
         final SelectedSquareView<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareView = selectedSquareControl.getSelectedSquareView();
         new MapCursorControl<GameObject, MapArchObject, Archetype, CMapViewBasic>("cfeditor", gameObjectAttributesDialogFactory, mapManager, mapViewManager, selectedSquareControl, selectedSquareView);

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-08-20 20:32:48 UTC (rev 4931)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-08-20 20:34:41 UTC (rev 4932)
@@ -91,7 +91,6 @@
 import net.sf.gridarta.gui.map.tools.ToolPalette;
 import net.sf.gridarta.gui.newmap.NewMapDialogFactory;
 import net.sf.gridarta.gui.objectchoicedisplay.ObjectChoiceDisplay;
-import net.sf.gridarta.gui.objectchooser.DefaultObjectChooser;
 import net.sf.gridarta.gui.objectchooser.ObjectChooser;
 import net.sf.gridarta.gui.prefs.MapValidatorPrefs;
 import net.sf.gridarta.gui.prefs.MiscPrefs;
@@ -187,9 +186,6 @@
     /** Preferences default value for editor application. */
     public static final String PREFS_APP_EDITOR_DEFAULT = "vim";
 
-    /** The object chooser. */
-    private final DefaultObjectChooser<GameObject, MapArchObject, Archetype> objectChooser;
-
     /** Bit field of edit types to show transparent. */
     private int alphaType;
 
@@ -247,7 +243,6 @@
      */
     public CMainControl() {
         super(new DaimoninObjectsFactory(), new DefaultRendererFactory(), "daieditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory(), true, null);
-        objectChooser = new DefaultObjectChooser<GameObject, MapArchObject, Archetype>(archetypeChooserControl, pickmapChooserControl);
         final SelectedSquareControl<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareControl = new SelectedSquareControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(ACTION_FACTORY, gameObjectAttributesDialogFactory, objectChooser, mapManager, mapViewManager, editTypes, mapTileListBottom, GUIUtils.getSysIcon(IGUIConstants.TILE_NORTH), archetypeSet);
         final SelectedSquareView<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareView = selectedSquareControl.getSelectedSquareView();
         new MapCursorControl<GameObject, MapArchObject, Archetype, CMapViewBasic>("daieditor", gameObjectAttributesDialogFactory, mapManager, mapViewManager, selectedSquareControl, selectedSquareView);

Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-20 20:32:48 UTC (rev 4931)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-20 20:34:41 UTC (rev 4932)
@@ -53,6 +53,7 @@
 import net.sf.gridarta.gui.map.MapViewBasic;
 import net.sf.gridarta.gui.map.RendererFactory;
 import net.sf.gridarta.gui.newmap.NewMapDialogFactory;
+import net.sf.gridarta.gui.objectchooser.DefaultObjectChooser;
 import net.sf.gridarta.gui.pickmapchooser.PickmapChooserControl;
 import net.sf.gridarta.help.Help;
 import net.sf.gridarta.io.PathManager;
@@ -187,6 +188,12 @@
     protected final ReplaceDialogManager<G, A, R, V> replaceDialogManager;
 
     /**
+     * The object chooser.
+     */
+    @NotNull
+    protected final DefaultObjectChooser<G, A, R> objectChooser;
+
+    /**
      * Creates a new instance.
      * @param gridartaObjectsFactory the gridarta objects factory
      * @param rendererFactory the renderer factory
@@ -231,6 +238,7 @@
         createMapImageCache(mapImageCacheDir, SystemIcons.getDefaultIcon(), SystemIcons.getDefaultPreview(), new StatusBar<G, A, R, V>(mapManager, mapViewManager, archetypeSet, faceObjects));
         mainView = new MainView<G, A, R, V>(this, editTypes, mapManager, mapViewManager, ACTION_FACTORY, mapManagerActions.getCloseAllAction(), statusBar);
         replaceDialogManager = new ReplaceDialogManager<G, A, R, V>(mainView, archetypeSet, copyBuffer);
+        objectChooser = new DefaultObjectChooser<G, A, R>(archetypeChooserControl, pickmapChooserControl);
     }
 
     /**


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