generics: new message

diff --git a/weaver/src/org/aspectj/weaver/WeaverMessages.java b/weaver/src/org/aspectj/weaver/WeaverMessages.java
index 1037afdbb765f3374720c91ff17fd93e0d337680..0030f8bd7688d3ee0adaccae939861bfad6d502f 100644 (file)
--- a/weaver/src/org/aspectj/weaver/WeaverMessages.java
+++ b/weaver/src/org/aspectj/weaver/WeaverMessages.java
@@ -125,6 +125,10 @@ public class WeaverMessages {
        
        public static final String INCORRECT_TARGET_FOR_DECLARE_ANNOTATION = "incorrectTargetForDeclareAnnotation";
        
+       
+       // Generics
+       public static final String CANT_DECP_MULTIPLE_PARAMETERIZATIONS="cantDecpMultipleParameterizations";
+       
        public static String format(String key) {
                return bundle.getString(key);
        }

diff --git a/weaver/src/org/aspectj/weaver/weaver-messages.properties b/weaver/src/org/aspectj/weaver/weaver-messages.properties
index 32957a57b74bb16763fbc5533c9a3d564f27d56a..2fcc78c7a91822b461a82e778272606179897853 100644 (file)
--- a/weaver/src/org/aspectj/weaver/weaver-messages.properties
+++ b/weaver/src/org/aspectj/weaver/weaver-messages.properties
@@ -135,3 +135,7 @@ incorrectTargetForDeclareAnnotation={0} is not a valid target for annotation {1}
 
 referenceToNonAnnotationType=Type referred to is not an annotation type: {0}
 bindingNonRuntimeRetentionAnnotation=Annotation type {0} does not have runtime retention
+
+
+# Generics
+cantDecpMultipleParameterizations=Cannot declare parent {0} onto type {1} since it already has {2} in its hierarchy