Menu
▾
▴
[Gridarta-commit] SF.net SVN: gridarta:[4874] trunk
|
From: <aki...@us...> - 2008-08-15 23:05:40
|
Revision: 4874
http://gridarta.svn.sourceforge.net/gridarta/?rev=4874&view=rev
Author: akirschbaum
Date: 2008-08-15 23:05:48 +0000 (Fri, 15 Aug 2008)
Log Message:
-----------
Move code to common code base.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/CMainControl.java
trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptedEvent.java
trunk/daimonin/src/daieditor/CMainControl.java
trunk/daimonin/src/daieditor/gameobject/scripts/ScriptedEvent.java
trunk/src/app/net/sf/gridarta/AbstractMainControl.java
trunk/src/app/net/sf/gridarta/gameobject/scripts/ScriptedEvent.java
Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java 2008-08-15 22:58:22 UTC (rev 4873)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2008-08-15 23:05:48 UTC (rev 4874)
@@ -27,7 +27,6 @@
import cfeditor.gameobject.anim.AnimationObjects;
import cfeditor.gameobject.face.FaceObjects;
import cfeditor.gameobject.scripts.ScriptArchUtils;
-import cfeditor.gameobject.scripts.ScriptedEvent;
import cfeditor.gui.GameObjectAttributesControl;
import cfeditor.gui.map.CMapViewBasic;
import cfeditor.gui.prefs.GUIPrefs;
@@ -53,20 +52,20 @@
import javax.xml.parsers.ParserConfigurationException;
import net.sf.gridarta.AbstractMainControl;
import net.sf.gridarta.CommonConstants;
-import net.sf.gridarta.MainControl;
-import net.sf.gridarta.XmlHelper;
-import net.sf.gridarta.GlobalSettings;
import net.sf.gridarta.EditTypes;
+import net.sf.gridarta.GlobalSettings;
import net.sf.gridarta.GridartaObjectsFactory;
+import net.sf.gridarta.MainControl;
+import net.sf.gridarta.XmlHelper;
import net.sf.gridarta.archtype.ArchetypeAttributeParser;
import net.sf.gridarta.archtype.ArchetypeTypeParser;
import net.sf.gridarta.archtype.ArchetypeTypeSet;
import net.sf.gridarta.archtype.ArchetypeTypeSetParser;
+import net.sf.gridarta.gameobject.anim.AnimationObject;
import net.sf.gridarta.gameobject.match.GameObjectMatcher;
import net.sf.gridarta.gameobject.match.GameObjectMatchers;
import net.sf.gridarta.gameobject.match.GameObjectMatchersInstance;
import net.sf.gridarta.gameobject.scripts.AbstractScriptArchEditor;
-import net.sf.gridarta.gameobject.anim.AnimationObject;
import net.sf.gridarta.gui.About;
import net.sf.gridarta.gui.HideFileFilterProxy;
import net.sf.gridarta.gui.LeftPanel;
@@ -215,7 +214,6 @@
*/
public CMainControl() {
super(new CrossfireObjectsFactory(), "cfeditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects());
- ScriptedEvent.setArchetypeSet(archetypeSet);
final boolean mapTileListBottom = prefs.getBoolean(MainView.MAP_TILE_LIST_BOTTOM_KEY, MainView.MAP_TILE_LIST_BOTTOM_DEFAULT);
ACTION_FACTORY.createActions(true, this, "createNew", "open", "options", "exit", "newScript", "editScript", "zoom", "gc", "onlineHelp", "tod", "about");
final MapManagerActions<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManagerActions = new MapManagerActions<GameObject, MapArchObject, Archetype, CMapViewBasic>(mapManager);
Modified: trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptedEvent.java
===================================================================
--- trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptedEvent.java 2008-08-15 22:58:22 UTC (rev 4873)
+++ trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptedEvent.java 2008-08-15 23:05:48 UTC (rev 4874)
@@ -21,15 +21,12 @@
import cfeditor.gameobject.Archetype;
import cfeditor.gameobject.GameObject;
-import cfeditor.map.MapArchObject;
-import net.sf.gridarta.gameobject.ArchetypeSet;
import net.sf.gridarta.gameobject.scripts.ScriptedEventEditor;
import net.sf.gridarta.gameobject.scripts.UndefinedEventArchetypeException;
import net.sf.gridarta.gameobject.scripts.UndefinedEventArchetypeNameException;
import net.sf.gridarta.gameobject.scripts.UndefinedEventArchetypeTypeException;
import org.apache.log4j.Logger;
import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
/**
* Class which stores information about one scripted event.
@@ -40,9 +37,6 @@
/** The Logger for printing log messages. */
private static final Logger log = Logger.getLogger(ScriptedEvent.class);
- @Nullable
- private static ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet;
-
/** The underlying game object that represents the event. */
private final GameObject event;
@@ -68,10 +62,6 @@
setEventData(pluginName, scriptPath, options);
}
- public static void setArchetypeSet(@Nullable final ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet) {
- ScriptedEvent.archetypeSet = archetypeSet;
- }
-
/**
* Validate this event object: Check if there is sufficient data.
* @return true if this object is valid, otherwise false
@@ -184,7 +174,7 @@
if (archetypeSet == null) {
throw new UndefinedEventArchetypeNameException(eventArchetypeName);
}
- final Archetype eventArchetype = archetypeSet.getArchetype(eventArchetypeName);
+ final Archetype eventArchetype = (Archetype) (Object) archetypeSet.getArchetype(eventArchetypeName);
if (eventArchetype == null) {
throw new UndefinedEventArchetypeNameException(eventArchetypeName);
}
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2008-08-15 22:58:22 UTC (rev 4873)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2008-08-15 23:05:48 UTC (rev 4874)
@@ -26,7 +26,6 @@
import daieditor.gameobject.anim.AnimationObjects;
import daieditor.gameobject.face.FaceObjects;
import daieditor.gameobject.scripts.ScriptArchUtils;
-import daieditor.gameobject.scripts.ScriptedEvent;
import daieditor.gui.GameObjectAttributesControl;
import daieditor.gui.map.CMapViewBasic;
import daieditor.gui.prefs.AppPrefs;
@@ -58,15 +57,16 @@
import javax.xml.parsers.ParserConfigurationException;
import net.sf.gridarta.AbstractMainControl;
import net.sf.gridarta.CommonConstants;
-import net.sf.gridarta.MainControl;
-import net.sf.gridarta.XmlHelper;
-import net.sf.gridarta.GlobalSettings;
import net.sf.gridarta.EditTypes;
+import net.sf.gridarta.GlobalSettings;
import net.sf.gridarta.GridartaObjectsFactory;
+import net.sf.gridarta.MainControl;
+import net.sf.gridarta.XmlHelper;
import net.sf.gridarta.archtype.ArchetypeAttributeParser;
import net.sf.gridarta.archtype.ArchetypeTypeParser;
import net.sf.gridarta.archtype.ArchetypeTypeSet;
import net.sf.gridarta.archtype.ArchetypeTypeSetParser;
+import net.sf.gridarta.gameobject.anim.AnimationObject;
import net.sf.gridarta.gameobject.face.FaceObjectProviders;
import net.sf.gridarta.gameobject.match.GameObjectMatcher;
import net.sf.gridarta.gameobject.match.GameObjectMatchers;
@@ -74,7 +74,6 @@
import net.sf.gridarta.gameobject.match.MutableOrGameObjectMatcher;
import net.sf.gridarta.gameobject.match.ViewGameObjectMatcherManager;
import net.sf.gridarta.gameobject.scripts.AbstractScriptArchEditor;
-import net.sf.gridarta.gameobject.anim.AnimationObject;
import net.sf.gridarta.gui.About;
import net.sf.gridarta.gui.HideFileFilterProxy;
import net.sf.gridarta.gui.LeftPanel;
@@ -270,7 +269,6 @@
*/
public CMainControl() {
super(new DaimoninObjectsFactory(), "daieditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects());
- ScriptedEvent.setArchetypeSet(archetypeSet);
final boolean mapTileListBottom = prefs.getBoolean(MainView.MAP_TILE_LIST_BOTTOM_KEY, MainView.MAP_TILE_LIST_BOTTOM_DEFAULT);
ACTION_FACTORY.createActions(true, this, "createNew", "open", "options", "exit", "newScript", "editScript", "controlServer", "controlClient", "cleanCompletelyBlockedSquares", "zoom", "gc", "onlineHelp", "tod", "about");
ACTION_FACTORY.createToggles(true, this, "drawDouble");
Modified: trunk/daimonin/src/daieditor/gameobject/scripts/ScriptedEvent.java
===================================================================
--- trunk/daimonin/src/daieditor/gameobject/scripts/ScriptedEvent.java 2008-08-15 22:58:22 UTC (rev 4873)
+++ trunk/daimonin/src/daieditor/gameobject/scripts/ScriptedEvent.java 2008-08-15 23:05:48 UTC (rev 4874)
@@ -21,14 +21,11 @@
import daieditor.gameobject.Archetype;
import daieditor.gameobject.GameObject;
-import daieditor.map.MapArchObject;
-import net.sf.gridarta.gameobject.ArchetypeSet;
import net.sf.gridarta.gameobject.scripts.ScriptedEventEditor;
import net.sf.gridarta.gameobject.scripts.UndefinedEventArchetypeException;
import net.sf.gridarta.gameobject.scripts.UndefinedEventArchetypeNameException;
import net.sf.gridarta.gameobject.scripts.UndefinedEventArchetypeTypeException;
import org.apache.log4j.Logger;
-import org.jetbrains.annotations.Nullable;
/**
* Class which stores information about one scripted event.
@@ -39,9 +36,6 @@
/** The Logger for printing log messages. */
private static final Logger log = Logger.getLogger(ScriptedEvent.class);
- @Nullable
- private static ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet;
-
/** The underlying game object that represents the event. */
private final GameObject event;
@@ -67,10 +61,6 @@
setEventData(pluginName, scriptPath, options);
}
- public static void setArchetypeSet(@Nullable final ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet) {
- ScriptedEvent.archetypeSet = archetypeSet;
- }
-
/**
* Validate this event object: Check if there is sufficient data.
* @return true if this object is valid, otherwise false
@@ -180,7 +170,7 @@
if (archetypeSet == null) {
throw new UndefinedEventArchetypeNameException(eventArchetypeName);
}
- final Archetype eventArchetype = archetypeSet.getArchetype(eventArchetypeName);
+ final Archetype eventArchetype = (Archetype) (Object) archetypeSet.getArchetype(eventArchetypeName);
if (eventArchetype == null) {
throw new UndefinedEventArchetypeNameException(eventArchetypeName);
}
Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-08-15 22:58:22 UTC (rev 4873)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-08-15 23:05:48 UTC (rev 4874)
@@ -33,6 +33,7 @@
import net.sf.gridarta.gameobject.anim.AnimationObject;
import net.sf.gridarta.gameobject.anim.AnimationObjects;
import net.sf.gridarta.gameobject.face.FaceObjects;
+import net.sf.gridarta.gameobject.scripts.ScriptedEvent;
import net.sf.gridarta.gameobject.scripts.ScriptedEventEditor;
import net.sf.gridarta.gui.HideFileFilterProxy;
import net.sf.gridarta.gui.StatusBar;
@@ -143,6 +144,7 @@
globalSettings.readGlobalSettings();
ScriptedEventEditor.setGlobalSettings(globalSettings);
archetypeSet = newArchetypeSet(globalSettings, editTypes, animationObjects, faceObjects, gridartaObjectsFactory);
+ ScriptedEvent.init(archetypeSet);
}
/**
Modified: trunk/src/app/net/sf/gridarta/gameobject/scripts/ScriptedEvent.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/scripts/ScriptedEvent.java 2008-08-15 22:58:22 UTC (rev 4873)
+++ trunk/src/app/net/sf/gridarta/gameobject/scripts/ScriptedEvent.java 2008-08-15 23:05:48 UTC (rev 4874)
@@ -19,7 +19,9 @@
package net.sf.gridarta.gameobject.scripts;
+import net.sf.gridarta.gameobject.ArchetypeSet;
import net.sf.gridarta.gameobject.GameObject;
+import org.jetbrains.annotations.Nullable;
/**
* Class which stores information about one scripted event.
@@ -28,6 +30,12 @@
public abstract class ScriptedEvent<G extends GameObject<G, ?, ?>> {
/**
+ * The archetype set to use.
+ */
+ @Nullable
+ protected static ArchetypeSet<?, ?, ?> archetypeSet;
+
+ /**
* Set event path and plugin name according to user input from popup
* dialog.
*/
@@ -47,4 +55,12 @@
public abstract int getEventType();
+ /**
+ * Initializes the module.
+ * @param archetypeSet the archetype set to use
+ */
+ public static void init(@Nullable final ArchetypeSet<?, ?, ?> archetypeSet) {
+ ScriptedEvent.archetypeSet = archetypeSet;
+ }
+
} // class ScriptedEvent
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
