consolidate findbugs filters using Or logic

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

diff --git a/src/resources/devtools/findbugs-filters.xml b/src/resources/devtools/findbugs-filters.xml
index cb9c4f3607e214c035ef7600e5e65581e3385182..4677ffe633c812bad2b5c93f499628b775bff6a1 100644 (file)
--- a/src/resources/devtools/findbugs-filters.xml
+++ b/src/resources/devtools/findbugs-filters.xml
@@ -29,68 +29,29 @@
 
        <!-- things that were moved or are named equally on purpose -->
        <Match>
-               <Class name="org.apache.poi.hssf.extractor.ExcelExtractor"/>
+               <Or>
+                       <Class name="org.apache.poi.hssf.extractor.ExcelExtractor"/>
+                       <Class name="org.apache.poi.hssf.record.RecordFormatException"/>
+                       <Class name="org.apache.poi.hssf.record.UnicodeString"/>
+                       <Class name="org.apache.poi.hssf.usermodel.HeaderFooter"/>
+                       <Class name="org.apache.poi.hssf.util.AreaReference"/>
+                       <Class name="org.apache.poi.hssf.util.CellRangeAddress"/>
+                       <Class name="org.apache.poi.hssf.util.CellRangeAddressList"/>
+                       <Class name="org.apache.poi.hssf.util.CellReference"/>
+                       <Class name="org.apache.poi.hssf.util.Region"/>
+                       <Class name="org.apache.poi.hwpf.usermodel.CharacterRun"/>
+                       <Class name="org.apache.poi.sl.usermodel.Hyperlink"/>
+                       <Class name="org.apache.poi.ss.usermodel.Hyperlink"/>
+                       <Class name="org.apache.poi.xssf.model.IndexedUDFFinder"/>
+                       <Class name="org.apache.poi.xdgf.exceptions.XDGFException"/>
+               </Or>
                <Bug code="Nm" />
        </Match>
        <Match>
-               <Class name="org.apache.poi.hssf.record.RecordFormatException"/>
-               <Bug code="Nm" />
-       </Match>
-       <Match>
-               <Class name="org.apache.poi.hssf.record.UnicodeString"/>
-               <Bug code="Nm" />
-       </Match>
-       <Match>
-               <Class name="org.apache.poi.hssf.usermodel.HeaderFooter"/>
-               <Bug code="Nm" />
-       </Match>
-       <Match>
-               <Class name="org.apache.poi.hssf.util.AreaReference"/>
-               <Bug code="Nm" />
-       </Match>
-       <Match>
-               <Class name="org.apache.poi.hssf.util.CellRangeAddress"/>
-               <Bug code="Nm" />
-       </Match>
-       <Match>
-               <Class name="org.apache.poi.hssf.util.CellRangeAddressList"/>
-               <Bug code="Nm" />
-       </Match>
-       <Match>
-               <Class name="org.apache.poi.hssf.util.CellReference"/>
-               <Bug code="Nm" />
-       </Match>
-       <Match>
-               <Class name="org.apache.poi.hssf.util.Region"/>
-               <Bug code="Nm" />
-       </Match>
-       <Match>
-               <Class name="org.apache.poi.hwpf.usermodel.CharacterRun"/>
-               <Bug code="Nm" />
-       </Match>
-       <Match>
-               <Class name="org.apache.poi.sl.usermodel.Hyperlink"/>
-               <Bug code="Nm" />
-       </Match>
-       <Match>
-               <Class name="org.apache.poi.ss.usermodel.Hyperlink"/>
-               <Bug code="Nm" />
-       </Match>
-       <Match>
-               <Class name="org.apache.poi.xssf.model.IndexedUDFFinder"/>
-               <Bug code="Nm" />
-       </Match>
-               <Match>
                <Class name="org.apache.poi.hpsf.Decimal"/>
                <Bug pattern="URF_UNREAD_FIELD" />
+               <Field name="field_[12345]_.+" />
        </Match>
-
-       <!-- named this way on purpose -->
-       <Match>
-               <Class name="org.apache.poi.xdgf.exceptions.XDGFException"/>
-               <Bug code="Nm" />
-       </Match>
-    
     <!-- invalid performance issues - e.g. see #57840 -->
     <Match>
         <Class name="org.apache.poi.xssf.usermodel.XSSFRow"/>