diff options
| author | Alexander Kriegisch <Alexander@Kriegisch.name> | 2023-11-01 08:50:17 +0700 |
|---|---|---|
| committer | Alexander Kriegisch <Alexander@Kriegisch.name> | 2023-11-01 08:50:17 +0700 |
| commit | 3bca8528f33a3648f3646aeeb2f0b55576b0fc64 (patch) | |
| tree | a3e8df1da264ff49fb169857175b5973bf33e38b /org.aspectj.ajdt.core | |
| parent | 72171c3724100618bf2c733316d23ff7578eeaa1 (diff) | |
| download | aspectj-3bca8528f33a3648f3646aeeb2f0b55576b0fc64.tar.gz aspectj-3bca8528f33a3648f3646aeeb2f0b55576b0fc64.zip | |
Adjust to latest changes in JDT Core
Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
Diffstat (limited to 'org.aspectj.ajdt.core')
2 files changed, 8 insertions, 8 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 6fc9de7dd..c187aa5bf 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 @@ -128,27 +128,27 @@ public class AjLookupEnvironment extends LookupEnvironment implements AnonymousC ContextToken completeTypeBindingsToken = enteringPhase(COMPLETING_TYPE_BINDINGS, ""); // builtInterTypesAndPerClauses = false; // pendingTypesToWeave = new ArrayList(); - stepCompleted = BUILD_TYPE_HIERARCHY; + stepCompleted = CompleteTypeBindingsSteps.CONNECT_TYPE_HIERARCHY; for (int i = lastCompletedUnitIndex + 1; i <= lastUnitIndex; i++) { ContextToken tok = enteringPhase(CHECK_AND_SET_IMPORTS, units[i].compilationResult.fileName); units[i].scope.checkAndSetImports(); leavingPhase(tok); } - stepCompleted = CHECK_AND_SET_IMPORTS; + stepCompleted = CompleteTypeBindingsSteps.CHECK_AND_SET_IMPORTS; for (int i = lastCompletedUnitIndex + 1; i <= lastUnitIndex; i++) { ContextToken tok = enteringPhase(CONNECTING_TYPE_HIERARCHY1, units[i].compilationResult.fileName); - units[i].scope.connectTypeHierarchy1(); + units[i].scope.connectTypeHierarchy(); leavingPhase(tok); } - stepCompleted = CONNECT_TYPE_HIERARCHY1; + stepCompleted = CompleteTypeBindingsSteps.CONNECT_TYPE_HIERARCHY; for (int i = lastCompletedUnitIndex + 1; i <= lastUnitIndex; i++) { ContextToken tok = enteringPhase(CONNECTING_TYPE_HIERARCHY2, units[i].compilationResult.fileName); - units[i].scope.connectTypeHierarchy2(); + units[i].scope.integrateAnnotationsInHierarchy(); leavingPhase(tok); } - stepCompleted = CONNECT_TYPE_HIERARCHY2; + stepCompleted = CompleteTypeBindingsSteps.INTEGRATE_ANNOTATIONS_IN_HIERARCHY; for (int i = lastCompletedUnitIndex + 1; i <= lastUnitIndex; i++) { ContextToken tok = enteringPhase(BUILDING_FIELDS_AND_METHODS, units[i].compilationResult.fileName); // units[i].scope.checkParameterizedTypes(); do this check a little later, after ITDs applied to stbs @@ -283,7 +283,7 @@ public class AjLookupEnvironment extends LookupEnvironment implements AnonymousC units[i] = null; // release unnecessary reference to the parsed unit } - stepCompleted = BUILD_FIELDS_AND_METHODS; + stepCompleted = CompleteTypeBindingsSteps.BUILD_FIELDS_AND_METHODS; lastCompletedUnitIndex = lastUnitIndex; AsmManager.setCompletingTypeBindings(false); factory.getWorld().getCrosscuttingMembersSet().verify(); diff --git a/org.aspectj.ajdt.core/src/main/resources/org/aspectj/org/eclipse/jdt/internal/compiler/batch/messages_aspectj.properties b/org.aspectj.ajdt.core/src/main/resources/org/aspectj/org/eclipse/jdt/internal/compiler/batch/messages_aspectj.properties index d2b9afa41..02617606e 100644 --- a/org.aspectj.ajdt.core/src/main/resources/org/aspectj/org/eclipse/jdt/internal/compiler/batch/messages_aspectj.properties +++ b/org.aspectj.ajdt.core/src/main/resources/org/aspectj/org/eclipse/jdt/internal/compiler/batch/messages_aspectj.properties @@ -1,5 +1,5 @@ compiler.name = AspectJ Compiler -compiler.version = Eclipse Compiler d23a141971a37b (27Apr2023) - Java20 +compiler.version = Eclipse Compiler 3e6295cd3e87e5 (29Oct2023) - Java21 compiler.copyright = misc.version = {0} {1} - {2} {3} |