[Gridarta-commit] SF.net SVN: gridarta:[9412] trunk/src/gridarta/src/main/java/net/sf/ gridarta/maincontrol/GridartaEditor.java

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

Revision: 9412
          http://sourceforge.net/p/gridarta/code/9412
Author:   akirschbaum
Date:     2013-10-08 21:47:05 +0000 (Tue, 08 Oct 2013)
Log Message:
-----------
Reorder initialization code.

Modified Paths:
--------------
    trunk/src/gridarta/src/main/java/net/sf/gridarta/maincontrol/GridartaEditor.java

Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/maincontrol/GridartaEditor.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/maincontrol/GridartaEditor.java	2013-10-08 21:45:01 UTC (rev 9411)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/maincontrol/GridartaEditor.java	2013-10-08 21:47:05 UTC (rev 9412)
@@ -308,6 +308,7 @@
             final ScriptArchUtils scriptArchUtils = DefaultMainControl.loadScriptArchUtils(errorView, editorFactory, projectSettings, archetypeTypeSet, xmlHelper);
             DefaultMainControl.loadArchetypes(errorView, projectSettings, archetypeSet, archetypeChooserModel, resources, configSource);
             final ScriptedEventFactory<G, A, R> scriptedEventFactory = editorFactory.newScriptedEventFactory(scriptArchUtils, gameObjectFactory, scriptedEventEditor, archetypeSet);
+            new AutojoinListsParser<G, A, R>(errorView, archetypeSet, autojoinLists).loadList(projectSettings.getConfigurationDirectory());
             final MapModelFactory<G, A, R> mapModelFactory = new MapModelFactory<G, A, R>(archetypeChooserModel, autojoinLists, mapViewSettings, gameObjectFactory, gameObjectMatchers, topmostInsertionMode);
             final MapControlFactory<G, A, R> mapControlFactory = editorFactory.newMapControlFactory(mapWriter, projectSettings, mapModelFactory);
             final AbstractMapManager<G, A, R> mapManager = new DefaultMapManager<G, A, R>(mapReaderFactory, mapControlFactory, projectSettings, faceObjectProviders);
@@ -321,9 +322,6 @@
             final PluginModelParser<G, A, R> pluginModelParser = new PluginModelParser<G, A, R>(pluginParameterFactory);
             final File scriptsFile = new File(projectSettings.getMapsDirectory(), editorFactory.getScriptsDir());
             new PluginModelLoader<G, A, R>(pluginModelParser).loadPlugins(errorView, scriptsFile, pluginModel);
-
-            new AutojoinListsParser<G, A, R>(errorView, archetypeSet, autojoinLists).loadList(projectSettings.getConfigurationDirectory());
-
             final NamedFilter defaultNamedFilterList = new NamedFilter(gameObjectMatchers.getFilters());
             final FilterControl<G, A, R> filterControl = new DefaultFilterControl<G, A, R>(defaultNamedFilterList);
             final RendererFactory<G, A, R> rendererFactory = editorFactory.newRendererFactory(mapViewSettings, filterControl, gameObjectParser, faceObjectProviders, systemIcons);

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