Menu
▾
▴
[Gridarta-commit] SF.net SVN: gridarta:[4467] trunk
|
From: <aki...@us...> - 2008-07-26 07:29:39
|
Revision: 4467
http://gridarta.svn.sourceforge.net/gridarta/?rev=4467&view=rev
Author: akirschbaum
Date: 2008-07-26 07:29:46 +0000 (Sat, 26 Jul 2008)
Log Message:
-----------
Remove calls to MainControl.getArchetypeSet().
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/CMainControl.java
trunk/crossfire/src/cfeditor/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java
trunk/crossfire/src/cfeditor/gui/gameobjectattributesdialog/GameObjectAttributesDialogFactory.java
trunk/daimonin/src/daieditor/CMainControl.java
trunk/daimonin/src/daieditor/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java
trunk/daimonin/src/daieditor/gui/gameobjectattributesdialog/GameObjectAttributesDialogFactory.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/AbstractGameObjectAttributesDialog.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/AbstractGameObjectAttributesDialogFactory.java
Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java 2008-07-26 07:14:11 UTC (rev 4466)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2008-07-26 07:29:46 UTC (rev 4467)
@@ -368,7 +368,7 @@
recentManager.initRecent();
validators = createMapValidators();
new AutoValidator<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, PREFS_VALIDATOR_AUTO_DEFAULT);
- gameObjectAttributesDialogFactory = new GameObjectAttributesDialogFactory(typeList, this, animationObjects, getMapManager(), treasureListTree, faceObjects, mapFileFilter);
+ gameObjectAttributesDialogFactory = new GameObjectAttributesDialogFactory(typeList, this, archetypeSet, animationObjects, getMapManager(), treasureListTree, faceObjects, mapFileFilter);
}
/**
Modified: trunk/crossfire/src/cfeditor/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java 2008-07-26 07:14:11 UTC (rev 4466)
+++ trunk/crossfire/src/cfeditor/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java 2008-07-26 07:29:46 UTC (rev 4467)
@@ -37,6 +37,7 @@
import net.sf.gridarta.MainControl;
import net.sf.gridarta.MapManager;
import net.sf.gridarta.gameobject.ArchAttribType;
+import net.sf.gridarta.gameobject.ArchetypeSet;
import net.sf.gridarta.gameobject.anim.AnimationObjects;
import net.sf.gridarta.gameobject.face.FaceObjects;
import net.sf.gridarta.gui.gameobjectattributesdialog.AbstractGameObjectAttributesDialog;
@@ -74,14 +75,15 @@
* @param archTypeList the list of CF type-data
* @param gameObject the GameObject to be displayed by this dialog
* @param mainControl main control
+ * @param archetypeSet the archetype set to use
* @param animationObjects the animation objects instance to use
* @param mapManager the map manager
* @param treasureListTree the treasure list tree
* @param faceObjects the FaceObjects instance to use
* @param mapFileFilter the Swing file filter to use
*/
- public GameObjectAttributesDialog(@NotNull final AbstractGameObjectAttributesDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gameObjectAttributesDialogFactory, @NotNull final CFArchTypeList archTypeList, @NotNull final GameObject gameObject, @NotNull final MainControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mainControl, @NotNull final AnimationObjects<?> animationObjects, @NotNull final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager, @NotNull final CFTreasureListTree<GameObject, MapArchObject, Archetype> treasureListTree, @NotNull final FaceObjects faceObjects, @NotNull final FileFilter mapFileFilter) {
- super(gameObjectAttributesDialogFactory, archTypeList, gameObject, mainControl, animationObjects, treasureListTree, faceObjects, mapFileFilter);
+ public GameObjectAttributesDialog(@NotNull final AbstractGameObjectAttributesDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gameObjectAttributesDialogFactory, @NotNull final CFArchTypeList archTypeList, @NotNull final GameObject gameObject, @NotNull final MainControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mainControl, @NotNull final ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet, @NotNull final AnimationObjects<?> animationObjects, @NotNull final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager, @NotNull final CFTreasureListTree<GameObject, MapArchObject, Archetype> treasureListTree, @NotNull final FaceObjects faceObjects, @NotNull final FileFilter mapFileFilter) {
+ super(gameObjectAttributesDialogFactory, archTypeList, gameObject, mainControl, archetypeSet, animationObjects, treasureListTree, faceObjects, mapFileFilter);
this.mapManager = mapManager;
}
@@ -469,7 +471,7 @@
// now lets assign the visible face - perhaps we have still a anim
gameObject.setObjectFace();
- imagePanel.setIcon(mainControl.getArchetypeSet().getFace(gameObject));
+ imagePanel.setIcon(getFace(gameObject));
if (newMsg != null) {
// set new msg text only when it is not equal to Archetype
Modified: trunk/crossfire/src/cfeditor/gui/gameobjectattributesdialog/GameObjectAttributesDialogFactory.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/gameobjectattributesdialog/GameObjectAttributesDialogFactory.java 2008-07-26 07:14:11 UTC (rev 4466)
+++ trunk/crossfire/src/cfeditor/gui/gameobjectattributesdialog/GameObjectAttributesDialogFactory.java 2008-07-26 07:29:46 UTC (rev 4467)
@@ -27,11 +27,11 @@
import net.sf.gridarta.CFArchTypeList;
import net.sf.gridarta.MainControl;
import net.sf.gridarta.MapManager;
+import net.sf.gridarta.gameobject.ArchetypeSet;
import net.sf.gridarta.gameobject.anim.AnimationObjects;
import net.sf.gridarta.gameobject.face.FaceObjects;
import net.sf.gridarta.gui.gameobjectattributesdialog.AbstractGameObjectAttributesDialogFactory;
import net.sf.gridarta.treasurelist.CFTreasureListTree;
-import net.sf.japi.swing.ActionFactory;
import org.jetbrains.annotations.NotNull;
public class GameObjectAttributesDialogFactory extends AbstractGameObjectAttributesDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> {
@@ -40,20 +40,21 @@
* Creates a new instance.
* @param archTypeList the list of CF type-data
* @param mainControl main control
+ * @param archetypeSet the archetype set to use
* @param animationObjects the animation objects instance to use
* @param mapManager the map manager
* @param treasureListTree the treasure list tree instance to use
* @param faceObjects the FaceObjects instance to use
* @param mapFileFilter the Swing file filter to use
*/
- public GameObjectAttributesDialogFactory(@NotNull final CFArchTypeList archTypeList, @NotNull final MainControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mainControl, @NotNull final AnimationObjects<?> animationObjects, @NotNull final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager, @NotNull final CFTreasureListTree<GameObject, MapArchObject, Archetype> treasureListTree, @NotNull final FaceObjects faceObjects, @NotNull final FileFilter mapFileFilter) {
- super(archTypeList, mainControl, animationObjects, mapManager, treasureListTree, faceObjects, mapFileFilter);
+ public GameObjectAttributesDialogFactory(@NotNull final CFArchTypeList archTypeList, @NotNull final MainControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mainControl, @NotNull final ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet, @NotNull final AnimationObjects<?> animationObjects, @NotNull final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager, @NotNull final CFTreasureListTree<GameObject, MapArchObject, Archetype> treasureListTree, @NotNull final FaceObjects faceObjects, @NotNull final FileFilter mapFileFilter) {
+ super(archTypeList, mainControl, archetypeSet, animationObjects, mapManager, treasureListTree, faceObjects, mapFileFilter);
}
/** {@inheritDoc} */
@Override
- protected GameObjectAttributesDialog newGameObjectAttributesDialog(@NotNull final CFArchTypeList archTypeList, @NotNull final GameObject gameObject, @NotNull final MainControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mainControl, @NotNull final AnimationObjects<?> animationObjects, @NotNull final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager, @NotNull final CFTreasureListTree<GameObject, MapArchObject, Archetype> treasureListTree, @NotNull final FaceObjects faceObjects, @NotNull final FileFilter mapFileFilter) {
- return new GameObjectAttributesDialog(this, archTypeList, gameObject, mainControl, animationObjects, mapManager, treasureListTree, faceObjects, mapFileFilter);
+ protected GameObjectAttributesDialog newGameObjectAttributesDialog(@NotNull final CFArchTypeList archTypeList, @NotNull final GameObject gameObject, @NotNull final MainControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mainControl, @NotNull final ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet, @NotNull final AnimationObjects<?> animationObjects, @NotNull final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager, @NotNull final CFTreasureListTree<GameObject, MapArchObject, Archetype> treasureListTree, @NotNull final FaceObjects faceObjects, @NotNull final FileFilter mapFileFilter) {
+ return new GameObjectAttributesDialog(this, archTypeList, gameObject, mainControl, archetypeSet, animationObjects, mapManager, treasureListTree, faceObjects, mapFileFilter);
}
} // class GameObjectAttributesDialogFactory
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2008-07-26 07:14:11 UTC (rev 4466)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2008-07-26 07:29:46 UTC (rev 4467)
@@ -443,7 +443,7 @@
recentManager.initRecent();
validators = createMapValidators();
new AutoValidator<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, PREFS_VALIDATOR_AUTO_DEFAULT);
- gameObjectAttributesDialogFactory = new GameObjectAttributesDialogFactory(typeList, this, animationObjects, getMapManager(), treasureListTree, faceObjects, mapFileFilter);
+ gameObjectAttributesDialogFactory = new GameObjectAttributesDialogFactory(typeList, this, archetypeSet, animationObjects, getMapManager(), treasureListTree, faceObjects, mapFileFilter);
}
/**
Modified: trunk/daimonin/src/daieditor/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java 2008-07-26 07:14:11 UTC (rev 4466)
+++ trunk/daimonin/src/daieditor/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java 2008-07-26 07:29:46 UTC (rev 4467)
@@ -37,6 +37,7 @@
import net.sf.gridarta.MainControl;
import net.sf.gridarta.MapManager;
import net.sf.gridarta.gameobject.ArchAttribType;
+import net.sf.gridarta.gameobject.ArchetypeSet;
import net.sf.gridarta.gameobject.anim.AnimationObjects;
import net.sf.gridarta.gameobject.face.FaceObjects;
import net.sf.gridarta.gui.gameobjectattributesdialog.AbstractGameObjectAttributesDialog;
@@ -73,14 +74,15 @@
* @param archTypeList the list of CF type-data
* @param gameObject the GameObject to be displayed by this dialog
* @param mainControl main control
+ * @param archetypeSet the archetype set to use
* @param animationObjects the animation objects instance to use
* @param mapManager the map manager
* @param treasureListTree the treasure list tree
* @param faceObjects the FaceObjects instance to use
* @param mapFileFilter the Swing file filter to use
*/
- public GameObjectAttributesDialog(@NotNull final AbstractGameObjectAttributesDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gameObjectAttributesDialogFactory, @NotNull final CFArchTypeList archTypeList, @NotNull final GameObject gameObject, @NotNull final MainControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mainControl, @NotNull final AnimationObjects<?> animationObjects, @NotNull final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager, @NotNull final CFTreasureListTree<GameObject, MapArchObject, Archetype> treasureListTree, @NotNull final FaceObjects faceObjects, @NotNull final FileFilter mapFileFilter) {
- super(gameObjectAttributesDialogFactory, archTypeList, gameObject, mainControl, animationObjects, treasureListTree, faceObjects, mapFileFilter);
+ public GameObjectAttributesDialog(@NotNull final AbstractGameObjectAttributesDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gameObjectAttributesDialogFactory, @NotNull final CFArchTypeList archTypeList, @NotNull final GameObject gameObject, @NotNull final MainControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mainControl, @NotNull final ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet, @NotNull final AnimationObjects<?> animationObjects, @NotNull final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager, @NotNull final CFTreasureListTree<GameObject, MapArchObject, Archetype> treasureListTree, @NotNull final FaceObjects faceObjects, @NotNull final FileFilter mapFileFilter) {
+ super(gameObjectAttributesDialogFactory, archTypeList, gameObject, mainControl, archetypeSet, animationObjects, treasureListTree, faceObjects, mapFileFilter);
this.mapManager = mapManager;
}
Modified: trunk/daimonin/src/daieditor/gui/gameobjectattributesdialog/GameObjectAttributesDialogFactory.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/gameobjectattributesdialog/GameObjectAttributesDialogFactory.java 2008-07-26 07:14:11 UTC (rev 4466)
+++ trunk/daimonin/src/daieditor/gui/gameobjectattributesdialog/GameObjectAttributesDialogFactory.java 2008-07-26 07:29:46 UTC (rev 4467)
@@ -27,11 +27,11 @@
import net.sf.gridarta.CFArchTypeList;
import net.sf.gridarta.MainControl;
import net.sf.gridarta.MapManager;
+import net.sf.gridarta.gameobject.ArchetypeSet;
import net.sf.gridarta.gameobject.anim.AnimationObjects;
import net.sf.gridarta.gameobject.face.FaceObjects;
import net.sf.gridarta.gui.gameobjectattributesdialog.AbstractGameObjectAttributesDialogFactory;
import net.sf.gridarta.treasurelist.CFTreasureListTree;
-import net.sf.japi.swing.ActionFactory;
import org.jetbrains.annotations.NotNull;
public class GameObjectAttributesDialogFactory extends AbstractGameObjectAttributesDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> {
@@ -40,20 +40,21 @@
* Creates a new instance.
* @param archTypeList the list of CF type-data
* @param mainControl main control
+ * @param archetypeSet the archetype set to use
* @param animationObjects the animation objects instance to use
* @param mapManager the map manager
* @param treasureListTree the treasure list tree instance to use
* @param faceObjects the FaceObjects instance to use
* @param mapFileFilter the Swing file filter to use
*/
- public GameObjectAttributesDialogFactory(@NotNull final CFArchTypeList archTypeList, @NotNull final MainControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mainControl, @NotNull final AnimationObjects<?> animationObjects, @NotNull final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager, @NotNull final CFTreasureListTree<GameObject, MapArchObject, Archetype> treasureListTree, @NotNull final FaceObjects faceObjects, @NotNull final FileFilter mapFileFilter) {
- super(archTypeList, mainControl, animationObjects, mapManager, treasureListTree, faceObjects, mapFileFilter);
+ public GameObjectAttributesDialogFactory(@NotNull final CFArchTypeList archTypeList, @NotNull final MainControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mainControl, @NotNull final ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet, @NotNull final AnimationObjects<?> animationObjects, @NotNull final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager, @NotNull final CFTreasureListTree<GameObject, MapArchObject, Archetype> treasureListTree, @NotNull final FaceObjects faceObjects, @NotNull final FileFilter mapFileFilter) {
+ super(archTypeList, mainControl, archetypeSet, animationObjects, mapManager, treasureListTree, faceObjects, mapFileFilter);
}
/** {@inheritDoc} */
@Override
- protected GameObjectAttributesDialog newGameObjectAttributesDialog(@NotNull final CFArchTypeList archTypeList, @NotNull final GameObject gameObject, @NotNull final MainControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mainControl, @NotNull final AnimationObjects<?> animationObjects, @NotNull final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager, @NotNull final CFTreasureListTree<GameObject, MapArchObject, Archetype> treasureListTree, @NotNull final FaceObjects faceObjects, @NotNull final FileFilter mapFileFilter) {
- return new GameObjectAttributesDialog(this, archTypeList, gameObject, mainControl, animationObjects, mapManager, treasureListTree, faceObjects, mapFileFilter);
+ protected GameObjectAttributesDialog newGameObjectAttributesDialog(@NotNull final CFArchTypeList archTypeList, @NotNull final GameObject gameObject, @NotNull final MainControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mainControl, @NotNull final ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet, @NotNull final AnimationObjects<?> animationObjects, @NotNull final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager, @NotNull final CFTreasureListTree<GameObject, MapArchObject, Archetype> treasureListTree, @NotNull final FaceObjects faceObjects, @NotNull final FileFilter mapFileFilter) {
+ return new GameObjectAttributesDialog(this, archTypeList, gameObject, mainControl, archetypeSet, animationObjects, mapManager, treasureListTree, faceObjects, mapFileFilter);
}
} // class GameObjectAttributesDialogFactory
Modified: trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/AbstractGameObjectAttributesDialog.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/AbstractGameObjectAttributesDialog.java 2008-07-26 07:14:11 UTC (rev 4466)
+++ trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/AbstractGameObjectAttributesDialog.java 2008-07-26 07:29:46 UTC (rev 4467)
@@ -79,6 +79,7 @@
import net.sf.gridarta.MainControl;
import net.sf.gridarta.gameobject.ArchAttribType;
import net.sf.gridarta.gameobject.Archetype;
+import net.sf.gridarta.gameobject.ArchetypeSet;
import net.sf.gridarta.gameobject.GameObject;
import net.sf.gridarta.gameobject.anim.AnimationObjects;
import net.sf.gridarta.gameobject.face.FaceObjects;
@@ -125,6 +126,12 @@
/** Reference to MainControl. */
protected final MainControl<G, A, R, ?> mainControl;
+ /**
+ * The archetype set to use.
+ */
+ @NotNull
+ private final ArchetypeSet<G, A, R> archetypeSet;
+
/** The animation objects to use. */
@NotNull
private final AnimationObjects<?> animationObjects;
@@ -191,16 +198,18 @@
* @param archTypeList Reference to the list of CFArchTypes.
* @param gameObject GameObject to show dialog for.
* @param mainControl MainControl, for retrieving AnimationObjects etc.
+ * @param archetypeSet the archetype set to use
* @param animationObjects the animation objects instance to use
* @param treasureListTree the treasure list tree
* @param faceObjects the face objects instance to use
* @param mapFileFilter the Swing FileFilter for map files
*/
- protected AbstractGameObjectAttributesDialog(@NotNull final AbstractGameObjectAttributesDialogFactory<G, A, R, ?> gameObjectAttributesDialogFactory, final CFArchTypeList archTypeList, @NotNull final G gameObject, @NotNull final MainControl<G, A, R, ?> mainControl, @NotNull final AnimationObjects<?> animationObjects, @NotNull final CFTreasureListTree<G, A, R> treasureListTree, @NotNull final FaceObjects faceObjects, @NotNull final FileFilter mapFileFilter) {
+ protected AbstractGameObjectAttributesDialog(@NotNull final AbstractGameObjectAttributesDialogFactory<G, A, R, ?> gameObjectAttributesDialogFactory, final CFArchTypeList archTypeList, @NotNull final G gameObject, @NotNull final MainControl<G, A, R, ?> mainControl, @NotNull final ArchetypeSet<G, A, R> archetypeSet, @NotNull final AnimationObjects<?> animationObjects, @NotNull final CFTreasureListTree<G, A, R> treasureListTree, @NotNull final FaceObjects faceObjects, @NotNull final FileFilter mapFileFilter) {
this.gameObjectAttributesDialogFactory = gameObjectAttributesDialogFactory;
this.archTypeList = archTypeList;
this.gameObject = gameObject.getHead();
this.mainControl = mainControl;
+ this.archetypeSet = archetypeSet;
this.animationObjects = animationObjects;
this.treasureListTree = treasureListTree;
this.faceObjects = faceObjects;
@@ -390,8 +399,8 @@
* @param gameObject GameObject to return face for.
* @return Face for the supplied GameObject.
*/
- private ImageIcon getFace(@NotNull final G gameObject) {
- return mainControl.getArchetypeSet().getFace(gameObject);
+ protected ImageIcon getFace(@NotNull final G gameObject) {
+ return archetypeSet.getFace(gameObject);
}
/**
Modified: trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/AbstractGameObjectAttributesDialogFactory.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/AbstractGameObjectAttributesDialogFactory.java 2008-07-26 07:14:11 UTC (rev 4466)
+++ trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/AbstractGameObjectAttributesDialogFactory.java 2008-07-26 07:29:46 UTC (rev 4467)
@@ -27,6 +27,7 @@
import net.sf.gridarta.MainControl;
import net.sf.gridarta.MapManager;
import net.sf.gridarta.gameobject.Archetype;
+import net.sf.gridarta.gameobject.ArchetypeSet;
import net.sf.gridarta.gameobject.GameObject;
import net.sf.gridarta.gameobject.anim.AnimationObjects;
import net.sf.gridarta.gameobject.face.FaceObjects;
@@ -60,6 +61,12 @@
private final MainControl<G, A, R, V> mainControl;
/**
+ * The archetype set to use.
+ */
+ @NotNull
+ private final ArchetypeSet<G, A, R> archetypeSet;
+
+ /**
* @param animationObjects the animation objects instance to use
*/
@NotNull
@@ -93,15 +100,17 @@
* Creates a new instance.
* @param archTypeList the list of CF type-data
* @param mainControl main control
+ * @param archetypeSet the archetype set to use
* @param animationObjects the animation objects instance to use
* @param mapManager the map manager
* @param treasureListTree the treasure list tree instance to use
* @param faceObjects the FaceObjects instance to use
* @param mapFileFilter the Swing file filter to use
*/
- protected AbstractGameObjectAttributesDialogFactory(@NotNull final CFArchTypeList archTypeList, @NotNull final MainControl<G, A, R, V> mainControl, @NotNull final AnimationObjects<?> animationObjects, @NotNull final MapManager<G, A, R, V> mapManager, @NotNull final CFTreasureListTree<G, A, R> treasureListTree, @NotNull final FaceObjects faceObjects, @NotNull final FileFilter mapFileFilter) {
+ protected AbstractGameObjectAttributesDialogFactory(@NotNull final CFArchTypeList archTypeList, @NotNull final MainControl<G, A, R, V> mainControl, @NotNull final ArchetypeSet<G, A, R> archetypeSet, @NotNull final AnimationObjects<?> animationObjects, @NotNull final MapManager<G, A, R, V> mapManager, @NotNull final CFTreasureListTree<G, A, R> treasureListTree, @NotNull final FaceObjects faceObjects, @NotNull final FileFilter mapFileFilter) {
this.archTypeList = archTypeList;
this.mainControl = mainControl;
+ this.archetypeSet = archetypeSet;
this.animationObjects = animationObjects;
this.mapManager = mapManager;
this.treasureListTree = treasureListTree;
@@ -119,7 +128,7 @@
if (dialogs.containsKey(gameObject)) {
dialogs.get(gameObject).toFront();
} else {
- final AbstractGameObjectAttributesDialog<G, A, R> pane = newGameObjectAttributesDialog(archTypeList, gameObject, mainControl, animationObjects, mapManager, treasureListTree, faceObjects, mapFileFilter);
+ final AbstractGameObjectAttributesDialog<G, A, R> pane = newGameObjectAttributesDialog(archTypeList, gameObject, mainControl, archetypeSet, animationObjects, mapManager, treasureListTree, faceObjects, mapFileFilter);
final JDialog dialog = pane.createDialog(mainControl.getMainView(), ACTION_FACTORY.getString("attribTitle"));
dialog.getRootPane().setDefaultButton(pane.okButton);
dialog.setResizable(true);
@@ -148,12 +157,13 @@
* @param archTypeList the list of CF type-data
* @param gameObject the GameObject to be displayed by this dialog
* @param mainControl main control
+ * @param archetypeSet the archetype set to use
* @param animationObjects the animation objects instance to use
* @param mapManager the map manager
* @param treasureListTree the treasure list tree
* @param faceObjects the FaceObjects instance to use
* @param mapFileFilter the Swing file filter to use
*/
- protected abstract AbstractGameObjectAttributesDialog<G, A, R> newGameObjectAttributesDialog(@NotNull final CFArchTypeList archTypeList, @NotNull final G gameObject, @NotNull final MainControl<G, A, R, V> mainControl, @NotNull final AnimationObjects<?> animationObjects, @NotNull final MapManager<G, A, R, V> mapManager, @NotNull final CFTreasureListTree<G, A, R> treasureListTree, @NotNull final FaceObjects faceObjects, @NotNull final FileFilter mapFileFilter);
+ protected abstract AbstractGameObjectAttributesDialog<G, A, R> newGameObjectAttributesDialog(@NotNull final CFArchTypeList archTypeList, @NotNull final G gameObject, @NotNull final MainControl<G, A, R, V> mainControl, @NotNull final ArchetypeSet<G, A, R> archetypeSet, @NotNull final AnimationObjects<?> animationObjects, @NotNull final MapManager<G, A, R, V> mapManager, @NotNull final CFTreasureListTree<G, A, R> treasureListTree, @NotNull final FaceObjects faceObjects, @NotNull final FileFilter mapFileFilter);
} // class AbstractGameObjectAttributesDialogFactory
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
