aboutsummaryrefslogtreecommitdiffstats
path: root/org.aspectj.ajdt.core
diff options
context:
space:
mode:
authorAlexander Kriegisch <Alexander@Kriegisch.name>2023-09-26 13:45:32 +0700
committerAlexander Kriegisch <Alexander@Kriegisch.name>2023-09-26 13:45:32 +0700
commitff92343e7ab763941180a66df5b956cb971098ff (patch)
tree043fbbb77d081c8a40a8ae92e52005a203d50ceb /org.aspectj.ajdt.core
parent70ba99c31121897c44e31ec236df54474e523049 (diff)
downloadaspectj-ff92343e7ab763941180a66df5b956cb971098ff.tar.gz
aspectj-ff92343e7ab763941180a66df5b956cb971098ff.zip
Bump JDT Core to 1.9.21-SNAPSHOT
Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
Diffstat (limited to 'org.aspectj.ajdt.core')
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java12
1 files changed, 9 insertions, 3 deletions
diff --git a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java
index e0123ee4a..a97f3fa8a 100644
--- a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java
@@ -148,11 +148,17 @@ public class AjLookupEnvironment extends LookupEnvironment implements AnonymousC
for (int i = lastCompletedUnitIndex + 1; i <= lastUnitIndex; i++) {
ContextToken tok = CompilationAndWeavingContext.enteringPhase(CompilationAndWeavingContext.CONNECTING_TYPE_HIERARCHY,
units[i].compilationResult.fileName);
- units[i].scope.connectTypeHierarchy();
+ units[i].scope.connectTypeHierarchy1();
CompilationAndWeavingContext.leavingPhase(tok);
}
- stepCompleted = CONNECT_TYPE_HIERARCHY;
-
+ stepCompleted = CONNECT_TYPE_HIERARCHY1;
+ for (int i = lastCompletedUnitIndex + 1; i <= lastUnitIndex; i++) {
+ ContextToken tok = CompilationAndWeavingContext.enteringPhase(CompilationAndWeavingContext.CONNECTING_TYPE_HIERARCHY,
+ units[i].compilationResult.fileName);
+ units[i].scope.connectTypeHierarchy2();
+ CompilationAndWeavingContext.leavingPhase(tok);
+ }
+ stepCompleted = CONNECT_TYPE_HIERARCHY2;
for (int i = lastCompletedUnitIndex + 1; i <= lastUnitIndex; i++) {
ContextToken tok = CompilationAndWeavingContext.enteringPhase(CompilationAndWeavingContext.BUILDING_FIELDS_AND_METHODS,
units[i].compilationResult.fileName);