From 1853126f9b9ca8b09b09a35f3ac43453d13234ed Mon Sep 17 00:00:00 2001
From: Javen O'Neal <onealj@apache.org>
Date: Mon, 13 Jun 2016 04:42:59 +0000
Subject: [PATCH] findbugs: fix URF_UNREAD_FIELD warnings

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1748084 13f79535-47bb-0310-9956-ffa450edef68
---
 .../usermodel/HSSFDataValidationHelper.java   |  6 ++---
 .../poi/hssf/usermodel/HSSFTextbox.java       |  3 ++-
 .../usermodel/XSSFDataValidationHelper.java   |  5 ++--
 .../poi/xssf/usermodel/XSSFGraphicFrame.java  |  3 ++-
 src/resources/devtools/findbugs-filters.xml   | 27 ++++++++++++++-----
 5 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFDataValidationHelper.java b/src/java/org/apache/poi/hssf/usermodel/HSSFDataValidationHelper.java
index dd24bc416..a6990f3e2 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFDataValidationHelper.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFDataValidationHelper.java
@@ -27,12 +27,12 @@ import org.apache.poi.ss.util.CellRangeAddressList;
  * Helper for working with Data Validation
  */
 public class HSSFDataValidationHelper implements DataValidationHelper {
-	@SuppressWarnings("unused")
-	private HSSFSheet sheet;
+	//URF_UNREAD_FIELD
+	//private HSSFSheet sheet;
 	
 	public HSSFDataValidationHelper(HSSFSheet sheet) {
 		super();
-		this.sheet = sheet;
+		//this.sheet = sheet;
 	}
 
 	/*
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFTextbox.java b/src/java/org/apache/poi/hssf/usermodel/HSSFTextbox.java
index f8f81c1f0..0dd4533e3 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFTextbox.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFTextbox.java
@@ -48,7 +48,8 @@ public class HSSFTextbox extends HSSFSimpleShape {
         super(spContainer, objRecord, textObjectRecord);
     }
 
-    HSSFRichTextString string = new HSSFRichTextString("");
+    //Unused: URF_UNREAD_FIELD
+    //HSSFRichTextString string = new HSSFRichTextString("");
 
     /**
      * Construct a new textbox with the given parent and anchor.
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDataValidationHelper.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDataValidationHelper.java
index d86911035..98b2a84d7 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDataValidationHelper.java
+++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDataValidationHelper.java
@@ -35,12 +35,13 @@ import org.openxmlformats.schemas.spreadsheetml.x2006.main.STDataValidationType;
  *
  */
 public class XSSFDataValidationHelper implements DataValidationHelper {
-	private XSSFSheet xssfSheet;
+    //Unused: URF_UNREAD_FIELD
+	//private XSSFSheet xssfSheet;
 	
     
     public XSSFDataValidationHelper(XSSFSheet xssfSheet) {
 		super();
-		this.xssfSheet = xssfSheet;
+		//this.xssfSheet = xssfSheet;
 	}
 
 	/* (non-Javadoc)
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFGraphicFrame.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFGraphicFrame.java
index f26f3eb50..4c0811f79 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFGraphicFrame.java
+++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFGraphicFrame.java
@@ -43,7 +43,8 @@ public final class XSSFGraphicFrame extends XSSFShape {
 	private static CTGraphicalObjectFrame prototype = null;
 
 	private CTGraphicalObjectFrame graphicFrame;
-	private XSSFDrawing drawing;
+	// Unused: URF_UNREAD_FIELD
+	//private XSSFDrawing drawing;
 	private XSSFClientAnchor anchor;
 
 	/**
diff --git a/src/resources/devtools/findbugs-filters.xml b/src/resources/devtools/findbugs-filters.xml
index 4677ffe63..b2152bcf4 100644
--- a/src/resources/devtools/findbugs-filters.xml
+++ b/src/resources/devtools/findbugs-filters.xml
@@ -47,18 +47,31 @@
 		</Or>
 		<Bug code="Nm" />
 	</Match>
+
+	<!-- ignore fields that correspond to the values in a H??F binary record -->
 	<Match>
-		<Class name="org.apache.poi.hpsf.Decimal"/>
+		<Class name="~org\.apache\.poi\.h..f\..*"/>
 		<Bug pattern="URF_UNREAD_FIELD" />
-		<Field name="field_[12345]_.+" />
+		<Field name="~field_[12345].*" />
 	</Match>
+	<Match>
+		<Class name="org.apache.poi.hssf.usermodel.HSSFChart"/>
+		<Bug pattern="URF_UNREAD_FIELD" />
+		<Field name="chartTitleFormat" />
+	</Match>
+	<Match>
+		<Class name="org.apache.poi.hwmf.record.HwmfWindowing"/>
+		<Bug pattern="URF_UNREAD_FIELD" />
+		<Field name="count2" />
+	</Match>
+	
+
     <!-- invalid performance issues - e.g. see #57840 -->
     <Match>
-        <Class name="org.apache.poi.xssf.usermodel.XSSFRow"/>
-        <Bug pattern="DM_NUMBER_CTOR" />
-    </Match>
-    <Match>
-        <Class name="org.apache.poi.xssf.usermodel.XSSFSheet"/>
+        <Or>
+            <Class name="org.apache.poi.xssf.usermodel.XSSFRow"/>
+            <Class name="org.apache.poi.xssf.usermodel.XSSFSheet"/>
+        </Or>
         <Bug pattern="DM_NUMBER_CTOR" />
     </Match>