2003/09/24 07:33:32

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

diff --git a/src/org/xwt/XWT.java b/src/org/xwt/XWT.java
index f3368c4..22d20a9 100644 (file)
--- a/src/org/xwt/XWT.java
+++ b/src/org/xwt/XWT.java
@@ -27,9 +27,6 @@ public final class XWT extends JS.Obj {
         else if (name.equals("control")) return Surface.control ? Boolean.TRUE : Boolean.FALSE;
         else if (name.equals("shift")) return Surface.shift ? Boolean.TRUE : Boolean.FALSE;
         else if (name.equals("clipboard")) return Platform.getClipBoard();
-        /* FIXME
-        else if (name.equals("static")) return .getStatic("");
-        */
         else if (name.equals("origin")) return Main.origin;
         else if (name.equals("maxdim")) return new Integer(Short.MAX_VALUE);
         else if (name.equals("altKeyName")) return Platform.altKeyName();
@@ -86,7 +83,6 @@ public final class XWT extends JS.Obj {
 
         } else if (method.equals("date")) {
             if (checkOnly) return Boolean.TRUE;
-            // FIXME
             Log.log(XWT.class, "date not implemented");
             return null;
 
@@ -120,13 +116,10 @@ public final class XWT extends JS.Obj {
             return null;
 
         } else if (method.equals("openFile")) {
-            //FIXME
-            /*
             if (checkOnly) return Boolean.TRUE;
             if (args.length() != 1) return null;
             String file = Platform.fileDialog(args.elementAt(0).toString(), false);
-            return file == null ? null : new ByteStream(file);
-            */
+            return file == null ? null : new Res.stringToResource("file:" + file);
 
         } else if (method.equals("saveFile")) {
             if (checkOnly) return Boolean.TRUE;
@@ -213,9 +206,10 @@ public final class XWT extends JS.Obj {
             JS s = (JS)o;
             Object[] keys = s.keys();
             for(int i=0; i<keys.length; i++)
-                recurse(indent + "  ", keys[i].toString(),
-                        (keys[i] instanceof Integer) ?
-                        s.get(((Integer)keys[i])) : s.get(keys[i].toString()));
+                if (keys[i] != null)
+                    recurse(indent + "  ", keys[i].toString(),
+                            (keys[i] instanceof Integer) ?
+                            s.get(((Integer)keys[i])) : s.get(keys[i].toString()));
 
         } else {
             Log.logJS(indent + name + o);