237962: deserializing 1.5.4 aspects - fix

diff --git a/weaver/src/org/aspectj/weaver/patterns/AndAnnotationTypePattern.java b/weaver/src/org/aspectj/weaver/patterns/AndAnnotationTypePattern.java
index c9525445faa738a8f1e9ac957bc65accb08f0ae9..4392a19d3281388648f2dcefc79d2d2ae197e19b 100644 (file)
--- a/weaver/src/org/aspectj/weaver/patterns/AndAnnotationTypePattern.java
+++ b/weaver/src/org/aspectj/weaver/patterns/AndAnnotationTypePattern.java
@@ -74,7 +74,7 @@ public class AndAnnotationTypePattern extends AnnotationTypePattern {
                                AnnotationTypePattern.read(s,context),
                                AnnotationTypePattern.read(s,context));
                p.readLocation(context,s);
-               if (s.getMajorVersion()>=WeaverVersionInfo.WEAVER_VERSION_MINOR_AJ160) {
+               if (s.getMajorVersion()>=WeaverVersionInfo.WEAVER_VERSION_MAJOR_AJ160) {
                        if (s.readBoolean()) p.setForParameterAnnotationMatch();                        
                }
                return p;               

diff --git a/weaver/src/org/aspectj/weaver/patterns/NotAnnotationTypePattern.java b/weaver/src/org/aspectj/weaver/patterns/NotAnnotationTypePattern.java
index 61a461e01d32793125dc24bc6019ae43e0f84b9b..02802946a874de0df77039ac3b3cf2645e1382c8 100644 (file)
--- a/weaver/src/org/aspectj/weaver/patterns/NotAnnotationTypePattern.java
+++ b/weaver/src/org/aspectj/weaver/patterns/NotAnnotationTypePattern.java
@@ -78,7 +78,7 @@ public class NotAnnotationTypePattern extends AnnotationTypePattern {
        public static AnnotationTypePattern read(VersionedDataInputStream s, ISourceContext context) throws IOException {
                AnnotationTypePattern ret = new NotAnnotationTypePattern(AnnotationTypePattern.read(s,context));
                ret.readLocation(context,s);
-               if (s.getMajorVersion()>=WeaverVersionInfo.WEAVER_VERSION_MINOR_AJ160) {
+               if (s.getMajorVersion()>=WeaverVersionInfo.WEAVER_VERSION_MAJOR_AJ160) {
                        if (s.readBoolean()) ret.setForParameterAnnotationMatch();
                }
                return ret;

diff --git a/weaver/src/org/aspectj/weaver/patterns/OrAnnotationTypePattern.java b/weaver/src/org/aspectj/weaver/patterns/OrAnnotationTypePattern.java
index d36dfdf76900befcce8834b7524850d467a749d6..9c70ac337f27229917db1aee047bc5a1464c170b 100644 (file)
--- a/weaver/src/org/aspectj/weaver/patterns/OrAnnotationTypePattern.java
+++ b/weaver/src/org/aspectj/weaver/patterns/OrAnnotationTypePattern.java
@@ -80,7 +80,7 @@ public class OrAnnotationTypePattern extends AnnotationTypePattern {
                                AnnotationTypePattern.read(s,context),
                                AnnotationTypePattern.read(s,context));
                p.readLocation(context,s);
-               if (s.getMajorVersion()>=WeaverVersionInfo.WEAVER_VERSION_MINOR_AJ160) {
+               if (s.getMajorVersion()>=WeaverVersionInfo.WEAVER_VERSION_MAJOR_AJ160) {
                        if (s.readBoolean()) p.setForParameterAnnotationMatch();
                }
                return p;               

diff --git a/weaver/src/org/aspectj/weaver/patterns/WildAnnotationTypePattern.java b/weaver/src/org/aspectj/weaver/patterns/WildAnnotationTypePattern.java
index 362c1b045c30a26c74eb494c989ce21a3357a938..4555df8ef65c1425816cc0457a67c0a607f6f7fc 100644 (file)
--- a/weaver/src/org/aspectj/weaver/patterns/WildAnnotationTypePattern.java
+++ b/weaver/src/org/aspectj/weaver/patterns/WildAnnotationTypePattern.java
@@ -320,7 +320,7 @@ public class WildAnnotationTypePattern extends AnnotationTypePattern {
                TypePattern t = TypePattern.read(s,context);
                ret = new WildAnnotationTypePattern(t);
                ret.readLocation(context,s);
-               if (s.getMajorVersion()>=WeaverVersionInfo.WEAVER_VERSION_MINOR_AJ160) {
+               if (s.getMajorVersion()>=WeaverVersionInfo.WEAVER_VERSION_MAJOR_AJ160) {
                        if (s.readBoolean()) ret.setForParameterAnnotationMatch();
                }
                if (s.getMajorVersion()>=WeaverVersionInfo.WEAVER_VERSION_MAJOR_AJ160M2) {