From 4676acbde531b3c00f5572ff4053435e9ba9b1eb Mon Sep 17 00:00:00 2001
From: acolyer <acolyer>
Date: Mon, 19 Dec 2005 12:22:26 +0000
Subject: merge of changes from 1.5.0 branch into HEAD

---
 tests/java5/ataspectj/annotationGen/ITDTest.aj    | 2 +-
 tests/java5/reflection/AtAspectJDeclareParents.aj | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'tests/java5')

diff --git a/tests/java5/ataspectj/annotationGen/ITDTest.aj b/tests/java5/ataspectj/annotationGen/ITDTest.aj
index dc8089f70..46e7feed5 100644
--- a/tests/java5/ataspectj/annotationGen/ITDTest.aj
+++ b/tests/java5/ataspectj/annotationGen/ITDTest.aj
@@ -186,7 +186,7 @@ class A {}
 @Aspect
 class X {
 	
-	@org.aspectj.lang.annotation.DeclareParents("org.xyz..*")
+	@org.aspectj.lang.annotation.DeclareParents(value="org.xyz..*",defaultImpl=Mixin.class)
 	public static I myMixin = new Mixin();
 
 
diff --git a/tests/java5/reflection/AtAspectJDeclareParents.aj b/tests/java5/reflection/AtAspectJDeclareParents.aj
index d60f6a3c6..fddf12a56 100644
--- a/tests/java5/reflection/AtAspectJDeclareParents.aj
+++ b/tests/java5/reflection/AtAspectJDeclareParents.aj
@@ -2,8 +2,8 @@ import org.aspectj.lang.annotation.*;
 
 public aspect AtAspectJDeclareParents {
 	
-	@DeclareParents("C")
-	public static I mixin = new Impl();
+	@DeclareParents(value="C",defaultImpl=Impl.class)
+	private I implementedInterface;
 	
 }
 
-- 
cgit v1.2.3