2003/07/05 03:23:31

[org.ibex.core.git] / src / org / xwt / XWT.java

diff --git a/src/org/xwt/XWT.java b/src/org/xwt/XWT.java
index 0f0cac7..b73a1fb 100644 (file)
--- a/src/org/xwt/XWT.java
+++ b/src/org/xwt/XWT.java
@@ -109,9 +109,7 @@ public final class XWT extends JS.Obj {
         }});
 
         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;
+            return new Regexp(args);
         }});
 
         super.put("listfonts", new JS.Callable() { public Object call(JS.Array args) throws JS.Exn {
@@ -164,12 +162,12 @@ 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.super.put(ret.numChildren(), (Box)args.elementAt(i));
+                    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.Callable)) {
                     JS s = (JS)args.elementAt(i);
                     Object[] keys = s.keys();
-                    for(int j=0; j<keys.length; j++) ret.super.put(keys[j].toString(), s.get(keys[j].toString()));
+                    for(int j=0; j<keys.length; j++) ret.put(keys[j].toString(), s.get(keys[j].toString()));
                 }
             return ret;
         }});
@@ -194,7 +192,7 @@ public final class XWT extends JS.Obj {
             if (safeFiles.get(Platform.isCaseSensitive() ? file : file.toLowerCase()) == null) {
                 file = Platform.fileDialog(file, true);
                 if (file == null) return null;
-                safeFiles.super.put(Platform.isCaseSensitive() ? file : file.toLowerCase(), new Object());
+                safeFiles.put(Platform.isCaseSensitive() ? file : file.toLowerCase(), new Object());
             }
             try {
                 ((ByteStream)args.elementAt(1)).writeTo(new FileOutputStream(file));
@@ -212,7 +210,7 @@ public final class XWT extends JS.Obj {
             String file = args.elementAt(0).toString();
             file = Platform.fileDialog(file, true);
             if (file == null) return null;
-            safeFiles.super.put(Platform.isCaseSensitive() ? file : file.toLowerCase(), new Object());
+            safeFiles.put(Platform.isCaseSensitive() ? file : file.toLowerCase(), new Object());
             try {
                 ((ByteStream)args.elementAt(1)).writeTo(new FileOutputStream(file));
                 return null;