summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoracolyer <acolyer>2005-08-22 07:12:34 +0000
committeracolyer <acolyer>2005-08-22 07:12:34 +0000
commitddf1655ed6ab513dfd183e34a8e85c9d805a36d7 (patch)
treea7cb42cb9e58cdf76cca954d18d066f02c722488
parent44425d3eeaf0c4a29ef3336c6112e56ad5f7bb49 (diff)
downloadaspectj-ddf1655ed6ab513dfd183e34a8e85c9d805a36d7.tar.gz
aspectj-ddf1655ed6ab513dfd183e34a8e85c9d805a36d7.zip
don't let jdt put out warnings about static overrides for ITDs - we've already done it and we do a better job of it :)
-rw-r--r--org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/problem/AjProblemReporter.java8
1 files changed, 8 insertions, 0 deletions
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 05c776a0a..bd3783b0a 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
@@ -19,6 +19,7 @@ import java.util.Iterator;
import org.aspectj.ajdt.internal.compiler.ast.PointcutDeclaration;
import org.aspectj.ajdt.internal.compiler.ast.Proceed;
import org.aspectj.ajdt.internal.compiler.lookup.EclipseFactory;
+import org.aspectj.ajdt.internal.compiler.lookup.InterTypeMethodBinding;
import org.aspectj.org.eclipse.jdt.core.compiler.CharOperation;
import org.aspectj.org.eclipse.jdt.core.compiler.IProblem;
import org.aspectj.org.eclipse.jdt.internal.compiler.CompilationResult;
@@ -171,6 +172,13 @@ public class AjProblemReporter extends ProblemReporter {
super.inheritedMethodReducesVisibility(type,concreteMethod,abstractMethods);
}
+ // if either of the MethodBinding is an ITD, we have already reported it.
+ public void staticAndInstanceConflict(MethodBinding currentMethod, MethodBinding inheritedMethod) {
+ if (currentMethod instanceof InterTypeMethodBinding) return;
+ if (inheritedMethod instanceof InterTypeMethodBinding) return;
+ super.staticAndInstanceConflict(currentMethod, inheritedMethod);
+ }
+
public void abstractMethodMustBeImplemented(
SourceTypeBinding type,
MethodBinding abstractMethod)