From: megacz <megacz@xwt.org>
Date: Fri, 30 Jan 2004 07:04:39 +0000 (+0000)
Subject: 2003/09/04 06:37:17
X-Git-Tag: RC3~722
X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=commitdiff_plain;h=c21a0e631cef9283da291c900e4e08c3ec9a9145

2003/09/04 06:37:17

darcs-hash:20040130070439-2ba56-d9489cf223a1a4a176cf2cbc019e03bb95446af4.gz
---

diff --git a/src/org/xwt/js/JS.java b/src/org/xwt/js/JS.java
index be1fd2c..853a973 100644
--- a/src/org/xwt/js/JS.java
+++ b/src/org/xwt/js/JS.java
@@ -78,8 +78,18 @@ public abstract class JS {
     public abstract Object get(Object key) throws JS.Exn; 
     public abstract void put(Object key, Object val) throws JS.Exn; 
     public abstract Object[] keys(); 
-    public abstract Object callMethod(Object method, JS.Array args, boolean justChecking);
-
+    public Object callMethod(Object method, Array args, boolean checkOnly) throws JS.Exn {
+	if(checkOnly) return Boolean.FALSE;
+	Object o = get(method);
+	if(o instanceof JS.Callable) {
+	    return ((JS.Callable)o).call(args);
+	} else if(o == null) {
+	    throw new JS.Exn("Attempted to call non-existent method: " + method);
+	} else {
+	    throw new JS.Exn("Attempted to call a non-method: " +method);
+	}
+    }
+    
     public Number coerceToNumber() { return new Integer(0); }
     public String coerceToString() { throw new JS.Exn("tried to coerce a JavaScript object to a String"); }
     public boolean coerceToBoolean() { return true; }
@@ -104,17 +114,6 @@ public abstract class JS {
                 return new Internal.CallableStub(this,key);
             return entries.get(key);
         }
-        public Object callMethod(Object method, JS.Array args, boolean checkOnly) throws JS.Exn {
-            if(checkOnly) return Boolean.FALSE;
-            Object o = get(method);
-            if(o instanceof JS.Callable) {
-                return ((JS.Callable)o).call(args);
-            } else if(o == null) {
-                throw new JS.Exn("Attempted to call non-existent method: " + method);
-            } else {
-                throw new JS.Exn("Attempted to call a non-method: " +method);
-            }
-        }
     }
 
     /** An exception which can be thrown and caught by JavaScript code */