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

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

Revision: 4851
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4851&view=rev
Author:   akirschbaum
Date:     2008-08-15 19:19:09 +0000 (Fri, 15 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

Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-15 19:17:15 UTC (rev 4850)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-15 19:19:09 UTC (rev 4851)
@@ -216,7 +216,6 @@
      */
     public CMainControl() {
         super(new CrossfireObjectsFactory(), "cfeditor", new GlobalSettingsImpl());
-        ScriptedEventEditor.setGlobalSettings(globalSettings);
         final AnimationObjects<AnimationObject> animationObjects = new cfeditor.gameobject.anim.AnimationObjects();
         final ArchetypeSet archetypeSet = new ArchetypeSet(this, globalSettings, editTypes, animationObjects, faceObjects, ((GlobalSettingsImpl) globalSettings).getImageSet(), gridartaObjectsFactory);
         ScriptedEvent.setArchetypeSet(archetypeSet);

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-08-15 19:17:15 UTC (rev 4850)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-08-15 19:19:09 UTC (rev 4851)
@@ -272,7 +272,6 @@
      */
     public CMainControl() {
         super(new DaimoninObjectsFactory(), "daieditor", new GlobalSettingsImpl());
-        ScriptedEventEditor.setGlobalSettings(globalSettings);
         final AnimationObjects<AnimationObject> animationObjects = new daieditor.gameobject.anim.AnimationObjects();
         final ArchetypeSet archetypeSet = new ArchetypeSet(this, globalSettings, editTypes, animationObjects, faceObjects, gridartaObjectsFactory);
         GameObject.setArchetypeSet(archetypeSet);

Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-15 19:17:15 UTC (rev 4850)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-15 19:19:09 UTC (rev 4851)
@@ -29,6 +29,7 @@
 import javax.swing.filechooser.FileFilter;
 import net.sf.gridarta.gameobject.Archetype;
 import net.sf.gridarta.gameobject.GameObject;
+import net.sf.gridarta.gameobject.scripts.ScriptedEventEditor;
 import net.sf.gridarta.gui.HideFileFilterProxy;
 import net.sf.gridarta.gui.StatusBar;
 import net.sf.gridarta.gui.map.MapPreviewAccessory;
@@ -114,6 +115,7 @@
         copyBuffer = new CopyBuffer<G, A, R, V>(this, editTypes, gridartaObjectsFactory);
         this.gridartaObjectsFactory = gridartaObjectsFactory;
         globalSettings.readGlobalSettings();
+        ScriptedEventEditor.setGlobalSettings(globalSettings);
     }
 
     /**


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