2003/12/29 03:27:43

darcs-hash:20040130074333-2ba56-f29bac4eb30a5ed8d226cfb53992139e1d547768.gz

diff --git a/src/org/xwt/Box.java b/src/org/xwt/Box.java
index df1cfd6..7572beb 100644 (file)
--- a/src/org/xwt/Box.java
+++ b/src/org/xwt/Box.java
@@ -605,7 +605,7 @@ public final class Box extends JSScope implements Scheduler.Task {
         case "bottom": set(ALIGN_BOTTOM);
         case "left": set(ALIGN_LEFT);
         case "right": set(ALIGN_RIGHT);
-        default: Log.logJS("invalid alignment \"" + value + "\"");
+        default: JS.log("invalid alignment \"" + value + "\"");
         //#end
     }
     
@@ -785,13 +785,13 @@ public final class Box extends JSScope implements Scheduler.Task {
         if (i < 0) return;
             
         if (value != null && !(value instanceof Box)) {
-            if (Log.on) Log.logJS(this, "attempt to set a numerical property on a box to a non-box");
+            if (Log.on) JS.log(this, "attempt to set a numerical property on a box to a non-box");
             return;
         }
 
         if (redirect == null) {
             if (value == null) putAndTriggerTrapsAndCatchExceptions("childremoved", getChild(i));
-            else Log.logJS(this, "attempt to add/remove children to/from a node with a null redirect");
+            else JS.log(this, "attempt to add/remove children to/from a node with a null redirect");
 
         } else if (redirect != this) {
             if (value != null) putAndTriggerTrapsAndCatchExceptions("childadded", value);
@@ -813,14 +813,14 @@ public final class Box extends JSScope implements Scheduler.Task {
             // check if box being moved is currently target of a redirect
             for(Box cur = b.parent; cur != null; cur = cur.parent)
                 if (cur.redirect == b) {
-                    if (Log.on) Log.logJS(this, "attempt to move a box that is the target of a redirect");
+                    if (Log.on) JS.log(this, "attempt to move a box that is the target of a redirect");
                     return;
                 }
 
             // check for recursive ancestor violation
             for(Box cur = this; cur != null; cur = cur.parent)
                 if (cur == b) {
-                    if (Log.on) Log.logJS(this, "attempt to make a node a parent of its own ancestor");
+                    if (Log.on) JS.log(this, "attempt to make a node a parent of its own ancestor");
                     if (Log.on) Log.info(this, "box == " + this + "  ancestor == " + b);
                     return;
                 }
@@ -842,8 +842,8 @@ public final class Box extends JSScope implements Scheduler.Task {
         try {
             putAndTriggerTraps(name, val);
         } catch (Exception e) {
-            Log.logJS("caught exception while putting to trap \""+name+"\"");
-            Log.logJS(e);
+            JS.log("caught exception while putting to trap \""+name+"\"");
+            JS.log(e);
         }
     }
 

diff --git a/src/org/xwt/Surface.java b/src/org/xwt/Surface.java
index 45221ba..fd66554 100644 (file)
--- a/src/org/xwt/Surface.java
+++ b/src/org/xwt/Surface.java
@@ -143,7 +143,7 @@ public abstract class Surface extends PixelBuffer implements Scheduler.Task {
                 root.putAndTriggerTraps("_Move", T);
             } catch (JSExn e) {
                 Log.info(Surface.class, "Exception thrown from Move message handler");
-                Log.logJS(e);
+                JS.log(e);
             }
         if (!cursor.equals(oldcursor)) syncCursor();
     }
@@ -307,7 +307,7 @@ public abstract class Surface extends PixelBuffer implements Scheduler.Task {
                 boxContainingMouse.putAndTriggerTraps(name, value);
             } catch (JSExn e) {
                 Log.info(Surface.class, "Exception thrown from "+name+" handler");
-                Log.logJS(e);
+                JS.log(e);
             } finally {
                 Platform.clipboardReadEnabled = false;
             }

diff --git a/src/org/xwt/Template.java b/src/org/xwt/Template.java
index 8d47f68..df20ee9 100644 (file)
--- a/src/org/xwt/Template.java
+++ b/src/org/xwt/Template.java
@@ -115,7 +115,7 @@ public class Template {
             b.mark_for_repack();
             Log.info(Template.class, "WARNING: exception (below) thrown during application of template;");
             Log.info(Template.class, "         setting visibility of target box to \"false\"");
-            Log.logJS(e);
+            JS.log(e);
         }
     }
 

diff --git a/src/org/xwt/XWT.java b/src/org/xwt/XWT.java
index 25a05a3..76db51a 100644 (file)
--- a/src/org/xwt/XWT.java
+++ b/src/org/xwt/XWT.java
@@ -153,10 +153,10 @@ public final class XWT extends JS {
                                       catch (Res.NotCacheableException e) { throw new JSExn("this resource cannot be cached"); }
                     case "stream.url": return url2res((String)a);
                     case "thread.sleep": sleep(JS.toInt(a)); return null;
-                    case "log.debug":   Log.logJS(this, a== null ? "**null**" : a.toString()); return null;
-                    case "log.info":   Log.logJS(this, a== null ? "**null**" : a.toString()); return null;
-                    case "log.warn":   Log.logJS(this, a== null ? "**null**" : a.toString()); return null;
-                    case "log.error":   Log.logJS(this, a== null ? "**null**" : a.toString()); return null;
+                    case "log.debug":   JS.log(this, a== null ? "**null**" : a.toString()); return null;
+                    case "log.info":   JS.log(this, a== null ? "**null**" : a.toString()); return null;
+                    case "log.warn":   JS.log(this, a== null ? "**null**" : a.toString()); return null;
+                    case "log.error":   JS.log(this, a== null ? "**null**" : a.toString()); return null;
                     case "regexp": return new JSRegexp(a, null);
                     case "rpc.xml": return new XMLRPC((String)a, "");
                     case "crypto.rsa": /* FEATURE */ return null;