Menu
▾
▴
[Gridarta-commit] SF.net SVN: gridarta:[4667] trunk
|
From: <aki...@us...> - 2008-08-01 21:46:32
|
Revision: 4667
http://gridarta.svn.sourceforge.net/gridarta/?rev=4667&view=rev
Author: akirschbaum
Date: 2008-08-01 21:46:37 +0000 (Fri, 01 Aug 2008)
Log Message:
-----------
Remove calls to AbstractMainControl.getInstance().
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/gameobject/GameObject.java
trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptArchData.java
trunk/daimonin/src/daieditor/gameobject/GameObject.java
trunk/daimonin/src/daieditor/gameobject/scripts/ScriptArchData.java
trunk/src/app/net/sf/gridarta/gameobject/GameObject.java
trunk/src/app/net/sf/gridarta/gameobject/scripts/AbstractScriptArchEditor.java
trunk/src/app/net/sf/gridarta/gameobject/scripts/ScriptUtils.java
trunk/src/app/net/sf/gridarta/gameobject/scripts/ScriptedEventEditor.java
trunk/src/app/net/sf/gridarta/gui/GameObjectAttributesPanel.java
trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java
Modified: trunk/crossfire/src/cfeditor/gameobject/GameObject.java
===================================================================
--- trunk/crossfire/src/cfeditor/gameobject/GameObject.java 2008-08-01 21:29:18 UTC (rev 4666)
+++ trunk/crossfire/src/cfeditor/gameobject/GameObject.java 2008-08-01 21:46:37 UTC (rev 4667)
@@ -24,6 +24,7 @@
import java.awt.Frame;
import javax.swing.ImageIcon;
import javax.swing.JList;
+import net.sf.gridarta.MainControl;
import net.sf.gridarta.gameobject.ArchetypeSet;
import net.sf.gridarta.gameobject.scripts.AbstractScriptArchEditor;
import net.sf.gridarta.gui.GameObjectAttributesPanel;
@@ -247,8 +248,8 @@
/** {@inheritDoc} */
@Override
- public void modifyEventScript(final int eventType, final int task, @NotNull final JList eventList, @NotNull final GameObjectAttributesPanel<GameObject, MapArchObject, Archetype, ?> mapanel) {
- scriptArchData.modifyEventScript(eventType, task, eventList);
+ public void modifyEventScript(final int eventType, final int task, @NotNull final JList eventList, @NotNull final GameObjectAttributesPanel<GameObject, MapArchObject, Archetype, ?> mapanel, @NotNull final MainControl<?, ?, ?, ?> mainControl) {
+ scriptArchData.modifyEventScript(eventType, task, eventList, mainControl);
if (scriptArchData.isEmpty()) {
mapanel.setScriptPanelButtonState(true, false, false, false);
Modified: trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptArchData.java
===================================================================
--- trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptArchData.java 2008-08-01 21:29:18 UTC (rev 4666)
+++ trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptArchData.java 2008-08-01 21:46:37 UTC (rev 4667)
@@ -26,6 +26,7 @@
import javax.swing.JDialog;
import javax.swing.JList;
import javax.swing.JOptionPane;
+import net.sf.gridarta.MainControl;
import net.sf.gridarta.gameobject.scripts.ScriptedEventEditor;
import net.sf.gridarta.gui.GameObjectAttributesPanel;
import org.apache.log4j.Logger;
@@ -116,8 +117,9 @@
* @param task ID number for task (open script/ edit path/ remove)
* @param panelList JList from the MapArchPanel (script tab) which displays
* the events
+ * @param mainControl the main control instance
*/
- public void modifyEventScript(int eventIndex, final int task, @NotNull final JList panelList) {
+ public void modifyEventScript(int eventIndex, final int task, @NotNull final JList panelList, @NotNull final MainControl<?, ?, ?, ?> mainControl) {
GameObject oldEvent = null;
/* Find the event object */
@@ -136,7 +138,7 @@
final ScriptedEvent event = new ScriptedEvent(oldEvent);
// now decide what to do:
if (task == GameObjectAttributesPanel.SCRIPT_OPEN) {
- ScriptedEventEditor.openScript(event.getScriptPath());
+ ScriptedEventEditor.openScript(mainControl, event.getScriptPath());
} else if (task == GameObjectAttributesPanel.SCRIPT_EDIT_PATH) {
ScriptedEventEditor.editParameters(event);
} else if (task == GameObjectAttributesPanel.SCRIPT_REMOVE) {
Modified: trunk/daimonin/src/daieditor/gameobject/GameObject.java
===================================================================
--- trunk/daimonin/src/daieditor/gameobject/GameObject.java 2008-08-01 21:29:18 UTC (rev 4666)
+++ trunk/daimonin/src/daieditor/gameobject/GameObject.java 2008-08-01 21:46:37 UTC (rev 4667)
@@ -25,6 +25,7 @@
import java.awt.Frame;
import javax.swing.ImageIcon;
import javax.swing.JList;
+import net.sf.gridarta.MainControl;
import net.sf.gridarta.gameobject.anim.AnimationObjects;
import net.sf.gridarta.gameobject.scripts.AbstractScriptArchEditor;
import net.sf.gridarta.gui.GameObjectAttributesPanel;
@@ -392,8 +393,8 @@
/** {@inheritDoc} */
@Override
- public void modifyEventScript(final int eventType, final int task, @NotNull final JList eventList, @NotNull final GameObjectAttributesPanel<GameObject, MapArchObject, Archetype, ?> mapanel) {
- scriptArchData.modifyEventScript(eventType, task, eventList);
+ public void modifyEventScript(final int eventType, final int task, @NotNull final JList eventList, @NotNull final GameObjectAttributesPanel<GameObject, MapArchObject, Archetype, ?> mapanel, @NotNull final MainControl<?, ?, ?, ?> mainControl) {
+ scriptArchData.modifyEventScript(eventType, task, eventList, mainControl);
if (scriptArchData.isEmpty()) {
mapanel.setScriptPanelButtonState(true, false, false, false);
Modified: trunk/daimonin/src/daieditor/gameobject/scripts/ScriptArchData.java
===================================================================
--- trunk/daimonin/src/daieditor/gameobject/scripts/ScriptArchData.java 2008-08-01 21:29:18 UTC (rev 4666)
+++ trunk/daimonin/src/daieditor/gameobject/scripts/ScriptArchData.java 2008-08-01 21:46:37 UTC (rev 4667)
@@ -26,6 +26,7 @@
import javax.swing.JDialog;
import javax.swing.JList;
import javax.swing.JOptionPane;
+import net.sf.gridarta.MainControl;
import net.sf.gridarta.gameobject.scripts.ScriptedEventEditor;
import net.sf.gridarta.gui.GameObjectAttributesPanel;
import org.apache.log4j.Logger;
@@ -117,7 +118,7 @@
* @param panelList JList from the MapArchPanel (script tab) which displays
* the events
*/
- public void modifyEventScript(int eventIndex, final int task, @NotNull final JList panelList) {
+ public void modifyEventScript(int eventIndex, final int task, @NotNull final JList panelList, @NotNull final MainControl<?, ?, ?, ?> mainControl) {
GameObject oldEvent = null;
/* Find the event object */
@@ -136,7 +137,7 @@
final ScriptedEvent event = new ScriptedEvent(oldEvent);
// now decide what to do:
if (task == GameObjectAttributesPanel.SCRIPT_OPEN) {
- ScriptedEventEditor.openScript(event.getScriptPath());
+ ScriptedEventEditor.openScript(mainControl, event.getScriptPath());
} else if (task == GameObjectAttributesPanel.SCRIPT_EDIT_PATH) {
ScriptedEventEditor.editParameters(event);
} else if (task == GameObjectAttributesPanel.SCRIPT_REMOVE) {
Modified: trunk/src/app/net/sf/gridarta/gameobject/GameObject.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/GameObject.java 2008-08-01 21:29:18 UTC (rev 4666)
+++ trunk/src/app/net/sf/gridarta/gameobject/GameObject.java 2008-08-01 21:46:37 UTC (rev 4667)
@@ -24,6 +24,7 @@
import java.util.Map;
import java.util.regex.Pattern;
import javax.swing.JList;
+import net.sf.gridarta.MainControl;
import net.sf.gridarta.archtype.ArchetypeType;
import net.sf.gridarta.archtype.ArchetypeTypeSet;
import net.sf.gridarta.gameobject.match.GameObjectMatchers;
@@ -1378,9 +1379,10 @@
* @param eventList JList from the MapArchPanel (script tab) which displays
* the events
* @param mapanel the MapArchPanel
+ * @param mainControl the main control instance
* @xxx this method knows things it should never know, it is evil!
*/
- public abstract void modifyEventScript(final int eventType, final int task, @NotNull final JList eventList, @NotNull final GameObjectAttributesPanel<G, A, R, ?> mapanel);
+ public abstract void modifyEventScript(final int eventType, final int task, @NotNull final JList eventList, @NotNull final GameObjectAttributesPanel<G, A, R, ?> mapanel, @NotNull final MainControl<?, ?, ?, ?> mainControl);
/**
* A popup is opened and the user can create a new scripting event which
Modified: trunk/src/app/net/sf/gridarta/gameobject/scripts/AbstractScriptArchEditor.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/scripts/AbstractScriptArchEditor.java 2008-08-01 21:29:18 UTC (rev 4666)
+++ trunk/src/app/net/sf/gridarta/gameobject/scripts/AbstractScriptArchEditor.java 2008-08-01 21:46:37 UTC (rev 4667)
@@ -165,7 +165,7 @@
if (fileChooser.showOpenDialog(newScriptFrame) == JFileChooser.APPROVE_OPTION) {
// user has selected a file
final File f = fileChooser.getSelectedFile();
- inputScriptPath.setText(ScriptUtils.localizeEventPath(f, new File(globalSettings.getMapDefaultFolder())));
+ inputScriptPath.setText(ScriptUtils.localizeEventPath(mainControl.getLocalMapDir(), f, new File(globalSettings.getMapDefaultFolder())));
}
}
});
Modified: trunk/src/app/net/sf/gridarta/gameobject/scripts/ScriptUtils.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/scripts/ScriptUtils.java 2008-08-01 21:29:18 UTC (rev 4666)
+++ trunk/src/app/net/sf/gridarta/gameobject/scripts/ScriptUtils.java 2008-08-01 21:46:37 UTC (rev 4667)
@@ -21,7 +21,6 @@
import java.io.File;
import java.io.IOException;
-import net.sf.gridarta.AbstractMainControl;
import net.sf.gridarta.io.PathManager;
import org.apache.log4j.Logger;
import org.jetbrains.annotations.NotNull;
@@ -39,13 +38,12 @@
* This method is called when the user selects a new event to be created.
* The path relative to the map dir is calculated, and if reasonable, a
* relative path is created (relative to the map the event is on).
+ * @param localMapDir the base directory
* @param f script file
* @param mapDir the map directory
* @return local event path
*/
- public static String localizeEventPath(final File f, @NotNull final File mapDir) {
- final File localMapDir = AbstractMainControl.getInstance().getLocalMapDir();
-
+ public static String localizeEventPath(@NotNull final File localMapDir, final File f, @NotNull final File mapDir) {
if (!mapDir.exists()) {
log.warn("Map directory '" + mapDir.getAbsolutePath() + "' does not exist!");
return f.getName();
Modified: trunk/src/app/net/sf/gridarta/gameobject/scripts/ScriptedEventEditor.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/scripts/ScriptedEventEditor.java 2008-08-01 21:29:18 UTC (rev 4666)
+++ trunk/src/app/net/sf/gridarta/gameobject/scripts/ScriptedEventEditor.java 2008-08-01 21:46:37 UTC (rev 4667)
@@ -32,6 +32,7 @@
import javax.swing.WindowConstants;
import net.sf.gridarta.AbstractMainControl;
import net.sf.gridarta.GlobalSettings;
+import net.sf.gridarta.MainControl;
import net.sf.gridarta.textedit.scripteditor.ScriptEditControlInstance;
import net.sf.japi.swing.ActionFactory;
import org.apache.log4j.Logger;
@@ -76,9 +77,10 @@
/**
* Opens the script pad to display a script.
+ * @param mainControl the main control instance
* @param scriptPath the script path
*/
- public static void openScript(final String scriptPath) {
+ public static void openScript(@NotNull final MainControl<?, ?, ?, ?> mainControl, final String scriptPath) {
// trying to get the absolute path to scriptfile:
final StringBuilder tmpPath = new StringBuilder();
if (scriptPath.startsWith("/")) {
@@ -87,7 +89,7 @@
tmpPath.append(scriptPath);
} else {
// file path is relative to map dir
- final String mapPath = AbstractMainControl.getInstance().getLocalMapDir().getAbsolutePath();
+ final String mapPath = mainControl.getLocalMapDir().getAbsolutePath();
tmpPath.append(mapPath);
if (!mapPath.endsWith("/")) {
tmpPath.append('/');
Modified: trunk/src/app/net/sf/gridarta/gui/GameObjectAttributesPanel.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/GameObjectAttributesPanel.java 2008-08-01 21:29:18 UTC (rev 4666)
+++ trunk/src/app/net/sf/gridarta/gui/GameObjectAttributesPanel.java 2008-08-01 21:46:37 UTC (rev 4667)
@@ -638,7 +638,7 @@
final MapSquare<G, A, R> mapSquare = selectedGameObject.getMapSquare();
assert mapSquare != null;
mapSquare.getMapModel().beginTransaction("Modify event script");
- selectedGameObject.getHead().modifyEventScript(index, task, eventList, this);
+ selectedGameObject.getHead().modifyEventScript(index, task, eventList, this, mainControl);
mapSquare.getMapModel().endTransaction();
}
}
Modified: trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java
===================================================================
--- trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java 2008-08-01 21:29:18 UTC (rev 4666)
+++ trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java 2008-08-01 21:46:37 UTC (rev 4667)
@@ -808,7 +808,7 @@
}
/** {@inheritDoc} */
- public void modifyEventScript(final int eventType, final int task, @NotNull final JList eventList, @NotNull final GameObjectAttributesPanel<TestGameObject, TestMapArchObject, TestArchetype, ?> mapanel) {
+ public void modifyEventScript(final int eventType, final int task, @NotNull final JList eventList, @NotNull final GameObjectAttributesPanel<TestGameObject, TestMapArchObject, TestArchetype, ?> mapanel, @NotNull final MainControl<?, ?, ?, ?> mainControl) {
throw new AssertionError();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
