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

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

Revision: 8525
          http://gridarta.svn.sourceforge.net/gridarta/?rev=8525&view=rev
Author:   akirschbaum
Date:     2010-06-27 20:17:34 +0000 (Sun, 27 Jun 2010)

Log Message:
-----------
Improve --script command-line option to report some plugin script errors to the operating system.

Modified Paths:
--------------
    trunk/atrinik/ChangeLog
    trunk/crossfire/ChangeLog
    trunk/daimonin/ChangeLog
    trunk/src/app/net/sf/gridarta/maincontrol/GridartaEditor.java

Removed Paths:
-------------
    trunk/src/app/net/sf/gridarta/commands/ScriptCommand.java

Modified: trunk/atrinik/ChangeLog
===================================================================

--- trunk/atrinik/ChangeLog	2010-06-27 20:03:32 UTC (rev 8524)
+++ trunk/atrinik/ChangeLog	2010-06-27 20:17:34 UTC (rev 8525)
@@ -1,5 +1,8 @@
 2010-06-27  Andreas Kirschbaum
 
+	* Improve --script command-line option to report some plugin
+	script errors to the operating system.
+
 	* Include details in error messages of "Tile path invalid" map
 	validator.
 

Modified: trunk/crossfire/ChangeLog
===================================================================
--- trunk/crossfire/ChangeLog	2010-06-27 20:03:32 UTC (rev 8524)
+++ trunk/crossfire/ChangeLog	2010-06-27 20:17:34 UTC (rev 8525)
@@ -1,5 +1,8 @@
 2010-06-27  Andreas Kirschbaum
 
+	* Improve --script command-line option to report some plugin
+	script errors to the operating system.
+
 	* Include details in error messages of "Tile path invalid" map
 	validator.
 

Modified: trunk/daimonin/ChangeLog
===================================================================
--- trunk/daimonin/ChangeLog	2010-06-27 20:03:32 UTC (rev 8524)
+++ trunk/daimonin/ChangeLog	2010-06-27 20:17:34 UTC (rev 8525)
@@ -1,5 +1,8 @@
 2010-06-27  Andreas Kirschbaum
 
+	* Improve --script command-line option to report some plugin
+	script errors to the operating system.
+
 	* Include details in error messages of "Tile path invalid" map
 	validator.
 

Deleted: trunk/src/app/net/sf/gridarta/commands/ScriptCommand.java
===================================================================
--- trunk/src/app/net/sf/gridarta/commands/ScriptCommand.java	2010-06-27 20:03:32 UTC (rev 8524)
+++ trunk/src/app/net/sf/gridarta/commands/ScriptCommand.java	2010-06-27 20:17:34 UTC (rev 8525)
@@ -1,76 +0,0 @@
-/*
- * Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
- * Copyright (C) 2000-2010 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 net.sf.gridarta.commands;
-
-import net.sf.gridarta.script.ScriptExecException;
-import net.sf.gridarta.script.ScriptExecutor;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * Executes a plugin script.
- * @author Andreas Kirschbaum
- */
-public class ScriptCommand implements Command {
-
-    /**
-     * The script to execute.
-     */
-    @NotNull
-    private final String script;
-
-    /**
-     * The script parameters.
-     */
-    @NotNull
-    private final Iterable<String> params;
-
-    /**
-     * The {@link ScriptExecutor} to execute.
-     */
-    @NotNull
-    private final ScriptExecutor<?, ?, ?> scriptExecutor;
-
-    /**
-     * Creates a new instance.
-     * @param script the script to execute
-     * @param params the script parameters
-     * @param scriptExecutor the script executor to use
-     */
-    public ScriptCommand(@NotNull final String script, @NotNull final Iterable<String> params, @NotNull final ScriptExecutor<?, ?, ?> scriptExecutor) {
-        this.script = script;
-        this.params = params;
-        this.scriptExecutor = scriptExecutor;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public int execute() {
-        try {
-            scriptExecutor.executeScript(script, params);
-        } catch (final ScriptExecException ex) {
-            System.err.println(ex.getMessage());
-            return 1;
-        }
-        return 0;
-    }
-
-} // class ScriptCommand

Modified: trunk/src/app/net/sf/gridarta/maincontrol/GridartaEditor.java
===================================================================
--- trunk/src/app/net/sf/gridarta/maincontrol/GridartaEditor.java	2010-06-27 20:03:32 UTC (rev 8524)
+++ trunk/src/app/net/sf/gridarta/maincontrol/GridartaEditor.java	2010-06-27 20:17:34 UTC (rev 8525)
@@ -35,8 +35,6 @@
 import net.sf.gridarta.MainControl;
 import net.sf.gridarta.commands.BatchPngCommand;
 import net.sf.gridarta.commands.CollectArchesCommand;
-import net.sf.gridarta.commands.Command;
-import net.sf.gridarta.commands.ScriptCommand;
 import net.sf.gridarta.commands.SinglePngCommand;
 import net.sf.gridarta.gui.errorview.ConsoleErrorView;
 import net.sf.gridarta.gui.errorview.DefaultErrorView;
@@ -90,6 +88,7 @@
 import net.sf.gridarta.model.spells.NumberSpell;
 import net.sf.gridarta.model.spells.Spells;
 import net.sf.gridarta.preferences.FilePreferencesFactory;
+import net.sf.gridarta.script.ScriptExecException;
 import net.sf.gridarta.script.ScriptExecutor;
 import net.sf.gridarta.script.ScriptModel;
 import net.sf.gridarta.script.ScriptParameters;
@@ -343,12 +342,18 @@
      * @param scriptExecutor the script executor to use
      * @return return code suitable for passing to {@link System#exit(int)}
      */
-    private int runScript(@NotNull final String script, final ErrorView errorView, final List<String> args, @NotNull final ScriptExecutor<G, A, R> scriptExecutor) {
+    private int runScript(@NotNull final String script, final ErrorView errorView, final Iterable<String> args, @NotNull final ScriptExecutor<G, A, R> scriptExecutor) {
         checkForErrors(errorView);
         waitDialog(errorView);
 
-        final Command command = new ScriptCommand(script, args, scriptExecutor);
-        return command.execute();
+        try {
+            scriptExecutor.executeScript(script, args);
+        } catch (final ScriptExecException ex) {
+            System.err.println(ex.getMessage());
+            return 1;
+        }
+
+        return 0;
     }
 
     /**


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:[8525] trunk (Page 56)

gridarta-commit