From: aclement <aclement>
Date: Thu, 7 Aug 2008 18:19:50 +0000 (+0000)
Subject: 242797
X-Git-Tag: V162DEV_M1~147
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5a16f7645e3435626eea9ed93f09450e16380140;p=aspectj.git

242797
---

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/problem/AjProblemReporter.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/problem/AjProblemReporter.java
index 0543cdf14..6e90938b6 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/problem/AjProblemReporter.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/problem/AjProblemReporter.java
@@ -44,6 +44,7 @@ import org.aspectj.org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
 import org.aspectj.org.eclipse.jdt.internal.compiler.impl.ReferenceContext;
 import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.ArrayBinding;
 import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.MethodBinding;
+import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.ParameterizedMethodBinding;
 import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding;
 import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.SourceTypeBinding;
 import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.TagBits;
@@ -517,9 +518,10 @@ public class AjProblemReporter extends ProblemReporter {
      * (pr115788)
      */
     public void duplicateInheritedMethods(SourceTypeBinding type, MethodBinding inheritedMethod1, MethodBinding inheritedMethod2) {
-    	if (!(inheritedMethod1 instanceof InterTypeMethodBinding && 
-    	      inheritedMethod2 instanceof InterTypeMethodBinding)) 
-    		super.duplicateInheritedMethods(type,inheritedMethod1,inheritedMethod2);
+    	if (inheritedMethod1 instanceof InterTypeMethodBinding || inheritedMethod2 instanceof InterTypeMethodBinding) return;
+    	if ((inheritedMethod1 instanceof ParameterizedMethodBinding) && ((ParameterizedMethodBinding)inheritedMethod1).original() instanceof InterTypeMethodBinding) return;
+    	if ((inheritedMethod2 instanceof ParameterizedMethodBinding) && ((ParameterizedMethodBinding)inheritedMethod2).original() instanceof InterTypeMethodBinding) return;
+   		super.duplicateInheritedMethods(type,inheritedMethod1,inheritedMethod2);
     }
     
     /**