Fix 449739: support is(FinalType)

2 files changed, 7 insertions, 0 deletions

diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/PatternParser.java b/org.aspectj.matcher/src/org/aspectj/weaver/patterns/PatternParser.java
index 6bcb4ce4a..106376aad 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/PatternParser.java
+++ b/org.aspectj.matcher/src/org/aspectj/weaver/patterns/PatternParser.java
@@ -1064,6 +1064,8 @@ public class PatternParser {
 				typeIsPattern = new TypeCategoryTypePattern(TypeCategoryTypePattern.ENUM);
 			} else if (category.equals("AnnotationType")) {
 				typeIsPattern = new TypeCategoryTypePattern(TypeCategoryTypePattern.ANNOTATION);
+			} else if (category.equals("FinalType")) {
+				typeIsPattern = new TypeCategoryTypePattern(TypeCategoryTypePattern.FINAL);
 			}
 		}
 		if (typeIsPattern == null) {
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/TypeCategoryTypePattern.java b/org.aspectj.matcher/src/org/aspectj/weaver/patterns/TypeCategoryTypePattern.java
index 9f565b20d..72efea400 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/TypeCategoryTypePattern.java
+++ b/org.aspectj.matcher/src/org/aspectj/weaver/patterns/TypeCategoryTypePattern.java
@@ -14,6 +14,7 @@
 package org.aspectj.weaver.patterns;
 
 import java.io.IOException;
+import java.lang.reflect.Modifier;
 import java.util.Map;
 
 import org.aspectj.util.FuzzyBoolean;
@@ -40,6 +41,7 @@ public class TypeCategoryTypePattern extends TypePattern {
 	public static final int ANONYMOUS = 5;
 	public static final int ENUM = 6;
 	public static final int ANNOTATION = 7;
+	public static final int FINAL = 8;
 
 	private int category;
 
@@ -104,6 +106,7 @@ public class TypeCategoryTypePattern extends TypePattern {
 		writeLocation(s);
 	}
 
+	@SuppressWarnings("unused")
 	public static TypePattern read(VersionedDataInputStream s, ISourceContext context) throws IOException {
 		int version = s.readInt();
 		int category = s.readInt();
@@ -131,6 +134,8 @@ public class TypeCategoryTypePattern extends TypePattern {
 			return type.isEnum();
 		case ANNOTATION:
 			return type.isAnnotation();
+		case FINAL:
+			return Modifier.isFinal(type.getModifiers());
 		}
 		return false;
 	}