modified for binding processing from branch and Andy optimized toString()

diff --git a/weaver/src/org/aspectj/weaver/Advice.java b/weaver/src/org/aspectj/weaver/Advice.java
index a6cd8f412e4cdca4be2a0108e51ec6e0fc40aed6..18327288660f7918a62e50b31020c0b52391105f 100644 (file)
--- a/weaver/src/org/aspectj/weaver/Advice.java
+++ b/weaver/src/org/aspectj/weaver/Advice.java
@@ -236,6 +236,9 @@ public abstract class Advice extends ShadowMunger {
                p = new AndPointcut(clause, p);
                p.copyLocationFrom(oldP);
                p.state = Pointcut.CONCRETE;
+
+            //FIXME ? ATAJ copy unbound bindings to ignore
+            p.m_ignoreUnboundBindingForNames  =oldP.m_ignoreUnboundBindingForNames;
         }
         
                Advice munger = world.concreteAdvice(attribute, p, signature);
@@ -247,14 +250,18 @@ public abstract class Advice extends ShadowMunger {
        // ---- from object
 
        public String toString() {
-               return "("
-                       + getKind()
-            + extraParametersToString() 
-                       + ": "
-                       + pointcut
-                       + "->"
-                       + signature
-                       + ")";
+               StringBuffer sb = new StringBuffer();
+               sb.append("(").append(getKind()).append(extraParametersToString());
+               sb.append(": ").append(pointcut).append("->").append(signature).append(")");
+               return sb.toString();
+//             return "("
+//                     + getKind()
+//            + extraParametersToString() 
+//                     + ": "
+//                     + pointcut
+//                     + "->"
+//                     + signature
+//                     + ")";
        }
     public boolean equals(Object other) {
         if (! (other instanceof Advice)) return false;