From fd3129964398cbaf66f3ae3c5e3c75ebf7f3a34b Mon Sep 17 00:00:00 2001
From: aclement <aclement>
Date: Thu, 17 Feb 2005 15:06:17 +0000
Subject: [PATCH] Updated with suppression attribute for non-matching advice.

---
 tests/java5/annotations/AnnotationAspect02.aj    |  4 ++--
 tests/java5/annotations/args/AtArgsAspect.java   | 16 ++++++++--------
 .../annotations/binding/complexExample/X4.java   |  2 +-
 tests/java5/covariance/CovAspect06.aj            |  3 ++-
 tests/java5/covariance/CovAspect09.aj            |  1 +
 tests/java5/varargs/VarargsAspect01.aj           |  1 +
 tests/java5/varargs/VarargsAspect02.aj           |  1 +
 tests/java5/varargs/VarargsAspect03.aj           |  1 +
 tests/java5/varargs/VarargsAspect04.aj           |  1 +
 9 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/tests/java5/annotations/AnnotationAspect02.aj b/tests/java5/annotations/AnnotationAspect02.aj
index ddc3cc48d..00bb10941 100644
--- a/tests/java5/annotations/AnnotationAspect02.aj
+++ b/tests/java5/annotations/AnnotationAspect02.aj
@@ -1,5 +1,5 @@
 public aspect AnnotationAspect02 {
-  before(): call(@SimpleAnnotation * *(..)) {}
+  @org.aspectj.lang.annotation.SuppressAjWarnings before(): call(@SimpleAnnotation * *(..)) {}
 
-  before(): call( * *(..)) {}
+  @org.aspectj.lang.annotation.SuppressAjWarnings before(): call( * *(..)) {}
 }
diff --git a/tests/java5/annotations/args/AtArgsAspect.java b/tests/java5/annotations/args/AtArgsAspect.java
index 5a5c8a4f7..010808ef0 100644
--- a/tests/java5/annotations/args/AtArgsAspect.java
+++ b/tests/java5/annotations/args/AtArgsAspect.java
@@ -9,14 +9,14 @@ public aspect AtArgsAspect {
 		System.out.print("@args(*,*,*,*,*): ");
 		System.out.println(TestingArgsAnnotations.expected() ? "PASS" : "FAIL");
 	}
-	before() : myMethod() && !@args(*,*,*,*,*) {
+	@org.aspectj.lang.annotation.SuppressAjWarnings before() : myMethod() && !@args(*,*,*,*,*) {
 		System.out.print("@args(*,*,*,*,*): ");
 		System.out.println(!TestingArgsAnnotations.expected() ? "PASS" : "FAIL");
 	}
 	
 	// One too few
 	// test 1
-	before() : myMethod() && @args(*,*,*,*) {
+	@org.aspectj.lang.annotation.SuppressAjWarnings before() : myMethod() && @args(*,*,*,*) {
 		System.out.print("@args(*,*,*,*): ");
 		System.out.println(TestingArgsAnnotations.expected() ? "PASS" : "FAIL");
 	}
@@ -27,7 +27,7 @@ public aspect AtArgsAspect {
 	
 	// One too many
 	// test 2
-	before() : myMethod() && @args(*,*,*,*,*,*) {
+	@org.aspectj.lang.annotation.SuppressAjWarnings before() : myMethod() && @args(*,*,*,*,*,*) {
 		System.out.print("@args(*,*,*,*,*,*): ");
 		System.out.println(TestingArgsAnnotations.expected() ? "PASS" : "FAIL");
 	}
@@ -42,7 +42,7 @@ public aspect AtArgsAspect {
 		System.out.print("@args(*,*,..,*,*,*): ");
 		System.out.println(TestingArgsAnnotations.expected() ? "PASS" : "FAIL");
 	}
-	before() : myMethod() && !@args(*,*,..,*,*,*) {
+	@org.aspectj.lang.annotation.SuppressAjWarnings before() : myMethod() && !@args(*,*,..,*,*,*) {
 		System.out.print("@args(*,*,..,*,*,*): ");
 		System.out.println(!TestingArgsAnnotations.expected() ? "PASS" : "FAIL");
 	}
@@ -53,7 +53,7 @@ public aspect AtArgsAspect {
 		System.out.print("@args(*,*,*,..): ");
 		System.out.println(TestingArgsAnnotations.expected() ? "PASS" : "FAIL");
 	}
-	before() : myMethod() && !@args(*,*,*,..) {
+	@org.aspectj.lang.annotation.SuppressAjWarnings before() : myMethod() && !@args(*,*,*,..) {
 		System.out.print("@args(*,*,*,..): ");
 		System.out.println(!TestingArgsAnnotations.expected() ? "PASS" : "FAIL");
 	}
@@ -97,7 +97,7 @@ public aspect AtArgsAspect {
 		System.out.print("@args(..,@MyInheritableAnnotation,*): ");
 		System.out.println(TestingArgsAnnotations.expected() ? "PASS" : "FAIL");
 	}
-	before() : myMethod() && !@args(..,@MyInheritableAnnotation,*) {
+	@org.aspectj.lang.annotation.SuppressAjWarnings before() : myMethod() && !@args(..,@MyInheritableAnnotation,*) {
 		System.out.print("@args(..,@MyInheritableAnnotation,*): ");
 		System.out.println(!TestingArgsAnnotations.expected() ? "PASS" : "FAIL");
 	}
@@ -107,7 +107,7 @@ public aspect AtArgsAspect {
 		System.out.print("@args(..,@MyInheritableAnnotation,@MyInheritableAnnotation): ");
 		System.out.println(TestingArgsAnnotations.expected() ? "PASS" : "FAIL");
 	}
-	before() : myMethod() && !@args(..,@MyInheritableAnnotation,@MyInheritableAnnotation) {
+	@org.aspectj.lang.annotation.SuppressAjWarnings before() : myMethod() && !@args(..,@MyInheritableAnnotation,@MyInheritableAnnotation) {
 		System.out.print("@args(..,@MyInheritableAnnotation,@MyInheritableAnnotation): ");
 		System.out.println(!TestingArgsAnnotations.expected() ? "PASS" : "FAIL");
 	}
@@ -122,4 +122,4 @@ public aspect AtArgsAspect {
 		System.out.println(!TestingArgsAnnotations.expected() ? "PASS" : "FAIL");
 	}
 
-}
\ No newline at end of file
+}
diff --git a/tests/java5/annotations/binding/complexExample/X4.java b/tests/java5/annotations/binding/complexExample/X4.java
index edfb63ef1..de910fe0f 100644
--- a/tests/java5/annotations/binding/complexExample/X4.java
+++ b/tests/java5/annotations/binding/complexExample/X4.java
@@ -3,7 +3,7 @@ import a.b.c.A;
 public aspect X4 {
 
   // Error as Color not imported
-  before(A a): execution(@Color * A+.*(..)) && this(a) {
+  @org.aspectj.lang.annotation.SuppressAjWarnings before(A a): execution(@Color * A+.*(..)) && this(a) {
     System.err.println("Before call to "+thisJoinPoint);
   }
 
diff --git a/tests/java5/covariance/CovAspect06.aj b/tests/java5/covariance/CovAspect06.aj
index bb4961360..34d575ba5 100644
--- a/tests/java5/covariance/CovAspect06.aj
+++ b/tests/java5/covariance/CovAspect06.aj
@@ -1,7 +1,8 @@
 aspect CovAspect06 {
 	
   pointcut p(): call(Car Sub.getCar());
-
+ 
+  @org.aspectj.lang.annotation.SuppressAjWarnings
   before(): p() {
   	System.out.println("[call(Car Sub.getCar()) matched on '"+thisJoinPoint+":"+thisJoinPoint.getSourceLocation()+"']");
   }
diff --git a/tests/java5/covariance/CovAspect09.aj b/tests/java5/covariance/CovAspect09.aj
index 6a3497048..aad549dd3 100644
--- a/tests/java5/covariance/CovAspect09.aj
+++ b/tests/java5/covariance/CovAspect09.aj
@@ -2,6 +2,7 @@ aspect CovAspect09 {
 	
   pointcut p1(): call(FastCar Super.getCar());
 
+  @org.aspectj.lang.annotation.SuppressAjWarnings
   before(): p1() {
   	System.out.println("[call(FastCar Super.getCar()) matched on '"+thisJoinPoint+":"+thisJoinPoint.getSourceLocation()+"']");
   }
diff --git a/tests/java5/varargs/VarargsAspect01.aj b/tests/java5/varargs/VarargsAspect01.aj
index 8b30c7017..2025150f2 100644
--- a/tests/java5/varargs/VarargsAspect01.aj
+++ b/tests/java5/varargs/VarargsAspect01.aj
@@ -1,5 +1,6 @@
 public aspect VarargsAspect01 {
 
+  @org.aspectj.lang.annotation.SuppressAjWarnings
   before(): call(* *(Integer[])) { }
 
 }
diff --git a/tests/java5/varargs/VarargsAspect02.aj b/tests/java5/varargs/VarargsAspect02.aj
index a64b7462d..5385942eb 100644
--- a/tests/java5/varargs/VarargsAspect02.aj
+++ b/tests/java5/varargs/VarargsAspect02.aj
@@ -1,5 +1,6 @@
 public aspect VarargsAspect02 {
 
+  @org.aspectj.lang.annotation.SuppressAjWarnings
   before(): execution(* *(Integer[])) { }
 
 }
diff --git a/tests/java5/varargs/VarargsAspect03.aj b/tests/java5/varargs/VarargsAspect03.aj
index c1b37e1bf..430d1dcd4 100644
--- a/tests/java5/varargs/VarargsAspect03.aj
+++ b/tests/java5/varargs/VarargsAspect03.aj
@@ -1,5 +1,6 @@
 public aspect VarargsAspect03 {
 
+  @org.aspectj.lang.annotation.SuppressAjWarnings
   before(): initialization(new(Integer[])) { }
 
 }
diff --git a/tests/java5/varargs/VarargsAspect04.aj b/tests/java5/varargs/VarargsAspect04.aj
index 1eb425536..35d0e36ec 100644
--- a/tests/java5/varargs/VarargsAspect04.aj
+++ b/tests/java5/varargs/VarargsAspect04.aj
@@ -1,5 +1,6 @@
 public aspect VarargsAspect04 {
 
+  @org.aspectj.lang.annotation.SuppressAjWarnings
   before(): withincode(* *(Integer[])) && call(* *(..)) { }
 
 }
-- 
2.39.5