Put the ordering back to allow deserialization of an old set of relationships to...

diff --git a/asm/src/org/aspectj/asm/IRelationship.java b/asm/src/org/aspectj/asm/IRelationship.java
index 41c25ba748e870a20958e5b21edf88b95d865e9c..500ba5b4fe338d8c5b9338bc48c32276773f9819 100644 (file)
--- a/asm/src/org/aspectj/asm/IRelationship.java
+++ b/asm/src/org/aspectj/asm/IRelationship.java
@@ -38,6 +38,8 @@ public interface IRelationship extends Serializable {
         */
        public static class Kind implements Serializable {
                
+        public static final Kind DECLARE_WARNING       = new Kind("declare warning");
+        public static final Kind DECLARE_ERROR         = new Kind("declare error");
                public static final Kind ADVICE_AROUND         = new Kind("around advice");
                public static final Kind ADVICE_AFTERRETURNING = new Kind("after returning advice");
                public static final Kind ADVICE_AFTERTHROWING  = new Kind("after throwing advice");
@@ -45,16 +47,14 @@ public interface IRelationship extends Serializable {
                public static final Kind ADVICE_BEFORE         = new Kind("before advice");
                public static final Kind ADVICE                = new Kind("advice");
                public static final Kind DECLARE               = new Kind("declare");
-        public static final Kind DECLARE_WARNING       = new Kind("declare warning");
-        public static final Kind DECLARE_ERROR         = new Kind("declare error");
-        public static final Kind DECLARE_SOFT          = new Kind("declare soft");
         public static final Kind DECLARE_INTER_TYPE    = new Kind("inter-type declaration");
-               public static final Kind USES_POINTCUT             = new Kind("uses pointcut");
+               public static final Kind USES_POINTCUT           = new Kind("uses pointcut");
+        public static final Kind DECLARE_SOFT          = new Kind("declare soft");
                
                public static final Kind[] ALL = { 
-                       DECLARE_WARNING, DECLARE_ERROR, DECLARE_SOFT,
+                       DECLARE_WARNING, DECLARE_ERROR,
                        ADVICE_AROUND,ADVICE_AFTERRETURNING,ADVICE_AFTERTHROWING,ADVICE_AFTER,ADVICE_BEFORE,
-                       ADVICE, DECLARE, DECLARE_INTER_TYPE, USES_POINTCUT };
+                       ADVICE, DECLARE, DECLARE_INTER_TYPE, USES_POINTCUT, DECLARE_SOFT };
                        
                private final String name;