Menu
▾
▴
[Gridarta-commit] SF.net SVN: gridarta:[4883] trunk
|
From: <aki...@us...> - 2008-08-16 07:54:00
|
Revision: 4883
http://gridarta.svn.sourceforge.net/gridarta/?rev=4883&view=rev
Author: akirschbaum
Date: 2008-08-16 07:54:09 +0000 (Sat, 16 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-16 07:40:32 UTC (rev 4882)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2008-08-16 07:54:09 UTC (rev 4883)
@@ -57,6 +57,7 @@
import net.sf.gridarta.GridartaObjectsFactory;
import net.sf.gridarta.MainControl;
import net.sf.gridarta.XmlHelper;
+import net.sf.gridarta.MapManager;
import net.sf.gridarta.archtype.ArchetypeAttributeParser;
import net.sf.gridarta.archtype.ArchetypeTypeParser;
import net.sf.gridarta.archtype.ArchetypeTypeSet;
@@ -187,9 +188,6 @@
/** The treasure lists. */
private final CFTreasureListTree<GameObject, MapArchObject, Archetype> treasureListTree;
- /** The factory for creating new maps or pickmaps. */
- private final NewMapDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> newMapDialogFactory;
-
@NotNull
private final GameObjectAttributesControl gameObjectAttributesControl;
@@ -215,7 +213,6 @@
final MapManagerActions<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManagerActions = new MapManagerActions<GameObject, MapArchObject, Archetype, CMapViewBasic>(mapManager);
final ArchetypeChooserModel<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserModel = new ArchetypeChooserModel<GameObject, MapArchObject, Archetype, CMapViewBasic>(archetypeSet);
final ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserControl = new ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(archetypeChooserModel);
- newMapDialogFactory = new NewMapDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, mapManager, gridartaObjectsFactory, IGUIConstants.DEF_MAPSIZE, IGUIConstants.DEF_MAPSIZE, 0, false, false, IGUIConstants.DEF_PICKMAP_WIDTH, IGUIConstants.DEF_PICKMAP_HEIGHT);
pickmapChooserControl = new PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(newMapDialogFactory, this, gridartaObjectsFactory, new File(globalSettings.getMapDir(), IGUIConstants.PICKMAP_DIR), mapManager, autojoinLists);
newMapDialogFactory.setPickmapChooserControl(pickmapChooserControl);
final ArchetypeTypeSet<GameObject, MapArchObject, Archetype> archetypeTypeSet = new ArchetypeTypeSet<GameObject, MapArchObject, Archetype>();
@@ -370,6 +367,13 @@
fileControl = new FileControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(globalSettings, archetypeSet, mapPreviewAccessory, mapManager, mainView, mapFileFilter, pythonFileFilter, newMapDialogFactory, ".py");
}
+ /** {@inheritDoc} */
+ @NotNull
+ @Override
+ protected NewMapDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> newNewMapDialogFactory(@NotNull final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager, @NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory) {
+ return new NewMapDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, mapManager, gridartaObjectsFactory, IGUIConstants.DEF_MAPSIZE, IGUIConstants.DEF_MAPSIZE, 0, false, false, IGUIConstants.DEF_PICKMAP_WIDTH, IGUIConstants.DEF_PICKMAP_HEIGHT);
+ }
+
/**
* Initializes the map validators.
* @return A MapValidator that delegates to other map validators.
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2008-08-16 07:40:32 UTC (rev 4882)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2008-08-16 07:54:09 UTC (rev 4883)
@@ -63,6 +63,7 @@
import net.sf.gridarta.GridartaObjectsFactory;
import net.sf.gridarta.MainControl;
import net.sf.gridarta.XmlHelper;
+import net.sf.gridarta.MapManager;
import net.sf.gridarta.archtype.ArchetypeAttributeParser;
import net.sf.gridarta.archtype.ArchetypeTypeParser;
import net.sf.gridarta.archtype.ArchetypeTypeSet;
@@ -249,9 +250,6 @@
/** The treasure lists. */
private final CFTreasureListTree<GameObject, MapArchObject, Archetype> treasureListTree;
- /** The factory for creating new maps or pickmaps. */
- private final NewMapDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> newMapDialogFactory;
-
@NotNull
private final GameObjectAttributesControl gameObjectAttributesControl;
@@ -271,7 +269,6 @@
final MapManagerActions<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManagerActions = new MapManagerActions<GameObject, MapArchObject, Archetype, CMapViewBasic>(mapManager);
final ArchetypeChooserModel<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserModel = new ArchetypeChooserModel<GameObject, MapArchObject, Archetype, CMapViewBasic>(archetypeSet);
final ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserControl = new ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(archetypeChooserModel);
- newMapDialogFactory = new NewMapDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, mapManager, gridartaObjectsFactory, IGUIConstants.DEF_MAPSIZE, IGUIConstants.DEF_MAPSIZE, IGUIConstants.DEF_MAPDIFFICULTY, true, true, IGUIConstants.DEF_PICKMAP_WIDTH, IGUIConstants.DEF_PICKMAP_HEIGHT);
pickmapChooserControl = new PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(newMapDialogFactory, this, gridartaObjectsFactory, new File(globalSettings.getArchDefaultFolder(), IGUIConstants.PICKMAP_DIR), mapManager, autojoinLists);
newMapDialogFactory.setPickmapChooserControl(pickmapChooserControl);
final ArchetypeTypeSet<GameObject, MapArchObject, Archetype> archetypeTypeSet = new ArchetypeTypeSet<GameObject, MapArchObject, Archetype>();
@@ -443,6 +440,13 @@
fileControl = new FileControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(globalSettings, archetypeSet, mapPreviewAccessory, mapManager, mainView, mapFileFilter, luaFileFilter, newMapDialogFactory, ".lua");
}
+ /** {@inheritDoc} */
+ @NotNull
+ @Override
+ protected NewMapDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> newNewMapDialogFactory(@NotNull final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager, @NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory) {
+ return new NewMapDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, mapManager, gridartaObjectsFactory, IGUIConstants.DEF_MAPSIZE, IGUIConstants.DEF_MAPSIZE, IGUIConstants.DEF_MAPDIFFICULTY, true, true, IGUIConstants.DEF_PICKMAP_WIDTH, IGUIConstants.DEF_PICKMAP_HEIGHT);
+ }
+
/**
* Initializes the map validators.
* @return A MapValidator that delegates to other map validators.
Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-08-16 07:40:32 UTC (rev 4882)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-08-16 07:54:09 UTC (rev 4883)
@@ -41,6 +41,7 @@
import net.sf.gridarta.gui.map.MapPreviewAccessory;
import net.sf.gridarta.gui.map.MapView;
import net.sf.gridarta.gui.map.MapViewBasic;
+import net.sf.gridarta.gui.newmap.NewMapDialogFactory;
import net.sf.gridarta.help.Help;
import net.sf.gridarta.io.PathManager;
import net.sf.gridarta.map.MapArchObject;
@@ -128,6 +129,10 @@
/** The status bar instance. */
protected StatusBar<G, A, R, V> statusBar = null;
+ /** The factory for creating new maps or pickmaps. */
+ @NotNull
+ protected final NewMapDialogFactory<G, A, R, V> newMapDialogFactory;
+
/**
* Creates a new instance.
* @param gridartaObjectsFactory the gridarta objects factory
@@ -151,9 +156,19 @@
archetypeSet = newArchetypeSet(globalSettings, editTypes, animationObjects, faceObjects, gridartaObjectsFactory);
ScriptedEvent.init(archetypeSet);
PathManager.setGlobalSettings(globalSettings);
+ newMapDialogFactory = newNewMapDialogFactory(mapManager, gridartaObjectsFactory);
}
/**
+ * Creates a new {@link NewMapDialogFactory} instance.
+ * @param mapManager the map manager instance
+ * @param gridartaObjectsFactory the gridarta objects factory instance
+ * @return the new new map dialog factory instance
+ */
+ @NotNull
+ protected abstract NewMapDialogFactory<G, A, R, V> newNewMapDialogFactory(@NotNull final MapManager<G, A, R, V> mapManager, @NotNull final GridartaObjectsFactory<G, A, R, V> gridartaObjectsFactory);
+
+ /**
* Creates an {@link ArchetypeSet} instance.
* @param globalSettings the global settigns instance
* @param editTypes the edit types instance
Modified: trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java
===================================================================
--- trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java 2008-08-16 07:40:32 UTC (rev 4882)
+++ trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java 2008-08-16 07:54:09 UTC (rev 4883)
@@ -62,6 +62,7 @@
import net.sf.gridarta.gameobject.face.DuplicateFaceException;
import net.sf.gridarta.gameobject.match.GameObjectMatcher;
import net.sf.gridarta.gui.MainView;
+import net.sf.gridarta.gui.newmap.NewMapDialogFactory;
import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserModel;
import net.sf.gridarta.gui.gameobjectattributespanel.ScriptTab;
import net.sf.gridarta.gui.map.LevelRenderer;
@@ -472,6 +473,13 @@
/** {@inheritDoc} */
@NotNull
@Override
+ protected NewMapDialogFactory<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> newNewMapDialogFactory(@NotNull final MapManager<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> mapManager, @NotNull final GridartaObjectsFactory<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> gridartaObjectsFactory) {
+ throw new AssertionError();
+ }
+
+ /** {@inheritDoc} */
+ @NotNull
+ @Override
protected ArchetypeSet<TestGameObject, TestMapArchObject, TestArchetype> newArchetypeSet(@NotNull final GlobalSettings globalSettings, @NotNull final EditTypes<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> editTypes, @NotNull final AnimationObjects<? extends AnimationObject> animationObjects, @NotNull final FaceObjects faceObjects, @NotNull final GridartaObjectsFactory<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> gridartaObjectsFactory) {
throw new AssertionError();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
