generics: new error messages.

diff --git a/weaver/src/org/aspectj/weaver/WeaverMessages.java b/weaver/src/org/aspectj/weaver/WeaverMessages.java
index 0030f8bd7688d3ee0adaccae939861bfad6d502f..0399c0cd38461d2d7d56ae7810cb03e95e604922 100644 (file)
--- a/weaver/src/org/aspectj/weaver/WeaverMessages.java
+++ b/weaver/src/org/aspectj/weaver/WeaverMessages.java
@@ -128,6 +128,8 @@ public class WeaverMessages {
        
        // Generics
        public static final String CANT_DECP_MULTIPLE_PARAMETERIZATIONS="cantDecpMultipleParameterizations";
+       public static final String INCORRECT_NUMBER_OF_TYPE_ARGUMENTS = "incorrectNumberOfTypeArguments";
+       public static final String VIOLATES_TYPE_VARIABLE_BOUNDS = "violatesTypeVariableBounds";
        
        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 2fcc78c7a91822b461a82e778272606179897853..336b737fdc458393ba2cd5310bbd970193ffc730 100644 (file)
--- a/weaver/src/org/aspectj/weaver/weaver-messages.properties
+++ b/weaver/src/org/aspectj/weaver/weaver-messages.properties
@@ -139,3 +139,5 @@ bindingNonRuntimeRetentionAnnotation=Annotation type {0} does not have runtime r
 
 # Generics
 cantDecpMultipleParameterizations=Cannot declare parent {0} onto type {1} since it already has {2} in its hierarchy
+incorrectNumberOfTypeArguments=Wrong number of type arguments; Type {0} requires {1}
+violatesTypeVariableBounds=Type {0} does not meet the specification for type parameter {1} in generic type {2}
\ No newline at end of file