From: aclement <aclement>
Date: Thu, 17 Jan 2008 00:25:17 +0000 (+0000)
Subject: AspectJ6: picking up compiler interface changes
X-Git-Tag: V1_6_0M1~12
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ae6ffffa9d441f8e763f46c3cf7d2b96f149b5b7;p=aspectj.git

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 207969258..1ecf293a4 100644
--- 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 5bc5c1a2f..3ad690781 100644
--- 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)