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

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

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

Modified Files:
	ScriptableDelegate.java ScriptingEngine.java 
Log Message:
Make scripting package accessible

Index: ScriptableDelegate.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/scripting/ScriptableDelegate.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ScriptableDelegate.java	2 Apr 2003 15:31:12 -0000	1.8
+++ ScriptableDelegate.java	23 Sep 2003 12:13:44 -0000	1.9
@@ -37,7 +37,7 @@
         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 String evaluateScriptExpression( String urlString ) { return null; }
         public ScriptingEngine newScriptingEngine( ScriptableDelegate child ) { return this; }
     };
 
@@ -66,11 +66,11 @@
 
 
     /**
-     * Evaluates the specified javascript URL.
+     * Evaluates the specified javascript expression, returning its value.
      **/
-    public String evaluateURL( String urlString ) {
+    public String evaluateExpression( String urlString ) {
         if (urlString.length() == 0) return null;
-        return getScriptEngine().getURLContents( urlString );
+        return getScriptEngine().evaluateScriptExpression( urlString );
     }
 
 

Index: ScriptingEngine.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/scripting/ScriptingEngine.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ScriptingEngine.java	9 Mar 2003 20:35:48 -0000	1.5
+++ ScriptingEngine.java	23 Sep 2003 12:13:44 -0000	1.6
@@ -49,7 +49,7 @@
     /**
      * Evaluates the specified string as JavaScript. Will return null if the script has no return value.
      */
-    public String getURLContents( String urlString );
+    public String evaluateScriptExpression( String urlString );
 
 
     /**