test was failing because a message was coming out twice - once when applying decp...

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java
index 98d57e8d2e8235dd4e333fd83439db9ed824c648..a04ca410d096722ec66bbd90ef3e3e503d5743b9 100644 (file)
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java
@@ -483,7 +483,7 @@ public class AjLookupEnvironment extends LookupEnvironment {
                                newI[n] = parentBinding;
                        }
                        sourceType.superInterfaces = newI;
-                       warnOnAddedInterface(factory.fromEclipse(sourceType),parent);
+                       // warnOnAddedInterface(factory.fromEclipse(sourceType),parent); // now reported at weave time...
                        
 
             // this used to be true, but I think I've fixed it now, decp is done at weave time!                        

diff --git a/tests/src/org/aspectj/systemtest/serialVerUID/serialVerUID-tests.xml b/tests/src/org/aspectj/systemtest/serialVerUID/serialVerUID-tests.xml
index 06465f6ef89fbc7a7126fb71e8130e4ffa6ff46a..2700af07f2e3d281a6d6239487c1cf7c8e40dbb3 100644 (file)
--- a/tests/src/org/aspectj/systemtest/serialVerUID/serialVerUID-tests.xml
+++ b/tests/src/org/aspectj/systemtest/serialVerUID/serialVerUID-tests.xml
@@ -114,7 +114,7 @@
                <compile files="Test.java, Util.java" />
         <run class="Test"/>
                <compile files="Test.java, Util.java, DeclareImplements.aj" options="-Xlint:warning">
-            <message kind="warning"/>
+            <message kind="warning" line="3"/>
                </compile>
         <run class="Util" options="-fail"/>
        </ajc-test>