2003/12/29 03:27:44

darcs-hash:20040130074334-2ba56-91a114ae5434eb48f93652fcca0befab86b69b93.gz

diff --git a/src/org/xwt/js/JS.java b/src/org/xwt/js/JS.java
index 60c974a..0191a59 100644 (file)
--- a/src/org/xwt/js/JS.java
+++ b/src/org/xwt/js/JS.java
@@ -11,6 +11,10 @@ public class JS extends org.xwt.util.BalancedTree {
 
     // Static Interpreter Control Methods ///////////////////////////////////////////////////////////////
 
+    /** log a message with the current JavaScript sourceName/line */
+    public static void log(Object o, Object message) { logJS(message); }
+    public static void log(Object message) { Log.echo(JS.getSourceName() + ":" + JS.getLine(), message); }
+
     public static int getLine() {
         Interpreter c = Interpreter.current();
         return c == null || c.f == null || c.pc < 0 || c.pc >= c.f.size ? -1 : c.f.line[c.pc];

diff --git a/src/org/xwt/util/Log.java b/src/org/xwt/util/Log.java
index aa24171..e536252 100644 (file)
--- a/src/org/xwt/util/Log.java
+++ b/src/org/xwt/util/Log.java
@@ -22,10 +22,6 @@ public class Log {
     /** true iff nothing has yet been logged */
     public static boolean firstMessage = true;
 
-    /** log a message with the current JavaScript sourceName/line */
-    public static void logJS(Object o, Object message) { logJS(message); }
-    public static void logJS(Object message) { log(JS.getSourceName() + ":" + JS.getLine(), message); }
-
     /** message can be a String or a Throwable */
     public static synchronized void echo(Object o, Object message) { log(o, message, ECHO); }
     public static synchronized void debug(Object o, Object message) { log(o, message, DEBUG); }
@@ -145,16 +141,16 @@ public class Log {
         if (!name.equals("")) name += " : ";
 
         if (o == null) {
-            Log.logJS(indent + name + "<null>");
+            JS.log(indent + name + "<null>");
 
         } else if (o instanceof JSArray) {
-            Log.logJS(indent + name + "<array>");
+            JS.log(indent + name + "<array>");
             JSArray na = (JSArray)o;
             for(int i=0; i<na.length(); i++)
                 recursiveLog(indent + "  ", i + "", na.elementAt(i));
 
         } else if (o instanceof JS) {
-            Log.logJS(indent + name + "<object>");
+            JS.log(indent + name + "<object>");
             JS s = (JS)o;
             Enumeration e = s.keys();
             while(e.hasMoreElements()) {
@@ -165,7 +161,7 @@ public class Log {
                                  s.get(((Integer)key)) : s.get(key.toString()));
             }
         } else {
-            Log.logJS(indent + name + o);
+            JS.log(indent + name + o);
 
         }
     }