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

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

Revision: 4953
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4953&view=rev
Author:   akirschbaum
Date:     2008-08-21 20:35:10 +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:32:37 UTC (rev 4952)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-21 20:35:10 UTC (rev 4953)
@@ -181,7 +181,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);
-        replaceDialogManager.setObjectChooser(objectChooser);
         validators = createMapValidators();
         mainActions = new MainActions<GameObject, MapArchObject, Archetype, CMapViewBasic>(replaceDialogManager, this, validators, editTypes, archetypeSet, copyBuffer, animationObjects, ACTION_FACTORY, faceObjects, objectChooser, mapManager, mapViewManager);
         GameObject.setArchetypeSet(archetypeSet, SystemIcons.getNofaceTileIcon());

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-08-21 20:32:37 UTC (rev 4952)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-08-21 20:35:10 UTC (rev 4953)
@@ -241,7 +241,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));
-        replaceDialogManager.setObjectChooser(objectChooser);
         validators = createMapValidators();
         mainActions = new MainActions<GameObject, MapArchObject, Archetype, CMapViewBasic>(replaceDialogManager, this, validators, editTypes, archetypeSet, copyBuffer, animationObjects, ACTION_FACTORY, faceObjects, objectChooser, mapManager, mapViewManager);
         GameObject.setAnimationObjects(animationObjects, SystemIcons.getNofaceTileIcon());

Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-21 20:32:37 UTC (rev 4952)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-21 20:35:10 UTC (rev 4953)
@@ -250,6 +250,7 @@
         selectedSquareControl = new SelectedSquareControl<G, A, R, V>(ACTION_FACTORY, gameObjectAttributesDialogFactory, objectChooser, mapManager, mapViewManager, editTypes, mapTileListBottom, compassIcon, archetypeSet);
         selectedSquareView = selectedSquareControl.getSelectedSquareView();
         new MapCursorControl<G, A, R, V>(key, gameObjectAttributesDialogFactory, mapManager, mapViewManager, selectedSquareControl, selectedSquareView);
+        replaceDialogManager.setObjectChooser(objectChooser);
     }
 
     /**


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