72766 - messages output when preventing ITDs on enums/annotations

diff --git a/weaver/src/org/aspectj/weaver/WeaverMessages.java b/weaver/src/org/aspectj/weaver/WeaverMessages.java
index df2f90376eb5649ad2ae7864e64591eb6de32030..dac3f3fb4aea5320736982e2aa31ac298371c3e0 100644 (file)
--- a/weaver/src/org/aspectj/weaver/WeaverMessages.java
+++ b/weaver/src/org/aspectj/weaver/WeaverMessages.java
@@ -95,12 +95,20 @@ public class WeaverMessages {
        public static final String DIRECTORY_ENTRY_MISSING = "directoryEntryMissing";
        public static final String OUTJAR_IN_INPUT_PATH = "outjarInInputPath";
        
+       
        public static final String XLINT_LOAD_ERROR = "problemLoadingXLint";
        public static final String XLINTDEFAULT_LOAD_ERROR = "unableToLoadXLintDefault";
        public static final String XLINTDEFAULT_LOAD_PROBLEM = "errorLoadingXLintDefault";
        public static final String XLINT_KEY_ERROR = "invalidXLintKey";
        public static final String XLINT_VALUE_ERROR = "invalidXLintMessageKind";
        
+    // Java5 messages
+       public static final String ITDC_ON_ENUM_NOT_ALLOWED = "itdcOnEnumNotAllowed";
+       public static final String ITDM_ON_ENUM_NOT_ALLOWED = "itdmOnEnumNotAllowed";
+       public static final String ITDF_ON_ENUM_NOT_ALLOWED = "itdfOnEnumNotAllowed";
+       public static final String ITDC_ON_ANNOTATION_NOT_ALLOWED = "itdcOnAnnotationNotAllowed";
+       public static final String ITDM_ON_ANNOTATION_NOT_ALLOWED = "itdmOnAnnotationNotAllowed";
+       public static final String ITDF_ON_ANNOTATION_NOT_ALLOWED = "itdfOnAnnotationNotAllowed";
        
        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 97a7e754d5f9c1a8bcadcad5831de09e315a74a0..fa19b4a8015b064efdf7d6b0f566c58fad58d515 100644 (file)
--- a/weaver/src/org/aspectj/weaver/weaver-messages.properties
+++ b/weaver/src/org/aspectj/weaver/weaver-messages.properties
@@ -107,3 +107,17 @@ unableToLoadXLintDefault=couldn''t load XlintDefault.properties
 errorLoadingXLintDefault=problem loading XlintDefault.properties, {0}
 invalidXLintKey=invalid Xlint key: {0}
 invalidXLintMessageKind=invalid Xlint message kind (must be one of ignore, warning, error): {0}
+
+# Java5 
+
+# Enum
+itdcOnEnumNotAllowed=can''t make inter-type constructor declarations on enum types
+itdmOnEnumNotAllowed=can''t make inter-type method declarations on enum types
+itdfOnEnumNotAllowed=can''t make inter-type field declarations on enum types
+
+# Enum
+itdcOnAnnotationNotAllowed=can''t make inter-type constructor declarations on annotation types
+itdmOnAnnotationNotAllowed=can''t make inter-type method declarations on annotation types
+itdfOnAnnotationNotAllowed=can''t make inter-type field declarations on annotation types
+
+