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

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

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

Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-21 21:01:32 UTC (rev 4960)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-21 21:05:00 UTC (rev 4961)
@@ -107,7 +107,6 @@
 import net.sf.gridarta.treasurelist.TreasureListsParser;
 import net.sf.gridarta.treasurelist.TreasureLocation;
 import net.sf.gridarta.treasurelist.TreasureTreeNode;
-import net.sf.gridarta.updater.UpdaterManager;
 import net.sf.japi.swing.ActionFactory;
 import net.sf.japi.swing.ActionMethod;
 import net.sf.japi.swing.prefs.PreferencesGroup;
@@ -171,9 +170,7 @@
      * @throws RuntimeException If the controller cannot be initialized.
      */
     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);
-        updaterManager = new UpdaterManager("cfeditor", this, mapManager, mainView, "CrossfireEditor.jar");
-        updaterManager.startup();
+        super(gridartaObjectsFactory, new DefaultRendererFactory(), "cfeditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory(gridartaObjectsFactory), false, CResourceLoader.getHomeFile("thumbnails"), null, "DaimoninEditor.jar");
 
         // initialize the script-editor pad
         ScriptEditControlInstance.init(pythonFileFilter, ".py", mainView, new File(globalSettings.getMapDefaultFolder()));

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-08-21 21:01:32 UTC (rev 4960)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-08-21 21:05:00 UTC (rev 4961)
@@ -124,7 +124,6 @@
 import net.sf.gridarta.treasurelist.TreasureListsParser;
 import net.sf.gridarta.treasurelist.TreasureLocation;
 import net.sf.gridarta.treasurelist.TreasureTreeNode;
-import net.sf.gridarta.updater.UpdaterManager;
 import net.sf.japi.io.args.ArgParser;
 import net.sf.japi.swing.ActionFactory;
 import net.sf.japi.swing.ActionMethod;
@@ -231,9 +230,7 @@
      * @throws RuntimeException If the controller cannot be initialized.
      */
     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));
-        updaterManager = new UpdaterManager("daieditor", this, mapManager, mainView, "DaimoninEditor.jar");
-        updaterManager.startup();
+        super(gridartaObjectsFactory, new DefaultRendererFactory(), "daieditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory(gridartaObjectsFactory), true, null, GUIUtils.getSysIcon(IGUIConstants.TILE_NORTH), "CrossfireEditor.jar");
 
         // initialize & load
         MultiPositionData.init(getConfigurationDirectory());

Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-21 21:01:32 UTC (rev 4960)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-21 21:05:00 UTC (rev 4961)
@@ -224,8 +224,9 @@
      * <code>null</code> to use the map directory
      * @param compassIcon the icon to display in the selected square view;
      * <code>null</code> to not show an icon
+     * @param gridartaJarFilename the filename of the editor's .jar file
      */
-    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, @Nullable final File mapImageCacheDir, @Nullable final ImageIcon compassIcon) {
+    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, @Nullable final File mapImageCacheDir, @Nullable final ImageIcon compassIcon, @NotNull final String gridartaJarFilename) {
         this.globalSettings = globalSettings;
         this.mapControlFactory = mapControlFactory;
         final DefaultMapManager<G, A, R, V> tmpMapManager = new DefaultMapManager<G, A, R, V>(this, key, gridartaObjectsFactory, mapControlFactory, globalSettings);
@@ -267,6 +268,8 @@
         gameObjectAttributesDialogFactory.setParent(mainView);
         new About(key, mainView);
         new UndoControl<G, A, R, V>(mapManager);
+        updaterManager = new UpdaterManager(key, this, mapManager, mainView, gridartaJarFilename);
+        updaterManager.startup();
     }
 
     /**

Modified: trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java
===================================================================
--- trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java	2008-08-21 21:01:32 UTC (rev 4960)
+++ trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java	2008-08-21 21:05:00 UTC (rev 4961)
@@ -433,7 +433,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, true, null, null);
+            super(gridartaObjectsFactory, rendererFactory, key, globalSettings, animationObjects, faceObjects, mapControlFactory, true, null, null, "test.jar");
         }
 
         /** {@inheritDoc} */


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