Menu
▾
▴
[Gridarta-commit] SF.net SVN: gridarta:[4977] trunk
|
From: <aki...@us...> - 2008-08-21 22:43:18
|
Revision: 4977
http://gridarta.svn.sourceforge.net/gridarta/?rev=4977&view=rev
Author: akirschbaum
Date: 2008-08-21 22:43:26 +0000 (Thu, 21 Aug 2008)
Log Message:
-----------
Move code to common code base.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/CMainControl.java
trunk/daimonin/src/daieditor/CMainControl.java
trunk/src/app/net/sf/gridarta/AbstractMainControl.java
trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java
Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java 2008-08-21 22:39:16 UTC (rev 4976)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2008-08-21 22:43:26 UTC (rev 4977)
@@ -124,9 +124,6 @@
/** Preferences default for auto validation. */
private static final boolean PREFS_VALIDATOR_AUTO_DEFAULT = true;
- /** The treasure lists. */
- private final CFTreasureListTree<GameObject, MapArchObject, Archetype> treasureListTree;
-
@NotNull
private final GameObjectAttributesControl gameObjectAttributesControl;
@@ -143,9 +140,6 @@
*/
public CMainControl(@NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory) {
super(gridartaObjectsFactory, new DefaultRendererFactory(), "cfeditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory(gridartaObjectsFactory), false, CResourceLoader.getHomeFile("thumbnails"), null, "DaimoninEditor.jar", pythonFileFilter, ".py", Archetype.TYPE_SPELL, null);
- treasureListTree = new CFTreasureListTree<GameObject, MapArchObject, Archetype>(mainView, archetypeSet, specialTreasureLists,
- new TreasureLocation(getCollectedDirectory(), IGUIConstants.TREASURES_FILE)
- );
final ArchetypeAttributeParser<GameObject, MapArchObject, Archetype> archetypeAttributeParser = new ArchetypeAttributeParser<GameObject, MapArchObject, Archetype>(Archetype.TYPE_EVENT_CONNECTOR, false, globalSettings, mapFileFilter, pythonFileFilter, faceObjects, animationObjects, numberSpells, gameObjectSpells, 0, archetypeTypeSet, treasureListTree);
final ArchetypeTypeParser<GameObject, MapArchObject, Archetype> archetypeTypeParser = new ArchetypeTypeParser<GameObject, MapArchObject, Archetype>(archetypeAttributeParser);
final ArchetypeTypeSetParser<GameObject, MapArchObject, Archetype> archetypeTypeSetParser = new ArchetypeTypeSetParser<GameObject, MapArchObject, Archetype>(xmlHelper.getDocumentBuilder(), xmlHelper.getXPath(), archetypeTypeSet, archetypeTypeParser);
@@ -232,6 +226,15 @@
/** {@inheritDoc} */
@NotNull
@Override
+ protected CFTreasureListTree<GameObject, MapArchObject, Archetype> createTreasureListTree() {
+ return new CFTreasureListTree<GameObject, MapArchObject, Archetype>(mainView, archetypeSet, specialTreasureLists,
+ new TreasureLocation(getCollectedDirectory(), IGUIConstants.TREASURES_FILE)
+ );
+ }
+
+ /** {@inheritDoc} */
+ @NotNull
+ @Override
protected MapActions init1() {
archetypeTypeSet.getListTable().put("event", ScriptArchUtils.getEventTypes());
return new MapActions(mainView, mainView, gridartaObjectsFactory, globalSettings, mapManager, mapViewManager, exitMatcher, mapFileFilter, selectedSquareView);
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2008-08-21 22:39:16 UTC (rev 4976)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2008-08-21 22:43:26 UTC (rev 4977)
@@ -186,9 +186,6 @@
/** The ViewGameObjectMatcherManager for alpha. */
private final ViewGameObjectMatcherManager vaommAlpha = new ViewGameObjectMatcherManager(moaomAlpha);
- /** The treasure lists. */
- private final CFTreasureListTree<GameObject, MapArchObject, Archetype> treasureListTree;
-
@NotNull
private final GameObjectAttributesControl gameObjectAttributesControl;
@@ -205,10 +202,6 @@
*/
public CMainControl(@NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory) {
super(gridartaObjectsFactory, new DefaultRendererFactory(), "daieditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory(gridartaObjectsFactory), true, null, GUIUtils.getSysIcon(IGUIConstants.TILE_NORTH), "CrossfireEditor.jar", luaFileFilter, ".lua", 0, IGUIConstants.SPELL_FILE);
- treasureListTree = new CFTreasureListTree<GameObject, MapArchObject, Archetype>(mainView, archetypeSet, specialTreasureLists,
- new TreasureLocation(getCollectedDirectory(), IGUIConstants.TREASURES_FILE),
- new TreasureLocation(globalSettings.getMapDefaultFolder(), null)
- );
final ArchetypeAttributeParser<GameObject, MapArchObject, Archetype> archetypeAttributeParser = new ArchetypeAttributeParser<GameObject, MapArchObject, Archetype>(0, true, globalSettings, mapFileFilter, luaFileFilter, faceObjects, animationObjects, numberSpells, gameObjectSpells, -1, archetypeTypeSet, treasureListTree);
final ArchetypeTypeParser<GameObject, MapArchObject, Archetype> archetypeTypeParser = new ArchetypeTypeParser<GameObject, MapArchObject, Archetype>(archetypeAttributeParser);
final ArchetypeTypeSetParser<GameObject, MapArchObject, Archetype> archetypeTypeSetParser = new ArchetypeTypeSetParser<GameObject, MapArchObject, Archetype>(xmlHelper.getDocumentBuilder(), xmlHelper.getXPath(), archetypeTypeSet, archetypeTypeParser);
@@ -312,6 +305,16 @@
/** {@inheritDoc} */
@NotNull
@Override
+ protected CFTreasureListTree<GameObject, MapArchObject, Archetype> createTreasureListTree() {
+ return new CFTreasureListTree<GameObject, MapArchObject, Archetype>(mainView, archetypeSet, specialTreasureLists,
+ new TreasureLocation(getCollectedDirectory(), IGUIConstants.TREASURES_FILE),
+ new TreasureLocation(globalSettings.getMapDefaultFolder(), null)
+ );
+ }
+
+ /** {@inheritDoc} */
+ @NotNull
+ @Override
protected MapActions init1() {
return new MapActions(mainView, mainView, gridartaObjectsFactory, globalSettings, mapManager, mapViewManager, exitMatcher, mapFileFilter, selectedSquareView);
}
Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-08-21 22:39:16 UTC (rev 4976)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-08-21 22:43:26 UTC (rev 4977)
@@ -84,6 +84,7 @@
import net.sf.gridarta.spells.Spells;
import net.sf.gridarta.spells.XMLSpellLoader;
import net.sf.gridarta.textedit.scripteditor.ScriptEditControlInstance;
+import net.sf.gridarta.treasurelist.CFTreasureListTree;
import net.sf.gridarta.treasurelist.TreasureListsParser;
import net.sf.gridarta.treasurelist.TreasureTreeNode;
import net.sf.gridarta.updater.UpdaterManager;
@@ -293,6 +294,10 @@
@NotNull
protected Map<String, TreasureTreeNode> specialTreasureLists;
+ /** The treasure lists. */
+ @NotNull
+ protected final CFTreasureListTree<G, A, R> treasureListTree;
+
/**
* Creates a new instance.
* @param gridartaObjectsFactory the gridarta objects factory
@@ -412,9 +417,13 @@
log.warn("Cannot read TreasureLists.xml: " + ex.getMessage());
specialTreasureLists = Collections.emptyMap();
}
+ treasureListTree = createTreasureListTree();
}
@NotNull
+ protected abstract CFTreasureListTree<G, A, R> createTreasureListTree();
+
+ @NotNull
protected abstract MapActions init1();
/**
Modified: trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java
===================================================================
--- trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java 2008-08-21 22:39:16 UTC (rev 4976)
+++ trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java 2008-08-21 22:43:26 UTC (rev 4977)
@@ -46,6 +46,7 @@
import net.sf.gridarta.MapImageCache;
import net.sf.gridarta.MapManager;
import net.sf.gridarta.Size2D;
+import net.sf.gridarta.treasurelist.CFTreasureListTree;
import net.sf.gridarta.data.NamedTreeNode;
import net.sf.gridarta.gameobject.AbstractArchetypeParser;
import net.sf.gridarta.gameobject.AbstractArchetypeSet;
@@ -496,6 +497,13 @@
/** {@inheritDoc} */
@NotNull
@Override
+ protected CFTreasureListTree<TestGameObject, TestMapArchObject, TestArchetype> createTreasureListTree() {
+ throw new AssertionError();
+ }
+
+ /** {@inheritDoc} */
+ @NotNull
+ @Override
protected MapActions init1() {
throw new AssertionError();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
