make the default warning level for my beautiful "warnOnSwallowedExceptions" be "ignore"

diff --git a/tests/src/org/aspectj/systemtest/ajc121/ajc121-tests.xml b/tests/src/org/aspectj/systemtest/ajc121/ajc121-tests.xml
index 681f033c756ea6ea7c1382f1cc81f26ac0dd1693..54f6047032485e162c3408c399e7aeac953609c4 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc121/ajc121-tests.xml
+++ b/tests/src/org/aspectj/systemtest/ajc121/ajc121-tests.xml
@@ -348,8 +348,6 @@
                        <message kind="error" line="10" text="The method ancientJ() from the type AncientFoo is not visible"/>
                        <message kind="error" line="11" text="The method clone() from the type Object is not visible"/>
                        <message kind="error" line="12" text="Cannot make a static reference to the non-static method clone() from the type Object"/>
-                       <message kind="warning" line="14" text="Exception swallowed in catch block"/>
-                       <message kind="warning" line="29" text="Exception swallowed in catch block"/>
                </compile>
        </ajc-test>
        

diff --git a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
index bd82343892ed4275ba89c0a3f0022ad83774334d..091042faecb25a011ef116068a57ee5b95cb72d5 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
+++ b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
@@ -51,8 +51,6 @@
                <message kind="warning" line="17" text="aa * *(..) throws Exception"/>
                <message kind="warning" line="37" text="aa call void m() throws Exception"/>
                <message kind="warning" line="38" text="aa call void m() throws Exception"/>
-            <message kind="warning" line="37" text="Exception swallowed in catch block"/>
-            <message kind="warning" line="38" text="Exception swallowed in catch block"/>
        </compile>
         <run class="pr119749">
             <stdout>

diff --git a/tests/src/org/aspectj/systemtest/ajc151/ajc151.xml b/tests/src/org/aspectj/systemtest/ajc151/ajc151.xml
index 160aab9e36c1a3f0ae7394b2858e085873014a13..caac4da143dcc7a50b24b8ff91bf08365e9f3723 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc151/ajc151.xml
+++ b/tests/src/org/aspectj/systemtest/ajc151/ajc151.xml
@@ -424,13 +424,13 @@
     </ajc-test>  
     
     <ajc-test dir="features151/swallowedExceptions" title="swallowed exceptions">
-        <compile files="SwallowedException.java">
+        <compile files="SwallowedException.java" options="-Xlint:warning">
             <message kind="warning" line="11" text="Exception swallowed in catch block"/>
         </compile>
     </ajc-test>
 
     <ajc-test dir="features151/swallowedExceptions" title="swallowed exceptions with xlint">
-        <compile files="SwallowedException.java" options="-Xlint:ignore">
+        <compile files="SwallowedException.java">
         </compile>
     </ajc-test>
 </suite>
\ No newline at end of file

diff --git a/tests/src/org/aspectj/systemtest/design/designtest.xml b/tests/src/org/aspectj/systemtest/design/designtest.xml
index 349bbf464cd1ddf4e73c4f27c222849453a8f44a..d3b70d9ec8c14818e5120457b7abb2ac58b54619 100644 (file)
--- a/tests/src/org/aspectj/systemtest/design/designtest.xml
+++ b/tests/src/org/aspectj/systemtest/design/designtest.xml
@@ -52,7 +52,6 @@
     <ajc-test dir="design/intro"
       title="declared exceptions are checked correctly on intros">
       <compile files="ExceptionsCP.java">
-        <message kind="warning" line="10" text="Exception swallowed in catch block"/>        
       </compile>
         <run class="ExceptionsCP"/>
     </ajc-test>

diff --git a/tests/src/org/aspectj/systemtest/pre10x/pre10x-tests.xml b/tests/src/org/aspectj/systemtest/pre10x/pre10x-tests.xml
index 0dbdce7bdb9c9b519d83788892ee9974daa1fd62..4d4cb999dedb8f44d44eee59c24e655d779f3738 100644 (file)
--- a/tests/src/org/aspectj/systemtest/pre10x/pre10x-tests.xml
+++ b/tests/src/org/aspectj/systemtest/pre10x/pre10x-tests.xml
@@ -531,7 +531,6 @@
         <compile files="UndeclaredThrows.java">
             <message kind="error" line="12"/>
             <message kind="error" line="18"/>
-            <message kind="warning" line="18" text="Exception swallowed in catch block"/>
         </compile>
     </ajc-test>
 

diff --git a/weaver/src/org/aspectj/weaver/XlintDefault.properties b/weaver/src/org/aspectj/weaver/XlintDefault.properties
index 70063a74eb14c6de7f526852473e862dab1a0d09..d1d0776dfa90c640c7973c606de250a9f2c6dc10 100644 (file)
--- a/weaver/src/org/aspectj/weaver/XlintDefault.properties
+++ b/weaver/src/org/aspectj/weaver/XlintDefault.properties
@@ -39,5 +39,5 @@ cantFindType = error
 cantFindTypeAffectingJPMatch = warning
 
 unorderedAdviceAtShadow=ignore
-swallowedExceptionInCatchBlock=warning
+swallowedExceptionInCatchBlock=ignore
 calculatingSerialVersionUID=ignore
\ No newline at end of file