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

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

Revision: 4958
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4958&view=rev
Author:   akirschbaum
Date:     2008-08-21 20:59:27 +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:58:24 UTC (rev 4957)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-21 20:59:27 UTC (rev 4958)
@@ -174,7 +174,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);
-        gameObjectAttributesDialogFactory.setParent(mainView);
         new About("cfeditor", mainView);
         new UndoControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(mapManager);
         updaterManager = new UpdaterManager("cfeditor", this, mapManager, mainView, "CrossfireEditor.jar");

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-08-21 20:58:24 UTC (rev 4957)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-08-21 20:59:27 UTC (rev 4958)
@@ -234,7 +234,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));
-        gameObjectAttributesDialogFactory.setParent(mainView);
         new About("daieditor", mainView);
         new UndoControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(mapManager);
         updaterManager = new UpdaterManager("daieditor", this, mapManager, mainView, "DaimoninEditor.jar");

Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-21 20:58:24 UTC (rev 4957)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-21 20:59:27 UTC (rev 4958)
@@ -262,6 +262,7 @@
         replaceDialogManager.setObjectChooser(objectChooser);
         validators = createMapValidators();
         mainActions = new MainActions<G, A, R, V>(replaceDialogManager, this, validators, editTypes, archetypeSet, copyBuffer, animationObjects, ACTION_FACTORY, faceObjects, objectChooser, mapManager, mapViewManager);
+        gameObjectAttributesDialogFactory.setParent(mainView);
     }
 
     /**


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