Menu
▾
▴
[Gridarta-commit] SF.net SVN: gridarta:[4631] trunk
|
From: <aki...@us...> - 2008-07-31 21:50:20
|
Revision: 4631
http://gridarta.svn.sourceforge.net/gridarta/?rev=4631&view=rev
Author: akirschbaum
Date: 2008-07-31 21:50:23 +0000 (Thu, 31 Jul 2008)
Log Message:
-----------
Remove calls to MainControl.getArchetypeTypeSet().
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/CMainControl.java
trunk/crossfire/src/cfeditor/gui/GameObjectAttributesPanel.java
trunk/daimonin/src/daieditor/CMainControl.java
trunk/daimonin/src/daieditor/gui/GameObjectAttributesPanel.java
trunk/src/app/net/sf/gridarta/gui/GameObjectAttributesPanel.java
Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java 2008-07-31 21:44:34 UTC (rev 4630)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2008-07-31 21:50:23 UTC (rev 4631)
@@ -323,7 +323,7 @@
// Initialize the main view
final LockedItemsControl<GameObject, MapArchObject, Archetype, CMapViewBasic> lockedItemsControl = new LockedItemsControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(getMapManager(), 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);
- gameObjectAttributesPanel = new GameObjectAttributesPanel(this, getMapManager(), animationObjects, lockedItemsControl, monsterMatcher, selectedSquareControl, selectedSquareView);
+ gameObjectAttributesPanel = new GameObjectAttributesPanel(this, archetypeTypeSet, getMapManager(), animationObjects, lockedItemsControl, monsterMatcher, selectedSquareControl, selectedSquareView);
PluginParameterFactory.init(archetypeSet, gameObjectAttributesPanel);
scriptControl = new ScriptController(this, archetypeSet, mainView);
mainView.init(gameObjectAttributesPanel, selectedSquareView, archetypeTypeSet, mapTileListBottom, gameObjectMatchers, archetypeChooserControl, objectChooser);
Modified: trunk/crossfire/src/cfeditor/gui/GameObjectAttributesPanel.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/GameObjectAttributesPanel.java 2008-07-31 21:44:34 UTC (rev 4630)
+++ trunk/crossfire/src/cfeditor/gui/GameObjectAttributesPanel.java 2008-07-31 21:50:23 UTC (rev 4631)
@@ -25,6 +25,7 @@
import cfeditor.map.MapArchObject;
import net.sf.gridarta.MainControl;
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.connectionview.LockedItemsControl;
@@ -45,8 +46,8 @@
private static final long serialVersionUID = 1L;
/* Build Panel */
- public GameObjectAttributesPanel(final MainControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mainControl, final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager, @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) {
- super(mainControl, mapManager, animationObjects, lockedItemsControl, monsterMatcher, selectedSquareControl, selectedSquareView);
+ public GameObjectAttributesPanel(final MainControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mainControl, @NotNull final ArchetypeTypeSet<GameObject, MapArchObject, Archetype> archetypeTypeSet, final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager, @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) {
+ super(mainControl, archetypeTypeSet, mapManager, animationObjects, lockedItemsControl, monsterMatcher, selectedSquareControl, selectedSquareView);
}
/** {@inheritDoc} */
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2008-07-31 21:44:34 UTC (rev 4630)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2008-07-31 21:50:23 UTC (rev 4631)
@@ -384,7 +384,7 @@
// Initialize the main view
final LockedItemsControl<GameObject, MapArchObject, Archetype, CMapViewBasic> lockedItemsControl = new LockedItemsControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(getMapManager(), 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);
- gameObjectAttributesPanel = new GameObjectAttributesPanel(this, getMapManager(), animationObjects, lockedItemsControl, monsterMatcher, selectedSquareControl, selectedSquareView);
+ gameObjectAttributesPanel = new GameObjectAttributesPanel(this, archetypeTypeSet, getMapManager(), animationObjects, lockedItemsControl, monsterMatcher, selectedSquareControl, selectedSquareView);
mainView.init(gameObjectAttributesPanel, selectedSquareView, archetypeTypeSet, mapTileListBottom, gameObjectMatchers, archetypeChooserControl, objectChooser);
mapActions.updateMenuState();
archetypeParser = new ArchetypeParser(this, archetypeChooserControl, animationObjects, archetypeSet);
Modified: trunk/daimonin/src/daieditor/gui/GameObjectAttributesPanel.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/GameObjectAttributesPanel.java 2008-07-31 21:44:34 UTC (rev 4630)
+++ trunk/daimonin/src/daieditor/gui/GameObjectAttributesPanel.java 2008-07-31 21:50:23 UTC (rev 4631)
@@ -25,6 +25,7 @@
import daieditor.map.MapArchObject;
import net.sf.gridarta.MainControl;
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.connectionview.LockedItemsControl;
@@ -45,8 +46,8 @@
private static final long serialVersionUID = 1L;
/* Build Panel */
- public GameObjectAttributesPanel(final MainControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mainControl, final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager, @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) {
- super(mainControl, mapManager, animationObjects, lockedItemsControl, monsterMatcher, selectedSquareControl, selectedSquareView);
+ public GameObjectAttributesPanel(final MainControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mainControl, @NotNull final ArchetypeTypeSet<GameObject, MapArchObject, Archetype> archetypeTypeSet, final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager, @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) {
+ super(mainControl, archetypeTypeSet, mapManager, animationObjects, lockedItemsControl, monsterMatcher, selectedSquareControl, selectedSquareView);
}
/** {@inheritDoc} */
Modified: trunk/src/app/net/sf/gridarta/gui/GameObjectAttributesPanel.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/GameObjectAttributesPanel.java 2008-07-31 21:44:34 UTC (rev 4630)
+++ trunk/src/app/net/sf/gridarta/gui/GameObjectAttributesPanel.java 2008-07-31 21:50:23 UTC (rev 4631)
@@ -48,6 +48,7 @@
import net.sf.gridarta.MapManager;
import net.sf.gridarta.MapManagerListener;
import net.sf.gridarta.archtype.ArchetypeType;
+import net.sf.gridarta.archtype.ArchetypeTypeSet;
import net.sf.gridarta.gameobject.Archetype;
import net.sf.gridarta.gameobject.GameObject;
import net.sf.gridarta.gameobject.anim.AnimationObjects;
@@ -109,6 +110,10 @@
/** The MainControl to use, e.g. for accessing AnimationObjects. */
private final MainControl<G, A, R, V> mainControl;
+ /** The archetype type set. */
+ @NotNull
+ private final ArchetypeTypeSet<G, A, R> archetypeTypeSet;
+
/** The map manager. */
private final MapManager<G, A, R, V> mapManager;
@@ -272,12 +277,14 @@
* Create the GameObjectAttributesPanel.
* @param mainControl MainControl to use, e.g. for accessing
* AnimationObjects.
+ * @param archetypeTypeSet the archetype type set
* @param monsterMatcher the <code>GameObjectMatcher</code> for matching
* monster objects
*/
- protected GameObjectAttributesPanel(@NotNull final MainControl<G, A, R, V> mainControl, @NotNull final MapManager<G, A, R, V> mapManager, @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) {
+ protected GameObjectAttributesPanel(@NotNull final MainControl<G, A, R, V> mainControl, @NotNull final ArchetypeTypeSet<G, A, R> archetypeTypeSet, @NotNull final MapManager<G, A, R, V> mapManager, @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) {
super(new BorderLayout());
this.mainControl = mainControl;
+ this.archetypeTypeSet = archetypeTypeSet;
this.mapManager = mapManager;
this.animationObjects = animationObjects;
errorListView = new ErrorListView<G, A, R, V>(mapManager, selectedSquareView);
@@ -970,7 +977,7 @@
archTypeText.setText("Type:");
} else {
final StringBuilder typeText = new StringBuilder("Type: ");
- final ArchetypeType archetypeType = mainControl.getArchetypeTypeSet().getArchetypeType(gameObject.getArchetype());
+ final ArchetypeType archetypeType = archetypeTypeSet.getArchetypeType(gameObject.getArchetype());
typeText.append(archetypeType.getTypeName());
typeText.append(" (").append(archetypeType.getTypeNo()).append(')');
typeText.append(" [").append(gameObject.getArchetypeName()).append(']');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
