[Gridarta-commit] SF.net SVN: gridarta:[5518] trunk

[<aki...@us...>]

Revision: 5518
          http://gridarta.svn.sourceforge.net/gridarta/?rev=5518&view=rev
Author:   akirschbaum
Date:     2008-10-13 19:11:39 +0000 (Mon, 13 Oct 2008)

Log Message:
-----------
Extract common code into function.

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

Modified: trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptArchData.java
===================================================================
--- trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptArchData.java	2008-10-13 19:07:16 UTC (rev 5517)
+++ trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptArchData.java	2008-10-13 19:11:39 UTC (rev 5518)
@@ -63,7 +63,7 @@
         while (it.hasNext()) {
             final GameObject tmp = it.next();
             if (tmp.getTypeNo() == eventTypeNo) {
-                final ScriptedEvent se = new ScriptedEvent(tmp);
+                final ScriptedEvent se = newScriptedEvent(tmp);
                 // validate this event
                 if (!se.isValid()) {
                     // this event is invalid
@@ -94,7 +94,7 @@
         }
 
         if (oldEvent != null) {
-            final ScriptedEvent event = new ScriptedEvent(oldEvent);
+            final ScriptedEvent event = newScriptedEvent(oldEvent);
             // now decide what to do:
             if (task == ScriptTab.SCRIPT_OPEN) {
                 ScriptedEventEditor.openScript(mapManager, event.getScriptPath(), parent);
@@ -113,6 +113,11 @@
         }
     }
 
+    @NotNull
+    private ScriptedEvent newScriptedEvent(@NotNull final GameObject event) {
+        return new ScriptedEvent(event);
+    }
+
     /** {@inheritDoc} */
     public void createNewEvent(final JDialog frame) {
         ScriptArchEditor.createNewEvent(frame, this);

Modified: trunk/daimonin/src/daieditor/gameobject/scripts/ScriptArchData.java
===================================================================
--- trunk/daimonin/src/daieditor/gameobject/scripts/ScriptArchData.java	2008-10-13 19:07:16 UTC (rev 5517)
+++ trunk/daimonin/src/daieditor/gameobject/scripts/ScriptArchData.java	2008-10-13 19:11:39 UTC (rev 5518)
@@ -63,7 +63,7 @@
         while (it.hasNext()) {
             final GameObject tmp = it.next();
             if (tmp.getTypeNo() == eventTypeNo) {
-                final ScriptedEvent se = new ScriptedEvent(tmp);
+                final ScriptedEvent se = newScriptedEvent(tmp);
                 // validate this event
                 if (!se.isValid()) {
                     // this event is invalid
@@ -94,7 +94,7 @@
         }
 
         if (oldEvent != null) {
-            final ScriptedEvent event = new ScriptedEvent(oldEvent);
+            final ScriptedEvent event = newScriptedEvent(oldEvent);
             // now decide what to do:
             if (task == ScriptTab.SCRIPT_OPEN) {
                 ScriptedEventEditor.openScript(mapManager, event.getScriptPath(), parent);
@@ -113,6 +113,11 @@
         }
     }
 
+    @NotNull
+    private ScriptedEvent newScriptedEvent(@NotNull final GameObject event) {
+        return new ScriptedEvent(event);
+    }
+
     /** {@inheritDoc} */
     public void createNewEvent(final JDialog frame) {
         ScriptArchEditor.createNewEvent(frame, this);


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