Menu
▾
▴
[Gridarta-commit] SF.net SVN: gridarta:[4984] trunk
|
From: <aki...@us...> - 2008-08-22 07:55:22
|
Revision: 4984
http://gridarta.svn.sourceforge.net/gridarta/?rev=4984&view=rev
Author: akirschbaum
Date: 2008-08-22 07:55:30 +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:49:51 UTC (rev 4983)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2008-08-22 07:55:30 UTC (rev 4984)
@@ -58,7 +58,6 @@
import net.sf.gridarta.gui.MainView;
import net.sf.gridarta.gui.RecentManager;
import net.sf.gridarta.gui.SystemIcons;
-import net.sf.gridarta.gui.connectionview.LockedItemsControl;
import net.sf.gridarta.gui.gameobjectattributespanel.GameObjectAttributesModel;
import net.sf.gridarta.gui.map.MapView;
import net.sf.gridarta.gui.map.tools.ToolPalette;
@@ -133,9 +132,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, "DaimoninEditor.jar", pythonFileFilter, ".py", "Python", Archetype.TYPE_SPELL, null, Archetype.TYPE_EVENT_CONNECTOR, false, 0);
- // Initialize the main view
- final LockedItemsControl<GameObject, MapArchObject, Archetype, CMapViewBasic> lockedItemsControl = new LockedItemsControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(mapManager, mapViewManager, 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);
+ 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, });
final GameObjectAttributesModel<GameObject, MapArchObject, Archetype> gameObjectAttributesModel = new GameObjectAttributesModel<GameObject, MapArchObject, Archetype>();
gameObjectAttributesControl = new GameObjectAttributesControl(gameObjectAttributesModel, gameObjectAttributesDialogFactory, objectChooser, archetypeTypeSet, mapManager, mapViewManager, animationObjects, lockedItemsControl, monsterMatcher, selectedSquareControl, selectedSquareView, mainView);
PluginParameterFactory.init(archetypeSet, gameObjectAttributesModel, objectChooser, mapManager);
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2008-08-22 07:49:51 UTC (rev 4983)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2008-08-22 07:55:30 UTC (rev 4984)
@@ -65,7 +65,6 @@
import net.sf.gridarta.gui.MainView;
import net.sf.gridarta.gui.RecentManager;
import net.sf.gridarta.gui.SystemIcons;
-import net.sf.gridarta.gui.connectionview.LockedItemsControl;
import net.sf.gridarta.gui.gameobjectattributespanel.GameObjectAttributesModel;
import net.sf.gridarta.gui.map.MapView;
import net.sf.gridarta.gui.map.tools.ToolPalette;
@@ -195,9 +194,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), "CrossfireEditor.jar", luaFileFilter, ".lua", "Lua", 0, IGUIConstants.SPELL_FILE, 0, true, -1);
- // Initialize the main view
- final LockedItemsControl<GameObject, MapArchObject, Archetype, CMapViewBasic> lockedItemsControl = new LockedItemsControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(mapManager, mapViewManager, 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);
+ 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, });
final GameObjectAttributesModel<GameObject, MapArchObject, Archetype> gameObjectAttributesModel = new GameObjectAttributesModel<GameObject, MapArchObject, Archetype>();
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);
Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-08-22 07:49:51 UTC (rev 4983)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-08-22 07:55:30 UTC (rev 4984)
@@ -28,9 +28,9 @@
import java.util.ResourceBundle;
import java.util.prefs.Preferences;
import javax.swing.ImageIcon;
+import javax.swing.JComboBox;
import javax.swing.JFileChooser;
import javax.swing.JOptionPane;
-import javax.swing.JComboBox;
import javax.swing.filechooser.FileFilter;
import javax.xml.parsers.ParserConfigurationException;
import net.sf.gridarta.archtype.ArchetypeAttributeParser;
@@ -62,6 +62,7 @@
import net.sf.gridarta.gui.SystemIcons;
import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserControl;
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.map.MapCursorControl;
import net.sf.gridarta.gui.map.MapPreviewAccessory;
@@ -311,6 +312,9 @@
@NotNull
protected final ArchetypeTypeSetParser<G, A, R> archetypeTypeSetParser;
+
+ @NotNull
+ protected final LockedItemsControl<G, A, R, V> lockedItemsControl;
/**
* Creates a new instance.
@@ -337,8 +341,10 @@
* @param typeNoEventConnector the object type to event game objects
* @param includeFaceText whether face names are included in the object
* @param undefinedSpellIndex the index for no spell
+ * @param lockedItemsTypeNumbers the type numbers of game objects being
+ * locked items
*/
- 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, @NotNull final FileFilter scriptFileFilter, @NotNull final String scriptExtension, @NotNull final String scriptName, final int spellType, @Nullable final String spellFile, final int typeNoEventConnector, final boolean includeFaceText, final int undefinedSpellIndex) {
+ 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, @NotNull final FileFilter scriptFileFilter, @NotNull final String scriptExtension, @NotNull final String scriptName, final int spellType, @Nullable final String spellFile, final int typeNoEventConnector, final boolean includeFaceText, final int undefinedSpellIndex, @NotNull final int[] lockedItemsTypeNumbers) {
this.gridartaObjectsFactory = gridartaObjectsFactory;
this.globalSettings = globalSettings;
this.mapControlFactory = mapControlFactory;
@@ -446,6 +452,7 @@
log.error("Cannot read " + CommonConstants.TYPEDEF_FILE + ": " + ex.getMessage());
}
AbstractScriptArchEditor.initEventTypeBoxes(scriptExtension, scriptName, createEventTypeBox(), scriptFileFilter, globalSettings, mapManager);
+ lockedItemsControl = new LockedItemsControl<G, A, R, V>(mapManager, mapViewManager, lockedItemsTypeNumbers);
}
@NotNull
Modified: trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java
===================================================================
--- trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java 2008-08-22 07:49:51 UTC (rev 4983)
+++ trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java 2008-08-22 07:55:30 UTC (rev 4984)
@@ -436,7 +436,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, "test.jar", new TestFileFilter(), ".script", "Script", 0, null, -1, false, 0);
+ super(gridartaObjectsFactory, rendererFactory, key, globalSettings, animationObjects, faceObjects, mapControlFactory, true, null, null, "test.jar", new TestFileFilter(), ".script", "Script", 0, null, -1, false, 0, new int[] { 13, });
}
/** {@inheritDoc} */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
