Bug 155033 "Use ajcore for LTW problems" (new convenience methods and formatting...

diff --git a/weaver/src/org/aspectj/weaver/tools/AbstractTrace.java b/weaver/src/org/aspectj/weaver/tools/AbstractTrace.java
index b426c0e9e8afde8b25cf93b1432556a3cb0e3459..2ec0aa3a95db434d36209c7f99354460213c3c1a 100644 (file)
--- a/weaver/src/org/aspectj/weaver/tools/AbstractTrace.java
+++ b/weaver/src/org/aspectj/weaver/tools/AbstractTrace.java
@@ -17,6 +17,8 @@ import java.text.SimpleDateFormat;
 import java.util.Collection;
 import java.util.Date;
 
+import org.aspectj.bridge.IMessage.Kind;
+
 public abstract class AbstractTrace implements Trace {
 
        protected Class tracedClass;
@@ -54,6 +56,10 @@ public abstract class AbstractTrace implements Trace {
                exit(methodName,new Boolean(b));
        }
 
+       public void exit (String methodName, int i) {
+               exit(methodName,new Integer(i));
+       }
+
        public void event (String methodName, Object thiz, Object arg) {
                event(methodName,thiz,new Object[] { arg });
        }
@@ -125,6 +131,7 @@ public abstract class AbstractTrace implements Trace {
                            || obj instanceof File
                            || obj instanceof StringBuffer
                            || obj instanceof URL
+                           || obj instanceof Kind
                    ) return obj;
                else if (obj.getClass().isArray()) {
                        return formatArray(obj);

diff --git a/weaver/src/org/aspectj/weaver/tools/Trace.java b/weaver/src/org/aspectj/weaver/tools/Trace.java
index 6c4ac387306db883ff7817b1243466d1996ce0ea..c1a040d3626c1c82d5712315936bb3ab29b63feb 100644 (file)
--- a/weaver/src/org/aspectj/weaver/tools/Trace.java
+++ b/weaver/src/org/aspectj/weaver/tools/Trace.java
@@ -52,6 +52,8 @@ public interface Trace {
 
        public void exit (String methodName, boolean b);
 
+       public void exit (String methodName, int i);
+
        public void event (String methodName, Object thiz, Object arg);
        
        public boolean isTraceEnabled ();