diff options
| author | aclement <aclement> | 2009-07-27 17:27:25 +0000 |
|---|---|---|
| committer | aclement <aclement> | 2009-07-27 17:27:25 +0000 |
| commit | 08b7d9e41e05df9956c5da1514a2edd29567a0ac (patch) | |
| tree | 25b7c9a4545131de7ca67b3ab9dbf40ee32fce87 /asm/src | |
| parent | 7b0a1866168d9d477db641376929c92053b3a37d (diff) | |
| download | aspectj-08b7d9e41e05df9956c5da1514a2edd29567a0ac.tar.gz aspectj-08b7d9e41e05df9956c5da1514a2edd29567a0ac.zip | |
284771: before tjp clashing advice sigs dont get counter suffix
Diffstat (limited to 'asm/src')
| -rw-r--r-- | asm/src/org/aspectj/asm/internal/JDTLikeHandleProvider.java | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/asm/src/org/aspectj/asm/internal/JDTLikeHandleProvider.java b/asm/src/org/aspectj/asm/internal/JDTLikeHandleProvider.java index 074ab9321..2954f2780 100644 --- a/asm/src/org/aspectj/asm/internal/JDTLikeHandleProvider.java +++ b/asm/src/org/aspectj/asm/internal/JDTLikeHandleProvider.java @@ -226,6 +226,19 @@ public class JDTLikeHandleProvider implements IElementHandleProvider { if (ipeSig != null && ((idx = ipeSig.indexOf(")")) != -1)) { ipeSig = ipeSig.substring(0, idx); } + if (ipeSig != null) { + if (ipeSig.indexOf("Lorg/aspectj/lang") != -1) { + if (ipeSig.endsWith("Lorg/aspectj/lang/JoinPoint$StaticPart;")) { + ipeSig = ipeSig.substring(0, ipeSig.lastIndexOf("Lorg/aspectj/lang/JoinPoint$StaticPart;")); + } + if (ipeSig.endsWith("Lorg/aspectj/lang/JoinPoint;")) { + ipeSig = ipeSig.substring(0, ipeSig.lastIndexOf("Lorg/aspectj/lang/JoinPoint;")); + } + if (ipeSig.endsWith("Lorg/aspectj/lang/JoinPoint$StaticPart;")) { + ipeSig = ipeSig.substring(0, ipeSig.lastIndexOf("Lorg/aspectj/lang/JoinPoint$StaticPart;")); + } + } + } for (Iterator iterator = kids.iterator(); iterator.hasNext();) { IProgramElement object = (IProgramElement) iterator.next(); if (object.equals(ipe)) { |