Upgrade JDT Core to @3caefb80 (4.20 snapshot, date 2021-03-09)

Add methods isRecord() and getRecordComponents() to class
CompactTypeStructureRepresentation

Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>

diff --git a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/CompactTypeStructureRepresentation.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/CompactTypeStructureRepresentation.java
index 2e4001e073f25c00fe542f61da7ddb8f0ec492e3..b82b06d3a9045655c1b8768f0bca628fa116ff07 100644 (file)
--- a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/CompactTypeStructureRepresentation.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/CompactTypeStructureRepresentation.java
@@ -19,6 +19,7 @@ import org.aspectj.org.eclipse.jdt.internal.compiler.env.IBinaryMethod;
 import org.aspectj.org.eclipse.jdt.internal.compiler.env.IBinaryNestedType;
 import org.aspectj.org.eclipse.jdt.internal.compiler.env.IBinaryType;
 import org.aspectj.org.eclipse.jdt.internal.compiler.env.IBinaryTypeAnnotation;
+import org.aspectj.org.eclipse.jdt.internal.compiler.env.IRecordComponent;
 import org.aspectj.org.eclipse.jdt.internal.compiler.env.ITypeAnnotationWalker;
 import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.BinaryTypeBinding.ExternalAnnotationStatus;
 import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.LookupEnvironment;
@@ -48,7 +49,7 @@ public class CompactTypeStructureRepresentation implements IBinaryType {
 
        // this is the extra state that enables us to be an IBinaryType
        char[] enclosingTypeName;
-       boolean isLocal, isAnonymous, isMember;
+       boolean isLocal, isAnonymous, isMember, isRecord;
        char[] sourceFileName;
        char[] fileName;
        char[] sourceName;
@@ -59,6 +60,7 @@ public class CompactTypeStructureRepresentation implements IBinaryType {
        IBinaryNestedType[] memberTypes;
        IBinaryAnnotation[] annotations;
        IBinaryTypeAnnotation[] typeAnnotations;
+       IRecordComponent[] recordComponents;
 
 
        public CompactTypeStructureRepresentation(ClassFileReader cfr, boolean isAspect) {
@@ -97,6 +99,8 @@ public class CompactTypeStructureRepresentation implements IBinaryType {
                // }
                this.superclassName = cfr.getSuperclassName(); // slashes...
                interfaces = cfr.getInterfaceNames();
+               isRecord = cfr.isRecord();
+               recordComponents = cfr.getRecordComponents();
 
        }
 
@@ -136,6 +140,11 @@ public class CompactTypeStructureRepresentation implements IBinaryType {
                return isLocal;
        }
 
+       @Override
+       public boolean isRecord() {
+               return isRecord;
+       }
+
        public boolean isMember() {
                return isMember;
        }
@@ -164,6 +173,11 @@ public class CompactTypeStructureRepresentation implements IBinaryType {
                return binFields;
        }
 
+       @Override
+       public IRecordComponent[] getRecordComponents() {
+               return recordComponents;
+       }
+
        public IBinaryMethod[] getMethods() {
                return binMethods;
        }
@@ -199,4 +213,4 @@ public class CompactTypeStructureRepresentation implements IBinaryType {
                return ExternalAnnotationStatus.NOT_EEA_CONFIGURED;
        }
 
-}
\ No newline at end of file
+}

diff --git a/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip b/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip
index e85670fef32541e4c9b3c9903520ea5594077f40..d6111b792b6db872d15dd88ccaa8132906f83aa6 100644 (file)
Binary files a/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip and b/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip differ

diff --git a/org.eclipse.jdt.core/jdtcore-for-aspectj.jar b/org.eclipse.jdt.core/jdtcore-for-aspectj.jar
index ee8178f332387c3002e6ab340f36d652e7f9df90..de4b541ad7efa23b17ee4edf53638bda05cfdae2 100644 (file)
Binary files a/org.eclipse.jdt.core/jdtcore-for-aspectj.jar and b/org.eclipse.jdt.core/jdtcore-for-aspectj.jar differ