[Gridarta-commit] SF.net SVN: gridarta:[4673] trunk

[<aki...@us...>]

Revision: 4673
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4673&view=rev
Author:   akirschbaum
Date:     2008-08-01 22:14:30 +0000 (Fri, 01 Aug 2008)

Log Message:
-----------
Remove calls to MainControl.getGridartaObjectsFactory().

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/CMainControl.java
    trunk/crossfire/src/cfeditor/gameobject/ArchetypeSet.java
    trunk/daimonin/src/daieditor/CMainControl.java
    trunk/daimonin/src/daieditor/gameobject/ArchetypeSet.java

Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-01 22:10:44 UTC (rev 4672)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-01 22:14:30 UTC (rev 4673)
@@ -228,7 +228,7 @@
         ScriptArchEditor.setGlobalSettings(globalSettings, this);
         ScriptedEventEditor.setGlobalSettings(globalSettings);
         animationObjects = new cfeditor.gameobject.anim.AnimationObjects();
-        archetypeSet = new ArchetypeSet(this, globalSettings, editTypes, animationObjects, faceObjects, ((GlobalSettingsImpl) globalSettings).getImageSet());
+        archetypeSet = new ArchetypeSet(this, globalSettings, editTypes, animationObjects, faceObjects, ((GlobalSettingsImpl) globalSettings).getImageSet(), gridartaObjectsFactory);
         GameObject.setArchetypeSet(archetypeSet);
         ScriptedEvent.setArchetypeSet(archetypeSet);
         final boolean mapTileListBottom = prefs.getBoolean(MainView.MAP_TILE_LIST_BOTTOM_KEY, MainView.MAP_TILE_LIST_BOTTOM_DEFAULT);

Modified: trunk/crossfire/src/cfeditor/gameobject/ArchetypeSet.java
===================================================================
--- trunk/crossfire/src/cfeditor/gameobject/ArchetypeSet.java	2008-08-01 22:10:44 UTC (rev 4672)
+++ trunk/crossfire/src/cfeditor/gameobject/ArchetypeSet.java	2008-08-01 22:14:30 UTC (rev 4673)
@@ -39,6 +39,7 @@
 import javax.swing.ImageIcon;
 import net.sf.gridarta.EditTypes;
 import net.sf.gridarta.GlobalSettings;
+import net.sf.gridarta.GridartaObjectsFactory;
 import net.sf.gridarta.gameobject.AbstractArchetypeParser;
 import net.sf.gridarta.gameobject.AbstractArchetypeSet;
 import net.sf.gridarta.gameobject.anim.AnimationObjects;
@@ -100,9 +101,11 @@
      * @param animationObjects the animations to use
      * @param faceObjects the FaceObjects instance to use
      * @param imageSet the image set to use
+     * @param gridartaObjectsFactory the gridarta objects factory instance to
+     * use
      */
-    public ArchetypeSet(@NotNull final CMainControl mainControl, @NotNull final GlobalSettings globalSettings, @NotNull final EditTypes<GameObject, MapArchObject, Archetype, CMapViewBasic> editTypes, @NotNull final AnimationObjects<AnimationObject> animationObjects, @NotNull final FaceObjects faceObjects, @Nullable final String imageSet) {
-        super(mainControl.getGridartaObjectsFactory());
+    public ArchetypeSet(@NotNull final CMainControl mainControl, @NotNull final GlobalSettings globalSettings, @NotNull final EditTypes<GameObject, MapArchObject, Archetype, CMapViewBasic> editTypes, @NotNull final AnimationObjects<AnimationObject> animationObjects, @NotNull final FaceObjects faceObjects, @Nullable final String imageSet, @NotNull final GridartaObjectsFactory gridartaObjectsFactory) {
+        super(gridartaObjectsFactory);
         this.mainControl = mainControl;
         this.globalSettings = globalSettings;
         this.editTypes = editTypes;

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-08-01 22:10:44 UTC (rev 4672)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-08-01 22:14:30 UTC (rev 4673)
@@ -284,7 +284,7 @@
         ScriptedEventEditor.setGlobalSettings(globalSettings);
         animationObjects = new daieditor.gameobject.anim.AnimationObjects();
         GameObject.setAnimationObjects(animationObjects);
-        archetypeSet = new ArchetypeSet(this, globalSettings, editTypes, animationObjects, faceObjects);
+        archetypeSet = new ArchetypeSet(this, globalSettings, editTypes, animationObjects, faceObjects, gridartaObjectsFactory);
         GameObject.setArchetypeSet(archetypeSet);
         ScriptedEvent.setArchetypeSet(archetypeSet);
         final boolean mapTileListBottom = prefs.getBoolean(MainView.MAP_TILE_LIST_BOTTOM_KEY, MainView.MAP_TILE_LIST_BOTTOM_DEFAULT);

Modified: trunk/daimonin/src/daieditor/gameobject/ArchetypeSet.java
===================================================================
--- trunk/daimonin/src/daieditor/gameobject/ArchetypeSet.java	2008-08-01 22:10:44 UTC (rev 4672)
+++ trunk/daimonin/src/daieditor/gameobject/ArchetypeSet.java	2008-08-01 22:14:30 UTC (rev 4673)
@@ -40,6 +40,7 @@
 import javax.swing.ImageIcon;
 import net.sf.gridarta.EditTypes;
 import net.sf.gridarta.GlobalSettings;
+import net.sf.gridarta.GridartaObjectsFactory;
 import net.sf.gridarta.gameobject.AbstractArchetypeParser;
 import net.sf.gridarta.gameobject.AbstractArchetypeSet;
 import net.sf.gridarta.gameobject.anim.AnimationObjects;
@@ -104,9 +105,11 @@
      * @param editTypes the edit types instance
      * @param animationObjects the animations to use
      * @param faceObjects the FaceObjects instance to use
+     * @param gridartaObjectsFactory the gridarta objects factory instance to
+     * use
      */
-    public ArchetypeSet(@NotNull final CMainControl mainControl, @NotNull final GlobalSettings globalSettings, @NotNull final EditTypes<GameObject, MapArchObject, Archetype, CMapViewBasic> editTypes, @NotNull final AnimationObjects<AnimationObject> animationObjects, @NotNull final FaceObjects faceObjects) {
-        super(mainControl.getGridartaObjectsFactory());
+    public ArchetypeSet(@NotNull final CMainControl mainControl, @NotNull final GlobalSettings globalSettings, @NotNull final EditTypes<GameObject, MapArchObject, Archetype, CMapViewBasic> editTypes, @NotNull final AnimationObjects<AnimationObject> animationObjects, @NotNull final FaceObjects faceObjects, @NotNull final GridartaObjectsFactory gridartaObjectsFactory) {
+        super(gridartaObjectsFactory);
         this.mainControl = mainControl;
         this.globalSettings = globalSettings;
         this.editTypes = editTypes;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.