Thread: [Gridarta-commit] SF.net SVN: gridarta: [3939] trunk (Page 56)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 3939
          http://gridarta.svn.sourceforge.net/gridarta/?rev=3939&view=rev
Author:   akirschbaum
Date:     2008-05-03 02:33:26 -0700 (Sat, 03 May 2008)

Log Message:
-----------
Extract code from ScriptArchData into ScriptArchUtils.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/CMainControl.java
    trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptArchData.java
    trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptedEvent.java
    trunk/daimonin/src/daieditor/gameobject/scripts/ScriptArchData.java
    trunk/daimonin/src/daieditor/gameobject/scripts/ScriptedEvent.java

Added Paths:
-----------
    trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptArchUtils.java
    trunk/daimonin/src/daieditor/gameobject/scripts/ScriptArchUtils.java

Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================

--- trunk/crossfire/src/cfeditor/CMainControl.java	2008-05-03 09:01:40 UTC (rev 3938)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-05-03 09:33:26 UTC (rev 3939)
@@ -26,7 +26,7 @@
 import cfeditor.gameobject.GameObject;
 import cfeditor.gameobject.anim.AnimationObjects;
 import cfeditor.gameobject.face.FaceObjects;
-import cfeditor.gameobject.scripts.ScriptArchData;
+import cfeditor.gameobject.scripts.ScriptArchUtils;
 import cfeditor.gui.GameObjectAttributesDialog;
 import cfeditor.gui.ObjectChooser;
 import cfeditor.gui.prefs.GUIPrefs;
@@ -982,9 +982,9 @@
 
     private List<?> getEventTypes() {
         final List<Object> result = new ArrayList<Object>();
-        for (int typeNumber = 1; ScriptArchData.typeArchName(typeNumber) != null; typeNumber++) {
+        for (int typeNumber = 1; ScriptArchUtils.typeArchName(typeNumber) != null; typeNumber++) {
             result.add(typeNumber);
-            result.add(ScriptArchData.typeName(typeNumber));
+            result.add(ScriptArchUtils.typeName(typeNumber));
         }
         return result;
     }

Modified: trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptArchData.java
===================================================================
--- trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptArchData.java	2008-05-03 09:01:40 UTC (rev 3938)
+++ trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptArchData.java	2008-05-03 09:33:26 UTC (rev 3939)
@@ -92,23 +92,6 @@
 
     private static JTextField inputOptions;
 
-    // FIXME: This should NOT BE HERE. Instead, it should be read from types.xml.
-    private static final String[] allEventTypes = new String[] {
-        "apply",
-        "attack",
-        "death",
-        "drop",
-        "pickup",
-        "say",
-        "stop",
-        "time",
-        "throw",
-        "trigger",
-        "close",
-        "timer",
-        "destroy",
-    };
-
     private final GameObject owner;
 
     private boolean changed;
@@ -129,8 +112,8 @@
         pluginNameBox = new JComboBox(new String[]{" Python"});
         pluginNameBox.setSelectedIndex(0);
 
-        eventTypeBox = new JComboBox(allEventTypes);
-        eventTypeBox.setSelectedIndex(Arrays2.linearEqualitySearch("say", allEventTypes));
+        eventTypeBox = new JComboBox(ScriptArchUtils.allEventTypes);
+        eventTypeBox.setSelectedIndex(Arrays2.linearEqualitySearch("say", ScriptArchUtils.allEventTypes));
     }
 
     /**
@@ -179,7 +162,7 @@
         final Vector<String> content = new Vector<String>();
         for (final GameObject tmp : owner) {
             if (tmp.getArchTypNr() == Archetype.TYPE_EVENT_CONNECTOR) {
-                content.add(" " + typeName(tmp.getAttributeInt("subtype")));
+                content.add(" " + ScriptArchUtils.typeName(tmp.getAttributeInt("subtype")));
             }
         }
 
@@ -219,7 +202,7 @@
                 event.editParameters();
             } else if (task == GameObjectAttributesPanel.SCRIPT_REMOVE) {
                 // first ask for confirmation
-                if (JOptionPane.showConfirmDialog(panelList, "Are you sure you want to remove this \"" + typeName(event.getEventType()) + "\" event which is\n" + "linked to the script: '" + event.getScriptPath() + "'?\n" + "(The script file itself is not going to be deleted)", "Confirm", JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) {
+                if (JOptionPane.showConfirmDialog(panelList, "Are you sure you want to remove this \"" + ScriptArchUtils.typeName(event.getEventType()) + "\" event which is\n" + "linked to the script: '" + event.getScriptPath() + "'?\n" + "(The script file itself is not going to be deleted)", "Confirm", JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) {
                     // remove this event from the GameObject
                     oldEvent.remove();
                     addEventsToJList(panelList); // update panel JList
@@ -441,7 +424,7 @@
         final GameObject replaceObject = getScriptedEvent(eventType);
         if (replaceObject != null) {
             // collision with existing event -> ask user: replace?
-            if (JOptionPane.showConfirmDialog(frame, "An event of type \"" + typeName(eventType) + "\" already exists for this object.\n" + "Do you want to replace the existing event?", "Event exists", JOptionPane.YES_NO_OPTION, JOptionPane.INFORMATION_MESSAGE) == JOptionPane.NO_OPTION) {
+            if (JOptionPane.showConfirmDialog(frame, "An event of type \"" + ScriptArchUtils.typeName(eventType) + "\" already exists for this object.\n" + "Do you want to replace the existing event?", "Event exists", JOptionPane.YES_NO_OPTION, JOptionPane.INFORMATION_MESSAGE) == JOptionPane.NO_OPTION) {
                 // bail out
                 return false;
             }
@@ -549,37 +532,6 @@
     }
 
     /**
-     * Return a human readable name for an event type.
-     *
-     * @param eventType the event type
-     *
-     * @return the event type name
-     */
-    public static String typeName(final int eventType) {
-        if (eventType > 0 && eventType <= allEventTypes.length) {
-            return allEventTypes[eventType - 1];
-        } else {
-            return "<invalid type>";
-        }
-    }
-
-    /**
-     * Return the archetype for an event type.
-     *
-     * @param eventType the event type
-     *
-     * @return the archetype name, or <code>null</code> if the event type is
-     * invalid
-     */
-    @Nullable public static String typeArchName(final int eventType) {
-        if (eventType > 0 && eventType <= allEventTypes.length) {
-            return "event_" + allEventTypes[eventType - 1];
-        } else {
-            return null;
-        }
-    }
-
-    /**
      * Return a guess for the directory to use.
      *
      * @return the directory to use

Added: trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptArchUtils.java
===================================================================
--- trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptArchUtils.java	                        (rev 0)
+++ trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptArchUtils.java	2008-05-03 09:33:26 UTC (rev 3939)
@@ -0,0 +1,74 @@
+/*
+ * Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
+ * Copyright (C) 2000-2007 The Gridarta Developers.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+package cfeditor.gameobject.scripts;
+
+import org.jetbrains.annotations.Nullable;
+
+public class ScriptArchUtils {
+
+    // FIXME: This should NOT BE HERE. Instead, it should be read from types.xml.
+    public static final String[] allEventTypes = new String[] {
+        "apply",
+        "attack",
+        "death",
+        "drop",
+        "pickup",
+        "say",
+        "stop",
+        "time",
+        "throw",
+        "trigger",
+        "close",
+        "timer",
+        "destroy",
+    };
+
+    /**
+     * Return a human readable name for an event type.
+     *
+     * @param eventType the event type
+     *
+     * @return the event type name
+     */
+    public static String typeName(final int eventType) {
+        if (eventType > 0 && eventType <= allEventTypes.length) {
+            return allEventTypes[eventType - 1];
+        } else {
+            return "<invalid type>";
+        }
+    }
+
+    /**
+     * Return the archetype for an event type.
+     *
+     * @param eventType the event type
+     *
+     * @return the archetype name, or <code>null</code> if the event type is
+     * invalid
+     */
+    @Nullable public static String typeArchName(final int eventType) {
+        if (eventType > 0 && eventType <= allEventTypes.length) {
+            return "event_" + allEventTypes[eventType - 1];
+        } else {
+            return null;
+        }
+    }
+
+} // class ScriptArchUtils


Property changes on: trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptArchUtils.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + LF

Modified: trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptedEvent.java
===================================================================
--- trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptedEvent.java	2008-05-03 09:01:40 UTC (rev 3938)
+++ trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptedEvent.java	2008-05-03 09:33:26 UTC (rev 3939)
@@ -102,14 +102,14 @@
         final int eventType = getEventType();
 
         if (scriptPath == null || scriptPath.length() <= 0) {
-            log.error("Map Error: Found " + ScriptArchData.typeName(eventType) + " event without file name!");
+            log.error("Map Error: Found " + ScriptArchUtils.typeName(eventType) + " event without file name!");
             return false;
         }
 
         if (pluginName == null || pluginName.length() <= 0) {
             pluginName = "Python";
             if (log.isInfoEnabled()) {
-                log.info("Found " + ScriptArchData.typeName(eventType) + " without plugin name. Setting to \"Python\".");
+                log.info("Found " + ScriptArchUtils.typeName(eventType) + " without plugin name. Setting to \"Python\".");
             }
         }
 
@@ -304,7 +304,7 @@
      * be created
      */
     private static GameObject newEventGameObject(final int eventType) throws UndefinedEventArchetypeException {
-        final String typeArchName = ScriptArchData.typeArchName(eventType);
+        final String typeArchName = ScriptArchUtils.typeArchName(eventType);
         if (typeArchName == null) {
             throw new UndefinedEventArchetypeTypeException(eventType);
         }

Modified: trunk/daimonin/src/daieditor/gameobject/scripts/ScriptArchData.java
===================================================================
--- trunk/daimonin/src/daieditor/gameobject/scripts/ScriptArchData.java	2008-05-03 09:01:40 UTC (rev 3938)
+++ trunk/daimonin/src/daieditor/gameobject/scripts/ScriptArchData.java	2008-05-03 09:33:26 UTC (rev 3939)
@@ -92,23 +92,6 @@
 
     private static JTextField inputOptions;
 
-    // FIXME: This should NOT BE HERE. Instead, it should be read from types.xml.
-    private static final String[] allEventTypes = new String[] {
-        "apply",
-        "attack",
-        "death",
-        "drop",
-        "pickup",
-        "say",
-        "stop",
-        "time (don't use)",
-        "throw",
-        "trigger",
-        "close",
-        "examine",
-        "talk",
-    };
-
     private final GameObject owner;
 
     private boolean changed;
@@ -129,8 +112,8 @@
         pluginNameBox = new JComboBox(new String[]{" Lua "});
         pluginNameBox.setSelectedIndex(0);
 
-        eventTypeBox = new JComboBox(allEventTypes);
-        eventTypeBox.setSelectedIndex(Arrays2.linearEqualitySearch("say", allEventTypes));
+        eventTypeBox = new JComboBox(ScriptArchUtils.allEventTypes);
+        eventTypeBox.setSelectedIndex(Arrays2.linearEqualitySearch("say", ScriptArchUtils.allEventTypes));
     }
 
     /**
@@ -179,7 +162,7 @@
         final Vector<String> content = new Vector<String>();
         for (final GameObject tmp : owner) {
             if (tmp.getArchTypNr() == Archetype.TYPE_EVENT_OBJECT) {
-                content.add(" " + typeName(tmp.getAttributeInt("sub_type")));
+                content.add(" " + ScriptArchUtils.typeName(tmp.getAttributeInt("sub_type")));
             }
         }
 
@@ -219,7 +202,7 @@
                 event.editParameters();
             } else if (task == GameObjectAttributesPanel.SCRIPT_REMOVE) {
                 // first ask for confirmation
-                if (JOptionPane.showConfirmDialog(panelList, "Are you sure you want to remove this \"" + typeName(event.getEventType()) + "\" event which is\n" + "linked to the script: '" + event.getScriptPath() + "'?\n" + "(The script file itself is not going to be deleted)", "Confirm", JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) {
+                if (JOptionPane.showConfirmDialog(panelList, "Are you sure you want to remove this \"" + ScriptArchUtils.typeName(event.getEventType()) + "\" event which is\n" + "linked to the script: '" + event.getScriptPath() + "'?\n" + "(The script file itself is not going to be deleted)", "Confirm", JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) {
                     // remove this event from the GameObject
                     oldEvent.remove();
                     addEventsToJList(panelList); // update panel JList
@@ -441,7 +424,7 @@
         final GameObject replaceObject = getScriptedEvent(eventType);
         if (replaceObject != null) {
             // collision with existing event -> ask user: replace?
-            if (JOptionPane.showConfirmDialog(frame, "An event of type \"" + typeName(eventType) + "\" already exists for this object.\n" + "Do you want to replace the existing event?", "Event exists", JOptionPane.YES_NO_OPTION, JOptionPane.INFORMATION_MESSAGE) == JOptionPane.NO_OPTION) {
+            if (JOptionPane.showConfirmDialog(frame, "An event of type \"" + ScriptArchUtils.typeName(eventType) + "\" already exists for this object.\n" + "Do you want to replace the existing event?", "Event exists", JOptionPane.YES_NO_OPTION, JOptionPane.INFORMATION_MESSAGE) == JOptionPane.NO_OPTION) {
                 // bail out
                 return false;
             }
@@ -549,21 +532,6 @@
     }
 
     /**
-     * Return a human readable name for an event type.
-     *
-     * @param eventType the event type
-     *
-     * @return the event type name
-     */
-    public static String typeName(final int eventType) {
-        if (eventType > 0 && eventType <= allEventTypes.length) {
-            return allEventTypes[eventType - 1];
-        } else {
-            return "<invalid type>";
-        }
-    }
-
-    /**
      * Return a guess for the directory to use.
      *
      * @return the directory to use

Added: trunk/daimonin/src/daieditor/gameobject/scripts/ScriptArchUtils.java
===================================================================
--- trunk/daimonin/src/daieditor/gameobject/scripts/ScriptArchUtils.java	                        (rev 0)
+++ trunk/daimonin/src/daieditor/gameobject/scripts/ScriptArchUtils.java	2008-05-03 09:33:26 UTC (rev 3939)
@@ -0,0 +1,56 @@
+/*
+ * Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
+ * Copyright (C) 2000-2007 The Gridarta Developers.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+package daieditor.gameobject.scripts;
+
+public class ScriptArchUtils {
+
+    // FIXME: This should NOT BE HERE. Instead, it should be read from types.xml.
+    public static final String[] allEventTypes = new String[] {
+        "apply",
+        "attack",
+        "death",
+        "drop",
+        "pickup",
+        "say",
+        "stop",
+        "time (don't use)",
+        "throw",
+        "trigger",
+        "close",
+        "examine",
+        "talk",
+    };
+
+    /**
+     * Return a human readable name for an event type.
+     *
+     * @param eventType the event type
+     *
+     * @return the event type name
+     */
+    public static String typeName(final int eventType) {
+        if (eventType > 0 && eventType <= allEventTypes.length) {
+            return allEventTypes[eventType - 1];
+        } else {
+            return "<invalid type>";
+        }
+    }
+
+} // class ScriptArchUtils


Property changes on: trunk/daimonin/src/daieditor/gameobject/scripts/ScriptArchUtils.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + LF

Modified: trunk/daimonin/src/daieditor/gameobject/scripts/ScriptedEvent.java
===================================================================
--- trunk/daimonin/src/daieditor/gameobject/scripts/ScriptedEvent.java	2008-05-03 09:01:40 UTC (rev 3938)
+++ trunk/daimonin/src/daieditor/gameobject/scripts/ScriptedEvent.java	2008-05-03 09:33:26 UTC (rev 3939)
@@ -101,14 +101,14 @@
         final int eventType = getEventType();
 
         if (scriptPath == null || scriptPath.length() <= 0) {
-            log.error("Map Error: Found " + ScriptArchData.typeName(eventType) + " event without file name!");
+            log.error("Map Error: Found " + ScriptArchUtils.typeName(eventType) + " event without file name!");
             return false;
         }
 
         if (pluginName == null || pluginName.length() <= 0) {
             pluginName = "Python";
             if (log.isInfoEnabled()) {
-                log.info("Found " + ScriptArchData.typeName(eventType) + " without plugin name. Setting to \"Python\".");
+                log.info("Found " + ScriptArchUtils.typeName(eventType) + " without plugin name. Setting to \"Python\".");
             }
         }
 


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




Thread: [Gridarta-commit] SF.net SVN: gridarta: [3939] trunk (Page 56)

gridarta-commit