From acc440c53b0c46ecc9e9af4452e8eee6d14a92a1 Mon Sep 17 00:00:00 2001 From: aclement Date: Tue, 19 Apr 2005 12:34:57 +0000 Subject: [PATCH] modified for binding processing from branch and Andy optimized toString() --- weaver/src/org/aspectj/weaver/Advice.java | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/weaver/src/org/aspectj/weaver/Advice.java b/weaver/src/org/aspectj/weaver/Advice.java index a6cd8f412..183272886 100644 --- 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; -- 2.39.5