Menu
▾
▴
[Gridarta-commit] SF.net SVN: gridarta:[4929] trunk
|
From: <aki...@us...> - 2008-08-20 20:27:45
|
Revision: 4929
http://gridarta.svn.sourceforge.net/gridarta/?rev=4929&view=rev
Author: akirschbaum
Date: 2008-08-20 20:27:49 +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:22:52 UTC (rev 4928)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2008-08-20 20:27:49 UTC (rev 4929)
@@ -76,7 +76,6 @@
import net.sf.gridarta.gui.MapFileFilter;
import net.sf.gridarta.gui.RecentManager;
import net.sf.gridarta.gui.ReplaceDialogManager;
-import net.sf.gridarta.gui.StatusBar;
import net.sf.gridarta.gui.SystemIcons;
import net.sf.gridarta.gui.connectionview.LockedItemsControl;
import net.sf.gridarta.gui.gameobjectattributespanel.GameObjectAttributesModel;
@@ -191,8 +190,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(), false);
- createMapImageCache(CResourceLoader.getHomeFile("thumbnails"), SystemIcons.getDefaultIcon(), SystemIcons.getDefaultPreview(), new StatusBar<GameObject, MapArchObject, Archetype, CMapViewBasic>(mapManager, mapViewManager, archetypeSet, faceObjects));
+ super(new CrossfireObjectsFactory(), new DefaultRendererFactory(), "cfeditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory(), false, CResourceLoader.getHomeFile("thumbnails"));
mainView = new MainView<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, editTypes, mapManager, mapViewManager, ACTION_FACTORY, mapManagerActions.getCloseAllAction(), statusBar);
final ReplaceDialogManager<GameObject, MapArchObject, Archetype, CMapViewBasic> replaceDialogManager = new ReplaceDialogManager<GameObject, MapArchObject, Archetype, CMapViewBasic>(mainView, archetypeSet, copyBuffer);
objectChooser = new DefaultObjectChooser<GameObject, MapArchObject, Archetype>(archetypeChooserControl, pickmapChooserControl);
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2008-08-20 20:22:52 UTC (rev 4928)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2008-08-20 20:27:49 UTC (rev 4929)
@@ -83,7 +83,6 @@
import net.sf.gridarta.gui.MapFileFilter;
import net.sf.gridarta.gui.RecentManager;
import net.sf.gridarta.gui.ReplaceDialogManager;
-import net.sf.gridarta.gui.StatusBar;
import net.sf.gridarta.gui.SystemIcons;
import net.sf.gridarta.gui.connectionview.LockedItemsControl;
import net.sf.gridarta.gui.gameobjectattributespanel.GameObjectAttributesModel;
@@ -251,8 +250,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(), true);
- createMapImageCache(null, SystemIcons.getDefaultIcon(), SystemIcons.getDefaultPreview(), new StatusBar<GameObject, MapArchObject, Archetype, CMapViewBasic>(mapManager, mapViewManager, archetypeSet, faceObjects));
+ super(new DaimoninObjectsFactory(), new DefaultRendererFactory(), "daieditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory(), true, null);
mainView = new MainView<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, editTypes, mapManager, mapViewManager, ACTION_FACTORY, mapManagerActions.getCloseAllAction(), statusBar);
final ReplaceDialogManager<GameObject, MapArchObject, Archetype, CMapViewBasic> replaceDialogManager = new ReplaceDialogManager<GameObject, MapArchObject, Archetype, CMapViewBasic>(mainView, archetypeSet, copyBuffer);
objectChooser = new DefaultObjectChooser<GameObject, MapArchObject, Archetype>(archetypeChooserControl, pickmapChooserControl);
Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-08-20 20:22:52 UTC (rev 4928)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-08-20 20:27:49 UTC (rev 4929)
@@ -188,8 +188,10 @@
* @param faceObjects the face objects instance
* @param mapControlFactory the map control instance
* @param createDirectionPane whether the direction panel should be created
+ * @param mapImageCacheDir the map image cache directory or
+ * <code>null</code> to use the map directory
*/
- 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) {
+ 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) {
this.globalSettings = globalSettings;
this.mapControlFactory = mapControlFactory;
final DefaultMapManager<G, A, R, V> tmpMapManager = new DefaultMapManager<G, A, R, V>(this, key, gridartaObjectsFactory, mapControlFactory, globalSettings);
@@ -218,6 +220,7 @@
archetypeChooserControl.init(createDirectionPane, gameObjectAttributesDialogFactory);
mapViewManager = new MapViewManager<G, A, R, V>();
SystemIcons.init();
+ createMapImageCache(mapImageCacheDir, SystemIcons.getDefaultIcon(), SystemIcons.getDefaultPreview(), new StatusBar<G, A, R, V>(mapManager, mapViewManager, archetypeSet, faceObjects));
}
/**
Modified: trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java
===================================================================
--- trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java 2008-08-20 20:22:52 UTC (rev 4928)
+++ trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java 2008-08-20 20:27:49 UTC (rev 4929)
@@ -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, true);
+ super(gridartaObjectsFactory, rendererFactory, key, globalSettings, animationObjects, faceObjects, mapControlFactory, true, null);
}
/** {@inheritDoc} */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
