2003/06/16 08:44:09

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

diff --git a/src/org/xwt/XWT.java b/src/org/xwt/XWT.java
index 7da117e..1b875ad 100644 (file)
--- a/src/org/xwt/XWT.java
+++ b/src/org/xwt/XWT.java
@@ -55,7 +55,7 @@ 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", org.xwt.js.JS.Math);
 
         put("newBrowserWindow", new JS.Callable() { public Object call(JS.Array args) throws JS.Exn {
             if (args.length() != 1 || args.elementAt(0) == null) return null;
@@ -98,8 +98,7 @@ public final class XWT extends JS.Obj {
             
         put("println", new JS.Callable() { public Object call(JS.Array args) throws JS.Exn {
             if (args.length() != 1) return null;
-            if (Log.on) Log.log(this, Context.getCurrentSourceNameAndLine() + " " +
-                                (args.elementAt(0) == null ? "**null**" : args.elementAt(0).toString()));
+            if (Log.on) Log.logJS(this, (args.elementAt(0) == null ? "**null**" : args.elementAt(0).toString()));
             return null;
         }});
 
@@ -322,16 +321,16 @@ public final class XWT extends JS.Obj {
         if (!name.equals("")) name += " : ";
 
         if (o == null) {
-            Log.log(Context.getCurrentSourceNameAndLine() , indent + name + "<null>");
+            Log.logJS(indent + name + "<null>");
 
         } else if (o instanceof JS.Array) {
-            Log.log(Context.getCurrentSourceNameAndLine() , indent + name + "<array>");
+            Log.logJS(indent + name + "<array>");
             JS.Array na = (JS.Array)o;
             for(int i=0; i<na.length(); i++)
                 recurse(indent + "  ", i + "", na.elementAt(i));
 
         } else if (o instanceof JS) {
-            Log.log(Context.getCurrentSourceNameAndLine() , indent + name + "<object>");
+            Log.logJS(indent + name + "<object>");
             JS s = (JS)o;
             Object[] keys = s.keys();
             for(int i=0; i<keys.length; i++)
@@ -340,20 +339,20 @@ public final class XWT extends JS.Obj {
                         s.get(((Integer)keys[i])) : s.get(keys[i].toString()));
 
         } else {
-            Log.log(Context.getCurrentSourceNameAndLine(), indent + name + o);
+            Log.logJS(indent + name + o);
 
         }
     }
 
 
     public static void sleep(int i) {
-        Thread thread = Thread.currentThread();
+        java.lang.Thread thread = java.lang.Thread.currentThread();
         if (!(thread instanceof ThreadMessage)) {
             if (Log.on) Log.log(XWT.class, "cannot sleep() or yield() in the foreground thread");
         } else {
             ThreadMessage mythread = (ThreadMessage)thread;
             mythread.done.release();
-            if (i > 0) try { Thread.sleep(i); } catch (Exception e) { }
+            if (i > 0) try { java.lang.Thread.sleep(i); } catch (Exception e) { }
             MessageQueue.add(mythread);
             mythread.go.block();
         }