X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FXWT.java;h=8c9debbbda3eca5553f8014b3fef91ce2681af8a;hb=e8442c40f5b8c03a4e6993cbcc9ce64dddab6a90;hp=1b875ad5b6ba89f52e10a88d0b1254acd6277b5e;hpb=77f51cd3e157cf6fd2ae85ce774444bb85ea7b81;p=org.ibex.core.git

diff --git a/src/org/xwt/XWT.java b/src/org/xwt/XWT.java
index 1b875ad..8c9debb 100644
--- a/src/org/xwt/XWT.java
+++ b/src/org/xwt/XWT.java
@@ -13,6 +13,8 @@ import org.bouncycastle.util.encoders.Base64;
 public final class XWT extends JS.Obj {
 
     public static final XWT singleton = new XWT();
+    private final JS xwtMath = new XWTMath();
+    private final JS xwtString = new XWTString();
 
     /** each key is a string representing a filename which the user has already given XWT permission to write to */
     private static Hashtable safeFiles = new Hashtable();
@@ -47,38 +49,39 @@ public final class XWT extends JS.Obj {
     }
 
     private XWT() {
-        put("maxdim", new Integer(Short.MAX_VALUE));
-        put("origin", Main.origin);
-        put("altKeyName", Platform.altKeyName());
-        put("screenWidth", new Integer(Platform.getScreenWidth()));
-        put("screenHeight", new Integer(Platform.getScreenHeight()));
-        put("fileSeparator", File.separator);
-        put("homeDir", System.getProperty("user.home"));
-        put("tempDir", System.getProperty("java.io.tempdir"));
-        put("math", org.xwt.js.JS.Math);
-
-        put("newBrowserWindow", new JS.Callable() { public Object call(JS.Array args) throws JS.Exn {
+        super.put("maxdim", new Integer(Short.MAX_VALUE));
+        super.put("origin", Main.origin);
+        super.put("altKeyName", Platform.altKeyName());
+        super.put("screenWidth", new Integer(Platform.getScreenWidth()));
+        super.put("screenHeight", new Integer(Platform.getScreenHeight()));
+        super.put("fileSeparator", File.separator);
+        super.put("homeDir", System.getProperty("user.home"));
+        super.put("tempDir", System.getProperty("java.io.tempdir"));
+        super.put("math", xwtMath);
+        super.put("string", xwtString);
+
+        super.put("newBrowserWindow", new JS.Callable() { public Object call(JS.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.Callable() { public Object call(JS.Array args) throws JS.Exn {
+        super.put("parseFloat", new JS.Callable() { public Object call(JS.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.Callable() { public Object call(JS.Array args) throws JS.Exn {
+        super.put("parseInt", new JS.Callable() { public Object call(JS.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.Callable() { public Object call(JS.Array args) throws JS.Exn {
+        super.put("yield", new JS.Callable() { public Object call(JS.Array args) throws JS.Exn {
             sleep(0);
             return null;
         }});
 
-        put("theme", new JS.Callable() { public Object call(JS.Array args) throws JS.Exn {
+        super.put("theme", new JS.Callable() { public Object call(JS.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++) {
@@ -96,37 +99,35 @@ public final class XWT extends JS.Obj {
                 return null;
         }});
             
-        put("println", new JS.Callable() { public Object call(JS.Array args) throws JS.Exn {
+        super.put("println", new JS.Callable() { public Object call(JS.Array args) throws JS.Exn {
             if (args.length() != 1) return null;
             if (Log.on) Log.logJS(this, (args.elementAt(0) == null ? "**null**" : args.elementAt(0).toString()));
             return null;
         }});
 
-        put("date", new JS.Callable() { public Object call(JS.Array args) throws JS.Exn {
+        super.put("date", new JS.Callable() { public Object call(JS.Array args) throws JS.Exn {
             Log.log(XWT.class, "date not implemented");
             //throw new Error("not implemented");
             return null;
         }});
 
-        put("regexp", new JS.Callable() { public Object call(JS.Array args) throws JS.Exn {
-            //throw new Error("not implemented");
-            Log.log(XWT.class, "regexp not implemented");
-            return null;
+        super.put("regexp", new JS.Callable() { public Object call(JS.Array args) throws JS.Exn {
+            return new Regexp(args);
         }});
 
-        put("listfonts", new JS.Callable() { public Object call(JS.Array args) throws JS.Exn {
+        super.put("listfonts", new JS.Callable() { public Object call(JS.Array args) throws JS.Exn {
             Object[] fonts = Platform.listFonts();
             JS.Array ret = new JS.Array();
             for(int i=0; i<fonts.length; i++) ret.addElement(fonts[i]);
             return ret;
         }});
 
-        put("xmlrpc", new JS.Callable() { public Object call(JS.Array args) throws JS.Exn {
+        super.put("xmlrpc", new JS.Callable() { public Object call(JS.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.Callable() { public Object call(JS.Array args) throws JS.Exn {
+        super.put("soap", new JS.Callable() { public Object call(JS.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);
@@ -135,7 +136,7 @@ public final class XWT extends JS.Obj {
             else return null;
         }});
 
-        put("textwidth", new JS.Callable() { public Object call(JS.Array args) throws JS.Exn {
+        super.put("textwidth", new JS.Callable() { public Object call(JS.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();
@@ -145,7 +146,7 @@ public final class XWT extends JS.Obj {
             else return new Integer(xwf.stringWidth(text));
         }});
 
-        put("textheight", new JS.Callable() { public Object call(JS.Array args) throws JS.Exn {
+        super.put("textheight", new JS.Callable() { public Object call(JS.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();
@@ -154,7 +155,7 @@ public final class XWT extends JS.Obj {
             else return new Integer(xwf.getMaxAscent() + xwf.getMaxDescent());
         }});
         
-        put("newBox", new JS.Callable() { public Object call(JS.Array args) throws JS.Exn {
+        super.put("newBox", new JS.Callable() { public Object call(JS.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.Callable callback = null;
             for(int i=1; i<args.length(); i++)
@@ -174,20 +175,20 @@ public final class XWT extends JS.Obj {
             return ret;
         }});
 
-        put("sleep", new JS.Callable() { public Object call(JS.Array args) throws JS.Exn {
+        super.put("sleep", new JS.Callable() { public Object call(JS.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.Callable() { public Object call(JS.Array args) throws JS.Exn {
+        super.put("openFile", new JS.Callable() { public Object call(JS.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.Callable() { public Object call(JS.Array args) throws JS.Exn {
+        super.put("saveFile", new JS.Callable() { public Object call(JS.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();
@@ -206,7 +207,7 @@ public final class XWT extends JS.Obj {
             }
         }});
 
-        put("saveFileAs", new JS.Callable() { public Object call(JS.Array args) throws JS.Exn {
+        super.put("saveFileAs", new JS.Callable() { public Object call(JS.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();
@@ -223,12 +224,12 @@ public final class XWT extends JS.Obj {
             }
         }});
 
-        put("utfEncode", new JS.Callable() { public Object call(JS.Array args) throws JS.Exn {
+        super.put("utfEncode", new JS.Callable() { public Object call(JS.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.Callable() { public Object call(JS.Array args) throws JS.Exn {
+        super.put("parseHTML", new JS.Callable() { public Object call(JS.Array args) throws JS.Exn {
                 if (args == null || args.length() != 1 || args.elementAt(0) == null) return null;
                 try {
                     if (args.elementAt(0) instanceof ByteStream) {
@@ -244,13 +245,13 @@ public final class XWT extends JS.Obj {
             }
         });
     
-    put("recursivePrintObject", new JS.Callable() { public Object call(JS.Array args) {
+    super.put("recursivePrintObject", new JS.Callable() { public Object call(JS.Array args) {
         if (args.length() != 1) return null;
         recurse("", "", args.elementAt(0));
         return null;
     }});
 
-    put("loadArchive", new JS.Callable() { public Object call(JS.Array args) throws JS.Exn {
+    super.put("loadArchive", new JS.Callable() { public Object call(JS.Array args) throws JS.Exn {
         if (!ThreadMessage.suspendThread()) return null;
         try {
             if (args == null || args.length() < 1 || args.elementAt(0) == null) return null;
@@ -309,7 +310,7 @@ public final class XWT extends JS.Obj {
         return null;
     }});
 
-    put("prefetchImage", new JS.Callable() { public Object call(JS.Array args) throws JS.Exn {
+    super.put("prefetchImage", new JS.Callable() { public Object call(JS.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.Callable ? (JS.Callable)args.elementAt(1) : null);
@@ -357,12 +358,32 @@ public final class XWT extends JS.Obj {
             mythread.go.block();
         }
     }
+    
+    private static class XWTMath extends JS.Obj {
+        public XWTMath() {
+            JS gs = new JS.GlobalScope();
+            put("isNaN",gs.get("isNaN"));
+            put("isFinite",gs.get("isFinite"));
+            put("NaN",gs.get("NaN"));
+            put("Infinity",gs.get("Infinity"));
+            setSeal(true);
+        }
+        public Object get(Object key) {
+            Object ret = super.get(key);
+            if(ret == null) ret = JS.Math.get(key);
+            return ret;
+        }
+    }
+    private static class XWTString extends JS.Obj {
+        public XWTString() {
+            JS gs = new JS.GlobalScope();
+            put("parseInt",gs.get("parseInt"));
+            put("parseFloat",gs.get("parseFloat"));
+            put("decodeURI",gs.get("decodeURI"));
+            put("decodeURIComponent",gs.get("decodeURIComponent"));
+            put("encodeURI",gs.get("encodeURI"));
+            put("encodeURIComponent",gs.get("encodeURIComponent"));
+            setSeal(true);
+        }
+    }
 }
-
-
-
-
-
-
-
-