updates to name processing to take into account nesting on $ conversions

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AstUtil.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AstUtil.java
index 00c6ed69b2181d1dd9f41e56ce220398a1dc4d3e..50ded3bd680babea860a5ed62f4c9094edf812c2 100644 (file)
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AstUtil.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AstUtil.java
@@ -240,7 +240,7 @@ public class AstUtil {
                return (long)end | ((long)start << 32);
        }
        public static char[][] getCompoundName(String string) {
-               return WildTypePattern.splitNames(string);
+               return WildTypePattern.splitNames(string,true);
        }
 
        public static TypeBinding[] insert(

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseScope.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseScope.java
index bc7efca5baee86e97a0c8b0b8a84d4073008af31..494a714a2032ba129493aadbf7f60c963a3ab63b 100644 (file)
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseScope.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseScope.java
@@ -61,7 +61,7 @@ public class EclipseScope implements IScope {
        
        
        public UnresolvedType lookupType(String name, IHasPosition location) {
-               char[][] splitName = WildTypePattern.splitNames(name);
+               char[][] splitName = WildTypePattern.splitNames(name,true);
                TypeBinding b = scope.getType(splitName,splitName.length);
                //FIXME ??? need reasonable error handling...
                if (!b.isValidBinding()) {

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceType.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceType.java
index 91eff5bd1f858175e1aee35eba412f3d1ef5f1f2..2785778e59446dd3d2aeff79a3d91c102ca21531 100644 (file)
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceType.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceType.java
@@ -111,6 +111,10 @@ public class EclipseSourceType extends AbstractReferenceTypeDelegate {
        public boolean isAnonymous() {
                return ((declaration.modifiers & ASTNode.AnonymousAndLocalMask) != 0);
        }
+       
+       public boolean isNested() {
+               return ((declaration.modifiers & ASTNode.IsMemberTypeMASK) != 0);
+       }
 
     public boolean isAnnotationStyleAspect() {
         if (declaration.annotations == null) {