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

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

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

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

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/gameobject/ArchetypeSet.java
    trunk/daimonin/src/daieditor/gameobject/ArchetypeSet.java
    trunk/src/app/net/sf/gridarta/gameobject/AbstractArchetypeSet.java

Modified: trunk/crossfire/src/cfeditor/gameobject/ArchetypeSet.java
===================================================================
--- trunk/crossfire/src/cfeditor/gameobject/ArchetypeSet.java	2008-08-01 22:14:30 UTC (rev 4673)
+++ trunk/crossfire/src/cfeditor/gameobject/ArchetypeSet.java	2008-08-01 22:15:31 UTC (rev 4674)
@@ -150,7 +150,7 @@
         }
         reportErrors(mainControl.getMainView());
 
-        mainControl.getGridartaObjectsFactory().newGameObjectParser().collectTempList(mainControl.getMainView(), this, editTypes, invObjects, fname, true);
+        gridartaObjectsFactory.newGameObjectParser().collectTempList(mainControl.getMainView(), this, editTypes, invObjects, fname, true);
         connectFaces();    // attach faces to arches
 
         // print message if no arches were found

Modified: trunk/daimonin/src/daieditor/gameobject/ArchetypeSet.java
===================================================================
--- trunk/daimonin/src/daieditor/gameobject/ArchetypeSet.java	2008-08-01 22:14:30 UTC (rev 4673)
+++ trunk/daimonin/src/daieditor/gameobject/ArchetypeSet.java	2008-08-01 22:15:31 UTC (rev 4674)
@@ -188,7 +188,7 @@
         loadArchesFromArtifacts(archetypeParser, mainControl.getCollectedDirectory() + "/" + IGUIConstants.ARTIFACTS_FILE, "Artifacts", "artifacts", invObjects);
         loadArchesFromArtifacts(archetypeParser, globalSettings.getMapDefaultFolder(), "Artifacts", "maps", invObjects);
 
-        mainControl.getGridartaObjectsFactory().newGameObjectParser().collectTempList(mainControl.getMainView(), this, editTypes, invObjects, fname, true);
+        gridartaObjectsFactory.newGameObjectParser().collectTempList(mainControl.getMainView(), this, editTypes, invObjects, fname, true);
         connectFaces();    // attach faces to arches
 
         // print message if no arches were found

Modified: trunk/src/app/net/sf/gridarta/gameobject/AbstractArchetypeSet.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/AbstractArchetypeSet.java	2008-08-01 22:14:30 UTC (rev 4673)
+++ trunk/src/app/net/sf/gridarta/gameobject/AbstractArchetypeSet.java	2008-08-01 22:15:31 UTC (rev 4674)
@@ -57,7 +57,7 @@
 
     /** The objects factory to use. */
     @NotNull
-    private final GridartaObjectsFactory<G, A, R, ?> gridartaObjectsFactory;
+    protected final GridartaObjectsFactory<G, A, R, ?> gridartaObjectsFactory;
 
     /** The load status of this ArchetypeSet. */
     private LoadStatus loadStatus = LoadStatus.EMPTY;


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