[Httpunit-commit] CVS: httpunit/src/com/meterware/httpunit/scripting ScriptableDelegate.java,1.6,1.7 ScriptingEngine.java,1.4,1.5

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

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

Modified Files:
	ScriptableDelegate.java ScriptingEngine.java 
Log Message:
support <noscript> tags

Index: ScriptableDelegate.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/scripting/ScriptableDelegate.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ScriptableDelegate.java	24 Oct 2002 13:28:54 -0000	1.6
+++ ScriptableDelegate.java	9 Mar 2003 20:35:48 -0000	1.7
@@ -31,13 +31,19 @@
 
 
     private static final ScriptingEngine NULL_SCRIPT_ENGINE = new ScriptingEngine() {
-        public String executeScript( String script ) { return ""; }
+        public boolean supportsScriptLanguage( String language ) { return false; }
+        public String executeScript( String language, String script ) { return ""; }
         public boolean performEvent( String eventScript ) { return true; }
         public String getURLContents( String urlString ) { return null; }
         public ScriptingEngine newScriptingEngine( ScriptableDelegate child ) { return this; }
     };
 
 
+    public boolean supportsScript( String language ) {
+        return getScriptEngine().supportsScriptLanguage( language );
+    }
+
+
     /**
      * Executes the specified scripted event.
      **/
@@ -51,8 +57,8 @@
      * Executes the specified script, returning any intended replacement text.
      * @return the replacement text, which may be empty.
      **/
-    public String runScript( String script ) {
-        return (script.length() == 0) ? "" : getScriptEngine().executeScript( script );
+    public String runScript( String language, String script ) {
+        return (script.length() == 0) ? "" : getScriptEngine().executeScript( language, script );
     }
 
 

Index: ScriptingEngine.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/scripting/ScriptingEngine.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ScriptingEngine.java	24 Oct 2002 13:28:54 -0000	1.4
+++ ScriptingEngine.java	9 Mar 2003 20:35:48 -0000	1.5
@@ -29,9 +29,15 @@
 
 
     /**
+     * Returns true if this engine supports the specified script.
+     **/
+    public boolean supportsScriptLanguage( String language );
+
+
+    /**
      * Interprets the specified script, which may include global function definitions.
      */
-    public String executeScript( String script );
+    public String executeScript( String language, String script );
 
 
     /**