X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FXWT.java;h=f20cf26cb8637f6e193cac04f01da25ce29c5ded;hb=d5f0e6ca91a3359b09352d3df367d6b6bd22f096;hp=ed8feb1541077b8a6f17ce625f7df77ca2227c4b;hpb=e6a665b309c7103a3a29c2cd96b1073409c13606;p=org.ibex.core.git

diff --git a/src/org/xwt/XWT.java b/src/org/xwt/XWT.java
index ed8feb1..f20cf26 100644
--- a/src/org/xwt/XWT.java
+++ b/src/org/xwt/XWT.java
@@ -37,7 +37,7 @@ public final class XWT extends JS.Obj {
     }
 
     public void put(Object name, Object value) {
-	if (name.equals("thread") && value != null && value instanceof JS.Function) ThreadMessage.newthread((JS.Function)value);
+	if (name.equals("thread") && value != null && value instanceof JS.Callable) ThreadMessage.newthread((JS.Callable)value);
         else if (name.equals("clipboard")) Platform.setClipBoard(value.toString());
         else if (name.equals("proxyAuthorization")) {
 	    // FIXME: undocumented, possibly insecure
@@ -55,67 +55,30 @@ public final class XWT extends JS.Obj {
         put("fileSeparator", File.separator);
         put("homeDir", System.getProperty("user.home"));
         put("tempDir", System.getProperty("java.io.tempdir"));
+	put("math", org.xwt.js.Math.singleton);
 
-	put("math", new JS.Obj() { public Object get(Object name) {
-	    if ("ceil".equals(name)) return new JS.Function(-1, "java", null, null) { public Object _call(JS.Array args)
-		    { if (args.elementAt(0) == null) return null;
-		    return new Long((long)Math.ceil(Double.parseDouble(args.elementAt(0).toString()))); } };
-	    else if ("floor".equals(name)) return new JS.Function(-1, "java", null, null) { public Object _call(JS.Array args)
-		    { if (args.elementAt(0) == null) return null;
-			return new Long((long)Math.floor(Double.parseDouble(args.elementAt(0).toString()))); } };
-	    else if ("round".equals(name)) return new JS.Function(-1, "java", null, null) { public Object _call(JS.Array args)
-		    { if (args.elementAt(0) == null) return null;
-			return new Long((long)Math.round(Double.parseDouble(args.elementAt(0).toString()))); } };
-	    else if ("abs".equals(name)) return new JS.Function(-1, "java", null, null) { public Object _call(JS.Array args)
-		    { if (args.elementAt(0) == null) return null;
-			return new Long((long)Math.abs(Double.parseDouble(args.elementAt(0).toString()))); } };
-	    else if ("min".equals(name)) return new JS.Function(-1, "java", null, null) { public Object _call(JS.Array args) {
-		if (args.length() < 2 || args.elementAt(0) == null || args.elementAt(1) == null) return args.elementAt(0);
-		return new Double(Math.min(((Number)args.elementAt(0)).doubleValue(),
-					   ((Number)args.elementAt(1)).doubleValue())); } };
-	    else if ("max".equals(name)) return new JS.Function(-1, "java", null, null) { public Object _call(JS.Array args) {
-		if (args.length() < 2) return args.elementAt(0);
-		return new Double(Math.max(((Number)args.elementAt(0)).doubleValue(),
-					   ((Number)args.elementAt(1)).doubleValue())); } };
-	    else if ("cos".equals(name)) return new JS.Function(-1, "java", null, null) { public Object _call(JS.Array args) {
-		return new Double(Math.cos(((Number)args.elementAt(0)).doubleValue())); } };
-	    else if ("sin".equals(name)) return new JS.Function(-1, "java", null, null) { public Object _call(JS.Array args) {
-		return new Double(Math.sin(((Number)args.elementAt(0)).doubleValue())); } };
-	    else if ("tan".equals(name)) return new JS.Function(-1, "java", null, null) { public Object _call(JS.Array args) {
-		return new Double(Math.tan(((Number)args.elementAt(0)).doubleValue())); } };
-	    else if ("acos".equals(name)) return new JS.Function(-1, "java", null, null) { public Object _call(JS.Array args) {
-		return new Double(Math.acos(((Number)args.elementAt(0)).doubleValue())); } };
-	    else if ("asin".equals(name)) return new JS.Function(-1, "java", null, null) { public Object _call(JS.Array args) {
-		return new Double(Math.asin(((Number)args.elementAt(0)).doubleValue())); } };
-	    else if ("atan".equals(name)) return new JS.Function(-1, "java", null, null) { public Object _call(JS.Array args) {
-		return new Double(Math.atan(((Number)args.elementAt(0)).doubleValue())); } };
-	    else if ("sqrt".equals(name)) return new JS.Function(-1, "java", null, null) { public Object _call(JS.Array args) {
-		return new Double(Math.sqrt(((Number)args.elementAt(0)).doubleValue())); } };
-	    return null;
-	}});
-
-	put("newBrowserWindow", new JS.Function(-1, "java", null, null) { public Object _call(JS.Array args) throws JS.Exn {
+	put("newBrowserWindow", new JS.Callable() { public Object call(Array args) throws JS.Exn {
 	    if (args.length() != 1 || args.elementAt(0) == null) return null;
 	    Platform.newBrowserWindow(args.elementAt(0).toString());
 	    return null;
 	}});
 
-	put("parseFloat", new JS.Function(-1, "java", null, null) { public Object _call(JS.Array args) throws JS.Exn {
+	put("parseFloat", new JS.Callable() { public Object call(Array args) throws JS.Exn {
 	    if (args.length() != 1 || args.elementAt(0) == null) return null;
 	    return new Float(args.elementAt(0).toString());
 	}});
 
-	put("parseInt", new JS.Function(-1, "java", null, null) { public Object _call(JS.Array args) throws JS.Exn {
+	put("parseInt", new JS.Callable() { public Object call(Array args) throws JS.Exn {
 	    if (args.length() != 1 || args.elementAt(0) == null) return null;
 	    return new Float(args.elementAt(0).toString());
 	}});
 
-	put("yield", new JS.Function(-1, "java", null, null) { public Object _call(JS.Array args) throws JS.Exn {
+	put("yield", new JS.Callable() { public Object call(Array args) throws JS.Exn {
 	    sleep(0);
 	    return null;
 	}});
 
-	put("theme", new JS.Function(-1, "java", null, null) { public Object _call(JS.Array args) throws JS.Exn {
+	put("theme", new JS.Callable() { public Object call(Array args) throws JS.Exn {
 		if (args.length() != 2) return null;
 		if (args.elementAt(0) == null || args.elementAt(1) == null) return null;
 		for(int i=1; i<args.length(); i++) {
@@ -127,44 +90,44 @@ public final class XWT extends JS.Obj {
 			Resources.mapTo.addElement(to);
 		    }
 		}
-		JS.Function callback = args.elementAt(args.length() - 1) instanceof Function ?
-		    (Function)args.elementAt(args.length() - 1) : null;
+		JS.Callable callback = args.elementAt(args.length() - 1) instanceof JS.Callable ?
+		    (JS.Callable)args.elementAt(args.length() - 1) : null;
 		Template.retheme(callback);
 		return null;
 	}});
 	    
-	put("println", new JS.Function(-1, "java", null, null) { public Object _call(JS.Array args) throws JS.Exn {
+	put("println", new JS.Callable() { public Object call(Array args) throws JS.Exn {
 	    if (args.length() != 1) return null;
-	    if (Log.on) Log.log(this, JS.getFileAndLine() + " " +
+	    if (Log.on) Log.log(this, Context.getCurrentSourceNameAndLine() + " " +
 				(args.elementAt(0) == null ? "**null**" : args.elementAt(0).toString()));
 	    return null;
 	}});
 
-	put("date", new JS.Function(-1, "java", null, null) { public Object _call(JS.Array args) throws JS.Exn {
+	put("date", new JS.Callable() { public Object call(Array args) throws JS.Exn {
 	    Log.log(XWT.class, "date not implemented");
 	    //throw new Error("not implemented");
 	    return null;
         }});
 
-	put("regexp", new JS.Function(-1, "java", null, null) { public Object _call(JS.Array args) throws JS.Exn {
+	put("regexp", new JS.Callable() { public Object call(Array args) throws JS.Exn {
 	    //throw new Error("not implemented");
 	    Log.log(XWT.class, "regexp not implemented");
 	    return null;
 	}});
 
-	put("listfonts", new JS.Function(-1, "java", null, null) { public Object _call(JS.Array args) throws JS.Exn {
+	put("listfonts", new JS.Callable() { public Object call(Array args) throws JS.Exn {
 	    Object[] fonts = Platform.listFonts();
-	    JS.Array ret = new JS.Array();
+	    Array ret = new Array();
 	    for(int i=0; i<fonts.length; i++) ret.addElement(fonts[i]);
 	    return ret;
 	}});
 
-	put("xmlrpc", new JS.Function(-1, "java", null, null) { public Object _call(JS.Array args) throws JS.Exn {
+	put("xmlrpc", new JS.Callable() { public Object call(Array args) throws JS.Exn {
 	    if (args.length() != 1 || args.elementAt(0) == null) return null;
 	    return new XMLRPC(args.elementAt(0).toString(), "");
 	}});
 
-	put("soap", new JS.Function(-1, "java", null, null) { public Object _call(JS.Array args) throws JS.Exn {
+	put("soap", new JS.Callable() { public Object call(Array args) throws JS.Exn {
 	    if (args.length() == 1 && args.elementAt(0) != null) return new SOAP(args.elementAt(0).toString(), "", null, null);
 	    else if (args.length() == 2 && args.elementAt(0) != null && args.elementAt(1) != null)
 		return new SOAP(args.elementAt(0).toString(), "", args.elementAt(1).toString(), null);
@@ -173,7 +136,7 @@ public final class XWT extends JS.Obj {
 	    else return null;
 	}});
 
-	put("textwidth", new JS.Function(-1, "java", null, null) { public Object _call(JS.Array args) throws JS.Exn {
+	put("textwidth", new JS.Callable() { public Object call(Array args) throws JS.Exn {
 	    if (args.length() < 1 || args.length() > 2) return null;
 	    if (args.elementAt(0) == null || (args.length() == 2 && args.elementAt(1) == null)) return null;
 	    String font = args.length() == 1 ? Platform.getDefaultFont() : args.elementAt(0).toString();
@@ -183,7 +146,7 @@ public final class XWT extends JS.Obj {
 	    else return new Integer(xwf.stringWidth(text));
 	}});
 
-	put("textheight", new JS.Function(-1, "java", null, null) { public Object _call(JS.Array args) throws JS.Exn {
+	put("textheight", new JS.Callable() { public Object call(Array args) throws JS.Exn {
 	    if (args.length() > 1) return null;
 	    if (args.length() == 1 && args.elementAt(0) == null) return null;
 	    String font = args.length() == 0 || args.elementAt(0) == null ? Platform.getDefaultFont() : args.elementAt(0).toString();
@@ -192,19 +155,19 @@ public final class XWT extends JS.Obj {
 	    else return new Integer(xwf.getMaxAscent() + xwf.getMaxDescent());
 	}});
 	
-	put("newBox", new JS.Function(-1, "java", null, null) { public Object _call(JS.Array args) throws JS.Exn {
+	put("newBox", new JS.Callable() { public Object call(Array args) throws JS.Exn {
 	    if (args.length() > 0) Log.log(XWT.class, "DEPRECATED: xwt.newBox() with multiple arguments is deprecated; use xwt.newBox().apply()");
-	    JS.Function callback = null;
+	    JS.Callable callback = null;
 	    for(int i=1; i<args.length(); i++)
-		if (args.elementAt(i) instanceof JS.Function && callback == null)
-		    callback = (JS.Function)args.elementAt(i);
+		if (args.elementAt(i) instanceof JS.Callable && callback == null)
+		    callback = (JS.Callable)args.elementAt(i);
 	    Box ret = new Box(args.length() == 0 || args.elementAt(0) == null ? "box" : args.elementAt(0).toString(),
 			      Template.defaultImportList, callback);
 	    for(int i=1; i<args.length(); i++)
 		if (args.elementAt(i) instanceof Box)
 		    ret.put(ret.numChildren(), (Box)args.elementAt(i));
 	    for(int i=1; i<args.length(); i++)
-		if (args.elementAt(i) instanceof JS && !(args.elementAt(i) instanceof Box) && !(args.elementAt(i) instanceof JS.Function)) {
+		if (args.elementAt(i) instanceof JS && !(args.elementAt(i) instanceof Box) && !(args.elementAt(i) instanceof JS.Callable)) {
 		    JS s = (JS)args.elementAt(i);
 		    Object[] keys = s.keys();
 		    for(int j=0; j<keys.length; j++) ret.put(keys[j].toString(), s.get(keys[j].toString()));
@@ -212,20 +175,20 @@ public final class XWT extends JS.Obj {
 	    return ret;
 	}});
 
-	put("sleep", new JS.Function(-1, "java", null, null) { public Object _call(JS.Array args) throws JS.Exn {
+	put("sleep", new JS.Callable() { public Object call(Array args) throws JS.Exn {
 	    if (args != null && (args.length() != 1 || args.elementAt(0) == null)) return null;
 	    int i = args == null ? 0 : SpecialBoxProperty.stoi(args.elementAt(0).toString());
 	    sleep(i);
 	    return null;
 	}});
 
-	put("openFile", new JS.Function(-1, "java", null, null) { public Object _call(JS.Array args) throws JS.Exn {
+	put("openFile", new JS.Callable() { public Object call(Array args) throws JS.Exn {
 	    if (args.length() != 1) return null;
 	    String file = Platform.fileDialog(args.elementAt(0).toString(), false);
 	    return file == null ? null : new ByteStream(file);
 	}});
 
-	put("saveFile", new JS.Function(-1, "java", null, null) { public Object _call(JS.Array args) throws JS.Exn {
+	put("saveFile", new JS.Callable() { public Object call(Array args) throws JS.Exn {
 	    if (args.length() != 2) return null;
 	    if (!(args.elementAt(1) instanceof ByteStream)) return null;
 	    String file = args.elementAt(0).toString();
@@ -244,7 +207,7 @@ public final class XWT extends JS.Obj {
 	    }
 	}});
 
-	put("saveFileAs", new JS.Function(-1, "java", null, null) { public Object _call(JS.Array args) throws JS.Exn {
+	put("saveFileAs", new JS.Callable() { public Object call(Array args) throws JS.Exn {
 	    if (args.length() != 2) return null;
 	    if (!(args.elementAt(1) instanceof ByteStream)) return null;
 	    String file = args.elementAt(0).toString();
@@ -261,12 +224,12 @@ public final class XWT extends JS.Obj {
 	    }
 	}});
 
-	put("utfEncode", new JS.Function(-1, "java", null, null) { public Object _call(JS.Array args) throws JS.Exn {
+	put("utfEncode", new JS.Callable() { public Object call(Array args) throws JS.Exn {
 	    if (args == null || args.length() != 1) return null;
 	    return new ByteStream(args.elementAt(0).toString().getBytes());
 	}});
 
-	put("parseHTML", new JS.Function(-1, "java", null, null) { public Object _call(JS.Array args) throws JS.Exn {
+	put("parseHTML", new JS.Callable() { public Object call(Array args) throws JS.Exn {
                 if (args == null || args.length() != 1 || args.elementAt(0) == null) return null;
                 try {
                     if (args.elementAt(0) instanceof ByteStream) {
@@ -282,21 +245,21 @@ public final class XWT extends JS.Obj {
             }
         });
     
-    put("recursivePrintObject", new JS.Function(-1, "java", null, null) { public Object _call(JS.Array args) {
+    put("recursivePrintObject", new JS.Callable() { public Object call(Array args) {
 	if (args.length() != 1) return null;
 	recurse("", "", args.elementAt(0));
 	return null;
     }});
 
-    put("loadArchive", new JS.Function(-1, "java", null, null) { public Object _call(JS.Array args) throws JS.Exn {
+    put("loadArchive", new JS.Callable() { public Object call(Array args) throws JS.Exn {
 	if (!ThreadMessage.suspendThread()) return null;
 	try {
 	    if (args == null || args.length() < 1 || args.elementAt(0) == null) return null;
 	    URL u = new URL(args.elementAt(0).toString());
 	    
-	    JS.Function callback = null;
-	    if (args.length() == 2 && args.elementAt(1) != null && args.elementAt(1) instanceof JS.Function)
-		callback = (JS.Function)args.elementAt(1);
+	    JS.Callable callback = null;
+	    if (args.length() == 2 && args.elementAt(1) != null && args.elementAt(1) instanceof JS.Callable)
+		callback = (JS.Callable)args.elementAt(1);
 	    
 	    if (!u.getFile().endsWith(".xwar")) {
 		if (Log.on) Log.log(this, "Error: archive names must end with .xwar: " + u.getFile());
@@ -347,10 +310,10 @@ public final class XWT extends JS.Obj {
 	return null;
     }});
 
-    put("prefetchImage", new JS.Function(-1, "java", null, null) { public Object _call(JS.Array args) throws JS.Exn {
+    put("prefetchImage", new JS.Callable() { public Object call(Array args) throws JS.Exn {
 	if (args == null || args.length() < 1 || args.elementAt(0) == null) return null;
 	Box.getImage(args.elementAt(0).toString(),
-		     args.length() > 1 && args.elementAt(1) instanceof JS.Function ? (JS.Function)args.elementAt(1) : null);
+		     args.length() > 1 && args.elementAt(1) instanceof JS.Callable ? (JS.Callable)args.elementAt(1) : null);
 	return null;
     }});
     }
@@ -359,16 +322,16 @@ public final class XWT extends JS.Obj {
         if (!name.equals("")) name += " : ";
 
         if (o == null) {
-            Log.log(JS.getCurrentFunction().getSourceName(), indent + name + "<null>");
+            Log.log(Context.getCurrentSourceNameAndLine() , indent + name + "<null>");
 
-        } else if (o instanceof JS.Array) {
-            Log.log(JS.getCurrentFunction().getSourceName(), indent + name + "<array>");
-            JS.Array na = (JS.Array)o;
+        } else if (o instanceof Array) {
+            Log.log(Context.getCurrentSourceNameAndLine() , indent + name + "<array>");
+            Array na = (Array)o;
             for(int i=0; i<na.length(); i++)
                 recurse(indent + "  ", i + "", na.elementAt(i));
 
         } else if (o instanceof JS) {
-            Log.log(JS.getCurrentFunction().getSourceName(), indent + name + "<object>");
+            Log.log(Context.getCurrentSourceNameAndLine() , indent + name + "<object>");
             JS s = (JS)o;
             Object[] keys = s.keys();
             for(int i=0; i<keys.length; i++)
@@ -377,7 +340,7 @@ public final class XWT extends JS.Obj {
 			s.get(((Integer)keys[i])) : s.get(keys[i].toString()));
 
         } else {
-            Log.log(JS.getCurrentFunction().getSourceName(), indent + name + o);
+            Log.log(Context.getCurrentSourceNameAndLine(), indent + name + o);
 
         }
     }