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

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

Revision: 4951
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4951&view=rev
Author:   akirschbaum
Date:     2008-08-21 20:29:48 +0000 (Thu, 21 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-21 20:13:41 UTC (rev 4950)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-21 20:29:48 UTC (rev 4951)
@@ -88,7 +88,6 @@
 import net.sf.gridarta.gui.prefs.MapValidatorPrefs;
 import net.sf.gridarta.gui.prefs.MiscPrefs;
 import net.sf.gridarta.gui.prefs.UpdatePrefs;
-import net.sf.gridarta.gui.selectedsquare.SelectedSquareView;
 import net.sf.gridarta.gui.undo.UndoControl;
 import net.sf.gridarta.io.IOUtils;
 import net.sf.gridarta.map.AutoValidator;
@@ -183,7 +182,6 @@
      */
     public CMainControl(@NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory) {
         super(gridartaObjectsFactory, new DefaultRendererFactory(), "cfeditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory(gridartaObjectsFactory), false, CResourceLoader.getHomeFile("thumbnails"), null);
-        final SelectedSquareView<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareView = selectedSquareControl.getSelectedSquareView();
         new MapCursorControl<GameObject, MapArchObject, Archetype, CMapViewBasic>("cfeditor", gameObjectAttributesDialogFactory, mapManager, mapViewManager, selectedSquareControl, selectedSquareView);
         replaceDialogManager.setObjectChooser(objectChooser);
         validators = createMapValidators();

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-08-21 20:13:41 UTC (rev 4950)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-08-21 20:29:48 UTC (rev 4951)
@@ -95,7 +95,6 @@
 import net.sf.gridarta.gui.prefs.MapValidatorPrefs;
 import net.sf.gridarta.gui.prefs.MiscPrefs;
 import net.sf.gridarta.gui.prefs.UpdatePrefs;
-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.io.IOUtils;
@@ -243,7 +242,6 @@
      */
     public CMainControl(@NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory) {
         super(gridartaObjectsFactory, new DefaultRendererFactory(), "daieditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory(gridartaObjectsFactory), true, null, GUIUtils.getSysIcon(IGUIConstants.TILE_NORTH));
-        final SelectedSquareView<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareView = selectedSquareControl.getSelectedSquareView();
         new MapCursorControl<GameObject, MapArchObject, Archetype, CMapViewBasic>("daieditor", gameObjectAttributesDialogFactory, mapManager, mapViewManager, selectedSquareControl, selectedSquareView);
         replaceDialogManager.setObjectChooser(objectChooser);
         validators = createMapValidators();

Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-21 20:13:41 UTC (rev 4950)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-21 20:29:48 UTC (rev 4951)
@@ -56,6 +56,7 @@
 import net.sf.gridarta.gui.objectchooser.DefaultObjectChooser;
 import net.sf.gridarta.gui.pickmapchooser.PickmapChooserControl;
 import net.sf.gridarta.gui.selectedsquare.SelectedSquareControl;
+import net.sf.gridarta.gui.selectedsquare.SelectedSquareView;
 import net.sf.gridarta.help.Help;
 import net.sf.gridarta.io.PathManager;
 import net.sf.gridarta.map.MapArchObject;
@@ -194,6 +195,9 @@
     @NotNull
     protected final SelectedSquareControl<G, A, R, V> selectedSquareControl;
 
+    @NotNull
+    protected final SelectedSquareView<G, A, R, V> selectedSquareView;
+
     /**
      * Creates a new instance.
      * @param gridartaObjectsFactory the gridarta objects factory
@@ -243,6 +247,7 @@
         replaceDialogManager = new ReplaceDialogManager<G, A, R, V>(mainView, archetypeSet, copyBuffer);
         objectChooser = new DefaultObjectChooser<G, A, R>(archetypeChooserControl, pickmapChooserControl);
         selectedSquareControl = new SelectedSquareControl<G, A, R, V>(ACTION_FACTORY, gameObjectAttributesDialogFactory, objectChooser, mapManager, mapViewManager, editTypes, mapTileListBottom, compassIcon, archetypeSet);
+        selectedSquareView = selectedSquareControl.getSelectedSquareView();
     }
 
     /**


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