Menu
▾
▴
[Gridarta-commit] SF.net SVN: gridarta:[4850] trunk
|
From: <aki...@us...> - 2008-08-15 19:17:08
|
Revision: 4850
http://gridarta.svn.sourceforge.net/gridarta/?rev=4850&view=rev
Author: akirschbaum
Date: 2008-08-15 19:17:15 +0000 (Fri, 15 Aug 2008)
Log Message:
-----------
Merge redundant code.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/CMainControl.java
trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptArchEditor.java
trunk/daimonin/src/daieditor/CMainControl.java
trunk/daimonin/src/daieditor/gameobject/scripts/ScriptArchEditor.java
trunk/src/app/net/sf/gridarta/gameobject/scripts/AbstractScriptArchEditor.java
Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java 2008-08-15 19:05:39 UTC (rev 4849)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2008-08-15 19:17:15 UTC (rev 4850)
@@ -26,7 +26,6 @@
import cfeditor.gameobject.GameObject;
import cfeditor.gameobject.anim.AnimationObject;
import cfeditor.gameobject.face.FaceObjects;
-import cfeditor.gameobject.scripts.ScriptArchEditor;
import cfeditor.gameobject.scripts.ScriptArchUtils;
import cfeditor.gameobject.scripts.ScriptedEvent;
import cfeditor.gui.GameObjectAttributesControl;
@@ -217,7 +216,6 @@
*/
public CMainControl() {
super(new CrossfireObjectsFactory(), "cfeditor", new GlobalSettingsImpl());
- ScriptArchEditor.setGlobalSettings(globalSettings, mapManager);
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);
Modified: trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptArchEditor.java
===================================================================
--- trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptArchEditor.java 2008-08-15 19:05:39 UTC (rev 4849)
+++ trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptArchEditor.java 2008-08-15 19:17:15 UTC (rev 4850)
@@ -19,23 +19,16 @@
package cfeditor.gameobject.scripts;
-import cfeditor.gameobject.Archetype;
import cfeditor.gameobject.GameObject;
-import cfeditor.gui.map.CMapViewBasic;
-import cfeditor.map.MapArchObject;
import java.io.File;
import java.io.IOException;
import javax.swing.JDialog;
import javax.swing.JOptionPane;
-import net.sf.gridarta.GlobalSettings;
-import net.sf.gridarta.MapManager;
import net.sf.gridarta.gameobject.scripts.AbstractScriptArchEditor;
import net.sf.gridarta.gameobject.scripts.UndefinedEventArchetypeException;
import net.sf.gridarta.textedit.scripteditor.ScriptEditControlInstance;
import net.sf.japi.swing.ActionFactory;
import org.apache.log4j.Logger;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
public class ScriptArchEditor extends AbstractScriptArchEditor {
@@ -45,23 +38,6 @@
/** Action Factory. */
private static final ActionFactory ACTION_FACTORY = ActionFactory.getFactory("cfeditor");
- /**
- * The main control instance.
- */
- @Nullable
- private static MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager = null;
-
- /**
- * The global settings instance.
- */
- @Nullable
- private static GlobalSettings globalSettings = null;
-
- public static void setGlobalSettings(@NotNull final GlobalSettings globalSettings, @NotNull final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager) {
- ScriptArchEditor.globalSettings = globalSettings;
- ScriptArchEditor.mapManager = mapManager;
- }
-
public static boolean createNewEvent(final JDialog frame, final ScriptArchData scriptArchData) {
String scriptPath = inputScriptPath.getText().trim();
final String options = inputOptions.getText().trim();
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2008-08-15 19:05:39 UTC (rev 4849)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2008-08-15 19:17:15 UTC (rev 4850)
@@ -272,7 +272,6 @@
*/
public CMainControl() {
super(new DaimoninObjectsFactory(), "daieditor", new GlobalSettingsImpl());
- ScriptArchEditor.setGlobalSettings(globalSettings, mapManager);
ScriptedEventEditor.setGlobalSettings(globalSettings);
final AnimationObjects<AnimationObject> animationObjects = new daieditor.gameobject.anim.AnimationObjects();
final ArchetypeSet archetypeSet = new ArchetypeSet(this, globalSettings, editTypes, animationObjects, faceObjects, gridartaObjectsFactory);
Modified: trunk/daimonin/src/daieditor/gameobject/scripts/ScriptArchEditor.java
===================================================================
--- trunk/daimonin/src/daieditor/gameobject/scripts/ScriptArchEditor.java 2008-08-15 19:05:39 UTC (rev 4849)
+++ trunk/daimonin/src/daieditor/gameobject/scripts/ScriptArchEditor.java 2008-08-15 19:17:15 UTC (rev 4850)
@@ -19,23 +19,16 @@
package daieditor.gameobject.scripts;
-import daieditor.gameobject.Archetype;
import daieditor.gameobject.GameObject;
-import daieditor.gui.map.CMapViewBasic;
-import daieditor.map.MapArchObject;
import java.io.File;
import java.io.IOException;
import javax.swing.JDialog;
import javax.swing.JOptionPane;
-import net.sf.gridarta.GlobalSettings;
-import net.sf.gridarta.MapManager;
import net.sf.gridarta.gameobject.scripts.AbstractScriptArchEditor;
import net.sf.gridarta.gameobject.scripts.UndefinedEventArchetypeException;
import net.sf.gridarta.textedit.scripteditor.ScriptEditControlInstance;
import net.sf.japi.swing.ActionFactory;
import org.apache.log4j.Logger;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
public class ScriptArchEditor extends AbstractScriptArchEditor {
@@ -45,23 +38,6 @@
/** Action Factory. */
private static final ActionFactory ACTION_FACTORY = ActionFactory.getFactory("daieditor");
- /**
- * The global settings instance.
- */
- @Nullable
- private static GlobalSettings globalSettings = null;
-
- /**
- * The main control instance.
- */
- @Nullable
- private static MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager = null;
-
- public static void setGlobalSettings(@NotNull final GlobalSettings globalSettings, @NotNull final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager) {
- ScriptArchEditor.globalSettings = globalSettings;
- ScriptArchEditor.mapManager = mapManager;
- }
-
public static boolean createNewEvent(final JDialog frame, final ScriptArchData scriptArchData) {
String scriptPath = inputScriptPath.getText().trim();
final String options = inputOptions.getText().trim();
Modified: trunk/src/app/net/sf/gridarta/gameobject/scripts/AbstractScriptArchEditor.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/scripts/AbstractScriptArchEditor.java 2008-08-15 19:05:39 UTC (rev 4849)
+++ trunk/src/app/net/sf/gridarta/gameobject/scripts/AbstractScriptArchEditor.java 2008-08-15 19:17:15 UTC (rev 4850)
@@ -57,13 +57,13 @@
private static FileFilter scriptFileFilter;
@NotNull
- private static GlobalSettings globalSettings;
+ protected static GlobalSettings globalSettings;
/**
* The map manager instance to use.
*/
@NotNull
- private static MapManager<?, ?, ?, ?> mapManager;
+ protected static MapManager<?, ?, ?, ?> mapManager;
protected static JComboBox pluginNameBox;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
