cjolif 01/06/01 06:54:08 Modified: sources/org/apache/batik/script/rhino EventTargetWrapper.java RhinoInterpreter.java Log: some updates to follow Rhino updates Revision Changes Path 1.4 +3 -2 xml-batik/sources/org/apache/batik/script/rhino/EventTargetWrapper.java Index: EventTargetWrapper.java =================================================================== RCS file: /home/cvs/xml-batik/sources/org/apache/batik/script/rhino/EventTargetWrapper.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- EventTargetWrapper.java 2001/01/24 14:51:02 1.3 +++ EventTargetWrapper.java 2001/06/01 13:54:06 1.4 @@ -34,7 +34,7 @@ * <code>addEventListener</code> with a Java function object calling * the Rhino function. * @author <a href="mailto:[EMAIL PROTECTED]">Christophe Jolif</a> - * @version $Id: EventTargetWrapper.java,v 1.3 2001/01/24 14:51:02 cjolif Exp $ + * @version $Id: EventTargetWrapper.java,v 1.4 2001/06/01 13:54:06 cjolif Exp $ */ class EventTargetWrapper extends NativeJavaObject { @@ -68,7 +68,7 @@ Scriptable thisObj, Object[] args) throws JavaScriptException { if (args[1] instanceof Function) { - if (jsGet_name().equals(ADD_NAME)) { + if (this.get(NAME, this).equals(ADD_NAME)) { EventListener evtListener = new RhinoEventListener((Function)args[1]); if (listenerMap == null) @@ -118,6 +118,7 @@ private final static Class[] ARGS_TYPE = { String.class, EventListener.class, Boolean.TYPE }; + private final static String NAME = "name"; EventTargetWrapper(Scriptable scope, EventTarget object, RhinoInterpreter interp) { 1.6 +2 -2 xml-batik/sources/org/apache/batik/script/rhino/RhinoInterpreter.java Index: RhinoInterpreter.java =================================================================== RCS file: /home/cvs/xml-batik/sources/org/apache/batik/script/rhino/RhinoInterpreter.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- RhinoInterpreter.java 2001/04/17 14:56:59 1.5 +++ RhinoInterpreter.java 2001/06/01 13:54:07 1.6 @@ -31,7 +31,7 @@ * A simple implementation of <code>Interpreter</code> interface to use * Rhino ECMAScript interpreter. * @author <a href="mailto:[EMAIL PROTECTED]">Christophe Jolif</a> - * @version $Id: RhinoInterpreter.java,v 1.5 2001/04/17 14:56:59 cjolif Exp $ + * @version $Id: RhinoInterpreter.java,v 1.6 2001/06/01 13:54:07 cjolif Exp $ */ public class RhinoInterpreter implements Interpreter { private static String[] TO_BE_IMPORTED = { @@ -58,7 +58,7 @@ context = Context.enter(); try { // init std object with an importer - ImporterTopLevel importer = new ImporterTopLevel(); + ImporterTopLevel importer = new ImporterTopLevel(context); globalObject = (ScriptableObject)context.initStandardObjects(importer); // import Java lang package & DOM Level 2 & SVG DOM packages NativeJavaPackage[] p= new NativeJavaPackage[TO_BE_IMPORTED.length]; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]