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

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

Revision: 4955
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4955&view=rev
Author:   akirschbaum
Date:     2008-08-21 20:45:17 +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:42:52 UTC (rev 4954)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-21 20:45:17 UTC (rev 4955)
@@ -71,7 +71,6 @@
 import net.sf.gridarta.gui.About;
 import net.sf.gridarta.gui.HideFileFilterProxy;
 import net.sf.gridarta.gui.LeftPanel;
-import net.sf.gridarta.gui.MainActions;
 import net.sf.gridarta.gui.MainView;
 import net.sf.gridarta.gui.MapFileFilter;
 import net.sf.gridarta.gui.RecentManager;
@@ -156,9 +155,6 @@
     /** Preferences default for auto validation. */
     private static final boolean PREFS_VALIDATOR_AUTO_DEFAULT = true;
 
-    /** Actions used by this instance. */
-    private final MainActions<GameObject, MapArchObject, Archetype, CMapViewBasic> mainActions;
-
     /** The treasure lists. */
     private final CFTreasureListTree<GameObject, MapArchObject, Archetype> treasureListTree;
 
@@ -178,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);
-        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());
         gameObjectAttributesDialogFactory.setParent(mainView);
         new About("cfeditor", mainView);

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-08-21 20:42:52 UTC (rev 4954)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-08-21 20:45:17 UTC (rev 4955)
@@ -78,7 +78,6 @@
 import net.sf.gridarta.gui.About;
 import net.sf.gridarta.gui.HideFileFilterProxy;
 import net.sf.gridarta.gui.LeftPanel;
-import net.sf.gridarta.gui.MainActions;
 import net.sf.gridarta.gui.MainView;
 import net.sf.gridarta.gui.MapFileFilter;
 import net.sf.gridarta.gui.RecentManager;
@@ -216,9 +215,6 @@
     /** The ViewGameObjectMatcherManager for alpha. */
     private final ViewGameObjectMatcherManager vaommAlpha = new ViewGameObjectMatcherManager(moaomAlpha);
 
-    /** Actions used by this instance. */
-    private final MainActions<GameObject, MapArchObject, Archetype, CMapViewBasic> mainActions;
-
     /** The treasure lists. */
     private final CFTreasureListTree<GameObject, MapArchObject, Archetype> treasureListTree;
 
@@ -238,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));
-        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());
         gameObjectAttributesDialogFactory.setParent(mainView);
         new About("daieditor", mainView);

Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-21 20:42:52 UTC (rev 4954)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-21 20:45:17 UTC (rev 4955)
@@ -38,6 +38,7 @@
 import net.sf.gridarta.gameobject.scripts.ScriptedEvent;
 import net.sf.gridarta.gameobject.scripts.ScriptedEventEditor;
 import net.sf.gridarta.gui.HideFileFilterProxy;
+import net.sf.gridarta.gui.MainActions;
 import net.sf.gridarta.gui.MainView;
 import net.sf.gridarta.gui.MapManagerActions;
 import net.sf.gridarta.gui.MapPreview;
@@ -203,6 +204,10 @@
     /** The map validators. */
     protected final DelegatingMapValidator<G, A, R> validators;
 
+    /** Actions used by this instance. */
+    @NotNull
+    protected final MainActions<G, A, R, V> mainActions;
+
     /**
      * Creates a new instance.
      * @param gridartaObjectsFactory the gridarta objects factory
@@ -256,6 +261,7 @@
         new MapCursorControl<G, A, R, V>(key, gameObjectAttributesDialogFactory, mapManager, mapViewManager, selectedSquareControl, selectedSquareView);
         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);
     }
 
     /**


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