Menu
▾
▴
[Gridarta-commit] SF.net SVN: gridarta:[5203] trunk
|
From: <aki...@us...> - 2008-09-18 12:57:49
|
Revision: 5203
http://gridarta.svn.sourceforge.net/gridarta/?rev=5203&view=rev
Author: akirschbaum
Date: 2008-09-18 19:57:56 +0000 (Thu, 18 Sep 2008)
Log Message:
-----------
Move GameObjectAttributesControl 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/app/net/sf/gridarta/gui/gameobjectattributespanel/GameObjectAttributesControl.java
trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java
Removed Paths:
-------------
trunk/crossfire/src/cfeditor/gui/GameObjectAttributesControl.java
trunk/daimonin/src/daieditor/gui/GameObjectAttributesControl.java
Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java 2008-09-18 19:50:01 UTC (rev 5202)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2008-09-18 19:57:56 UTC (rev 5203)
@@ -28,7 +28,6 @@
import cfeditor.gameobject.anim.AnimationObjects;
import cfeditor.gameobject.face.FaceObjects;
import cfeditor.gameobject.scripts.ScriptArchUtils;
-import cfeditor.gui.GameObjectAttributesControl;
import cfeditor.gui.map.CMapViewBasic;
import cfeditor.gui.map.DefaultRendererFactory;
import cfeditor.gui.prefs.GUIPrefs;
@@ -57,19 +56,14 @@
import net.sf.gridarta.gameobject.match.GameObjectMatcher;
import net.sf.gridarta.gameobject.match.GameObjectMatchers;
import net.sf.gridarta.gui.MainView;
-import net.sf.gridarta.gui.MapViewManager;
import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserControl;
-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.newmap.NewMapDialogFactory;
-import net.sf.gridarta.gui.objectchooser.DefaultObjectChooser;
import net.sf.gridarta.gui.objectchooser.ObjectChooser;
import net.sf.gridarta.gui.prefs.DevPrefs;
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.io.ConfigFileUtils;
import net.sf.gridarta.io.GameObjectParser;
@@ -165,13 +159,6 @@
/** {@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();
}
Deleted: trunk/crossfire/src/cfeditor/gui/GameObjectAttributesControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/GameObjectAttributesControl.java 2008-09-18 19:50:01 UTC (rev 5202)
+++ trunk/crossfire/src/cfeditor/gui/GameObjectAttributesControl.java 2008-09-18 19:57:56 UTC (rev 5203)
@@ -1,57 +0,0 @@
-/*
- * Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
- * Copyright (C) 2000-2007 The Gridarta Developers.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-package cfeditor.gui;
-
-import cfeditor.gameobject.Archetype;
-import cfeditor.gameobject.GameObject;
-import cfeditor.gui.map.CMapViewBasic;
-import cfeditor.map.MapArchObject;
-import java.awt.Frame;
-import net.sf.gridarta.MapManager;
-import net.sf.gridarta.archtype.ArchetypeTypeSet;
-import net.sf.gridarta.gameobject.anim.AnimationObjects;
-import net.sf.gridarta.gameobject.match.GameObjectMatcher;
-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.gameobjectattributespanel.GameObjectAttributesModel;
-import net.sf.gridarta.gui.objectchooser.ObjectChooser;
-import net.sf.gridarta.gui.selectedsquare.SelectedSquareControl;
-import net.sf.gridarta.gui.selectedsquare.SelectedSquareView;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * <code>GameObjectAttributesPanel</code> implements the panel that holds
- * information about the currently selected GameObject on the map.
- * @author <a href="mailto:mic...@no...">Michael Toennies</a>
- * @author <a href="mailto:and...@gm...">Andreas Vogl</a>
- * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
- */
-public final class GameObjectAttributesControl extends net.sf.gridarta.gui.gameobjectattributespanel.GameObjectAttributesControl<GameObject, MapArchObject, Archetype, CMapViewBasic> {
-
- /** Serial Version UID. */
- private static final long serialVersionUID = 1L;
-
- /* Build Panel */
- public GameObjectAttributesControl(@NotNull final GameObjectAttributesModel<GameObject, MapArchObject, Archetype> gameObjectAttributesModel, @NotNull final GameObjectAttributesDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gameObjectAttributesDialogFactory, @NotNull final ObjectChooser<GameObject, MapArchObject, Archetype> objectChooser, @NotNull final ArchetypeTypeSet<GameObject, MapArchObject, Archetype> archetypeTypeSet, @NotNull final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager, @NotNull final MapViewManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapViewManager, @NotNull final AnimationObjects<?> animationObjects, final LockedItemsControl<GameObject, MapArchObject, Archetype, CMapViewBasic> lockedItemsControl, @NotNull final GameObjectMatcher monsterMatcher, @NotNull final SelectedSquareControl<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareControl, @NotNull final SelectedSquareView<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareView, @NotNull final Frame parent) {
- super(gameObjectAttributesModel, gameObjectAttributesDialogFactory, objectChooser, archetypeTypeSet, mapManager, mapViewManager, animationObjects, lockedItemsControl, monsterMatcher, selectedSquareControl, selectedSquareView, parent);
- }
-
-} // class GameObjectAttributesControl
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2008-09-18 19:50:01 UTC (rev 5202)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2008-09-18 19:57:56 UTC (rev 5203)
@@ -28,7 +28,6 @@
import daieditor.gameobject.anim.AnimationObjects;
import daieditor.gameobject.face.FaceObjects;
import daieditor.gameobject.scripts.ScriptArchUtils;
-import daieditor.gui.GameObjectAttributesControl;
import daieditor.gui.map.CMapViewBasic;
import daieditor.gui.map.DefaultRendererFactory;
import daieditor.gui.prefs.AppPrefs;
@@ -61,19 +60,14 @@
import net.sf.gridarta.gameobject.match.MutableOrGameObjectMatcher;
import net.sf.gridarta.gameobject.match.ViewGameObjectMatcherManager;
import net.sf.gridarta.gui.MainView;
-import net.sf.gridarta.gui.MapViewManager;
import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserControl;
-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.newmap.NewMapDialogFactory;
-import net.sf.gridarta.gui.objectchooser.DefaultObjectChooser;
import net.sf.gridarta.gui.objectchooser.ObjectChooser;
import net.sf.gridarta.gui.prefs.DevPrefs;
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.gui.utils.GUIUtils;
import net.sf.gridarta.io.GameObjectParser;
@@ -225,13 +219,6 @@
/** {@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();
}
Deleted: trunk/daimonin/src/daieditor/gui/GameObjectAttributesControl.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/GameObjectAttributesControl.java 2008-09-18 19:50:01 UTC (rev 5202)
+++ trunk/daimonin/src/daieditor/gui/GameObjectAttributesControl.java 2008-09-18 19:57:56 UTC (rev 5203)
@@ -1,57 +0,0 @@
-/*
- * Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
- * Copyright (C) 2000-2007 The Gridarta Developers.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-package daieditor.gui;
-
-import daieditor.gameobject.Archetype;
-import daieditor.gameobject.GameObject;
-import daieditor.gui.map.CMapViewBasic;
-import daieditor.map.MapArchObject;
-import java.awt.Frame;
-import net.sf.gridarta.MapManager;
-import net.sf.gridarta.archtype.ArchetypeTypeSet;
-import net.sf.gridarta.gameobject.anim.AnimationObjects;
-import net.sf.gridarta.gameobject.match.GameObjectMatcher;
-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.gameobjectattributespanel.GameObjectAttributesModel;
-import net.sf.gridarta.gui.objectchooser.ObjectChooser;
-import net.sf.gridarta.gui.selectedsquare.SelectedSquareControl;
-import net.sf.gridarta.gui.selectedsquare.SelectedSquareView;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * <code>GameObjectAttributesPanel</code> implements the panel that holds
- * information about the currently selected GameObject on the map.
- * @author <a href="mailto:mic...@no...">Michael Toennies</a>
- * @author <a href="mailto:and...@gm...">Andreas Vogl</a>
- * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
- */
-public final class GameObjectAttributesControl extends net.sf.gridarta.gui.gameobjectattributespanel.GameObjectAttributesControl<GameObject, MapArchObject, Archetype, CMapViewBasic> {
-
- /** Serial Version UID. */
- private static final long serialVersionUID = 1L;
-
- /* Build Panel */
- public GameObjectAttributesControl(@NotNull final GameObjectAttributesModel<GameObject, MapArchObject, Archetype> gameObjectAttributesModel, @NotNull final GameObjectAttributesDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gameObjectAttributesDialogFactory, @NotNull final ObjectChooser<GameObject, MapArchObject, Archetype> objectChooser, @NotNull final ArchetypeTypeSet<GameObject, MapArchObject, Archetype> archetypeTypeSet, @NotNull final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager, @NotNull final MapViewManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapViewManager, @NotNull final AnimationObjects<?> animationObjects, final LockedItemsControl<GameObject, MapArchObject, Archetype, CMapViewBasic> lockedItemsControl, @NotNull final GameObjectMatcher monsterMatcher, @NotNull final SelectedSquareControl<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareControl, @NotNull final SelectedSquareView<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareView, @NotNull final Frame parent) {
- super(gameObjectAttributesModel, gameObjectAttributesDialogFactory, objectChooser, archetypeTypeSet, mapManager, mapViewManager, animationObjects, lockedItemsControl, monsterMatcher, selectedSquareControl, selectedSquareView, parent);
- }
-
-} // class GameObjectAttributesControl
Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-09-18 19:50:01 UTC (rev 5202)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-09-18 19:57:56 UTC (rev 5203)
@@ -399,7 +399,7 @@
AbstractScriptArchEditor.initEventTypeBoxes(scriptExtension, scriptName, createEventTypeBox(), scriptFileFilter, globalSettings, mapManager);
final LockedItemsControl<G, A, R, V> lockedItemsControl = new LockedItemsControl<G, A, R, V>(mapManager, mapViewManager, lockedItemsTypeNumbers);
final GameObjectAttributesModel<G, A, R> gameObjectAttributesModel = new GameObjectAttributesModel<G, A, R>();
- gameObjectAttributesControl = newGameObjectAttributesControl(gameObjectAttributesModel, gameObjectAttributesDialogFactory, objectChooser, archetypeTypeSet, mapManager, mapViewManager, animationObjects, lockedItemsControl, monsterMatcher, selectedSquareControl, selectedSquareView, mainView);
+ gameObjectAttributesControl = new GameObjectAttributesControl<G, A, R, V>(gameObjectAttributesModel, gameObjectAttributesDialogFactory, objectChooser, archetypeTypeSet, mapManager, mapViewManager, animationObjects, lockedItemsControl, monsterMatcher, selectedSquareControl, selectedSquareView, mainView);
init2(gridartaObjectsFactory, globalSettings, mapManager, archetypeSet, validators, gameObjectMatchers, gameObjectAttributesModel, objectChooser);
final ObjectChoiceDisplay<G, A, R, V> objectChoiceDisplay = new ObjectChoiceDisplay<G, A, R, V>(replaceDialogManager, archetypeTypeSet, objectChooser, archetypeChooserModel, pickmapChooserControl);
final ToolPalette<G, A, R, V> toolPalette = new ToolPalette<G, A, R, V>(editTypes, selectedSquareView, objectChooser, pickmapChooserControl);
@@ -459,9 +459,6 @@
protected abstract void createActions();
@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/app/net/sf/gridarta/gui/gameobjectattributespanel/GameObjectAttributesControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjectattributespanel/GameObjectAttributesControl.java 2008-09-18 19:50:01 UTC (rev 5202)
+++ trunk/src/app/net/sf/gridarta/gui/gameobjectattributespanel/GameObjectAttributesControl.java 2008-09-18 19:57:56 UTC (rev 5203)
@@ -71,7 +71,7 @@
* attributes.
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
-public abstract class GameObjectAttributesControl<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R, V>> extends JPanel {
+public class GameObjectAttributesControl<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R, V>> extends JPanel {
/** The serial version UID. */
private static final long serialVersionUID = 1;
@@ -310,7 +310,7 @@
* @param selectedSquareView the selected square view instance
* @param parent the parent component for dialog windows
*/
- protected GameObjectAttributesControl(@NotNull final GameObjectAttributesModel<G, A, R> gameObjectAttributesModel, @NotNull final GameObjectAttributesDialogFactory<G, A, R, V> gameObjectAttributesDialogFactory, @NotNull final ObjectChooser<G, A, R> objectChooser, @NotNull final ArchetypeTypeSet<G, A, R> archetypeTypeSet, @NotNull final MapManager<G, A, R, V> mapManager, @NotNull final MapViewManager<G, A, R, V> mapViewManager, @NotNull final AnimationObjects<?> animationObjects, final LockedItemsControl<G, A, R, V> lockedItemsControl, @NotNull final GameObjectMatcher monsterMatcher, @NotNull final SelectedSquareControl<G, A, R, V> selectedSquareControl, @NotNull final SelectedSquareView<G, A, R, V> selectedSquareView, @NotNull final Frame parent) {
+ public GameObjectAttributesControl(@NotNull final GameObjectAttributesModel<G, A, R> gameObjectAttributesModel, @NotNull final GameObjectAttributesDialogFactory<G, A, R, V> gameObjectAttributesDialogFactory, @NotNull final ObjectChooser<G, A, R> objectChooser, @NotNull final ArchetypeTypeSet<G, A, R> archetypeTypeSet, @NotNull final MapManager<G, A, R, V> mapManager, @NotNull final MapViewManager<G, A, R, V> mapViewManager, @NotNull final AnimationObjects<?> animationObjects, final LockedItemsControl<G, A, R, V> lockedItemsControl, @NotNull final GameObjectMatcher monsterMatcher, @NotNull final SelectedSquareControl<G, A, R, V> selectedSquareControl, @NotNull final SelectedSquareView<G, A, R, V> selectedSquareView, @NotNull final Frame parent) {
super(new BorderLayout());
this.gameObjectAttributesModel = gameObjectAttributesModel;
this.gameObjectAttributesDialogFactory = gameObjectAttributesDialogFactory;
Modified: trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java
===================================================================
--- trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java 2008-09-18 19:50:01 UTC (rev 5202)
+++ trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java 2008-09-18 19:57:56 UTC (rev 5203)
@@ -54,9 +54,9 @@
import net.sf.gridarta.gameobject.AbstractArchetypeSet;
import net.sf.gridarta.gameobject.Archetype;
import net.sf.gridarta.gameobject.ArchetypeSet;
+import net.sf.gridarta.gameobject.FaceSource;
import net.sf.gridarta.gameobject.GameObject;
import net.sf.gridarta.gameobject.GameObjectFactory;
-import net.sf.gridarta.gameobject.FaceSource;
import net.sf.gridarta.gameobject.anim.AbstractAnimationObject;
import net.sf.gridarta.gameobject.anim.AnimationObject;
import net.sf.gridarta.gameobject.anim.AnimationObjects;
@@ -68,12 +68,8 @@
import net.sf.gridarta.gameobject.match.GameObjectMatcher;
import net.sf.gridarta.gameobject.match.GameObjectMatchers;
import net.sf.gridarta.gui.MainView;
-import net.sf.gridarta.gui.MapViewManager;
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.gameobjectattributespanel.GameObjectAttributesControl;
import net.sf.gridarta.gui.gameobjectattributespanel.GameObjectAttributesModel;
import net.sf.gridarta.gui.gameobjectattributespanel.ScriptTab;
import net.sf.gridarta.gui.map.LevelRenderer;
@@ -82,9 +78,7 @@
import net.sf.gridarta.gui.map.RendererFactory;
import net.sf.gridarta.gui.map.tools.ToolPalette;
import net.sf.gridarta.gui.newmap.NewMapDialogFactory;
-import net.sf.gridarta.gui.objectchooser.DefaultObjectChooser;
import net.sf.gridarta.gui.objectchooser.ObjectChooser;
-import net.sf.gridarta.gui.selectedsquare.SelectedSquareControl;
import net.sf.gridarta.gui.selectedsquare.SelectedSquareView;
import net.sf.gridarta.io.AbstractGameObjectParser;
import net.sf.gridarta.io.GameObjectParser;
@@ -491,13 +485,6 @@
/** {@inheritDoc} */
@NotNull
@Override
- protected GameObjectAttributesControl<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> newGameObjectAttributesControl(final GameObjectAttributesModel<TestGameObject, TestMapArchObject, TestArchetype> gameObjectAttributesModel, final GameObjectAttributesDialogFactory<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> gameObjectAttributesDialogFactory, final DefaultObjectChooser<TestGameObject, TestMapArchObject, TestArchetype> objectChooser, final ArchetypeTypeSet<TestGameObject, TestMapArchObject, TestArchetype> archetypeTypeSet, final MapManager<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> mapManager, final MapViewManager<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> mapViewManager, final AnimationObjects<? extends AnimationObject> animationObjects, final LockedItemsControl<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> lockedItemsControl, final GameObjectMatcher monsterMatcher, final SelectedSquareControl<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> selectedSquareControl, final SelectedSquareView<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> selectedSquareView, final MainView<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> mainView) {
- 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.
|
