Menu
▾
▴
[Gridarta-commit] SF.net SVN: gridarta:[6178] trunk/src
|
From: <aki...@us...> - 2009-03-28 19:07:43
|
Revision: 6178
http://gridarta.svn.sourceforge.net/gridarta/?rev=6178&view=rev
Author: akirschbaum
Date: 2009-03-28 19:07:37 +0000 (Sat, 28 Mar 2009)
Log Message:
-----------
Remove dependency ArchetypeAttributeTreasure constructor -> CFTreasureListTree.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/AbstractMainControl.java
trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttribute.java
trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeAnimName.java
trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeBitmask.java
trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeBool.java
trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeBoolSpec.java
trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeDoubleList.java
trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeFaceName.java
trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeFixed.java
trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeFloat.java
trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeInt.java
trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeInvSpell.java
trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeInvSpellOptional.java
trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeList.java
trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeLong.java
trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeMapPath.java
trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeScriptFile.java
trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeSpell.java
trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeString.java
trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeText.java
trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeTreasure.java
trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeZSpell.java
trunk/src/app/net/sf/gridarta/archtype/DefaultArchetypeAttributeFactory.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/GameObjectAttributesDialogFactory.java
trunk/src/test/net/sf/gridarta/archtype/ArchetypeTypeSetParserTest.java
Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2009-03-28 19:02:16 UTC (rev 6177)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2009-03-28 19:07:37 UTC (rev 6178)
@@ -429,7 +429,8 @@
newMapDialogFactory.setParent(mainView);
pickmapChooserControl = new PickmapChooserControl<G, A, R, V>(newMapDialogFactory, mapControlFactory, mapFolderTree, mapManager, mainView);
newMapDialogFactory.setPickmapChooserControl(pickmapChooserControl);
- final GameObjectAttributesDialogFactory<G, A, R> gameObjectAttributesDialogFactory = new GameObjectAttributesDialogFactory<G, A, R>(archetypeTypeSet, mainView);
+ final CFTreasureListTree<G, A, R> treasureListTree = new CFTreasureListTree<G, A, R>(treasureTree, mainView, archetypeSet);
+ final GameObjectAttributesDialogFactory<G, A, R> gameObjectAttributesDialogFactory = new GameObjectAttributesDialogFactory<G, A, R>(archetypeTypeSet, mainView, treasureListTree);
final ArchetypeChooserControl<G, A, R, V> archetypeChooserControl = new ArchetypeChooserControl<G, A, R, V>(archetypeChooserModel, createDirectionPane);
final DefaultObjectChooser<G, A, R> objectChooser = new DefaultObjectChooser<G, A, R>(archetypeChooserControl, pickmapChooserControl);
newMapDialogFactory.setObjectChooser(objectChooser);
@@ -465,8 +466,7 @@
}
final ScriptArchUtils scriptArchUtils = newScriptArchUtils();
final MapActions mapActions = init1(mapViewSettings, mapArchObjectParserFactory, mapArchObjectFactory, globalSettings, mapManager, mapViewManager, selectedSquareModel, exitMatcher, mainView);
- final CFTreasureListTree<G, A, R> treasureListTree = new CFTreasureListTree<G, A, R>(treasureTree, mainView, archetypeSet);
- final ArchetypeAttributeFactory<G, A, R> archetypeAttributeFactory = new DefaultArchetypeAttributeFactory<G, A, R>(animationObjects, typeNoEventConnector, archetypeTypeSet, faceObjects, gameObjectSpells, numberSpells, undefinedSpellIndex, globalSettings, mapFileFilter, scriptFileFilter, treasureListTree, treasureTree);
+ final ArchetypeAttributeFactory<G, A, R> archetypeAttributeFactory = new DefaultArchetypeAttributeFactory<G, A, R>(animationObjects, typeNoEventConnector, archetypeTypeSet, faceObjects, gameObjectSpells, numberSpells, undefinedSpellIndex, globalSettings, mapFileFilter, scriptFileFilter, treasureTree);
final ArchetypeAttributeParser<G, A, R> archetypeAttributeParser = new ArchetypeAttributeParser<G, A, R>(archetypeAttributeFactory);
final ArchetypeTypeParser<G, A, R> archetypeTypeParser = new ArchetypeTypeParser<G, A, R>(archetypeAttributeParser);
final ArchetypeTypeSetParser<G, A, R> archetypeTypeSetParser = new ArchetypeTypeSetParser<G, A, R>(xmlHelper.getDocumentBuilder(), xmlHelper.getXPath(), archetypeTypeSet, archetypeTypeParser);
Modified: trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttribute.java
===================================================================
--- trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttribute.java 2009-03-28 19:02:16 UTC (rev 6177)
+++ trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttribute.java 2009-03-28 19:07:37 UTC (rev 6178)
@@ -26,6 +26,7 @@
import net.sf.gridarta.map.MapArchObject;
import net.sf.gridarta.map.validation.checks.AttributeRangeChecker;
import net.sf.gridarta.map.validation.checks.InvalidCheckException;
+import net.sf.gridarta.treasurelist.CFTreasureListTree;
import org.jetbrains.annotations.NotNull;
/**
@@ -173,10 +174,11 @@
* @param type the archetype type
* @param background the background color
* @param parent the parent component
+ * @param treasureListTree the treasure list tree to display
* @return the GUI elements
*/
@NotNull
- public abstract GuiInfo<G, A, R> createGui(@NotNull final G gameObject, @NotNull final R archetype, @NotNull final ArchetypeType<G, A, R> type, @NotNull final Color background, @NotNull final Component parent);
+ public abstract GuiInfo<G, A, R> createGui(@NotNull final G gameObject, @NotNull final R archetype, @NotNull final ArchetypeType<G, A, R> type, @NotNull final Color background, @NotNull final Component parent, @NotNull final CFTreasureListTree<G, A, R> treasureListTree);
/**
* Adds attribute range checks for all defined attributes.
Modified: trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeAnimName.java
===================================================================
--- trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeAnimName.java 2009-03-28 19:02:16 UTC (rev 6177)
+++ trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeAnimName.java 2009-03-28 19:07:37 UTC (rev 6178)
@@ -30,6 +30,7 @@
import net.sf.gridarta.gui.gameobjectattributesdialog.TreeChooseAction;
import net.sf.gridarta.map.MapArchObject;
import net.sf.gridarta.map.validation.checks.AttributeRangeChecker;
+import net.sf.gridarta.treasurelist.CFTreasureListTree;
import org.jetbrains.annotations.NotNull;
/**
@@ -70,7 +71,7 @@
/** {@inheritDoc} */
@NotNull
@Override
- public GuiInfo<G, A, R> createGui(@NotNull final G gameObject, @NotNull final R archetype, @NotNull final ArchetypeType<G, A, R> type, @NotNull final Color background, @NotNull final Component parent) {
+ public GuiInfo<G, A, R> createGui(@NotNull final G gameObject, @NotNull final R archetype, @NotNull final ArchetypeType<G, A, R> type, @NotNull final Color background, @NotNull final Component parent, @NotNull final CFTreasureListTree<G, A, R> treasureListTree) {
final JTextField input = new JTextField(gameObject.getAttributeString(getArchetypeAttributeName()), TEXTFIELD_COLUMNS);
final JButton cLabel = new JButton(new TreeChooseAction(getAttributeName() + ": ", input, animationObjects));
return new GuiInfo<G, A, R>(new DialogAttribAnimName<G, A, R>(this, input, typeNoEventConnector), cLabel, input, null, null, false);
Modified: trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeBitmask.java
===================================================================
--- trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeBitmask.java 2009-03-28 19:02:16 UTC (rev 6177)
+++ trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeBitmask.java 2009-03-28 19:07:37 UTC (rev 6178)
@@ -32,6 +32,7 @@
import net.sf.gridarta.map.MapArchObject;
import net.sf.gridarta.map.validation.checks.AttributeRangeChecker;
import net.sf.gridarta.map.validation.checks.InvalidCheckException;
+import net.sf.gridarta.treasurelist.CFTreasureListTree;
import org.jetbrains.annotations.NotNull;
/**
@@ -72,7 +73,7 @@
/** {@inheritDoc} */
@NotNull
@Override
- public GuiInfo<G, A, R> createGui(@NotNull final G gameObject, @NotNull final R archetype, @NotNull final ArchetypeType<G, A, R> type, @NotNull final Color background, @NotNull final Component parent) {
+ public GuiInfo<G, A, R> createGui(@NotNull final G gameObject, @NotNull final R archetype, @NotNull final ArchetypeType<G, A, R> type, @NotNull final Color background, @NotNull final Component parent, @NotNull final CFTreasureListTree<G, A, R> treasureListTree) {
final JTextArea input = new JTextArea();
final DialogAttribBitmask<G, A, R> tmpAttr = new DialogAttribBitmask<G, A, R>(this, input);
final JTextArea cComp;
Modified: trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeBool.java
===================================================================
--- trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeBool.java 2009-03-28 19:02:16 UTC (rev 6177)
+++ trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeBool.java 2009-03-28 19:07:37 UTC (rev 6178)
@@ -28,6 +28,7 @@
import net.sf.gridarta.map.MapArchObject;
import net.sf.gridarta.map.validation.checks.AttributeRangeChecker;
import net.sf.gridarta.map.validation.checks.InvalidCheckException;
+import net.sf.gridarta.treasurelist.CFTreasureListTree;
import org.jetbrains.annotations.NotNull;
/**
@@ -52,7 +53,7 @@
/** {@inheritDoc} */
@NotNull
@Override
- public GuiInfo<G, A, R> createGui(@NotNull final G gameObject, @NotNull final R archetype, @NotNull final ArchetypeType<G, A, R> type, @NotNull final Color background, @NotNull final Component parent) {
+ public GuiInfo<G, A, R> createGui(@NotNull final G gameObject, @NotNull final R archetype, @NotNull final ArchetypeType<G, A, R> type, @NotNull final Color background, @NotNull final Component parent, @NotNull final CFTreasureListTree<G, A, R> treasureListTree) {
final JCheckBox input = new JCheckBox(getAttributeName(), gameObject.getAttributeInt(getArchetypeAttributeName()) == 1);
return new GuiInfo<G, A, R>(new DialogAttribBool<G, A, R>(this, input), null, null, input, null, false);
}
Modified: trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeBoolSpec.java
===================================================================
--- trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeBoolSpec.java 2009-03-28 19:02:16 UTC (rev 6177)
+++ trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeBoolSpec.java 2009-03-28 19:07:37 UTC (rev 6178)
@@ -27,6 +27,7 @@
import net.sf.gridarta.gui.gameobjectattributesdialog.DialogAttribBoolSpec;
import net.sf.gridarta.map.MapArchObject;
import net.sf.gridarta.map.validation.checks.AttributeRangeChecker;
+import net.sf.gridarta.treasurelist.CFTreasureListTree;
import org.jetbrains.annotations.NotNull;
/**
@@ -68,7 +69,7 @@
/** {@inheritDoc} */
@NotNull
@Override
- public GuiInfo<G, A, R> createGui(@NotNull final G gameObject, @NotNull final R archetype, @NotNull final ArchetypeType<G, A, R> type, @NotNull final Color background, @NotNull final Component parent) {
+ public GuiInfo<G, A, R> createGui(@NotNull final G gameObject, @NotNull final R archetype, @NotNull final ArchetypeType<G, A, R> type, @NotNull final Color background, @NotNull final Component parent, @NotNull final CFTreasureListTree<G, A, R> treasureListTree) {
final String attrString = gameObject.getAttributeString(getArchetypeAttributeName());
final boolean defaultValue;
if (trueValue.equals("0")) {
Modified: trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeDoubleList.java
===================================================================
--- trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeDoubleList.java 2009-03-28 19:02:16 UTC (rev 6177)
+++ trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeDoubleList.java 2009-03-28 19:07:37 UTC (rev 6178)
@@ -31,6 +31,7 @@
import net.sf.gridarta.gui.gameobjectattributesdialog.DialogAttribDoubleList;
import net.sf.gridarta.map.MapArchObject;
import net.sf.gridarta.map.validation.checks.AttributeRangeChecker;
+import net.sf.gridarta.treasurelist.CFTreasureListTree;
import net.sf.gridarta.utils.CommonConstants;
import org.jetbrains.annotations.NotNull;
@@ -79,7 +80,7 @@
/** {@inheritDoc} */
@NotNull
@Override
- public GuiInfo<G, A, R> createGui(@NotNull final G gameObject, @NotNull final R archetype, @NotNull final ArchetypeType<G, A, R> type, @NotNull final Color background, @NotNull final Component parent) {
+ public GuiInfo<G, A, R> createGui(@NotNull final G gameObject, @NotNull final R archetype, @NotNull final ArchetypeType<G, A, R> type, @NotNull final Color background, @NotNull final Component parent, @NotNull final CFTreasureListTree<G, A, R> treasureListTree) {
final JPanel compo = new JPanel(new BorderLayout());
final JLabel cLabel = new JLabel(getAttributeName() + ": ");
cLabel.setForeground(CommonConstants.INT_COLOR);
Modified: trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeFaceName.java
===================================================================
--- trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeFaceName.java 2009-03-28 19:02:16 UTC (rev 6177)
+++ trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeFaceName.java 2009-03-28 19:07:37 UTC (rev 6178)
@@ -30,6 +30,7 @@
import net.sf.gridarta.gui.gameobjectattributesdialog.TreeChooseAction;
import net.sf.gridarta.map.MapArchObject;
import net.sf.gridarta.map.validation.checks.AttributeRangeChecker;
+import net.sf.gridarta.treasurelist.CFTreasureListTree;
import org.jetbrains.annotations.NotNull;
/**
@@ -69,7 +70,7 @@
/** {@inheritDoc} */
@NotNull
@Override
- public GuiInfo<G, A, R> createGui(@NotNull final G gameObject, @NotNull final R archetype, @NotNull final ArchetypeType<G, A, R> type, @NotNull final Color background, @NotNull final Component parent) {
+ public GuiInfo<G, A, R> createGui(@NotNull final G gameObject, @NotNull final R archetype, @NotNull final ArchetypeType<G, A, R> type, @NotNull final Color background, @NotNull final Component parent, @NotNull final CFTreasureListTree<G, A, R> treasureListTree) {
final String defaultText;
final String attributeName = getArchetypeAttributeName();
if (attributeName.equals("face")) {
Modified: trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeFixed.java
===================================================================
--- trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeFixed.java 2009-03-28 19:02:16 UTC (rev 6177)
+++ trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeFixed.java 2009-03-28 19:07:37 UTC (rev 6178)
@@ -25,6 +25,7 @@
import net.sf.gridarta.gameobject.GameObject;
import net.sf.gridarta.map.MapArchObject;
import net.sf.gridarta.map.validation.checks.AttributeRangeChecker;
+import net.sf.gridarta.treasurelist.CFTreasureListTree;
import org.jetbrains.annotations.NotNull;
/**
@@ -49,7 +50,7 @@
/** {@inheritDoc} */
@NotNull
@Override
- public GuiInfo<G, A, R> createGui(@NotNull final G gameObject, @NotNull final R archetype, @NotNull final ArchetypeType<G, A, R> type, @NotNull final Color background, @NotNull final Component parent) {
+ public GuiInfo<G, A, R> createGui(@NotNull final G gameObject, @NotNull final R archetype, @NotNull final ArchetypeType<G, A, R> type, @NotNull final Color background, @NotNull final Component parent, @NotNull final CFTreasureListTree<G, A, R> treasureListTree) {
throw new AssertionError();
}
Modified: trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeFloat.java
===================================================================
--- trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeFloat.java 2009-03-28 19:02:16 UTC (rev 6177)
+++ trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeFloat.java 2009-03-28 19:07:37 UTC (rev 6178)
@@ -31,6 +31,7 @@
import net.sf.gridarta.gui.gameobjectattributesdialog.DialogAttribFloat;
import net.sf.gridarta.map.MapArchObject;
import net.sf.gridarta.map.validation.checks.AttributeRangeChecker;
+import net.sf.gridarta.treasurelist.CFTreasureListTree;
import net.sf.gridarta.utils.CommonConstants;
import org.jetbrains.annotations.NotNull;
@@ -56,7 +57,7 @@
/** {@inheritDoc} */
@NotNull
@Override
- public GuiInfo<G, A, R> createGui(@NotNull final G gameObject, @NotNull final R archetype, @NotNull final ArchetypeType<G, A, R> type, @NotNull final Color background, @NotNull final Component parent) {
+ public GuiInfo<G, A, R> createGui(@NotNull final G gameObject, @NotNull final R archetype, @NotNull final ArchetypeType<G, A, R> type, @NotNull final Color background, @NotNull final Component parent, @NotNull final CFTreasureListTree<G, A, R> treasureListTree) {
final JLabel cLabel = new JLabel(getAttributeName() + ": ");
cLabel.setForeground(CommonConstants.FLOAT_COLOR);
final int fieldLength = getInputLength() == 0 ? TEXTFIELD_COLUMNS : getInputLength();
Modified: trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeInt.java
===================================================================
--- trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeInt.java 2009-03-28 19:02:16 UTC (rev 6177)
+++ trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeInt.java 2009-03-28 19:07:37 UTC (rev 6178)
@@ -32,6 +32,7 @@
import net.sf.gridarta.map.MapArchObject;
import net.sf.gridarta.map.validation.checks.AttributeRangeChecker;
import net.sf.gridarta.map.validation.checks.InvalidCheckException;
+import net.sf.gridarta.treasurelist.CFTreasureListTree;
import net.sf.gridarta.utils.CommonConstants;
import org.jetbrains.annotations.NotNull;
@@ -85,7 +86,7 @@
/** {@inheritDoc} */
@NotNull
@Override
- public GuiInfo<G, A, R> createGui(@NotNull final G gameObject, @NotNull final R archetype, @NotNull final ArchetypeType<G, A, R> type, @NotNull final Color background, @NotNull final Component parent) {
+ public GuiInfo<G, A, R> createGui(@NotNull final G gameObject, @NotNull final R archetype, @NotNull final ArchetypeType<G, A, R> type, @NotNull final Color background, @NotNull final Component parent, @NotNull final CFTreasureListTree<G, A, R> treasureListTree) {
final JLabel cLabel = new JLabel(getAttributeName() + ": ");
cLabel.setForeground(CommonConstants.INT_COLOR);
final int fieldLength = getInputLength() == 0 ? TEXTFIELD_COLUMNS : getInputLength();
Modified: trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeInvSpell.java
===================================================================
--- trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeInvSpell.java 2009-03-28 19:02:16 UTC (rev 6177)
+++ trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeInvSpell.java 2009-03-28 19:07:37 UTC (rev 6178)
@@ -30,6 +30,7 @@
import net.sf.gridarta.map.validation.checks.AttributeRangeChecker;
import net.sf.gridarta.spells.GameObjectSpell;
import net.sf.gridarta.spells.Spells;
+import net.sf.gridarta.treasurelist.CFTreasureListTree;
import net.sf.gridarta.utils.CommonConstants;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -65,7 +66,7 @@
/** {@inheritDoc} */
@NotNull
@Override
- public GuiInfo<G, A, R> createGui(@NotNull final G gameObject, @NotNull final R archetype, @NotNull final ArchetypeType<G, A, R> type, @NotNull final Color background, @NotNull final Component parent) {
+ public GuiInfo<G, A, R> createGui(@NotNull final G gameObject, @NotNull final R archetype, @NotNull final ArchetypeType<G, A, R> type, @NotNull final Color background, @NotNull final Component parent, @NotNull final CFTreasureListTree<G, A, R> treasureListTree) {
final JLabel cLabel = new JLabel(getAttributeName() + ": ");
cLabel.setForeground(CommonConstants.INT_COLOR);
// create ComboBox with parsed selection
Modified: trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeInvSpellOptional.java
===================================================================
--- trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeInvSpellOptional.java 2009-03-28 19:02:16 UTC (rev 6177)
+++ trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeInvSpellOptional.java 2009-03-28 19:07:37 UTC (rev 6178)
@@ -30,6 +30,7 @@
import net.sf.gridarta.map.validation.checks.AttributeRangeChecker;
import net.sf.gridarta.spells.GameObjectSpell;
import net.sf.gridarta.spells.Spells;
+import net.sf.gridarta.treasurelist.CFTreasureListTree;
import net.sf.gridarta.utils.CommonConstants;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -65,7 +66,7 @@
/** {@inheritDoc} */
@NotNull
@Override
- public GuiInfo<G, A, R> createGui(@NotNull final G gameObject, @NotNull final R archetype, @NotNull final ArchetypeType<G, A, R> type, @NotNull final Color background, @NotNull final Component parent) {
+ public GuiInfo<G, A, R> createGui(@NotNull final G gameObject, @NotNull final R archetype, @NotNull final ArchetypeType<G, A, R> type, @NotNull final Color background, @NotNull final Component parent, @NotNull final CFTreasureListTree<G, A, R> treasureListTree) {
final JLabel cLabel = new JLabel(getAttributeName() + ": ");
cLabel.setForeground(CommonConstants.INT_COLOR);
// create ComboBox with parsed selection
Modified: trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeList.java
===================================================================
--- trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeList.java 2009-03-28 19:02:16 UTC (rev 6177)
+++ trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeList.java 2009-03-28 19:07:37 UTC (rev 6178)
@@ -29,6 +29,7 @@
import net.sf.gridarta.gui.gameobjectattributesdialog.DialogAttribList;
import net.sf.gridarta.map.MapArchObject;
import net.sf.gridarta.map.validation.checks.AttributeRangeChecker;
+import net.sf.gridarta.treasurelist.CFTreasureListTree;
import net.sf.gridarta.utils.CommonConstants;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -71,7 +72,7 @@
/** {@inheritDoc} */
@NotNull
@Override
- public GuiInfo<G, A, R> createGui(@NotNull final G gameObject, @NotNull final R archetype, @NotNull final ArchetypeType<G, A, R> type, @NotNull final Color background, @NotNull final Component parent) {
+ public GuiInfo<G, A, R> createGui(@NotNull final G gameObject, @NotNull final R archetype, @NotNull final ArchetypeType<G, A, R> type, @NotNull final Color background, @NotNull final Component parent, @NotNull final CFTreasureListTree<G, A, R> treasureListTree) {
final JLabel cLabel = new JLabel(getAttributeName() + ": ");
cLabel.setForeground(CommonConstants.INT_COLOR);
// create ComboBox with parsed selection
Modified: trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeLong.java
===================================================================
--- trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeLong.java 2009-03-28 19:02:16 UTC (rev 6177)
+++ trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeLong.java 2009-03-28 19:07:37 UTC (rev 6178)
@@ -31,6 +31,7 @@
import net.sf.gridarta.gui.gameobjectattributesdialog.DialogAttribLong;
import net.sf.gridarta.map.MapArchObject;
import net.sf.gridarta.map.validation.checks.AttributeRangeChecker;
+import net.sf.gridarta.treasurelist.CFTreasureListTree;
import net.sf.gridarta.utils.CommonConstants;
import org.jetbrains.annotations.NotNull;
@@ -56,7 +57,7 @@
/** {@inheritDoc} */
@NotNull
@Override
- public GuiInfo<G, A, R> createGui(@NotNull final G gameObject, @NotNull final R archetype, @NotNull final ArchetypeType<G, A, R> type, @NotNull final Color background, @NotNull final Component parent) {
+ public GuiInfo<G, A, R> createGui(@NotNull final G gameObject, @NotNull final R archetype, @NotNull final ArchetypeType<G, A, R> type, @NotNull final Color background, @NotNull final Component parent, @NotNull final CFTreasureListTree<G, A, R> treasureListTree) {
final JLabel cLabel = new JLabel(getAttributeName() + ": ");
cLabel.setForeground(CommonConstants.INT_COLOR);
final int fieldLength = getInputLength() == 0 ? TEXTFIELD_COLUMNS : getInputLength();
Modified: trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeMapPath.java
===================================================================
--- trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeMapPath.java 2009-03-28 19:02:16 UTC (rev 6177)
+++ trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeMapPath.java 2009-03-28 19:07:37 UTC (rev 6178)
@@ -32,6 +32,7 @@
import net.sf.gridarta.map.MapSquare;
import net.sf.gridarta.map.validation.checks.AttributeRangeChecker;
import net.sf.gridarta.settings.GlobalSettings;
+import net.sf.gridarta.treasurelist.CFTreasureListTree;
import org.jetbrains.annotations.NotNull;
/**
@@ -72,7 +73,7 @@
/** {@inheritDoc} */
@NotNull
@Override
- public GuiInfo<G, A, R> createGui(@NotNull final G gameObject, @NotNull final R archetype, @NotNull final ArchetypeType<G, A, R> type, @NotNull final Color background, @NotNull final Component parent) {
+ public GuiInfo<G, A, R> createGui(@NotNull final G gameObject, @NotNull final R archetype, @NotNull final ArchetypeType<G, A, R> type, @NotNull final Color background, @NotNull final Component parent, @NotNull final CFTreasureListTree<G, A, R> treasureListTree) {
final MapSquare<G,A,R> mapSquare = gameObject.getMapSquare();
File relativeReference = mapSquare == null ? null : mapSquare.getMapModel().getMapControl().getMapFile();
if (relativeReference == null) {
Modified: trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeScriptFile.java
===================================================================
--- trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeScriptFile.java 2009-03-28 19:02:16 UTC (rev 6177)
+++ trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeScriptFile.java 2009-03-28 19:07:37 UTC (rev 6178)
@@ -31,6 +31,7 @@
import net.sf.gridarta.map.MapArchObject;
import net.sf.gridarta.map.validation.checks.AttributeRangeChecker;
import net.sf.gridarta.settings.GlobalSettings;
+import net.sf.gridarta.treasurelist.CFTreasureListTree;
import org.jetbrains.annotations.NotNull;
/**
@@ -71,7 +72,7 @@
/** {@inheritDoc} */
@NotNull
@Override
- public GuiInfo<G, A, R> createGui(@NotNull final G gameObject, @NotNull final R archetype, @NotNull final ArchetypeType<G, A, R> type, @NotNull final Color background, @NotNull final Component parent) {
+ public GuiInfo<G, A, R> createGui(@NotNull final G gameObject, @NotNull final R archetype, @NotNull final ArchetypeType<G, A, R> type, @NotNull final Color background, @NotNull final Component parent, @NotNull final CFTreasureListTree<G, A, R> treasureListTree) {
final JLabel cLabel = new JLabel(getAttributeName() + ": ");
final TilePanel tilePanel = new TilePanel(scriptFileFilter);
tilePanel.setAbsoluteReference(globalSettings.getMapDir());
Modified: trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeSpell.java
===================================================================
--- trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeSpell.java 2009-03-28 19:02:16 UTC (rev 6177)
+++ trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeSpell.java 2009-03-28 19:07:37 UTC (rev 6178)
@@ -30,6 +30,7 @@
import net.sf.gridarta.map.validation.checks.AttributeRangeChecker;
import net.sf.gridarta.spells.NumberSpell;
import net.sf.gridarta.spells.Spells;
+import net.sf.gridarta.treasurelist.CFTreasureListTree;
import net.sf.gridarta.utils.CommonConstants;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -72,7 +73,7 @@
/** {@inheritDoc} */
@NotNull
@Override
- public GuiInfo<G, A, R> createGui(@NotNull final G gameObject, @NotNull final R archetype, @NotNull final ArchetypeType<G, A, R> type, @NotNull final Color background, @NotNull final Component parent) {
+ public GuiInfo<G, A, R> createGui(@NotNull final G gameObject, @NotNull final R archetype, @NotNull final ArchetypeType<G, A, R> type, @NotNull final Color background, @NotNull final Component parent, @NotNull final CFTreasureListTree<G, A, R> treasureListTree) {
final JLabel cLabel = new JLabel(getAttributeName() + ": ");
cLabel.setForeground(CommonConstants.INT_COLOR);
// create ComboBox with parsed selection
Modified: trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeString.java
===================================================================
--- trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeString.java 2009-03-28 19:02:16 UTC (rev 6177)
+++ trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeString.java 2009-03-28 19:07:37 UTC (rev 6178)
@@ -28,6 +28,7 @@
import net.sf.gridarta.gui.gameobjectattributesdialog.DialogAttribString;
import net.sf.gridarta.map.MapArchObject;
import net.sf.gridarta.map.validation.checks.AttributeRangeChecker;
+import net.sf.gridarta.treasurelist.CFTreasureListTree;
import org.jetbrains.annotations.NotNull;
/**
@@ -59,7 +60,7 @@
/** {@inheritDoc} */
@NotNull
@Override
- public GuiInfo<G, A, R> createGui(@NotNull final G gameObject, @NotNull final R archetype, @NotNull final ArchetypeType<G, A, R> type, @NotNull final Color background, @NotNull final Component parent) {
+ public GuiInfo<G, A, R> createGui(@NotNull final G gameObject, @NotNull final R archetype, @NotNull final ArchetypeType<G, A, R> type, @NotNull final Color background, @NotNull final Component parent, @NotNull final CFTreasureListTree<G, A, R> treasureListTree) {
final String defaultText = getDefaultText(gameObject, archetype, type);
final JTextField input = new JTextField(defaultText, TEXTFIELD_COLUMNS);
final JLabel cLabel = new JLabel(getAttributeName() + ": ");
Modified: trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeText.java
===================================================================
--- trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeText.java 2009-03-28 19:02:16 UTC (rev 6177)
+++ trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeText.java 2009-03-28 19:07:37 UTC (rev 6178)
@@ -30,6 +30,7 @@
import net.sf.gridarta.textedit.textarea.JEditTextArea;
import net.sf.gridarta.textedit.textarea.SyntaxDocument;
import net.sf.gridarta.textedit.textarea.tokenmarker.TokenMarkerFactory;
+import net.sf.gridarta.treasurelist.CFTreasureListTree;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -70,7 +71,7 @@
/** {@inheritDoc} */
@NotNull
@Override
- public GuiInfo<G, A, R> createGui(@NotNull final G gameObject, @NotNull final R archetype, @NotNull final ArchetypeType<G, A, R> type, @NotNull final Color background, @NotNull final Component parent) {
+ public GuiInfo<G, A, R> createGui(@NotNull final G gameObject, @NotNull final R archetype, @NotNull final ArchetypeType<G, A, R> type, @NotNull final Color background, @NotNull final Component parent, @NotNull final CFTreasureListTree<G, A, R> treasureListTree) {
String text = "";
if (getArchetypeAttributeName().equals("msg")) {
final String archetypeMsgText = archetype.getMsgText();
Modified: trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeTreasure.java
===================================================================
--- trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeTreasure.java 2009-03-28 19:02:16 UTC (rev 6177)
+++ trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeTreasure.java 2009-03-28 19:07:37 UTC (rev 6178)
@@ -41,12 +41,6 @@
public class ArchetypeAttributeTreasure<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> extends ArchetypeAttribute<G, A, R> {
/**
- * The treasurelist tree to display.
- */
- @NotNull
- private final CFTreasureListTree<G, A, R> treasureListTree;
-
- /**
* The {@link TreasureTree} to use.
*/
@NotNull
@@ -59,19 +53,17 @@
* @param description the attribute's description
* @param inputLength the input length in characters for text input fields
* @param sectionName the section name for the new attribute
- * @param treasureListTree the treasurelist tree to display
* @param treasureTree the treasure tree to use
*/
- public ArchetypeAttributeTreasure(@NotNull final String archetypeAttributeName, @NotNull final String attributeName, @NotNull final String description, final int inputLength, @NotNull final String sectionName, @NotNull final CFTreasureListTree<G, A, R> treasureListTree, @NotNull final TreasureTree treasureTree) {
+ public ArchetypeAttributeTreasure(@NotNull final String archetypeAttributeName, @NotNull final String attributeName, @NotNull final String description, final int inputLength, @NotNull final String sectionName, @NotNull final TreasureTree treasureTree) {
super(archetypeAttributeName, attributeName, description, inputLength, sectionName);
- this.treasureListTree = treasureListTree;
this.treasureTree = treasureTree;
}
/** {@inheritDoc} */
@NotNull
@Override
- public GuiInfo<G, A, R> createGui(@NotNull final G gameObject, @NotNull final R archetype, @NotNull final ArchetypeType<G, A, R> type, @NotNull final Color background, @NotNull final Component parent) {
+ public GuiInfo<G, A, R> createGui(@NotNull final G gameObject, @NotNull final R archetype, @NotNull final ArchetypeType<G, A, R> type, @NotNull final Color background, @NotNull final Component parent, @NotNull final CFTreasureListTree<G, A, R> treasureListTree) {
// textfield (no direct input, text is set by the treasurelist dialog)
String treasureName = gameObject.getAttributeString(getArchetypeAttributeName());
if (treasureName.trim().length() == 0 || treasureName.trim().equalsIgnoreCase("none")) {
Modified: trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeZSpell.java
===================================================================
--- trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeZSpell.java 2009-03-28 19:02:16 UTC (rev 6177)
+++ trunk/src/app/net/sf/gridarta/archtype/ArchetypeAttributeZSpell.java 2009-03-28 19:07:37 UTC (rev 6178)
@@ -30,6 +30,7 @@
import net.sf.gridarta.map.validation.checks.AttributeRangeChecker;
import net.sf.gridarta.spells.NumberSpell;
import net.sf.gridarta.spells.Spells;
+import net.sf.gridarta.treasurelist.CFTreasureListTree;
import net.sf.gridarta.utils.CommonConstants;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -72,7 +73,7 @@
/** {@inheritDoc} */
@NotNull
@Override
- public GuiInfo<G, A, R> createGui(@NotNull final G gameObject, @NotNull final R archetype, @NotNull final ArchetypeType<G, A, R> type, @NotNull final Color background, @NotNull final Component parent) {
+ public GuiInfo<G, A, R> createGui(@NotNull final G gameObject, @NotNull final R archetype, @NotNull final ArchetypeType<G, A, R> type, @NotNull final Color background, @NotNull final Component parent, @NotNull final CFTreasureListTree<G, A, R> treasureListTree) {
final JLabel cLabel = new JLabel(getAttributeName() + ": ");
cLabel.setForeground(CommonConstants.INT_COLOR);
// create ComboBox with parsed selection
Modified: trunk/src/app/net/sf/gridarta/archtype/DefaultArchetypeAttributeFactory.java
===================================================================
--- trunk/src/app/net/sf/gridarta/archtype/DefaultArchetypeAttributeFactory.java 2009-03-28 19:02:16 UTC (rev 6177)
+++ trunk/src/app/net/sf/gridarta/archtype/DefaultArchetypeAttributeFactory.java 2009-03-28 19:07:37 UTC (rev 6178)
@@ -10,7 +10,6 @@
import net.sf.gridarta.spells.GameObjectSpell;
import net.sf.gridarta.spells.NumberSpell;
import net.sf.gridarta.spells.Spells;
-import net.sf.gridarta.treasurelist.CFTreasureListTree;
import net.sf.gridarta.treasurelist.TreasureTree;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -81,12 +80,6 @@
private final FileFilter scriptFileFilter;
/**
- * The treasurelist tree to display.
- */
- @NotNull
- private final CFTreasureListTree<G, A, R> treasureListTree;
-
- /**
* The {@link TreasureTree} to use.
*/
@NotNull
@@ -105,10 +98,9 @@
* @param globalSettings the global settings instance
* @param mapFileFilter the file filter to use
* @param scriptFileFilter the file filter to use
- * @param treasureListTree the treasurelist tree to display
* @param treasureTree the treasure tree to use
*/
- public DefaultArchetypeAttributeFactory(@NotNull final AnimationObjects animationObjects, final int typeNoEventConnector, @NotNull final ArchetypeTypeSet<G, A, R> archetypeTypeSet, @NotNull final FaceObjects faceObjects, @NotNull final Spells<GameObjectSpell<G, A, R>> gameObjectSpells, @NotNull final Spells<NumberSpell> numberSpells, final int undefinedSpellIndex, @NotNull final GlobalSettings globalSettings, @NotNull final FileFilter mapFileFilter, @NotNull final FileFilter scriptFileFilter, @NotNull final CFTreasureListTree<G, A, R> treasureListTree, @NotNull final TreasureTree treasureTree) {
+ public DefaultArchetypeAttributeFactory(@NotNull final AnimationObjects animationObjects, final int typeNoEventConnector, @NotNull final ArchetypeTypeSet<G, A, R> archetypeTypeSet, @NotNull final FaceObjects faceObjects, @NotNull final Spells<GameObjectSpell<G, A, R>> gameObjectSpells, @NotNull final Spells<NumberSpell> numberSpells, final int undefinedSpellIndex, @NotNull final GlobalSettings globalSettings, @NotNull final FileFilter mapFileFilter, @NotNull final FileFilter scriptFileFilter, @NotNull final TreasureTree treasureTree) {
this.animationObjects = animationObjects;
this.typeNoEventConnector = typeNoEventConnector;
this.archetypeTypeSet = archetypeTypeSet;
@@ -119,7 +111,6 @@
this.globalSettings = globalSettings;
this.mapFileFilter = mapFileFilter;
this.scriptFileFilter = scriptFileFilter;
- this.treasureListTree = treasureListTree;
this.treasureTree = treasureTree;
}
@@ -253,7 +244,7 @@
@NotNull
@Override
public ArchetypeAttribute<G, A, R> newArchetypeAttributeTreasure(@NotNull final String archetypeAttributeName, @NotNull final String attributeName, @NotNull final String description, final int inputLength, @NotNull final String sectionName) {
- return new ArchetypeAttributeTreasure<G, A, R>(archetypeAttributeName, attributeName, description, inputLength, sectionName, treasureListTree, treasureTree);
+ return new ArchetypeAttributeTreasure<G, A, R>(archetypeAttributeName, attributeName, description, inputLength, sectionName, treasureTree);
}
/** {@inheritDoc} */
Modified: trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java 2009-03-28 19:02:16 UTC (rev 6177)
+++ trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java 2009-03-28 19:07:37 UTC (rev 6178)
@@ -74,6 +74,7 @@
import net.sf.gridarta.map.MapArchObject;
import net.sf.gridarta.map.MapModel;
import net.sf.gridarta.map.MapSquare;
+import net.sf.gridarta.treasurelist.CFTreasureListTree;
import net.sf.gridarta.utils.StringUtils;
import net.sf.japi.swing.action.ActionBuilder;
import net.sf.japi.swing.action.ActionBuilderFactory;
@@ -112,6 +113,12 @@
*/
private final JFrame parent;
+ /**
+ * The {@link CFTreasureListTree} to use.
+ */
+ @NotNull
+ private final CFTreasureListTree<G, A, R> treasureListTree;
+
private final List<DialogAttrib<G, A, R>> dialogAttribs = new ArrayList<DialogAttrib<G, A, R>>();
/**
@@ -201,12 +208,14 @@
* @param archetypeTypeSet Reference to the list of archetype types.
* @param gameObject GameObject to show dialog for.
* @param parent the parent frame for showing dialog boxes
+ * @param treasureListTree the treasure list tree to display
*/
- public GameObjectAttributesDialog(@NotNull final GameObjectAttributesDialogFactory<G, A, R> gameObjectAttributesDialogFactory, final ArchetypeTypeSet<G, A, R> archetypeTypeSet, @NotNull final G gameObject, @NotNull final JFrame parent) {
+ public GameObjectAttributesDialog(@NotNull final GameObjectAttributesDialogFactory<G, A, R> gameObjectAttributesDialogFactory, final ArchetypeTypeSet<G, A, R> archetypeTypeSet, @NotNull final G gameObject, @NotNull final JFrame parent, @NotNull final CFTreasureListTree<G, A, R> treasureListTree) {
this.gameObjectAttributesDialogFactory = gameObjectAttributesDialogFactory;
this.archetypeTypeSet = archetypeTypeSet;
this.gameObject = gameObject;
this.parent = parent;
+ this.treasureListTree = treasureListTree;
archetype = gameObject.getArchetype();
archetypeType = archetypeTypeSet.getArchetypeType(gameObject);
@@ -477,7 +486,7 @@
panel.add(helpButton, helpGbc);
helpButton.addFocusListener(focusListener);
- final GuiInfo<G, A, R> guiInfo = archetypeAttribute.createGui(gameObject, archetype, archetypeType, getBackground(), this);
+ final GuiInfo<G, A, R> guiInfo = archetypeAttribute.createGui(gameObject, archetype, archetypeType, getBackground(), this, treasureListTree);
dialogAttribs.add(guiInfo.newAttr);
helpButton.addActionListener(new HelpActionListener(guiInfo.newAttr.getRef(), this));
Modified: trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/GameObjectAttributesDialogFactory.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/GameObjectAttributesDialogFactory.java 2009-03-28 19:02:16 UTC (rev 6177)
+++ trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/GameObjectAttributesDialogFactory.java 2009-03-28 19:07:37 UTC (rev 6178)
@@ -27,6 +27,7 @@
import net.sf.gridarta.gameobject.Archetype;
import net.sf.gridarta.gameobject.GameObject;
import net.sf.gridarta.map.MapArchObject;
+import net.sf.gridarta.treasurelist.CFTreasureListTree;
import net.sf.japi.swing.action.ActionBuilder;
import net.sf.japi.swing.action.ActionBuilderFactory;
import org.jetbrains.annotations.NotNull;
@@ -55,13 +56,21 @@
private final JFrame parent;
/**
+ * The {@link CFTreasureListTree} to display.
+ */
+ @NotNull
+ private final CFTreasureListTree<G, A, R> treasureListTree;
+
+ /**
* Creates a new instance.
* @param archetypeTypeSet the list of CF type-data
* @param parent the parent frame for dialog boxes
+ * @param treasureListTree the treasure list tree to display
*/
- public GameObjectAttributesDialogFactory(@NotNull final ArchetypeTypeSet<G, A, R> archetypeTypeSet, @NotNull final JFrame parent) {
+ public GameObjectAttributesDialogFactory(@NotNull final ArchetypeTypeSet<G, A, R> archetypeTypeSet, @NotNull final JFrame parent, @NotNull final CFTreasureListTree<G, A, R> treasureListTree) {
this.archetypeTypeSet = archetypeTypeSet;
this.parent = parent;
+ this.treasureListTree = treasureListTree;
}
/**
@@ -87,7 +96,7 @@
if (dialogs.containsKey(head)) {
dialogs.get(head).toFront();
} else {
- final GameObjectAttributesDialog<G, A, R> pane = new GameObjectAttributesDialog<G, A, R>(this, archetypeTypeSet, head, parent);
+ final GameObjectAttributesDialog<G, A, R> pane = new GameObjectAttributesDialog<G, A, R>(this, archetypeTypeSet, head, parent, treasureListTree);
final JDialog dialog = pane.createDialog();
dialogs.put(head, dialog);
}
Modified: trunk/src/test/net/sf/gridarta/archtype/ArchetypeTypeSetParserTest.java
===================================================================
--- trunk/src/test/net/sf/gridarta/archtype/ArchetypeTypeSetParserTest.java 2009-03-28 19:02:16 UTC (rev 6177)
+++ trunk/src/test/net/sf/gridarta/archtype/ArchetypeTypeSetParserTest.java 2009-03-28 19:07:37 UTC (rev 6178)
@@ -34,6 +34,7 @@
import net.sf.gridarta.map.TestMapArchObject;
import net.sf.gridarta.map.validation.checks.AttributeRangeChecker;
import net.sf.gridarta.map.validation.checks.InvalidCheckException;
+import net.sf.gridarta.treasurelist.CFTreasureListTree;
import net.sf.gridarta.utils.XmlHelper;
import org.apache.log4j.Logger;
import org.jetbrains.annotations.NotNull;
@@ -607,7 +608,7 @@
/** {@inheritDoc} */
@NotNull
@Override
- public GuiInfo<TestGameObject, TestMapArchObject, TestArchetype> createGui(@NotNull final TestGameObject gameObject, @NotNull final TestArchetype archetype, @NotNull final ArchetypeType<TestGameObject, TestMapArchObject, TestArchetype> type, @NotNull final Color background, @NotNull final Component parent) {
+ public GuiInfo<TestGameObject, TestMapArchObject, TestArchetype> createGui(@NotNull final TestGameObject gameObject, @NotNull final TestArchetype archetype, @NotNull final ArchetypeType<TestGameObject, TestMapArchObject, TestArchetype> type, @NotNull final Color background, @NotNull final Component parent, @NotNull final CFTreasureListTree<TestGameObject, TestMapArchObject, TestArchetype> treasureListTree) {
throw new AssertionError();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|