2003/06/18 06:25:44

darcs-hash:20040130070151-2ba56-b712d0ff55586660c2f8a0f70612bc3523809ef2.gz

diff --git a/src/org/xwt/XWT.java b/src/org/xwt/XWT.java
index 1b875ad..0f0cac7 100644 (file)
--- a/src/org/xwt/XWT.java
+++ b/src/org/xwt/XWT.java
@@ -47,38 +47,38 @@ 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", org.xwt.js.JS.Math);
+
+        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 +96,37 @@ 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 {
+        super.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;
         }});
 
-        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 +135,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 +145,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 +154,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++)
@@ -164,37 +164,37 @@ public final class XWT extends JS.Obj {
                               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));
+                    ret.super.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.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()));
+                    for(int j=0; j<keys.length; j++) ret.super.put(keys[j].toString(), s.get(keys[j].toString()));
                 }
             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();
             if (safeFiles.get(Platform.isCaseSensitive() ? file : file.toLowerCase()) == null) {
                 file = Platform.fileDialog(file, true);
                 if (file == null) return null;
-                safeFiles.put(Platform.isCaseSensitive() ? file : file.toLowerCase(), new Object());
+                safeFiles.super.put(Platform.isCaseSensitive() ? file : file.toLowerCase(), new Object());
             }
             try {
                 ((ByteStream)args.elementAt(1)).writeTo(new FileOutputStream(file));
@@ -206,13 +206,13 @@ 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();
             file = Platform.fileDialog(file, true);
             if (file == null) return null;
-            safeFiles.put(Platform.isCaseSensitive() ? file : file.toLowerCase(), new Object());
+            safeFiles.super.put(Platform.isCaseSensitive() ? file : file.toLowerCase(), new Object());
             try {
                 ((ByteStream)args.elementAt(1)).writeTo(new FileOutputStream(file));
                 return null;
@@ -223,12 +223,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 +244,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 +309,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);