Menu
▾
▴
gridarta-commit
|
From: <aki...@us...> - 2008-06-22 20:04:03
|
Revision: 4218
http://gridarta.svn.sourceforge.net/gridarta/?rev=4218&view=rev
Author: akirschbaum
Date: 2008-06-22 13:04:12 -0700 (Sun, 22 Jun 2008)
Log Message:
-----------
Add ScriptArchData.getOwner() to common code base.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptArchData.java
trunk/daimonin/src/daieditor/gameobject/scripts/ScriptArchData.java
trunk/src/app/net/sf/gridarta/gameobject/scripts/PathButtonListener.java
trunk/src/app/net/sf/gridarta/gameobject/scripts/ScriptArchData.java
Modified: trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptArchData.java
===================================================================
--- trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptArchData.java 2008-06-22 19:52:53 UTC (rev 4217)
+++ trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptArchData.java 2008-06-22 20:04:12 UTC (rev 4218)
@@ -38,7 +38,7 @@
* @author <a href="mailto:and...@gm...">Andreas Vogl</a>
* @xxx This class is designed very badly, as it combines model and presentation.
*/
-public final class ScriptArchData extends net.sf.gridarta.gameobject.scripts.ScriptArchData {
+public final class ScriptArchData extends net.sf.gridarta.gameobject.scripts.ScriptArchData<GameObject> {
/** The Logger for printing log messages. */
private static final Logger log = Logger.getLogger(ScriptArchData.class);
@@ -184,6 +184,7 @@
return changed;
}
+ /** {@inheritDoc} */
public GameObject getOwner() {
return owner;
}
Modified: trunk/daimonin/src/daieditor/gameobject/scripts/ScriptArchData.java
===================================================================
--- trunk/daimonin/src/daieditor/gameobject/scripts/ScriptArchData.java 2008-06-22 19:52:53 UTC (rev 4217)
+++ trunk/daimonin/src/daieditor/gameobject/scripts/ScriptArchData.java 2008-06-22 20:04:12 UTC (rev 4218)
@@ -38,7 +38,7 @@
* @author <a href="mailto:and...@gm...">Andreas Vogl</a>
* @xxx This class is designed very badly, as it combines model and presentation.
*/
-public final class ScriptArchData extends net.sf.gridarta.gameobject.scripts.ScriptArchData {
+public final class ScriptArchData extends net.sf.gridarta.gameobject.scripts.ScriptArchData<GameObject> {
/** The Logger for printing log messages. */
private static final Logger log = Logger.getLogger(ScriptArchData.class);
@@ -184,6 +184,7 @@
return changed;
}
+ /** {@inheritDoc} */
public GameObject getOwner() {
return owner;
}
Modified: trunk/src/app/net/sf/gridarta/gameobject/scripts/PathButtonListener.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/scripts/PathButtonListener.java 2008-06-22 19:52:53 UTC (rev 4217)
+++ trunk/src/app/net/sf/gridarta/gameobject/scripts/PathButtonListener.java 2008-06-22 20:04:12 UTC (rev 4218)
@@ -43,7 +43,7 @@
/**
* The ScriptArchData to operate on.
*/
- private ScriptArchData scriptArchData;
+ private ScriptArchData<?> scriptArchData;
/**
* Create a PathButtonListener.
@@ -51,7 +51,7 @@
* @param frame frame this listener belongs to
* @param scriptArchData this is only set for the ok-button of "create new" frame, otherwise null
*/
- public PathButtonListener(final boolean isOkButton, final JDialog frame, @Nullable final ScriptArchData scriptArchData) {
+ public PathButtonListener(final boolean isOkButton, final JDialog frame, @Nullable final ScriptArchData<?> scriptArchData) {
this.isOkButton = isOkButton;
this.frame = frame;
this.scriptArchData = scriptArchData;
@@ -69,7 +69,7 @@
* Set the ScriptArchData to operate on.
* @param scriptArchData ScriptArchData to operate on.
*/
- public void setScriptArchData(final ScriptArchData scriptArchData) {
+ public void setScriptArchData(final ScriptArchData<?> scriptArchData) {
this.scriptArchData = scriptArchData;
}
Modified: trunk/src/app/net/sf/gridarta/gameobject/scripts/ScriptArchData.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/scripts/ScriptArchData.java 2008-06-22 19:52:53 UTC (rev 4217)
+++ trunk/src/app/net/sf/gridarta/gameobject/scripts/ScriptArchData.java 2008-06-22 20:04:12 UTC (rev 4218)
@@ -22,6 +22,7 @@
import java.io.Serializable;
import javax.swing.JDialog;
import javax.swing.JList;
+import net.sf.gridarta.gameobject.GameObject;
/**
* Stores and manages information about scripted events.
@@ -29,7 +30,7 @@
* @author <a href="mailto:and...@gm...">Andreas Vogl</a>
* @xxx This class is designed very badly, as it combines model and presentation.
*/
-public abstract class ScriptArchData implements Serializable {
+public abstract class ScriptArchData<G extends GameObject<G, ?, ?>> implements Serializable {
/**
* The user has chosen to create a new event, now it is to be done.
@@ -49,4 +50,6 @@
*/
public abstract void addEventsToJList(final JList list);
+ public abstract G getOwner();
+
} // class ScriptArchData
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-06-22 20:09:40
|
Revision: 4219
http://gridarta.svn.sourceforge.net/gridarta/?rev=4219&view=rev
Author: akirschbaum
Date: 2008-06-22 13:09:49 -0700 (Sun, 22 Jun 2008)
Log Message:
-----------
Add ScriptArchData.getScriptedEvent() to common code base.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptArchData.java
trunk/daimonin/src/daieditor/gameobject/scripts/ScriptArchData.java
trunk/src/app/net/sf/gridarta/gameobject/scripts/ScriptArchData.java
Modified: trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptArchData.java
===================================================================
--- trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptArchData.java 2008-06-22 20:04:12 UTC (rev 4218)
+++ trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptArchData.java 2008-06-22 20:09:49 UTC (rev 4219)
@@ -58,13 +58,7 @@
this.owner = owner;
}
- /**
- * Search the owner game object for an event object of the specified event
- * type.
- * @param eventType look for a ScriptedEvent of this type
- * @return the event game object, or <code>null</code> if no event of this
- * type exists
- */
+ /** {@inheritDoc} */
@Nullable public GameObject getScriptedEvent(final int eventType) {
for (final GameObject tmp : owner) {
if (tmp.getArchTypNr() == Archetype.TYPE_EVENT_CONNECTOR && tmp.getAttributeInt("subtype") == eventType) {
Modified: trunk/daimonin/src/daieditor/gameobject/scripts/ScriptArchData.java
===================================================================
--- trunk/daimonin/src/daieditor/gameobject/scripts/ScriptArchData.java 2008-06-22 20:04:12 UTC (rev 4218)
+++ trunk/daimonin/src/daieditor/gameobject/scripts/ScriptArchData.java 2008-06-22 20:09:49 UTC (rev 4219)
@@ -58,13 +58,7 @@
this.owner = owner;
}
- /**
- * Search the owner game object for an event object of the specified event
- * type.
- * @param eventType look for a ScriptedEvent of this type
- * @return the event game object, or <code>null</code> if no event of this
- * type exists
- */
+ /** {@inheritDoc} */
@Nullable public GameObject getScriptedEvent(final int eventType) {
for (final GameObject tmp : owner) {
if (tmp.getArchTypNr() == Archetype.TYPE_EVENT_OBJECT && tmp.getAttributeInt("sub_type") == eventType) {
Modified: trunk/src/app/net/sf/gridarta/gameobject/scripts/ScriptArchData.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/scripts/ScriptArchData.java 2008-06-22 20:04:12 UTC (rev 4218)
+++ trunk/src/app/net/sf/gridarta/gameobject/scripts/ScriptArchData.java 2008-06-22 20:09:49 UTC (rev 4219)
@@ -23,6 +23,7 @@
import javax.swing.JDialog;
import javax.swing.JList;
import net.sf.gridarta.gameobject.GameObject;
+import org.jetbrains.annotations.Nullable;
/**
* Stores and manages information about scripted events.
@@ -52,4 +53,13 @@
public abstract G getOwner();
+ /**
+ * Search the owner game object for an event object of the specified event
+ * type.
+ * @param eventType look for a ScriptedEvent of this type
+ * @return the event game object, or <code>null</code> if no event of this
+ * type exists
+ */
+ @Nullable public abstract G getScriptedEvent(final int eventType);
+
} // class ScriptArchData
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-06-22 20:24:33
|
Revision: 4220
http://gridarta.svn.sourceforge.net/gridarta/?rev=4220&view=rev
Author: akirschbaum
Date: 2008-06-22 13:24:41 -0700 (Sun, 22 Jun 2008)
Log Message:
-----------
Move ScriptArchEditor.addEventScript() to common code base.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptArchEditor.java
trunk/daimonin/src/daieditor/gameobject/scripts/ScriptArchEditor.java
trunk/src/app/net/sf/gridarta/gameobject/scripts/AbstractScriptArchEditor.java
Modified: trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptArchEditor.java
===================================================================
--- trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptArchEditor.java 2008-06-22 20:09:49 UTC (rev 4219)
+++ trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptArchEditor.java 2008-06-22 20:24:41 UTC (rev 4220)
@@ -20,29 +20,12 @@
package cfeditor.gameobject.scripts;
import cfeditor.gameobject.GameObject;
-import java.awt.Color;
-import java.awt.FlowLayout;
-import java.awt.Insets;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
import java.io.File;
import java.io.IOException;
-import javax.swing.BorderFactory;
-import javax.swing.Box;
-import javax.swing.BoxLayout;
-import javax.swing.JButton;
import javax.swing.JDialog;
-import javax.swing.JFileChooser;
-import javax.swing.JLabel;
-import javax.swing.JList;
import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
-import javax.swing.WindowConstants;
import net.sf.gridarta.AbstractMainControl;
import net.sf.gridarta.gameobject.scripts.AbstractScriptArchEditor;
-import net.sf.gridarta.gameobject.scripts.PathButtonListener;
-import net.sf.gridarta.gameobject.scripts.ScriptUtils;
import net.sf.gridarta.gameobject.scripts.UndefinedEventArchetypeException;
import net.sf.gridarta.textedit.scripteditor.ScriptEditControlInstance;
import net.sf.japi.swing.ActionFactory;
@@ -56,138 +39,6 @@
/** Action Factory. */
private static final ActionFactory ACTION_FACTORY = ActionFactory.getFactory("cfeditor");
- // popup frame for new scripts:
- private static JDialog newScriptFrame;
-
- private static JLabel headingLabel;
-
- private static PathButtonListener nsOkListener;
-
- private static JTextField inputScriptPath;
-
- private static JTextField inputOptions;
-
- /**
- * A popup is opened and the user can create a new scripting event
- * which gets attached to this gameObject.
- * @param panelList JList from the MapArchPanel (script tab) which displays the events
- * @param gameObject GameObject to add event to
- * @param scriptArchData the <code>ScriptArchData</code> instance to display
- */
- public static void addEventScript(final JList panelList, final GameObject gameObject, final ScriptArchData scriptArchData) {
- final String archName = gameObject.getBestName();
- // create a reasonable default script name for lazy users :-)
- final String defScriptName = ScriptUtils.chooseDefaultScriptName(archName, scriptEnding);
-
- if (newScriptFrame == null) {
- // initialize popup frame
- newScriptFrame = new JDialog(AbstractMainControl.getInstance().getMainView(), "New Scripted Event", true);
- newScriptFrame.setDefaultCloseOperation(WindowConstants.HIDE_ON_CLOSE);
-
- final JPanel mainPanel = new JPanel();
- mainPanel.setLayout(new BoxLayout(mainPanel, BoxLayout.Y_AXIS));
- mainPanel.setBorder(BorderFactory.createEmptyBorder(5, 5, 2, 5));
-
- // first line: heading
- final JPanel line1 = new JPanel(new FlowLayout(FlowLayout.LEFT));
- headingLabel = new JLabel("New scripted event for \"" + archName + "\":");
- headingLabel.setForeground(Color.black);
- line1.add(headingLabel);
- mainPanel.add(line1);
-
- // event type
- mainPanel.add(Box.createVerticalStrut(10));
- final JPanel line2 = new JPanel(new FlowLayout(FlowLayout.LEFT));
- final JLabel tlabel1 = new JLabel("Event type:");
- line2.add(tlabel1);
- line2.add(eventTypeBox);
- //mainPanel.add(line2);
- line2.add(Box.createHorizontalStrut(10));
-
- // plugin name
- final JLabel tlabel2 = new JLabel("Plugin:");
- line2.add(tlabel2);
- line2.add(pluginNameBox);
- mainPanel.add(line2);
-
- // path
- mainPanel.add(Box.createVerticalStrut(5));
- final JPanel line3 = new JPanel(new FlowLayout(FlowLayout.LEFT));
- final JLabel tlabel3 = new JLabel("Script file:");
- line3.add(tlabel3);
- mainPanel.add(line3);
- inputScriptPath = new JTextField(defScriptName, 20);
- final JButton browseb = new JButton("...");
- browseb.setMargin(new Insets(0, 10, 0, 10));
- browseb.addActionListener(new ActionListener() {
- public void actionPerformed(final ActionEvent e) {
- final File home = AbstractMainControl.getInstance().getLocalMapDir();
-
- final JFileChooser fileChooser = new JFileChooser();
- fileChooser.setDialogTitle("Select Script File");
- fileChooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
- fileChooser.setCurrentDirectory(home);
- fileChooser.setMultiSelectionEnabled(false);
- fileChooser.setFileFilter(AbstractMainControl.getInstance().getScriptFileFilter());
-
- if (fileChooser.showOpenDialog(newScriptFrame) == JFileChooser.APPROVE_OPTION) {
- // user has selected a file
- final File f = fileChooser.getSelectedFile();
- inputScriptPath.setText(ScriptUtils.localizeEventPath(f));
- }
- }
- });
- line3.add(inputScriptPath);
- line3.add(browseb);
- mainPanel.add(line3);
-
- // options
- mainPanel.add(Box.createVerticalStrut(5));
- final JPanel line4 = new JPanel(new FlowLayout(FlowLayout.LEFT));
- line4.add(new JLabel("Script options:"));
- inputOptions = new JTextField("", 20);
- line4.add(inputOptions);
- mainPanel.add(line4);
-
- // description
- final JPanel line5 = new JPanel(new FlowLayout(FlowLayout.LEFT));
- final JPanel textPanel = new JPanel();
- textPanel.setLayout(new BoxLayout(textPanel, BoxLayout.Y_AXIS));
- final JLabel tlabel4 = new JLabel("When you specify an existing file, the new event will be linked");
- textPanel.add(tlabel4);
- final JLabel tlabel5 = new JLabel("to that existing script. Otherwise a new script file is created.");
- textPanel.add(tlabel5);
- line5.add(textPanel);
- mainPanel.add(line5);
-
- // button panel:
- mainPanel.add(Box.createVerticalStrut(10));
- final JPanel line6 = new JPanel(new FlowLayout(FlowLayout.RIGHT));
- final JButton nsOkButton = new JButton("OK");
- nsOkListener = new PathButtonListener(true, newScriptFrame, scriptArchData);
- nsOkButton.addActionListener(nsOkListener);
- line6.add(nsOkButton);
-
- final JButton cancelButton = new JButton("Cancel");
- cancelButton.addActionListener(new PathButtonListener(false, newScriptFrame, null));
- line6.add(cancelButton);
- mainPanel.add(line6);
-
- newScriptFrame.getContentPane().add(mainPanel);
- newScriptFrame.pack();
- newScriptFrame.setLocationRelativeTo(AbstractMainControl.getInstance().getMainView());
- newScriptFrame.setVisible(true);
- } else {
- // just set fields and show
- headingLabel.setText("New scripted event for \"" + archName + "\":");
- inputScriptPath.setText(defScriptName);
- inputOptions.setText("");
- nsOkListener.setScriptArchData(scriptArchData);
- newScriptFrame.toFront();
- newScriptFrame.setVisible(true);
- }
- }
-
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/gameobject/scripts/ScriptArchEditor.java
===================================================================
--- trunk/daimonin/src/daieditor/gameobject/scripts/ScriptArchEditor.java 2008-06-22 20:09:49 UTC (rev 4219)
+++ trunk/daimonin/src/daieditor/gameobject/scripts/ScriptArchEditor.java 2008-06-22 20:24:41 UTC (rev 4220)
@@ -20,29 +20,12 @@
package daieditor.gameobject.scripts;
import daieditor.gameobject.GameObject;
-import java.awt.Color;
-import java.awt.FlowLayout;
-import java.awt.Insets;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
import java.io.File;
import java.io.IOException;
-import javax.swing.BorderFactory;
-import javax.swing.Box;
-import javax.swing.BoxLayout;
-import javax.swing.JButton;
import javax.swing.JDialog;
-import javax.swing.JFileChooser;
-import javax.swing.JLabel;
-import javax.swing.JList;
import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
-import javax.swing.WindowConstants;
import net.sf.gridarta.AbstractMainControl;
import net.sf.gridarta.gameobject.scripts.AbstractScriptArchEditor;
-import net.sf.gridarta.gameobject.scripts.PathButtonListener;
-import net.sf.gridarta.gameobject.scripts.ScriptUtils;
import net.sf.gridarta.gameobject.scripts.UndefinedEventArchetypeException;
import net.sf.gridarta.textedit.scripteditor.ScriptEditControlInstance;
import net.sf.japi.swing.ActionFactory;
@@ -56,138 +39,6 @@
/** Action Factory. */
private static final ActionFactory ACTION_FACTORY = ActionFactory.getFactory("daieditor");
- // popup frame for new scripts:
- private static JDialog newScriptFrame;
-
- private static JLabel headingLabel;
-
- private static PathButtonListener nsOkListener;
-
- private static JTextField inputScriptPath;
-
- private static JTextField inputOptions;
-
- /**
- * A popup is opened and the user can create a new scripting event
- * which gets attached to this gameObject.
- * @param panelList JList from the MapArchPanel (script tab) which displays the events
- * @param gameObject GameObject to add event to
- * @param scriptArchData the <code>ScriptArchData</code> instance to display
- */
- public static void addEventScript(final JList panelList, final GameObject gameObject, final ScriptArchData scriptArchData) {
- final String archName = gameObject.getBestName();
- // create a reasonable default script name for lazy users :-)
- final String defScriptName = ScriptUtils.chooseDefaultScriptName(archName, scriptEnding);
-
- if (newScriptFrame == null) {
- // initialize popup frame
- newScriptFrame = new JDialog(AbstractMainControl.getInstance().getMainView(), "New Scripted Event", true);
- newScriptFrame.setDefaultCloseOperation(WindowConstants.HIDE_ON_CLOSE);
-
- final JPanel mainPanel = new JPanel();
- mainPanel.setLayout(new BoxLayout(mainPanel, BoxLayout.Y_AXIS));
- mainPanel.setBorder(BorderFactory.createEmptyBorder(5, 5, 2, 5));
-
- // first line: heading
- final JPanel line1 = new JPanel(new FlowLayout(FlowLayout.LEFT));
- headingLabel = new JLabel("New scripted event for \"" + archName + "\":");
- headingLabel.setForeground(Color.black);
- line1.add(headingLabel);
- mainPanel.add(line1);
-
- // event type
- mainPanel.add(Box.createVerticalStrut(10));
- final JPanel line2 = new JPanel(new FlowLayout(FlowLayout.LEFT));
- final JLabel tlabel1 = new JLabel("Event type:");
- line2.add(tlabel1);
- line2.add(eventTypeBox);
- //mainPanel.add(line2);
- line2.add(Box.createHorizontalStrut(10));
-
- // plugin name
- final JLabel tlabel2 = new JLabel("Plugin:");
- line2.add(tlabel2);
- line2.add(pluginNameBox);
- mainPanel.add(line2);
-
- // path
- mainPanel.add(Box.createVerticalStrut(5));
- final JPanel line3 = new JPanel(new FlowLayout(FlowLayout.LEFT));
- final JLabel tlabel3 = new JLabel("Script file:");
- line3.add(tlabel3);
- mainPanel.add(line3);
- inputScriptPath = new JTextField(defScriptName, 20);
- final JButton browseb = new JButton("...");
- browseb.setMargin(new Insets(0, 10, 0, 10));
- browseb.addActionListener(new ActionListener() {
- public void actionPerformed(final ActionEvent e) {
- final File home = AbstractMainControl.getInstance().getLocalMapDir();
-
- final JFileChooser fileChooser = new JFileChooser();
- fileChooser.setDialogTitle("Select Script File");
- fileChooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
- fileChooser.setCurrentDirectory(home);
- fileChooser.setMultiSelectionEnabled(false);
- fileChooser.setFileFilter(AbstractMainControl.getInstance().getScriptFileFilter());
-
- if (fileChooser.showOpenDialog(newScriptFrame) == JFileChooser.APPROVE_OPTION) {
- // user has selected a file
- final File f = fileChooser.getSelectedFile();
- inputScriptPath.setText(ScriptUtils.localizeEventPath(f));
- }
- }
- });
- line3.add(inputScriptPath);
- line3.add(browseb);
- mainPanel.add(line3);
-
- // options
- mainPanel.add(Box.createVerticalStrut(5));
- final JPanel line4 = new JPanel(new FlowLayout(FlowLayout.LEFT));
- line4.add(new JLabel("Script options:"));
- inputOptions = new JTextField("", 20);
- line4.add(inputOptions);
- mainPanel.add(line4);
-
- // description
- final JPanel line5 = new JPanel(new FlowLayout(FlowLayout.LEFT));
- final JPanel textPanel = new JPanel();
- textPanel.setLayout(new BoxLayout(textPanel, BoxLayout.Y_AXIS));
- final JLabel tlabel4 = new JLabel("When you specify an existing file, the new event will be linked");
- textPanel.add(tlabel4);
- final JLabel tlabel5 = new JLabel("to that existing script. Otherwise a new script file is created.");
- textPanel.add(tlabel5);
- line5.add(textPanel);
- mainPanel.add(line5);
-
- // button panel:
- mainPanel.add(Box.createVerticalStrut(10));
- final JPanel line6 = new JPanel(new FlowLayout(FlowLayout.RIGHT));
- final JButton nsOkButton = new JButton("OK");
- nsOkListener = new PathButtonListener(true, newScriptFrame, scriptArchData);
- nsOkButton.addActionListener(nsOkListener);
- line6.add(nsOkButton);
-
- final JButton cancelButton = new JButton("Cancel");
- cancelButton.addActionListener(new PathButtonListener(false, newScriptFrame, null));
- line6.add(cancelButton);
- mainPanel.add(line6);
-
- newScriptFrame.getContentPane().add(mainPanel);
- newScriptFrame.pack();
- newScriptFrame.setLocationRelativeTo(AbstractMainControl.getInstance().getMainView());
- newScriptFrame.setVisible(true);
- } else {
- // just set fields and show
- headingLabel.setText("New scripted event for \"" + archName + "\":");
- inputScriptPath.setText(defScriptName);
- inputOptions.setText("");
- nsOkListener.setScriptArchData(scriptArchData);
- newScriptFrame.toFront();
- newScriptFrame.setVisible(true);
- }
- }
-
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-06-22 20:09:49 UTC (rev 4219)
+++ trunk/src/app/net/sf/gridarta/gameobject/scripts/AbstractScriptArchEditor.java 2008-06-22 20:24:41 UTC (rev 4220)
@@ -19,7 +19,26 @@
package net.sf.gridarta.gameobject.scripts;
+import java.awt.Color;
+import java.awt.FlowLayout;
+import java.awt.Insets;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.File;
+import javax.swing.BorderFactory;
+import javax.swing.Box;
+import javax.swing.BoxLayout;
+import javax.swing.JButton;
import javax.swing.JComboBox;
+import javax.swing.JDialog;
+import javax.swing.JFileChooser;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+import javax.swing.WindowConstants;
+import net.sf.gridarta.AbstractMainControl;
+import net.sf.gridarta.gameobject.GameObject;
import org.apache.log4j.Logger;
public abstract class AbstractScriptArchEditor {
@@ -34,6 +53,17 @@
protected static JComboBox pluginNameBox;
+ // popup frame for new scripts:
+ private static JDialog newScriptFrame;
+
+ private static JLabel headingLabel;
+
+ protected static JTextField inputScriptPath;
+
+ protected static JTextField inputOptions;
+
+ private static PathButtonListener nsOkListener;
+
/**
* Creates a new instance.
*/
@@ -50,4 +80,125 @@
AbstractScriptArchEditor.eventTypeBox = eventTypeBox;
}
+ /**
+ * A popup is opened and the user can create a new scripting event
+ * which gets attached to this gameObject.
+ * @param panelList JList from the MapArchPanel (script tab) which displays the events
+ * @param gameObject GameObject to add event to
+ * @param scriptArchData the <code>ScriptArchData</code> instance to display
+ */
+ public static <G extends GameObject<G, ?, ?>> void addEventScript(final JList panelList, final G gameObject, final ScriptArchData scriptArchData) {
+ final String archName = gameObject.getBestName();
+ // create a reasonable default script name for lazy users :-)
+ final String defScriptName = ScriptUtils.chooseDefaultScriptName(archName, scriptEnding);
+
+ if (newScriptFrame == null) {
+ // initialize popup frame
+ newScriptFrame = new JDialog(AbstractMainControl.getInstance().getMainView(), "New Scripted Event", true);
+ newScriptFrame.setDefaultCloseOperation(WindowConstants.HIDE_ON_CLOSE);
+
+ final JPanel mainPanel = new JPanel();
+ mainPanel.setLayout(new BoxLayout(mainPanel, BoxLayout.Y_AXIS));
+ mainPanel.setBorder(BorderFactory.createEmptyBorder(5, 5, 2, 5));
+
+ // first line: heading
+ final JPanel line1 = new JPanel(new FlowLayout(FlowLayout.LEFT));
+ headingLabel = new JLabel("New scripted event for \"" + archName + "\":");
+ headingLabel.setForeground(Color.black);
+ line1.add(headingLabel);
+ mainPanel.add(line1);
+
+ // event type
+ mainPanel.add(Box.createVerticalStrut(10));
+ final JPanel line2 = new JPanel(new FlowLayout(FlowLayout.LEFT));
+ final JLabel tlabel1 = new JLabel("Event type:");
+ line2.add(tlabel1);
+ line2.add(eventTypeBox);
+ //mainPanel.add(line2);
+ line2.add(Box.createHorizontalStrut(10));
+
+ // plugin name
+ final JLabel tlabel2 = new JLabel("Plugin:");
+ line2.add(tlabel2);
+ line2.add(pluginNameBox);
+ mainPanel.add(line2);
+
+ // path
+ mainPanel.add(Box.createVerticalStrut(5));
+ final JPanel line3 = new JPanel(new FlowLayout(FlowLayout.LEFT));
+ final JLabel tlabel3 = new JLabel("Script file:");
+ line3.add(tlabel3);
+ mainPanel.add(line3);
+ inputScriptPath = new JTextField(defScriptName, 20);
+ final JButton browseb = new JButton("...");
+ browseb.setMargin(new Insets(0, 10, 0, 10));
+ browseb.addActionListener(new ActionListener() {
+ public void actionPerformed(final ActionEvent e) {
+ final File home = AbstractMainControl.getInstance().getLocalMapDir();
+
+ final JFileChooser fileChooser = new JFileChooser();
+ fileChooser.setDialogTitle("Select Script File");
+ fileChooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
+ fileChooser.setCurrentDirectory(home);
+ fileChooser.setMultiSelectionEnabled(false);
+ fileChooser.setFileFilter(AbstractMainControl.getInstance().getScriptFileFilter());
+
+ if (fileChooser.showOpenDialog(newScriptFrame) == JFileChooser.APPROVE_OPTION) {
+ // user has selected a file
+ final File f = fileChooser.getSelectedFile();
+ inputScriptPath.setText(ScriptUtils.localizeEventPath(f));
+ }
+ }
+ });
+ line3.add(inputScriptPath);
+ line3.add(browseb);
+ mainPanel.add(line3);
+
+ // options
+ mainPanel.add(Box.createVerticalStrut(5));
+ final JPanel line4 = new JPanel(new FlowLayout(FlowLayout.LEFT));
+ line4.add(new JLabel("Script options:"));
+ inputOptions = new JTextField("", 20);
+ line4.add(inputOptions);
+ mainPanel.add(line4);
+
+ // description
+ final JPanel line5 = new JPanel(new FlowLayout(FlowLayout.LEFT));
+ final JPanel textPanel = new JPanel();
+ textPanel.setLayout(new BoxLayout(textPanel, BoxLayout.Y_AXIS));
+ final JLabel tlabel4 = new JLabel("When you specify an existing file, the new event will be linked");
+ textPanel.add(tlabel4);
+ final JLabel tlabel5 = new JLabel("to that existing script. Otherwise a new script file is created.");
+ textPanel.add(tlabel5);
+ line5.add(textPanel);
+ mainPanel.add(line5);
+
+ // button panel:
+ mainPanel.add(Box.createVerticalStrut(10));
+ final JPanel line6 = new JPanel(new FlowLayout(FlowLayout.RIGHT));
+ final JButton nsOkButton = new JButton("OK");
+ nsOkListener = new PathButtonListener(true, newScriptFrame, scriptArchData);
+ nsOkButton.addActionListener(nsOkListener);
+ line6.add(nsOkButton);
+
+ final JButton cancelButton = new JButton("Cancel");
+ cancelButton.addActionListener(new PathButtonListener(false, newScriptFrame, null));
+ line6.add(cancelButton);
+ mainPanel.add(line6);
+
+ newScriptFrame.getContentPane().add(mainPanel);
+ newScriptFrame.pack();
+ newScriptFrame.setLocationRelativeTo(AbstractMainControl.getInstance().getMainView());
+ newScriptFrame.setVisible(true);
+ } else {
+ // just set fields and show
+ headingLabel.setText("New scripted event for \"" + archName + "\":");
+ inputScriptPath.setText(defScriptName);
+ inputOptions.setText("");
+ nsOkListener.setScriptArchData(scriptArchData);
+ newScriptFrame.toFront();
+ newScriptFrame.setVisible(true);
+ }
+ }
+
} // class AbstractScriptArchEditor
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-06-22 20:30:14
|
Revision: 4221
http://gridarta.svn.sourceforge.net/gridarta/?rev=4221&view=rev
Author: akirschbaum
Date: 2008-06-22 13:30:11 -0700 (Sun, 22 Jun 2008)
Log Message:
-----------
Add ScriptedEvent.getEventArch() to common code base.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptedEvent.java
trunk/daimonin/src/daieditor/gameobject/scripts/ScriptedEvent.java
trunk/src/app/net/sf/gridarta/gameobject/scripts/ScriptedEvent.java
Modified: trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptedEvent.java
===================================================================
--- trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptedEvent.java 2008-06-22 20:24:41 UTC (rev 4220)
+++ trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptedEvent.java 2008-06-22 20:30:11 UTC (rev 4221)
@@ -33,7 +33,7 @@
* Class which stores information about one scripted event.
* @author Andreas Kirschbaum
*/
-public final class ScriptedEvent extends net.sf.gridarta.gameobject.scripts.ScriptedEvent {
+public final class ScriptedEvent extends net.sf.gridarta.gameobject.scripts.ScriptedEvent<GameObject> {
/** The Logger for printing log messages. */
private static final Logger log = Logger.getLogger(ScriptedEvent.class);
@@ -105,11 +105,7 @@
setOptions(newOptions); // unlike the above two, event options can be empty
}
- /**
- * Return the underlying event game object.
- *
- * @return the underlying event game object
- */
+ /** {@inheritDoc} */
public GameObject getEventArch() {
return event;
}
Modified: trunk/daimonin/src/daieditor/gameobject/scripts/ScriptedEvent.java
===================================================================
--- trunk/daimonin/src/daieditor/gameobject/scripts/ScriptedEvent.java 2008-06-22 20:24:41 UTC (rev 4220)
+++ trunk/daimonin/src/daieditor/gameobject/scripts/ScriptedEvent.java 2008-06-22 20:30:11 UTC (rev 4221)
@@ -32,7 +32,7 @@
* Class which stores information about one scripted event.
* @author Andreas Kirschbaum
*/
-public final class ScriptedEvent extends net.sf.gridarta.gameobject.scripts.ScriptedEvent {
+public final class ScriptedEvent extends net.sf.gridarta.gameobject.scripts.ScriptedEvent<GameObject> {
/** The Logger for printing log messages. */
private static final Logger log = Logger.getLogger(ScriptedEvent.class);
@@ -106,11 +106,7 @@
}
}
- /**
- * Return the underlying event game object.
- *
- * @return the underlying event game object
- */
+ /** {@inheritDoc} */
public GameObject getEventArch() {
return event;
}
Modified: trunk/src/app/net/sf/gridarta/gameobject/scripts/ScriptedEvent.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/scripts/ScriptedEvent.java 2008-06-22 20:24:41 UTC (rev 4220)
+++ trunk/src/app/net/sf/gridarta/gameobject/scripts/ScriptedEvent.java 2008-06-22 20:30:11 UTC (rev 4221)
@@ -19,11 +19,13 @@
package net.sf.gridarta.gameobject.scripts;
+import net.sf.gridarta.gameobject.GameObject;
+
/**
* Class which stores information about one scripted event.
* @author Andreas Kirschbaum
*/
-public abstract class ScriptedEvent {
+public abstract class ScriptedEvent<G extends GameObject<G, ?, ?>> {
/**
* Set event path and plugin name according to user input from popup
@@ -37,4 +39,10 @@
public abstract String getOptions();
+ /**
+ * Returns the underlying event game object.
+ * @return the underlying event game object
+ */
+ public abstract G getEventArch();
+
} // class ScriptedEvent
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-06-22 20:41:26
|
Revision: 4222
http://gridarta.svn.sourceforge.net/gridarta/?rev=4222&view=rev
Author: akirschbaum
Date: 2008-06-22 13:41:17 -0700 (Sun, 22 Jun 2008)
Log Message:
-----------
Add ScriptedEvent.getEventType() to common code base.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptedEvent.java
trunk/daimonin/src/daieditor/gameobject/scripts/ScriptedEvent.java
trunk/src/app/net/sf/gridarta/gameobject/scripts/ScriptedEvent.java
Modified: trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptedEvent.java
===================================================================
--- trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptedEvent.java 2008-06-22 20:30:11 UTC (rev 4221)
+++ trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptedEvent.java 2008-06-22 20:41:17 UTC (rev 4222)
@@ -110,6 +110,7 @@
return event;
}
+ /** {@inheritDoc} */
public int getEventType() {
return event.getAttributeInt("subtype");
}
Modified: trunk/daimonin/src/daieditor/gameobject/scripts/ScriptedEvent.java
===================================================================
--- trunk/daimonin/src/daieditor/gameobject/scripts/ScriptedEvent.java 2008-06-22 20:30:11 UTC (rev 4221)
+++ trunk/daimonin/src/daieditor/gameobject/scripts/ScriptedEvent.java 2008-06-22 20:41:17 UTC (rev 4222)
@@ -111,6 +111,7 @@
return event;
}
+ /** {@inheritDoc} */
public int getEventType() {
return event.getAttributeInt("sub_type");
}
Modified: trunk/src/app/net/sf/gridarta/gameobject/scripts/ScriptedEvent.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/scripts/ScriptedEvent.java 2008-06-22 20:30:11 UTC (rev 4221)
+++ trunk/src/app/net/sf/gridarta/gameobject/scripts/ScriptedEvent.java 2008-06-22 20:41:17 UTC (rev 4222)
@@ -45,4 +45,6 @@
*/
public abstract G getEventArch();
+ public abstract int getEventType();
+
} // class ScriptedEvent
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-07-04 20:54:27
|
Revision: 4225
http://gridarta.svn.sourceforge.net/gridarta/?rev=4225&view=rev
Author: akirschbaum
Date: 2008-07-04 13:54:00 -0700 (Fri, 04 Jul 2008)
Log Message:
-----------
Add @Nullable/@NotNull annotations.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/GlobalSettingsImpl.java
trunk/crossfire/src/cfeditor/gameobject/ArchetypeParser.java
trunk/crossfire/src/cfeditor/gui/map/MapRenderer.java
trunk/daimonin/src/daieditor/ProcessRunner.java
trunk/daimonin/src/daieditor/gameobject/ArchetypeParser.java
trunk/daimonin/src/daieditor/gameobject/ArchetypeSet.java
trunk/daimonin/src/daieditor/gameobject/GameObject.java
trunk/daimonin/src/daieditor/gui/map/DefaultLevelRenderer.java
trunk/daimonin/src/test/daieditor/gui/map/MapCursorTest.java
trunk/daimonin/src/test/daieditor/map/validation/AbstractValidatorTest.java
trunk/src/app/net/sf/gridarta/XmlHelper.java
trunk/src/app/net/sf/gridarta/data/NamedTreeNode.java
trunk/src/app/net/sf/gridarta/gameobject/Collector.java
trunk/src/app/net/sf/gridarta/gameobject/anim/AnimationParseException.java
trunk/src/app/net/sf/gridarta/gui/ErrorListView.java
trunk/src/app/net/sf/gridarta/gui/GUIUtils.java
trunk/src/app/net/sf/gridarta/gui/MainActions.java
trunk/src/app/net/sf/gridarta/gui/ObjectChoiceDisplay.java
trunk/src/app/net/sf/gridarta/gui/ReplaceDialog.java
trunk/src/app/net/sf/gridarta/gui/ShiftProcessor.java
trunk/src/app/net/sf/gridarta/gui/SplashScreen.java
trunk/src/app/net/sf/gridarta/gui/connectionview/Connections.java
trunk/src/app/net/sf/gridarta/gui/findarchetypes/FindArchetypesDialog.java
trunk/src/app/net/sf/gridarta/gui/findarchetypes/TableModel.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/AbstractGameObjectAttributesDialog.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/ConfirmErrorsAL.java
trunk/src/app/net/sf/gridarta/gui/map/AbstractMapTilePane.java
trunk/src/app/net/sf/gridarta/gui/map/MapGrid.java
trunk/src/app/net/sf/gridarta/gui/map/MapPreviewAccessory.java
trunk/src/app/net/sf/gridarta/gui/map/MapView.java
trunk/src/app/net/sf/gridarta/gui/newmap/NewPickmapFolderDialog.java
trunk/src/app/net/sf/gridarta/gui/pickmapchooser/FolderListActions.java
trunk/src/app/net/sf/gridarta/gui/pickmapchooser/Loader.java
trunk/src/app/net/sf/gridarta/gui/pickmapchooser/Model.java
trunk/src/app/net/sf/gridarta/gui/selectedsquare/CellRenderer.java
trunk/src/app/net/sf/gridarta/gui/selectedsquare/SelectedSquareView.java
trunk/src/app/net/sf/gridarta/help/HtmlPane.java
trunk/src/app/net/sf/gridarta/map/validation/checks/BlockedSpawnPointChecker.java
trunk/src/app/net/sf/gridarta/textedit/textarea/DefaultInputHandler.java
trunk/src/app/net/sf/gridarta/textedit/textarea/InputHandler.java
trunk/src/app/net/sf/gridarta/textedit/textarea/JEditTextArea.java
trunk/src/app/net/sf/gridarta/textedit/textarea/ScrollLayout.java
trunk/src/app/net/sf/gridarta/textedit/textarea/SyntaxStyle.java
trunk/src/app/net/sf/gridarta/textedit/textarea/TextAreaPainter.java
trunk/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/DaimoninAITokenMarker.java
trunk/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/KeywordMap.java
trunk/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/TokenMarker.java
Modified: trunk/crossfire/src/cfeditor/GlobalSettingsImpl.java
===================================================================
--- trunk/crossfire/src/cfeditor/GlobalSettingsImpl.java 2008-06-27 18:58:07 UTC (rev 4224)
+++ trunk/crossfire/src/cfeditor/GlobalSettingsImpl.java 2008-07-04 20:54:00 UTC (rev 4225)
@@ -23,6 +23,7 @@
import java.util.prefs.Preferences;
import net.sf.gridarta.MainControl;
import org.apache.log4j.Logger;
+import org.jetbrains.annotations.Nullable;
/**
* Maintains path names to resources.
@@ -39,11 +40,13 @@
private static final Preferences prefs = Preferences.userNodeForPackage(MainControl.class);
/** Name of used Image Set (null = none). */
+ @Nullable
private String imageSet;
/** Time for an automated docu popup. */
private boolean autoPopupDocu = false;
+ @Nullable
public String getImageSet() {
return imageSet;
}
Modified: trunk/crossfire/src/cfeditor/gameobject/ArchetypeParser.java
===================================================================
--- trunk/crossfire/src/cfeditor/gameobject/ArchetypeParser.java 2008-06-27 18:58:07 UTC (rev 4224)
+++ trunk/crossfire/src/cfeditor/gameobject/ArchetypeParser.java 2008-07-04 20:54:00 UTC (rev 4225)
@@ -84,7 +84,7 @@
/** {@inheritDoc} */
public void parseArchetypeFromStream(final BufferedReader in, @Nullable final GameObject prototype, @Nullable final String line, @Nullable final String archName, @NotNull final String panelName, @NotNull final String folderName, final String fname, @NotNull final List<GameObject> invObjects) throws IOException {
// start with new clean GameObject instance
- GameObject archetype;
+ @Nullable GameObject archetype;
GameObject archlast = null;
if (prototype == null) {
archetype = new GameObject();
@@ -93,7 +93,7 @@
}
final boolean isInternPath;
// path is needed when we don't read from collection because there is no editor_folder in arc files
- final String path;
+ @Nullable final String path;
if (!mainControl.getArchetypeSet().isLoadedFromArchive() && archName == null) {
String tmpPath = (new File(PathManager.getArchPath(fname))).getParent();
if (tmpPath == null) {
@@ -116,15 +116,15 @@
thisLine2 = line; // pre read "Object" from artifacts file loader
}
- GameObject firstArch = null;
+ @Nullable GameObject firstArch = null;
boolean archmore = false;
boolean parsearch = false;
boolean animflag = false;
boolean msgflag = false;
boolean loreflag = false;
- String editorFolder = null;
- StringBuilder animText = null;
- StringBuilder loreText = null;
+ @Nullable String editorFolder = null;
+ @Nullable StringBuilder animText = null;
+ @Nullable StringBuilder loreText = null;
while (thisLine2 != null) {
final String thisLine = thisLine2.trim();
Modified: trunk/crossfire/src/cfeditor/gui/map/MapRenderer.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/map/MapRenderer.java 2008-06-27 18:58:07 UTC (rev 4224)
+++ trunk/crossfire/src/cfeditor/gui/map/MapRenderer.java 2008-07-04 20:54:00 UTC (rev 4225)
@@ -69,6 +69,7 @@
* buffers are huge and therefore frequently cause out of memory errors
* when loading large and/or multiple maps.
*/
+ @Nullable
private SoftReference<BufferedImage> backBufferRef = null;
private final CMainControl mainControl;
Modified: trunk/daimonin/src/daieditor/ProcessRunner.java
===================================================================
--- trunk/daimonin/src/daieditor/ProcessRunner.java 2008-06-27 18:58:07 UTC (rev 4224)
+++ trunk/daimonin/src/daieditor/ProcessRunner.java 2008-07-04 20:54:00 UTC (rev 4225)
@@ -37,6 +37,7 @@
import javax.swing.JToolBar;
import javax.swing.SwingUtilities;
import net.sf.japi.swing.ActionFactory;
+import org.jetbrains.annotations.Nullable;
/**
* Class to run an external process.
@@ -270,6 +271,7 @@
private static final class CopyOutput implements Runnable {
/** BufferedReader to read from. */
+ @Nullable
@SuppressWarnings({"InstanceVariableNamingConvention"})
private InputStream in;
Modified: trunk/daimonin/src/daieditor/gameobject/ArchetypeParser.java
===================================================================
--- trunk/daimonin/src/daieditor/gameobject/ArchetypeParser.java 2008-06-27 18:58:07 UTC (rev 4224)
+++ trunk/daimonin/src/daieditor/gameobject/ArchetypeParser.java 2008-07-04 20:54:00 UTC (rev 4225)
@@ -86,7 +86,7 @@
@SuppressWarnings({"StringContatenationInLoop", "ObjectAllocationInLoop"})
public void parseArchetypeFromStream(final BufferedReader in, @Nullable final GameObject prototype, @Nullable final String line, @Nullable final String archName, @NotNull final String panelName, @NotNull final String folderName, final String fname, @NotNull final List<GameObject> invObjects) throws IOException {
// start with new clean GameObject instance
- GameObject archetype;
+ @Nullable GameObject archetype;
GameObject archlast = null;
if (prototype == null) {
archetype = new GameObject();
@@ -95,7 +95,7 @@
}
final boolean isInternPath;
// path is needed when we don't read from collection because there is no editor_folder in arc files
- final String path;
+ @Nullable final String path;
if (!mainControl.getArchetypeSet().isLoadedFromArchive() && archName == null) {
String tmpPath = (new File(PathManager.getArchPath(fname))).getParent();
if (tmpPath == null) {
@@ -118,13 +118,13 @@
thisLine2 = line; // pre read "Object" from artifacts file loader
}
- GameObject firstArch = null;
+ @Nullable GameObject firstArch = null;
boolean archmore = false;
boolean parsearch = false;
boolean animflag = false;
boolean msgflag = false;
- String editorFolder = null;
- StringBuilder animText = null;
+ @Nullable String editorFolder = null;
+ @Nullable StringBuilder animText = null;
int multiShapeID = 0;
while (thisLine2 != null) {
Modified: trunk/daimonin/src/daieditor/gameobject/ArchetypeSet.java
===================================================================
--- trunk/daimonin/src/daieditor/gameobject/ArchetypeSet.java 2008-06-27 18:58:07 UTC (rev 4224)
+++ trunk/daimonin/src/daieditor/gameobject/ArchetypeSet.java 2008-07-04 20:54:00 UTC (rev 4225)
@@ -79,6 +79,7 @@
* The animation files.
* This variable is only used during arch collection from files.
*/
+ @Nullable
private List<File> animFiles;
/**
@@ -226,15 +227,15 @@
return;
}
// This is an artifact file to parse
- String editorPath = null;
+ @Nullable String editorPath = null;
try {
final BufferedReader myInput = new BufferedReader(new FileReader(filename));
//Open the file for reading
try {
int editorCode = -1;
- String name = null;
- String defArchName = null;
+ @Nullable String name = null;
+ @Nullable String defArchName = null;
int lineCount = 0;
// do the actual parsing
Modified: trunk/daimonin/src/daieditor/gameobject/GameObject.java
===================================================================
--- trunk/daimonin/src/daieditor/gameobject/GameObject.java 2008-06-27 18:58:07 UTC (rev 4224)
+++ trunk/daimonin/src/daieditor/gameobject/GameObject.java 2008-07-04 20:54:00 UTC (rev 4225)
@@ -194,7 +194,7 @@
}
noface = true;
- String effectiveFaceObjName;
+ @Nullable String effectiveFaceObjName;
if (effectiveAnimName != null) { // we have a animation - get the frame picture
final AnimationObjects<AnimationObject> animationObjects = CMainControl.getInstance().getAnimationObjects();
Modified: trunk/daimonin/src/daieditor/gui/map/DefaultLevelRenderer.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/map/DefaultLevelRenderer.java 2008-06-27 18:58:07 UTC (rev 4224)
+++ trunk/daimonin/src/daieditor/gui/map/DefaultLevelRenderer.java 2008-07-04 20:54:00 UTC (rev 4225)
@@ -366,6 +366,7 @@
* @param node GameObject to paint
*/
private void paintGameObject(final Graphics2D grfx, final int xstart, final int ystart, GameObject node) {
+ @Nullable
final GameObject tmpNode;
if (node.isMulti()) {
// this is a multipart tail:
Modified: trunk/daimonin/src/test/daieditor/gui/map/MapCursorTest.java
===================================================================
--- trunk/daimonin/src/test/daieditor/gui/map/MapCursorTest.java 2008-06-27 18:58:07 UTC (rev 4224)
+++ trunk/daimonin/src/test/daieditor/gui/map/MapCursorTest.java 2008-07-04 20:54:00 UTC (rev 4225)
@@ -29,6 +29,7 @@
import net.sf.gridarta.gui.map.MapCursorListener;
import net.sf.gridarta.gui.map.MapGrid;
import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.junit.AfterClass;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -46,6 +47,7 @@
*/
public class MapCursorTest implements MapCursorListener {
+ @Nullable
private static MapCursor cursor;
private static final Size2D gridSize = new Size2D(6, 7);
private static final MapGrid grid = new MapGrid(gridSize);
Modified: trunk/daimonin/src/test/daieditor/map/validation/AbstractValidatorTest.java
===================================================================
--- trunk/daimonin/src/test/daieditor/map/validation/AbstractValidatorTest.java 2008-06-27 18:58:07 UTC (rev 4224)
+++ trunk/daimonin/src/test/daieditor/map/validation/AbstractValidatorTest.java 2008-07-04 20:54:00 UTC (rev 4225)
@@ -21,6 +21,7 @@
import junit.framework.TestCase;
import net.sf.gridarta.map.validation.AbstractValidator;
+import org.jetbrains.annotations.Nullable;
/**
* Test for {@link AbstractValidator}.
@@ -29,6 +30,7 @@
public class AbstractValidatorTest extends TestCase {
/** Object Under Test: A AbstractValidator. */
+ @Nullable
private AbstractValidator oUT;
/** {@inheritDoc} */
Modified: trunk/src/app/net/sf/gridarta/XmlHelper.java
===================================================================
--- trunk/src/app/net/sf/gridarta/XmlHelper.java 2008-06-27 18:58:07 UTC (rev 4224)
+++ trunk/src/app/net/sf/gridarta/XmlHelper.java 2008-07-04 20:54:00 UTC (rev 4225)
@@ -29,6 +29,7 @@
import net.sf.gridarta.io.IOUtils;
import net.sf.japi.swing.misc.JSAXErrorHandler;
import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
@@ -87,6 +88,7 @@
private static class GridartaEntityResolver implements EntityResolver {
/** {@inheritDoc} */
+ @Nullable
public InputSource resolveEntity(final String publicId, final String systemId) throws IOException {
if (systemId.endsWith(".xml")) {
return null;
Modified: trunk/src/app/net/sf/gridarta/data/NamedTreeNode.java
===================================================================
--- trunk/src/app/net/sf/gridarta/data/NamedTreeNode.java 2008-06-27 18:58:07 UTC (rev 4224)
+++ trunk/src/app/net/sf/gridarta/data/NamedTreeNode.java 2008-07-04 20:54:00 UTC (rev 4225)
@@ -30,6 +30,7 @@
import javax.swing.tree.TreePath;
import net.sf.japi.swing.ActionFactory;
import org.apache.log4j.Logger;
+import org.jetbrains.annotations.Nullable;
/**
* TreeNode implementation for Named Objects (like arches, faces, animations, artifacts etc.), used for displaying faces in a {@link javax.swing.JTree}.
@@ -55,6 +56,7 @@
* it is ordered.
* Basically it is redundant.
*/
+ @Nullable
private NamedTreeNode<E>[] childNodeArray;
/** The parent node, which may be <code>null</code> for the root node. */
@@ -64,6 +66,7 @@
private final String name;
/** Node object. */
+ @Nullable
private final E namedObject;
/** Directory state, <code>true</code> for directory nodes, <code>false</code> for face nodes. */
@@ -171,6 +174,7 @@
* Only returns an object for leaf nodes. For dir nodes, it returns <code>null</code>
* @return AbstractNamedObject of leaf node / <code>null</code> for dir nodes
*/
+ @Nullable
public E getNamedObject() {
return namedObject;
}
Modified: trunk/src/app/net/sf/gridarta/gameobject/Collector.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/Collector.java 2008-06-27 18:58:07 UTC (rev 4224)
+++ trunk/src/app/net/sf/gridarta/gameobject/Collector.java 2008-07-04 20:54:00 UTC (rev 4225)
@@ -26,6 +26,7 @@
import java.util.List;
import net.sf.japi.swing.ActionFactory;
import net.sf.japi.swing.misc.Progress;
+import org.jetbrains.annotations.Nullable;
/**
* A Collector is capable of iterating over a collection of {@link Collectable}s and collecting them in a separate Thread with a nice GUI.
@@ -48,6 +49,7 @@
/**
* The worker thread, or <code>null</code> if not running.
*/
+ @Nullable
private Thread thread = null;
/** Create a Collector.
Modified: trunk/src/app/net/sf/gridarta/gameobject/anim/AnimationParseException.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/anim/AnimationParseException.java 2008-06-27 18:58:07 UTC (rev 4224)
+++ trunk/src/app/net/sf/gridarta/gameobject/anim/AnimationParseException.java 2008-07-04 20:54:00 UTC (rev 4225)
@@ -20,6 +20,7 @@
package net.sf.gridarta.gameobject.anim;
import java.net.URI;
+import org.jetbrains.annotations.Nullable;
/**
* This exception is thrown when parsing an animation definition file (<code>arch/animations</code> and <code>arch/**.anim</code>) revealed that such
@@ -36,6 +37,7 @@
* The resource that caused the error.
* @serial include
*/
+ @Nullable
private final URI uri;
/**
Modified: trunk/src/app/net/sf/gridarta/gui/ErrorListView.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/ErrorListView.java 2008-06-27 18:58:07 UTC (rev 4224)
+++ trunk/src/app/net/sf/gridarta/gui/ErrorListView.java 2008-07-04 20:54:00 UTC (rev 4225)
@@ -73,6 +73,7 @@
private final JEditorPane errorMsg = new JEditorPane("text/html", "");
/** The currently displayed errors. */
+ @Nullable
private transient ValidationError<G, A, R>[] errors;
/**
Modified: trunk/src/app/net/sf/gridarta/gui/GUIUtils.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/GUIUtils.java 2008-06-27 18:58:07 UTC (rev 4224)
+++ trunk/src/app/net/sf/gridarta/gui/GUIUtils.java 2008-07-04 20:54:00 UTC (rev 4225)
@@ -68,7 +68,7 @@
// Look for the file, replacing '/' with File.separatorChar when necessary.
final File imageFile = new File(File.separatorChar != '/' ? dirUri.replace('/', File.separatorChar) : dirUri, strIconName);
- final ImageIcon icon;
+ @Nullable final ImageIcon icon;
if (imageFile.exists()) {
// image file exists in expected directory
icon = new ImageIcon(imageFile.getAbsolutePath());
Modified: trunk/src/app/net/sf/gridarta/gui/MainActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/MainActions.java 2008-06-27 18:58:07 UTC (rev 4224)
+++ trunk/src/app/net/sf/gridarta/gui/MainActions.java 2008-07-04 20:54:00 UTC (rev 4225)
@@ -152,6 +152,7 @@
* The {@link Collector} if an archetype collection is running, or else
* <code>null</code>.
*/
+ @Nullable
private Collector collector = null;
/**
Modified: trunk/src/app/net/sf/gridarta/gui/ObjectChoiceDisplay.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/ObjectChoiceDisplay.java 2008-06-27 18:58:07 UTC (rev 4224)
+++ trunk/src/app/net/sf/gridarta/gui/ObjectChoiceDisplay.java 2008-07-04 20:54:00 UTC (rev 4225)
@@ -119,7 +119,7 @@
archTileText.setText(null);
} else {
final G headObject = gameObject.getHead();
- String objName = headObject.getObjName();
+ @Nullable String objName = headObject.getObjName();
if (objName == null || objName.length() == 0) {
final R archetype = headObject.getArchetype();
if (archetype == headObject) {
Modified: trunk/src/app/net/sf/gridarta/gui/ReplaceDialog.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/ReplaceDialog.java 2008-06-27 18:58:07 UTC (rev 4224)
+++ trunk/src/app/net/sf/gridarta/gui/ReplaceDialog.java 2008-07-04 20:54:00 UTC (rev 4225)
@@ -48,6 +48,7 @@
import net.sf.gridarta.map.MapSquare;
import net.sf.japi.swing.ActionFactory;
import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* This dialog manages the replace action.
@@ -292,7 +293,7 @@
* @return number of arches that have been replaced
*/
private int doReplace(final int matchCriteria, final String matchString, final boolean entireMap, final boolean deleteOnly, final int replaceDensity) {
- final List<G> replaceList;
+ @Nullable final List<G> replaceList;
switch (lastSelectedIndex) {
case 0:
if (replaceArch == null) {
Modified: trunk/src/app/net/sf/gridarta/gui/ShiftProcessor.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/ShiftProcessor.java 2008-06-27 18:58:07 UTC (rev 4224)
+++ trunk/src/app/net/sf/gridarta/gui/ShiftProcessor.java 2008-07-04 20:54:00 UTC (rev 4225)
@@ -33,6 +33,7 @@
import net.sf.gridarta.map.MapArchObject;
import net.sf.gridarta.map.MapModel;
import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* Performs a "shift" operation in a map: shift all selected tiles into the
@@ -60,11 +61,13 @@
/**
* The map grid to operate on.
*/
+ @Nullable
private MapGrid mapGrid = null;
/**
* The selection rectangle to operate on.
*/
+ @Nullable
private Rectangle selRec = null;
/**
Modified: trunk/src/app/net/sf/gridarta/gui/SplashScreen.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/SplashScreen.java 2008-06-27 18:58:07 UTC (rev 4224)
+++ trunk/src/app/net/sf/gridarta/gui/SplashScreen.java 2008-07-04 20:54:00 UTC (rev 4225)
@@ -25,6 +25,7 @@
import javax.swing.JFrame;
import javax.swing.JLabel;
import javax.swing.SwingConstants;
+import org.jetbrains.annotations.Nullable;
/**
* Class for a splash screen that's displayed while loading.
@@ -35,6 +36,7 @@
public final class SplashScreen {
/** SplashScreen window. */
+ @Nullable
private JFrame splashScreen;
/** Show the splash screen. */
Modified: trunk/src/app/net/sf/gridarta/gui/connectionview/Connections.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/connectionview/Connections.java 2008-06-27 18:58:07 UTC (rev 4224)
+++ trunk/src/app/net/sf/gridarta/gui/connectionview/Connections.java 2008-07-04 20:54:00 UTC (rev 4225)
@@ -22,6 +22,7 @@
import java.util.regex.Pattern;
import net.sf.gridarta.gameobject.GameObject;
import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* Utility class to parse "connected" fields in {@link GameObject}s.
@@ -54,6 +55,7 @@
* @return The connected values, or <code>null</code> if the game object
* does not contain a "connected" field.
*/
+ @Nullable
public static int[] parseConnections(@NotNull final GameObject<?, ?, ?> gameObject) {
final String connectionSpec = gameObject.getAttributeString("connected", false);
if (!patternValues.matcher(connectionSpec).matches()) {
Modified: trunk/src/app/net/sf/gridarta/gui/findarchetypes/FindArchetypesDialog.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/findarchetypes/FindArchetypesDialog.java 2008-06-27 18:58:07 UTC (rev 4224)
+++ trunk/src/app/net/sf/gridarta/gui/findarchetypes/FindArchetypesDialog.java 2008-07-04 20:54:00 UTC (rev 4225)
@@ -53,6 +53,7 @@
import net.sf.gridarta.map.MapArchObject;
import net.sf.japi.swing.ActionFactory;
import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* Dialog used to find archetypes.
@@ -254,7 +255,7 @@
* short.
*/
private void doSearch(final boolean force) {
- final R selectedArchetype;
+ @Nullable final R selectedArchetype;
try {
resultTableModel.clear();
final String name = nameField.getText();
Modified: trunk/src/app/net/sf/gridarta/gui/findarchetypes/TableModel.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/findarchetypes/TableModel.java 2008-06-27 18:58:07 UTC (rev 4224)
+++ trunk/src/app/net/sf/gridarta/gui/findarchetypes/TableModel.java 2008-07-04 20:54:00 UTC (rev 4225)
@@ -76,6 +76,7 @@
/**
* Reflects the current sorting of the model's contents.
*/
+ @Nullable
private Integer[] sorting = null;
/**
Modified: trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/AbstractGameObjectAttributesDialog.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/AbstractGameObjectAttributesDialog.java 2008-06-27 18:58:07 UTC (rev 4224)
+++ trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/AbstractGameObjectAttributesDialog.java 2008-07-04 20:54:00 UTC (rev 4225)
@@ -279,7 +279,7 @@
final boolean isOptionalSpell = attr.getDataType() == ArchAttribType.INV_SPELL_OPTIONAL;
final Vector<String> content = new Vector<String>();
final int selectedIndex;
- final String title;
+ @Nullable final String title;
switch (gameObject.countInvObjects()) {
case 0:
selectedIndex = mainControl.getGameObjectSpells().size();
@@ -295,7 +295,7 @@
final G invObject = gameObject.iterator().next();
final String invObjectArchetypeName = invObject.getArchetype().getArchetypeName();
int index = 0;
- String tmpTitle = "<customized spell>";
+ @Nullable String tmpTitle = "<customized spell>";
for (final GameObjectSpell<G, A, R> spellObject : mainControl.getGameObjectSpells()) {
if (invObjectArchetypeName.equals(spellObject.getArchetypeName())) {
if (invObject.isDefaultGameObject()) {
@@ -587,9 +587,7 @@
}
break;
default:
- assert false;
- input = null;
- break;
+ throw new AssertionError();
}
newAttr = new DialogAttrib<JCheckBox>(attrib, input);
cRow = input;
@@ -612,9 +610,7 @@
format.setMaximumFractionDigits(10);
break;
default:
- assert false;
- format = null;
- break;
+ throw new AssertionError();
}
format.setGroupingUsed(false);
final NumberFormatter formatter = new NumberFormatter(format);
@@ -632,9 +628,7 @@
value = gameObject.getAttributeDouble(nameOld);
break;
default:
- value = null;
- assert false;
- break;
+ throw new AssertionError();
}
final JFormattedTextField input = new JFormattedTextField(factory, value);
input.setColumns(fieldLength);
@@ -676,9 +670,7 @@
cLabel = new JButton(new TreeChooseAction(attrib.getNameNew() + ": ", input, mainControl.getAnimationObjects()));
break;
default:
- assert false;
- cLabel = null;
- break;
+ throw new AssertionError();
}
break;
default:
@@ -717,7 +709,7 @@
cLabel = new JLabel(attrib.getNameNew() + ": ");
cLabel.setForeground(CommonConstants.INT_COLOR);
// create ComboBox with parsed selection
- final JComboBox input;
+ @Nullable final JComboBox input;
switch (dType) {
case SPELL:
case ZSPELL:
@@ -738,9 +730,7 @@
}
break;
default:
- assert false;
- input = null;
- break;
+ throw new AssertionError();
}
if (input != null) {
cComp = input;
@@ -814,9 +804,7 @@
}
break;
default:
- newAttr = null;
- assert false;
- break;
+ throw new AssertionError();
} // switch (dType)
assert newAttr != null;
Modified: trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/ConfirmErrorsAL.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/ConfirmErrorsAL.java 2008-06-27 18:58:07 UTC (rev 4224)
+++ trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/ConfirmErrorsAL.java 2008-07-04 20:54:00 UTC (rev 4225)
@@ -8,6 +8,7 @@
import javax.swing.JDialog;
import javax.swing.JTextArea;
import net.sf.gridarta.gameobject.GameObject;
+import org.jetbrains.annotations.Nullable;
/**
* ActionListener for the buttons in the ConfirmErrors popup dialog and
@@ -18,6 +19,7 @@
public final class ConfirmErrorsAL extends WindowAdapter implements ActionListener {
/** The popup dialog. */
+ @Nullable
private JDialog dialog;
/** The button to keep what's in the textfield. */
Modified: trunk/src/app/net/sf/gridarta/gui/map/AbstractMapTilePane.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/AbstractMapTilePane.java 2008-06-27 18:58:07 UTC (rev 4224)
+++ trunk/src/app/net/sf/gridarta/gui/map/AbstractMapTilePane.java 2008-07-04 20:54:00 UTC (rev 4225)
@@ -47,6 +47,7 @@
import net.sf.gridarta.map.MapControl;
import net.sf.japi.swing.ActionFactory;
import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.NotNull;
/**
* A Panel for managing the tiling of maps.
@@ -498,7 +499,7 @@
} else {
newfile = new File(mapControl.getMapFile().getParent(), path);
}
- TileMapHeader maphead;
+ @Nullable TileMapHeader maphead;
try {
maphead = loadMapFileHeader(newfile.getCanonicalFile());
@@ -516,7 +517,7 @@
}
@Nullable private TileMapHeader loadMapFileHeader(final File file) {
- TileMapHeader maphead;
+ @Nullable TileMapHeader maphead;
try {
final BufferedReader myInput = new BufferedReader(new InputStreamReader(new FileInputStream(file), IOUtils.MAP_ENCODING));
try {
@@ -556,17 +557,22 @@
// TODO: This class should get more responsibility. Several things from MapTilePane should be moved here.
private static final class TileMapHeader {
+ @NotNull
private final MapArchObject<?> mapArchObject;
+ @Nullable
private String linkPath;
+ @Nullable
private File mapfile;
+ @NotNull
private final StringBuilder maptail;
+ @Nullable
private MapControl<?, ?, ?, ?> map; // map loaded in editor
- TileMapHeader(final MapArchObject<?> mapArchObject) {
+ TileMapHeader(@NotNull final MapArchObject<?> mapArchObject) {
this.mapArchObject = mapArchObject;
linkPath = null;
mapfile = null;
Modified: trunk/src/app/net/sf/gridarta/gui/map/MapGrid.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/MapGrid.java 2008-06-27 18:58:07 UTC (rev 4224)
+++ trunk/src/app/net/sf/gridarta/gui/map/MapGrid.java 2008-07-04 20:54:00 UTC (rev 4225)
@@ -62,6 +62,7 @@
* The return value for {@link #getSelectedRec()}. Only valid if {@link
* #cachedSelectedRecValid} is set.
*/
+ @Nullable
private Rectangle cachedSelectedRec = null;
/** Selection - marks all selected tiles. */
Modified: trunk/src/app/net/sf/gridarta/gui/map/MapPreviewAccessory.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/MapPreviewAccessory.java 2008-06-27 18:58:07 UTC (rev 4224)
+++ trunk/src/app/net/sf/gridarta/gui/map/MapPreviewAccessory.java 2008-07-04 20:54:00 UTC (rev 4225)
@@ -199,7 +199,7 @@
/** {@inheritDoc} */
@Override public Icon getIcon(final File f) {
- final Icon icon;
+ @Nullable final Icon icon;
if (fileChooser.getCurrentDirectory().equals(f.getParentFile())) {
icon = getMapIcon(f);
} else {
Modified: trunk/src/app/net/sf/gridarta/gui/map/MapView.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/MapView.java 2008-06-27 18:58:07 UTC (rev 4224)
+++ trunk/src/app/net/sf/gridarta/gui/map/MapView.java 2008-07-04 20:54:00 UTC (rev 4225)
@@ -67,7 +67,7 @@
@NotNull private final V view;
/** The map file actions for this map. */
- @NotNull private final MapFileActions<G, A, R, V> mapFileActions;
+ @Nullable private final MapFileActions<G, A, R, V> mapFileActions;
/** The Action to select this Window. */
@NotNull protected final WindowAction<G, A, R, V> windowAction;
Modified: trunk/src/app/net/sf/gridarta/gui/newmap/NewPickmapFolderDialog.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/newmap/NewPickmapFolderDialog.java 2008-06-27 18:58:07 UTC (rev 4224)
+++ trunk/src/app/net/sf/gridarta/gui/newmap/NewPickmapFolderDialog.java 2008-07-04 20:54:00 UTC (rev 4225)
@@ -88,6 +88,7 @@
return panel;
}
+ @Nullable
@Override protected JPanel createMapParametersPanel() {
return null;
}
Modified: trunk/src/app/net/sf/gridarta/gui/pickmapchooser/FolderListActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/pickmapchooser/FolderListActions.java 2008-06-27 18:58:07 UTC (rev 4224)
+++ trunk/src/app/net/sf/gridarta/gui/pickmapchooser/FolderListActions.java 2008-07-04 20:54:00 UTC (rev 4225)
@@ -165,6 +165,7 @@
* @return the folder to delete, or <code>null</code> if the action should
* be disabled
*/
+ @Nullable
private Folder<G, A, R, V> getDeletePickmapFolderEnabled() {
final Folder<G, A, R, V> folder = activeFolder;
return folder != null && folder.getParent() != null ? folder : null;
Modified: trunk/src/app/net/sf/gridarta/gui/pickmapchooser/Loader.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/pickmapchooser/Loader.java 2008-06-27 18:58:07 UTC (rev 4224)
+++ trunk/src/app/net/sf/gridarta/gui/pickmapchooser/Loader.java 2008-07-04 20:54:00 UTC (rev 4225)
@@ -79,6 +79,7 @@
* @return the default <code>Folder</code>, or <code>null</code> if this
* directory is empty
*/
+ @Nullable
private Folder<G, A, R, V> load(@Nullable final Folder<G, A, R, V> parent, @NotNull final String folderName) {
final File dir = parent == null ? model.getBaseDir() : new File(parent.getDir(), folderName);
final File[] files = dir.listFiles();
Modified: trunk/src/app/net/sf/gridarta/gui/pickmapchooser/Model.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/pickmapchooser/Model.java 2008-06-27 18:58:07 UTC (rev 4224)
+++ trunk/src/app/net/sf/gridarta/gui/pickmapchooser/Model.java 2008-07-04 20:54:00 UTC (rev 4225)
@@ -53,6 +53,7 @@
/**
* The active folders.
*/
+ @Nullable
private Folder<G, A, R, V> activeFolder = null;
/**
Modified: trunk/src/app/net/sf/gridarta/gui/selectedsquare/CellRenderer.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/selectedsquare/CellRenderer.java 2008-06-27 18:58:07 UTC (rev 4224)
+++ trunk/src/app/net/sf/gridarta/gui/selectedsquare/CellRenderer.java 2008-07-04 20:54:00 UTC (rev 4225)
@@ -30,6 +30,7 @@
import net.sf.gridarta.gui.SystemIcons;
import net.sf.gridarta.map.MapArchObject;
import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* CellRenderer for rendering ArchObjects on a certain map tile in a list.
@@ -65,7 +66,7 @@
if (arch.getObjName() != null && arch.getObjName().length() > 0) {
setText(arch.getObjName()); // special name
} else {
- final String defname;
+ @Nullable final String defname;
if (arch.hasArchetype()) {
defname = arch.getArchetype().getObjName();
} else {
Modified: trunk/src/app/net/sf/gridarta/gui/selectedsquare/SelectedSquareView.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/selectedsquare/SelectedSquareView.java 2008-06-27 18:58:07 UTC (rev 4224)
+++ trunk/src/app/net/sf/gridarta/gui/selectedsquare/SelectedSquareView.java 2008-07-04 20:54:00 UTC (rev 4225)
@@ -331,9 +331,9 @@
* information in <code>selectedMapTile</code>.
*/
private void refresh() {
- final MapView<G, A, R, V> mapView;
- final MapSquare<G, A, R> mapSquare;
- final G gameObject;
+ @Nullable final MapView<G, A, R, V> mapView;
+ @Nullable final MapSquare<G, A, R> mapSquare;
+ @Nullable final G gameObject;
if (selectedMapTile == null) {
mapView = null;
mapSquare = null;
Modified: trunk/src/app/net/sf/gridarta/help/HtmlPane.java
===================================================================
--- trunk/src/app/net/sf/gridarta/help/HtmlPane.java 2008-06-27 18:58:07 UTC (rev 4224)
+++ trunk/src/app/net/sf/gridarta/help/HtmlPane.java 2008-07-04 20:54:00 UTC (rev 4225)
@@ -35,6 +35,7 @@
import javax.swing.event.HyperlinkListener;
import javax.swing.text.Document;
import net.sf.gridarta.CommonConstants;
+import org.jetbrains.annotations.Nullable;
/**
* Pane for displaying HTML.
@@ -174,6 +175,7 @@
private final class PageLoader implements Runnable {
/** URL to load. */
+ @Nullable
private URL url;
/** Original cursor that should be restored once the document is loaded. */
Modified: trunk/src/app/net/sf/gridarta/map/validation/checks/BlockedSpawnPointChecker.java
===================================================================
--- trunk/src/app/net/sf/gridarta/map/validation/checks/BlockedSpawnPointChecker.java 2008-06-27 18:58:07 UTC (rev 4224)
+++ trunk/src/app/net/sf/gridarta/map/validation/checks/BlockedSpawnPointChecker.java 2008-07-04 20:54:00 UTC (rev 4225)
@@ -30,6 +30,7 @@
import net.sf.gridarta.map.validation.AbstractValidator;
import net.sf.gridarta.map.validation.ErrorCollector;
import net.sf.gridarta.map.validation.MapValidator;
+import org.jetbrains.annotations.Nullable;
/**
* A SquareValidator to assert that mobs or spawn points aren't on blocked squares.
@@ -59,6 +60,7 @@
}
/** The currently processed map. */
+ @Nullable
private MapModel<G, A, R> mapModel = null;
/** The width of the currently processed map. */
@@ -67,6 +69,7 @@
/** The height of the currently processed map. */
private int height = 0;
+ @Nullable
private BlockedMatrix blocked = null;
/**
Modified: trunk/src/app/net/sf/gridarta/textedit/textarea/DefaultInputHandler.java
===================================================================
--- trunk/src/app/net/sf/gridarta/textedit/textarea/DefaultInputHandler.java 2008-06-27 18:58:07 UTC (rev 4224)
+++ trunk/src/app/net/sf/gridarta/textedit/textarea/DefaultInputHandler.java 2008-07-04 20:54:00 UTC (rev 4225)
@@ -315,8 +315,10 @@
*/
private static class Union {
+ @Nullable
private final Map<KeyStroke, Union> map;
+ @Nullable
private final ActionListener actionListener;
public Union(final Map<KeyStroke, Union> map) {
Modified: trunk/src/app/net/sf/gridarta/textedit/textarea/InputHandler.java
===================================================================
--- trunk/src/app/net/sf/gridarta/textedit/textarea/InputHandler.java 2008-06-27 18:58:07 UTC (rev 4224)
+++ trunk/src/app/net/sf/gridarta/textedit/textarea/InputHandler.java 2008-07-04 20:54:00 UTC (rev 4225)
@@ -213,6 +213,7 @@
actions.put("replace", REPLACE);
}
+ @Nullable
protected ActionListener grabAction;
protected boolean repeat;
Modified: trunk/src/app/net/sf/gridarta/textedit/textarea/JEditTextArea.java
===================================================================
--- trunk/src/app/net/sf/gridarta/textedit/textarea/JEditTextArea.java 2008-06-27 18:58:07 UTC (rev 4224)
+++ trunk/src/app/net/sf/gridarta/textedit/textarea/JEditTextArea.java 2008-07-04 20:54:00 UTC (rev 4225)
@@ -102,6 +102,7 @@
*/
private String unmodifiedText = "";
+ @Nullable
private static JEditTextArea focusedComponent;
private static final Timer caretTimer = new Timer(500, new CaretBlinker());
Modified: trunk/src/app/net/sf/gridarta/textedit/textarea/ScrollLayout.java
===================================================================
--- trunk/src/app/net/sf/gridarta/textedit/textarea/ScrollLayout.java 2008-06-27 18:58:07 UTC (rev 4224)
+++ trunk/src/app/net/sf/gridarta/textedit/textarea/ScrollLayout.java 2008-07-04 20:54:00 UTC (rev 4225)
@@ -27,6 +27,7 @@
import java.util.ArrayList;
import java.util.List;
import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
public class ScrollLayout implements LayoutManager {
@@ -139,10 +140,13 @@
}
// private members
+ @Nullable
private Component center;
+ @Nullable
private Component right;
+ @Nullable
private Component bottom;
private final List<Component> leftOfScrollBar = new ArrayList<Component>();
Modified: trunk/src/app/net/sf/gridarta/textedit/textarea/SyntaxStyle.java
===================================================================
--- trunk/src/app/net/sf/gridarta/textedit/textarea/SyntaxStyle.java 2008-06-27 18:58:07 UTC (rev 4224)
+++ trunk/src/app/net/sf/gridarta/textedit/textarea/SyntaxStyle.java 2008-07-04 20:54:00 UTC (rev 4225)
@@ -13,6 +13,7 @@
import java.awt.Font;
import java.awt.FontMetrics;
import java.awt.Graphics;
+import org.jetbrains.annotations.Nullable;
/**
* A simple text style class. It can specify the color, italic flag,
@@ -53,6 +54,7 @@
* The font metrics for {@link #lastStyledFont}. May be <code>null</code>
* if not yet known.
*/
+ @Nullable
private FontMetrics fontMetrics = null;
/**
Modified: trunk/src/app/net/sf/gridarta/textedit/textarea/TextAreaPainter.java
===================================================================
--- trunk/src/app/net/sf/gridarta/textedit/textarea/TextAreaPainter.java 2008-06-27 18:58:07 UTC (rev 4224)
+++ trunk/src/app/net/sf/gridarta/textedit/textarea/TextAreaPainter.java 2008-07-04 20:54:00 UTC (rev 4225)
@@ -129,6 +129,7 @@
/**
* The tokens of the currently painted line.
*/
+ @Nullable
private List<Token> currentLineTokens = null;
/**
@@ -730,7 +731,7 @@
* Returns the tokens of the currently painted line.
* @return the tokens
*/
- public List<Token> getCurrentLineTokens() {
+ @Nullable public List<Token> getCurrentLineTokens() {
return currentLineTokens;
}
@@ -738,7 +739,7 @@
* Sets the tokens of the currently painted line.
* @param tokens the tokens
*/
- public void setCurrentLineTokens(final List<Token> tokens) {
+ public void setCurrentLineTokens(@Nullable final List<Token> tokens) {
currentLineTokens = tokens == null ? null : new LinkedList<Token>(tokens);
}
Modified: trunk/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/DaimoninAITokenMarker.java
===================================================================
--- trunk/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/DaimoninAITokenMarker.java 2008-06-27 18:58:07 UTC (rev 4224)
+++ trunk/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/DaimoninAITokenMarker.java 2008-07-04 20:54:00 UTC (rev 4225)
@@ -27,6 +27,8 @@
import java.util.regex.Pattern;
import javax.swing.text.Segment;
import net.sf.gridarta.textedit.textarea.Token;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.NotNull;
/**
* A {@link TokenMarker} for the message field of Daimonin AI objects.
@@ -234,7 +236,7 @@
}
/** {@inheritDoc} */
- @Override public final byte markTokensImpl(final byte token, final Segment line, final int lineIndex) {
+ @Override public final byte markTokensImpl(final byte token, @NotNull final Segment line, final int lineIndex) {
final char[] array = line.array;
int offset = line.offset;
final int end = line.count + offset;
@@ -317,7 +319,8 @@
* @return the command specification, or <code>null</code> if the command
* name is undefined.
*/
- private Spec getSpec(final String command) {
+ @Nullable
+ private Spec getSpec(@NotNull final String command) {
final Spec fixedSpec = fixedSpecs.get(command);
if (fixedSpec != null) {
return fixedSpec;
Modified: trunk/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/KeywordMap.java
===================================================================
--- trunk/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/KeywordMap.java 2008-06-27 18:58:07 UTC (rev 4224)
+++ trunk/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/KeywordMap.java 2008-07-04 20:54:00 UTC (rev 4225)
@@ -21,6 +21,7 @@
import javax.swing.text.Segment;
import net.sf.gridarta.textedit.textarea.Token;
+import org.jetbrains.annotations.Nullable;
/**
* Maps (parts of) {@link Segment}s to <code>byte</code> values. It allows
@@ -146,6 +147,7 @@
* @return The next node, or <code>null</code> if no key matching
* exists.
*/
+ @Nullable
public Node lookup(final char ch) {
return MIN <= ch && ch <= MAX ? nodes[ch - MIN] : null;
}
Modified: trunk/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/TokenMarker.java
===================================================================
--- trunk/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/TokenMarker.java 2008-06-27 18:58:07 UTC (rev 4224)
+++ trunk/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/TokenMarker.java 2008-07-04 20:54:00 UTC (rev 4225)
@@ -13,6 +13,7 @@
import java.util.List;
import javax.swing.text.Segment;
import net.sf.gridarta.textedit.textarea.Token;
+import org.jetbrains.annotations.Nullable;
/**
* A token marker that splits lines of text into tokens. Each token carries a
@@ -68,7 +69,7 @@
tokens.clear();
final LineInfo info = lineInfo[lineIndex];
- final LineInfo prev;
+ @Nullable final LineInfo prev;
if (lineIndex == 0) {
prev = null;
} else {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-07-04 21:08:45
|
Revision: 4226
http://gridarta.svn.sourceforge.net/gridarta/?rev=4226&view=rev
Author: akirschbaum
Date: 2008-07-04 14:08:45 -0700 (Fri, 04 Jul 2008)
Log Message:
-----------
Replace System.err with Logger.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/CFJavaEditor.java
trunk/daimonin/src/daieditor/CMainControl.java
trunk/daimonin/src/daieditor/ProcessRunner.java
trunk/daimonin/src/daieditor/gameobject/ArchetypeParser.java
trunk/src/app/net/sf/gridarta/gameobject/face/AbstractFaceProvider.java
trunk/src/app/net/sf/gridarta/gui/MainView.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/BitmaskAttrib.java
trunk/src/app/net/sf/gridarta/textedit/scripteditor/CFPythonPopup.java
trunk/src/app/net/sf/gridarta/textedit/scripteditor/ScriptEditControl.java
trunk/src/app/net/sf/gridarta/textedit/textarea/JEditTextArea.java
trunk/src/app/net/sf/gridarta/textedit/textarea/actions/Paste.java
Modified: trunk/crossfire/src/cfeditor/CFJavaEditor.java
===================================================================
--- trunk/crossfire/src/cfeditor/CFJavaEditor.java 2008-07-04 20:54:00 UTC (rev 4225)
+++ trunk/crossfire/src/cfeditor/CFJavaEditor.java 2008-07-04 21:08:45 UTC (rev 4226)
@@ -45,6 +45,7 @@
* @author <a href="mailto:mic...@no...">Michael Toennies</a>
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
+@SuppressWarnings({"UseOfSystemOutOrSystemErr"})
public final class CFJavaEditor {
static {
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2008-07-04 20:54:00 UTC (rev 4225)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2008-07-04 21:08:45 UTC (rev 4226)
@@ -379,8 +379,10 @@
final File[] libFiles = libs.listFiles(Factory.not(new GlobFileFilter(patterns)));
if (libFiles != null) {
Arrays.sort(libFiles);
- for (final File libFile : libFiles) {
- System.out.println(libFile);
+ if (log.isInfoEnabled()) {
+ for (final File libFile : libFiles) {
+ log.info(libFile);
+ }
}
}
if (libFiles != null && libFiles.length > 0 && ACTION_FACTORY.showOnetimeConfirmDialog(mainView, JOptionPane.YES_NO_OPTION, JOptionPane.INFORMATION_MESSAGE, "oldLibsFound", libs.toString()) == JOptionPane.YES_OPTION) {
Modified: trunk/daimonin/src/daieditor/ProcessRunner.java
===================================================================
--- trunk/daimonin/src/daieditor/ProcessRunner.java 2008-07-04 20:54:00 UTC (rev 4225)
+++ trunk/daimonin/src/daieditor/ProcessRunner.java 2008-07-04 21:08:45 UTC (rev 4226)
@@ -38,6 +38,7 @@
import javax.swing.SwingUtilities;
import net.sf.japi.swing.ActionFactory;
import org.jetbrains.annotations.Nullable;
+import org.apache.log4j.Logger;
/**
* Class to run an external process.
@@ -45,6 +46,9 @@
*/
public final class ProcessRunner extends JPanel {
+ /** The Logger for printing log messages. */
+ private static final Logger log = Logger.getLogger(ProcessRunner.class);
+
/** Serial Version. */
private static final long serialVersionUID = 1L;
@@ -228,7 +232,7 @@
} catch (final Exception e) { /* ignore */ }
process.exitValue();
} catch (final IllegalThreadStateException e) {
- System.err.println("Still running!");
+ log.error("Still running!");
// Process is still running, don't start a new one
return;
}
@@ -318,13 +322,17 @@
*/
private void start(final InputStream stream) {
if (in != null) {
- System.err.println("Trying to stop previous stream.");
+ if (log.isInfoEnabled()) {
+ log.info("Trying to stop previous stream.");
+ }
try {
in.close();
} catch (final Exception e) {
/* ignore */
}
- System.err.println("Stopped previous stream.");
+ if (log.isInfoEnabled()) {
+ log.info("Stopped previous stream.");
+ }
}
//in = new BufferedInputStream(stream);
in = stream;
Modified: trunk/daimonin/src/daieditor/gameobject/ArchetypeParser.java
===================================================================
--- trunk/daimonin/src/daieditor/gameobject/ArchetypeParser.java 2008-07-04 20:54:00 UTC (rev 4225)
+++ trunk/daimonin/src/daieditor/gameobject/ArchetypeParser.java 2008-07-04 21:08:45 UTC (rev 4226)
@@ -320,10 +320,10 @@
multiShapeID = Integer.parseInt(thisLine.substring(9).trim());
if (multiShapeID <= 0 || multiShapeID >= MultiPositionData.Y_DIM) {
- System.err.println("WARNING: Arch " + archetype.getArchetypeName() + " mpart_id number is '" + thisLine.substring(9) + '\'');
+ log.warn("Arch " + archetype.getArchetypeName() + " mpart_id number is '" + thisLine.substring(9) + '\'');
}
} catch (final NumberFormatException e) {
- System.err.println("WARNING: Arch " + archetype.getArchetypeName() + " has a invalid mpart_id (" + thisLine.substring(9) + ')');
+ log.warn("Arch " + archetype.getArchetypeName() + " has a invalid mpart_id (" + thisLine.substring(9) + ')');
archetype.addObjectText(thisLine);
}
} else if (thisLine.startsWith("mpart_nr ")) {
@@ -332,7 +332,7 @@
final int i = Integer.parseInt(thisLine.substring(9).trim());
archetype.setMultiPartNr(i);
} catch (final NumberFormatException e) {
- System.err.println("WARNING: Arch " + archetype.getArchetypeName() + " has a invalid mpart_nr (" + thisLine.substring(9) + ')');
+ log.warn("Arch " + archetype.getArchetypeName() + " has a invalid mpart_nr (" + thisLine.substring(9) + ')');
archetype.addObjectText(thisLine);
}
} else {
Modified: trunk/src/app/net/sf/gridarta/gameobject/face/AbstractFaceProvider.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/face/AbstractFaceProvider.java 2008-07-04 20:54:00 UTC (rev 4225)
+++ trunk/src/app/net/sf/gridarta/gameobject/face/AbstractFaceProvider.java 2008-07-04 21:08:45 UTC (rev 4226)
@@ -25,6 +25,7 @@
import javax.swing.ImageIcon;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
+import org.apache.log4j.Logger;
/**
* Abstract Base class for FaceProviders which implements a memory sensitive cache.
@@ -32,6 +33,9 @@
*/
public abstract class AbstractFaceProvider implements FaceProvider {
+ /** The Logger for printing log messages. */
+ private static final Logger log = Logger.getLogger(AbstractFaceProvider.class);
+
/**
* The HashMap to provide the icons from.
* Note: Weak hashing does not differ because the keys are definitely referenced elsewhere.
@@ -56,7 +60,9 @@
/** {@inheritDoc} */
public void reload() {
- System.err.println("Clearing image cache.");
+ if (log.isInfoEnabled()) {
+ log.info("Clearing image cache.");
+ }
cache.clear();
}
Modified: trunk/src/app/net/sf/gridarta/gui/MainView.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/MainView.java 2008-07-04 20:54:00 UTC (rev 4225)
+++ trunk/src/app/net/sf/gridarta/gui/MainView.java 2008-07-04 21:08:45 UTC (rev 4226)
@@ -348,7 +348,7 @@
try {
mapView.setMaximum(true);
} catch (final PropertyVetoException e) {
- System.err.println(e);
+ log.error("PropertyVetoException: " + e);
}
refreshMenus();
}
Modified: trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/BitmaskAttrib.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/BitmaskAttrib.java 2008-07-04 20:54:00 UTC (rev 4225)
+++ trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/BitmaskAttrib.java 2008-07-04 21:08:45 UTC (rev 4226)
@@ -4,6 +4,7 @@
import net.sf.gridarta.CAttribBitmask;
import net.sf.gridarta.CFArchAttrib;
import org.jetbrains.annotations.NotNull;
+import org.apache.log4j.Logger;
/**
* DialogAttrib for types with bitmasks to choose from.
@@ -11,6 +12,9 @@
*/
public final class BitmaskAttrib extends DialogAttrib<JTextComponent> {
+ /** The Logger for printing log messages. */
+ private static final Logger log = Logger.getLogger(BitmaskAttrib.class);
+
/** Active bitmask value. */
private int value;
@@ -51,7 +55,7 @@
if (bitmask != null) {
getInput().setText(bitmask.getText(value));
} else {
- System.err.println("null bitmask");
+ log.warn("null bitmask");
}
}
Modified: trunk/src/app/net/sf/gridarta/textedit/scripteditor/CFPythonPopup.java
===================================================================
--- trunk/src/app/net/sf/gridarta/textedit/scripteditor/CFPythonPopup.java 2008-07-04 20:54:00 UTC (rev 4225)
+++ trunk/src/app/net/sf/gridarta/textedit/scripteditor/CFPythonPopup.java 2008-07-04 21:08:45 UTC (rev 4226)
@@ -40,6 +40,7 @@
import net.sf.gridarta.CommonConstants;
import net.sf.gridarta.io.IOUtils;
import net.sf.gridarta.textedit.textarea.JEditTextArea;
+import org.apache.log4j.Logger;
/**
* This class implements a popup window which shows all python
@@ -55,6 +56,9 @@
*/
public final class CFPythonPopup extends JComboBox {
+ /** The Logger for printing log messages. */
+ private static final Logger log = Logger.getLogger(CFPythonPopup.class);
+
/**
* Serial Version UID.
*/
@@ -116,8 +120,8 @@
if (k > 0) {
line = line.substring(0, k) + "()";
} else {
- System.err.println("Parse error in " + CommonConstants.PYTHONMENU_FILE + ":");
- System.err.println(" \"" + line + "\" missing '()'");
+ log.error("Parse error in " + CommonConstants.PYTHONMENU_FILE + ":");
+ log.error(" \"" + line + "\" missing '()'");
line += "()"; // that line is probably garbage, but will work
}
cmdList.add(line);
@@ -133,11 +137,11 @@
reader.close();
}
} catch (final FileNotFoundException e) {
- System.err.println("File '" + CommonConstants.PYTHONMENU_FILE + "' not found.");
+ log.error("File '" + CommonConstants.PYTHONMENU_FILE + "' not found.");
} catch (final EOFException e) {
// expected exception, do not handle: end of file/spell struct reached
} catch (final IOException e) {
- System.err.println("Cannot read file '" + CommonConstants.PYTHONMENU_FILE + "'!");
+ log.error("Cannot read file '" + CommonConstants.PYTHONMENU_FILE + "'!");
}
}
@@ -193,7 +197,7 @@
// insert method into the document
activeTextArea.getDocument().insertString(caretPos, method, null);
} catch (final BadLocationException ex) {
- System.err.println("BadLocationException");
+ log.error("BadLocationException");
}
}
Modified: trunk/src/app/net/sf/gridarta/textedit/scripteditor/ScriptEditControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/textedit/scripteditor/ScriptEditControl.java 2008-07-04 20:54:00 UTC (rev 4225)
+++ trunk/src/app/net/sf/gridarta/textedit/scripteditor/ScriptEditControl.java 2008-07-04 21:08:45 UTC (rev 4226)
@@ -275,7 +275,7 @@
activeTextArea.resetModified();
}
} else {
- System.err.println("ScriptEditControl.saveActiveTab(): Cannot save file without name!");
+ log.error("ScriptEditControl.saveActiveTab(): Cannot save file without name!");
// Path is missing? This shouldn't happen, but let's do a saveAs instead...
saveAsActiveTab();
}
Modified: trunk/src/app/net/sf/gridarta/textedit/textarea/JEditTextArea.java
===================================================================
--- trunk/src/app/net/sf/gridarta/textedit/textarea/JEditTextArea.java 2008-07-04 20:54:00 UTC (rev 4225)
+++ trunk/src/app/net/sf/gridarta/textedit/textarea/JEditTextArea.java 2008-07-04 21:08:45 UTC (rev 4226)
@@ -501,7 +501,7 @@
focusedComponent = this;
setCaretPosition(0); // set caret to 0, 0 coords
} catch (final NullPointerException e) {
- System.err.println("Nullpointer Excepion in JEditTextArea.setEditingFocus()");
+ log.error("Nullpointer Excepion in JEditTextArea.setEditingFocus()");
}
}
Modified: trunk/src/app/net/sf/gridarta/textedit/textarea/actions/Paste.java
===================================================================
--- trunk/src/app/net/sf/gridarta/textedit/textarea/actions/Paste.java 2008-07-04 20:54:00 UTC (rev 4225)
+++ trunk/src/app/net/sf/gridarta/textedit/textarea/actions/Paste.java 2008-07-04 21:08:45 UTC (rev 4226)
@@ -20,6 +20,7 @@
import javax.swing.text.BadLocationException;
import net.sf.gridarta.textedit.textarea.InputHandler;
import net.sf.gridarta.textedit.textarea.JEditTextArea;
+import org.apache.log4j.Logger;
/**
* Actionlistener for PASTE actions.
@@ -27,6 +28,9 @@
*/
public final class Paste implements ActionListener {
+ /** The Logger for printing log messages. */
+ private static final Logger log = Logger.getLogger(Paste.class);
+
/**
* {@inheritDoc}
* Get content of the system clipboard and insert it at caret position.
@@ -67,13 +71,13 @@
textarea.getDocument().insertString(textarea.getCaretPosition(), buff.toString(), null);
}
} catch (final ClassNotFoundException ex) {
- System.err.println("syntax.InputHandler: Paste action failed due to ClassNotFoundException");
+ log.error("syntax.InputHandler: Paste action failed due to ClassNotFoundException");
} catch (final UnsupportedFlavorException ex) {
- System.err.println("syntax.InputHandler: Paste action failed because clipboard data flavour is not supported.");
+ log.error("syntax.InputHandler: Paste action failed because clipboard data flavour is not supported.");
} catch (final IOException ex) {
- System.err.println("syntax.InputHandler: Paste action failed due to IOException");
+ log.error("syntax.InputHandler: Paste action failed due to IOException");
} catch (final BadLocationException ex) {
- System.err.println("syntax.InputHandler: Paste action failed due to BadLocationException");
+ log.error("syntax.InputHandler: Paste action failed due to BadLocationException");
} catch (final NullPointerException ex) {
// this happens when clipboard is empty, it's not an error
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-07-04 21:10:02
|
Revision: 4227
http://gridarta.svn.sourceforge.net/gridarta/?rev=4227&view=rev
Author: akirschbaum
Date: 2008-07-04 14:10:00 -0700 (Fri, 04 Jul 2008)
Log Message:
-----------
Simplify code.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/gameobject/ArchetypeParser.java
trunk/daimonin/src/daieditor/gameobject/ArchetypeParser.java
trunk/src/app/net/sf/gridarta/textedit/textarea/DefaultInputHandler.java
Modified: trunk/crossfire/src/cfeditor/gameobject/ArchetypeParser.java
===================================================================
--- trunk/crossfire/src/cfeditor/gameobject/ArchetypeParser.java 2008-07-04 21:08:45 UTC (rev 4226)
+++ trunk/crossfire/src/cfeditor/gameobject/ArchetypeParser.java 2008-07-04 21:10:00 UTC (rev 4227)
@@ -169,7 +169,7 @@
if (thisLine.equals("mina")) {
try {
archetype.setAnimText(animText.toString());
- animationObjects.addAnimPath(archetype.getArchetypeName(), path.concat(archetype.getArchetypeName()));
+ animationObjects.addAnimPath(archetype.getArchetypeName(), path + archetype.getArchetypeName());
animationObjects.addAnimationObject(archetype.getArchetypeName(), animText.toString());
animText = null;
} catch (final DuplicateAnimationException e) {
Modified: trunk/daimonin/src/daieditor/gameobject/ArchetypeParser.java
===================================================================
--- trunk/daimonin/src/daieditor/gameobject/ArchetypeParser.java 2008-07-04 21:08:45 UTC (rev 4226)
+++ trunk/daimonin/src/daieditor/gameobject/ArchetypeParser.java 2008-07-04 21:10:00 UTC (rev 4227)
@@ -171,7 +171,7 @@
} else if (animflag) {
if (thisLine.equals("mina")) {
try {
- animationObjects.addAnimPath(archetype.getArchetypeName(), path.concat(archetype.getArchetypeName()));
+ animationObjects.addAnimPath(archetype.getArchetypeName(), path + archetype.getArchetypeName());
animationObjects.addAnimationObject(archetype.getArchetypeName(), animText.toString());
animText = null;
} catch (final DuplicateAnimationException e) {
Modified: trunk/src/app/net/sf/gridarta/textedit/textarea/DefaultInputHandler.java
===================================================================
--- trunk/src/app/net/sf/gridarta/textedit/textarea/DefaultInputHandler.java 2008-07-04 21:08:45 UTC (rev 4226)
+++ trunk/src/app/net/sf/gridarta/textedit/textarea/DefaultInputHandler.java 2008-07-04 21:10:00 UTC (rev 4227)
@@ -294,7 +294,7 @@
final int ch;
try {
- ch = KeyEvent.class.getField("VK_".concat(key)).getInt(null);
+ ch = KeyEvent.class.getField("VK_" + key).getInt(null);
} catch (final Exception e) {
log.error("Invalid key stroke: " + keyStroke);
return null;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-07-04 21:11:52
|
Revision: 4228
http://gridarta.svn.sourceforge.net/gridarta/?rev=4228&view=rev
Author: akirschbaum
Date: 2008-07-04 14:11:42 -0700 (Fri, 04 Jul 2008)
Log Message:
-----------
Rewrite expression.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/GlobalSettingsImpl.java
trunk/daimonin/src/daieditor/GlobalSettingsImpl.java
Modified: trunk/crossfire/src/cfeditor/GlobalSettingsImpl.java
===================================================================
--- trunk/crossfire/src/cfeditor/GlobalSettingsImpl.java 2008-07-04 21:10:00 UTC (rev 4227)
+++ trunk/crossfire/src/cfeditor/GlobalSettingsImpl.java 2008-07-04 21:11:42 UTC (rev 4228)
@@ -70,7 +70,7 @@
setLoadFromArchive(prefs.getBoolean(LOAD_ARCH_COLL, true));
// docu version
- if (IGUIConstants.DOCU_VERSION > prefs.getInt(DOCU_VERSION_KEY, 0)) {
+ if (prefs.getInt(DOCU_VERSION_KEY, 0) < IGUIConstants.DOCU_VERSION) {
// remember to open docu
autoPopupDocu = true;
// update docu version right now, because we want the help popup only one time
Modified: trunk/daimonin/src/daieditor/GlobalSettingsImpl.java
===================================================================
--- trunk/daimonin/src/daieditor/GlobalSettingsImpl.java 2008-07-04 21:10:00 UTC (rev 4227)
+++ trunk/daimonin/src/daieditor/GlobalSettingsImpl.java 2008-07-04 21:11:42 UTC (rev 4228)
@@ -62,7 +62,7 @@
setLoadFromArchive(prefs.getBoolean(LOAD_ARCH_COLL, true));
// docu version
- if (IGUIConstants.DOCU_VERSION > prefs.getInt(DOCU_VERSION_KEY, 0)) {
+ if (prefs.getInt(DOCU_VERSION_KEY, 0) < IGUIConstants.DOCU_VERSION) {
// remember to open docu
autoPopupDocu = true;
// update docu version right now, because we want the help popup only one time
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-07-04 21:13:07
|
Revision: 4229
http://gridarta.svn.sourceforge.net/gridarta/?rev=4229&view=rev
Author: akirschbaum
Date: 2008-07-04 14:12:57 -0700 (Fri, 04 Jul 2008)
Log Message:
-----------
Remove unneeded static qualifiers.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/gameobject/GameObject.java
trunk/daimonin/src/daieditor/gameobject/GameObject.java
trunk/src/app/net/sf/gridarta/gui/gameobjecttexteditor/GameObjectTextEditor.java
trunk/src/app/net/sf/gridarta/gui/map/MapViewBasic.java
trunk/src/app/net/sf/gridarta/textedit/scripteditor/ScriptEditView.java
Modified: trunk/crossfire/src/cfeditor/gameobject/GameObject.java
===================================================================
--- trunk/crossfire/src/cfeditor/gameobject/GameObject.java 2008-07-04 21:11:42 UTC (rev 4228)
+++ trunk/crossfire/src/cfeditor/gameobject/GameObject.java 2008-07-04 21:12:57 UTC (rev 4229)
@@ -185,7 +185,7 @@
/** {@inheritDoc} */
@Override public boolean isScripted() {
for (final GameObject tmp : this) {
- if (tmp.archType == Archetype.TYPE_EVENT_CONNECTOR) {
+ if (tmp.archType == TYPE_EVENT_CONNECTOR) {
return true;
}
}
Modified: trunk/daimonin/src/daieditor/gameobject/GameObject.java
===================================================================
--- trunk/daimonin/src/daieditor/gameobject/GameObject.java 2008-07-04 21:11:42 UTC (rev 4228)
+++ trunk/daimonin/src/daieditor/gameobject/GameObject.java 2008-07-04 21:12:57 UTC (rev 4229)
@@ -123,8 +123,8 @@
@Override public void addLast(@NotNull final GameObject gameObject) {
super.addLast(gameObject);
// force type change when a MONSTER is put in a spawn point
- if (typeList.getTypeOfArch(this) != null && typeList.getTypeOfArch(this).getTypeNr() == Archetype.TYPE_SPAWN_POINT && typeList.getTypeOfArch(gameObject).getTypeNr() == Archetype.TYPE_MOB) {
- gameObject.archType = Archetype.TYPE_SPAWN_POINT_MOB; // change to SPAWN_POINT_MOB
+ if (typeList.getTypeOfArch(this) != null && typeList.getTypeOfArch(this).getTypeNr() == TYPE_SPAWN_POINT && typeList.getTypeOfArch(gameObject).getTypeNr() == TYPE_MOB) {
+ gameObject.archType = TYPE_SPAWN_POINT_MOB; // change to SPAWN_POINT_MOB
}
}
@@ -132,8 +132,8 @@
@Override public void addFirst(@NotNull final GameObject gameObject) {
super.addFirst(gameObject);
// force type change when a MONSTER is put in a spawn point
- if (typeList.getTypeOfArch(this).getTypeNr() == Archetype.TYPE_SPAWN_POINT && typeList.getTypeOfArch(gameObject).getTypeNr() == Archetype.TYPE_MOB) {
- gameObject.archType = Archetype.TYPE_SPAWN_POINT_MOB; // change to SPAWN_POINT_MOB
+ if (typeList.getTypeOfArch(this).getTypeNr() == TYPE_SPAWN_POINT && typeList.getTypeOfArch(gameObject).getTypeNr() == TYPE_MOB) {
+ gameObject.archType = TYPE_SPAWN_POINT_MOB; // change to SPAWN_POINT_MOB
}
}
@@ -353,7 +353,7 @@
/** {@inheritDoc} */
@Override public boolean isScripted() {
for (final GameObject tmp : this) {
- if (tmp.archType == Archetype.TYPE_EVENT_OBJECT) {
+ if (tmp.archType == TYPE_EVENT_OBJECT) {
return true;
}
}
Modified: trunk/src/app/net/sf/gridarta/gui/gameobjecttexteditor/GameObjectTextEditor.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjecttexteditor/GameObjectTextEditor.java 2008-07-04 21:11:42 UTC (rev 4228)
+++ trunk/src/app/net/sf/gridarta/gui/gameobjecttexteditor/GameObjectTextEditor.java 2008-07-04 21:12:57 UTC (rev 4229)
@@ -53,8 +53,8 @@
setViewportView(archEdit);
setBackground(archEdit.getBackground());
getViewport().add(archEdit);
- setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED);
- setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS);
+ setHorizontalScrollBarPolicy(HORIZONTAL_SCROLLBAR_AS_NEEDED);
+ setVerticalScrollBarPolicy(VERTICAL_SCROLLBAR_ALWAYS);
getViewport().setScrollMode(JViewport.SIMPLE_SCROLL_MODE);
}
Modified: trunk/src/app/net/sf/gridarta/gui/map/MapViewBasic.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/MapViewBasic.java 2008-07-04 21:11:42 UTC (rev 4228)
+++ trunk/src/app/net/sf/gridarta/gui/map/MapViewBasic.java 2008-07-04 21:12:57 UTC (rev 4229)
@@ -59,7 +59,7 @@
* @param mapControl MapControl to use.
*/
protected MapViewBasic(@NotNull final MapControl<G, A, R, ?> mapControl) {
- super(ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED);
+ super(VERTICAL_SCROLLBAR_AS_NEEDED, HORIZONTAL_SCROLLBAR_AS_NEEDED);
mapModel = mapControl.getMapModel();
mapGrid = new MapGrid(mapModel.getMapSize());
mapCursor = new MapCursor(mapGrid);
Modified: trunk/src/app/net/sf/gridarta/textedit/scripteditor/ScriptEditView.java
===================================================================
--- trunk/src/app/net/sf/gridarta/textedit/scripteditor/ScriptEditView.java 2008-07-04 21:11:42 UTC (rev 4228)
+++ trunk/src/app/net/sf/gridarta/textedit/scripteditor/ScriptEditView.java 2008-07-04 21:12:57 UTC (rev 4229)
@@ -98,7 +98,7 @@
*/
public ScriptEditView(final ScriptEditControl control, @NotNull final Frame owner) {
super(owner, "Script Pad");
- setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
+ setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
textAreas = new ArrayList<JEditTextArea>();
actions = new Actions(control);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-07-04 21:19:22
|
Revision: 4231
http://gridarta.svn.sourceforge.net/gridarta/?rev=4231&view=rev
Author: akirschbaum
Date: 2008-07-04 14:19:08 -0700 (Fri, 04 Jul 2008)
Log Message:
-----------
Remove redundant fully qualified class names.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptedEvent.java
trunk/daimonin/src/daieditor/DaimoninObjectsFactory.java
trunk/daimonin/src/daieditor/gameobject/scripts/ScriptedEvent.java
trunk/src/app/net/sf/gridarta/gameobject/anim/AnimationObjects.java
trunk/src/app/net/sf/gridarta/gameobject/face/FaceObjects.java
trunk/src/app/net/sf/gridarta/gui/map/LevelRenderer.java
Modified: trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptedEvent.java
===================================================================
--- trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptedEvent.java 2008-07-04 21:14:43 UTC (rev 4230)
+++ trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptedEvent.java 2008-07-04 21:19:08 UTC (rev 4231)
@@ -166,7 +166,7 @@
*
* @return the new event game object
*
- * @throws net.sf.gridarta.gameobject.scripts.UndefinedEventArchetypeException if the event game object cannot
+ * @throws UndefinedEventArchetypeException if the event game object cannot
* be created
*/
private static GameObject newEventGameObject(final int eventType) throws UndefinedEventArchetypeException {
Modified: trunk/daimonin/src/daieditor/DaimoninObjectsFactory.java
===================================================================
--- trunk/daimonin/src/daieditor/DaimoninObjectsFactory.java 2008-07-04 21:14:43 UTC (rev 4230)
+++ trunk/daimonin/src/daieditor/DaimoninObjectsFactory.java 2008-07-04 21:19:08 UTC (rev 4231)
@@ -70,7 +70,7 @@
/** The {@link ObjectChooser} instance to use. */
private ObjectChooser<GameObject, MapArchObject, Archetype, CMapViewBasic> objectChooser = null;
- /** The {@link net.sf.gridarta.gui.archetypechooser.ArchetypeChooserControl} instance to use. */
+ /** The {@link ArchetypeChooserControl} instance to use. */
@NotNull private ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserControl = null;
/** {@inheritDoc} */
Modified: trunk/daimonin/src/daieditor/gameobject/scripts/ScriptedEvent.java
===================================================================
--- trunk/daimonin/src/daieditor/gameobject/scripts/ScriptedEvent.java 2008-07-04 21:14:43 UTC (rev 4230)
+++ trunk/daimonin/src/daieditor/gameobject/scripts/ScriptedEvent.java 2008-07-04 21:19:08 UTC (rev 4231)
@@ -162,7 +162,7 @@
*
* @return the new event game object
*
- * @throws net.sf.gridarta.gameobject.scripts.UndefinedEventArchetypeException if the event game object cannot
+ * @throws UndefinedEventArchetypeException if the event game object cannot
* be created
*/
private static GameObject newEventGameObject(final int eventType) throws UndefinedEventArchetypeException {
Modified: trunk/src/app/net/sf/gridarta/gameobject/anim/AnimationObjects.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/anim/AnimationObjects.java 2008-07-04 21:14:43 UTC (rev 4230)
+++ trunk/src/app/net/sf/gridarta/gameobject/anim/AnimationObjects.java 2008-07-04 21:19:08 UTC (rev 4231)
@@ -51,8 +51,8 @@
/**
* Loads animations from a file.
* @param animFile file to load animations from
- * @throws java.io.IOException in case of I/O errors
- * @throws java.io.FileNotFoundException in case the file couldn't be opened
+ * @throws IOException in case of I/O errors
+ * @throws FileNotFoundException in case the file couldn't be opened
* @throws AnimationParseException in case parsing the animation reveals errors
* @throws DuplicateAnimationException in case an animation was not unique
*/
Modified: trunk/src/app/net/sf/gridarta/gameobject/face/FaceObjects.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/face/FaceObjects.java 2008-07-04 21:14:43 UTC (rev 4230)
+++ trunk/src/app/net/sf/gridarta/gameobject/face/FaceObjects.java 2008-07-04 21:19:08 UTC (rev 4231)
@@ -35,8 +35,8 @@
* Loads all faces from a png collection file.
* @param faceFile file to load faces from
* @param treeFile file to load tree information from
- * @throws java.io.IOException in case of I/O errors
- * @throws java.io.FileNotFoundException in case the file couldn't be opened
+ * @throws IOException in case of I/O errors
+ * @throws FileNotFoundException in case the file couldn't be opened
* @throws DuplicateFaceException in case a face was not unique
*/
void loadFacesCollection(File faceFile, File treeFile) throws IOException, FileNotFoundException, DuplicateFaceException;
Modified: trunk/src/app/net/sf/gridarta/gui/map/LevelRenderer.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/LevelRenderer.java 2008-07-04 21:14:43 UTC (rev 4230)
+++ trunk/src/app/net/sf/gridarta/gui/map/LevelRenderer.java 2008-07-04 21:19:08 UTC (rev 4231)
@@ -70,7 +70,7 @@
/**
* Saves an image of the entire view to a file.
* @param file file to write image file to
- * @throws java.io.IOException in case of I/O problems
+ * @throws IOException in case of I/O problems
*/
void printFullImage(File file) throws IOException;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-07-04 21:29:02
|
Revision: 4232
http://gridarta.svn.sourceforge.net/gridarta/?rev=4232&view=rev
Author: akirschbaum
Date: 2008-07-04 14:28:43 -0700 (Fri, 04 Jul 2008)
Log Message:
-----------
Do not reuse variables.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/CResourceLoader.java
trunk/crossfire/src/cfeditor/gui/script/ScriptEditor.java
trunk/src/app/net/sf/gridarta/gui/map/AbstractMapTilePane.java
trunk/src/app/net/sf/gridarta/help/HtmlPane.java
trunk/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/DaimoninAITokenMarker.java
Modified: trunk/crossfire/src/cfeditor/CResourceLoader.java
===================================================================
--- trunk/crossfire/src/cfeditor/CResourceLoader.java 2008-07-04 21:19:08 UTC (rev 4231)
+++ trunk/crossfire/src/cfeditor/CResourceLoader.java 2008-07-04 21:28:43 UTC (rev 4232)
@@ -117,12 +117,12 @@
/*Third try JAR*/
if (checkJAR) {
- URL resource = ClassLoader.getSystemResource(filename.replace('\\', '/'));
+ final URL resource1 = ClassLoader.getSystemResource(filename.replace('\\', '/'));
if (log.isDebugEnabled()) {
- log.debug("trying to load " + filename + " from " + resource);
+ log.debug("trying to load " + filename + " from " + resource1);
}
- if (resource != null) {
+ if (resource1 != null) {
log.debug("ok!");
type = LOCATION_JAR;
return;
@@ -133,12 +133,12 @@
*/
if (filename.contains(File.separator)) {
filename = filename.substring(filename.indexOf(File.separator) + 1);
- resource = ClassLoader.getSystemResource(filename.replace('\\', '/'));
+ final URL resource2 = ClassLoader.getSystemResource(filename.replace('\\', '/'));
if (log.isDebugEnabled()) {
- log.debug("trying to load " + filename + " from " + resource);
+ log.debug("trying to load " + filename + " from " + resource2);
}
- if (resource != null) {
+ if (resource2 != null) {
log.debug("ok!");
this.filename = filename;
type = LOCATION_JAR;
Modified: trunk/crossfire/src/cfeditor/gui/script/ScriptEditor.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/script/ScriptEditor.java 2008-07-04 21:19:08 UTC (rev 4231)
+++ trunk/crossfire/src/cfeditor/gui/script/ScriptEditor.java 2008-07-04 21:28:43 UTC (rev 4232)
@@ -180,24 +180,24 @@
optionsTab.add(typeBash, gbc);
gbc.gridx = 0;
gbc.gridy = 4;
- JButton btn = new JButton("re-register script");
- btn.setToolTipText("Force plugin manager to unregister this plugin from filter list, launch the autrun (if plugin is autostart) and re-register it (if filter plugin)");
- btn.addActionListener(new ActionListener() {
+ final JButton registerButton = new JButton("re-register script");
+ registerButton.setToolTipText("Force plugin manager to unregister this plugin from filter list, launch the autrun (if plugin is autostart) and re-register it (if filter plugin)");
+ registerButton.addActionListener(new ActionListener() {
public void actionPerformed(final ActionEvent e) {
getScript().getController().reRegister(getScript().getName());
}
});
- optionsTab.add(btn, gbc);
+ optionsTab.add(registerButton, gbc);
tabs.add("Options", optionsTab);
gbc.gridy = 5;
- btn = new JButton("Export script...");
- btn.setToolTipText("Export the specified plugin as XML (for distribution)");
- btn.addActionListener(new ActionListener() {
+ final JButton exportButton = new JButton("Export script...");
+ exportButton.setToolTipText("Export the specified plugin as XML (for distribution)");
+ exportButton.addActionListener(new ActionListener() {
public void actionPerformed(final ActionEvent e) {
getScript().getController().saveScriptAs(getScript(), false);
}
});
- optionsTab.add(btn, gbc);
+ optionsTab.add(exportButton, gbc);
tabs.add("Options", optionsTab);
final JPanel parameterTab = new JPanel(new BorderLayout());
paramTable = new JPanel(new GridBagLayout());
@@ -207,8 +207,8 @@
redrawTable();
}
});
- JScrollPane scrl = new JScrollPane(paramTable);
- parameterTab.add(scrl, BorderLayout.CENTER);
+ final JScrollPane scrollPane1 = new JScrollPane(paramTable);
+ parameterTab.add(scrollPane1, BorderLayout.CENTER);
//parameterTab.add(paramTable, BorderLayout.CENTER);
final JPanel paramButtons = new JPanel();
paramButtons.setLayout(new StackLayout(5));
@@ -251,9 +251,9 @@
getScript().setCode(code.getText());
}
});
- scrl = new JScrollPane(code);
+ final JScrollPane scrollPane2 = new JScrollPane(code);
final JPanel codePanel = new JPanel(new BorderLayout());
- codePanel.add(scrl, BorderLayout.CENTER);
+ codePanel.add(scrollPane2, BorderLayout.CENTER);
final JPanel codeBottom = new JPanel(new FlowLayout());
final JButton test = new JButton("Run Script...");
test.addActionListener(new ActionListener() {
@@ -307,60 +307,60 @@
log.debug("Doing " + param);
}
- ParameterNameEditor o = paramNameEditors.get(param);
- if (o != null) {
- return o;
+ final ParameterNameEditor existingParameterNameEditor = paramNameEditors.get(param);
+ if (existingParameterNameEditor != null) {
+ return existingParameterNameEditor;
}
- o = new ParameterNameEditor(param);
- paramNameEditors.put(param, o);
- newTableComponent(o);
- return o;
+ final ParameterNameEditor newParameterNameEditor = new ParameterNameEditor(param);
+ paramNameEditors.put(param, newParameterNameEditor);
+ newTableComponent(newParameterNameEditor);
+ return newParameterNameEditor;
}
private ParameterDescriptionEditor getParameterDescriptionEditor(final PluginParameter param) {
- ParameterDescriptionEditor o = paramDescriptionEditors.get(param);
- if (o != null) {
- return o;
+ final ParameterDescriptionEditor existingParameterDescriptionEditor = paramDescriptionEditors.get(param);
+ if (existingParameterDescriptionEditor != null) {
+ return existingParameterDescriptionEditor;
}
- o = new ParameterDescriptionEditor(param);
- newTableComponent(o);
- paramDescriptionEditors.put(param, o);
- return o;
+ final ParameterDescriptionEditor newParameterDescriptionEditor = new ParameterDescriptionEditor(param);
+ newTableComponent(newParameterDescriptionEditor);
+ paramDescriptionEditors.put(param, newParameterDescriptionEditor);
+ return newParameterDescriptionEditor;
}
private ParameterTypeEditor getParameterTypeEditor(final PluginParameter param) {
- ParameterTypeEditor o = paramTypeEditors.get(param);
- if (o != null) {
- return o;
+ final ParameterTypeEditor existingPArameterTypeEditor = paramTypeEditors.get(param);
+ if (existingPArameterTypeEditor != null) {
+ return existingPArameterTypeEditor;
}
- o = new ParameterTypeEditor(script, param);
- paramTypeEditors.put(param, o);
- newTableComponent(o);
- return o;
+ final ParameterTypeEditor newParameterTypeEditor = new ParameterTypeEditor(script, param);
+ paramTypeEditors.put(param, newParameterTypeEditor);
+ newTableComponent(newParameterTypeEditor);
+ return newParameterTypeEditor;
}
private PluginParameterView getParameterView(final PluginParameter param) {
- PluginParameterView o = paramViews.get(param);
- if (o != null) {
- return o;
+ final PluginParameterView existingPluginParameterView = paramViews.get(param);
+ if (existingPluginParameterView != null) {
+ return existingPluginParameterView;
}
- o = param.getView();
+ final PluginParameterView newPluginParameterView = param.getView();
if (log.isDebugEnabled()) {
log.debug("param.getValue() is " + param.getValue());
}
- newTableComponent(o.getConfigComponent(param.getConfig(), param));
- newTableComponent(o.getValueComponent(param.getValue(), param));
+ newTableComponent(newPluginParameterView.getConfigComponent(param.getConfig(), param));
+ newTableComponent(newPluginParameterView.getValueComponent(param.getValue(), param));
if (log.isDebugEnabled()) {
log.debug("param.getValue() is " + param.getValue());
}
- paramViews.put(param, o);
- return o;
+ paramViews.put(param, newPluginParameterView);
+ return newPluginParameterView;
}
private void putRow(final GridBagConstraints gbc, final PluginParameter param) {
Modified: trunk/src/app/net/sf/gridarta/gui/map/AbstractMapTilePane.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/AbstractMapTilePane.java 2008-07-04 21:19:08 UTC (rev 4231)
+++ trunk/src/app/net/sf/gridarta/gui/map/AbstractMapTilePane.java 2008-07-04 21:28:43 UTC (rev 4232)
@@ -408,18 +408,18 @@
}
@Nullable private String getTilePath(final String base, final String link) {
- int i = base.lastIndexOf("/");
- int ii = base.lastIndexOf(File.separator);
- int pos = i;
- if (ii > i) {
- pos = ii;
+ final int slashIndex1 = base.lastIndexOf("/");
+ final int separatorIndex1 = base.lastIndexOf(File.separator);
+ int pos = slashIndex1;
+ if (separatorIndex1 > slashIndex1) {
+ pos = separatorIndex1;
}
- i = link.lastIndexOf("/");
- ii = link.lastIndexOf(File.separator);
- int pos2 = i;
- if (ii > i) {
- pos2 = ii;
+ final int slashIndex2 = link.lastIndexOf("/");
+ final int separatorIndex2 = link.lastIndexOf(File.separator);
+ int pos2 = slashIndex2;
+ if (separatorIndex2 > slashIndex2) {
+ pos2 = separatorIndex2;
}
final String first;
final String second;
Modified: trunk/src/app/net/sf/gridarta/help/HtmlPane.java
===================================================================
--- trunk/src/app/net/sf/gridarta/help/HtmlPane.java 2008-07-04 21:19:08 UTC (rev 4231)
+++ trunk/src/app/net/sf/gridarta/help/HtmlPane.java 2008-07-04 21:28:43 UTC (rev 4232)
@@ -67,16 +67,16 @@
html = new JEditorPane(s);
} else {
// file missing, so let's look if we can get it from the jar
- URL url = ClassLoader.getSystemResource(CommonConstants.HELP_DIR.replace('\\', '/') + '/' + fname);
+ final URL url1 = ClassLoader.getSystemResource(CommonConstants.HELP_DIR.replace('\\', '/') + '/' + fname);
- if (url != null) {
- html = new JEditorPane(url);
+ if (url1 != null) {
+ html = new JEditorPane(url1);
} else {
// let's try it again without first directory
log.info("trying: HelpFiles/" + fname);
- url = ClassLoader.getSystemResource("HelpFiles/" + fname);
- if (url != null) {
- html = new JEditorPane(url);
+ final URL url2 = ClassLoader.getSystemResource("HelpFiles/" + fname);
+ if (url2 != null) {
+ html = new JEditorPane(url2);
} else {
log.info("Failed to open help file '" + fname + "'!");
throw new RuntimeException(); // FIXME
Modified: trunk/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/DaimoninAITokenMarker.java
===================================================================
--- trunk/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/DaimoninAITokenMarker.java 2008-07-04 21:19:08 UTC (rev 4231)
+++ trunk/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/DaimoninAITokenMarker.java 2008-07-04 21:28:43 UTC (rev 4232)
@@ -273,21 +273,21 @@
// 2. create tokens
final Iterator<Integer> it = segments.iterator();
- offset = line.offset;
+ int offset2 = line.offset;
final int commandLength = it.next();
- final String command = new String(array, offset, commandLength);
+ final String command = new String(array, offset2, commandLength);
final Spec spec = getSpec(command);
addToken(commandLength, spec != null ? spec.getId() : Token.INVALID);
- offset += commandLength;
+ offset2 += commandLength;
final int spacesLength1 = it.next();
addToken(spacesLength1, Token.NULL);
- offset += spacesLength1;
+ offset2 += spacesLength1;
while (it.hasNext()) {
final int paramLength = it.next();
- final String[] tmp = new String(array, offset, paramLength).split("=", 2);
+ final String[] tmp = new String(array, offset2, paramLength).split("=", 2);
if (tmp.length != 2) {
// missing '=' sign ==> syntax error
addToken(paramLength, Token.INVALID);
@@ -302,11 +302,11 @@
addToken(1, (param.length() == 0 && !parameterValid) || (arg.length() == 0 && !valueValid) ? Token.INVALID : Token.OPERATOR);
addToken(arg.length(), valueValid ? Token.NULL : Token.INVALID);
}
- offset += paramLength;
+ offset2 += paramLength;
final int spacesLength2 = it.next();
addToken(spacesLength2, Token.NULL);
- offset += spacesLength2;
+ offset2 += spacesLength2;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-07-04 21:43:52
|
Revision: 4234
http://gridarta.svn.sourceforge.net/gridarta/?rev=4234&view=rev
Author: akirschbaum
Date: 2008-07-04 14:43:47 -0700 (Fri, 04 Jul 2008)
Log Message:
-----------
Make methods static.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/CMainControl.java
trunk/crossfire/src/cfeditor/MapActions.java
trunk/crossfire/src/cfeditor/filter/NamedFilterList.java
trunk/crossfire/src/cfeditor/gui/map/MapRenderer.java
trunk/crossfire/src/cfeditor/gui/map/MapUserListener.java
trunk/crossfire/src/cfeditor/script/ScriptController.java
trunk/daimonin/src/daieditor/MapActions.java
trunk/daimonin/src/daieditor/gameobject/ArchetypeSet.java
trunk/daimonin/src/daieditor/spells/Spells.java
trunk/daimonin/src/test/daieditor/gui/map/MapCursorTest.java
trunk/src/app/net/sf/gridarta/AbstractMainControl.java
trunk/src/app/net/sf/gridarta/gui/map/MapCursorControl.java
trunk/src/app/net/sf/gridarta/gui/selectedsquare/SelectedSquareControl.java
trunk/src/app/net/sf/gridarta/io/AbstractGameObjectParser.java
trunk/src/app/net/sf/gridarta/spells/XMLSpellLoader.java
trunk/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/DaimoninAITokenMarker.java
Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java 2008-07-04 21:30:22 UTC (rev 4233)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2008-07-04 21:43:47 UTC (rev 4234)
@@ -834,7 +834,7 @@
return getConfigurationDirectory();
}
- private List<?> getEventTypes() {
+ private static List<?> getEventTypes() {
final List<Object> result = new ArrayList<Object>();
for (int typeNumber = 1; ScriptArchUtils.getArchetypeNameForEventType(typeNumber) != null; typeNumber++) {
result.add(typeNumber);
Modified: trunk/crossfire/src/cfeditor/MapActions.java
===================================================================
--- trunk/crossfire/src/cfeditor/MapActions.java 2008-07-04 21:30:22 UTC (rev 4233)
+++ trunk/crossfire/src/cfeditor/MapActions.java 2008-07-04 21:43:47 UTC (rev 4234)
@@ -568,7 +568,7 @@
*
* @return the new view position
*/
- private Point calculateNewViewPosition(@NotNull final CMapViewBasic oldMapView, @NotNull final CMapViewBasic newMapView, final int direction) {
+ private static Point calculateNewViewPosition(@NotNull final CMapViewBasic oldMapView, @NotNull final CMapViewBasic newMapView, final int direction) {
final Dimension newViewSize = newMapView.getViewSize();
final Rectangle oldViewRect = oldMapView.getViewRect();
Modified: trunk/crossfire/src/cfeditor/filter/NamedFilterList.java
===================================================================
--- trunk/crossfire/src/cfeditor/filter/NamedFilterList.java 2008-07-04 21:30:22 UTC (rev 4233)
+++ trunk/crossfire/src/cfeditor/filter/NamedFilterList.java 2008-07-04 21:43:47 UTC (rev 4234)
@@ -126,7 +126,7 @@
return subFilters.keySet().toArray(new String[subFilters.keySet().size()]);
}
- public boolean isFilterEnabled(final FilterConfig config, final String name) {
+ public static boolean isFilterEnabled(final FilterConfig config, final String name) {
return ((NamedFilterConfig) config).isSubFilterEnabled(name);
}
@@ -137,11 +137,11 @@
}
}
- public boolean isInverted(final FilterConfig config) {
+ public static boolean isInverted(final FilterConfig config) {
return ((NamedFilterConfig) config).isInverted();
}
- public void setInverted(final FilterConfig config, final boolean b) {
+ public static void setInverted(final FilterConfig config, final boolean b) {
((NamedFilterConfig) config).setInverted(b);
}
Modified: trunk/crossfire/src/cfeditor/gui/map/MapRenderer.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/map/MapRenderer.java 2008-07-04 21:30:22 UTC (rev 4233)
+++ trunk/crossfire/src/cfeditor/gui/map/MapRenderer.java 2008-07-04 21:43:47 UTC (rev 4234)
@@ -141,7 +141,7 @@
}
}
- private void paintFromBackbuffer(final Graphics grfx, final BufferedImage backBuffer, final int x, final int y, final int width, final int height) {
+ private static void paintFromBackbuffer(final Graphics grfx, final BufferedImage backBuffer, final int x, final int y, final int width, final int height) {
if (grfx == null) {
return;
}
Modified: trunk/crossfire/src/cfeditor/gui/map/MapUserListener.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/map/MapUserListener.java 2008-07-04 21:30:22 UTC (rev 4233)
+++ trunk/crossfire/src/cfeditor/gui/map/MapUserListener.java 2008-07-04 21:43:47 UTC (rev 4234)
@@ -233,7 +233,7 @@
*
* @return <code>true</code> is "select" was selected
*/
- private boolean isSelect(final MouseEvent e) {
+ private static boolean isSelect(final MouseEvent e) {
return (e.getModifiers() & InputEvent.BUTTON1_MASK) != 0;
}
@@ -244,7 +244,7 @@
*
* @return <code>true</code> is "insert" was selected
*/
- private boolean isInsert(final MouseEvent e) {
+ private static boolean isInsert(final MouseEvent e) {
return (e.getModifiers() & (InputEvent.BUTTON3_MASK | InputEvent.CTRL_MASK)) == InputEvent.BUTTON3_MASK;
}
@@ -255,7 +255,7 @@
*
* @return <code>true</code> is "delete" was selected
*/
- private boolean isDelete(final MouseEvent e) {
+ private static boolean isDelete(final MouseEvent e) {
return (e.getModifiers() & InputEvent.BUTTON2_MASK) != 0
|| (e.getModifiers() & (InputEvent.BUTTON3_MASK | InputEvent.CTRL_MASK)) == (InputEvent.BUTTON3_MASK | InputEvent.CTRL_MASK);
}
Modified: trunk/crossfire/src/cfeditor/script/ScriptController.java
===================================================================
--- trunk/crossfire/src/cfeditor/script/ScriptController.java 2008-07-04 21:30:22 UTC (rev 4233)
+++ trunk/crossfire/src/cfeditor/script/ScriptController.java 2008-07-04 21:43:47 UTC (rev 4234)
@@ -294,7 +294,7 @@
*
* @throws IOException If the file cannot be saved.
*/
- public void saveScript(@NotNull final ScriptModel scriptModel, @NotNull final File file) throws IOException {
+ public static void saveScript(@NotNull final ScriptModel scriptModel, @NotNull final File file) throws IOException {
final FileOutputStream fos = new FileOutputStream(file);
try {
final Element root = scriptModel.toXML();
Modified: trunk/daimonin/src/daieditor/MapActions.java
===================================================================
--- trunk/daimonin/src/daieditor/MapActions.java 2008-07-04 21:30:22 UTC (rev 4233)
+++ trunk/daimonin/src/daieditor/MapActions.java 2008-07-04 21:43:47 UTC (rev 4234)
@@ -526,7 +526,7 @@
*
* @return the new view position
*/
- private Point calculateNewViewPosition(@NotNull final CMapViewBasic oldMapView, @NotNull final CMapViewBasic newMapView, final int direction) {
+ private static Point calculateNewViewPosition(@NotNull final CMapViewBasic oldMapView, @NotNull final CMapViewBasic newMapView, final int direction) {
final Dimension newViewSize = newMapView.getViewSize();
final Rectangle oldViewRect = oldMapView.getViewRect();
Modified: trunk/daimonin/src/daieditor/gameobject/ArchetypeSet.java
===================================================================
--- trunk/daimonin/src/daieditor/gameobject/ArchetypeSet.java 2008-07-04 21:30:22 UTC (rev 4233)
+++ trunk/daimonin/src/daieditor/gameobject/ArchetypeSet.java 2008-07-04 21:43:47 UTC (rev 4234)
@@ -129,8 +129,7 @@
return getFace(gameObject.getFaceObjName(), gameObject.hasUndefinedArchetype());
}
- /** {@inheritDoc} */
- @NotNull public ImageIcon getTrans(@NotNull final GameObject gameObject) {
+ @NotNull public static ImageIcon getTrans(@NotNull final GameObject gameObject) {
return getTrans(gameObject.getFaceObjName(), gameObject.hasUndefinedArchetype());
}
@@ -141,7 +140,7 @@
* referencing an undefined archetype
* @return face ImageIcon for index <var>faceName</var>
*/
- @NotNull private ImageIcon getTrans(final String faceName, final boolean hasUndefinedArchetype) {
+ @NotNull private static ImageIcon getTrans(final String faceName, final boolean hasUndefinedArchetype) {
if (hasUndefinedArchetype) {
return SystemIcons.getNoarchTileIcon();
}
Modified: trunk/daimonin/src/daieditor/spells/Spells.java
===================================================================
--- trunk/daimonin/src/daieditor/spells/Spells.java 2008-07-04 21:30:22 UTC (rev 4233)
+++ trunk/daimonin/src/daieditor/spells/Spells.java 2008-07-04 21:43:47 UTC (rev 4234)
@@ -62,7 +62,7 @@
* then import spells.
* @param mainControl main control
*/
- public void importSpellsWanted(final MainControl mainControl) {
+ public static void importSpellsWanted(final MainControl mainControl) {
// open a file chooser window
final JFileChooser fileChooser = new JFileChooser();
fileChooser.setDialogTitle("Open CF Spellist File");
@@ -96,7 +96,7 @@
* @param baseDir The base directory to load the spells file from.
* @return number of successfully collected spells
*/
- private int importSpells(final File spellfile, final String baseDir) {
+ private static int importSpells(final File spellfile, final String baseDir) {
final Map<String, String> spells = new TreeMap<String, String>();
if (spellfile.getName().equalsIgnoreCase("spellist.h")) {
try {
Modified: trunk/daimonin/src/test/daieditor/gui/map/MapCursorTest.java
===================================================================
--- trunk/daimonin/src/test/daieditor/gui/map/MapCursorTest.java 2008-07-04 21:30:22 UTC (rev 4233)
+++ trunk/daimonin/src/test/daieditor/gui/map/MapCursorTest.java 2008-07-04 21:43:47 UTC (rev 4234)
@@ -251,7 +251,7 @@
dragTo(CommonConstants.NORTH_EAST, dragStart, p, offset);
}
- private void dragTo(final int dir, final Point start, final Point p, final Dimension offset) {
+ private static void dragTo(final int dir, final Point start, final Point p, final Dimension offset) {
final Point d = new Point(MapCursor.direction[dir][0], MapCursor.direction[dir][1]);
p.x += d.x;
p.y += d.y;
@@ -265,7 +265,7 @@
assertPreSelection(start, p);
}
- private void assertPreSelection(final Point start, final Point end) {
+ private static void assertPreSelection(final Point start, final Point end) {
final int minX = Math.min(start.x, end.x);
final int maxX = Math.max(start.x, end.x);
final int minY = Math.min(start.y, end.y);
@@ -286,7 +286,7 @@
}
}
- private void assertSelection(final Point start, final Point end, final boolean flag) {
+ private static void assertSelection(final Point start, final Point end, final boolean flag) {
final int minX = Math.min(start.x, end.x);
final int maxX = Math.max(start.x, end.x);
final int minY = Math.min(start.y, end.y);
@@ -391,7 +391,7 @@
* @param nPos number of position events.
* @param nMode number of mode events.
*/
- private void testEvents(final int nPos, final int nMode) {
+ private static void testEvents(final int nPos, final int nMode) {
assertEquals("Position change event", nPos, changedPosCounter);
changedPosCounter = 0;
assertEquals("Mode change event", nMode, changedModeCounter);
Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-07-04 21:30:22 UTC (rev 4233)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-07-04 21:43:47 UTC (rev 4234)
@@ -308,7 +308,7 @@
}
/** Create and open a new script. */
- @ActionMethod public void newScript() {
+ @ActionMethod public static void newScript() {
ScriptEditControlInstance.getInstance().openScriptNew();
}
Modified: trunk/src/app/net/sf/gridarta/gui/map/MapCursorControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/MapCursorControl.java 2008-07-04 21:30:22 UTC (rev 4233)
+++ trunk/src/app/net/sf/gridarta/gui/map/MapCursorControl.java 2008-07-04 21:43:47 UTC (rev 4234)
@@ -67,7 +67,7 @@
* @param mapCursor the map cursor to change
* @param dir Constants in <code>IGUIConstants</code>
*/
- public void goTo(@NotNull final MapCursor mapCursor, final int dir) {
+ public static void goTo(@NotNull final MapCursor mapCursor, final int dir) {
mapCursor.goTo(dir);
}
@@ -75,12 +75,12 @@
goLocationDialogManager.showDialog(mapView);
}
- public void selectTile(@NotNull final MapCursor mapCursor, final MapGrid.SelectionMode mode) {
+ public static void selectTile(@NotNull final MapCursor mapCursor, final MapGrid.SelectionMode mode) {
mapCursor.dragStart();
mapCursor.dragSelect(mode);
}
- public void startStopDrag(@NotNull final MapCursor mapCursor) {
+ public static void startStopDrag(@NotNull final MapCursor mapCursor) {
if (mapCursor.isDragging()) {
mapCursor.dragSelect(MapGrid.SelectionMode.FLIP);
} else {
@@ -88,7 +88,7 @@
}
}
- public void releaseDrag(@NotNull final MapCursor mapCursor) {
+ public static void releaseDrag(@NotNull final MapCursor mapCursor) {
if (mapCursor.isDragging()) {
mapCursor.dragRelease();
} else {
Modified: trunk/src/app/net/sf/gridarta/gui/selectedsquare/SelectedSquareControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/selectedsquare/SelectedSquareControl.java 2008-07-04 21:30:22 UTC (rev 4233)
+++ trunk/src/app/net/sf/gridarta/gui/selectedsquare/SelectedSquareControl.java 2008-07-04 21:43:47 UTC (rev 4234)
@@ -254,7 +254,7 @@
*
* @return <code>true</code> is "select" was selected
*/
- private boolean isSelect(final MouseEvent e) {
+ private static boolean isSelect(final MouseEvent e) {
return (e.getModifiers() & InputEvent.BUTTON1_MASK) != 0;
}
@@ -265,7 +265,7 @@
*
* @return <code>true</code> is "insert" was selected
*/
- private boolean isInsert(final MouseEvent e) {
+ private static boolean isInsert(final MouseEvent e) {
return (e.getModifiers() & (InputEvent.BUTTON3_MASK | InputEvent.CTRL_MASK)) == InputEvent.BUTTON3_MASK;
}
@@ -276,7 +276,7 @@
*
* @return <code>true</code> is "delete" was selected
*/
- private boolean isDelete(final MouseEvent e) {
+ private static boolean isDelete(final MouseEvent e) {
return (e.getModifiers() & InputEvent.BUTTON2_MASK) != 0
|| (e.getModifiers() & (InputEvent.BUTTON3_MASK | InputEvent.CTRL_MASK)) == (InputEvent.BUTTON3_MASK | InputEvent.CTRL_MASK);
}
Modified: trunk/src/app/net/sf/gridarta/io/AbstractGameObjectParser.java
===================================================================
--- trunk/src/app/net/sf/gridarta/io/AbstractGameObjectParser.java 2008-07-04 21:30:22 UTC (rev 4233)
+++ trunk/src/app/net/sf/gridarta/io/AbstractGameObjectParser.java 2008-07-04 21:43:47 UTC (rev 4234)
@@ -157,7 +157,7 @@
*
* @throws IOException If an error occurs.
*/
- @Nullable private String readArchName(@NotNull final BufferedReader reader, @NotNull final String firstLine) throws IOException {
+ @Nullable private static String readArchName(@NotNull final BufferedReader reader, @NotNull final String firstLine) throws IOException {
String thisLine2 = firstLine;
do {
final String thisLine = thisLine2.trim();
Modified: trunk/src/app/net/sf/gridarta/spells/XMLSpellLoader.java
===================================================================
--- trunk/src/app/net/sf/gridarta/spells/XMLSpellLoader.java 2008-07-04 21:30:22 UTC (rev 4233)
+++ trunk/src/app/net/sf/gridarta/spells/XMLSpellLoader.java 2008-07-04 21:43:47 UTC (rev 4234)
@@ -50,7 +50,7 @@
*
* @param spells The <code>Spells</code> instance to add the spells to.
*/
- public void load(@NotNull final String baseDir, @NotNull final String filename, @NotNull final DocumentBuilder documentBuilder, @NotNull final Spells<NumberSpell> spells) {
+ public static void load(@NotNull final String baseDir, @NotNull final String filename, @NotNull final DocumentBuilder documentBuilder, @NotNull final Spells<NumberSpell> spells) {
try {
// parse xml document
final Document doc = documentBuilder.parse(IOUtils.getResourceURLAsString(baseDir, filename));
Modified: trunk/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/DaimoninAITokenMarker.java
===================================================================
--- trunk/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/DaimoninAITokenMarker.java 2008-07-04 21:30:22 UTC (rev 4233)
+++ trunk/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/DaimoninAITokenMarker.java 2008-07-04 21:43:47 UTC (rev 4234)
@@ -320,7 +320,7 @@
* name is undefined.
*/
@Nullable
- private Spec getSpec(@NotNull final String command) {
+ private static Spec getSpec(@NotNull final String command) {
final Spec fixedSpec = fixedSpecs.get(command);
if (fixedSpec != null) {
return fixedSpec;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-07-04 22:09:45
|
Revision: 4235
http://gridarta.svn.sourceforge.net/gridarta/?rev=4235&view=rev
Author: akirschbaum
Date: 2008-07-04 15:09:15 -0700 (Fri, 04 Jul 2008)
Log Message:
-----------
Whitespace changes.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/CFJavaEditor.java
trunk/crossfire/src/cfeditor/CFilterControl.java
trunk/crossfire/src/cfeditor/CMainControl.java
trunk/crossfire/src/cfeditor/CResourceLoader.java
trunk/crossfire/src/cfeditor/CrossfireObjectsFactory.java
trunk/crossfire/src/cfeditor/IGUIConstants.java
trunk/crossfire/src/cfeditor/MapActions.java
trunk/crossfire/src/cfeditor/filter/BasicFilterConfig.java
trunk/crossfire/src/cfeditor/filter/BtnPopup.java
trunk/crossfire/src/cfeditor/filter/ConfigEventType.java
trunk/crossfire/src/cfeditor/filter/Filter.java
trunk/crossfire/src/cfeditor/filter/FilterConfig.java
trunk/crossfire/src/cfeditor/filter/NamedFilterList.java
trunk/crossfire/src/cfeditor/filter/NamedGameObjectMatcherFilter.java
trunk/crossfire/src/cfeditor/filter/package-info.java
trunk/crossfire/src/cfeditor/gameobject/ArchetypeParser.java
trunk/crossfire/src/cfeditor/gameobject/ArchetypeSet.java
trunk/crossfire/src/cfeditor/gameobject/GameObject.java
trunk/crossfire/src/cfeditor/gameobject/UndefinedArchetype.java
trunk/crossfire/src/cfeditor/gameobject/anim/AnimationObject.java
trunk/crossfire/src/cfeditor/gameobject/anim/package-info.java
trunk/crossfire/src/cfeditor/gameobject/face/FaceObjects.java
trunk/crossfire/src/cfeditor/gameobject/face/package-info.java
trunk/crossfire/src/cfeditor/gameobject/package-info.java
trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptArchData.java
trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptArchUtils.java
trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptedEvent.java
trunk/crossfire/src/cfeditor/gameobject/scripts/package-info.java
trunk/crossfire/src/cfeditor/gui/GameObjectAttributesDialog.java
trunk/crossfire/src/cfeditor/gui/GameObjectAttributesPanel.java
trunk/crossfire/src/cfeditor/gui/ObjectChooser.java
trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java
trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java
trunk/crossfire/src/cfeditor/gui/map/MapPropertiesDialog.java
trunk/crossfire/src/cfeditor/gui/map/MapRenderer.java
trunk/crossfire/src/cfeditor/gui/map/MapTilePane.java
trunk/crossfire/src/cfeditor/gui/map/MapUserListener.java
trunk/crossfire/src/cfeditor/gui/map/PickmapRenderer.java
trunk/crossfire/src/cfeditor/gui/map/SimpleLevelRenderer.java
trunk/crossfire/src/cfeditor/gui/map/package-info.java
trunk/crossfire/src/cfeditor/gui/package-info.java
trunk/crossfire/src/cfeditor/gui/prefs/GUIPrefs.java
trunk/crossfire/src/cfeditor/gui/prefs/ResPrefs.java
trunk/crossfire/src/cfeditor/gui/prefs/package-info.java
trunk/crossfire/src/cfeditor/gui/script/CloseableTabbedPane.java
trunk/crossfire/src/cfeditor/gui/script/ScriptManager.java
trunk/crossfire/src/cfeditor/gui/script/ScriptView.java
trunk/crossfire/src/cfeditor/gui/script/StackLayout.java
trunk/crossfire/src/cfeditor/gui/script/parameter/ArchComboBox.java
trunk/crossfire/src/cfeditor/gui/script/parameter/DoubleParameterView.java
trunk/crossfire/src/cfeditor/gui/script/parameter/IntegerParameterView.java
trunk/crossfire/src/cfeditor/gui/script/parameter/MapParameterView.java
trunk/crossfire/src/cfeditor/io/GameObjectParser.java
trunk/crossfire/src/cfeditor/io/MapArchObjectParser.java
trunk/crossfire/src/cfeditor/io/package-info.java
trunk/crossfire/src/cfeditor/map/MapArchObject.java
trunk/crossfire/src/cfeditor/map/package-info.java
trunk/crossfire/src/cfeditor/package-info.java
trunk/crossfire/src/cfeditor/script/BshThread.java
trunk/crossfire/src/cfeditor/script/ScriptControlListener.java
trunk/crossfire/src/cfeditor/script/ScriptController.java
trunk/crossfire/src/cfeditor/script/ScriptModel.java
trunk/crossfire/src/cfeditor/script/parameter/ArchParameter.java
trunk/crossfire/src/cfeditor/script/parameter/BooleanParameter.java
trunk/crossfire/src/cfeditor/script/parameter/DoubleParameter.java
trunk/crossfire/src/cfeditor/script/parameter/FilterParameter.java
trunk/crossfire/src/cfeditor/script/parameter/IntegerParameter.java
trunk/crossfire/src/cfeditor/script/parameter/MapParameter.java
trunk/crossfire/src/cfeditor/script/parameter/PluginParameter.java
trunk/crossfire/src/cfeditor/script/parameter/PluginParameterFactory.java
trunk/crossfire/src/cfeditor/script/parameter/StringParameter.java
trunk/daimonin/src/daieditor/CMainControl.java
trunk/daimonin/src/daieditor/DaimoninEditor.java
trunk/daimonin/src/daieditor/DaimoninObjectsFactory.java
trunk/daimonin/src/daieditor/IGUIConstants.java
trunk/daimonin/src/daieditor/MapActions.java
trunk/daimonin/src/daieditor/MultiPositionData.java
trunk/daimonin/src/daieditor/ProcessRunner.java
trunk/daimonin/src/daieditor/gameobject/ArchetypeParser.java
trunk/daimonin/src/daieditor/gameobject/ArchetypeSet.java
trunk/daimonin/src/daieditor/gameobject/GameObject.java
trunk/daimonin/src/daieditor/gameobject/UndefinedArchetype.java
trunk/daimonin/src/daieditor/gameobject/anim/AnimationObject.java
trunk/daimonin/src/daieditor/gameobject/anim/AnimationObjects.java
trunk/daimonin/src/daieditor/gameobject/anim/package-info.java
trunk/daimonin/src/daieditor/gameobject/face/FaceObjects.java
trunk/daimonin/src/daieditor/gameobject/face/package-info.java
trunk/daimonin/src/daieditor/gameobject/package-info.java
trunk/daimonin/src/daieditor/gameobject/scripts/ScriptArchData.java
trunk/daimonin/src/daieditor/gameobject/scripts/ScriptArchUtils.java
trunk/daimonin/src/daieditor/gameobject/scripts/ScriptedEvent.java
trunk/daimonin/src/daieditor/gameobject/scripts/package-info.java
trunk/daimonin/src/daieditor/gui/GameObjectAttributesDialog.java
trunk/daimonin/src/daieditor/gui/GameObjectAttributesPanel.java
trunk/daimonin/src/daieditor/gui/ObjectChooser.java
trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java
trunk/daimonin/src/daieditor/gui/map/DefaultLevelRenderer.java
trunk/daimonin/src/daieditor/gui/map/MapPropertiesDialog.java
trunk/daimonin/src/daieditor/gui/map/MapRenderer.java
trunk/daimonin/src/daieditor/gui/map/MapTilePane.java
trunk/daimonin/src/daieditor/gui/map/MapUserListener.java
trunk/daimonin/src/daieditor/gui/map/MapViewSettings.java
trunk/daimonin/src/daieditor/gui/map/PickmapRenderer.java
trunk/daimonin/src/daieditor/gui/map/SimpleLevelRenderer.java
trunk/daimonin/src/daieditor/gui/map/event/MapViewSettingsEvent.java
trunk/daimonin/src/daieditor/gui/map/event/MapViewSettingsListener.java
trunk/daimonin/src/daieditor/gui/map/event/MouseOpEvent.java
trunk/daimonin/src/daieditor/gui/map/event/package-info.java
trunk/daimonin/src/daieditor/gui/map/package-info.java
trunk/daimonin/src/daieditor/gui/map/tools/BasicAbstractTool.java
trunk/daimonin/src/daieditor/gui/map/tools/DeletionTool.java
trunk/daimonin/src/daieditor/gui/map/tools/InsertionTool.java
trunk/daimonin/src/daieditor/gui/map/tools/SelectionTool.java
trunk/daimonin/src/daieditor/gui/map/tools/Tool.java
trunk/daimonin/src/daieditor/gui/map/tools/ToolPalette.java
trunk/daimonin/src/daieditor/gui/map/tools/ToolSelector.java
trunk/daimonin/src/daieditor/gui/map/tools/VoidTool.java
trunk/daimonin/src/daieditor/gui/map/tools/package-info.java
trunk/daimonin/src/daieditor/gui/package-info.java
trunk/daimonin/src/daieditor/gui/prefs/AppPrefs.java
trunk/daimonin/src/daieditor/gui/prefs/GUIPrefs.java
trunk/daimonin/src/daieditor/gui/prefs/ResPrefs.java
trunk/daimonin/src/daieditor/gui/prefs/package-info.java
trunk/daimonin/src/daieditor/io/GameObjectParser.java
trunk/daimonin/src/daieditor/io/MapArchObjectParser.java
trunk/daimonin/src/daieditor/io/package-info.java
trunk/daimonin/src/daieditor/map/MapArchObject.java
trunk/daimonin/src/daieditor/map/package-info.java
trunk/daimonin/src/daieditor/map/validation/checks/ExitChecker.java
trunk/daimonin/src/daieditor/map/validation/checks/ExitError.java
trunk/daimonin/src/daieditor/map/validation/checks/SlayingChecker.java
trunk/daimonin/src/daieditor/map/validation/checks/TilePathsChecker.java
trunk/daimonin/src/daieditor/map/validation/checks/package-info.java
trunk/daimonin/src/daieditor/overview.html
trunk/daimonin/src/daieditor/package-info.java
trunk/daimonin/src/daieditor/spells/Spells.java
trunk/daimonin/src/test/daieditor/gui/map/MapCursorTest.java
trunk/daimonin/src/test/daieditor/gui/map/package-info.java
trunk/daimonin/src/test/daieditor/gui/prefs/package-info.java
trunk/daimonin/src/test/daieditor/io/PathManagerTest.java
trunk/daimonin/src/test/daieditor/io/package-info.java
trunk/daimonin/src/test/daieditor/map/MapArchObjectTest.java
trunk/daimonin/src/test/daieditor/map/package-info.java
trunk/daimonin/src/test/daieditor/map/validation/AbstractValidatorTest.java
trunk/daimonin/src/test/daieditor/map/validation/package-info.java
trunk/src/app/net/sf/gridarta/AbstractMainControl.java
trunk/src/app/net/sf/gridarta/ArchTypeParseException.java
trunk/src/app/net/sf/gridarta/AutojoinList.java
trunk/src/app/net/sf/gridarta/AutojoinLists.java
trunk/src/app/net/sf/gridarta/CAttribBitmask.java
trunk/src/app/net/sf/gridarta/CFArchAttrib.java
trunk/src/app/net/sf/gridarta/CFArchType.java
trunk/src/app/net/sf/gridarta/CFArchTypeList.java
trunk/src/app/net/sf/gridarta/CommonConstants.java
trunk/src/app/net/sf/gridarta/CopyBuffer.java
trunk/src/app/net/sf/gridarta/CurrentMapListener.java
trunk/src/app/net/sf/gridarta/DefaultMapManager.java
trunk/src/app/net/sf/gridarta/GlobalSettings.java
trunk/src/app/net/sf/gridarta/GlobalSettingsImpl.java
trunk/src/app/net/sf/gridarta/GridartaObjectsFactory.java
trunk/src/app/net/sf/gridarta/MainControl.java
trunk/src/app/net/sf/gridarta/MapImageCache.java
trunk/src/app/net/sf/gridarta/MapManager.java
trunk/src/app/net/sf/gridarta/MapManagerListener.java
trunk/src/app/net/sf/gridarta/Size2D.java
trunk/src/app/net/sf/gridarta/WrappingStringBuilder.java
trunk/src/app/net/sf/gridarta/XmlHelper.java
trunk/src/app/net/sf/gridarta/data/AbstractNamedObject.java
trunk/src/app/net/sf/gridarta/data/AbstractNamedObjects.java
trunk/src/app/net/sf/gridarta/data/NamedObject.java
trunk/src/app/net/sf/gridarta/data/NamedObjects.java
trunk/src/app/net/sf/gridarta/data/NamedTreeNode.java
trunk/src/app/net/sf/gridarta/data/package-info.java
trunk/src/app/net/sf/gridarta/floodfill/Floodfill.java
trunk/src/app/net/sf/gridarta/gameobject/AbstractArchetypeParser.java
trunk/src/app/net/sf/gridarta/gameobject/AbstractArchetypeSet.java
trunk/src/app/net/sf/gridarta/gameobject/Archetype.java
trunk/src/app/net/sf/gridarta/gameobject/ArchetypeParser.java
trunk/src/app/net/sf/gridarta/gameobject/ArchetypeSet.java
trunk/src/app/net/sf/gridarta/gameobject/ArchetypeSetListener.java
trunk/src/app/net/sf/gridarta/gameobject/Collectable.java
trunk/src/app/net/sf/gridarta/gameobject/Collector.java
trunk/src/app/net/sf/gridarta/gameobject/GameObject.java
trunk/src/app/net/sf/gridarta/gameobject/GameObjectContainer.java
trunk/src/app/net/sf/gridarta/gameobject/IsArchetypeException.java
trunk/src/app/net/sf/gridarta/gameobject/MultiArchData.java
trunk/src/app/net/sf/gridarta/gameobject/NotArchetypeException.java
trunk/src/app/net/sf/gridarta/gameobject/NotInsideContainerException.java
trunk/src/app/net/sf/gridarta/gameobject/RecursiveGameObjectIterator.java
trunk/src/app/net/sf/gridarta/gameobject/anim/AbstractAnimationObject.java
trunk/src/app/net/sf/gridarta/gameobject/anim/AbstractAnimationObjects.java
trunk/src/app/net/sf/gridarta/gameobject/anim/AnimationObject.java
trunk/src/app/net/sf/gridarta/gameobject/anim/AnimationObjects.java
trunk/src/app/net/sf/gridarta/gameobject/anim/AnimationParseException.java
trunk/src/app/net/sf/gridarta/gameobject/anim/package-info.java
trunk/src/app/net/sf/gridarta/gameobject/face/AbstractFaceObjects.java
trunk/src/app/net/sf/gridarta/gameobject/face/AbstractFaceProvider.java
trunk/src/app/net/sf/gridarta/gameobject/face/ArchFaceProvider.java
trunk/src/app/net/sf/gridarta/gameobject/face/CollectedFaceProvider.java
trunk/src/app/net/sf/gridarta/gameobject/face/ColourFilter.java
trunk/src/app/net/sf/gridarta/gameobject/face/DefaultFaceObject.java
trunk/src/app/net/sf/gridarta/gameobject/face/FaceObjectProviders.java
trunk/src/app/net/sf/gridarta/gameobject/face/FaceObjects.java
trunk/src/app/net/sf/gridarta/gameobject/face/FaceProvider.java
trunk/src/app/net/sf/gridarta/gameobject/face/FilterFaceProvider.java
trunk/src/app/net/sf/gridarta/gameobject/face/package-info.java
trunk/src/app/net/sf/gridarta/gameobject/match/AndGameObjectMatcher.java
trunk/src/app/net/sf/gridarta/gameobject/match/AttribGameObjectMatcher.java
trunk/src/app/net/sf/gridarta/gameobject/match/GameObjectMatcher.java
trunk/src/app/net/sf/gridarta/gameobject/match/GameObjectMatcherParser.java
trunk/src/app/net/sf/gridarta/gameobject/match/GameObjectMatchers.java
trunk/src/app/net/sf/gridarta/gameobject/match/GameObjectMatchersInstance.java
trunk/src/app/net/sf/gridarta/gameobject/match/GameObjectMatchersParser.java
trunk/src/app/net/sf/gridarta/gameobject/match/MutableNameGameObjectMatcher.java
trunk/src/app/net/sf/gridarta/gameobject/match/MutableOrGameObjectMatcher.java
trunk/src/app/net/sf/gridarta/gameobject/match/NamedGameObjectMatcher.java
trunk/src/app/net/sf/gridarta/gameobject/match/NotGameObjectMatcher.java
trunk/src/app/net/sf/gridarta/gameobject/match/OrGameObjectMatcher.java
trunk/src/app/net/sf/gridarta/gameobject/match/TypeNrsGameObjectMatcher.java
trunk/src/app/net/sf/gridarta/gameobject/match/ViewGameObjectMatcherManager.java
trunk/src/app/net/sf/gridarta/gameobject/match/package-info.java
trunk/src/app/net/sf/gridarta/gameobject/package-info.java
trunk/src/app/net/sf/gridarta/gameobject/scripts/AbstractScriptArchEditor.java
trunk/src/app/net/sf/gridarta/gameobject/scripts/PathButtonListener.java
trunk/src/app/net/sf/gridarta/gameobject/scripts/ScriptArchData.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/gameobject/scripts/UndefinedEventArchetypeException.java
trunk/src/app/net/sf/gridarta/gameobject/scripts/UndefinedEventArchetypeNameException.java
trunk/src/app/net/sf/gridarta/gameobject/scripts/UndefinedEventArchetypeTypeException.java
trunk/src/app/net/sf/gridarta/gameobject/scripts/package-info.java
trunk/src/app/net/sf/gridarta/gui/About.java
trunk/src/app/net/sf/gridarta/gui/AbstractObjectChooser.java
trunk/src/app/net/sf/gridarta/gui/ArchetypesActions.java
trunk/src/app/net/sf/gridarta/gui/AsynchonousProgress.java
trunk/src/app/net/sf/gridarta/gui/DirectionLayout.java
trunk/src/app/net/sf/gridarta/gui/ErrorListView.java
trunk/src/app/net/sf/gridarta/gui/GSplitPane.java
trunk/src/app/net/sf/gridarta/gui/GUIUtils.java
trunk/src/app/net/sf/gridarta/gui/GameObjectAttributesPanel.java
trunk/src/app/net/sf/gridarta/gui/HideFileFilterProxy.java
trunk/src/app/net/sf/gridarta/gui/MainActions.java
trunk/src/app/net/sf/gridarta/gui/MainView.java
trunk/src/app/net/sf/gridarta/gui/MapFileFilter.java
trunk/src/app/net/sf/gridarta/gui/MapManagerActions.java
trunk/src/app/net/sf/gridarta/gui/MapPreview.java
trunk/src/app/net/sf/gridarta/gui/MenuHelper.java
trunk/src/app/net/sf/gridarta/gui/ObjectChoiceDisplay.java
trunk/src/app/net/sf/gridarta/gui/ObjectChooser.java
trunk/src/app/net/sf/gridarta/gui/RecentManager.java
trunk/src/app/net/sf/gridarta/gui/ReplaceDialog.java
trunk/src/app/net/sf/gridarta/gui/ReplaceDialogManager.java
trunk/src/app/net/sf/gridarta/gui/ShiftProcessor.java
trunk/src/app/net/sf/gridarta/gui/SplashScreen.java
trunk/src/app/net/sf/gridarta/gui/StatusBar.java
trunk/src/app/net/sf/gridarta/gui/SystemIcons.java
trunk/src/app/net/sf/gridarta/gui/archetypechooser/ArchetypeChooserControl.java
trunk/src/app/net/sf/gridarta/gui/archetypechooser/ArchetypeChooserListener.java
trunk/src/app/net/sf/gridarta/gui/archetypechooser/ArchetypeNameCellRenderer.java
trunk/src/app/net/sf/gridarta/gui/archetypechooser/ArchetypePanel.java
trunk/src/app/net/sf/gridarta/gui/archetypechooser/DirectionPane.java
trunk/src/app/net/sf/gridarta/gui/archetypechooser/DisplayNameCellRenderer.java
trunk/src/app/net/sf/gridarta/gui/archetypechooser/package-info.java
trunk/src/app/net/sf/gridarta/gui/connectionview/CellRenderer.java
trunk/src/app/net/sf/gridarta/gui/connectionview/Connection.java
trunk/src/app/net/sf/gridarta/gui/connectionview/ConnectionControl.java
trunk/src/app/net/sf/gridarta/gui/connectionview/ConnectionView.java
trunk/src/app/net/sf/gridarta/gui/connectionview/Connections.java
trunk/src/app/net/sf/gridarta/gui/connectionview/Control.java
trunk/src/app/net/sf/gridarta/gui/connectionview/LockedItemsControl.java
trunk/src/app/net/sf/gridarta/gui/connectionview/LockedItemsView.java
trunk/src/app/net/sf/gridarta/gui/connectionview/MonsterControl.java
trunk/src/app/net/sf/gridarta/gui/connectionview/MonsterView.java
trunk/src/app/net/sf/gridarta/gui/connectionview/View.java
trunk/src/app/net/sf/gridarta/gui/connectionview/package-info.java
trunk/src/app/net/sf/gridarta/gui/findarchetypes/FindArchetypesDialog.java
trunk/src/app/net/sf/gridarta/gui/findarchetypes/TableModel.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/AbstractGameObjectAttributesDialog.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/ConfirmErrorsAL.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/DialogAttrib.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/HelpActionListener.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/MaskChangeAL.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/StringKeyManager.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/TreeChooseAction.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/ViewTreasurelistAL.java
trunk/src/app/net/sf/gridarta/gui/gameobjecttexteditor/GameObjectTextEditor.java
trunk/src/app/net/sf/gridarta/gui/gameobjecttexteditor/ScrollingTextPane.java
trunk/src/app/net/sf/gridarta/gui/map/AbstractLevelRenderer.java
trunk/src/app/net/sf/gridarta/gui/map/AbstractMapTilePane.java
trunk/src/app/net/sf/gridarta/gui/map/GoLocationDialog.java
trunk/src/app/net/sf/gridarta/gui/map/GoLocationDialogManager.java
trunk/src/app/net/sf/gridarta/gui/map/LevelRenderer.java
trunk/src/app/net/sf/gridarta/gui/map/MapCursor.java
trunk/src/app/net/sf/gridarta/gui/map/MapCursorActions.java
trunk/src/app/net/sf/gridarta/gui/map/MapCursorControl.java
trunk/src/app/net/sf/gridarta/gui/map/MapCursorEvent.java
trunk/src/app/net/sf/gridarta/gui/map/MapCursorListener.java
trunk/src/app/net/sf/gridarta/gui/map/MapFileActions.java
trunk/src/app/net/sf/gridarta/gui/map/MapGrid.java
trunk/src/app/net/sf/gridarta/gui/map/MapGridEvent.java
trunk/src/app/net/sf/gridarta/gui/map/MapPreviewAccessory.java
trunk/src/app/net/sf/gridarta/gui/map/MapSelectionEvent.java
trunk/src/app/net/sf/gridarta/gui/map/MapSelectionListener.java
trunk/src/app/net/sf/gridarta/gui/map/MapView.java
trunk/src/app/net/sf/gridarta/gui/map/MapViewBasic.java
trunk/src/app/net/sf/gridarta/gui/map/ShrinkMapSizeDialog.java
trunk/src/app/net/sf/gridarta/gui/map/ShrinkMapSizeDialogManager.java
trunk/src/app/net/sf/gridarta/gui/map/TilePanel.java
trunk/src/app/net/sf/gridarta/gui/map/ViewActions.java
trunk/src/app/net/sf/gridarta/gui/map/WindowAction.java
trunk/src/app/net/sf/gridarta/gui/map/package-info.java
trunk/src/app/net/sf/gridarta/gui/newmap/AbstractMapsizeNewMapDialog.java
trunk/src/app/net/sf/gridarta/gui/newmap/AbstractNewMapDialog.java
trunk/src/app/net/sf/gridarta/gui/newmap/NewMapDialog.java
trunk/src/app/net/sf/gridarta/gui/newmap/NewMapDialogFactory.java
trunk/src/app/net/sf/gridarta/gui/newmap/NewPickmapDialog.java
trunk/src/app/net/sf/gridarta/gui/newmap/NewPickmapFolderDialog.java
trunk/src/app/net/sf/gridarta/gui/package-info.java
trunk/src/app/net/sf/gridarta/gui/pickmapchooser/ArchNPickChangeListener.java
trunk/src/app/net/sf/gridarta/gui/pickmapchooser/CurrentPickmapActions.java
trunk/src/app/net/sf/gridarta/gui/pickmapchooser/Folder.java
trunk/src/app/net/sf/gridarta/gui/pickmapchooser/FolderListAction.java
trunk/src/app/net/sf/gridarta/gui/pickmapchooser/FolderListActions.java
trunk/src/app/net/sf/gridarta/gui/pickmapchooser/Loader.java
trunk/src/app/net/sf/gridarta/gui/pickmapchooser/Model.java
trunk/src/app/net/sf/gridarta/gui/pickmapchooser/ModelListener.java
trunk/src/app/net/sf/gridarta/gui/pickmapchooser/Pickmap.java
trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserControl.java
trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserView.java
trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapSelectionListener.java
trunk/src/app/net/sf/gridarta/gui/pickmapchooser/package-info.java
trunk/src/app/net/sf/gridarta/gui/prefs/MapValidatorPrefs.java
trunk/src/app/net/sf/gridarta/gui/prefs/MiscPrefs.java
trunk/src/app/net/sf/gridarta/gui/prefs/UpdatePrefs.java
trunk/src/app/net/sf/gridarta/gui/selectedsquare/CellRenderer.java
trunk/src/app/net/sf/gridarta/gui/selectedsquare/MapTileSelection.java
trunk/src/app/net/sf/gridarta/gui/selectedsquare/MapTileSelectionCache.java
trunk/src/app/net/sf/gridarta/gui/selectedsquare/SelectedSquareControl.java
trunk/src/app/net/sf/gridarta/gui/selectedsquare/SelectedSquareListener.java
trunk/src/app/net/sf/gridarta/gui/selectedsquare/SelectedSquareView.java
trunk/src/app/net/sf/gridarta/gui/selectedsquare/package-info.java
trunk/src/app/net/sf/gridarta/gui/undo/UndoControl.java
trunk/src/app/net/sf/gridarta/gui/undo/package-info.java
trunk/src/app/net/sf/gridarta/help/Help.java
trunk/src/app/net/sf/gridarta/help/HtmlPane.java
trunk/src/app/net/sf/gridarta/help/package-info.java
trunk/src/app/net/sf/gridarta/io/AbstractGameObjectParser.java
trunk/src/app/net/sf/gridarta/io/AbstractMapArchObjectParser.java
trunk/src/app/net/sf/gridarta/io/DefaultMapReader.java
trunk/src/app/net/sf/gridarta/io/DefaultMapWriter.java
trunk/src/app/net/sf/gridarta/io/FlatFileIterator.java
trunk/src/app/net/sf/gridarta/io/GameObjectParser.java
trunk/src/app/net/sf/gridarta/io/IOUtils.java
trunk/src/app/net/sf/gridarta/io/InvalidMapFormatException.java
trunk/src/app/net/sf/gridarta/io/MapArchObjectParser.java
trunk/src/app/net/sf/gridarta/io/MapReader.java
trunk/src/app/net/sf/gridarta/io/PathManager.java
trunk/src/app/net/sf/gridarta/io/RecursiveFileIterator.java
trunk/src/app/net/sf/gridarta/io/package-info.java
trunk/src/app/net/sf/gridarta/map/AbstractMapArchObject.java
trunk/src/app/net/sf/gridarta/map/AutoValidator.java
trunk/src/app/net/sf/gridarta/map/AutoValidatorProcessor.java
trunk/src/app/net/sf/gridarta/map/DefaultMapControl.java
trunk/src/app/net/sf/gridarta/map/DefaultMapModel.java
trunk/src/app/net/sf/gridarta/map/MapArchObject.java
trunk/src/app/net/sf/gridarta/map/MapArchObjectListener.java
trunk/src/app/net/sf/gridarta/map/MapControl.java
trunk/src/app/net/sf/gridarta/map/MapControlListener.java
trunk/src/app/net/sf/gridarta/map/MapModel.java
trunk/src/app/net/sf/gridarta/map/MapModelEvent.java
trunk/src/app/net/sf/gridarta/map/MapModelListener.java
trunk/src/app/net/sf/gridarta/map/MapSquare.java
trunk/src/app/net/sf/gridarta/map/MapState.java
trunk/src/app/net/sf/gridarta/map/MapTransactionListener.java
trunk/src/app/net/sf/gridarta/map/MapType.java
trunk/src/app/net/sf/gridarta/map/ShrinkMapSizeUtils.java
trunk/src/app/net/sf/gridarta/map/package-info.java
trunk/src/app/net/sf/gridarta/map/validation/AbstractValidator.java
trunk/src/app/net/sf/gridarta/map/validation/CorrectableError.java
trunk/src/app/net/sf/gridarta/map/validation/DefaultErrorCollector.java
trunk/src/app/net/sf/gridarta/map/validation/DelegatingMapValidator.java
trunk/src/app/net/sf/gridarta/map/validation/GameObjectValidationError.java
trunk/src/app/net/sf/gridarta/map/validation/GameObjectValidator.java
trunk/src/app/net/sf/gridarta/map/validation/GameObjectsValidationError.java
trunk/src/app/net/sf/gridarta/map/validation/MapValidationError.java
trunk/src/app/net/sf/gridarta/map/validation/MapValidator.java
trunk/src/app/net/sf/gridarta/map/validation/SquareValidationError.java
trunk/src/app/net/sf/gridarta/map/validation/SquareValidator.java
trunk/src/app/net/sf/gridarta/map/validation/ValidationError.java
trunk/src/app/net/sf/gridarta/map/validation/Validator.java
trunk/src/app/net/sf/gridarta/map/validation/checks/AttributeRangeChecker.java
trunk/src/app/net/sf/gridarta/map/validation/checks/AttributeRangeError.java
trunk/src/app/net/sf/gridarta/map/validation/checks/BlockedMatrix.java
trunk/src/app/net/sf/gridarta/map/validation/checks/BlockedMobOrSpawnPointChecker.java
trunk/src/app/net/sf/gridarta/map/validation/checks/BlockedMobOrSpawnPointError.java
trunk/src/app/net/sf/gridarta/map/validation/checks/BlockedSpawnPointChecker.java
trunk/src/app/net/sf/gridarta/map/validation/checks/BlockedSpawnPointError.java
trunk/src/app/net/sf/gridarta/map/validation/checks/BlockedSquareChecker.java
trunk/src/app/net/sf/gridarta/map/validation/checks/BlockedSquareError.java
trunk/src/app/net/sf/gridarta/map/validation/checks/ConnectedInsideContainerChecker.java
trunk/src/app/net/sf/gridarta/map/validation/checks/ConnectionChecker.java
trunk/src/app/net/sf/gridarta/map/validation/checks/ConnectionError.java
trunk/src/app/net/sf/gridarta/map/validation/checks/ConnectionUnknownError.java
trunk/src/app/net/sf/gridarta/map/validation/checks/ConnectionWithoutSinksError.java
trunk/src/app/net/sf/gridarta/map/validation/checks/ConnectionWithoutSourcesError.java
trunk/src/app/net/sf/gridarta/map/validation/checks/CustomTypeChecker.java
trunk/src/app/net/sf/gridarta/map/validation/checks/CustomTypeError.java
trunk/src/app/net/sf/gridarta/map/validation/checks/DoubleLayerChecker.java
trunk/src/app/net/sf/gridarta/map/validation/checks/DoubleLayerError.java
trunk/src/app/net/sf/gridarta/map/validation/checks/DoubleTypeChecker.java
trunk/src/app/net/sf/gridarta/map/validation/checks/DoubleTypeError.java
trunk/src/app/net/sf/gridarta/map/validation/checks/EmptySpawnPointChecker.java
trunk/src/app/net/sf/gridarta/map/validation/checks/EmptySpawnPointError.java
trunk/src/app/net/sf/gridarta/map/validation/checks/EnvironmentSensorSlayingError.java
trunk/src/app/net/sf/gridarta/map/validation/checks/MobOutsideSpawnPointChecker.java
trunk/src/app/net/sf/gridarta/map/validation/checks/SlayingChecker.java
trunk/src/app/net/sf/gridarta/map/validation/checks/SlayingError.java
trunk/src/app/net/sf/gridarta/map/validation/checks/SquareWithoutFloorChecker.java
trunk/src/app/net/sf/gridarta/map/validation/checks/SysObjectNotOnLayerZeroError.java
trunk/src/app/net/sf/gridarta/map/validation/checks/UndefinedArchetypeChecker.java
trunk/src/app/net/sf/gridarta/map/validation/checks/UndefinedArchetypeError.java
trunk/src/app/net/sf/gridarta/map/validation/checks/UnsetSlayingChecker.java
trunk/src/app/net/sf/gridarta/map/validation/checks/UnsetSlayingError.java
trunk/src/app/net/sf/gridarta/map/validation/checks/package-info.java
trunk/src/app/net/sf/gridarta/map/validation/package-info.java
trunk/src/app/net/sf/gridarta/package-info.java
trunk/src/app/net/sf/gridarta/preferences/Codec.java
trunk/src/app/net/sf/gridarta/preferences/FilePreferences.java
trunk/src/app/net/sf/gridarta/preferences/FilePreferencesFactory.java
trunk/src/app/net/sf/gridarta/preferences/FilePreferencesNode.java
trunk/src/app/net/sf/gridarta/preferences/FilePreferencesRoot.java
trunk/src/app/net/sf/gridarta/preferences/NodeType.java
trunk/src/app/net/sf/gridarta/preferences/Storage.java
trunk/src/app/net/sf/gridarta/spells/ArchetypeSetSpellLoader.java
trunk/src/app/net/sf/gridarta/spells/GameObjectSpell.java
trunk/src/app/net/sf/gridarta/spells/NumberSpell.java
trunk/src/app/net/sf/gridarta/spells/Spell.java
trunk/src/app/net/sf/gridarta/spells/Spells.java
trunk/src/app/net/sf/gridarta/spells/XMLSpellLoader.java
trunk/src/app/net/sf/gridarta/textedit/scripteditor/Actions.java
trunk/src/app/net/sf/gridarta/textedit/scripteditor/CFPythonPopup.java
trunk/src/app/net/sf/gridarta/textedit/scripteditor/EditWindowListener.java
trunk/src/app/net/sf/gridarta/textedit/scripteditor/ScriptEditControl.java
trunk/src/app/net/sf/gridarta/textedit/scripteditor/ScriptEditControlInstance.java
trunk/src/app/net/sf/gridarta/textedit/scripteditor/ScriptEditView.java
trunk/src/app/net/sf/gridarta/textedit/scripteditor/UndoActions.java
trunk/src/app/net/sf/gridarta/textedit/scripteditor/package-info.java
trunk/src/app/net/sf/gridarta/textedit/textarea/DefaultInputHandler.java
trunk/src/app/net/sf/gridarta/textedit/textarea/Highlight.java
trunk/src/app/net/sf/gridarta/textedit/textarea/InputHandler.java
trunk/src/app/net/sf/gridarta/textedit/textarea/JEditTextArea.java
trunk/src/app/net/sf/gridarta/textedit/textarea/ScrollLayout.java
trunk/src/app/net/sf/gridarta/textedit/textarea/SyntaxDocument.java
trunk/src/app/net/sf/gridarta/textedit/textarea/SyntaxStyle.java
trunk/src/app/net/sf/gridarta/textedit/textarea/SyntaxStyles.java
trunk/src/app/net/sf/gridarta/textedit/textarea/SyntaxUtilities.java
trunk/src/app/net/sf/gridarta/textedit/textarea/TextAreaDefaults.java
trunk/src/app/net/sf/gridarta/textedit/textarea/TextAreaPainter.java
trunk/src/app/net/sf/gridarta/textedit/textarea/TextUtilities.java
trunk/src/app/net/sf/gridarta/textedit/textarea/Token.java
trunk/src/app/net/sf/gridarta/textedit/textarea/actions/Copy.java
trunk/src/app/net/sf/gridarta/textedit/textarea/actions/Cut.java
trunk/src/app/net/sf/gridarta/textedit/textarea/actions/End.java
trunk/src/app/net/sf/gridarta/textedit/textarea/actions/Find.java
trunk/src/app/net/sf/gridarta/textedit/textarea/actions/FindAgain.java
trunk/src/app/net/sf/gridarta/textedit/textarea/actions/FunctionMenu.java
trunk/src/app/net/sf/gridarta/textedit/textarea/actions/Home.java
trunk/src/app/net/sf/gridarta/textedit/textarea/actions/Paste.java
trunk/src/app/net/sf/gridarta/textedit/textarea/actions/Replace.java
trunk/src/app/net/sf/gridarta/textedit/textarea/actions/Save.java
trunk/src/app/net/sf/gridarta/textedit/textarea/package-info.java
trunk/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/CTokenMarker.java
trunk/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/CrossfireDialogTokenMarker.java
trunk/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/DaimoninAITokenMarker.java
trunk/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/EmptyTokenMarker.java
trunk/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/HTMLTokenMarker.java
trunk/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/KeywordMap.java
trunk/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/LuaTokenMarker.java
trunk/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/PythonTokenMarker.java
trunk/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/TokenMarker.java
trunk/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/TokenMarkerFactory.java
trunk/src/app/net/sf/gridarta/treasurelist/CFTreasureListTree.java
trunk/src/app/net/sf/gridarta/treasurelist/TreasureCellRenderer.java
trunk/src/app/net/sf/gridarta/treasurelist/TreasureListsParser.java
trunk/src/app/net/sf/gridarta/treasurelist/TreasureLoader.java
trunk/src/app/net/sf/gridarta/treasurelist/TreasureLocation.java
trunk/src/app/net/sf/gridarta/treasurelist/TreasureObj.java
trunk/src/app/net/sf/gridarta/treasurelist/TreasureTreeNode.java
trunk/src/app/net/sf/gridarta/undo/UndoModel.java
trunk/src/app/net/sf/gridarta/undo/UndoState.java
trunk/src/app/net/sf/gridarta/undo/package-info.java
trunk/src/app/net/sf/gridarta/updater/Updater.java
trunk/src/app/net/sf/gridarta/updater/UpdaterManager.java
trunk/src/app/net/sf/gridarta/utils/ArrayUtils.java
trunk/src/app/net/sf/gridarta/utils/StringUtils.java
trunk/src/doc/copyright.xhtml
trunk/src/doc/dev/codeStyle.xhtml
trunk/src/doc/dev/howToHelp.xhtml
trunk/src/doc/dev/mergeStats.xhtml
trunk/src/doc/dev/start.xhtml
trunk/src/doc/dev/todo.xhtml
trunk/src/doc/dev/transactions.xhtml
trunk/src/doc/dev/typeParameters.xhtml
trunk/src/doc/dtd/catalogForAnt.xml
trunk/src/doc/faq.xhtml
trunk/src/doc/hist/MergingEditors.xhtml
trunk/src/doc/history.xhtml
trunk/src/doc/news/2006-05-27_1.xhtml
trunk/src/doc/news/start.xhtml
trunk/src/doc/sitestyle.css
trunk/src/doc/start.xhtml
trunk/src/doc/status404.xhtml
trunk/src/doc/subversion.xhtml
trunk/src/test/net/sf/gridarta/Size2DTest.java
trunk/src/test/net/sf/gridarta/WrappingStringBuilderTest.java
trunk/src/test/net/sf/gridarta/gui/HideFileFilterProxyTest.java
trunk/src/test/net/sf/gridarta/gui/map/MapGridTest.java
trunk/src/test/net/sf/gridarta/gui/map/package-info.java
trunk/src/test/net/sf/gridarta/gui/package-info.java
trunk/src/test/net/sf/gridarta/package-info.java
trunk/src/test/net/sf/gridarta/utils/StringUtilsTest.java
Modified: trunk/crossfire/src/cfeditor/CFJavaEditor.java
===================================================================
--- trunk/crossfire/src/cfeditor/CFJavaEditor.java 2008-07-04 21:43:47 UTC (rev 4234)
+++ trunk/crossfire/src/cfeditor/CFJavaEditor.java 2008-07-04 22:09:15 UTC (rev 4235)
@@ -93,7 +93,8 @@
if (arg.equals("--help") || arg.equals("-h")) {
usage();
return;
- } else if (arg.equals(op = "--outfile") || arg.equals(op = "-o")) {
+ } else
+ if (arg.equals(op = "--outfile") || arg.equals(op = "-o")) {
if (outfile != null) {
System.err.println("Warning: Option --outfile specified more than once. Overriding previous argument.");
}
@@ -180,7 +181,7 @@
}
}
- private static void processFile(final CMainControl mainControl, final String filelist) throws IOException{
+ private static void processFile(final CMainControl mainControl, final String filelist) throws IOException {
try {
final BufferedReader reader = new BufferedReader(new FileReader(filelist));
try {
Modified: trunk/crossfire/src/cfeditor/CFilterControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CFilterControl.java 2008-07-04 21:43:47 UTC (rev 4234)
+++ trunk/crossfire/src/cfeditor/CFilterControl.java 2008-07-04 22:09:15 UTC (rev 4235)
@@ -39,19 +39,17 @@
/**
* Control for filters.
* <p/>
- * Control to check if
- * 1) a specific GameObject can be shown (filter out of view part)
- * 2) a specific MapSquare must be highlighted (analysis part)
- * It provides only one filterOut path (and so elements are visible
- * or not, they can't be twice visible or such).
- * It provides 3 highlight paths. each of them can be (dis)enabled.
- * So you can, e.g., highlight walls in a specific color, teleporters in another
- * and monsters in a third.
- * highlight and filterOut filters works all the same. You can activate specific
- * predefined filters or you can provide your own
- * If several predefined Filters are activated for a path, they are combined
- * in an OR way. For example, if you enable the filterOut path, activate in
- * this path the wall and the floor filters, only walls and floors will be shown.
+ * Control to check if 1) a specific GameObject can be shown (filter out of view
+ * part) 2) a specific MapSquare must be highlighted (analysis part) It provides
+ * only one filterOut path (and so elements are visible or not, they can't be
+ * twice visible or such). It provides 3 highlight paths. each of them can be
+ * (dis)enabled. So you can, e.g., highlight walls in a specific color,
+ * teleporters in another and monsters in a third. highlight and filterOut
+ * filters works all the same. You can activate specific predefined filters or
+ * you can provide your own If several predefined Filters are activated for a
+ * path, they are combined in an OR way. For example, if you enable the
+ * filterOut path, activate in this path the wall and the floor filters, only
+ * walls and floors will be shown.
* @author tchize
*/
//TODO allow implementation of own filter
@@ -68,13 +66,15 @@
private final boolean[] highLightResult;
/** The main control. */
- @NotNull private final CMainControl mainControl;
+ @NotNull
+ private final CMainControl mainControl;
- @Nullable private final MapControl<cfeditor.gameobject.GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl;
+ @Nullable
+ private final MapControl<cfeditor.gameobject.GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl;
/**
- * Create a new FilterControl.
- * Do not highlight anything and does not filterOut anything
+ * Create a new FilterControl. Do not highlight anything and does not
+ * filterOut anything
* @param mapControl MapControl to create FilterControl for.
* @param mainControl The main control.
*/
@@ -82,7 +82,7 @@
this.filterList = filterList;
this.mainControl = mainControl;
filterOutConfig = (NamedFilterConfig) filterList.createConfig();
- highLightConfig = new NamedFilterConfig[]{
+ highLightConfig = new NamedFilterConfig[] {
(NamedFilterConfig) filterList.createConfig(),
(NamedFilterConfig) filterList.createConfig(),
(NamedFilterConfig) filterList.createConfig(),
Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java 2008-07-04 21:43:47 UTC (rev 4234)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2008-07-04 22:09:15 UTC (rev 4235)
@@ -159,7 +159,8 @@
private final MainView<GameObject, MapArchObject, Archetype, CMapViewBasic> mainView;
/** The undo control. */
- @NotNull private final UndoControl<GameObject, MapArchObject, Archetype, CMapViewBasic> undoControl;
+ @NotNull
+ private final UndoControl<GameObject, MapArchObject, Archetype, CMapViewBasic> undoControl;
private final ArchetypeParser archetypeParser;
@@ -178,9 +179,7 @@
/** List of objects on map (right side). */
private SelectedSquareControl<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareControl;
- /**
- * The ArchetypeSet, which is a registry of all Archetypes.
- */
+ /** The ArchetypeSet, which is a registry of all Archetypes. */
private final ArchetypeSet archetypeSet;
private final NamedFilterList defaultNamedFilterList;
@@ -224,7 +223,6 @@
/**
* Constructs the main controller and its model and view.
- *
* @throws RuntimeException If the controller cannot be initialized.
*/
public CMainControl() {
@@ -367,7 +365,7 @@
specialTreasureLists = Collections.emptyMap();
}
treasureListTree = new CFTreasureListTree<GameObject, MapArchObject, Archetype>(mainView, archetypeSet, specialTreasureLists,
- new TreasureLocation(getCollectedDirectory(), IGUIConstants.TREASURES_FILE)
+ new TreasureLocation(getCollectedDirectory(), IGUIConstants.TREASURES_FILE)
);
recentManager.initRecent();
validators = createMapValidators();
@@ -413,7 +411,7 @@
Archetype.TYPE_TRIGGER,
Archetype.TYPE_TRIGGER_ALTAR,
Archetype.TYPE_TRIGGER_BUTTON,
- }, new int[] {
+ }, new int[] {
Archetype.TYPE_CREATOR,
Archetype.TYPE_DIRECTOR,
Archetype.TYPE_DUPLICATOR,
@@ -425,7 +423,7 @@
Archetype.TYPE_TELEPORTER,
Archetype.TYPE_TIMED_GATE,
Archetype.TYPE_TRIGGER_MARKER,
- }),
+ }),
customTypeChecker,
new MapDifficultyChecker(),
new UndefinedArchetypeChecker<GameObject, MapArchObject, Archetype>(),
@@ -458,12 +456,14 @@
}
/** View Treasure Lists. */
- @ActionMethod public void viewTreasurelists() {
+ @ActionMethod
+ public void viewTreasurelists() {
treasureListTree.showDialog();
}
/** Edit an existing script. */
- @ActionMethod public void editScript() {
+ @ActionMethod
+ public void editScript() {
openFileWanted(false);
}
@@ -543,9 +543,10 @@
}
/**
- * The user wants to open a file.
- * The filefilters and preselected filefilter are set accordingly to <var>mapFilter</var>.
- * @param mapFilter set to <code>true</code> if the user probably wants to open a map, <code>false</code> otherwise
+ * The user wants to open a file. The filefilters and preselected filefilter
+ * are set accordingly to <var>mapFilter</var>.
+ * @param mapFilter set to <code>true</code> if the user probably wants to
+ * open a map, <code>false</code> otherwise
*/
public void openFileWanted(final boolean mapFilter) {
if (fileChooser == null) {
@@ -571,7 +572,7 @@
/**
* Load an array of files.
- * @param dir directory to load files from
+ * @param dir directory to load files from
* @param files array of files to load
*/
private void openFiles(final File dir, final File... files) {
@@ -685,7 +686,10 @@
PreferencesPane.showPreferencesDialog(mainView, prefsGroup, false);
}
- /** Invoked to show the next tip of the day or bring the tip of the day to front. */
+ /**
+ * Invoked to show the next tip of the day or bring the tip of the day to
+ * front.
+ */
public void tod() {
TipOfTheDayManager.show(mainView);
}
@@ -707,35 +711,37 @@
appExitNotify();
ScriptEditControlInstance.getInstance().appExitNotify();
final Thread thread = new Thread() {
- /** {@inheritDoc} */
- public void run() {
- try {
- mainActions.waitUntilArchCollectionFinished();
- } catch (final InterruptedException ex) {
- log.warn("Archetype collection was interrupted");
- }
- try {
- SwingUtilities.invokeAndWait(new Runnable() {
- /** {@inheritDoc} */
- public void run() {
- mainView.dispose();
- }
- });
- } catch (final InterruptedException ex) {
- log.warn("Cannot destroy main view: " + ex.getMessage());
- } catch (final InvocationTargetException ex) {
- log.warn("Cannot destroy main view: " + ex.getMessage());
- }
- if (prefs.getBoolean(PREFS_SYSTEM_EXIT, PREFS_SYSTEM_EXIT_DEFAULT)) {
- if (log.isDebugEnabled()) {
- log.debug(ACTION_FACTORY.getString("logExitWithExit"));
+ /** {@inheritDoc} */
+ public void run() {
+ try {
+ mainActions.waitUntilArchCollectionFinished();
+ } catch (final InterruptedException ex) {
+ log.warn("Archetype collection was interrupted");
+ }
+ try {
+ SwingUtilities.invokeAndWait(new Runnable() {
+ /** {@inheritDoc} */
+ public void run() {
+ mainView.dispose();
}
- System.exit(0);
- } else {
- log.debug(ACTION_FACTORY.getString("logExitWithoutExit"));
+ });
+ } catch (final InterruptedException ex) {
+ log.warn("Cannot destroy main view: " + ex.getMessage());
+ } catch (final InvocationTargetException ex) {
+ log.warn("Cannot destroy main view: " + ex.getMessage());
+ }
+ if (prefs.getBoolean(PREFS_SYSTEM_EXIT, PREFS_SYSTEM_EXIT_DEFAULT)) {
+ if (log.isDebugEnabled()) {
+ log.debug(ACTION_FACTORY.getString("logExitWithExit"));
}
- };
- };
+ System.exit(0);
+ } else {
+ log.debug(ACTION_FACTORY.getString("logExitWithoutExit"));
+ }
+ }
+
+ ;
+ };
thread.start();
}
@@ -802,9 +808,10 @@
/**
* Returns the current top map view we are working with.
* @return the current top map view we are working with, or
- * <code>null</code> if no map is open
+ * <code>null</code> if no map is open
*/
- @Nullable public MapView<GameObject, MapArchObject, Archetype, CMapViewBasic> getCurrentMapView() {
+ @Nullable
+ public MapView<GameObject, MapArchObject, Archetype, CMapViewBasic> getCurrentMapView() {
return mainView == null ? null : mainView.getCurrentMapView();
}
@@ -825,12 +832,14 @@
}
/** {@inheritDoc} */
- @NotNull public String getConfigurationDirectory() {
+ @NotNull
+ public String getConfigurationDirectory() {
return "resource/conf";
}
/** {@inheritDoc} */
- @NotNull public String getCollectedDirectory() {
+ @NotNull
+ public String getCollectedDirectory() {
return getConfigurationDirectory();
}
@@ -854,12 +863,14 @@
}
/** {@inheritDoc} */
- @NotNull public SelectedSquareControl<GameObject, MapArchObject, Archetype, CMapViewBasic> getSelectedSquareControl() {
+ @NotNull
+ public SelectedSquareControl<GameObject, MapArchObject, Archetype, CMapViewBasic> getSelectedSquareControl() {
return selectedSquareControl;
}
/** {@inheritDoc} */
- @NotNull public MainActions<GameObject, MapArchObject, Archetype, CMapViewBasic> getMainActions() {
+ @NotNull
+ public MainActions<GameObject, MapArchObject, Archetype, CMapViewBasic> getMainActions() {
return mainActions;
}
Modified: trunk/crossfire/src/cfeditor/CResourceLoader.java
===================================================================
--- trunk/crossfire/src/cfeditor/CResourceLoader.java 2008-07-04 21:43:47 UTC (rev 4234)
+++ trunk/crossfire/src/cfeditor/CResourceLoader.java 2008-07-04 22:09:15 UTC (rev 4235)
@@ -29,18 +29,14 @@
import org.jdom.input.SAXBuilder;
/**
- * Loader for loading resources from various locations.
- * Used to load resources from various locations.
- * Given a relative filename, this looks for the given
- * file in the following order:
- * - current directory
- * - home directory
- * - JAR resource
- * It is also able to write the resource. If resource was loaded
- * from current directory or home directory, it is written at same
- * place (if not read only). If the resource was loaded from JAR, it
- * is written to the home directory. You can also explicitly choose
- * where to load/save using the LOCATION_xxx constants
+ * Loader for loading resources from various locations. Used to load resources
+ * from various locations. Given a relative filename, this looks for the given
+ * file in the following order: - current directory - home directory - JAR
+ * resource It is also able to write the resource. If resource was loaded from
+ * current directory or home directory, it is written at same place (if not read
+ * only). If the resource was loaded from JAR, it is written to the home
+ * directory. You can also explicitly choose where to load/save using the
+ * LOCATION_xxx constants
* @author tchize
*/
public final class CResourceLoader {
@@ -75,10 +71,10 @@
/**
* Create a new ResourceLoader with given relative filename.
- * @param filename The relative filename location
+ * @param filename The relative filename location
* @param checkCurrent Enable check for resource in current directory
- * @param checkHome Enable check for resource in home directory
- * @param checkJAR Enable check for resource in JAR
+ * @param checkHome Enable check for resource in home directory
+ * @param checkJAR Enable check for resource in JAR
*/
public CResourceLoader(String filename, final boolean checkCurrent, final boolean checkHome, final boolean checkJAR) {
this.filename = filename;
@@ -167,15 +163,13 @@
}
/**
- * Return the filename to use when dealing with this
- * application's and current users' home directory.
- * For example, if called like this
- * <code>CResourceLoader.getHomeFile("myfile");</code>
- * will return something like /home/someuser/.gridarta/myfile
- * under Linux.
+ * Return the filename to use when dealing with this application's and
+ * current users' home directory. For example, if called like this
+ * <code>CResourceLoader.getHomeFile("myfile");</code> will return something
+ * like /home/someuser/.gridarta/myfile under Linux.
* @param filename the name of requested file.
- * @return the full to user home directory, appended with
- * application directory and the filename.
+ * @return the full to user home directory, appended with application
+ * directory and the filename.
*/
public static File getHomeFile(final String filename) {
final StringBuilder buf = new StringBuilder(128);
@@ -193,13 +187,13 @@
/**
* Returns an aggregated XML document from the supplied parameters.
- * @param filename The resource name to load
+ * @param filename The resource name to load
* @param readCurrent read from current directory
- * @param readHome read from home/gridarta directory
- * @param readJar read from Jar
+ * @param readHome read from home/gridarta directory
+ * @param readJar read from Jar
* @return A document with which's element is the root element of jar file
- * and which content aggregates the content of root element of all files
- * read
+ * and which content aggregates the content of root element of all
+ * files read
*/
public static Document getAggregateXML(final String filename, final boolean readCurrent, final boolean readHome, final boolean readJar) {
final SAXBuilder builder = new SAXBuilder(false); /*non validating*/
@@ -259,7 +253,7 @@
log.debug("loading {" + jarDoc + ", " + homeDoc + ", " + currentDoc + "}");
}
- final Document[] docList = new Document[]{jarDoc, homeDoc, currentDoc,};
+ final Document[] docList = new Document[] {jarDoc, homeDoc, currentDoc,};
Document mainDoc = null;
for (final Document document : docList) {
if (document != null && document.hasRootElement()) {
Modified: trunk/crossfire/src/cfeditor/CrossfireObjectsFactory.java
===================================================================
--- trunk/crossfire/src/cfeditor/CrossfireObjectsFactory.java 2008-07-04 21:43:47 UTC (rev 4234)
+++ trunk/crossfire/src/cfeditor/CrossfireObjectsFactory.java 2008-07-04 22:09:15 UTC (rev 4235)
@@ -53,7 +53,6 @@
/**
* The {@link GridartaObjectsFactory} to create Crossfire related objects.
- *
* @author Andreas Kirschbaum
*/
public class CrossfireObjectsFactory implements GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> {
@@ -71,15 +70,18 @@
private ObjectChooser<GameObject, MapArchObject, Archetype, CMapViewBasic> objectChooser = null;
/** The {@link ArchetypeChooserControl} instance to use. */
- @NotNull private ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserControl = null;
+ @NotNull
+ private ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserControl = null;
/** {@inheritDoc} */
- @NotNull public GameObject newGameObject() {
+ @NotNull
+ public GameObject newGameObject() {
return new GameObject();
}
/** {@inheritDoc} */
- @NotNull public MapArchObject newMapArchObject(final boolean addDefaultAttributes) {
+ @NotNull
+ public MapArchObject newMapArchObject(final boolean addDefaultAttributes) {
final MapArchObject mapArchObject = new MapArchObject();
if (addDefaultAttributes) {
mapArchObject.addText("Created: " + String.format("%tF", System.currentTimeMillis()) + " " + prefs.get(AbstractMainControl.PREFS_USERNAME, AbstractMainControl.PREFS_USERNAME_DEFAULT));
@@ -88,12 +90,14 @@
}
/** {@inheritDoc} */
- @NotNull public MapReader<GameObject, MapArchObject> newMapReader(@NotNull final File file) throws FileNotFoundException {
+ @NotNull
+ public MapReader<GameObject, MapArchObject> newMapReader(@NotNull final File file) throws FileNotFoundException {
return new DefaultMapReader<GameObject, MapArchObject, Archetype>(CMainControl.getInstance(), file);
}
/** {@inheritDoc} */
- @NotNull public Archetype newUndefinedArchetype(@NotNull final String archetypeName) {
+ @NotNull
+ public Archetype newUndefinedArchetype(@NotNull final String archetypeName) {
return new UndefinedArchetype(archetypeName);
}
@@ -108,22 +112,26 @@
}
/** {@inheritDoc} */
- @NotNull public MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> newMapControl(@Nullable final List<GameObject> objects, @NotNull final MapArchObject mapArchObject) {
+ @NotNull
+ public MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> newMapControl(@Nullable final List<GameObject> objects, @NotNull final MapArchObject mapArchObject) {
return new DefaultMapControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, CMainControl.getInstance(), objects, mapArchObject, false, GameObjectMatchersInstance.getInstance().getMatcher("exit"), archetypeChooserControl);
}
/** {@inheritDoc} */
- @NotNull public MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> newPickmapControl(@Nullable final List<GameObject> objects, @NotNull final MapArchObject mapArchObject) {
+ @NotNull
+ public MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> newPickmapControl(@Nullable final List<GameObject> objects, @NotNull final MapArchObject mapArchObject) {
return new DefaultMapControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, CMainControl.getInstance(), objects, mapArchObject, true, GameObjectMatchersInstance.getInstance().getMatcher("exit"), archetypeChooserControl);
}
/** {@inheritDoc} */
- @NotNull public LevelRenderer newSimpleLevelRenderer(@NotNull final MapModel<GameObject, MapArchObject, Archetype> mapModel, @NotNull final ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet) {
+ @NotNull
+ public LevelRenderer newSimpleLevelRenderer(@NotNull final MapModel<GameObject, MapArchObject, Archetype> mapModel, @NotNull final ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet) {
return new SimpleLevelRenderer(mapModel, archetypeSet);
}
/** {@inheritDoc} */
- @NotNull public MapView<GameObject, MapArchObject, Archetype, CMapViewBasic> newMapView(@NotNull final MapControl mapControl, @Nullable final Point viewPosition, final int viewCounter) {
+ @NotNull
+ public MapView<GameObject, MapArchObject, Archetype, CMapViewBasic> newMapView(@NotNull final MapControl mapControl, @Nullable final Point viewPosition, final int viewCounter) {
return new MapView<GameObject, MapArchObject, Archetype, CMapViewBasic>(AbstractMainControl.getInstance(), mapControl, viewCounter, new CMapViewBasic(CMainControl.getInstance(), mapControl, viewPosition, faceObjects, objectChooser), ACTION_FACTORY);
}
Modified: trunk/crossfire/src/cfeditor/IGUIConstants.java
===================================================================
--- trunk/crossfire/src/cfeditor/IGUIConstants.java 2008-07-04 21:43:47 UTC (rev 4234)
+++ trunk/crossfire/src/cfeditor/IGUIConstants.java 2008-07-04 22:09:15 UTC (rev 4235)
@@ -30,9 +30,9 @@
public interface IGUIConstants extends GUIConstants {
/**
- * Internal version number of the included online-documentation.
- * Increasing the number causes an automated popup of the docu
- * when users upgrade their editor and run for the first time.
+ * Internal version number of the included online-documentation. Increasing
+ * the number causes an automated popup of the docu when users upgrade their
+ * editor and run for the first time.
*/
int DOCU_VERSION = 2;
Modified: trunk/crossfire/src/cfeditor/MapActions.java
===================================================================
--- trunk/crossfire/src/cfeditor/MapActions.java 2008-07-04 21:43:47 UTC (rev 4234)
+++ trunk/crossfire/src/cfeditor/MapActions.java 2008-07-04 22:09:15 UTC (rev 4235)
@@ -62,19 +62,13 @@
/** Preferences. */
private static final Preferences prefs = Preferences.userNodeForPackage(MainControl.class);
- /**
- * Key for saving {@link #autoJoin} state in preferences.
- */
+ /** Key for saving {@link #autoJoin} state in preferences. */
private static final String AUTOJOIN_KEY = "autojoin";
- /**
- * Possible directions for "enter xxx map".
- */
+ /** Possible directions for "enter xxx map". */
private final String[] directionsMap = {"enterNorthMap", "enterEastMap", "enterSouthMap", "enterWestMap", "enterNorthEastMap", "enterSouthEastMap", "enterSouthWestMap", "enterNorthWestMap"};
- /**
- * Possible directions for "enter xxx map".
- */
+ /** Possible directions for "enter xxx map". */
private final int[] directionsDir = {CommonConstants.NORTH, CommonConstants.EAST, CommonConstants.SOUTH, CommonConstants.WEST};
/** Action for "grid visible". */
@@ -104,9 +98,7 @@
/** Indicates whether autojoining is on/off. */
private boolean autoJoin;
- /**
- * The main control to use.
- */
+ /** The main control to use. */
private final CMainControl mainControl;
/** The map manager. */
@@ -115,23 +107,16 @@
/** The matcher for selecting exit objects. */
private final GameObjectMatcher exitMatcher;
- /**
- * The current map listener used to detect current map/map view changes.
- */
+ /** The current map list...
[truncated message content] |
|
From: <aki...@us...> - 2008-07-04 22:19:19
|
Revision: 4238
http://gridarta.svn.sourceforge.net/gridarta/?rev=4238&view=rev
Author: akirschbaum
Date: 2008-07-04 15:19:19 -0700 (Fri, 04 Jul 2008)
Log Message:
-----------
Use correct static class name.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/gameobject/GameObject.java
trunk/daimonin/src/daieditor/gameobject/GameObject.java
Modified: trunk/crossfire/src/cfeditor/gameobject/GameObject.java
===================================================================
--- trunk/crossfire/src/cfeditor/gameobject/GameObject.java 2008-07-04 22:17:48 UTC (rev 4237)
+++ trunk/crossfire/src/cfeditor/gameobject/GameObject.java 2008-07-04 22:19:19 UTC (rev 4238)
@@ -20,10 +20,10 @@
package cfeditor.gameobject;
import cfeditor.gameobject.scripts.ScriptArchData;
-import cfeditor.gameobject.scripts.ScriptArchEditor;
import cfeditor.map.MapArchObject;
import java.io.Serializable;
import javax.swing.JList;
+import net.sf.gridarta.gameobject.scripts.AbstractScriptArchEditor;
import net.sf.gridarta.gui.GameObjectAttributesPanel;
import net.sf.gridarta.utils.StringUtils;
import org.jetbrains.annotations.NotNull;
@@ -224,7 +224,7 @@
/** {@inheritDoc} */
@Override
public void addEventScript(@NotNull final JList eventList, @NotNull final GameObjectAttributesPanel<GameObject, MapArchObject, Archetype, ?> mapanel) {
- ScriptArchEditor.addEventScript(eventList, this, scriptArchData);
+ AbstractScriptArchEditor.addEventScript(eventList, this, scriptArchData);
if (!scriptArchData.isEmpty()) {
mapanel.setScriptPanelButtonState(true, true, true, true);
Modified: trunk/daimonin/src/daieditor/gameobject/GameObject.java
===================================================================
--- trunk/daimonin/src/daieditor/gameobject/GameObject.java 2008-07-04 22:17:48 UTC (rev 4237)
+++ trunk/daimonin/src/daieditor/gameobject/GameObject.java 2008-07-04 22:19:19 UTC (rev 4238)
@@ -22,12 +22,12 @@
import daieditor.CMainControl;
import daieditor.gameobject.anim.AnimationObject;
import daieditor.gameobject.scripts.ScriptArchData;
-import daieditor.gameobject.scripts.ScriptArchEditor;
import daieditor.map.MapArchObject;
import java.io.Serializable;
import javax.swing.ImageIcon;
import javax.swing.JList;
import net.sf.gridarta.gameobject.anim.AnimationObjects;
+import net.sf.gridarta.gameobject.scripts.AbstractScriptArchEditor;
import net.sf.gridarta.gui.GameObjectAttributesPanel;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -395,7 +395,7 @@
/** {@inheritDoc} */
@Override
public void addEventScript(@NotNull final JList eventList, @NotNull final GameObjectAttributesPanel<GameObject, MapArchObject, Archetype, ?> mapanel) {
- ScriptArchEditor.addEventScript(eventList, this, scriptArchData);
+ AbstractScriptArchEditor.addEventScript(eventList, this, scriptArchData);
if (!scriptArchData.isEmpty()) {
mapanel.setScriptPanelButtonState(true, true, true, true);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-07-04 22:29:46
|
Revision: 4239
http://gridarta.svn.sourceforge.net/gridarta/?rev=4239&view=rev
Author: akirschbaum
Date: 2008-07-04 15:29:42 -0700 (Fri, 04 Jul 2008)
Log Message:
-----------
Replace string literals with character literals.
Modified Paths:
--------------
trunk/daimonin/src/daieditor/gameobject/ArchetypeSet.java
trunk/daimonin/src/daieditor/map/MapArchObject.java
trunk/src/app/net/sf/gridarta/data/NamedTreeNode.java
trunk/src/app/net/sf/gridarta/gameobject/GameObject.java
trunk/src/app/net/sf/gridarta/gameobject/scripts/ScriptUtils.java
trunk/src/app/net/sf/gridarta/gui/map/AbstractMapTilePane.java
trunk/src/app/net/sf/gridarta/io/AbstractMapArchObjectParser.java
trunk/src/app/net/sf/gridarta/io/PathManager.java
trunk/src/app/net/sf/gridarta/textedit/scripteditor/CFPythonPopup.java
trunk/src/app/net/sf/gridarta/treasurelist/TreasureLoader.java
Modified: trunk/daimonin/src/daieditor/gameobject/ArchetypeSet.java
===================================================================
--- trunk/daimonin/src/daieditor/gameobject/ArchetypeSet.java 2008-07-04 22:19:19 UTC (rev 4238)
+++ trunk/daimonin/src/daieditor/gameobject/ArchetypeSet.java 2008-07-04 22:29:42 UTC (rev 4239)
@@ -258,7 +258,7 @@
defArchName = thisLine.substring(9);
} else if (thisLine.startsWith("editor ")) {
final String editor = thisLine.substring(7);
- final int tIndex = editor.indexOf(":");
+ final int tIndex = editor.indexOf(':');
if (tIndex != -1) {
editorPath = editor.substring(tIndex + 1);
// TODO: use editorPath for determining the place of this GameObject
Modified: trunk/daimonin/src/daieditor/map/MapArchObject.java
===================================================================
--- trunk/daimonin/src/daieditor/map/MapArchObject.java 2008-07-04 22:19:19 UTC (rev 4238)
+++ trunk/daimonin/src/daieditor/map/MapArchObject.java 2008-07-04 22:29:42 UTC (rev 4239)
@@ -134,7 +134,7 @@
* @note Daimonin stores background music information in the map name.
*/
public String getMapDisplayName() {
- final int t = getMapName().indexOf("§");
+ final int t = getMapName().indexOf('§');
return t > 0 ? getMapName().substring(0, t) : getMapName();
}
@@ -144,8 +144,8 @@
*/
@Nullable
public String getBackgroundMusic() {
- final int t1 = getMapName().indexOf("§");
- final int t2 = getMapName().indexOf("|");
+ final int t1 = getMapName().indexOf('§');
+ final int t2 = getMapName().indexOf('|');
return t1 > 0 && t2 > t1 ? getMapName().substring(t1 + 1, t2) : null;
}
Modified: trunk/src/app/net/sf/gridarta/data/NamedTreeNode.java
===================================================================
--- trunk/src/app/net/sf/gridarta/data/NamedTreeNode.java 2008-07-04 22:19:19 UTC (rev 4238)
+++ trunk/src/app/net/sf/gridarta/data/NamedTreeNode.java 2008-07-04 22:29:42 UTC (rev 4239)
@@ -140,8 +140,8 @@
// Now we have the child node name in realName
if (realName.contains("/")) {
// Find directory node and append there
- final String dirName = realName.substring(0, realName.indexOf("/"));
- realName = realName.substring(realName.indexOf("/"));
+ final String dirName = realName.substring(0, realName.indexOf('/'));
+ realName = realName.substring(realName.indexOf('/'));
NamedTreeNode<E> dirNode = childNodes.get(dirName);
if (dirNode == null) {
dirNode = new NamedTreeNode<E>(true, this, dirName);
Modified: trunk/src/app/net/sf/gridarta/gameobject/GameObject.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/GameObject.java 2008-07-04 22:19:19 UTC (rev 4238)
+++ trunk/src/app/net/sf/gridarta/gameobject/GameObject.java 2008-07-04 22:29:42 UTC (rev 4239)
@@ -1278,7 +1278,7 @@
final StringBuilder result = new StringBuilder();
for (final String line : patternEndOfLine.split(atxt, 0)) {
if (ignoreValues) {
- final int spaceIndex = line.indexOf(" ");
+ final int spaceIndex = line.indexOf(' ');
if (line.length() > 0 && spaceIndex > 0 && diffTextString(getObjectText(), line.substring(0, spaceIndex + 1), ignoreValues) == null) {
result.append(line).append('\n');
}
Modified: trunk/src/app/net/sf/gridarta/gameobject/scripts/ScriptUtils.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/scripts/ScriptUtils.java 2008-07-04 22:19:19 UTC (rev 4238)
+++ trunk/src/app/net/sf/gridarta/gameobject/scripts/ScriptUtils.java 2008-07-04 22:29:42 UTC (rev 4239)
@@ -95,8 +95,8 @@
public static String chooseDefaultScriptName(final String archName, final String scriptEnding) {
String defScriptName = archName.trim();
final int i;
- if ((i = defScriptName.indexOf(" ")) >= 0) {
- if (defScriptName.length() > 12 || defScriptName.lastIndexOf(" ") != i) {
+ if ((i = defScriptName.indexOf(' ')) >= 0) {
+ if (defScriptName.length() > 12 || defScriptName.lastIndexOf(' ') != i) {
// if there are several whitespaces or the name is too long, just cut off the end
defScriptName = defScriptName.substring(0, i);
} else {
Modified: trunk/src/app/net/sf/gridarta/gui/map/AbstractMapTilePane.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/AbstractMapTilePane.java 2008-07-04 22:19:19 UTC (rev 4238)
+++ trunk/src/app/net/sf/gridarta/gui/map/AbstractMapTilePane.java 2008-07-04 22:29:42 UTC (rev 4239)
@@ -415,14 +415,14 @@
@Nullable
private String getTilePath(final String base, final String link) {
- final int slashIndex1 = base.lastIndexOf("/");
+ final int slashIndex1 = base.lastIndexOf('/');
final int separatorIndex1 = base.lastIndexOf(File.separator);
int pos = slashIndex1;
if (separatorIndex1 > slashIndex1) {
pos = separatorIndex1;
}
- final int slashIndex2 = link.lastIndexOf("/");
+ final int slashIndex2 = link.lastIndexOf('/');
final int separatorIndex2 = link.lastIndexOf(File.separator);
int pos2 = slashIndex2;
if (separatorIndex2 > slashIndex2) {
Modified: trunk/src/app/net/sf/gridarta/io/AbstractMapArchObjectParser.java
===================================================================
--- trunk/src/app/net/sf/gridarta/io/AbstractMapArchObjectParser.java 2008-07-04 22:19:19 UTC (rev 4238)
+++ trunk/src/app/net/sf/gridarta/io/AbstractMapArchObjectParser.java 2008-07-04 22:29:42 UTC (rev 4239)
@@ -108,8 +108,8 @@
// get tile path
try {
final int i = Integer.valueOf(line.substring(10, 11));
- if (i > 0 && i <= mapArchObject.getTilePaths() && line.lastIndexOf(" ") > 0) {
- mapArchObject.setTilePath(i - 1, line.substring(line.lastIndexOf(" ") + 1));
+ if (i > 0 && i <= mapArchObject.getTilePaths() && line.lastIndexOf(' ') > 0) {
+ mapArchObject.setTilePath(i - 1, line.substring(line.lastIndexOf(' ') + 1));
}
} catch (final NumberFormatException e) {
/* ignore (really?) */
Modified: trunk/src/app/net/sf/gridarta/io/PathManager.java
===================================================================
--- trunk/src/app/net/sf/gridarta/io/PathManager.java 2008-07-04 22:19:19 UTC (rev 4238)
+++ trunk/src/app/net/sf/gridarta/io/PathManager.java 2008-07-04 22:29:42 UTC (rev 4239)
@@ -142,7 +142,7 @@
if (isAbsolute(relative)) {
return relative;
}
- String work = reference.substring(0, reference.lastIndexOf("/") + 1) + relative; // + 1 to include the "/"
+ String work = reference.substring(0, reference.lastIndexOf('/') + 1) + relative; // + 1 to include the "/"
String work2;
do {
work2 = work;
Modified: trunk/src/app/net/sf/gridarta/textedit/scripteditor/CFPythonPopup.java
===================================================================
--- trunk/src/app/net/sf/gridarta/textedit/scripteditor/CFPythonPopup.java 2008-07-04 22:19:19 UTC (rev 4238)
+++ trunk/src/app/net/sf/gridarta/textedit/scripteditor/CFPythonPopup.java 2008-07-04 22:29:42 UTC (rev 4239)
@@ -109,7 +109,7 @@
if (line.length() > 0 && !line.startsWith("#")) {
// ATM, the descriptive info about method headers is cut out
// (TODO: parse and show the full info in a statusbar)
- final int k = line.indexOf("(");
+ final int k = line.indexOf('(');
if (k > 0) {
line = line.substring(0, k) + "()";
} else {
@@ -181,7 +181,7 @@
if (!ignore) {
// get method name to insert
String method = popup.getSelectedItem().toString();
- method = method.substring(0, method.indexOf("(")).trim() + "()";
+ method = method.substring(0, method.indexOf('(')).trim() + "()";
final JEditTextArea activeTextArea = control.getActiveTextArea();
if (activeTextArea != null) {
Modified: trunk/src/app/net/sf/gridarta/treasurelist/TreasureLoader.java
===================================================================
--- trunk/src/app/net/sf/gridarta/treasurelist/TreasureLoader.java 2008-07-04 22:19:19 UTC (rev 4238)
+++ trunk/src/app/net/sf/gridarta/treasurelist/TreasureLoader.java 2008-07-04 22:29:42 UTC (rev 4239)
@@ -188,7 +188,7 @@
if (line.length() > 0 && !line.startsWith("#")) {
// reading outside of treasurelist
final int i;
- if (line.startsWith("treasure") && (i = line.indexOf(" ")) != -1) {
+ if (line.startsWith("treasure") && (i = line.indexOf(' ')) != -1) {
// start of a new treasure section
final TreasureTreeNode node = new TreasureTreeNode(line.substring(i).trim(), line.startsWith("treasureone") ? TreasureObj.TREASUREONE_LIST : TreasureObj.TREASURE_LIST);
tmpList.add(node); // put this node to tmplist vector
@@ -258,11 +258,11 @@
if (!insideArch) {
// reading outside of an arch
if (line.startsWith("arch ")) {
- node = new TreasureTreeNode(line.substring(line.indexOf(" ")).trim(), TreasureObj.ARCH);
+ node = new TreasureTreeNode(line.substring(line.indexOf(' ')).trim(), TreasureObj.ARCH);
parentNode.add(node);
insideArch = true;
} else if (line.startsWith("list ")) {
- final String newName = line.substring(line.indexOf(" ")).trim(); // name of this contained list
+ final String newName = line.substring(line.indexOf(' ')).trim(); // name of this contained list
node = new TreasureTreeNode(newName, TreasureObj.TREASURE_LIST);
parentNode.add(node);
needLink.add(node); // this node needs to be linked to it's content later
@@ -283,19 +283,19 @@
insideArch = false;
} else if (line.startsWith("chance")) {
try {
- node.getTreasureObj().setChance(Integer.parseInt(line.substring(line.indexOf(" ") + 1).trim()));
+ node.getTreasureObj().setChance(Integer.parseInt(line.substring(line.indexOf(' ') + 1).trim()));
} catch (final NumberFormatException e) {
errorLog.append("in list ").append(parentNode.getTreasureObj().getName()).append(": arch ").append(node.getTreasureObj().getName()).append(" chance is not a number.\n");
}
} else if (line.startsWith("nrof")) {
try {
- node.getTreasureObj().setNrof(Integer.parseInt(line.substring(line.indexOf(" ") + 1).trim()));
+ node.getTreasureObj().setNrof(Integer.parseInt(line.substring(line.indexOf(' ') + 1).trim()));
} catch (final NumberFormatException e) {
errorLog.append("in list ").append(parentNode.getTreasureObj().getName()).append(": arch ").append(node.getTreasureObj().getName()).append(" nrof value is not a number.\n");
}
} else if (line.startsWith("magic")) {
try {
- node.getTreasureObj().setMagic(Integer.parseInt(line.substring(line.indexOf(" ") + 1).trim()));
+ node.getTreasureObj().setMagic(Integer.parseInt(line.substring(line.indexOf(' ') + 1).trim()));
} catch (final NumberFormatException e) {
errorLog.append("in list ").append(parentNode.getTreasureObj().getName()).append(": arch ").append(node.getTreasureObj().getName()).append(" magic value is not a number.\n");
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-07-04 23:15:43
|
Revision: 4240
http://gridarta.svn.sourceforge.net/gridarta/?rev=4240&view=rev
Author: akirschbaum
Date: 2008-07-04 16:15:40 -0700 (Fri, 04 Jul 2008)
Log Message:
-----------
Remove raw types.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/CrossfireObjectsFactory.java
trunk/crossfire/src/cfeditor/MapActions.java
trunk/crossfire/src/cfeditor/gui/GameObjectAttributesDialog.java
trunk/daimonin/src/daieditor/CMainControl.java
trunk/daimonin/src/daieditor/DaimoninObjectsFactory.java
trunk/daimonin/src/daieditor/MapActions.java
trunk/daimonin/src/daieditor/gui/GameObjectAttributesDialog.java
trunk/daimonin/src/daieditor/gui/map/event/MouseOpEvent.java
trunk/daimonin/src/daieditor/map/validation/checks/ExitError.java
trunk/daimonin/src/daieditor/map/validation/checks/TilePathsError.java
trunk/daimonin/src/daieditor/spells/Spells.java
trunk/src/app/net/sf/gridarta/AbstractMainControl.java
trunk/src/app/net/sf/gridarta/CFArchType.java
trunk/src/app/net/sf/gridarta/CFArchTypeList.java
trunk/src/app/net/sf/gridarta/CopyBuffer.java
trunk/src/app/net/sf/gridarta/floodfill/Floodfill.java
trunk/src/app/net/sf/gridarta/gameobject/IsArchetypeException.java
trunk/src/app/net/sf/gridarta/gameobject/NotArchetypeException.java
trunk/src/app/net/sf/gridarta/gameobject/NotInsideContainerException.java
trunk/src/app/net/sf/gridarta/gameobject/match/AndGameObjectMatcher.java
trunk/src/app/net/sf/gridarta/gameobject/match/AttribGameObjectMatcher.java
trunk/src/app/net/sf/gridarta/gameobject/match/GameObjectMatcher.java
trunk/src/app/net/sf/gridarta/gameobject/match/GameObjectMatchers.java
trunk/src/app/net/sf/gridarta/gameobject/match/MutableNameGameObjectMatcher.java
trunk/src/app/net/sf/gridarta/gameobject/match/MutableOrGameObjectMatcher.java
trunk/src/app/net/sf/gridarta/gameobject/match/NamedGameObjectMatcher.java
trunk/src/app/net/sf/gridarta/gameobject/match/NotGameObjectMatcher.java
trunk/src/app/net/sf/gridarta/gameobject/match/OrGameObjectMatcher.java
trunk/src/app/net/sf/gridarta/gameobject/match/TypeNrsGameObjectMatcher.java
trunk/src/app/net/sf/gridarta/gameobject/scripts/AbstractScriptArchEditor.java
trunk/src/app/net/sf/gridarta/gameobject/scripts/PathButtonListener.java
trunk/src/app/net/sf/gridarta/gameobject/scripts/ScriptedEventEditor.java
trunk/src/app/net/sf/gridarta/gui/ArchetypesActions.java
trunk/src/app/net/sf/gridarta/gui/GameObjectAttributesPanel.java
trunk/src/app/net/sf/gridarta/gui/MainActions.java
trunk/src/app/net/sf/gridarta/gui/MainView.java
trunk/src/app/net/sf/gridarta/gui/RecentManager.java
trunk/src/app/net/sf/gridarta/gui/ReplaceDialogManager.java
trunk/src/app/net/sf/gridarta/gui/StatusBar.java
trunk/src/app/net/sf/gridarta/gui/archetypechooser/ArchetypeChooserControl.java
trunk/src/app/net/sf/gridarta/gui/connectionview/CellRenderer.java
trunk/src/app/net/sf/gridarta/gui/connectionview/Connection.java
trunk/src/app/net/sf/gridarta/gui/connectionview/Control.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/AbstractGameObjectAttributesDialog.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/ConfirmErrorsAL.java
trunk/src/app/net/sf/gridarta/gui/map/AbstractMapTilePane.java
trunk/src/app/net/sf/gridarta/gui/map/GoLocationDialog.java
trunk/src/app/net/sf/gridarta/gui/map/MapCursorActions.java
trunk/src/app/net/sf/gridarta/gui/map/MapPreviewAccessory.java
trunk/src/app/net/sf/gridarta/gui/map/MapSelectionEvent.java
trunk/src/app/net/sf/gridarta/gui/map/ShrinkMapSizeDialog.java
trunk/src/app/net/sf/gridarta/gui/pickmapchooser/ArchNPickChangeListener.java
trunk/src/app/net/sf/gridarta/gui/pickmapchooser/Folder.java
trunk/src/app/net/sf/gridarta/gui/pickmapchooser/FolderListAction.java
trunk/src/app/net/sf/gridarta/gui/pickmapchooser/Loader.java
trunk/src/app/net/sf/gridarta/gui/pickmapchooser/Pickmap.java
trunk/src/app/net/sf/gridarta/gui/selectedsquare/MapTileSelection.java
trunk/src/app/net/sf/gridarta/io/DefaultMapReader.java
trunk/src/app/net/sf/gridarta/map/AutoValidator.java
trunk/src/app/net/sf/gridarta/map/DefaultMapModel.java
trunk/src/app/net/sf/gridarta/map/MapSquare.java
trunk/src/app/net/sf/gridarta/map/MapState.java
trunk/src/app/net/sf/gridarta/map/validation/DelegatingMapValidator.java
trunk/src/app/net/sf/gridarta/map/validation/checks/BlockedSpawnPointChecker.java
trunk/src/app/net/sf/gridarta/textedit/scripteditor/ScriptEditControl.java
trunk/src/app/net/sf/gridarta/textedit/scripteditor/ScriptEditControlInstance.java
trunk/src/app/net/sf/gridarta/updater/Updater.java
trunk/src/app/net/sf/gridarta/updater/UpdaterManager.java
Modified: trunk/crossfire/src/cfeditor/CrossfireObjectsFactory.java
===================================================================
--- trunk/crossfire/src/cfeditor/CrossfireObjectsFactory.java 2008-07-04 22:29:42 UTC (rev 4239)
+++ trunk/crossfire/src/cfeditor/CrossfireObjectsFactory.java 2008-07-04 23:15:40 UTC (rev 4240)
@@ -131,8 +131,8 @@
/** {@inheritDoc} */
@NotNull
- public MapView<GameObject, MapArchObject, Archetype, CMapViewBasic> newMapView(@NotNull final MapControl mapControl, @Nullable final Point viewPosition, final int viewCounter) {
- return new MapView<GameObject, MapArchObject, Archetype, CMapViewBasic>(AbstractMainControl.getInstance(), mapControl, viewCounter, new CMapViewBasic(CMainControl.getInstance(), mapControl, viewPosition, faceObjects, objectChooser), ACTION_FACTORY);
+ public MapView<GameObject, MapArchObject, Archetype, CMapViewBasic> newMapView(@NotNull final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl, @Nullable final Point viewPosition, final int viewCounter) {
+ return new MapView<GameObject, MapArchObject, Archetype, CMapViewBasic>((MainControl<GameObject, MapArchObject, Archetype, CMapViewBasic>) (MainControl) AbstractMainControl.getInstance(), mapControl, viewCounter, new CMapViewBasic(CMainControl.getInstance(), mapControl, viewPosition, faceObjects, objectChooser), ACTION_FACTORY);
}
/** {@inheritDoc} */
Modified: trunk/crossfire/src/cfeditor/MapActions.java
===================================================================
--- trunk/crossfire/src/cfeditor/MapActions.java 2008-07-04 22:29:42 UTC (rev 4239)
+++ trunk/crossfire/src/cfeditor/MapActions.java 2008-07-04 23:15:40 UTC (rev 4240)
@@ -111,7 +111,7 @@
private final CurrentMapListener<GameObject, MapArchObject, Archetype, CMapViewBasic> currentMapListener;
/** The {@link ShrinkMapSizeDialogManager} instance. */
- private final ShrinkMapSizeDialogManager shrinkMapSizeDialogManager;
+ private final ShrinkMapSizeDialogManager<GameObject, MapArchObject, Archetype, CMapViewBasic> shrinkMapSizeDialogManager;
/**
* Create a new instance.
@@ -123,7 +123,7 @@
this.mainControl = mainControl;
this.mapManager = mapManager;
this.exitMatcher = exitMatcher;
- shrinkMapSizeDialogManager = new ShrinkMapSizeDialogManager(mapManager);
+ shrinkMapSizeDialogManager = new ShrinkMapSizeDialogManager<GameObject, MapArchObject, Archetype, CMapViewBasic>(mapManager);
autoJoin = prefs.getBoolean(AUTOJOIN_KEY, false);
Modified: trunk/crossfire/src/cfeditor/gui/GameObjectAttributesDialog.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/GameObjectAttributesDialog.java 2008-07-04 22:29:42 UTC (rev 4239)
+++ trunk/crossfire/src/cfeditor/gui/GameObjectAttributesDialog.java 2008-07-04 23:15:40 UTC (rev 4240)
@@ -169,7 +169,7 @@
String newName = null;
String newFace = null;
String newMsg = null;
- for (final DialogAttrib attr : dialogAttribs) {
+ for (final DialogAttrib<?> attr : dialogAttribs) {
final ArchAttribType dType = attr.ref.getDataType();
switch (dType) {
@@ -330,7 +330,7 @@
// get selected index of ComboBox
final int attrValTmp = ((JComboBox) attr.getInput()).getSelectedIndex();
// fetch value according to this list entry:
- attrVal = (Integer) ((List) archTypeList.getListTable().get(attr.ref.getMisc()[0])).get(2 * attrValTmp);
+ attrVal = ((List<Integer>) archTypeList.getListTable().get(attr.ref.getMisc()[0])).get(2 * attrValTmp);
break;
default:
assert false;
@@ -400,8 +400,8 @@
}
break;
case DBLLIST: {
- final int val1 = (Integer) ((List) archTypeList.getListTable().get(attr.ref.getMisc()[0])).get(2 * ((JComboBox[]) attr.getInput())[0].getSelectedIndex());
- final int val2 = (Integer) ((List) archTypeList.getListTable().get(attr.ref.getMisc()[1])).get(2 * ((JComboBox[]) attr.getInput())[1].getSelectedIndex());
+ final int val1 = ((List<Integer>) archTypeList.getListTable().get(attr.ref.getMisc()[0])).get(2 * ((JComboBox[]) attr.getInput())[0].getSelectedIndex());
+ final int val2 = ((List<Integer>) archTypeList.getListTable().get(attr.ref.getMisc()[1])).get(2 * ((JComboBox[]) attr.getInput())[1].getSelectedIndex());
final int combinedVal = val1 + val2;
if (archetype.getAttributeInt(attr.ref.getNameOld()) != combinedVal) {
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2008-07-04 22:29:42 UTC (rev 4239)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2008-07-04 23:15:40 UTC (rev 4240)
@@ -350,7 +350,7 @@
log.fatal("GameObjectMatcher 'monster' does not exist");
throw new MissingResourceException("GameObjectMatcher 'monster' does not exist", null, null);
}
- final LockedItemsControl lockedItemsControl = new LockedItemsControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(getMapManager(), Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_ALTAR_TRIGGER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_SPAWN_POINT, Archetype.TYPE_CONTAINER);
+ final LockedItemsControl<GameObject, MapArchObject, Archetype, CMapViewBasic> lockedItemsControl = new LockedItemsControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(getMapManager(), Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_ALTAR_TRIGGER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_SPAWN_POINT, Archetype.TYPE_CONTAINER);
final GameObjectAttributesPanel gameObjectAttributesPanel = new GameObjectAttributesPanel(this, getMapManager(), mainView, lockedItemsControl, monsterMatcher);
mainView.init(gameObjectAttributesPanel, selectedSquareControl.getSelectedSquareView(), typeList, mapTileListBottom, gameObjectMatchers);
mapActions.updateMenuState();
Modified: trunk/daimonin/src/daieditor/DaimoninObjectsFactory.java
===================================================================
--- trunk/daimonin/src/daieditor/DaimoninObjectsFactory.java 2008-07-04 22:29:42 UTC (rev 4239)
+++ trunk/daimonin/src/daieditor/DaimoninObjectsFactory.java 2008-07-04 23:15:40 UTC (rev 4240)
@@ -120,7 +120,7 @@
/** {@inheritDoc} */
@NotNull
public MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> newPickmapControl(@Nullable final List<GameObject> objects, @NotNull final MapArchObject mapArchObject) {
- final DefaultMapControl mapControl = new DefaultMapControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, CMainControl.getInstance(), objects, mapArchObject, true, GameObjectMatchersInstance.getInstance().getMatcher("exit"), archetypeChooserControl);
+ final DefaultMapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl = new DefaultMapControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, CMainControl.getInstance(), objects, mapArchObject, true, GameObjectMatchersInstance.getInstance().getMatcher("exit"), archetypeChooserControl);
mapArchObject.setDifficulty(1);
return mapControl;
}
@@ -134,7 +134,7 @@
/** {@inheritDoc} */
@NotNull
public MapView<GameObject, MapArchObject, Archetype, CMapViewBasic> newMapView(@NotNull final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl, @Nullable final Point viewPosition, final int viewCounter) {
- return new MapView<GameObject, MapArchObject, Archetype, CMapViewBasic>(AbstractMainControl.getInstance(), mapControl, viewCounter, new CMapViewBasic(CMainControl.getInstance(), mapControl, viewPosition, faceObjects), ACTION_FACTORY);
+ return new MapView<GameObject, MapArchObject, Archetype, CMapViewBasic>((MainControl<GameObject, MapArchObject, Archetype, CMapViewBasic>) (MainControl) AbstractMainControl.getInstance(), mapControl, viewCounter, new CMapViewBasic(CMainControl.getInstance(), mapControl, viewPosition, faceObjects), ACTION_FACTORY);
}
/** {@inheritDoc} */
Modified: trunk/daimonin/src/daieditor/MapActions.java
===================================================================
--- trunk/daimonin/src/daieditor/MapActions.java 2008-07-04 22:29:42 UTC (rev 4239)
+++ trunk/daimonin/src/daieditor/MapActions.java 2008-07-04 23:15:40 UTC (rev 4240)
@@ -107,7 +107,7 @@
private final CurrentMapListener<GameObject, MapArchObject, Archetype, CMapViewBasic> currentMapListener;
/** The {@link ShrinkMapSizeDialogManager} instance. */
- private final ShrinkMapSizeDialogManager shrinkMapSizeDialogManager;
+ private final ShrinkMapSizeDialogManager<GameObject, MapArchObject, Archetype, CMapViewBasic> shrinkMapSizeDialogManager;
/**
* Create a new instance.
@@ -119,7 +119,7 @@
this.mainControl = mainControl;
this.mapManager = mapManager;
this.exitMatcher = exitMatcher;
- shrinkMapSizeDialogManager = new ShrinkMapSizeDialogManager(mapManager);
+ shrinkMapSizeDialogManager = new ShrinkMapSizeDialogManager<GameObject, MapArchObject, Archetype, CMapViewBasic>(mapManager);
autoJoin = prefs.getBoolean(AUTOJOIN_KEY, false);
Modified: trunk/daimonin/src/daieditor/gui/GameObjectAttributesDialog.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/GameObjectAttributesDialog.java 2008-07-04 22:29:42 UTC (rev 4239)
+++ trunk/daimonin/src/daieditor/gui/GameObjectAttributesDialog.java 2008-07-04 23:15:40 UTC (rev 4240)
@@ -168,7 +168,7 @@
String newName = null;
String newFace = null;
String newMsg = null;
- for (final DialogAttrib attr : dialogAttribs) {
+ for (final DialogAttrib<?> attr : dialogAttribs) {
final ArchAttribType dType = attr.ref.getDataType();
switch (dType) {
@@ -315,7 +315,7 @@
// get selected index of ComboBox
final int attrValTmp = ((JComboBox) attr.getInput()).getSelectedIndex();
// fetch value according to this list entry:
- attrVal = (Integer) ((List) archTypeList.getListTable().get(attr.ref.getMisc()[0])).get(2 * attrValTmp);
+ attrVal = ((List<Integer>) archTypeList.getListTable().get(attr.ref.getMisc()[0])).get(2 * attrValTmp);
break;
default:
assert false;
@@ -329,8 +329,8 @@
}
break;
case DBLLIST: {
- final int val1 = (Integer) ((List) archTypeList.getListTable().get(attr.ref.getMisc()[0])).get(2 * ((JComboBox[]) attr.getInput())[0].getSelectedIndex());
- final int val2 = (Integer) ((List) archTypeList.getListTable().get(attr.ref.getMisc()[1])).get(2 * ((JComboBox[]) attr.getInput())[1].getSelectedIndex());
+ final int val1 = ((List<Integer>) archTypeList.getListTable().get(attr.ref.getMisc()[0])).get(2 * ((JComboBox[]) attr.getInput())[0].getSelectedIndex());
+ final int val2 = ((List<Integer>) archTypeList.getListTable().get(attr.ref.getMisc()[1])).get(2 * ((JComboBox[]) attr.getInput())[1].getSelectedIndex());
final int combinedVal = val1 + val2;
if (archetype.getAttributeInt(attr.ref.getNameOld()) != combinedVal) {
Modified: trunk/daimonin/src/daieditor/gui/map/event/MouseOpEvent.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/map/event/MouseOpEvent.java 2008-07-04 22:29:42 UTC (rev 4239)
+++ trunk/daimonin/src/daieditor/gui/map/event/MouseOpEvent.java 2008-07-04 23:15:40 UTC (rev 4240)
@@ -155,7 +155,7 @@
this.clickCount = clickCount;
}
- public MapControl getMapControl() {
+ public MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> getMapControl() {
return mapControl;
}
Modified: trunk/daimonin/src/daieditor/map/validation/checks/ExitError.java
===================================================================
--- trunk/daimonin/src/daieditor/map/validation/checks/ExitError.java 2008-07-04 22:29:42 UTC (rev 4239)
+++ trunk/daimonin/src/daieditor/map/validation/checks/ExitError.java 2008-07-04 23:15:40 UTC (rev 4240)
@@ -28,7 +28,7 @@
* Validation error that's used when a map has wrong exit paths.
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
-public class ExitError extends GameObjectValidationError {
+public class ExitError<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> extends GameObjectValidationError<G, A, R> {
/** The exit path that was wrong. */
private final String exitPath;
@@ -38,7 +38,7 @@
* @param gameObject the GameObject on which the error occurred
* @param exitPath exit path which was wrong
*/
- public ExitError(final GameObject<? extends GameObject, ? extends MapArchObject, ? extends Archetype> gameObject, final String exitPath) {
+ public ExitError(final G gameObject, final String exitPath) {
super(gameObject);
this.exitPath = exitPath;
}
Modified: trunk/daimonin/src/daieditor/map/validation/checks/TilePathsError.java
===================================================================
--- trunk/daimonin/src/daieditor/map/validation/checks/TilePathsError.java 2008-07-04 22:29:42 UTC (rev 4239)
+++ trunk/daimonin/src/daieditor/map/validation/checks/TilePathsError.java 2008-07-04 23:15:40 UTC (rev 4240)
@@ -36,7 +36,7 @@
* @param mapModel the map on which the error occurred
* @param tilePath tile path which was wrong
*/
- public TilePathsError(final MapModel mapModel, final String tilePath) {
+ public TilePathsError(final MapModel<?, ?, ?> mapModel, final String tilePath) {
super(mapModel);
this.tilePath = tilePath;
}
Modified: trunk/daimonin/src/daieditor/spells/Spells.java
===================================================================
--- trunk/daimonin/src/daieditor/spells/Spells.java 2008-07-04 22:29:42 UTC (rev 4239)
+++ trunk/daimonin/src/daieditor/spells/Spells.java 2008-07-04 23:15:40 UTC (rev 4240)
@@ -61,7 +61,7 @@
* Opens a file chooser to select the spellist file, then import spells.
* @param mainControl main control
*/
- public static void importSpellsWanted(final MainControl mainControl) {
+ public static void importSpellsWanted(final MainControl<?, ?, ?, ?> mainControl) {
// open a file chooser window
final JFileChooser fileChooser = new JFileChooser();
fileChooser.setDialogTitle("Open CF Spellist File");
Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-07-04 22:29:42 UTC (rev 4239)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-07-04 23:15:40 UTC (rev 4240)
@@ -68,7 +68,7 @@
public static final FileFilter pngFileFilter = new HideFileFilterProxy(new EndingFileFilter(true, ACTION_FACTORY.getString("fileDialog.filter.png"), ".png"));
/** The current instance. */
- private static MainControl instance;
+ private static MainControl<?, ?, ?, ?> instance;
/** The Gridarta Objects Factory. */
private final GridartaObjectsFactory<G, A, R, V> gridartaObjectsFactory;
@@ -109,7 +109,7 @@
* Returns the current implementation.
* @return The current implementation.
*/
- public static MainControl getInstance() {
+ public static MainControl<?, ?, ?, ?> getInstance() {
return instance;
}
@@ -123,7 +123,7 @@
* Sets the current instance.
* @param instance Current instance
*/
- private static void setInstance(final MainControl instance) {
+ private static void setInstance(final MainControl<?, ?, ?, ?> instance) {
AbstractMainControl.instance = instance;
}
Modified: trunk/src/app/net/sf/gridarta/CFArchType.java
===================================================================
--- trunk/src/app/net/sf/gridarta/CFArchType.java 2008-07-04 22:29:42 UTC (rev 4239)
+++ trunk/src/app/net/sf/gridarta/CFArchType.java 2008-07-04 23:15:40 UTC (rev 4240)
@@ -455,7 +455,7 @@
return typeAttributes;
}
- public boolean matches(@NotNull final Archetype archetype) {
+ public boolean matches(@NotNull final Archetype<?, ?, ?> archetype) {
if (getTypeNr() != archetype.getArchTypNr()) {
return false;
}
Modified: trunk/src/app/net/sf/gridarta/CFArchTypeList.java
===================================================================
--- trunk/src/app/net/sf/gridarta/CFArchTypeList.java 2008-07-04 22:29:42 UTC (rev 4239)
+++ trunk/src/app/net/sf/gridarta/CFArchTypeList.java 2008-07-04 23:15:40 UTC (rev 4240)
@@ -268,7 +268,7 @@
* @return the <code>CFArchType</code> which belongs to this arch, or the
* first (misc) type if no match is found.
*/
- public CFArchType getTypeOfArch(final GameObject object) {
+ public CFArchType getTypeOfArch(final GameObject<?, ?, ?> object) {
// check if the type of the object is present in the definitions
for (final CFArchType tmp : archTypeList) {
if (tmp.getTypeNr() == object.getArchTypNr()) {
@@ -350,7 +350,7 @@
* match was found
*/
@NotNull
- public CFArchType getType(@NotNull final Archetype archetype) {
+ public CFArchType getType(@NotNull final Archetype<?, ?, ?> archetype) {
for (final CFArchType type : archTypeList) {
if (type.matches(archetype)) {
return type;
Modified: trunk/src/app/net/sf/gridarta/CopyBuffer.java
===================================================================
--- trunk/src/app/net/sf/gridarta/CopyBuffer.java 2008-07-04 22:29:42 UTC (rev 4239)
+++ trunk/src/app/net/sf/gridarta/CopyBuffer.java 2008-07-04 23:15:40 UTC (rev 4240)
@@ -265,7 +265,7 @@
return;
}
- final MapSquare cursorSquare = mapViewBasic.getCursorSquare();
+ final MapSquare<G, A, R> cursorSquare = mapViewBasic.getCursorSquare();
if (cursorSquare == null || !cursorSquare.isEmpty()) {
return;
}
@@ -276,7 +276,7 @@
}
final MapControl<G, A, R, V> mapControl = mapView.getMapControl();
- final MapModel mapModel = mapControl.getMapModel();
+ final MapModel<G, A, R> mapModel = mapControl.getMapModel();
mapModel.beginTransaction("Floodfill"); // TODO: I18N/L10N
//long start = System.currentTimeMillis();
new Floodfill().floodfill(mapControl, cursor.x, cursor.y, archList);
Modified: trunk/src/app/net/sf/gridarta/floodfill/Floodfill.java
===================================================================
--- trunk/src/app/net/sf/gridarta/floodfill/Floodfill.java 2008-07-04 22:29:42 UTC (rev 4239)
+++ trunk/src/app/net/sf/gridarta/floodfill/Floodfill.java 2008-07-04 23:15:40 UTC (rev 4240)
@@ -74,7 +74,7 @@
final Size2D mapSize = mapControl.getMapModel().getMapSize();
final byte[][] area = new byte[mapSize.getWidth()][mapSize.getHeight()];
area[startX][startY] = BORDER;
- final MapModel mapModel = mapControl.getMapModel();
+ final MapModel<G, A, R> mapModel = mapControl.getMapModel();
mapModel.beginTransaction("Flood Fill"); // TODO: I18N/L10N
int border = 1;
while (border > 0) {
Modified: trunk/src/app/net/sf/gridarta/gameobject/IsArchetypeException.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/IsArchetypeException.java 2008-07-04 22:29:42 UTC (rev 4239)
+++ trunk/src/app/net/sf/gridarta/gameobject/IsArchetypeException.java 2008-07-04 23:15:40 UTC (rev 4240)
@@ -35,13 +35,13 @@
/** The GameObject that is an Archetype. */
@NotNull
- private final GameObject archetype;
+ private final GameObject<?, ?, ?> archetype;
/**
* Create an IsArchetypeException.
* @param archetype The GameObject that is an Archetype.
*/
- public IsArchetypeException(@NotNull final GameObject archetype) {
+ public IsArchetypeException(@NotNull final GameObject<?, ?, ?> archetype) {
super(archetype.toString());
this.archetype = archetype;
}
@@ -51,7 +51,7 @@
* @return The GameObject that is an Archetype.
*/
@NotNull
- public GameObject getArchetype() {
+ public GameObject<?, ?, ?> getArchetype() {
return archetype;
}
Modified: trunk/src/app/net/sf/gridarta/gameobject/NotArchetypeException.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/NotArchetypeException.java 2008-07-04 22:29:42 UTC (rev 4239)
+++ trunk/src/app/net/sf/gridarta/gameobject/NotArchetypeException.java 2008-07-04 23:15:40 UTC (rev 4240)
@@ -30,13 +30,13 @@
private static final long serialVersionUID = 1;
/** The Archetype that was not an Archetype. */
- private final Archetype archetype;
+ private final Archetype<?, ?, ?> archetype;
/**
* Create a NotArchetypeException.
* @param archetype the Archetype that was not an Archetype
*/
- public NotArchetypeException(final Archetype archetype) {
+ public NotArchetypeException(final Archetype<?, ?, ?> archetype) {
super(archetype.toString());
this.archetype = archetype;
}
@@ -45,7 +45,7 @@
* Returns the Archetype that was not an Archetype.
* @return the Archetype that was not an Archetype
*/
- public Archetype getArchetype() {
+ public Archetype<?, ?, ?> getArchetype() {
return archetype;
}
Modified: trunk/src/app/net/sf/gridarta/gameobject/NotInsideContainerException.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/NotInsideContainerException.java 2008-07-04 22:29:42 UTC (rev 4239)
+++ trunk/src/app/net/sf/gridarta/gameobject/NotInsideContainerException.java 2008-07-04 23:15:40 UTC (rev 4240)
@@ -38,21 +38,21 @@
* container.
*/
@Nullable
- private final GameObjectContainer container;
+ private final GameObjectContainer<?, ?, ?> container;
/**
* The GameObject that was not inside a / the Container but should have
* been.
*/
@NotNull
- private final GameObject item;
+ private final GameObject<?, ?, ?> item;
/**
* Create a NotInsideContainerException.
* @param item GameObject that was not inside a container but should have
* been.
*/
- public NotInsideContainerException(@NotNull final GameObject item) {
+ public NotInsideContainerException(@NotNull final GameObject<?, ?, ?> item) {
this(null, item);
}
@@ -63,7 +63,7 @@
* @param item GameObject that was not inside a container but should have
* been.
*/
- public NotInsideContainerException(@Nullable final GameObjectContainer container, @NotNull final GameObject item) {
+ public NotInsideContainerException(@Nullable final GameObjectContainer<?, ?, ?> container, @NotNull final GameObject<?, ?, ?> item) {
super(container == null ?
item.toString() + " was expected to be inside a container but wasn't." :
item.toString() + " was expected to be inside " + container + " but was in " + item.getContainer());
@@ -78,7 +78,7 @@
* been.
*/
@NotNull
- public GameObject getItem() {
+ public GameObject<?, ?, ?> getItem() {
return item;
}
@@ -88,7 +88,7 @@
* if it was expected to have any container but had not.
*/
@Nullable
- public GameObjectContainer getContainer() {
+ public GameObjectContainer<?, ?, ?> getContainer() {
return container;
}
Modified: trunk/src/app/net/sf/gridarta/gameobject/match/AndGameObjectMatcher.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/match/AndGameObjectMatcher.java 2008-07-04 22:29:42 UTC (rev 4239)
+++ trunk/src/app/net/sf/gridarta/gameobject/match/AndGameObjectMatcher.java 2008-07-04 23:15:40 UTC (rev 4240)
@@ -45,7 +45,7 @@
}
/** {@inheritDoc} */
- public boolean isMatching(final GameObject arch) {
+ public boolean isMatching(final GameObject<?, ?, ?> arch) {
for (final GameObjectMatcher gameObjectMatcher : matchers) {
if (!gameObjectMatcher.isMatching(arch)) {
return false;
Modified: trunk/src/app/net/sf/gridarta/gameobject/match/AttribGameObjectMatcher.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/match/AttribGameObjectMatcher.java 2008-07-04 22:29:42 UTC (rev 4239)
+++ trunk/src/app/net/sf/gridarta/gameobject/match/AttribGameObjectMatcher.java 2008-07-04 23:15:40 UTC (rev 4240)
@@ -73,7 +73,7 @@
/** {@inheritDoc} */
@SuppressWarnings({"CallToStringCompareTo"})
- public boolean isMatching(final GameObject arch) {
+ public boolean isMatching(final GameObject<?, ?, ?> arch) {
final String actual = arch.getAttributeString(name, useDefArch);
final int ret = actual.compareTo(value);
switch (op) {
Modified: trunk/src/app/net/sf/gridarta/gameobject/match/GameObjectMatcher.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/match/GameObjectMatcher.java 2008-07-04 22:29:42 UTC (rev 4239)
+++ trunk/src/app/net/sf/gridarta/gameobject/match/GameObjectMatcher.java 2008-07-04 23:15:40 UTC (rev 4240)
@@ -34,6 +34,6 @@
* @return <code>true</code> if this matcher matches the given game object,
* otherwise <code>false</code>
*/
- boolean isMatching(GameObject arch);
+ boolean isMatching(GameObject<?, ?, ?> arch);
} // interface GameObjectMatcher
Modified: trunk/src/app/net/sf/gridarta/gameobject/match/GameObjectMatchers.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/match/GameObjectMatchers.java 2008-07-04 22:29:42 UTC (rev 4239)
+++ trunk/src/app/net/sf/gridarta/gameobject/match/GameObjectMatchers.java 2008-07-04 23:15:40 UTC (rev 4240)
@@ -96,7 +96,7 @@
* @param checkType the edit type to calculate
* @return the edit type
*/
- public int calculateEditType(@NotNull final GameObject gameObject, final int checkType) {
+ public int calculateEditType(@NotNull final GameObject<?, ?, ?> gameObject, final int checkType) {
int editType = 0;
for (final NamedGameObjectMatcher matcher : gameObjectMatchers) {
final int matcherEditType = matcher.getEditType();
Modified: trunk/src/app/net/sf/gridarta/gameobject/match/MutableNameGameObjectMatcher.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/match/MutableNameGameObjectMatcher.java 2008-07-04 22:29:42 UTC (rev 4239)
+++ trunk/src/app/net/sf/gridarta/gameobject/match/MutableNameGameObjectMatcher.java 2008-07-04 23:15:40 UTC (rev 4240)
@@ -49,7 +49,7 @@
}
/** {@inheritDoc} */
- public boolean isMatching(final GameObject arch) {
+ public boolean isMatching(final GameObject<?, ?, ?> arch) {
return name.matches(arch.getArchetypeName());
}
Modified: trunk/src/app/net/sf/gridarta/gameobject/match/MutableOrGameObjectMatcher.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/match/MutableOrGameObjectMatcher.java 2008-07-04 22:29:42 UTC (rev 4239)
+++ trunk/src/app/net/sf/gridarta/gameobject/match/MutableOrGameObjectMatcher.java 2008-07-04 23:15:40 UTC (rev 4240)
@@ -51,7 +51,7 @@
}
/** {@inheritDoc} */
- public boolean isMatching(final GameObject arch) {
+ public boolean isMatching(final GameObject<?, ?, ?> arch) {
if (gameObjectMatchers.isEmpty()) {
return true;
}
Modified: trunk/src/app/net/sf/gridarta/gameobject/match/NamedGameObjectMatcher.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/match/NamedGameObjectMatcher.java 2008-07-04 22:29:42 UTC (rev 4239)
+++ trunk/src/app/net/sf/gridarta/gameobject/match/NamedGameObjectMatcher.java 2008-07-04 23:15:40 UTC (rev 4240)
@@ -70,7 +70,7 @@
}
/** {@inheritDoc} */
- public boolean isMatching(final GameObject arch) {
+ public boolean isMatching(final GameObject<?, ?, ?> arch) {
return gameObjectMatcher.isMatching(arch);
}
Modified: trunk/src/app/net/sf/gridarta/gameobject/match/NotGameObjectMatcher.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/match/NotGameObjectMatcher.java 2008-07-04 22:29:42 UTC (rev 4239)
+++ trunk/src/app/net/sf/gridarta/gameobject/match/NotGameObjectMatcher.java 2008-07-04 23:15:40 UTC (rev 4240)
@@ -42,7 +42,7 @@
}
/** {@inheritDoc} */
- public boolean isMatching(final GameObject arch) {
+ public boolean isMatching(final GameObject<?, ?, ?> arch) {
return !gameObjectMatcher.isMatching(arch);
}
Modified: trunk/src/app/net/sf/gridarta/gameobject/match/OrGameObjectMatcher.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/match/OrGameObjectMatcher.java 2008-07-04 22:29:42 UTC (rev 4239)
+++ trunk/src/app/net/sf/gridarta/gameobject/match/OrGameObjectMatcher.java 2008-07-04 23:15:40 UTC (rev 4240)
@@ -45,7 +45,7 @@
}
/** {@inheritDoc} */
- public boolean isMatching(final GameObject arch) {
+ public boolean isMatching(final GameObject<?, ?, ?> arch) {
for (final GameObjectMatcher gameObjectMatcher : matchers) {
if (gameObjectMatcher.isMatching(arch)) {
return true;
Modified: trunk/src/app/net/sf/gridarta/gameobject/match/TypeNrsGameObjectMatcher.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/match/TypeNrsGameObjectMatcher.java 2008-07-04 22:29:42 UTC (rev 4239)
+++ trunk/src/app/net/sf/gridarta/gameobject/match/TypeNrsGameObjectMatcher.java 2008-07-04 23:15:40 UTC (rev 4240)
@@ -44,7 +44,7 @@
}
/** {@inheritDoc} */
- public boolean isMatching(final GameObject arch) {
+ public boolean isMatching(final GameObject<?, ?, ?> arch) {
return Arrays.binarySearch(types, arch.getArchTypNr()) >= 0;
}
Modified: trunk/src/app/net/sf/gridarta/gameobject/scripts/AbstractScriptArchEditor.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/scripts/AbstractScriptArchEditor.java 2008-07-04 22:29:42 UTC (rev 4239)
+++ trunk/src/app/net/sf/gridarta/gameobject/scripts/AbstractScriptArchEditor.java 2008-07-04 23:15:40 UTC (rev 4240)
@@ -87,7 +87,7 @@
* @param scriptArchData the <code>ScriptArchData</code> instance to
* display
*/
- public static <G extends GameObject<G, ?, ?>> void addEventScript(final JList panelList, final G gameObject, final ScriptArchData scriptArchData) {
+ public static <G extends GameObject<G, ?, ?>> void addEventScript(final JList panelList, final G gameObject, final ScriptArchData<G> scriptArchData) {
final String archName = gameObject.getBestName();
// create a reasonable default script name for lazy users :-)
final String defScriptName = ScriptUtils.chooseDefaultScriptName(archName, scriptEnding);
Modified: trunk/src/app/net/sf/gridarta/gameobject/scripts/PathButtonListener.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/scripts/PathButtonListener.java 2008-07-04 22:29:42 UTC (rev 4239)
+++ trunk/src/app/net/sf/gridarta/gameobject/scripts/PathButtonListener.java 2008-07-04 23:15:40 UTC (rev 4240)
@@ -36,7 +36,7 @@
private final boolean isOkButton;
/** The target event to script. */
- private ScriptedEvent scriptedEvent; // target event
+ private ScriptedEvent<?> scriptedEvent; // target event
/** The ScriptArchData to operate on. */
private ScriptArchData<?> scriptArchData;
@@ -58,7 +58,7 @@
* Set the target event to script.
* @param scriptedEvent new target event to script.
*/
- public void setTargetEvent(final ScriptedEvent scriptedEvent) {
+ public void setTargetEvent(final ScriptedEvent<?> scriptedEvent) {
this.scriptedEvent = scriptedEvent;
}
Modified: trunk/src/app/net/sf/gridarta/gameobject/scripts/ScriptedEventEditor.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/scripts/ScriptedEventEditor.java 2008-07-04 22:29:42 UTC (rev 4239)
+++ trunk/src/app/net/sf/gridarta/gameobject/scripts/ScriptedEventEditor.java 2008-07-04 23:15:40 UTC (rev 4240)
@@ -93,7 +93,7 @@
* input text fields for file path and plugin name.
* @param scriptedEvent the event
*/
- public static void editParameters(final ScriptedEvent scriptedEvent) {
+ public static void editParameters(final ScriptedEvent<?> scriptedEvent) {
if (pathFrame == null) {
// initialize popup frame
pathFrame = new JDialog(AbstractMainControl.getInstance().getMainView(), "Edit Parameters", true);
Modified: trunk/src/app/net/sf/gridarta/gui/ArchetypesActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/ArchetypesActions.java 2008-07-04 22:29:42 UTC (rev 4239)
+++ trunk/src/app/net/sf/gridarta/gui/ArchetypesActions.java 2008-07-04 23:15:40 UTC (rev 4240)
@@ -45,7 +45,7 @@
private final ToggleAction aDisplayObjectNames;
/** The "find archetypes" dialog. */
- private final FindArchetypesDialog findArchetypesDialog;
+ private final FindArchetypesDialog<G, A, R, V> findArchetypesDialog;
/** The listener to detect attribute changes. */
private final ArchetypeChooserListener<G, A, R> archetypeChooserListener = new ArchetypeChooserListener<G, A, R>() {
Modified: trunk/src/app/net/sf/gridarta/gui/GameObjectAttributesPanel.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/GameObjectAttributesPanel.java 2008-07-04 22:29:42 UTC (rev 4239)
+++ trunk/src/app/net/sf/gridarta/gui/GameObjectAttributesPanel.java 2008-07-04 23:15:40 UTC (rev 4240)
@@ -679,7 +679,7 @@
invnew.postParseGameObject(0);
final MapSquare<G, A, R> mapSquare = inv.getMapSquare();
assert mapSquare != null;
- final MapModel mapModel = mapSquare.getModel();
+ final MapModel<G, A, R> mapModel = mapSquare.getModel();
mapModel.beginTransaction("Add to inventory");
inv.addLast(invnew);
invnew.setObjectFace();
Modified: trunk/src/app/net/sf/gridarta/gui/MainActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/MainActions.java 2008-07-04 22:29:42 UTC (rev 4239)
+++ trunk/src/app/net/sf/gridarta/gui/MainActions.java 2008-07-04 23:15:40 UTC (rev 4240)
@@ -415,7 +415,7 @@
* @param dir The direction to shift.
*/
private void shift(final int dir) {
- final ShiftProcessor shiftProcessor = getShiftEnabled(dir);
+ final ShiftProcessor<G, A, R> shiftProcessor = getShiftEnabled(dir);
if (shiftProcessor != null) {
shiftProcessor.shift(dir);
}
@@ -658,7 +658,7 @@
* otherwise.
*/
@Nullable
- private ShiftProcessor getShiftEnabled(final int dir) {
+ private ShiftProcessor<G, A, R> getShiftEnabled(final int dir) {
final MapControl<G, A, R, V> mapControl = currentMap;
if (mapControl == null) {
return null;
@@ -669,7 +669,7 @@
return null;
}
- final ShiftProcessor shiftProcessor = new ShiftProcessor(mainControl, mapView, mapControl.getMapModel());
+ final ShiftProcessor<G, A, R> shiftProcessor = new ShiftProcessor<G, A, R>(mainControl, mapView, mapControl.getMapModel());
return shiftProcessor.canShift(dir) ? shiftProcessor : null;
}
Modified: trunk/src/app/net/sf/gridarta/gui/MainView.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/MainView.java 2008-07-04 22:29:42 UTC (rev 4239)
+++ trunk/src/app/net/sf/gridarta/gui/MainView.java 2008-07-04 23:15:40 UTC (rev 4240)
@@ -367,7 +367,7 @@
* @return The Game Object Attributes Panel.
*/
@NotNull
- public GameObjectAttributesPanel getGameObjectAttributesPanel() {
+ public GameObjectAttributesPanel<G, A, R, V> getGameObjectAttributesPanel() {
return gameObjectAttributesPanel;
}
Modified: trunk/src/app/net/sf/gridarta/gui/RecentManager.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/RecentManager.java 2008-07-04 22:29:42 UTC (rev 4239)
+++ trunk/src/app/net/sf/gridarta/gui/RecentManager.java 2008-07-04 23:15:40 UTC (rev 4240)
@@ -49,7 +49,7 @@
/** The main control. */
@NotNull
- private final MainControl mainControl;
+ private final MainControl<?, ?, ?, ?> mainControl;
/** List with recents. */
@SuppressWarnings({"CollectionDeclaredAsConcreteClass"})
@@ -64,7 +64,7 @@
* @param mainControl the main control
* @param recentMenu menu for managing the recent entries
*/
- public RecentManager(@NotNull final MainControl mainControl, @Nullable final JMenu recentMenu) {
+ public RecentManager(@NotNull final MainControl<?, ?, ?, ?> mainControl, @Nullable final JMenu recentMenu) {
this.mainControl = mainControl;
this.recentMenu = recentMenu;
}
Modified: trunk/src/app/net/sf/gridarta/gui/ReplaceDialogManager.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/ReplaceDialogManager.java 2008-07-04 22:29:42 UTC (rev 4239)
+++ trunk/src/app/net/sf/gridarta/gui/ReplaceDialogManager.java 2008-07-04 23:15:40 UTC (rev 4240)
@@ -10,7 +10,7 @@
public class ReplaceDialogManager {
/** Singleton Instance. */
- private static ReplaceDialog instance = null;
+ private static ReplaceDialog<?, ?, ?, ?> instance = null;
/**
* Returns whether this frame has been fully built.
@@ -21,11 +21,11 @@
return instance != null && instance.isBuilt();
}
- public static <G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R>> ReplaceDialog<G, A, R, V> getInstance(@NotNull final MainControl<G, A, R, V> mainControl, @NotNull final ObjectChooser objectChooser) {
+ public static <G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R>> ReplaceDialog<G, A, R, V> getInstance(@NotNull final MainControl<G, A, R, V> mainControl, @NotNull final ObjectChooser<G, A, R, V> objectChooser) {
if (instance == null) {
instance = new ReplaceDialog<G, A, R, V>(mainControl, objectChooser);
}
- return instance;
+ return (ReplaceDialog<G, A, R, V>) instance;
}
} // class ReplaceDialogManager
Modified: trunk/src/app/net/sf/gridarta/gui/StatusBar.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/StatusBar.java 2008-07-04 22:29:42 UTC (rev 4239)
+++ trunk/src/app/net/sf/gridarta/gui/StatusBar.java 2008-07-04 23:15:40 UTC (rev 4240)
@@ -35,13 +35,17 @@
import net.sf.gridarta.MainControl;
import net.sf.gridarta.MapManagerListener;
import net.sf.gridarta.gameobject.ArchetypeSet;
+import net.sf.gridarta.gameobject.Archetype;
+import net.sf.gridarta.gameobject.GameObject;
import net.sf.gridarta.gameobject.face.FaceObjects;
import net.sf.gridarta.gui.map.LevelRenderer;
import net.sf.gridarta.gui.map.MapCursor;
import net.sf.gridarta.gui.map.MapCursorEvent;
import net.sf.gridarta.gui.map.MapCursorListener;
import net.sf.gridarta.gui.map.MapView;
+import net.sf.gridarta.gui.map.MapViewBasic;
import net.sf.gridarta.map.MapControl;
+import net.sf.gridarta.map.MapArchObject;
import net.sf.japi.swing.ActionFactory;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -56,7 +60,7 @@
* @author <a href="mailto:dlv...@gm...">Daniel Viegas</a>
* @todo Separate labels and methods for mouse coordinates
*/
-public final class StatusBar extends JPanel implements MouseMotionListener {
+public final class StatusBar<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R>> extends JPanel implements MouseMotionListener {
/** Serial Version UID. */
private static final long serialVersionUID = 1L;
@@ -65,7 +69,7 @@
private static final ActionFactory ACTION_FACTORY = ActionFactory.getFactory("net.sf.gridarta");
/** Controller of this statusbar view. */
- private final MainControl mainControl;
+ private final MainControl<G, A, R, V> mainControl;
/** The FaceObjects instance to use. */
@NotNull
@@ -91,7 +95,7 @@
* <code>null</code> if none is registered.
*/
@Nullable
- private MapView mapView = null;
+ private MapView<G, A, R, V> mapView = null;
/** The map cursor listener to detect map cursor changes. */
private final MapCursorListener mapCursorListener = new MapCursorListener() {
@@ -109,7 +113,7 @@
};
/** The map manager listener to detect current map changes. */
- private final MapManagerListener mapManagerListener = new MapManagerListener() {
+ private final MapManagerListener<G, A, R, V> mapManagerListener = new MapManagerListener() {
/** {@inheritDoc} */
public void currentMapChanged(@Nullable final MapControl mapControl) {
@@ -151,7 +155,7 @@
/** {@inheritDoc} */
public void actionPerformed(final ActionEvent e) {
- final ArchetypeSet archetypeSet = mainControl.getArchetypeSet();
+ final ArchetypeSet<G, A, R> archetypeSet = mainControl.getArchetypeSet();
final int archetypeCount = archetypeSet == null ? 0 : archetypeSet.getArchetypeCount();
final int faceObjectsCount = faceObjects.size();
@@ -172,7 +176,7 @@
* @param mainControl The MainControl for statistical data.
* @param faceObjects the FaceObjects instance to use
*/
- public StatusBar(final MainControl mainControl, @NotNull final FaceObjects faceObjects) {
+ public StatusBar(final MainControl<G, A, R, V> mainControl, @NotNull final FaceObjects faceObjects) {
this.mainControl = mainControl;
this.faceObjects = faceObjects;
setLayout(new GridBagLayout());
@@ -303,7 +307,7 @@
}
}
- private void setCurrentMapView(@Nullable final MapView mapView) {
+ private void setCurrentMapView(@Nullable final MapView<G, A, R, V> mapView) {
if (this.mapView != null) {
this.mapView.getView().getMapCursor().removeMapCursorListener(mapCursorListener);
}
Modified: trunk/src/app/net/sf/gridarta/gui/archetypechooser/ArchetypeChooserControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/archetypechooser/ArchetypeChooserControl.java 2008-07-04 22:29:42 UTC (rev 4239)
+++ trunk/src/app/net/sf/gridarta/gui/archetypechooser/ArchetypeChooserControl.java 2008-07-04 23:15:40 UTC (rev 4240)
@@ -144,7 +144,7 @@
protected ArchetypePanel<G, A, R, V> findOrCreatePanel(@NotNull final String panelName) {
for (int i = 0; i < tabDesktop.getTabCount(); i++) {
if (panelName.equals(tabDesktop.getTitleAt(i))) {
- return (ArchetypePanel) tabDesktop.getComponentAt(i);
+ return (ArchetypePanel<G, A, R, V>) tabDesktop.getComponentAt(i);
}
}
@@ -167,7 +167,7 @@
*/
public void finishBuildProcess() {
for (int i = 0; i < tabDesktop.getTabCount(); i++) {
- ((ArchetypePanel) tabDesktop.getComponentAt(i)).finishBuildProcess();
+ ((ArchetypePanel<?, ?, ?, ?>) tabDesktop.getComponentAt(i)).finishBuildProcess();
}
selectedPanel = (ArchetypePanel<G, A, R, V>) tabDesktop.getSelectedComponent();
@@ -240,7 +240,7 @@
/** Fire a MapSquaresChangedEvent. */
private void fireDisplayObjectNamesChangedEvent() {
- for (final ArchetypeChooserListener listener : listenerList.getListeners(ArchetypeChooserListener.class)) {
+ for (final ArchetypeChooserListener<G, A, R> listener : listenerList.getListeners(ArchetypeChooserListener.class)) {
listener.displayObjectNamesChanged(displayObjectNames);
}
}
@@ -254,7 +254,7 @@
public void addArchetype(@NotNull final String panelName, @NotNull final String folderName, @NotNull final R arch) {
final ArchetypePanel<G, A, R, V> panel = findOrCreatePanel(panelName);
panel.addArchetype(folderName, arch);
- archetypes.put((R) arch, panel);
+ archetypes.put(arch, panel);
}
/**
Modified: trunk/src/app/net/sf/gridarta/gui/connectionview/CellRenderer.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/connectionview/CellRenderer.java 2008-07-04 22:29:42 UTC (rev 4239)
+++ trunk/src/app/net/sf/gridarta/gui/connectionview/CellRenderer.java 2008-07-04 23:15:40 UTC (rev 4240)
@@ -54,7 +54,7 @@
sbForFormat.append(":");
names.clear();
- for (final GameObject gameObject : connection) {
+ for (final GameObject<?, ?, ?> gameObject : connection) {
names.add(gameObject.getBestName());
}
for (final String name : names) {
Modified: trunk/src/app/net/sf/gridarta/gui/connectionview/Connection.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/connectionview/Connection.java 2008-07-04 22:29:42 UTC (rev 4239)
+++ trunk/src/app/net/sf/gridarta/gui/connectionview/Connection.java 2008-07-04 23:15:40 UTC (rev 4240)
@@ -31,7 +31,7 @@
* key object, and a set of <code>GameObject</code>s.
* @author Andreas Kirschbaum
*/
-public class Connection<K> implements Iterable<GameObject> {
+public class Connection<K> implements Iterable<GameObject<?, ?, ?>> {
/** The key. */
private final K key;
@@ -42,7 +42,7 @@
* @note the initial capacity of 2 assumes that most connection values have
* only two game objects: the triggering object and the triggered object
*/
- private final List<GameObject> gameObjects = new ArrayList<GameObject>(2);
+ private final List<GameObject<?, ?, ?>> gameObjects = new ArrayList<GameObject<?, ?, ?>>(2);
/**
* Create a new instance.
@@ -64,14 +64,14 @@
* Add a game object.
* @param gameObject the game object to add
*/
- public void addGameObject(@NotNull final GameObject gameObject) {
+ public void addGameObject(@NotNull final GameObject<?, ?, ?> gameObject) {
if (!gameObjects.contains(gameObject)) {
gameObjects.add(gameObject);
}
}
/** {@inheritDoc} */
- public Iterator<GameObject> iterator() {
+ public Iterator<GameObject<?, ?, ?>> iterator() {
return Collections.unmodifiableList(gameObjects).iterator();
}
Modified: trunk/src/app/net/sf/gridarta/gui/connectionview/Control.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/connectionview/Control.java 2008-07-04 22:29:42 UTC (rev 4239)
+++ trunk/src/app/net/sf/gridarta/gui/connectionview/Control.java 2008-07-04 23:15:40 UTC (rev 4240)
@@ -89,8 +89,8 @@
final List<Connection<K>> connections = view.getSelectedConnections();
for (final Connection<K> connection : connections) {
- for (final GameObject object : connection) {
- final GameObject topObject = object.getTopContainer();
+ for (final GameObject<?, ?, ?> object : connection) {
+ final GameObject<?, ?, ?> topObject = object.getTopContainer();
point.setLocation(topObject.getMapX(), topObject.getMapY());
mapGrid.select(point, point, MapGrid.SelectionMode.ADD);
}
Modified: trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/AbstractGameObjectAttributesDialog.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/AbstractGameObjectAttributesDialog.java 2008-07-04 22:29:42 UTC (rev 4239)
+++ trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/AbstractGameObjectAttributesDialog.java 2008-07-04 23:15:40 UTC (rev 4240)
@@ -1144,9 +1144,9 @@
/** ItemListener for the type-selection box on the attribute-dialog. */
private final class TypesBoxAL implements ItemListener {
- private final AbstractGameObjectAttributesDialog frame; // the entire frame
+ private final AbstractGameObjectAttributesDialog<G, A, R> frame; // the entire frame
- private final GameObject gameObject; // the according gameObject
+ private final GameObject<G, A, R> gameObject; // the according gameObject
private String deselected; // the latest deselected item
@@ -1157,7 +1157,7 @@
* @param frameNew the attribute-dialog mainframe
* @param gameObject the gameObject which has the error to be added
*/
- private TypesBoxAL(final AbstractGameObjectAttributesDialog frameNew, final GameObject gameObject) {
+ private TypesBoxAL(final AbstractGameObjectAttributesDialog<G, A, R> frameNew, final GameObject<G, A, R> gameObject) {
frame = frameNew;
this.gameObject = gameObject;
ignoreEvent = false;
Modified: trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/ConfirmErrorsAL.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/ConfirmErrorsAL.java 2008-07-04 22:29:42 UTC (rev 4239)
+++ trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/ConfirmErrorsAL.java 2008-07-04 23:15:40 UTC (rev 4240)
@@ -29,7 +29,7 @@
private final JTextArea text;
/** The affected GameObject. */
- private final GameObject gameObject;
+ private final GameObject<?, ?, ?> gameObject;
/** List of all errors. */
private final String allErrors;
@@ -43,7 +43,7 @@
* @param textNew textfield containing the error-text to keep
*/
@SuppressWarnings({"PublicConstructorInNonPublicClass"})
- public ConfirmErrorsAL(final JDialog dialog, final GameObject gameObject, final String errors, final JButton keepB, final JTextArea textNew) {
+ public ConfirmErrorsAL(final JDialog dialog, final GameObject<?, ?, ?> gameObject, final String errors, final JButton keepB, final JTextArea textNew) {
this.gameObject = gameObject;
keepButton = keepB;
text = textNew;
Modified: trunk/src/app/net/sf/gridarta/gui/map/AbstractMapTilePane.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/AbstractMapTilePane.java 2008-07-04 22:29:42 UTC (rev 4239)
+++ trunk/src/app/net/sf/gridarta/gui/map/AbstractMapTilePane.java 2008-07-04 23:15:40 UTC (rev 4240)
@@ -242,7 +242,7 @@
*/
public void actionPerformed(final ActionEvent e) {
raSwitch.updateRAState();
- ((AbstractMapTilePane) getParent().getParent()).tilePaths[nextFocus[direction]].textField.requestFocusInWindow();
+ ((AbstractMapTilePane<?>) getParent().getParent()).tilePaths[nextFocus[direction]].textField.requestFocusInWindow();
}
} // class MapTilePanel
Modified: trunk/src/app/net/sf/gridarta/gui/map/GoLocationDialog.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/GoLocationDialog.java 2008-07-04 22:29:42 UTC (rev 4239)
+++ trunk/src/app/net/sf/gridarta/gui/map/GoLocationDialog.java 2008-07-04 23:15:40 UTC (rev 4240)
@@ -36,13 +36,16 @@
import javax.swing.border.EtchedBorder;
import javax.swing.border.TitledBorder;
import net.sf.gridarta.gui.GUIConstants;
+import net.sf.gridarta.map.MapArchObject;
+import net.sf.gridarta.gameobject.GameObject;
+import net.sf.gridarta.gameobject.Archetype;
import net.sf.japi.swing.ActionFactory;
/**
* Dialog used to ask the user for coordinates to move the cursor to.
* @author Andreas Kirschbaum
*/
-public final class GoLocationDialog extends JOptionPane {
+public final class GoLocationDialog<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R>> extends JOptionPane {
/** Serial Version UID. */
private static final long serialVersionUID = 1L;
@@ -51,10 +54,10 @@
private static final ActionFactory ACTION_FACTORY = ActionFactory.getFactory("net.sf.gridarta");
/** The manager for this dialog. */
- private final GoLocationDialogManager goLocationDialogManager;
+ private final GoLocationDialogManager<G, A, R, V> goLocationDialogManager;
/** The affected map view of this go location dialog. */
- private final MapView<?, ?, ?, ?> mapView;
+ private final MapView<G, A, R, V> mapView;
/** Textfield for the x coordinate. */
private final JFormattedTextField xCoordinateField = new JFormattedTextField();
@@ -78,7 +81,7 @@
* @param goLocationDialogManager The manager for this dialog.
* @param mapView the map view to change the cursor
*/
- public GoLocationDialog(final GoLocationDialogManager goLocationDialogManager, final MapView<?, ?, ?, ?> mapView) {
+ public GoLocationDialog(final GoLocationDialogManager<G, A, R, V> goLocationDialogManager, final MapView<G, A, R, V> mapView) {
this.goLocationDialogManager = goLocationDialogManager;
okButton.setDefaultCapable(true);
Modified: trunk/src/app/net/sf/gridarta/gui/map/MapCursorActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/MapCursorActions.java 2008-07-04 22:29:42 UTC (rev 4239)
+++ trunk/src/app/net/sf/gridarta/gui/map/MapCursorActions.java 2008-07-04 23:15:40 UTC (rev 4240)
@@ -79,7 +79,7 @@
/** The control for this instance. */
@NotNull
- private final MapCursorControl control;
+ private final MapCursorControl<G, A, R, V> control;
/** The active map view, or <code>null</code> if no map view exists. */
@Nullable
@@ -146,7 +146,7 @@
* @param mainC...
[truncated message content] |
|
From: <aki...@us...> - 2008-07-04 23:38:38
|
Revision: 4241
http://gridarta.svn.sourceforge.net/gridarta/?rev=4241&view=rev
Author: akirschbaum
Date: 2008-07-04 16:38:35 -0700 (Fri, 04 Jul 2008)
Log Message:
-----------
Remove raw types.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/CMainControl.java
trunk/daimonin/src/daieditor/map/validation/checks/ExitChecker.java
trunk/daimonin/src/daieditor/map/validation/checks/TilePathsChecker.java
trunk/daimonin/src/daieditor/map/validation/checks/TilePathsError.java
trunk/src/app/net/sf/gridarta/CopyBuffer.java
trunk/src/app/net/sf/gridarta/gui/ArchetypesActions.java
trunk/src/app/net/sf/gridarta/gui/MainView.java
trunk/src/app/net/sf/gridarta/gui/StatusBar.java
trunk/src/app/net/sf/gridarta/gui/connectionview/View.java
trunk/src/app/net/sf/gridarta/gui/map/GoLocationDialogManager.java
trunk/src/app/net/sf/gridarta/gui/map/ShrinkMapSizeDialogManager.java
trunk/src/app/net/sf/gridarta/gui/pickmapchooser/Folder.java
trunk/src/app/net/sf/gridarta/map/DefaultMapModel.java
trunk/src/app/net/sf/gridarta/map/validation/checks/BlockedMobOrSpawnPointChecker.java
trunk/src/app/net/sf/gridarta/map/validation/checks/BlockedSpawnPointChecker.java
trunk/src/app/net/sf/gridarta/map/validation/checks/ConnectionChecker.java
trunk/src/app/net/sf/gridarta/treasurelist/CFTreasureListTree.java
Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java 2008-07-04 23:15:40 UTC (rev 4240)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2008-07-04 23:38:35 UTC (rev 4241)
@@ -396,8 +396,8 @@
customTypeChecker.addIgnore(Archetype.TYPE_MISC, Archetype.TYPE_FLOOR);
mapValidators.add(
attributeRangeChecker,
- new ConnectedInsideContainerChecker(),
- new ConnectedPickableChecker(),
+ new ConnectedInsideContainerChecker<GameObject, MapArchObject, Archetype>(),
+ new ConnectedPickableChecker<GameObject, MapArchObject, Archetype>(),
new ConnectionChecker<GameObject, MapArchObject, Archetype>(new int[] {
Archetype.TYPE_ALTAR,
Archetype.TYPE_BUTTON,
@@ -425,7 +425,7 @@
Archetype.TYPE_TRIGGER_MARKER,
}),
customTypeChecker,
- new MapDifficultyChecker(),
+ new MapDifficultyChecker<GameObject, MapArchObject, Archetype>(),
new UndefinedArchetypeChecker<GameObject, MapArchObject, Archetype>(),
new UnsetSlayingChecker<GameObject, MapArchObject, Archetype>(Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_DETECTOR, Archetype.TYPE_TRIGGER_MARKER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_CONTAINER)
);
Modified: trunk/daimonin/src/daieditor/map/validation/checks/ExitChecker.java
===================================================================
--- trunk/daimonin/src/daieditor/map/validation/checks/ExitChecker.java 2008-07-04 23:15:40 UTC (rev 4240)
+++ trunk/daimonin/src/daieditor/map/validation/checks/ExitChecker.java 2008-07-04 23:38:35 UTC (rev 4241)
@@ -60,7 +60,7 @@
newfile = new File(gameObject.getMapSquare().getModel().getMapControl().getMapFile().getParent(), path);
}
if (!newfile.exists() || newfile.isDirectory()) {
- errorCollector.collect(new ExitError(gameObject, path));
+ errorCollector.collect(new ExitError<GameObject, MapArchObject, Archetype>(gameObject, path));
}
}
}
Modified: trunk/daimonin/src/daieditor/map/validation/checks/TilePathsChecker.java
===================================================================
--- trunk/daimonin/src/daieditor/map/validation/checks/TilePathsChecker.java 2008-07-04 23:15:40 UTC (rev 4240)
+++ trunk/daimonin/src/daieditor/map/validation/checks/TilePathsChecker.java 2008-07-04 23:38:35 UTC (rev 4241)
@@ -63,7 +63,7 @@
newfile = new File(mapModel.getMapControl().getMapFile().getParent(), path);
}
if (!newfile.exists() || newfile.isDirectory()) {
- errorCollector.collect(new TilePathsError(mapModel, path));
+ errorCollector.collect(new TilePathsError<GameObject, MapArchObject, Archetype>(mapModel, path));
}
}
}
Modified: trunk/daimonin/src/daieditor/map/validation/checks/TilePathsError.java
===================================================================
--- trunk/daimonin/src/daieditor/map/validation/checks/TilePathsError.java 2008-07-04 23:15:40 UTC (rev 4240)
+++ trunk/daimonin/src/daieditor/map/validation/checks/TilePathsError.java 2008-07-04 23:38:35 UTC (rev 4241)
@@ -20,13 +20,16 @@
package daieditor.map.validation.checks;
import net.sf.gridarta.map.MapModel;
+import net.sf.gridarta.map.MapArchObject;
import net.sf.gridarta.map.validation.MapValidationError;
+import net.sf.gridarta.gameobject.GameObject;
+import net.sf.gridarta.gameobject.Archetype;
/**
* Validation error that's used when a map has wrong tile paths.
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
-public class TilePathsError extends MapValidationError {
+public class TilePathsError<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> extends MapValidationError<G, A, R> {
/** The tile path that was wrong. */
private final String tilePath;
@@ -36,7 +39,7 @@
* @param mapModel the map on which the error occurred
* @param tilePath tile path which was wrong
*/
- public TilePathsError(final MapModel<?, ?, ?> mapModel, final String tilePath) {
+ public TilePathsError(final MapModel<G, A, R> mapModel, final String tilePath) {
super(mapModel);
this.tilePath = tilePath;
}
Modified: trunk/src/app/net/sf/gridarta/CopyBuffer.java
===================================================================
--- trunk/src/app/net/sf/gridarta/CopyBuffer.java 2008-07-04 23:15:40 UTC (rev 4240)
+++ trunk/src/app/net/sf/gridarta/CopyBuffer.java 2008-07-04 23:38:35 UTC (rev 4241)
@@ -279,7 +279,7 @@
final MapModel<G, A, R> mapModel = mapControl.getMapModel();
mapModel.beginTransaction("Floodfill"); // TODO: I18N/L10N
//long start = System.currentTimeMillis();
- new Floodfill().floodfill(mapControl, cursor.x, cursor.y, archList);
+ new Floodfill<G, A, R>().floodfill(mapControl, cursor.x, cursor.y, archList);
//mainControl.setStatusText("Flood fill took " + (System.currentTimeMillis() - start) + " milliseconds in " + iter + " iterations.");
mapModel.endTransaction();
}
Modified: trunk/src/app/net/sf/gridarta/gui/ArchetypesActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/ArchetypesActions.java 2008-07-04 23:15:40 UTC (rev 4240)
+++ trunk/src/app/net/sf/gridarta/gui/ArchetypesActions.java 2008-07-04 23:38:35 UTC (rev 4241)
@@ -71,7 +71,7 @@
* @param archTypeList the instance for looking up archetype types
*/
public ArchetypesActions(@NotNull final Component parent, @NotNull final ArchetypeChooserControl<G, A, R, V> archetypeChooserControl, @NotNull final ObjectChooser<G, A, R, V> objectChooser, final CFArchTypeList archTypeList) {
- findArchetypesDialog = new FindArchetypesDialog(parent, archetypeChooserControl, objectChooser, archTypeList);
+ findArchetypesDialog = new FindArchetypesDialog<G, A, R, V>(parent, archetypeChooserControl, objectChooser, archTypeList);
aDisplayObjectNames = (ToggleAction) ACTION_FACTORY.createToggle(true, "displayObjectNames", archetypeChooserControl);
ACTION_FACTORY.createAction(true, "findArchetypes", findArchetypesDialog);
archetypeChooserControl.addArchetypeChooserListener(archetypeChooserListener);
Modified: trunk/src/app/net/sf/gridarta/gui/MainView.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/MainView.java 2008-07-04 23:15:40 UTC (rev 4240)
+++ trunk/src/app/net/sf/gridarta/gui/MainView.java 2008-07-04 23:38:35 UTC (rev 4241)
@@ -130,7 +130,7 @@
private final MapManager<G, A, R, V> mapManager;
/** The main statusbar. */
- private final StatusBar statusBar;
+ private final StatusBar<G, A, R, V> statusBar;
/** The map file actions for the global menubar. */
@NotNull
@@ -247,7 +247,7 @@
super(actionFactory.format("mainWindow.title", AbstractMainControl.getBuildNumberAsString()));
this.mapManager = mapManager;
mapFileAction = new MapFileActions<G, A, R, V>(mainControl, mapManager, null);
- statusBar = new StatusBar(mainControl, faceObjects);
+ statusBar = new StatusBar<G, A, R, V>(mainControl, faceObjects);
add(statusBar, BorderLayout.SOUTH);
setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
addWindowListener(new WindowAdapter() {
@@ -279,7 +279,7 @@
* Returns the StatusBar.
* @return The StatusBar.
*/
- public StatusBar getStatusBar() {
+ public StatusBar<G, A, R, V> getStatusBar() {
return statusBar;
}
Modified: trunk/src/app/net/sf/gridarta/gui/StatusBar.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/StatusBar.java 2008-07-04 23:15:40 UTC (rev 4240)
+++ trunk/src/app/net/sf/gridarta/gui/StatusBar.java 2008-07-04 23:38:35 UTC (rev 4241)
@@ -113,35 +113,35 @@
};
/** The map manager listener to detect current map changes. */
- private final MapManagerListener<G, A, R, V> mapManagerListener = new MapManagerListener() {
+ private final MapManagerListener<G, A, R, V> mapManagerListener = new MapManagerListener<G, A, R, V>() {
/** {@inheritDoc} */
- public void currentMapChanged(@Nullable final MapControl mapControl) {
+ public void currentMapChanged(@Nullable final MapControl<G, A, R, V> mapControl) {
// ignore
}
/** {@inheritDoc} */
- public void currentMapViewChanged(@Nullable final MapView mapView) {
+ public void currentMapViewChanged(@Nullable final MapView<G, A, R, V> mapView) {
setCurrentMapView(mapView);
}
/** {@inheritDoc} */
- public void mapCreated(@NotNull final MapControl mapControl) {
+ public void mapCreated(@NotNull final MapControl<G, A, R, V> mapControl) {
// ignore
}
/** {@inheritDoc} */
- public void mapViewCreated(@NotNull final MapView mapView) {
+ public void mapViewCreated(@NotNull final MapView<G, A, R, V> mapView) {
// ignore
}
/** {@inheritDoc} */
- public void mapClosing(@NotNull final MapControl mapControl) {
+ public void mapClosing(@NotNull final MapControl<G, A, R, V> mapControl) {
// ignore
}
/** {@inheritDoc} */
- public void mapViewClosing(@NotNull final MapView mapView) {
+ public void mapViewClosing(@NotNull final MapView<G, A, R, V> mapView) {
// ignore
}
Modified: trunk/src/app/net/sf/gridarta/gui/connectionview/View.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/connectionview/View.java 2008-07-04 23:15:40 UTC (rev 4240)
+++ trunk/src/app/net/sf/gridarta/gui/connectionview/View.java 2008-07-04 23:38:35 UTC (rev 4241)
@@ -150,7 +150,7 @@
*/
protected View(@NotNull final MapManager<G, A, R, V> mapManager) {
setLayout(new BorderLayout());
- connectionList.setCellRenderer(new CellRenderer());
+ connectionList.setCellRenderer(new CellRenderer<A>());
add(new JScrollPane(connectionList));
mapManager.addMapManagerListener(mapManagerListener);
}
Modified: trunk/src/app/net/sf/gridarta/gui/map/GoLocationDialogManager.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/GoLocationDialogManager.java 2008-07-04 23:15:40 UTC (rev 4240)
+++ trunk/src/app/net/sf/gridarta/gui/map/GoLocationDialogManager.java 2008-07-04 23:38:35 UTC (rev 4241)
@@ -38,7 +38,7 @@
public final class GoLocationDialogManager<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R>> {
/** Dialog for each map view. */
- private final Map<MapView<G, A, R, V>, GoLocationDialog> dialogs = new HashMap<MapView<G, A, R, V>, GoLocationDialog>();
+ private final Map<MapView<G, A, R, V>, GoLocationDialog<G, A, R, V>> dialogs = new HashMap<MapView<G, A, R, V>, GoLocationDialog<G, A, R, V>>();
/** The map manager listener to detect closed map views. */
private final MapManagerListener<G, A, R, V> mapManagerListener = new MapManagerListener<G, A, R, V>() {
@@ -89,13 +89,13 @@
*/
public void showDialog(final MapView<G, A, R, V> mapView) {
synchronized (dialogs) {
- final GoLocationDialog oldDialog = dialogs.get(mapView);
+ final GoLocationDialog<G, A, R, V> oldDialog = dialogs.get(mapView);
if (oldDialog != null) {
oldDialog.getDialog().toFront();
return;
}
- final GoLocationDialog pane = new GoLocationDialog(this, mapView);
+ final GoLocationDialog<G, A, R, V> pane = new GoLocationDialog<G, A, R, V>(this, mapView);
dialogs.put(mapView, pane);
}
}
@@ -106,7 +106,7 @@
* dialog exists.
*/
public void disposeDialog(final MapView<G, A, R, V> mapView) {
- final GoLocationDialog dialog;
+ final GoLocationDialog<G, A, R, V> dialog;
synchronized (dialogs) {
dialog = dialogs.remove(mapView);
if (dialog == null) {
Modified: trunk/src/app/net/sf/gridarta/gui/map/ShrinkMapSizeDialogManager.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/ShrinkMapSizeDialogManager.java 2008-07-04 23:15:40 UTC (rev 4240)
+++ trunk/src/app/net/sf/gridarta/gui/map/ShrinkMapSizeDialogManager.java 2008-07-04 23:38:35 UTC (rev 4241)
@@ -38,7 +38,7 @@
public final class ShrinkMapSizeDialogManager<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R>> {
/** Dialog for each map view. */
- private final Map<MapView<G, A, R, V>, ShrinkMapSizeDialog> dialogs = new HashMap<MapView<G, A, R, V>, ShrinkMapSizeDialog>();
+ private final Map<MapView<G, A, R, V>, ShrinkMapSizeDialog<G, A, R, V>> dialogs = new HashMap<MapView<G, A, R, V>, ShrinkMapSizeDialog<G, A, R, V>>();
/** The map manager listener to detect closed map views. */
private final MapManagerListener<G, A, R, V> mapManagerListener = new MapManagerListener<G, A, R, V>() {
@@ -89,13 +89,13 @@
*/
public void showDialog(final MapView<G, A, R, V> mapView) {
synchronized (dialogs) {
- final ShrinkMapSizeDialog oldDialog = dialogs.get(mapView);
+ final ShrinkMapSizeDialog<G, A, R, V> oldDialog = dialogs.get(mapView);
if (oldDialog != null) {
oldDialog.getDialog().toFront();
return;
}
- final ShrinkMapSizeDialog pane = new ShrinkMapSizeDialog(this, mapView);
+ final ShrinkMapSizeDialog<G, A, R, V> pane = new ShrinkMapSizeDialog<G, A, R, V>(this, mapView);
dialogs.put(mapView, pane);
}
}
@@ -106,7 +106,7 @@
* dialog exists
*/
public void disposeDialog(final MapView<G, A, R, V> mapView) {
- final ShrinkMapSizeDialog dialog;
+ final ShrinkMapSizeDialog<G, A, R, V> dialog;
synchronized (dialogs) {
dialog = dialogs.remove(mapView);
if (dialog == null) {
Modified: trunk/src/app/net/sf/gridarta/gui/pickmapchooser/Folder.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/pickmapchooser/Folder.java 2008-07-04 23:15:40 UTC (rev 4240)
+++ trunk/src/app/net/sf/gridarta/gui/pickmapchooser/Folder.java 2008-07-04 23:38:35 UTC (rev 4241)
@@ -134,7 +134,7 @@
* @throws InvalidNameException if the pickmap name is invalid
*/
public synchronized Pickmap<G, A, R, V> addPickmap(@NotNull final String name, @NotNull final GridartaObjectsFactory<G, A, R, V> gridartaObjectsFactory) throws InvalidNameException {
- final Pickmap<G, A, R, V> pickmap = new Pickmap(this, name, gridartaObjectsFactory);
+ final Pickmap<G, A, R, V> pickmap = new Pickmap<G, A, R, V>(this, name, gridartaObjectsFactory);
pickmaps.add(pickmap);
for (final FolderListener<G, A, R, V> listener : listeners.getListeners(FolderListener.class)) {
listener.pickmapAdded(pickmap);
Modified: trunk/src/app/net/sf/gridarta/map/DefaultMapModel.java
===================================================================
--- trunk/src/app/net/sf/gridarta/map/DefaultMapModel.java 2008-07-04 23:15:40 UTC (rev 4240)
+++ trunk/src/app/net/sf/gridarta/map/DefaultMapModel.java 2008-07-04 23:38:35 UTC (rev 4241)
@@ -130,7 +130,7 @@
/** The errors of this map model. */
@NotNull
- private ErrorCollector<G, A, R> errors = new DefaultErrorCollector();
+ private ErrorCollector<G, A, R> errors = new DefaultErrorCollector<G, A, R>();
/**
* Create an DefaultMapModel.
Modified: trunk/src/app/net/sf/gridarta/map/validation/checks/BlockedMobOrSpawnPointChecker.java
===================================================================
--- trunk/src/app/net/sf/gridarta/map/validation/checks/BlockedMobOrSpawnPointChecker.java 2008-07-04 23:15:40 UTC (rev 4240)
+++ trunk/src/app/net/sf/gridarta/map/validation/checks/BlockedMobOrSpawnPointChecker.java 2008-07-04 23:38:35 UTC (rev 4241)
@@ -67,7 +67,7 @@
}
}
if (!blockers.isEmpty() && !mobsOrSpawnPoints.isEmpty()) {
- errorCollector.collect(new BlockedMobOrSpawnPointError(mapSquare, new ArrayList<G>(blockers), new ArrayList<G>(mobsOrSpawnPoints)));
+ errorCollector.collect(new BlockedMobOrSpawnPointError<G, A, R>(mapSquare, new ArrayList<G>(blockers), new ArrayList<G>(mobsOrSpawnPoints)));
}
blockers.clear();
mobsOrSpawnPoints.clear();
Modified: trunk/src/app/net/sf/gridarta/map/validation/checks/BlockedSpawnPointChecker.java
===================================================================
--- trunk/src/app/net/sf/gridarta/map/validation/checks/BlockedSpawnPointChecker.java 2008-07-04 23:15:40 UTC (rev 4240)
+++ trunk/src/app/net/sf/gridarta/map/validation/checks/BlockedSpawnPointChecker.java 2008-07-04 23:38:35 UTC (rev 4241)
@@ -134,7 +134,7 @@
}
}
- errorCollector.collect(new BlockedSpawnPointError(gameObject));
+ errorCollector.collect(new BlockedSpawnPointError<G, A, R>(gameObject));
}
} // class BlockedSpawnPointChecker
Modified: trunk/src/app/net/sf/gridarta/map/validation/checks/ConnectionChecker.java
===================================================================
--- trunk/src/app/net/sf/gridarta/map/validation/checks/ConnectionChecker.java 2008-07-04 23:15:40 UTC (rev 4240)
+++ trunk/src/app/net/sf/gridarta/map/validation/checks/ConnectionChecker.java 2008-07-04 23:38:35 UTC (rev 4241)
@@ -171,15 +171,15 @@
public void addErrors(final int connection, @NotNull final MapModel<G, A, R> mapModel, @NotNull final ErrorCollector<G, A, R> errorCollector) {
if (!unknowns.isEmpty()) {
for (final G gameObject : unknowns) {
- errorCollector.collect(new ConnectionUnknownError(gameObject));
+ errorCollector.collect(new ConnectionUnknownError<G, A, R>(gameObject));
}
return;
}
if (sources.isEmpty()) {
- errorCollector.collect(new ConnectionWithoutSourcesError(mapModel, connection));
+ errorCollector.collect(new ConnectionWithoutSourcesError<G, A, R>(mapModel, connection));
}
if (sinks.isEmpty()) {
- errorCollector.collect(new ConnectionWithoutSinksError(mapModel, connection));
+ errorCollector.collect(new ConnectionWithoutSinksError<G, A, R>(mapModel, connection));
}
}
Modified: trunk/src/app/net/sf/gridarta/treasurelist/CFTreasureListTree.java
===================================================================
--- trunk/src/app/net/sf/gridarta/treasurelist/CFTreasureListTree.java 2008-07-04 23:15:40 UTC (rev 4240)
+++ trunk/src/app/net/sf/gridarta/treasurelist/CFTreasureListTree.java 2008-07-04 23:38:35 UTC (rev 4241)
@@ -100,7 +100,7 @@
this.mainView = mainView;
putClientProperty("JTree.lineStyle", "Angled");
- setCellRenderer(new TreasureCellRenderer(archetypeSet, root));
+ setCellRenderer(new TreasureCellRenderer<G, A, R>(archetypeSet, root));
for (final TreasureTreeNode folder : new HashSet<TreasureTreeNode>(specialTreasureLists.values())) {
root.add(folder);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-07-04 23:39:38
|
Revision: 4242
http://gridarta.svn.sourceforge.net/gridarta/?rev=4242&view=rev
Author: akirschbaum
Date: 2008-07-04 16:39:33 -0700 (Fri, 04 Jul 2008)
Log Message:
-----------
Order import statements.
Modified Paths:
--------------
trunk/daimonin/src/daieditor/map/validation/checks/TilePathsError.java
trunk/src/app/net/sf/gridarta/gameobject/face/AbstractFaceProvider.java
trunk/src/app/net/sf/gridarta/gui/StatusBar.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/BitmaskAttrib.java
trunk/src/app/net/sf/gridarta/gui/gameobjecttexteditor/GameObjectTextEditor.java
trunk/src/app/net/sf/gridarta/gui/map/AbstractMapTilePane.java
trunk/src/app/net/sf/gridarta/gui/map/GoLocationDialog.java
trunk/src/app/net/sf/gridarta/gui/map/MapViewBasic.java
trunk/src/app/net/sf/gridarta/textedit/scripteditor/ScriptEditView.java
trunk/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/DaimoninAITokenMarker.java
Modified: trunk/daimonin/src/daieditor/map/validation/checks/TilePathsError.java
===================================================================
--- trunk/daimonin/src/daieditor/map/validation/checks/TilePathsError.java 2008-07-04 23:38:35 UTC (rev 4241)
+++ trunk/daimonin/src/daieditor/map/validation/checks/TilePathsError.java 2008-07-04 23:39:33 UTC (rev 4242)
@@ -19,11 +19,11 @@
package daieditor.map.validation.checks;
+import net.sf.gridarta.gameobject.Archetype;
+import net.sf.gridarta.gameobject.GameObject;
+import net.sf.gridarta.map.MapArchObject;
import net.sf.gridarta.map.MapModel;
-import net.sf.gridarta.map.MapArchObject;
import net.sf.gridarta.map.validation.MapValidationError;
-import net.sf.gridarta.gameobject.GameObject;
-import net.sf.gridarta.gameobject.Archetype;
/**
* Validation error that's used when a map has wrong tile paths.
Modified: trunk/src/app/net/sf/gridarta/gameobject/face/AbstractFaceProvider.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/face/AbstractFaceProvider.java 2008-07-04 23:38:35 UTC (rev 4241)
+++ trunk/src/app/net/sf/gridarta/gameobject/face/AbstractFaceProvider.java 2008-07-04 23:39:33 UTC (rev 4242)
@@ -23,9 +23,9 @@
import java.util.HashMap;
import java.util.Map;
import javax.swing.ImageIcon;
+import org.apache.log4j.Logger;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import org.apache.log4j.Logger;
/**
* Abstract Base class for FaceProviders which implements a memory sensitive
Modified: trunk/src/app/net/sf/gridarta/gui/StatusBar.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/StatusBar.java 2008-07-04 23:38:35 UTC (rev 4241)
+++ trunk/src/app/net/sf/gridarta/gui/StatusBar.java 2008-07-04 23:39:33 UTC (rev 4242)
@@ -34,8 +34,8 @@
import javax.swing.border.BevelBorder;
import net.sf.gridarta.MainControl;
import net.sf.gridarta.MapManagerListener;
+import net.sf.gridarta.gameobject.Archetype;
import net.sf.gridarta.gameobject.ArchetypeSet;
-import net.sf.gridarta.gameobject.Archetype;
import net.sf.gridarta.gameobject.GameObject;
import net.sf.gridarta.gameobject.face.FaceObjects;
import net.sf.gridarta.gui.map.LevelRenderer;
@@ -44,8 +44,8 @@
import net.sf.gridarta.gui.map.MapCursorListener;
import net.sf.gridarta.gui.map.MapView;
import net.sf.gridarta.gui.map.MapViewBasic;
+import net.sf.gridarta.map.MapArchObject;
import net.sf.gridarta.map.MapControl;
-import net.sf.gridarta.map.MapArchObject;
import net.sf.japi.swing.ActionFactory;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
Modified: trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/BitmaskAttrib.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/BitmaskAttrib.java 2008-07-04 23:38:35 UTC (rev 4241)
+++ trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/BitmaskAttrib.java 2008-07-04 23:39:33 UTC (rev 4242)
@@ -3,8 +3,8 @@
import javax.swing.text.JTextComponent;
import net.sf.gridarta.CAttribBitmask;
import net.sf.gridarta.CFArchAttrib;
+import org.apache.log4j.Logger;
import org.jetbrains.annotations.NotNull;
-import org.apache.log4j.Logger;
/**
* DialogAttrib for types with bitmasks to choose from.
Modified: trunk/src/app/net/sf/gridarta/gui/gameobjecttexteditor/GameObjectTextEditor.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjecttexteditor/GameObjectTextEditor.java 2008-07-04 23:38:35 UTC (rev 4241)
+++ trunk/src/app/net/sf/gridarta/gui/gameobjecttexteditor/GameObjectTextEditor.java 2008-07-04 23:39:33 UTC (rev 4242)
@@ -23,7 +23,6 @@
import javax.swing.JScrollPane;
import javax.swing.JTextPane;
import javax.swing.JViewport;
-import javax.swing.ScrollPaneConstants;
import javax.swing.text.BadLocationException;
import javax.swing.text.Document;
import javax.swing.text.Style;
Modified: trunk/src/app/net/sf/gridarta/gui/map/AbstractMapTilePane.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/AbstractMapTilePane.java 2008-07-04 23:38:35 UTC (rev 4241)
+++ trunk/src/app/net/sf/gridarta/gui/map/AbstractMapTilePane.java 2008-07-04 23:39:33 UTC (rev 4242)
@@ -46,8 +46,8 @@
import net.sf.gridarta.map.MapArchObject;
import net.sf.gridarta.map.MapControl;
import net.sf.japi.swing.ActionFactory;
+import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import org.jetbrains.annotations.NotNull;
/**
* A Panel for managing the tiling of maps. It creates a Panel for a map where
Modified: trunk/src/app/net/sf/gridarta/gui/map/GoLocationDialog.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/GoLocationDialog.java 2008-07-04 23:38:35 UTC (rev 4241)
+++ trunk/src/app/net/sf/gridarta/gui/map/GoLocationDialog.java 2008-07-04 23:39:33 UTC (rev 4242)
@@ -35,10 +35,10 @@
import javax.swing.border.CompoundBorder;
import javax.swing.border.EtchedBorder;
import javax.swing.border.TitledBorder;
+import net.sf.gridarta.gameobject.Archetype;
+import net.sf.gridarta.gameobject.GameObject;
import net.sf.gridarta.gui.GUIConstants;
import net.sf.gridarta.map.MapArchObject;
-import net.sf.gridarta.gameobject.GameObject;
-import net.sf.gridarta.gameobject.Archetype;
import net.sf.japi.swing.ActionFactory;
/**
Modified: trunk/src/app/net/sf/gridarta/gui/map/MapViewBasic.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/MapViewBasic.java 2008-07-04 23:38:35 UTC (rev 4241)
+++ trunk/src/app/net/sf/gridarta/gui/map/MapViewBasic.java 2008-07-04 23:39:33 UTC (rev 4242)
@@ -25,7 +25,6 @@
import java.util.ArrayList;
import java.util.List;
import javax.swing.JScrollPane;
-import javax.swing.ScrollPaneConstants;
import net.sf.gridarta.CommonConstants;
import net.sf.gridarta.Size2D;
import net.sf.gridarta.gameobject.Archetype;
Modified: trunk/src/app/net/sf/gridarta/textedit/scripteditor/ScriptEditView.java
===================================================================
--- trunk/src/app/net/sf/gridarta/textedit/scripteditor/ScriptEditView.java 2008-07-04 23:38:35 UTC (rev 4241)
+++ trunk/src/app/net/sf/gridarta/textedit/scripteditor/ScriptEditView.java 2008-07-04 23:39:33 UTC (rev 4242)
@@ -37,7 +37,6 @@
import javax.swing.JOptionPane;
import javax.swing.JTabbedPane;
import javax.swing.SwingConstants;
-import javax.swing.WindowConstants;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import javax.swing.text.BadLocationException;
Modified: trunk/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/DaimoninAITokenMarker.java
===================================================================
--- trunk/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/DaimoninAITokenMarker.java 2008-07-04 23:38:35 UTC (rev 4241)
+++ trunk/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/DaimoninAITokenMarker.java 2008-07-04 23:39:33 UTC (rev 4242)
@@ -27,8 +27,8 @@
import java.util.regex.Pattern;
import javax.swing.text.Segment;
import net.sf.gridarta.textedit.textarea.Token;
+import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import org.jetbrains.annotations.NotNull;
/**
* A {@link TokenMarker} for the message field of Daimonin AI objects.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-07-05 05:49:59
|
Revision: 4244
http://gridarta.svn.sourceforge.net/gridarta/?rev=4244&view=rev
Author: akirschbaum
Date: 2008-07-04 22:49:57 -0700 (Fri, 04 Jul 2008)
Log Message:
-----------
Fix Javadoc issues.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/MapActions.java
trunk/daimonin/src/daieditor/MapActions.java
trunk/daimonin/src/daieditor/gameobject/ArchetypeSet.java
trunk/daimonin/src/test/daieditor/map/MapArchObjectTest.java
trunk/src/app/net/sf/gridarta/gameobject/ArchetypeParser.java
trunk/src/app/net/sf/gridarta/gameobject/GameObject.java
trunk/src/app/net/sf/gridarta/gui/ErrorListView.java
trunk/src/app/net/sf/gridarta/gui/findarchetypes/TableModel.java
trunk/src/app/net/sf/gridarta/gui/map/MapViewBasic.java
trunk/src/app/net/sf/gridarta/gui/pickmapchooser/Loader.java
trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserControl.java
trunk/src/app/net/sf/gridarta/io/AbstractGameObjectParser.java
trunk/src/app/net/sf/gridarta/io/AbstractMapArchObjectParser.java
trunk/src/app/net/sf/gridarta/map/validation/checks/UndefinedArchetypeError.java
trunk/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/KeywordMap.java
trunk/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/TokenMarkerFactory.java
trunk/src/app/net/sf/gridarta/treasurelist/TreasureLoader.java
Modified: trunk/crossfire/src/cfeditor/MapActions.java
===================================================================
--- trunk/crossfire/src/cfeditor/MapActions.java 2008-07-05 05:29:45 UTC (rev 4243)
+++ trunk/crossfire/src/cfeditor/MapActions.java 2008-07-05 05:49:57 UTC (rev 4244)
@@ -117,7 +117,7 @@
* Create a new instance.
* @param mainControl the main control to use
* @param mapManager the map manager
- * @param GameObjectMatchers the game object matchers
+ * @param exitMatcher the game object matcher selecting exit objects
*/
public MapActions(final CMainControl mainControl, final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager, final GameObjectMatcher exitMatcher) {
this.mainControl = mainControl;
Modified: trunk/daimonin/src/daieditor/MapActions.java
===================================================================
--- trunk/daimonin/src/daieditor/MapActions.java 2008-07-05 05:29:45 UTC (rev 4243)
+++ trunk/daimonin/src/daieditor/MapActions.java 2008-07-05 05:49:57 UTC (rev 4244)
@@ -113,7 +113,7 @@
* Create a new instance.
* @param mainControl the main control to use
* @param mapManager the map manager
- * @param GameObjectMatchers the game object matchers
+ * @param exitMatcher the game object matcher selecting exit objects
*/
public MapActions(final CMainControl mainControl, final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager, final GameObjectMatcher exitMatcher) {
this.mainControl = mainControl;
Modified: trunk/daimonin/src/daieditor/gameobject/ArchetypeSet.java
===================================================================
--- trunk/daimonin/src/daieditor/gameobject/ArchetypeSet.java 2008-07-05 05:29:45 UTC (rev 4243)
+++ trunk/daimonin/src/daieditor/gameobject/ArchetypeSet.java 2008-07-05 05:49:57 UTC (rev 4244)
@@ -407,8 +407,8 @@
* This method loads animations that are separately defined by looping
* through all files that were previously collected by {@link
* #loadArchetypesFromFiles(AbstractArchetypeParser, File, int, String,
- * String, boolean)}. Do not invoke this method if loadArchFromFiles()
- * wasn't invoked.
+ * String, boolean, List)}. Do not invoke this method if
+ * <code>loadArchetypesFromFiles()</code> wasn't invoked.
*/
private void loadAnimsFromFiles() {
for (final File animFile : animFiles) {
Modified: trunk/daimonin/src/test/daieditor/map/MapArchObjectTest.java
===================================================================
--- trunk/daimonin/src/test/daieditor/map/MapArchObjectTest.java 2008-07-05 05:29:45 UTC (rev 4243)
+++ trunk/daimonin/src/test/daieditor/map/MapArchObjectTest.java 2008-07-05 05:49:57 UTC (rev 4244)
@@ -37,7 +37,9 @@
public class MapArchObjectTest {
/**
- * Test for {@link MapArchObject#parseMapArch(java.io.BufferedReader)}.
+ * Test for {@link
+ * net.sf.gridarta.io.AbstractMapArchObjectParser#load(BufferedReader,
+ * net.sf.gridarta.map.MapArchObject)}.
* @throws IOException (unexpected)
*/
@Test
Modified: trunk/src/app/net/sf/gridarta/gameobject/ArchetypeParser.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/ArchetypeParser.java 2008-07-05 05:29:45 UTC (rev 4243)
+++ trunk/src/app/net/sf/gridarta/gameobject/ArchetypeParser.java 2008-07-05 05:49:57 UTC (rev 4244)
@@ -75,7 +75,7 @@
/**
* Short form of {@link #parseArchetypeFromStream(BufferedReader,
- * GameObject, String, String, String, String, String)}.
+ * GameObject, String, String, String, String, String, List)}.
* @param in <code>BufferedReader</code> file stream of archetype data
* @param panelName the panel name to add the archetype to
* @param folderName the folder name to add the archetype to
Modified: trunk/src/app/net/sf/gridarta/gameobject/GameObject.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/GameObject.java 2008-07-05 05:29:45 UTC (rev 4243)
+++ trunk/src/app/net/sf/gridarta/gameobject/GameObject.java 2008-07-05 05:49:57 UTC (rev 4244)
@@ -1504,7 +1504,7 @@
/**
* Add/remove a certain connection of the given arch by changing archtype
* and face.
- * @param gameObject GameObject to connect.
+ * @param archetype GameObject to connect.
* @param archetype the archetype to connect with
*/
public void connectArch(@NotNull final R archetype) {
Modified: trunk/src/app/net/sf/gridarta/gui/ErrorListView.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/ErrorListView.java 2008-07-05 05:29:45 UTC (rev 4243)
+++ trunk/src/app/net/sf/gridarta/gui/ErrorListView.java 2008-07-05 05:49:57 UTC (rev 4244)
@@ -137,7 +137,7 @@
/**
* Create a ConnectionPanel.
- * @param mapControl the map manager
+ * @param mapManager the map manager
* @param selectedSquareView the selected square view to update
*/
public ErrorListView(@NotNull final MapManager<G, A, R, V> mapManager, @NotNull final SelectedSquareView<G, A, R, V> selectedSquareView) {
Modified: trunk/src/app/net/sf/gridarta/gui/findarchetypes/TableModel.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/findarchetypes/TableModel.java 2008-07-05 05:29:45 UTC (rev 4243)
+++ trunk/src/app/net/sf/gridarta/gui/findarchetypes/TableModel.java 2008-07-05 05:49:57 UTC (rev 4244)
@@ -175,8 +175,9 @@
/**
* Finish updating the model's contents. This function must be called after
- * one or more elements have been added with {@link #add(R)}. If at least
- * one element has been added, {@link #sortTable()} must be called first.
+ * one or more elements have been added with {@link #add(Archetype)}. If at
+ * least one element has been added, {@link #sortTable()} must be called
+ * first.
*/
public void finishUpdate() {
if (sorting == null && archetypes.size() > 0) {
Modified: trunk/src/app/net/sf/gridarta/gui/map/MapViewBasic.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/MapViewBasic.java 2008-07-05 05:29:45 UTC (rev 4243)
+++ trunk/src/app/net/sf/gridarta/gui/map/MapViewBasic.java 2008-07-05 05:49:57 UTC (rev 4244)
@@ -161,7 +161,6 @@
/**
* Get the cursor square.
* @return cursor square or <code>null</code> if no current cursor
- * @see #getCursorPosition()
*/
@Nullable
public MapSquare<G, A, R> getCursorSquare() {
@@ -191,7 +190,7 @@
/**
* Set the cursor position.
* @param cursorPosition cursor position
- * @see #getCursorPosition()
+ * @see #getCursorSquare()
*/
public void setCursorPosition(final Point cursorPosition) {
mapCursor.setLocation(cursorPosition);
Modified: trunk/src/app/net/sf/gridarta/gui/pickmapchooser/Loader.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/pickmapchooser/Loader.java 2008-07-05 05:29:45 UTC (rev 4243)
+++ trunk/src/app/net/sf/gridarta/gui/pickmapchooser/Loader.java 2008-07-05 05:49:57 UTC (rev 4244)
@@ -71,7 +71,6 @@
/**
* Loads all pickmap files from a directory and its subdirectories.
- * @param dir the directory
* @param parent the parent folder, or <code>null</code>
* @param folderName the folder name of <code>dir</code>
* @return the default <code>Folder</code>, or <code>null</code> if this
Modified: trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserControl.java 2008-07-05 05:29:45 UTC (rev 4243)
+++ trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserControl.java 2008-07-05 05:49:57 UTC (rev 4244)
@@ -177,7 +177,7 @@
/**
* Reload a pickmap. Does nothing if the given file is unknown.
- * @param mapFile The file of the pickmap.
+ * @param file The file of the pickmap.
*/
public void reloadPickmap(@NotNull final File file) {
final Pickmap<G, A, R, V> pickmap = view.getPickmap(file);
Modified: trunk/src/app/net/sf/gridarta/io/AbstractGameObjectParser.java
===================================================================
--- trunk/src/app/net/sf/gridarta/io/AbstractGameObjectParser.java 2008-07-05 05:29:45 UTC (rev 4243)
+++ trunk/src/app/net/sf/gridarta/io/AbstractGameObjectParser.java 2008-07-05 05:49:57 UTC (rev 4244)
@@ -38,8 +38,8 @@
/**
* Abstract base class for classes implementing {@link GameObjectParser}s. This
* class contains the common code for reading game objects. Subclasses can
- * extend the parser ({@link #parseLine(String, A)}. No support for writing is
- * present.
+ * extend the parser ({@link #parseLine(String, GameObject)}. No support for
+ * writing is present.
* @author Andreas Kirschbaum
*/
public abstract class AbstractGameObjectParser<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> implements GameObjectParser<G, A, R> {
Modified: trunk/src/app/net/sf/gridarta/io/AbstractMapArchObjectParser.java
===================================================================
--- trunk/src/app/net/sf/gridarta/io/AbstractMapArchObjectParser.java 2008-07-05 05:29:45 UTC (rev 4243)
+++ trunk/src/app/net/sf/gridarta/io/AbstractMapArchObjectParser.java 2008-07-05 05:49:57 UTC (rev 4244)
@@ -28,8 +28,8 @@
/**
* Abstract base class for classes implementing {@link MapArchObjectParser}s.
* This class contains the common code for reading map arch objects. Subclasses
- * can extend the parser ({@link #parseLine(String, A)}. No support for writing
- * is present.
+ * can extend the parser ({@link #parseLine(String, MapArchObject)}. No support
+ * for writing is present.
* @author Andreas Kirschbaum
*/
public abstract class AbstractMapArchObjectParser<A extends MapArchObject<A>> implements MapArchObjectParser<A> {
Modified: trunk/src/app/net/sf/gridarta/map/validation/checks/UndefinedArchetypeError.java
===================================================================
--- trunk/src/app/net/sf/gridarta/map/validation/checks/UndefinedArchetypeError.java 2008-07-05 05:29:45 UTC (rev 4243)
+++ trunk/src/app/net/sf/gridarta/map/validation/checks/UndefinedArchetypeError.java 2008-07-05 05:49:57 UTC (rev 4244)
@@ -25,7 +25,7 @@
import net.sf.gridarta.map.validation.GameObjectValidationError;
/**
- * Validation error that's used when the {@link UndefinedArchetypeCheker}
+ * Validation error that's used when the {@link UndefinedArchetypeChecker}
* detected a possible error on the map.
* @author Andreas Kirschbaum
*/
Modified: trunk/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/KeywordMap.java
===================================================================
--- trunk/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/KeywordMap.java 2008-07-05 05:29:45 UTC (rev 4243)
+++ trunk/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/KeywordMap.java 2008-07-05 05:49:57 UTC (rev 4244)
@@ -69,8 +69,7 @@
}
/**
- * Adds a key-value mapping. All characters in the key must be withing
- * {@link #Node.MIN}..{@link #Node.MAX}.
+ * Adds a key-value mapping.
* @param keyword The key to add.
* @param id The value to map to.
*/
Modified: trunk/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/TokenMarkerFactory.java
===================================================================
--- trunk/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/TokenMarkerFactory.java 2008-07-05 05:29:45 UTC (rev 4243)
+++ trunk/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/TokenMarkerFactory.java 2008-07-05 05:49:57 UTC (rev 4244)
@@ -32,10 +32,10 @@
*/
public class TokenMarkerFactory {
- /** File extension for {@link CrossfireDialogTokenMarkerTokenMarker}. */
+ /** File extension for {@link CrossfireDialogTokenMarker}. */
public static final String CROSSFIRE_DIALOG = "crossfire-dialog";
- /** File extension for {@link DaimoninAITokenMarkerTokenMarkerFactory}. */
+ /** File extension for {@link DaimoninAITokenMarker}. */
public static final String DAIMONIN_AI = "daimonin-ai";
/** Maps file extensions to token marker classes. */
Modified: trunk/src/app/net/sf/gridarta/treasurelist/TreasureLoader.java
===================================================================
--- trunk/src/app/net/sf/gridarta/treasurelist/TreasureLoader.java 2008-07-05 05:29:45 UTC (rev 4243)
+++ trunk/src/app/net/sf/gridarta/treasurelist/TreasureLoader.java 2008-07-05 05:49:57 UTC (rev 4244)
@@ -158,7 +158,7 @@
* <code>dname</code>
* @param tmpList tmp. container for all treasurelists
* @param needLink all sub-treasurelist nodes that need linking
- * @see #parseTreasures()
+ * @see #parseTreasures(TreasureLocation[], Map, DefaultMutableTreeNode)
*/
private void loadTreasureList(final String dname, final String fname, final List<TreasureTreeNode> tmpList, final List<TreasureTreeNode> needLink) {
if (fname == null) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-07-05 06:12:33
|
Revision: 4245
http://gridarta.svn.sourceforge.net/gridarta/?rev=4245&view=rev
Author: akirschbaum
Date: 2008-07-04 23:12:33 -0700 (Fri, 04 Jul 2008)
Log Message:
-----------
Fix Javadoc issues.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/CFilterControl.java
trunk/crossfire/src/cfeditor/gameobject/ArchetypeParser.java
trunk/crossfire/src/cfeditor/gui/GameObjectAttributesDialog.java
trunk/daimonin/src/daieditor/gameobject/ArchetypeParser.java
trunk/daimonin/src/daieditor/gui/GameObjectAttributesDialog.java
trunk/daimonin/src/daieditor/gui/map/DefaultLevelRenderer.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/gui/gameobjectattributesdialog/AbstractGameObjectAttributesDialog.java
trunk/src/app/net/sf/gridarta/map/DefaultMapControl.java
trunk/src/app/net/sf/gridarta/map/validation/checks/ConnectionChecker.java
trunk/src/app/net/sf/gridarta/textedit/textarea/DefaultInputHandler.java
Modified: trunk/crossfire/src/cfeditor/CFilterControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CFilterControl.java 2008-07-05 05:49:57 UTC (rev 4244)
+++ trunk/crossfire/src/cfeditor/CFilterControl.java 2008-07-05 06:12:33 UTC (rev 4245)
@@ -77,6 +77,7 @@
* filterOut anything
* @param mapControl MapControl to create FilterControl for.
* @param mainControl The main control.
+ * @param filterList the filter list instance to use
*/
public CFilterControl(@Nullable final MapControl<cfeditor.gameobject.GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl, @NotNull final CMainControl mainControl, final NamedFilterList filterList) {
this.filterList = filterList;
Modified: trunk/crossfire/src/cfeditor/gameobject/ArchetypeParser.java
===================================================================
--- trunk/crossfire/src/cfeditor/gameobject/ArchetypeParser.java 2008-07-05 05:49:57 UTC (rev 4244)
+++ trunk/crossfire/src/cfeditor/gameobject/ArchetypeParser.java 2008-07-05 06:12:33 UTC (rev 4245)
@@ -72,6 +72,7 @@
* @param mainControl main control
* @param archetypeChooserControl an archetype chooser to add parsed
* archetypes to
+ * @param animationObjects the animation objects instance to use
*/
public ArchetypeParser(final MainControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mainControl, final ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserControl, final AnimationObjects<?> animationObjects) {
this.mainControl = mainControl;
Modified: trunk/crossfire/src/cfeditor/gui/GameObjectAttributesDialog.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/GameObjectAttributesDialog.java 2008-07-05 05:49:57 UTC (rev 4244)
+++ trunk/crossfire/src/cfeditor/gui/GameObjectAttributesDialog.java 2008-07-05 06:12:33 UTC (rev 4245)
@@ -77,6 +77,7 @@
* @param gameObject the GameObject to be displayed by this dialog
* @param mainControl main control
* @param mapManager the map manager
+ * @param treasureListTree the treasure list tree instance to use
* @param faceObjects the FaceObjects instance to use
*/
public static void showAttribDialog(final CFArchTypeList archTypeList, final GameObject gameObject, final MainControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mainControl, final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager, @NotNull final CFTreasureListTree<GameObject, MapArchObject, Archetype> treasureListTree, @NotNull final FaceObjects faceObjects) {
Modified: trunk/daimonin/src/daieditor/gameobject/ArchetypeParser.java
===================================================================
--- trunk/daimonin/src/daieditor/gameobject/ArchetypeParser.java 2008-07-05 05:49:57 UTC (rev 4244)
+++ trunk/daimonin/src/daieditor/gameobject/ArchetypeParser.java 2008-07-05 06:12:33 UTC (rev 4245)
@@ -73,6 +73,7 @@
* @param mainControl main control
* @param archetypeChooserControl an archetype chooser to add parsed
* archetypes to
+ * @param animationObjects the animation objects instance to use
*/
public ArchetypeParser(final MainControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mainControl, final ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserControl, final AnimationObjects<?> animationObjects) {
this.mainControl = mainControl;
Modified: trunk/daimonin/src/daieditor/gui/GameObjectAttributesDialog.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/GameObjectAttributesDialog.java 2008-07-05 05:49:57 UTC (rev 4244)
+++ trunk/daimonin/src/daieditor/gui/GameObjectAttributesDialog.java 2008-07-05 06:12:33 UTC (rev 4245)
@@ -76,6 +76,7 @@
* @param gameObject the GameObject to be displayed by this dialog
* @param mainControl main control
* @param mapManager the map manager
+ * @param treasureListTree the treasure list tree instance to use
* @param faceObjects the FaceObjects instance to use
*/
public static void showAttribDialog(final CFArchTypeList archTypeList, final GameObject gameObject, final MainControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mainControl, final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager, @NotNull final CFTreasureListTree<GameObject, MapArchObject, Archetype> treasureListTree, @NotNull final FaceObjects faceObjects) {
Modified: trunk/daimonin/src/daieditor/gui/map/DefaultLevelRenderer.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/map/DefaultLevelRenderer.java 2008-07-05 05:49:57 UTC (rev 4244)
+++ trunk/daimonin/src/daieditor/gui/map/DefaultLevelRenderer.java 2008-07-05 06:12:33 UTC (rev 4245)
@@ -139,6 +139,8 @@
* @param mainControl MainControl, used for getting icons and similar
* @param mapControl MapControl of the map to render
* @param mapGrid Grid to render
+ * @param borderOffsetX the horizontal border size
+ * @param borderOffsetY the vertical border size
* @param faceObjects the FaceObjects instance to use
*/
protected DefaultLevelRenderer(final CMainControl mainControl, final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl, final MapGrid mapGrid, final int borderOffsetX, final int borderOffsetY, @NotNull final FaceObjects faceObjects) {
Modified: trunk/src/app/net/sf/gridarta/gameobject/GameObject.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/GameObject.java 2008-07-05 05:49:57 UTC (rev 4244)
+++ trunk/src/app/net/sf/gridarta/gameobject/GameObject.java 2008-07-05 06:12:33 UTC (rev 4245)
@@ -1504,7 +1504,6 @@
/**
* Add/remove a certain connection of the given arch by changing archtype
* and face.
- * @param archetype GameObject to connect.
* @param archetype the archetype to connect with
*/
public void connectArch(@NotNull final R archetype) {
Modified: trunk/src/app/net/sf/gridarta/gameobject/scripts/AbstractScriptArchEditor.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/scripts/AbstractScriptArchEditor.java 2008-07-05 05:49:57 UTC (rev 4244)
+++ trunk/src/app/net/sf/gridarta/gameobject/scripts/AbstractScriptArchEditor.java 2008-07-05 06:12:33 UTC (rev 4245)
@@ -68,7 +68,13 @@
protected AbstractScriptArchEditor() {
}
- /** Initialize the JComboBox with the event types. */
+ /**
+ * Initialize the JComboBox with the event types.
+ * @param ending the suffix for script files
+ * @param name the default event type
+ * @param eventTypeBox the <code>JComboBox</code> containing all event
+ * types
+ */
public static synchronized void initEventTypeBoxes(final String ending, final String name, final JComboBox eventTypeBox) {
scriptEnding = ending;
Modified: trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/AbstractGameObjectAttributesDialog.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/AbstractGameObjectAttributesDialog.java 2008-07-05 05:49:57 UTC (rev 4244)
+++ trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/AbstractGameObjectAttributesDialog.java 2008-07-05 06:12:33 UTC (rev 4245)
@@ -182,9 +182,9 @@
* Create an AbstractGameObjectAttributesDialog.
* @param archTypeList Reference to the list of CFArchTypes.
* @param gameObject GameObject to show dialog for.
- * @param mainControl MainControl, for retrieving AnimationObjects,
- * FaceObjects etc..
+ * @param mainControl MainControl, for retrieving AnimationObjects etc.
* @param treasureListTree the treasure list tree
+ * @param faceObjects the face objects instance to use
*/
protected AbstractGameObjectAttributesDialog(final CFArchTypeList archTypeList, @NotNull final G gameObject, @NotNull final MainControl<G, A, R, ?> mainControl, @NotNull final CFTreasureListTree<G, A, R> treasureListTree, @NotNull final FaceObjects faceObjects) {
this.archTypeList = archTypeList;
Modified: trunk/src/app/net/sf/gridarta/map/DefaultMapControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/map/DefaultMapControl.java 2008-07-05 05:49:57 UTC (rev 4244)
+++ trunk/src/app/net/sf/gridarta/map/DefaultMapControl.java 2008-07-05 06:12:33 UTC (rev 4245)
@@ -148,6 +148,7 @@
* @param mapArchObject the map arch object for this map
* @param isPickmap true if this is a pickmap
* @param exitTypeGameObjectMatcher the matcher to select exit objects
+ * @param archetypeChooserControl the archeype chooser control to use
*/
public DefaultMapControl(@NotNull final GridartaObjectsFactory<G, A, R, V> gridartaObjectsFactory, @NotNull final MainControl<G, A, R, V> mainControl, final List<G> objects, final A mapArchObject, final boolean isPickmap, @Nullable final GameObjectMatcher exitTypeGameObjectMatcher, @NotNull final ArchetypeChooserControl<G, A, R, V> archetypeChooserControl) {
this.gridartaObjectsFactory = gridartaObjectsFactory;
Modified: trunk/src/app/net/sf/gridarta/map/validation/checks/ConnectionChecker.java
===================================================================
--- trunk/src/app/net/sf/gridarta/map/validation/checks/ConnectionChecker.java 2008-07-05 05:49:57 UTC (rev 4244)
+++ trunk/src/app/net/sf/gridarta/map/validation/checks/ConnectionChecker.java 2008-07-05 06:12:33 UTC (rev 4245)
@@ -114,7 +114,8 @@
/**
* Return whether a given game object is a source if connected.
- * @return Whether the game object is a source.
+ * @param gameObject the game object
+ * @return whether the game object is a source
*/
private boolean isSource(@NotNull final G gameObject) {
return sources.contains(gameObject.getArchTypNr());
@@ -122,7 +123,8 @@
/**
* Return whether a given game object is a sink if connected.
- * @return Whether the game object is a sink.
+ * @param gameObject the game object
+ * @return whether the game object is a sink
*/
private boolean isSink(@NotNull final G gameObject) {
return sinks.contains(gameObject.getArchTypNr());
Modified: trunk/src/app/net/sf/gridarta/textedit/textarea/DefaultInputHandler.java
===================================================================
--- trunk/src/app/net/sf/gridarta/textedit/textarea/DefaultInputHandler.java 2008-07-05 05:49:57 UTC (rev 4244)
+++ trunk/src/app/net/sf/gridarta/textedit/textarea/DefaultInputHandler.java 2008-07-05 06:12:33 UTC (rev 4245)
@@ -253,6 +253,7 @@
* <i>shortcut</i> is either a single character, or a keycode name from the
* <code>KeyEvent</code> class, without the <code>VK_</code> prefix.
* @param keyStroke a string description of the key stroke
+ * @return the key stroke or <code>null</code> if invalid
*/
@Nullable
public static KeyStroke parseKeyStroke(final String keyStroke) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-07-05 06:17:08
|
Revision: 4246
http://gridarta.svn.sourceforge.net/gridarta/?rev=4246&view=rev
Author: akirschbaum
Date: 2008-07-04 23:17:08 -0700 (Fri, 04 Jul 2008)
Log Message:
-----------
Remove empty declaration.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/CMainControl.java
trunk/daimonin/src/daieditor/CMainControl.java
Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java 2008-07-05 06:12:33 UTC (rev 4245)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2008-07-05 06:17:08 UTC (rev 4246)
@@ -739,8 +739,6 @@
log.debug(ACTION_FACTORY.getString("logExitWithoutExit"));
}
}
-
- ;
};
thread.start();
}
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2008-07-05 06:12:33 UTC (rev 4245)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2008-07-05 06:17:08 UTC (rev 4246)
@@ -927,8 +927,6 @@
log.debug(ACTION_FACTORY.getString("logExitWithoutExit"));
}
}
-
- ;
};
thread.start();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-07-05 07:26:49
|
Revision: 4248
http://gridarta.svn.sourceforge.net/gridarta/?rev=4248&view=rev
Author: akirschbaum
Date: 2008-07-05 00:26:49 -0700 (Sat, 05 Jul 2008)
Log Message:
-----------
Move ArchetypeSet.getFace() to common code base.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/gameobject/ArchetypeSet.java
trunk/daimonin/src/daieditor/gameobject/ArchetypeSet.java
trunk/src/app/net/sf/gridarta/gameobject/AbstractArchetypeSet.java
Modified: trunk/crossfire/src/cfeditor/gameobject/ArchetypeSet.java
===================================================================
--- trunk/crossfire/src/cfeditor/gameobject/ArchetypeSet.java 2008-07-05 06:26:58 UTC (rev 4247)
+++ trunk/crossfire/src/cfeditor/gameobject/ArchetypeSet.java 2008-07-05 07:26:49 UTC (rev 4248)
@@ -45,13 +45,11 @@
import net.sf.gridarta.gameobject.face.DuplicateFaceException;
import net.sf.gridarta.gameobject.face.FaceObjectProviders;
import net.sf.gridarta.gameobject.face.FaceObjects;
-import net.sf.gridarta.gui.SystemIcons;
import net.sf.gridarta.io.IOUtils;
import net.sf.japi.swing.ActionFactory;
import net.sf.japi.swing.misc.Progress;
import org.apache.log4j.Logger;
import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
/**
* The <code>ArchetypeSet</code> contains all the Archetypes.
@@ -89,31 +87,6 @@
this.faceObjects = faceObjects;
}
- /**
- * Returns the face ImageIcon with a certain face name.
- * @param faceName the face name of face ImageIcon
- * @param hasUndefinedArchetype if set, return the face for an game object
- * referencing an undefined archetype
- * @return face ImageIcon for face <var>faceName</var>
- */
- @NotNull
- private static ImageIcon getFace(@Nullable final String faceName, final boolean hasUndefinedArchetype) {
- if (hasUndefinedArchetype) {
- return SystemIcons.getNoarchTileIcon();
- }
-
- if (faceName == null || FaceObjectProviders.normal == null) {
- return SystemIcons.getNofaceTileIcon();
- }
-
- final ImageIcon face = FaceObjectProviders.normal.getImageIconForFacename(faceName);
- if (face == null) {
- return SystemIcons.getUnknownTileIcon();
- }
-
- return face;
- }
-
/** {@inheritDoc} */
@NotNull
public ImageIcon getFace(@NotNull final Archetype archetype) {
Modified: trunk/daimonin/src/daieditor/gameobject/ArchetypeSet.java
===================================================================
--- trunk/daimonin/src/daieditor/gameobject/ArchetypeSet.java 2008-07-05 06:26:58 UTC (rev 4247)
+++ trunk/daimonin/src/daieditor/gameobject/ArchetypeSet.java 2008-07-05 07:26:49 UTC (rev 4248)
@@ -97,31 +97,6 @@
this.faceObjects = faceObjects;
}
- /**
- * Returns the face ImageIcon with a certain face name.
- * @param faceName the face name of face ImageIcon
- * @param hasUndefinedArchetype if set, return the face for an game object
- * referencing an undefined archetype
- * @return face ImageIcon for face <var>faceName</var>
- */
- @NotNull
- private static ImageIcon getFace(@Nullable final String faceName, final boolean hasUndefinedArchetype) {
- if (hasUndefinedArchetype) {
- return SystemIcons.getNoarchTileIcon();
- }
-
- if (faceName == null || FaceObjectProviders.normal == null) {
- return SystemIcons.getNofaceTileIcon();
- }
-
- final ImageIcon face = FaceObjectProviders.normal.getImageIconForFacename(faceName);
- if (face == null) {
- return SystemIcons.getUnknownTileIcon();
- }
-
- return face;
- }
-
/** {@inheritDoc} */
@NotNull
public ImageIcon getFace(@NotNull final Archetype archetype) {
Modified: trunk/src/app/net/sf/gridarta/gameobject/AbstractArchetypeSet.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/AbstractArchetypeSet.java 2008-07-05 06:26:58 UTC (rev 4247)
+++ trunk/src/app/net/sf/gridarta/gameobject/AbstractArchetypeSet.java 2008-07-05 07:26:49 UTC (rev 4248)
@@ -31,6 +31,7 @@
import java.util.List;
import java.util.Map;
import java.util.TreeMap;
+import javax.swing.ImageIcon;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
@@ -38,6 +39,8 @@
import javax.swing.JTable;
import javax.swing.event.EventListenerList;
import net.sf.gridarta.GridartaObjectsFactory;
+import net.sf.gridarta.gameobject.face.FaceObjectProviders;
+import net.sf.gridarta.gui.SystemIcons;
import net.sf.gridarta.map.MapArchObject;
import net.sf.japi.swing.ActionFactory;
import org.jetbrains.annotations.NotNull;
@@ -249,4 +252,29 @@
}
}
+ /**
+ * Returns the face ImageIcon with a certain face name.
+ * @param faceName the face name of face ImageIcon
+ * @param hasUndefinedArchetype if set, return the face for an game object
+ * referencing an undefined archetype
+ * @return face ImageIcon for face <var>faceName</var>
+ */
+ @NotNull
+ protected static ImageIcon getFace(@Nullable final String faceName, final boolean hasUndefinedArchetype) {
+ if (hasUndefinedArchetype) {
+ return SystemIcons.getNoarchTileIcon();
+ }
+
+ if (faceName == null || FaceObjectProviders.normal == null) {
+ return SystemIcons.getNofaceTileIcon();
+ }
+
+ final ImageIcon face = FaceObjectProviders.normal.getImageIconForFacename(faceName);
+ if (face == null) {
+ return SystemIcons.getUnknownTileIcon();
+ }
+
+ return face;
+ }
+
} // class AbstractArchetypeSet
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-07-06 21:48:18
|
Revision: 4249
http://gridarta.svn.sourceforge.net/gridarta/?rev=4249&view=rev
Author: akirschbaum
Date: 2008-07-06 14:48:15 -0700 (Sun, 06 Jul 2008)
Log Message:
-----------
Replace some characters in auto-generated thumbnail and icon filenames to make the filenames work on Windows.
Modified Paths:
--------------
trunk/crossfire/ChangeLog
trunk/src/app/net/sf/gridarta/MapImageCache.java
Modified: trunk/crossfire/ChangeLog
===================================================================
--- trunk/crossfire/ChangeLog 2008-07-05 07:26:49 UTC (rev 4248)
+++ trunk/crossfire/ChangeLog 2008-07-06 21:48:15 UTC (rev 4249)
@@ -1,3 +1,8 @@
+2008-07-06 Andreas Kirschbaum
+
+ * Replace some characters in auto-generated thumbnail and icon
+ filenames to make the filenames work on Windows.
+
2008-06-07 Andreas Kirschbaum
* Do not crash if the destination map in 'enter exit' cannot be
Modified: trunk/src/app/net/sf/gridarta/MapImageCache.java
===================================================================
--- trunk/src/app/net/sf/gridarta/MapImageCache.java 2008-07-05 07:26:49 UTC (rev 4248)
+++ trunk/src/app/net/sf/gridarta/MapImageCache.java 2008-07-06 21:48:15 UTC (rev 4249)
@@ -420,7 +420,25 @@
final StringBuilder sb = new StringBuilder();
for (File tmp = mapFile; tmp != null; tmp = tmp.getParentFile()) {
- sb.insert(0, tmp.getName().replaceAll("!", "!!"));
+ final String name = tmp.getName();
+ int pos = 0;
+ for (int i = 0; i < name.length(); i++) {
+ final char ch = name.charAt(i);
+ if (('0' <= ch && ch <= '9')
+ || ('a' <= ch && ch <= 'z')
+ || ('A' <= ch && ch <= 'Z')
+ || ch == ' '
+ || ch == '.'
+ || ch == '-'
+ || ch == '_') {
+ sb.insert(pos++, ch);
+ } else {
+ sb.insert(pos++, '%');
+ final String str = Integer.toHexString(ch);
+ sb.insert(pos, str);
+ pos += str.length();
+ }
+ }
sb.insert(0, '!');
}
sb.append(".png");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-07-08 18:30:36
|
Revision: 4254
http://gridarta.svn.sourceforge.net/gridarta/?rev=4254&view=rev
Author: akirschbaum
Date: 2008-07-08 11:29:46 -0700 (Tue, 08 Jul 2008)
Log Message:
-----------
Remove unneeded fields.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/CMainControl.java
trunk/daimonin/src/daieditor/CMainControl.java
trunk/src/app/net/sf/gridarta/gui/ArchetypesActions.java
trunk/src/app/net/sf/gridarta/gui/MainView.java
trunk/src/app/net/sf/gridarta/map/validation/checks/BlockedMatrix.java
trunk/src/app/net/sf/gridarta/preferences/FilePreferencesFactory.java
trunk/src/app/net/sf/gridarta/updater/UpdaterManager.java
Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java 2008-07-08 04:59:54 UTC (rev 4253)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2008-07-08 18:29:46 UTC (rev 4254)
@@ -192,9 +192,6 @@
/** The list of archtype-data (loaded from "types.xml"). */
private CFArchTypeList typeList = null;
- /** The game object matchers. */
- private final GameObjectMatchers gameObjectMatchers;
-
/** The map validators. */
private final DelegatingMapValidator<GameObject, MapArchObject, Archetype> validators;
@@ -260,7 +257,7 @@
throw new MissingResourceException("Cannot create XML parser: " + ex.getMessage(), null, null);
}
typeList = new CFArchTypeList(xmlHelper.getDocumentBuilder(), xmlHelper.getXPath());
- gameObjectMatchers = new GameObjectMatchers(xmlHelper.getDocumentBuilder(), xmlHelper.getXPath());
+ final GameObjectMatchers gameObjectMatchers = new GameObjectMatchers(xmlHelper.getDocumentBuilder(), xmlHelper.getXPath());
new ArchetypeSetSpellLoader<GameObject, MapArchObject, Archetype>().load(archetypeSet, Archetype.TYPE_SPELL, gameObjectSpells);
gameObjectSpells.sort();
numberSpells.sort();
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2008-07-08 04:59:54 UTC (rev 4253)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2008-07-08 18:29:46 UTC (rev 4254)
@@ -184,8 +184,6 @@
/** Preferences default value for editor application. */
public static final String PREFS_APP_EDITOR_DEFAULT = "vim";
- private final Action aCollectSpells;
-
/** The map manager actions. */
private final MapManagerActions<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManagerActions;
@@ -285,7 +283,7 @@
mapCursorControl = new MapCursorControl<GameObject, MapArchObject, Archetype, CMapViewBasic>("daieditor", this, getMapManager());
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");
- aCollectSpells = ACTION_FACTORY.createAction(true, "collectSpells", this);
+ ACTION_FACTORY.createAction(true, "collectSpells", this);
mapManagerActions = new MapManagerActions<GameObject, MapArchObject, Archetype, CMapViewBasic>(getMapManager());
globalSettings.readGlobalSettings();
PathManager.setGlobalSettings(globalSettings);
Modified: trunk/src/app/net/sf/gridarta/gui/ArchetypesActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/ArchetypesActions.java 2008-07-08 04:59:54 UTC (rev 4253)
+++ trunk/src/app/net/sf/gridarta/gui/ArchetypesActions.java 2008-07-08 18:29:46 UTC (rev 4254)
@@ -44,9 +44,6 @@
/** Action for "display object names". */
private final ToggleAction aDisplayObjectNames;
- /** The "find archetypes" dialog. */
- private final FindArchetypesDialog<G, A, R, V> findArchetypesDialog;
-
/** The listener to detect attribute changes. */
private final ArchetypeChooserListener<G, A, R> archetypeChooserListener = new ArchetypeChooserListener<G, A, R>() {
@@ -71,7 +68,7 @@
* @param archTypeList the instance for looking up archetype types
*/
public ArchetypesActions(@NotNull final Component parent, @NotNull final ArchetypeChooserControl<G, A, R, V> archetypeChooserControl, @NotNull final ObjectChooser<G, A, R, V> objectChooser, final CFArchTypeList archTypeList) {
- findArchetypesDialog = new FindArchetypesDialog<G, A, R, V>(parent, archetypeChooserControl, objectChooser, archTypeList);
+ final FindArchetypesDialog<G, A, R, V> findArchetypesDialog = new FindArchetypesDialog<G, A, R, V>(parent, archetypeChooserControl, objectChooser, archTypeList);
aDisplayObjectNames = (ToggleAction) ACTION_FACTORY.createToggle(true, "displayObjectNames", archetypeChooserControl);
ACTION_FACTORY.createAction(true, "findArchetypes", findArchetypesDialog);
archetypeChooserControl.addArchetypeChooserListener(archetypeChooserListener);
Modified: trunk/src/app/net/sf/gridarta/gui/MainView.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/MainView.java 2008-07-08 04:59:54 UTC (rev 4253)
+++ trunk/src/app/net/sf/gridarta/gui/MainView.java 2008-07-08 18:29:46 UTC (rev 4254)
@@ -166,8 +166,6 @@
/** Attributes panel (bottom). */
private GameObjectAttributesPanel<G, A, R, V> gameObjectAttributesPanel;
- private final Action aViewTreasurelists;
-
/** The action for "close all map windows". */
private final Action aCloseAll;
@@ -260,10 +258,10 @@
this.mainControl = mainControl;
this.objectChooser = objectChooser;
this.actionFactory = actionFactory;
- aViewTreasurelists = actionFactory.createAction(true, "viewTreasurelists", mainControl);
this.aCloseAll = aCloseAll;
aPrevWindow = actionFactory.createAction(true, "prevWindow", this);
aNextWindow = actionFactory.createAction(true, "nextWindow", this);
+ actionFactory.createAction(true, "viewTreasurelists", mainControl);
viewActions = new ViewActions<G, A, R, V>(mainControl, mapManager);
Modified: trunk/src/app/net/sf/gridarta/map/validation/checks/BlockedMatrix.java
===================================================================
--- trunk/src/app/net/sf/gridarta/map/validation/checks/BlockedMatrix.java 2008-07-08 04:59:54 UTC (rev 4253)
+++ trunk/src/app/net/sf/gridarta/map/validation/checks/BlockedMatrix.java 2008-07-08 18:29:46 UTC (rev 4254)
@@ -39,15 +39,9 @@
*/
private final boolean[][] blocked;
- /** The width of the currently processed map. */
- private final int width;
-
- /** The height of the currently processed map. */
- private final int height;
-
public BlockedMatrix(@NotNull final MapModel<G, A, R> mapModel) {
- width = mapModel.getMapSize().getWidth();
- height = mapModel.getMapSize().getHeight();
+ final int width = mapModel.getMapSize().getWidth();
+ final int height = mapModel.getMapSize().getHeight();
blocked = new boolean[width][height];
final Point pos = new Point();
for (pos.y = 0; pos.y < height; pos.y++) {
Modified: trunk/src/app/net/sf/gridarta/preferences/FilePreferencesFactory.java
===================================================================
--- trunk/src/app/net/sf/gridarta/preferences/FilePreferencesFactory.java 2008-07-08 04:59:54 UTC (rev 4253)
+++ trunk/src/app/net/sf/gridarta/preferences/FilePreferencesFactory.java 2008-07-08 18:29:46 UTC (rev 4254)
@@ -31,9 +31,6 @@
*/
public class FilePreferencesFactory implements PreferencesFactory {
- /** The storage instance used for loading/saving values. */
- private static Storage storage = null;
-
/** The user preferences as returned by {@link #userRoot()}. */
private static Preferences userRoot = null;
@@ -47,7 +44,7 @@
* @param file The file for loading/saving values.
*/
public static void initialize(@NotNull final String defaultName, @NotNull final File file) {
- storage = new Storage(defaultName, file);
+ final Storage storage = new Storage(defaultName, file);
userRoot = new FilePreferencesRoot(NodeType.USER, storage);
systemRoot = new FilePreferencesRoot(NodeType.SYSTEM, storage);
}
Modified: trunk/src/app/net/sf/gridarta/updater/UpdaterManager.java
===================================================================
--- trunk/src/app/net/sf/gridarta/updater/UpdaterManager.java 2008-07-08 04:59:54 UTC (rev 4253)
+++ trunk/src/app/net/sf/gridarta/updater/UpdaterManager.java 2008-07-08 18:29:46 UTC (rev 4254)
@@ -69,9 +69,6 @@
/** The file to update. */
private final String updateFileName;
- /** Action for "update". */
- private final Action aUpdate;
-
/**
* Creates a new instance.
* @param key the action factory key
@@ -85,7 +82,7 @@
this.mainControl = mainControl;
this.parentComponent = parentComponent;
this.updateFileName = updateFileName;
- aUpdate = ACTION_FACTORY.createAction(true, "update", this);
+ final Action aUpdate = ACTION_FACTORY.createAction(true, "update", this);
final String propUrl = ACTION_FACTORY.getString("update.url");
aUpdate.setEnabled(propUrl.length() > 0);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X