Menu
▾
▴
[Gridarta-commit] SF.net SVN: gridarta:[4986] trunk
|
From: <aki...@us...> - 2008-08-22 08:05:54
|
Revision: 4986
http://gridarta.svn.sourceforge.net/gridarta/?rev=4986&view=rev
Author: akirschbaum
Date: 2008-08-22 08:05:59 +0000 (Fri, 22 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-22 07:57:04 UTC (rev 4985)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2008-08-22 08:05:59 UTC (rev 4986)
@@ -53,19 +53,28 @@
import net.sf.gridarta.GlobalSettings;
import net.sf.gridarta.GridartaObjectsFactory;
import net.sf.gridarta.MapManager;
+import net.sf.gridarta.archtype.ArchetypeTypeSet;
import net.sf.gridarta.gameobject.anim.AnimationObject;
+import net.sf.gridarta.gameobject.match.GameObjectMatcher;
import net.sf.gridarta.gui.LeftPanel;
import net.sf.gridarta.gui.MainView;
+import net.sf.gridarta.gui.MapViewManager;
import net.sf.gridarta.gui.RecentManager;
import net.sf.gridarta.gui.SystemIcons;
+import net.sf.gridarta.gui.connectionview.LockedItemsControl;
+import net.sf.gridarta.gui.gameobjectattributesdialog.GameObjectAttributesDialogFactory;
+import net.sf.gridarta.gui.gameobjectattributespanel.GameObjectAttributesModel;
import net.sf.gridarta.gui.map.MapView;
import net.sf.gridarta.gui.map.tools.ToolPalette;
import net.sf.gridarta.gui.newmap.NewMapDialogFactory;
import net.sf.gridarta.gui.objectchoicedisplay.ObjectChoiceDisplay;
+import net.sf.gridarta.gui.objectchooser.DefaultObjectChooser;
import net.sf.gridarta.gui.objectchooser.ObjectChooser;
import net.sf.gridarta.gui.prefs.MapValidatorPrefs;
import net.sf.gridarta.gui.prefs.MiscPrefs;
import net.sf.gridarta.gui.prefs.UpdatePrefs;
+import net.sf.gridarta.gui.selectedsquare.SelectedSquareControl;
+import net.sf.gridarta.gui.selectedsquare.SelectedSquareView;
import net.sf.gridarta.map.AutoValidator;
import net.sf.gridarta.map.MapControl;
import net.sf.gridarta.map.validation.DelegatingMapValidator;
@@ -116,9 +125,6 @@
/** Preferences default for auto validation. */
private static final boolean PREFS_VALIDATOR_AUTO_DEFAULT = true;
- @NotNull
- private final GameObjectAttributesControl gameObjectAttributesControl;
-
/**
* The file control instance.
*/
@@ -132,7 +138,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, "DaimoninEditor.jar", pythonFileFilter, ".py", "Python", Archetype.TYPE_SPELL, null, Archetype.TYPE_EVENT_CONNECTOR, false, 0, new int[] { Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_TRIGGER_ALTAR, Archetype.TYPE_DETECTOR, Archetype.TYPE_TRIGGER_MARKER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_CONTAINER, });
- gameObjectAttributesControl = new GameObjectAttributesControl(gameObjectAttributesModel, gameObjectAttributesDialogFactory, objectChooser, archetypeTypeSet, mapManager, mapViewManager, animationObjects, lockedItemsControl, monsterMatcher, selectedSquareControl, selectedSquareView, mainView);
PluginParameterFactory.init(archetypeSet, gameObjectAttributesModel, objectChooser, mapManager);
final NamedFilterList defaultNamedFilterList = new NamedFilterList(gameObjectMatchers.getFilters());
final CFilterControl filterControl = new CFilterControl(null, mapManager, defaultNamedFilterList);
@@ -203,6 +208,13 @@
/** {@inheritDoc} */
@NotNull
@Override
+ protected net.sf.gridarta.gui.gameobjectattributespanel.GameObjectAttributesControl<GameObject, MapArchObject, Archetype, CMapViewBasic> newGameObjectAttributesControl(final GameObjectAttributesModel<GameObject, MapArchObject, Archetype> gameObjectAttributesModel, final GameObjectAttributesDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gameObjectAttributesDialogFactory, final DefaultObjectChooser<GameObject, MapArchObject, Archetype> objectChooser, final ArchetypeTypeSet<GameObject, MapArchObject, Archetype> archetypeTypeSet, final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager, final MapViewManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapViewManager, final net.sf.gridarta.gameobject.anim.AnimationObjects<? extends AnimationObject> animationObjects, final LockedItemsControl<GameObject, MapArchObject, Archetype, CMapViewBasic> lockedItemsControl, final GameObjectMatcher monsterMatcher, final SelectedSquareControl<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareControl, final SelectedSquareView<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareView, final MainView<GameObject, MapArchObject, Archetype, CMapViewBasic> mainView) {
+ return new GameObjectAttributesControl(gameObjectAttributesModel, gameObjectAttributesDialogFactory, objectChooser, archetypeTypeSet, mapManager, mapViewManager, animationObjects, lockedItemsControl, monsterMatcher, selectedSquareControl, selectedSquareView, mainView);
+ }
+
+ /** {@inheritDoc} */
+ @NotNull
+ @Override
protected JComboBox createEventTypeBox() {
return ScriptArchUtils.createEventTypeBox();
}
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2008-08-22 07:57:04 UTC (rev 4985)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2008-08-22 08:05:59 UTC (rev 4986)
@@ -57,19 +57,28 @@
import net.sf.gridarta.GlobalSettings;
import net.sf.gridarta.GridartaObjectsFactory;
import net.sf.gridarta.MapManager;
+import net.sf.gridarta.archtype.ArchetypeTypeSet;
import net.sf.gridarta.gameobject.anim.AnimationObject;
import net.sf.gridarta.gameobject.face.FaceObjectProviders;
import net.sf.gridarta.gameobject.match.MutableOrGameObjectMatcher;
import net.sf.gridarta.gameobject.match.ViewGameObjectMatcherManager;
+import net.sf.gridarta.gameobject.match.GameObjectMatcher;
import net.sf.gridarta.gui.LeftPanel;
import net.sf.gridarta.gui.MainView;
import net.sf.gridarta.gui.RecentManager;
import net.sf.gridarta.gui.SystemIcons;
+import net.sf.gridarta.gui.MapViewManager;
+import net.sf.gridarta.gui.selectedsquare.SelectedSquareControl;
+import net.sf.gridarta.gui.selectedsquare.SelectedSquareView;
+import net.sf.gridarta.gui.connectionview.LockedItemsControl;
+import net.sf.gridarta.gui.gameobjectattributesdialog.GameObjectAttributesDialogFactory;
+import net.sf.gridarta.gui.gameobjectattributespanel.GameObjectAttributesModel;
import net.sf.gridarta.gui.map.MapView;
import net.sf.gridarta.gui.map.tools.ToolPalette;
import net.sf.gridarta.gui.newmap.NewMapDialogFactory;
import net.sf.gridarta.gui.objectchoicedisplay.ObjectChoiceDisplay;
import net.sf.gridarta.gui.objectchooser.ObjectChooser;
+import net.sf.gridarta.gui.objectchooser.DefaultObjectChooser;
import net.sf.gridarta.gui.prefs.MapValidatorPrefs;
import net.sf.gridarta.gui.prefs.MiscPrefs;
import net.sf.gridarta.gui.prefs.UpdatePrefs;
@@ -178,9 +187,6 @@
/** The ViewGameObjectMatcherManager for alpha. */
private final ViewGameObjectMatcherManager vaommAlpha = new ViewGameObjectMatcherManager(moaomAlpha);
- @NotNull
- private final GameObjectAttributesControl gameObjectAttributesControl;
-
/**
* The file control instance.
*/
@@ -194,7 +200,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), "CrossfireEditor.jar", luaFileFilter, ".lua", "Lua", 0, IGUIConstants.SPELL_FILE, 0, true, -1, new int[] { Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_ALTAR_TRIGGER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_SPAWN_POINT, Archetype.TYPE_CONTAINER, });
- gameObjectAttributesControl = new GameObjectAttributesControl(gameObjectAttributesModel, gameObjectAttributesDialogFactory, objectChooser, archetypeTypeSet, mapManager, mapViewManager, animationObjects, lockedItemsControl, monsterMatcher, selectedSquareControl, selectedSquareView, mainView);
final ObjectChoiceDisplay<GameObject, MapArchObject, Archetype, CMapViewBasic> objectChoiceDisplay = new ObjectChoiceDisplay<GameObject, MapArchObject, Archetype, CMapViewBasic>(replaceDialogManager, archetypeTypeSet, objectChooser, archetypeChooserModel, pickmapChooserControl);
final ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic> toolPalette = new ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic>(editTypes, selectedSquareView, objectChooser, pickmapChooserControl);
final LeftPanel leftPanel = new LeftPanel(objectChooser, toolPalette, objectChoiceDisplay);
@@ -282,6 +287,13 @@
/** {@inheritDoc} */
@NotNull
@Override
+ protected net.sf.gridarta.gui.gameobjectattributespanel.GameObjectAttributesControl<GameObject, MapArchObject, Archetype, CMapViewBasic> newGameObjectAttributesControl(final GameObjectAttributesModel<GameObject, MapArchObject, Archetype> gameObjectAttributesModel, final GameObjectAttributesDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gameObjectAttributesDialogFactory, final DefaultObjectChooser<GameObject, MapArchObject, Archetype> objectChooser, final ArchetypeTypeSet<GameObject, MapArchObject, Archetype> archetypeTypeSet, final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager, final MapViewManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapViewManager, final net.sf.gridarta.gameobject.anim.AnimationObjects<? extends AnimationObject> animationObjects, final LockedItemsControl<GameObject, MapArchObject, Archetype, CMapViewBasic> lockedItemsControl, final GameObjectMatcher monsterMatcher, final SelectedSquareControl<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareControl, final SelectedSquareView<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareView, final MainView<GameObject, MapArchObject, Archetype, CMapViewBasic> mainView) {
+ return new GameObjectAttributesControl(gameObjectAttributesModel, gameObjectAttributesDialogFactory, objectChooser, archetypeTypeSet, mapManager, mapViewManager, animationObjects, lockedItemsControl, monsterMatcher, selectedSquareControl, selectedSquareView, mainView);
+ }
+
+ /** {@inheritDoc} */
+ @NotNull
+ @Override
protected JComboBox createEventTypeBox() {
return ScriptArchUtils.createEventTypeBox();
}
Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-08-22 07:57:04 UTC (rev 4985)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-08-22 08:05:59 UTC (rev 4986)
@@ -64,6 +64,7 @@
import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserModel;
import net.sf.gridarta.gui.connectionview.LockedItemsControl;
import net.sf.gridarta.gui.gameobjectattributesdialog.GameObjectAttributesDialogFactory;
+import net.sf.gridarta.gui.gameobjectattributespanel.GameObjectAttributesControl;
import net.sf.gridarta.gui.gameobjectattributespanel.GameObjectAttributesModel;
import net.sf.gridarta.gui.map.MapCursorControl;
import net.sf.gridarta.gui.map.MapPreviewAccessory;
@@ -320,6 +321,9 @@
@NotNull
protected final GameObjectAttributesModel<G, A, R> gameObjectAttributesModel;
+ @NotNull
+ protected final GameObjectAttributesControl<G, A, R, V> gameObjectAttributesControl;
+
/**
* Creates a new instance.
* @param gridartaObjectsFactory the gridarta objects factory
@@ -458,9 +462,13 @@
AbstractScriptArchEditor.initEventTypeBoxes(scriptExtension, scriptName, createEventTypeBox(), scriptFileFilter, globalSettings, mapManager);
lockedItemsControl = new LockedItemsControl<G, A, R, V>(mapManager, mapViewManager, lockedItemsTypeNumbers);
gameObjectAttributesModel = new GameObjectAttributesModel<G, A, R>();
+ gameObjectAttributesControl = newGameObjectAttributesControl(gameObjectAttributesModel, gameObjectAttributesDialogFactory, objectChooser, archetypeTypeSet, mapManager, mapViewManager, animationObjects, lockedItemsControl, monsterMatcher, selectedSquareControl, selectedSquareView, mainView);
}
@NotNull
+ protected abstract GameObjectAttributesControl<G, A, R, V> newGameObjectAttributesControl(final GameObjectAttributesModel<G, A, R> gameObjectAttributesModel, final GameObjectAttributesDialogFactory<G, A, R, V> gameObjectAttributesDialogFactory, final DefaultObjectChooser<G, A, R> objectChooser, final ArchetypeTypeSet<G, A, R> archetypeTypeSet, final MapManager<G, A, R, V> mapManager, final MapViewManager<G, A, R, V> mapViewManager, final AnimationObjects<? extends AnimationObject> animationObjects, final LockedItemsControl<G, A, R, V> lockedItemsControl, final GameObjectMatcher monsterMatcher, final SelectedSquareControl<G, A, R, V> selectedSquareControl, final SelectedSquareView<G, A, R, V> selectedSquareView, final MainView<G, A, R, V> mainView);
+
+ @NotNull
protected abstract JComboBox createEventTypeBox();
@NotNull
Modified: trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java
===================================================================
--- trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java 2008-08-22 07:57:04 UTC (rev 4985)
+++ trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java 2008-08-22 08:05:59 UTC (rev 4986)
@@ -47,6 +47,7 @@
import net.sf.gridarta.MapImageCache;
import net.sf.gridarta.MapManager;
import net.sf.gridarta.Size2D;
+import net.sf.gridarta.archtype.ArchetypeTypeSet;
import net.sf.gridarta.treasurelist.CFTreasureListTree;
import net.sf.gridarta.data.NamedTreeNode;
import net.sf.gridarta.gameobject.AbstractArchetypeParser;
@@ -65,8 +66,13 @@
import net.sf.gridarta.gameobject.face.FaceObjects;
import net.sf.gridarta.gameobject.match.GameObjectMatcher;
import net.sf.gridarta.gui.MainView;
+import net.sf.gridarta.gui.MapViewManager;
+import net.sf.gridarta.gui.connectionview.LockedItemsControl;
+import net.sf.gridarta.gui.gameobjectattributesdialog.GameObjectAttributesDialogFactory;
import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserModel;
import net.sf.gridarta.gui.gameobjectattributespanel.ScriptTab;
+import net.sf.gridarta.gui.gameobjectattributespanel.GameObjectAttributesControl;
+import net.sf.gridarta.gui.gameobjectattributespanel.GameObjectAttributesModel;
import net.sf.gridarta.gui.map.LevelRenderer;
import net.sf.gridarta.gui.map.MapView;
import net.sf.gridarta.gui.map.MapViewBasic;
@@ -74,7 +80,9 @@
import net.sf.gridarta.gui.map.tools.ToolPalette;
import net.sf.gridarta.gui.newmap.NewMapDialogFactory;
import net.sf.gridarta.gui.objectchooser.ObjectChooser;
+import net.sf.gridarta.gui.objectchooser.DefaultObjectChooser;
import net.sf.gridarta.gui.selectedsquare.SelectedSquareView;
+import net.sf.gridarta.gui.selectedsquare.SelectedSquareControl;
import net.sf.gridarta.io.GameObjectParser;
import net.sf.gridarta.io.MapArchObjectParser;
import net.sf.gridarta.io.MapReader;
@@ -498,6 +506,13 @@
/** {@inheritDoc} */
@NotNull
@Override
+ protected GameObjectAttributesControl<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> newGameObjectAttributesControl(final GameObjectAttributesModel<TestGameObject, TestMapArchObject, TestArchetype> testGameObjectTestMapArchObjectTestArchetypeGameObjectAttributesModel, final GameObjectAttributesDialogFactory<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> testGameObjectTestMapArchObjectTestArchetypeTestMapViewBasicGameObjectAttributesDialogFactory, final DefaultObjectChooser<TestGameObject, TestMapArchObject, TestArchetype> testGameObjectTestMapArchObjectTestArchetypeDefaultObjectChooser, final ArchetypeTypeSet<TestGameObject, TestMapArchObject, TestArchetype> testGameObjectTestMapArchObjectTestArchetypeArchetypeTypeSet, final MapManager<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> testGameObjectTestMapArchObjectTestArchetypeTestMapViewBasicMapManager, final MapViewManager<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> testGameObjectTestMapArchObjectTestArchetypeTestMapViewBasicMapViewManager, final AnimationObjects<? extends AnimationObject> animationObjects, final LockedItemsControl<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> testGameObjectTestMapArchObjectTestArchetypeTestMapViewBasicLockedItemsControl, final GameObjectMatcher monsterMatcher, final SelectedSquareControl<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> testGameObjectTestMapArchObjectTestArchetypeTestMapViewBasicSelectedSquareControl, final SelectedSquareView<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> testGameObjectTestMapArchObjectTestArchetypeTestMapViewBasicSelectedSquareView, final MainView<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> testGameObjectTestMapArchObjectTestArchetypeTestMapViewBasicMainView) {
+ throw new AssertionError();
+ }
+
+ /** {@inheritDoc} */
+ @NotNull
+ @Override
protected JComboBox createEventTypeBox() {
throw new AssertionError();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
