From c439e326284d2ffdf4898a50a3d0d5f6a6e99ef1 Mon Sep 17 00:00:00 2001 From: acolyer Date: Tue, 8 Nov 2005 18:12:37 +0000 Subject: [PATCH] fix for pr104220 - poor toString implementations for adviceexecution join points. --- lib/aspectj/lib/aspectjrt.jar | Bin 107655 -> 107918 bytes lib/test/aspectjrt.jar | Bin 107655 -> 107918 bytes runtime/src/org/aspectj/lang/JoinPoint.java | 2 +- .../runtime/reflect/AdviceSignatureImpl.java | 20 ++++++++++++++---- .../aspectj/runtime/reflect/StringMaker.java | 2 ++ 5 files changed, 19 insertions(+), 5 deletions(-) diff --git a/lib/aspectj/lib/aspectjrt.jar b/lib/aspectj/lib/aspectjrt.jar index f84818173e01cfc225d43264f565dc26a2a05b64..6ef865ea7980063049eaab4d1086b380d30d3d7c 100644 GIT binary patch delta 10280 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 LLMey5Jd*q$s4TP; delta 9699 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

{$*6+K1mST-59&iWg@__&Q*4^@ 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 bdCnC3yEM diff --git a/lib/test/aspectjrt.jar b/lib/test/aspectjrt.jar index f84818173e01cfc225d43264f565dc26a2a05b64..6ef865ea7980063049eaab4d1086b380d30d3d7c 100644 GIT binary patch delta 10280 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 LLMey5Jd*q$s4TP; delta 9699 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

{$*6+K1mST-59&iWg@__&Q*4^@ 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 bdCnC3yEM diff --git a/runtime/src/org/aspectj/lang/JoinPoint.java b/runtime/src/org/aspectj/lang/JoinPoint.java index 5640786ba..a32e995cc 100644 --- a/runtime/src/org/aspectj/lang/JoinPoint.java +++ b/runtime/src/org/aspectj/lang/JoinPoint.java @@ -177,6 +177,6 @@ public interface JoinPoint { static String INITIALIZATION = "initialization"; static String EXCEPTION_HANDLER = "exception-handler"; - static String ADVICE_EXECUTION = "advice-execution"; //??? consider this vs. pcd + static String ADVICE_EXECUTION = "adviceexecution"; } diff --git a/runtime/src/org/aspectj/runtime/reflect/AdviceSignatureImpl.java b/runtime/src/org/aspectj/runtime/reflect/AdviceSignatureImpl.java index 6bf899a22..a6fbc097b 100644 --- a/runtime/src/org/aspectj/runtime/reflect/AdviceSignatureImpl.java +++ b/runtime/src/org/aspectj/runtime/reflect/AdviceSignatureImpl.java @@ -15,6 +15,7 @@ package org.aspectj.runtime.reflect; import java.lang.reflect.Method; +import java.util.StringTokenizer; import org.aspectj.lang.reflect.AdviceSignature; @@ -43,19 +44,30 @@ class AdviceSignatureImpl extends CodeSignatureImpl implements AdviceSignature { } protected String createToString(StringMaker sm) { - //XXX this signature needs a lot of work - StringBuffer buf = new StringBuffer("ADVICE: "); - buf.append(sm.makeModifiersString(getModifiers())); + StringBuffer buf = new StringBuffer(); +// buf.append(sm.makeModifiersString(getModifiers())); if (sm.includeArgs) buf.append(sm.makeTypeName(getReturnType())); if (sm.includeArgs) buf.append(" "); buf.append(sm.makePrimaryTypeName(getDeclaringType(),getDeclaringTypeName())); buf.append("."); - buf.append(getName()); + buf.append(toAdviceName(getName())); sm.addSignature(buf, getParameterTypes()); sm.addThrows(buf, getExceptionTypes()); return buf.toString(); } + private String toAdviceName(String methodName) { + if (methodName.indexOf('$') == -1) return methodName; + StringTokenizer strTok = new StringTokenizer(methodName,"$"); + while (strTok.hasMoreTokens()) { + String token = strTok.nextToken(); + if ( token.startsWith("before") || + token.startsWith("after") || + token.startsWith("around") ) return token; + } + return methodName; + } + /* (non-Javadoc) * @see org.aspectj.runtime.reflect.MemberSignatureImpl#createAccessibleObject() */ diff --git a/runtime/src/org/aspectj/runtime/reflect/StringMaker.java b/runtime/src/org/aspectj/runtime/reflect/StringMaker.java index a2a1122c0..941bc822f 100644 --- a/runtime/src/org/aspectj/runtime/reflect/StringMaker.java +++ b/runtime/src/org/aspectj/runtime/reflect/StringMaker.java @@ -16,6 +16,8 @@ package org.aspectj.runtime.reflect; import java.lang.reflect.Modifier; +import org.aspectj.lang.JoinPoint; + class StringMaker { boolean shortTypeNames = true; boolean includeArgs = true; -- 2.39.5