[Httpunit-commit] CVS: httpunit/src/com/meterware/httpunit/scripting ScriptableDelegate.java,1.1,1.2

[Russell G. <rus...@us...>]

Update of /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/scripting
In directory usw-pr-cvs1:/tmp/cvs-serv22152/src/com/meterware/httpunit/scripting

Modified Files:
	ScriptableDelegate.java 
Log Message:
Peter Royal: fixed scripting disabled, query-only URL parsing bugs

Index: ScriptableDelegate.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/scripting/ScriptableDelegate.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ScriptableDelegate.java	8 Aug 2002 20:47:22 -0000	1.1
+++ ScriptableDelegate.java	16 Aug 2002 17:24:00 -0000	1.2
@@ -30,14 +30,21 @@
 
     private ScriptingEngine _scriptEngine;
 
+    private static final ScriptingEngine NULL_SCRIPT_ENGINE = new ScriptingEngine() {
+        public void executeScript( String script ) {
+        }
+        public boolean performEvent( String eventScript ) {
+            return true;
+        }
+    };
+
 
     /**
      * Executes the specified scripted event.
      **/
     public boolean doEvent( String eventScript ) {
-        if (_scriptEngine == null) throw new IllegalStateException( "Script engine must be defined before running an event" );
         if (eventScript.length() == 0) return true;
-        return _scriptEngine.performEvent( eventScript );
+        return getScriptEngine().performEvent( eventScript );
     }
 
 
@@ -45,8 +52,7 @@
      * Executes the specified script.
      **/
     public void runScript( String script ) {
-        if (_scriptEngine == null) throw new IllegalStateException( "Script engine must be defined before running an event" );
-        _scriptEngine.executeScript( script );
+        if (script.length() != 0) getScriptEngine().executeScript( script );
     }
 
 
@@ -80,6 +86,11 @@
      */
     public void setScriptEngine( ScriptingEngine scriptEngine ) {
         _scriptEngine = scriptEngine;
+    }
+
+
+    private ScriptingEngine getScriptEngine() {
+        return _scriptEngine != null ? _scriptEngine : NULL_SCRIPT_ENGINE;
     }
 
 }