[Httpunit-commit] CVS: httpunit/src/com/meterware/httpunit/javascript JavaScript.java,1.60,1.61 JavaScriptEngineFactory.java,1.7,1.8

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

Update of /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/javascript
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21020/src/com/meterware/httpunit/javascript

Modified Files:
	JavaScript.java JavaScriptEngineFactory.java 
Log Message:
Support onload event for framesets

Index: JavaScript.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/javascript/JavaScript.java,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- JavaScript.java	24 Jun 2004 23:35:18 -0000	1.60
+++ JavaScript.java	8 Aug 2004 17:38:18 -0000	1.61
@@ -81,6 +81,15 @@
     }
 
 
+    /**
+     * Runs the onload event for the specified web response.
+     */
+    public static void load( WebResponse response ) throws ClassDefinitionException, InstantiationException, IllegalAccessException, InvocationTargetException, PropertyException, JavaScriptException, SAXException, NotAFunctionException {
+        if (!(response.getScriptableObject().getScriptEngine() instanceof JavaScriptEngine)) run( response );
+        response.getScriptableObject().load();
+    }
+
+
     private static void initHTMLObjects( Scriptable scope ) throws IllegalAccessException, InstantiationException,
             InvocationTargetException, ClassDefinitionException, PropertyException {
         ScriptableObject.defineClass( scope, Window.class );
@@ -425,8 +434,6 @@
 
             _screen = (Screen) Context.getCurrentContext().newObject( this, "Screen" );
             _screen.setClientProperties( getDelegate().getClientProperties() );
-
-            getDelegate().load();
         }
 
 

Index: JavaScriptEngineFactory.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/javascript/JavaScriptEngineFactory.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- JavaScriptEngineFactory.java	14 Oct 2002 04:19:06 -0000	1.7
+++ JavaScriptEngineFactory.java	8 Aug 2004 17:38:18 -0000	1.8
@@ -53,6 +53,18 @@
     }
 
 
+    public void load( WebResponse response ) {
+        try {
+            JavaScript.load( response );
+        } catch (RuntimeException e) {
+            throw e;
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new RuntimeException( e.toString() );
+        }
+    }
+
+
     public void setThrowExceptionsOnError( boolean throwExceptions ) {
         JavaScript.setThrowExceptionsOnError( throwExceptions );
     }