aboutsummaryrefslogtreecommitdiffstats
path: root/org.aspectj.matcher
diff options
context:
space:
mode:
authorAndy Clement <andrew.clement@gmail.com>2013-02-05 11:14:40 -0800
committerAndy Clement <andrew.clement@gmail.com>2013-02-05 11:14:40 -0800
commitedb41e385f232f7aebe1f6517d9a201221175a55 (patch)
tree9a7f39a97c943d7716caae59f2c241ea895a36c6 /org.aspectj.matcher
parent46f90792c01a4333eb62bc2ea6a1dcfb3efb0d23 (diff)
downloadaspectj-edb41e385f232f7aebe1f6517d9a201221175a55.tar.gz
aspectj-edb41e385f232f7aebe1f6517d9a201221175a55.zip
391384: fix
Diffstat (limited to 'org.aspectj.matcher')
-rw-r--r--org.aspectj.matcher/src/org/aspectj/weaver/WeaverMessages.java2
-rw-r--r--org.aspectj.matcher/src/org/aspectj/weaver/patterns/WildAnnotationTypePattern.java4
-rw-r--r--org.aspectj.matcher/src/org/aspectj/weaver/weaver-messages.properties1
3 files changed, 5 insertions, 2 deletions
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/WeaverMessages.java b/org.aspectj.matcher/src/org/aspectj/weaver/WeaverMessages.java
index d4a8f4c7f..736220cd2 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/WeaverMessages.java
+++ b/org.aspectj.matcher/src/org/aspectj/weaver/WeaverMessages.java
@@ -141,6 +141,8 @@ public class WeaverMessages {
public static final String CANT_DECP_TO_MAKE_ANNOTATION_SUPERTYPE = "cantDecpToMakeAnnotationSupertype";
public static final String REFERENCE_TO_NON_ANNOTATION_TYPE = "referenceToNonAnnotationType";
public static final String BINDING_NON_RUNTIME_RETENTION_ANNOTATION = "bindingNonRuntimeRetentionAnnotation";
+
+ public static final String UNSUPPORTED_ANNOTATION_VALUE_TYPE = "unsupportedAnnotationValueType";
public static final String INCORRECT_TARGET_FOR_DECLARE_ANNOTATION = "incorrectTargetForDeclareAnnotation";
public static final String NO_MATCH_BECAUSE_SOURCE_RETENTION = "noMatchBecauseSourceRetention";
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/WildAnnotationTypePattern.java b/org.aspectj.matcher/src/org/aspectj/weaver/patterns/WildAnnotationTypePattern.java
index 62dd896ee..c08073580 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/WildAnnotationTypePattern.java
+++ b/org.aspectj.matcher/src/org/aspectj/weaver/patterns/WildAnnotationTypePattern.java
@@ -228,8 +228,8 @@ public class WildAnnotationTypePattern extends AnnotationTypePattern {
replacementValues.put(k, rt.getSignature());
break;
} else {
- throw new RuntimeException("Compiler limitation: annotation value support not implemented for type "
- + t);
+ scope.message(MessageUtil.error(WeaverMessages.format(WeaverMessages.UNSUPPORTED_ANNOTATION_VALUE_TYPE,t), getSourceLocation()));
+ replacementValues.put(k,"");
}
}
}
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/weaver-messages.properties b/org.aspectj.matcher/src/org/aspectj/weaver/weaver-messages.properties
index 3657964f1..f47b3e38b 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/weaver-messages.properties
+++ b/org.aspectj.matcher/src/org/aspectj/weaver/weaver-messages.properties
@@ -111,6 +111,7 @@ noAroundOnSynchronization=Around advice is not supported on the lock and unlock
aroundOnPreInit=around on pre-initialization not supported (compiler limitation)
aroundOnInit=around on initialization not supported (compiler limitation)
aroundOnInterfaceStaticInit=around on staticinitialization of interface ''{0}'' not supported (compiler limitation)
+unsupportedAnnotationValueType=Compiler limitation: annotation value support not implemented for type {0}
# Bytecode generation nasties...
problemGeneratingMethod=problem generating method {0}.{1} : {2}