polish

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 84258cf0474d4c87df2e1d40300c9a1e40b72c60..b0fc8fe913d9bd276ab334f2f8175f4b628ff7a2 100644 (file)
--- 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")