Fix or suppress 1-instance findbug warnings.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1616312 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 18 insertions, 79 deletions

diff --git a/findbugs-exclude.xml b/findbugs-exclude.xml
index 8c3af2022..4af7948ad 100644
--- a/findbugs-exclude.xml
+++ b/findbugs-exclude.xml
@@ -9,18 +9,19 @@
     <Bug pattern="CI_CONFUSED_INHERITANCE"/>
   </Match>
   <Match>
-    <!-- 1 warning -->
     <Bug pattern="CN_IDIOM_NO_SUPER_CALL"/>
+    <Or>
+      <And>
+        <Class name="org.apache.fop.render.intermediate.IFGraphicContext"/>
+        <Method name="clone"/>
+      </And>
+    </Or>
   </Match>
   <Match>
     <!-- 15 warnings -->
     <Bug pattern="DB_DUPLICATE_SWITCH_CLAUSES"/>
   </Match>
   <Match>
-    <!-- 1 warning -->
-    <Bug pattern="DE_MIGHT_IGNORE"/>
-  </Match>
-  <Match>
     <!-- 27 warnings -->
     <Bug pattern="DLS_DEAD_LOCAL_STORE"/>
   </Match>
@@ -53,10 +54,6 @@
     <Bug pattern="DM_NUMBER_CTOR"/>
   </Match>
   <Match>
-    <!-- 1 warning -->
-    <Bug pattern="DM_STRING_CTOR"/>
-  </Match>
-  <Match>
     <!-- 2 warnings -->
     <Bug pattern="DM_STRING_TOSTRING"/>
   </Match>
@@ -81,22 +78,19 @@
     <Bug pattern="EI_EXPOSE_REP2"/>
   </Match>
   <Match>
-    <!-- 1 warning -->
     <Bug pattern="EQ_ALWAYS_TRUE"/>
-  </Match>
-  <Match>
-    <!-- 1 warning -->
-    <Bug pattern="EQ_COMPARETO_USE_OBJECT_EQUALS"/>
+    <Or>
+      <And>
+        <Class name="org.apache.fop.fo.properties.ToBeImplementedProperty"/>
+        <Method name="equals"/>
+      </And>
+    </Or>
   </Match>
   <Match>
     <!-- 2 warnings -->
     <Bug pattern="EQ_DOESNT_OVERRIDE_EQUALS"/>
   </Match>
   <Match>
-    <!-- 1 warning -->
-    <Bug pattern="EQ_UNUSUAL"/>
-  </Match>
-  <Match>
     <!-- 3 warnings -->
     <Bug pattern="ES_COMPARING_PARAMETER_STRING_WITH_EQ"/>
   </Match>
@@ -109,18 +103,6 @@
     <Bug pattern="FE_FLOATING_POINT_EQUALITY"/>
   </Match>
   <Match>
-    <!-- 1 warning -->
-    <Bug pattern="ICAST_IDIV_CAST_TO_DOUBLE"/>
-  </Match>
-  <Match>
-    <!-- 1 warning -->
-    <Bug pattern="ICAST_INT_CAST_TO_FLOAT_PASSED_TO_ROUND"/>
-  </Match>
-  <Match>
-    <!-- 1 warning -->
-    <Bug pattern="IM_AVERAGE_COMPUTATION_COULD_OVERFLOW"/>
-  </Match>
-  <Match>
     <!-- 2 warnings -->
     <Bug pattern="IM_BAD_CHECK_FOR_ODD"/>
   </Match>
@@ -137,16 +119,17 @@
     <Bug pattern="LI_LAZY_INIT_STATIC"/>
   </Match>
   <Match>
-    <!-- 1 warning -->
-    <Bug pattern="LI_LAZY_INIT_UPDATE_STATIC"/>
-  </Match>
-  <Match>
     <!-- 2 warnings -->
     <Bug pattern="MF_CLASS_MASKS_FIELD"/>
   </Match>
   <Match>
-    <!-- 1 warning -->
     <Bug pattern="MS_EXPOSE_REP"/>
+    <Or>
+      <And>
+        <Class name="org.apache.fop.fo.FOPropertyMapping"/>
+        <Method name="getGenericMappings"/>
+      </And>
+    </Or>
   </Match>
   <Match>
     <!-- 12 warnings -->
@@ -169,14 +152,6 @@
     <Bug pattern="NM_SAME_SIMPLE_NAME_AS_SUPERCLASS"/>
   </Match>
   <Match>
-    <!-- 1 warning -->
-    <Bug pattern="NP_GUARANTEED_DEREF"/>
-  </Match>
-  <Match>
-    <!-- 1 warning -->
-    <Bug pattern="NP_IMMEDIATE_DEREFERENCE_OF_READLINE"/>
-  </Match>
-  <Match>
     <!-- 4 warnings -->
     <Bug pattern="NP_LOAD_OF_KNOWN_NULL_VALUE"/>
   </Match>
@@ -205,10 +180,6 @@
     <Bug pattern="PZLA_PREFER_ZERO_LENGTH_ARRAYS"/>
   </Match>
   <Match>
-    <!-- 1 warning -->
-    <Bug pattern="RC_REF_COMPARISON_BAD_PRACTICE_BOOLEAN"/>
-  </Match>
-  <Match>
     <!-- 10 warnings -->
     <Bug pattern="RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE"/>
   </Match>
@@ -217,10 +188,6 @@
     <Bug pattern="RCN_REDUNDANT_NULLCHECK_OF_NULL_VALUE"/>
   </Match>
   <Match>
-    <!-- 1 warning -->
-    <Bug pattern="RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE"/>
-  </Match>
-  <Match>
     <!-- 23 warnings -->
     <Bug pattern="REC_CATCH_EXCEPTION"/>
   </Match>
@@ -229,22 +196,10 @@
     <Bug pattern="RI_REDUNDANT_INTERFACES"/>
   </Match>
   <Match>
-    <!-- 1 warning -->
-    <Bug pattern="RR_NOT_CHECKED"/>
-  </Match>
-  <Match>
-    <!-- 1 warning -->
-    <Bug pattern="RV_EXCEPTION_NOT_THROWN"/>
-  </Match>
-  <Match>
     <!-- 11 warnings -->
     <Bug pattern="RV_RETURN_VALUE_IGNORED_BAD_PRACTICE"/>
   </Match>
   <Match>
-    <!-- 1 warning -->
-    <Bug pattern="SA_FIELD_SELF_COMPARISON"/>
-  </Match>
-  <Match>
     <!-- 2 warnings -->
     <Bug pattern="SBSC_USE_STRINGBUFFER_CONCATENATION"/>
   </Match>
@@ -261,10 +216,6 @@
     <Bug pattern="SE_BAD_FIELD_STORE"/>
   </Match>
   <Match>
-    <!-- 1 warning -->
-    <Bug pattern="SE_COMPARATOR_SHOULD_BE_SERIALIZABLE"/>
-  </Match>
-  <Match>
     <!-- 6 warnings -->
     <Bug pattern="SE_INNER_CLASS"/>
   </Match>
@@ -277,10 +228,6 @@
     <Bug pattern="SF_SWITCH_FALLTHROUGH"/>
   </Match>
   <Match>
-    <!-- 1 warning -->
-    <Bug pattern="SF_SWITCH_NO_DEFAULT"/>
-  </Match>
-  <Match>
     <!-- 21 warnings -->
     <Bug pattern="SIC_INNER_SHOULD_BE_STATIC"/>
   </Match>
@@ -289,10 +236,6 @@
     <Bug pattern="SIC_INNER_SHOULD_BE_STATIC_ANON"/>
   </Match>
   <Match>
-    <!-- 1 warning -->
-    <Bug pattern="SIC_INNER_SHOULD_BE_STATIC_NEEDS_THIS"/>
-  </Match>
-  <Match>
     <!-- 5 warnings -->
     <Bug pattern="SR_NOT_CHECKED"/>
   </Match>
@@ -309,10 +252,6 @@
     <Bug pattern="UI_INHERITANCE_UNSAFE_GETRESOURCE"/>
   </Match>
   <Match>
-    <!-- 1 warning -->
-    <Bug pattern="UMAC_UNCALLABLE_METHOD_OF_ANONYMOUS_CLASS"/>
-  </Match>
-  <Match>
     <!-- 6 warnings -->
     <Bug pattern="UPM_UNCALLED_PRIVATE_METHOD"/>
   </Match>