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

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

Revision: 4960
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4960&view=rev
Author:   akirschbaum
Date:     2008-08-21 21:01:32 +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 21:00:37 UTC (rev 4959)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-21 21:01:32 UTC (rev 4960)
@@ -85,7 +85,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.undo.UndoControl;
 import net.sf.gridarta.io.IOUtils;
 import net.sf.gridarta.map.AutoValidator;
 import net.sf.gridarta.map.InsertionMode;
@@ -173,7 +172,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);
-        new UndoControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(mapManager);
         updaterManager = new UpdaterManager("cfeditor", this, mapManager, mainView, "CrossfireEditor.jar");
         updaterManager.startup();
 

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-08-21 21:00:37 UTC (rev 4959)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-08-21 21:01:32 UTC (rev 4960)
@@ -92,7 +92,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.undo.UndoControl;
 import net.sf.gridarta.gui.utils.GUIUtils;
 import net.sf.gridarta.io.IOUtils;
 import net.sf.gridarta.map.AutoValidator;
@@ -233,7 +232,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));
-        new UndoControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(mapManager);
         updaterManager = new UpdaterManager("daieditor", this, mapManager, mainView, "DaimoninEditor.jar");
         updaterManager.startup();
 

Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-21 21:00:37 UTC (rev 4959)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-21 21:01:32 UTC (rev 4960)
@@ -60,6 +60,7 @@
 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.gui.undo.UndoControl;
 import net.sf.gridarta.help.Help;
 import net.sf.gridarta.io.PathManager;
 import net.sf.gridarta.map.MapArchObject;
@@ -265,6 +266,7 @@
         mainActions = new MainActions<G, A, R, V>(replaceDialogManager, this, validators, editTypes, archetypeSet, copyBuffer, animationObjects, ACTION_FACTORY, faceObjects, objectChooser, mapManager, mapViewManager);
         gameObjectAttributesDialogFactory.setParent(mainView);
         new About(key, mainView);
+        new UndoControl<G, A, R, V>(mapManager);
     }
 
     /**


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