Menu
▾
▴
[Gridarta-commit] SF.net SVN: gridarta:[5115] trunk
|
From: <aki...@us...> - 2008-09-07 15:06:17
|
Revision: 5115
http://gridarta.svn.sourceforge.net/gridarta/?rev=5115&view=rev
Author: akirschbaum
Date: 2008-09-07 15:06:24 +0000 (Sun, 07 Sep 2008)
Log Message:
-----------
Remove calls to MainControl.getConfigurationDirectory().
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/CMainControl.java
trunk/crossfire/src/cfeditor/gameobject/ArchetypeSetLoader.java
trunk/daimonin/src/daieditor/CMainControl.java
trunk/daimonin/src/daieditor/gameobject/ArchetypeSetLoader.java
Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java 2008-09-07 15:01:58 UTC (rev 5114)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2008-09-07 15:06:24 UTC (rev 5115)
@@ -187,7 +187,7 @@
/** {@inheritDoc} */
@Override
protected void init4(@NotNull final AbstractArchetypeParser<GameObject, MapArchObject, Archetype> archetypeParser, @NotNull final EditTypes<GameObject, MapArchObject, Archetype, CMapViewBasic> editTypes, @NotNull final net.sf.gridarta.gameobject.face.FaceObjects faceObjects, @NotNull final net.sf.gridarta.gameobject.anim.AnimationObjects<? extends AnimationObject> animationObjects, @NotNull final MainView<GameObject, MapArchObject, Archetype, CMapViewBasic> mainView) {
- new ArchetypeSetLoader(globalSettings, gridartaObjectsFactory, this, getCollectedDirectory(), archetypeSet, archetypeParser, editTypes, faceObjects, animationObjects).loadArchetypes(mainView);
+ new ArchetypeSetLoader(globalSettings, gridartaObjectsFactory, getCollectedDirectory(), getConfigurationDirectory(), archetypeSet, archetypeParser, editTypes, faceObjects, animationObjects).loadArchetypes(mainView);
}
/** {@inheritDoc} */
Modified: trunk/crossfire/src/cfeditor/gameobject/ArchetypeSetLoader.java
===================================================================
--- trunk/crossfire/src/cfeditor/gameobject/ArchetypeSetLoader.java 2008-09-07 15:01:58 UTC (rev 5114)
+++ trunk/crossfire/src/cfeditor/gameobject/ArchetypeSetLoader.java 2008-09-07 15:06:24 UTC (rev 5115)
@@ -19,7 +19,6 @@
package cfeditor.gameobject;
-import cfeditor.CMainControl;
import cfeditor.IGUIConstants;
import cfeditor.gui.map.CMapViewBasic;
import cfeditor.map.MapArchObject;
@@ -80,16 +79,16 @@
private final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory;
/**
- * The main control instamce.
+ * The collected directory.
*/
@NotNull
- private final CMainControl mainControl;
+ private final String collectedDirectory;
/**
* The collected directory.
*/
@NotNull
- private final String collectedDirectory;
+ private final String configurationDirectory;
/**
* The archetype set to update.
@@ -125,19 +124,19 @@
* Creates a new instance.
* @param globalSettings the global settings instance
* @param gridartaObjectsFactory the gridarta objects factory instance
- * @param mainControl the main control instance
* @param collectedDirectory the collected directory
+ * @param configurationDirectory the configuration directory
* @param archetypeSet the archetype set to update
* @param archetypeParser the archetype parser to use
* @param editTypes the edit types instance
* @param faceObjects the face objects instance
* @param animationObjects the animation objects instance
*/
- public ArchetypeSetLoader(@NotNull final GlobalSettings globalSettings, @NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory, @NotNull final CMainControl mainControl, @NotNull final String collectedDirectory, @NotNull final ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet, @NotNull final AbstractArchetypeParser<GameObject, MapArchObject, Archetype> archetypeParser, @NotNull final EditTypes<GameObject, MapArchObject, Archetype, CMapViewBasic> editTypes, @NotNull final FaceObjects faceObjects, @NotNull final AnimationObjects<? extends AnimationObject> animationObjects) {
+ public ArchetypeSetLoader(@NotNull final GlobalSettings globalSettings, @NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory, @NotNull final String collectedDirectory, @NotNull final String configurationDirectory, @NotNull final ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet, @NotNull final AbstractArchetypeParser<GameObject, MapArchObject, Archetype> archetypeParser, @NotNull final EditTypes<GameObject, MapArchObject, Archetype, CMapViewBasic> editTypes, @NotNull final FaceObjects faceObjects, @NotNull final AnimationObjects<? extends AnimationObject> animationObjects) {
this.globalSettings = globalSettings;
this.gridartaObjectsFactory = gridartaObjectsFactory;
- this.mainControl = mainControl;
this.collectedDirectory = collectedDirectory;
+ this.configurationDirectory = configurationDirectory;
this.archetypeSet = archetypeSet;
this.archetypeParser = archetypeParser;
this.editTypes = editTypes;
@@ -205,7 +204,7 @@
} finally {
stream.close();
}
- faceObjects.loadFacesCollection(new File(collectedDirectory, IGUIConstants.PNG_FILE), new File(mainControl.getConfigurationDirectory(), IGUIConstants.FACETREE_FILE));
+ faceObjects.loadFacesCollection(new File(collectedDirectory, IGUIConstants.PNG_FILE), new File(configurationDirectory, IGUIConstants.FACETREE_FILE));
} catch (final IOException e) {
// TODO
log.error("Error:", e);
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2008-09-07 15:01:58 UTC (rev 5114)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2008-09-07 15:06:24 UTC (rev 5115)
@@ -243,7 +243,7 @@
@Override
protected void init4(@NotNull final AbstractArchetypeParser<GameObject, MapArchObject, Archetype> archetypeParser, @NotNull final EditTypes<GameObject, MapArchObject, Archetype, CMapViewBasic> editTypes, @NotNull final net.sf.gridarta.gameobject.face.FaceObjects faceObjects, @NotNull final net.sf.gridarta.gameobject.anim.AnimationObjects<? extends AnimationObject> animationObjects, @NotNull final MainView<GameObject, MapArchObject, Archetype, CMapViewBasic> mainView) {
MultiPositionData.init(getConfigurationDirectory());
- new ArchetypeSetLoader(globalSettings, gridartaObjectsFactory, this, getCollectedDirectory(), archetypeSet, archetypeParser, editTypes, faceObjects, animationObjects).loadArchetypes(mainView);
+ new ArchetypeSetLoader(globalSettings, gridartaObjectsFactory, this, getCollectedDirectory(), getConfigurationDirectory(), archetypeSet, archetypeParser, editTypes, faceObjects, animationObjects).loadArchetypes(mainView);
}
/** {@inheritDoc} */
Modified: trunk/daimonin/src/daieditor/gameobject/ArchetypeSetLoader.java
===================================================================
--- trunk/daimonin/src/daieditor/gameobject/ArchetypeSetLoader.java 2008-09-07 15:01:58 UTC (rev 5114)
+++ trunk/daimonin/src/daieditor/gameobject/ArchetypeSetLoader.java 2008-09-07 15:06:24 UTC (rev 5115)
@@ -95,6 +95,12 @@
private final String collectedDirectory;
/**
+ * The configuration directory.
+ */
+ @NotNull
+ private final String configurationDirectory;
+
+ /**
* The archetype set to update.
*/
@NotNull
@@ -137,17 +143,19 @@
* @param gridartaObjectsFactory the gridarta objects factory instance
* @param mainControl the main control instance
* @param collectedDirectory the collected directory
+ * @param configurationDirectory the configuration directory
* @param archetypeSet the archetype set to update
* @param archetypeParser the archetype parser to use
* @param editTypes the edit types instance
* @param faceObjects the face objects instance
* @param animationObjects the animation objects instance
*/
- public ArchetypeSetLoader(@NotNull final GlobalSettings globalSettings, @NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory, @NotNull final CMainControl mainControl, @NotNull final String collectedDirectory, @NotNull final ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet, @NotNull final AbstractArchetypeParser<GameObject, MapArchObject, Archetype> archetypeParser, @NotNull final EditTypes<GameObject, MapArchObject, Archetype, CMapViewBasic> editTypes, @NotNull final FaceObjects faceObjects, @NotNull final AnimationObjects<? extends AnimationObject> animationObjects) {
+ public ArchetypeSetLoader(@NotNull final GlobalSettings globalSettings, @NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory, @NotNull final CMainControl mainControl, @NotNull final String collectedDirectory, @NotNull final String configurationDirectory, @NotNull final ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet, @NotNull final AbstractArchetypeParser<GameObject, MapArchObject, Archetype> archetypeParser, @NotNull final EditTypes<GameObject, MapArchObject, Archetype, CMapViewBasic> editTypes, @NotNull final FaceObjects faceObjects, @NotNull final AnimationObjects<? extends AnimationObject> animationObjects) {
this.globalSettings = globalSettings;
this.gridartaObjectsFactory = gridartaObjectsFactory;
this.mainControl = mainControl;
this.collectedDirectory = collectedDirectory;
+ this.configurationDirectory = configurationDirectory;
this.archetypeSet = archetypeSet;
this.archetypeParser = archetypeParser;
this.editTypes = editTypes;
@@ -213,7 +221,7 @@
archetypeSet.setLoadedFromArchive(true); // load from the collected files
try {
- animationObjects.loadAnimTree(new File(mainControl.getConfigurationDirectory(), IGUIConstants.ANIMTREE_FILE));
+ animationObjects.loadAnimTree(new File(configurationDirectory, IGUIConstants.ANIMTREE_FILE));
loadAllDaimoninAnimationsFromCollect();
// open the resource file
final BufferedReader stream = IOUtils.createReader(collectedDirectory, IGUIConstants.ARCH_FILE);
@@ -223,7 +231,7 @@
} finally {
stream.close();
}
- faceObjects.loadFacesCollection(new File(collectedDirectory, IGUIConstants.PNG_FILE), new File(mainControl.getConfigurationDirectory(), IGUIConstants.FACETREE_FILE));
+ faceObjects.loadFacesCollection(new File(collectedDirectory, IGUIConstants.PNG_FILE), new File(configurationDirectory, IGUIConstants.FACETREE_FILE));
} catch (final IOException e) {
// TODO
log.error("Error:", e);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
