diff options
| author | aclement <aclement> | 2008-06-20 17:15:52 +0000 |
|---|---|---|
| committer | aclement <aclement> | 2008-06-20 17:15:52 +0000 |
| commit | be0316737b255f5e9d05bd76ea1e7bf973c347e1 (patch) | |
| tree | d6bbfad245d2cc83876fcda7caf15a5e2d02dae1 /weaver | |
| parent | b2d19f17228b4f874a1591932085e32c62e38ca8 (diff) | |
| download | aspectj-be0316737b255f5e9d05bd76ea1e7bf973c347e1.tar.gz aspectj-be0316737b255f5e9d05bd76ea1e7bf973c347e1.zip | |
237962: deserializing 1.5.4 aspects - fix
Diffstat (limited to 'weaver')
4 files changed, 4 insertions, 4 deletions
diff --git a/weaver/src/org/aspectj/weaver/patterns/AndAnnotationTypePattern.java b/weaver/src/org/aspectj/weaver/patterns/AndAnnotationTypePattern.java index c9525445f..4392a19d3 100644 --- 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 61a461e01..02802946a 100644 --- 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 d36dfdf76..9c70ac337 100644 --- 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 362c1b045..4555df8ef 100644 --- 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) { |