From: aclement <aclement>
Date: Wed, 20 Aug 2008 20:47:55 +0000 (+0000)
Subject: 145391: take parameterized types into account
X-Git-Tag: V162DEV_M1~109
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=89fb0653b48f0fb9316ec48edca0308ff60281d0;p=aspectj.git

145391: take parameterized types into account
---

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/SuperFixerVisitor.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/SuperFixerVisitor.java
index 3e5256b5f..227b5b4d1 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/SuperFixerVisitor.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/SuperFixerVisitor.java
@@ -100,7 +100,11 @@ public class SuperFixerVisitor extends ASTVisitor {
 								new String(superBinding.selector)).toCharArray();
 			} else if (call.receiver.isThis() && call.binding.isProtected() && !call.binding.isStatic()) {
 				//XXX this is a hack that violates some binary compatibility rules
-				if (superBinding.declaringClass.equals(targetClass)) {
+				ReferenceBinding superBindingDeclaringClass = superBinding.declaringClass;
+				if (superBindingDeclaringClass.isParameterizedType()) {
+					superBindingDeclaringClass = ((ParameterizedTypeBinding)superBindingDeclaringClass).type;
+				}
+				if (superBindingDeclaringClass.equals(targetClass)) {
 					accessName =
 						NameMangler.protectedDispatchMethod(factory.fromBinding(targetClass), 
 									new String(superBinding.selector)).toCharArray();