tests and fix for 109283.

2 files changed, 38 insertions, 10 deletions

diff --git a/weaver/src/org/aspectj/weaver/AjcMemberMaker.java b/weaver/src/org/aspectj/weaver/AjcMemberMaker.java
index c5c3024cc..142c055fa 100644
--- a/weaver/src/org/aspectj/weaver/AjcMemberMaker.java
+++ b/weaver/src/org/aspectj/weaver/AjcMemberMaker.java
@@ -270,17 +270,45 @@ public class AjcMemberMaker {
 	};
 	
 	// PTWIMPL ResolvedMember for aspectOf(), declared in aspect
-	public static ResolvedMember perTypeWithinAspectOfMethod(UnresolvedType declaringType) {
-		return new ResolvedMemberImpl(Member.METHOD,
-				declaringType, PUBLIC_STATIC, "aspectOf", 
-				"(Ljava/lang/Class;)" + declaringType.getSignature());		
+	public static ResolvedMember perTypeWithinAspectOfMethod(UnresolvedType declaringType,boolean inJava5Mode) {
+		UnresolvedType parameterType = null;
+		if (inJava5Mode) {
+			parameterType = UnresolvedType.forRawTypeName("java.lang.Class");
+		} else {
+			parameterType = UnresolvedType.forSignature("Ljava/lang/Class;");
+		}
+		return new ResolvedMemberImpl(
+				Member.METHOD,
+				declaringType,
+				PUBLIC_STATIC,
+				declaringType,
+				"aspectOf",
+				new UnresolvedType[] {parameterType}
+				);
+//		return new ResolvedMemberImpl(Member.METHOD,
+//				declaringType, PUBLIC_STATIC, "aspectOf", 
+//				"(Ljava/lang/Class;)" + declaringType.getSignature());		
 	}
 	
 	// PTWIMPL ResolvedMember for hasAspect(), declared in aspect
-	public static ResolvedMember perTypeWithinHasAspectMethod(UnresolvedType declaringType) {
-		return new ResolvedMemberImpl(Member.METHOD,
-			declaringType, PUBLIC_STATIC, "hasAspect", 
-			"(Ljava/lang/Class;)Z");		
+	public static ResolvedMember perTypeWithinHasAspectMethod(UnresolvedType declaringType, boolean inJava5Mode) {
+		UnresolvedType parameterType = null;
+		if (inJava5Mode) {
+			parameterType = UnresolvedType.forRawTypeName("java.lang.Class");
+		} else {
+			parameterType = UnresolvedType.forSignature("Ljava/lang/Class;");
+		}
+		return new ResolvedMemberImpl(
+				Member.METHOD,
+				declaringType,
+				PUBLIC_STATIC,
+				ResolvedType.BOOLEAN,
+				"hasAspect",
+				new UnresolvedType[] {parameterType}
+				);
+//		return new ResolvedMemberImpl(Member.METHOD,
+//			declaringType, PUBLIC_STATIC, "hasAspect", 
+//			"(Ljava/lang/Class;)Z");		
 	};
 	
 	// -- privileged accessors
diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelPerClauseAspectAdder.java b/weaver/src/org/aspectj/weaver/bcel/BcelPerClauseAspectAdder.java
index 724c06816..242e8b76d 100644
--- a/weaver/src/org/aspectj/weaver/bcel/BcelPerClauseAspectAdder.java
+++ b/weaver/src/org/aspectj/weaver/bcel/BcelPerClauseAspectAdder.java
@@ -398,7 +398,7 @@ public class BcelPerClauseAspectAdder extends BcelTypeMunger {
 
     private void generatePerTWAspectOfMethod(LazyClassGen classGen) {
         InstructionFactory factory = classGen.getFactory();
-        LazyMethodGen method = makeMethodGen(classGen, AjcMemberMaker.perTypeWithinAspectOfMethod(aspectType));
+        LazyMethodGen method = makeMethodGen(classGen, AjcMemberMaker.perTypeWithinAspectOfMethod(aspectType,classGen.getWorld().isInJava5Mode()));
         flagAsSynthetic(method, false);
         classGen.addMethodGen(method);
 
@@ -437,7 +437,7 @@ public class BcelPerClauseAspectAdder extends BcelTypeMunger {
 
     private void generatePerTWHasAspectMethod(LazyClassGen classGen) {
         InstructionFactory factory = classGen.getFactory();
-        LazyMethodGen method = makeMethodGen(classGen, AjcMemberMaker.perTypeWithinHasAspectMethod(aspectType));
+        LazyMethodGen method = makeMethodGen(classGen, AjcMemberMaker.perTypeWithinHasAspectMethod(aspectType,classGen.getWorld().isInJava5Mode()));
         flagAsSynthetic(method, false);
         classGen.addMethodGen(method);