Address changes in Eclipse 4.6 API
diff --git a/org.eclipse.ajdt.core/src/org/eclipse/ajdt/core/codeconversion/ITDAwareNameEnvironment.java b/org.eclipse.ajdt.core/src/org/eclipse/ajdt/core/codeconversion/ITDAwareNameEnvironment.java
index c3baa8d..417cd9e 100644
--- a/org.eclipse.ajdt.core/src/org/eclipse/ajdt/core/codeconversion/ITDAwareNameEnvironment.java
+++ b/org.eclipse.ajdt.core/src/org/eclipse/ajdt/core/codeconversion/ITDAwareNameEnvironment.java
@@ -1,7 +1,7 @@
package org.eclipse.ajdt.core.codeconversion;
import java.lang.reflect.Field;
-
+
import org.eclipse.ajdt.core.AspectJCore;
import org.eclipse.ajdt.core.javaelements.AJCompilationUnit;
import org.eclipse.ajdt.core.javaelements.ITDAwareSourceTypeInfo;
@@ -112,7 +112,7 @@
sourceTypes[index++] = newOtherInfo; // AspectJ Change
}
}
- return new NameEnvironmentAnswer(sourceTypes, getRestriction(answer));
+ return new NameEnvironmentAnswer(sourceTypes, getRestriction(answer), null);
} catch (JavaModelException npe) {
return null;
}
diff --git a/org.eclipse.ajdt.core/src/org/eclipse/ajdt/core/javaelements/BinaryAspectElementInfo.java b/org.eclipse.ajdt.core/src/org/eclipse/ajdt/core/javaelements/BinaryAspectElementInfo.java
index 23eed38..7a08416 100644
--- a/org.eclipse.ajdt.core/src/org/eclipse/ajdt/core/javaelements/BinaryAspectElementInfo.java
+++ b/org.eclipse.ajdt.core/src/org/eclipse/ajdt/core/javaelements/BinaryAspectElementInfo.java
@@ -14,6 +14,7 @@
import org.aspectj.asm.IProgramElement;
import org.eclipse.jdt.internal.compiler.env.IBinaryTypeAnnotation;
import org.eclipse.jdt.internal.compiler.env.ITypeAnnotationWalker;
+import org.eclipse.jdt.internal.compiler.lookup.BinaryTypeBinding.ExternalAnnotationStatus;
import org.eclipse.jdt.internal.compiler.lookup.LookupEnvironment;
import org.eclipse.jdt.internal.compiler.env.IBinaryAnnotation;
import org.eclipse.jdt.internal.compiler.env.IBinaryField;
@@ -146,5 +147,12 @@
LookupEnvironment arg2) {
return arg0;
}
+
+ /**
+ * Answer whether a provider for external annotations is associated with this binary type.
+ */
+ public ExternalAnnotationStatus getExternalAnnotationStatus() {
+ return null;
+ }
}
diff --git a/org.eclipse.contribution.weaving.jdt.tests/src/org/eclipse/contribution/weaving/jdt/tests/sourceprovider/SourceTransformerTests.java b/org.eclipse.contribution.weaving.jdt.tests/src/org/eclipse/contribution/weaving/jdt/tests/sourceprovider/SourceTransformerTests.java
index ac02931..88fe932 100644
--- a/org.eclipse.contribution.weaving.jdt.tests/src/org/eclipse/contribution/weaving/jdt/tests/sourceprovider/SourceTransformerTests.java
+++ b/org.eclipse.contribution.weaving.jdt.tests/src/org/eclipse/contribution/weaving/jdt/tests/sourceprovider/SourceTransformerTests.java
@@ -33,6 +33,7 @@
import org.eclipse.jdt.internal.compiler.env.IBinaryType;
import org.eclipse.jdt.internal.compiler.env.IBinaryTypeAnnotation;
import org.eclipse.jdt.internal.compiler.env.ITypeAnnotationWalker;
+import org.eclipse.jdt.internal.compiler.lookup.BinaryTypeBinding.ExternalAnnotationStatus;
import org.eclipse.jdt.internal.compiler.lookup.LookupEnvironment;
import org.eclipse.jdt.internal.core.BinaryType;
import org.eclipse.jdt.internal.core.JavaElement;
@@ -241,5 +242,9 @@
LookupEnvironment arg2) {
return null;
}
+
+ public ExternalAnnotationStatus getExternalAnnotationStatus() {
+ return null;
+ }
}
}
