Преглед на файлове

Adjust to latest changes in JDT Core

Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
tags/V1_9_21_M1
Alexander Kriegisch преди 6 месеца
родител
ревизия
3bca8528f3

+ 7
- 7
org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java Целия файл

ContextToken completeTypeBindingsToken = enteringPhase(COMPLETING_TYPE_BINDINGS, ""); ContextToken completeTypeBindingsToken = enteringPhase(COMPLETING_TYPE_BINDINGS, "");
// builtInterTypesAndPerClauses = false; // builtInterTypesAndPerClauses = false;
// pendingTypesToWeave = new ArrayList(); // pendingTypesToWeave = new ArrayList();
stepCompleted = BUILD_TYPE_HIERARCHY;
stepCompleted = CompleteTypeBindingsSteps.CONNECT_TYPE_HIERARCHY;


for (int i = lastCompletedUnitIndex + 1; i <= lastUnitIndex; i++) { for (int i = lastCompletedUnitIndex + 1; i <= lastUnitIndex; i++) {
ContextToken tok = enteringPhase(CHECK_AND_SET_IMPORTS, units[i].compilationResult.fileName); ContextToken tok = enteringPhase(CHECK_AND_SET_IMPORTS, units[i].compilationResult.fileName);
units[i].scope.checkAndSetImports(); units[i].scope.checkAndSetImports();
leavingPhase(tok); leavingPhase(tok);
} }
stepCompleted = CHECK_AND_SET_IMPORTS;
stepCompleted = CompleteTypeBindingsSteps.CHECK_AND_SET_IMPORTS;


for (int i = lastCompletedUnitIndex + 1; i <= lastUnitIndex; i++) { for (int i = lastCompletedUnitIndex + 1; i <= lastUnitIndex; i++) {
ContextToken tok = enteringPhase(CONNECTING_TYPE_HIERARCHY1, units[i].compilationResult.fileName); ContextToken tok = enteringPhase(CONNECTING_TYPE_HIERARCHY1, units[i].compilationResult.fileName);
units[i].scope.connectTypeHierarchy1();
units[i].scope.connectTypeHierarchy();
leavingPhase(tok); leavingPhase(tok);
} }
stepCompleted = CONNECT_TYPE_HIERARCHY1;
stepCompleted = CompleteTypeBindingsSteps.CONNECT_TYPE_HIERARCHY;
for (int i = lastCompletedUnitIndex + 1; i <= lastUnitIndex; i++) { for (int i = lastCompletedUnitIndex + 1; i <= lastUnitIndex; i++) {
ContextToken tok = enteringPhase(CONNECTING_TYPE_HIERARCHY2, units[i].compilationResult.fileName); ContextToken tok = enteringPhase(CONNECTING_TYPE_HIERARCHY2, units[i].compilationResult.fileName);
units[i].scope.connectTypeHierarchy2();
units[i].scope.integrateAnnotationsInHierarchy();
leavingPhase(tok); leavingPhase(tok);
} }
stepCompleted = CONNECT_TYPE_HIERARCHY2;
stepCompleted = CompleteTypeBindingsSteps.INTEGRATE_ANNOTATIONS_IN_HIERARCHY;
for (int i = lastCompletedUnitIndex + 1; i <= lastUnitIndex; i++) { for (int i = lastCompletedUnitIndex + 1; i <= lastUnitIndex; i++) {
ContextToken tok = enteringPhase(BUILDING_FIELDS_AND_METHODS, units[i].compilationResult.fileName); 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 // units[i].scope.checkParameterizedTypes(); do this check a little later, after ITDs applied to stbs
units[i] = null; // release unnecessary reference to the parsed unit units[i] = null; // release unnecessary reference to the parsed unit
} }


stepCompleted = BUILD_FIELDS_AND_METHODS;
stepCompleted = CompleteTypeBindingsSteps.BUILD_FIELDS_AND_METHODS;
lastCompletedUnitIndex = lastUnitIndex; lastCompletedUnitIndex = lastUnitIndex;
AsmManager.setCompletingTypeBindings(false); AsmManager.setCompletingTypeBindings(false);
factory.getWorld().getCrosscuttingMembersSet().verify(); factory.getWorld().getCrosscuttingMembersSet().verify();

+ 1
- 1
org.aspectj.ajdt.core/src/main/resources/org/aspectj/org/eclipse/jdt/internal/compiler/batch/messages_aspectj.properties Целия файл

compiler.name = AspectJ Compiler compiler.name = AspectJ Compiler
compiler.version = Eclipse Compiler d23a141971a37b (27Apr2023) - Java20
compiler.version = Eclipse Compiler 3e6295cd3e87e5 (29Oct2023) - Java21
compiler.copyright = compiler.copyright =


misc.version = {0} {1} - {2} {3} misc.version = {0} {1} - {2} {3}

Loading…
Отказ
Запис