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

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

Revision: 4926
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4926&view=rev
Author:   akirschbaum
Date:     2008-08-20 20:18:58 +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
    trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java

Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-20 20:15:53 UTC (rev 4925)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-20 20:18:58 UTC (rev 4926)
@@ -198,8 +198,7 @@
      * @throws RuntimeException If the controller cannot be initialized.
      */
     public CMainControl() {
-        super(new CrossfireObjectsFactory(), new DefaultRendererFactory(), "cfeditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory());
-        archetypeChooserControl.init(false, gameObjectAttributesDialogFactory);
+        super(new CrossfireObjectsFactory(), new DefaultRendererFactory(), "cfeditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory(), false);
         mapViewManager = new MapViewManager<GameObject, MapArchObject, Archetype, CMapViewBasic>();
         SystemIcons.init();
         createMapImageCache(CResourceLoader.getHomeFile("thumbnails"), SystemIcons.getDefaultIcon(), SystemIcons.getDefaultPreview(), new StatusBar<GameObject, MapArchObject, Archetype, CMapViewBasic>(mapManager, mapViewManager, archetypeSet, faceObjects));

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-08-20 20:15:53 UTC (rev 4925)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-08-20 20:18:58 UTC (rev 4926)
@@ -252,8 +252,7 @@
      * @throws RuntimeException If the controller cannot be initialized.
      */
     public CMainControl() {
-        super(new DaimoninObjectsFactory(), new DefaultRendererFactory(), "daieditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory());
-        archetypeChooserControl.init(true, gameObjectAttributesDialogFactory);
+        super(new DaimoninObjectsFactory(), new DefaultRendererFactory(), "daieditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory(), true);
         final MapViewManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapViewManager = new MapViewManager<GameObject, MapArchObject, Archetype, CMapViewBasic>();
         SystemIcons.init();
         createMapImageCache(null, SystemIcons.getDefaultIcon(), SystemIcons.getDefaultPreview(), new StatusBar<GameObject, MapArchObject, Archetype, CMapViewBasic>(mapManager, mapViewManager, archetypeSet, faceObjects));

Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-20 20:15:53 UTC (rev 4925)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-20 20:18:58 UTC (rev 4926)
@@ -179,8 +179,9 @@
      * @param animationObjects the animation objects instance
      * @param faceObjects the face objects instance
      * @param mapControlFactory the map control instance
+     * @param createDirectionPane whether the direction panel should be created
      */
-    protected AbstractMainControl(@NotNull final GridartaObjectsFactory<G, A, R, V> gridartaObjectsFactory, @NotNull final RendererFactory<G, A, R> rendererFactory, @NotNull final String key, @NotNull final GlobalSettings globalSettings, @NotNull final AnimationObjects<? extends AnimationObject> animationObjects, @NotNull final FaceObjects faceObjects, @NotNull final MapControlFactory<G, A, R, V> mapControlFactory) {
+    protected AbstractMainControl(@NotNull final GridartaObjectsFactory<G, A, R, V> gridartaObjectsFactory, @NotNull final RendererFactory<G, A, R> rendererFactory, @NotNull final String key, @NotNull final GlobalSettings globalSettings, @NotNull final AnimationObjects<? extends AnimationObject> animationObjects, @NotNull final FaceObjects faceObjects, @NotNull final MapControlFactory<G, A, R, V> mapControlFactory, final boolean createDirectionPane) {
         this.globalSettings = globalSettings;
         this.mapControlFactory = mapControlFactory;
         final DefaultMapManager<G, A, R, V> tmpMapManager = new DefaultMapManager<G, A, R, V>(this, key, gridartaObjectsFactory, mapControlFactory, globalSettings);
@@ -206,6 +207,7 @@
         newMapDialogFactory.setPickmapChooserControl(pickmapChooserControl);
         archetypeTypeSet = new ArchetypeTypeSet<G, A, R>();
         gameObjectAttributesDialogFactory = new GameObjectAttributesDialogFactory<G, A, R, V>(archetypeTypeSet, archetypeSet, mapManager);
+        archetypeChooserControl.init(createDirectionPane, gameObjectAttributesDialogFactory);
     }
 
     /**

Modified: trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java
===================================================================
--- trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java	2008-08-20 20:15:53 UTC (rev 4925)
+++ trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java	2008-08-20 20:18:58 UTC (rev 4926)
@@ -431,7 +431,7 @@
          * @param mapControlFactory the map control factory instance to use
          */
         protected TestMainControl(@NotNull final GridartaObjectsFactory<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> gridartaObjectsFactory, @NotNull final RendererFactory<TestGameObject, TestMapArchObject, TestArchetype> rendererFactory, @NotNull final String key, @NotNull final GlobalSettings globalSettings, @NotNull final AnimationObjects<TestAnimationObject> animationObjects, @NotNull final FaceObjects faceObjects, @NotNull final MapControlFactory<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> mapControlFactory) {
-            super(gridartaObjectsFactory, rendererFactory, key, globalSettings, animationObjects, faceObjects, mapControlFactory);
+            super(gridartaObjectsFactory, rendererFactory, key, globalSettings, animationObjects, faceObjects, mapControlFactory, true);
         }
 
         /** {@inheritDoc} */


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