tests and fix for 109283.

2 files changed, 2 insertions, 8 deletions

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java
index fa0735819..78387f762 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java
@@ -1015,8 +1015,8 @@ public class AspectDeclaration extends TypeDeclaration {
 				hasAspectMethod = AjcMemberMaker.perObjectHasAspectMethod(typeX);
 			} else if (perClause.getKind() == PerClause.PERTYPEWITHIN) {
 			    // PTWIMPL Use these variants of aspectOf()/hasAspect()
-				aspectOfMethod  = AjcMemberMaker.perTypeWithinAspectOfMethod(typeX);
-				hasAspectMethod = AjcMemberMaker.perTypeWithinHasAspectMethod(typeX);
+				aspectOfMethod  = AjcMemberMaker.perTypeWithinAspectOfMethod(typeX,world.getWorld().isInJava5Mode());
+				hasAspectMethod = AjcMemberMaker.perTypeWithinHasAspectMethod(typeX,world.getWorld().isInJava5Mode());
 			} else {
 				throw new RuntimeException("bad per clause: " + perClause);	
 			}
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseFactory.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseFactory.java
index e95c78233..68858e92e 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseFactory.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseFactory.java
@@ -570,12 +570,6 @@ public class EclipseFactory {
 	private ReferenceBinding lookupBinding(String sname) {
 		char[][] name = CharOperation.splitOn('.', sname.toCharArray());
 		ReferenceBinding rb = lookupEnvironment.getType(name);
-		// XXX We do this because the pertypewithin aspectOf(Class) generated method needs it.  Without this
-		// we don't get a 'rawtype' as the argument type for a messagesend to aspectOf() and this leads to 
-		// a compile error if some client class calls aspectOf(A.class) or similar as it says Class<A> isn't
-		// compatible with Class<T>
-		if (sname.equals("java.lang.Class")) 
-			rb = lookupEnvironment.createRawType(rb,rb.enclosingType());
 		return rb;		
 	}