diff options
| author | Andy Clement <aclement@pivotal.io> | 2018-10-15 08:41:09 -0700 |
|---|---|---|
| committer | Andy Clement <aclement@pivotal.io> | 2018-10-15 08:41:09 -0700 |
| commit | 10b2f3bfac7e4de7f5620923f631b2e6df5d5cdd (patch) | |
| tree | 1358a58f52cf47effeb934e74114e6e93db2d241 /org.aspectj.ajdt.core/src | |
| parent | 41a27118c9eef2033baab0dfce3fcb1cc5dfde1a (diff) | |
| download | aspectj-10b2f3bfac7e4de7f5620923f631b2e6df5d5cdd.tar.gz aspectj-10b2f3bfac7e4de7f5620923f631b2e6df5d5cdd.zip | |
polish
Diffstat (limited to 'org.aspectj.ajdt.core/src')
| -rw-r--r-- | org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmElementFormatter.java | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmElementFormatter.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmElementFormatter.java index 84258cf04..b0fc8fe91 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmElementFormatter.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmElementFormatter.java @@ -57,9 +57,6 @@ import org.aspectj.weaver.patterns.TypePatternList; */ public class AsmElementFormatter { - private final static String ASPECTJ_ANNOTATION_PACKAGE = "org.aspectj.lang.annotation"; - private final static char PACKAGE_INITIAL_CHAR = ASPECTJ_ANNOTATION_PACKAGE.charAt(0); - public void genLabelAndKind(MethodDeclaration methodDeclaration, IProgramElement node) { if (methodDeclaration instanceof AdviceDeclaration) { @@ -222,7 +219,7 @@ public class AsmElementFormatter { // Note: AV: implicit single advice type support here (should be enforced somewhere as well (APT etc)) Annotation annotation = methodDeclaration.annotations[i]; String annotationSig = new String(annotation.type.getTypeBindingPublic(methodDeclaration.scope).signature()); - if (annotationSig.charAt(1) == PACKAGE_INITIAL_CHAR) { + if (annotationSig.charAt(1) == 'o') { if ("Lorg/aspectj/lang/annotation/Pointcut;".equals(annotationSig)) { node.setKind(IProgramElement.Kind.POINTCUT); node.setAnnotationStyleDeclaration(true); // pointcuts don't seem to get handled quite right... @@ -462,7 +459,7 @@ public class AsmElementFormatter { // TODO: fix this way of determing ajc-added arguments, make subtype of Argument with extra info private boolean acceptArgument(String name, String type) { - if (name.charAt(0) != 'a' && type.charAt(0) != PACKAGE_INITIAL_CHAR) { + if (name.charAt(0) != 'a' && type.charAt(0) != 'o') { return true; } return !name.startsWith("ajc$this_") && !type.equals("org.aspectj.lang.JoinPoint.StaticPart") |