AspectJ6: picking up compiler interface changes

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/PrivilegedFieldBinding.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/PrivilegedFieldBinding.java
index 2079692580d3f964430184c8e02d3cf6926fcd16..1ecf293a47efdf691826066aa482004db798a751 100644 (file)
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/PrivilegedFieldBinding.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/PrivilegedFieldBinding.java
@@ -16,6 +16,7 @@ package org.aspectj.ajdt.internal.compiler.lookup;
 import org.aspectj.ajdt.internal.compiler.ast.AspectDeclaration;
 import org.aspectj.weaver.AjcMemberMaker;
 import org.aspectj.org.eclipse.jdt.internal.compiler.ast.ASTNode;
+import org.aspectj.org.eclipse.jdt.internal.compiler.impl.Constant;
 import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.FieldBinding;
 import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.InvocationSite;
 import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.Scope;
@@ -42,7 +43,7 @@ public class PrivilegedFieldBinding extends FieldBinding {
                                        inAspect.typeX, inAspect.factory.makeResolvedMember(baseField)
                        )));
                        
-               this.constant = ASTNode.NotAConstant;
+               this.constant = Constant.NotAConstant;
                this.baseField = baseField;
        }
 

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/PrivilegedHandler.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/PrivilegedHandler.java
index 5bc5c1a2f876aa39d6d4c3bca3fd36117bdff212..3ad690781070ae5553ffb1f5c335dcf01cdfce77 100644 (file)
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/PrivilegedHandler.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/PrivilegedHandler.java
@@ -35,6 +35,7 @@ import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.IPrivilegedHandler;
 import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.MethodBinding;
 import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.ParameterizedMethodBinding;
 import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding;
+import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.TagBits;
 
 
 
@@ -71,6 +72,7 @@ public class PrivilegedHandler implements IPrivilegedHandler {
                if (baseMethod.isConstructor()) {
                        ret = new MethodBinding(baseMethod, baseMethod.declaringClass);
                        ret.modifiers = AstUtil.makePublic(ret.modifiers); 
+                       baseMethod.modifiers = ret.modifiers;
                } else {
                        ret = inAspect.factory.makeMethodBinding(
                        AjcMemberMaker.privilegedAccessMethodForMethod(inAspect.typeX, key)