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

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

Revision: 4930
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4930&view=rev
Author:   akirschbaum
Date:     2008-08-20 20:30:07 +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:27:49 UTC (rev 4929)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-20 20:30:07 UTC (rev 4930)
@@ -152,9 +152,6 @@
     /** The object chooser. */
     private final DefaultObjectChooser<GameObject, MapArchObject, Archetype> objectChooser;
 
-    /** The main view. */
-    private final MainView<GameObject, MapArchObject, Archetype, CMapViewBasic> mainView;
-
     /** The Spells. */
     private final Spells<NumberSpell> numberSpells = new Spells<NumberSpell>();
 
@@ -191,7 +188,6 @@
      */
     public CMainControl() {
         super(new CrossfireObjectsFactory(), new DefaultRendererFactory(), "cfeditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory(), false, CResourceLoader.getHomeFile("thumbnails"));
-        mainView = new MainView<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, editTypes, mapManager, mapViewManager, ACTION_FACTORY, mapManagerActions.getCloseAllAction(), statusBar);
         final ReplaceDialogManager<GameObject, MapArchObject, Archetype, CMapViewBasic> replaceDialogManager = new ReplaceDialogManager<GameObject, MapArchObject, Archetype, CMapViewBasic>(mainView, archetypeSet, copyBuffer);
         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);

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-08-20 20:27:49 UTC (rev 4929)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-08-20 20:30:07 UTC (rev 4930)
@@ -191,9 +191,6 @@
     /** The object chooser. */
     private final DefaultObjectChooser<GameObject, MapArchObject, Archetype> objectChooser;
 
-    /** The main view. */
-    private final MainView<GameObject, MapArchObject, Archetype, CMapViewBasic> mainView;
-
     /** Bit field of edit types to show transparent. */
     private int alphaType;
 
@@ -251,7 +248,6 @@
      */
     public CMainControl() {
         super(new DaimoninObjectsFactory(), new DefaultRendererFactory(), "daieditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory(), true, null);
-        mainView = new MainView<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, editTypes, mapManager, mapViewManager, ACTION_FACTORY, mapManagerActions.getCloseAllAction(), statusBar);
         final ReplaceDialogManager<GameObject, MapArchObject, Archetype, CMapViewBasic> replaceDialogManager = new ReplaceDialogManager<GameObject, MapArchObject, Archetype, CMapViewBasic>(mainView, archetypeSet, copyBuffer);
         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);

Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-20 20:27:49 UTC (rev 4929)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-20 20:30:07 UTC (rev 4930)
@@ -178,6 +178,10 @@
     @NotNull
     protected final MapViewManager<G, A, R, V> mapViewManager;
 
+    /** The main view. */
+    @NotNull
+    protected final MainView<G, A, R, V> mainView;
+
     /**
      * Creates a new instance.
      * @param gridartaObjectsFactory the gridarta objects factory
@@ -221,6 +225,7 @@
         mapViewManager = new MapViewManager<G, A, R, V>();
         SystemIcons.init();
         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);
     }
 
     /**


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