You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by on...@apache.org on 2015/11/29 15:33:29 UTC

svn commit: r1717068 - in /poi/trunk/src/ooxml/java/org/apache/poi/xssf: streaming/SXSSFRow.java usermodel/XSSFRow.java

Author: onealj
Date: Sun Nov 29 14:33:28 2015
New Revision: 1717068

URL: http://svn.apache.org/viewvc?rev=1717068&view=rev
Log:
findbugs: add missing equals and hashCode for classes with a compareTo method

Modified:
    poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFRow.java
    poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRow.java

Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFRow.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFRow.java?rev=1717068&r1=1717067&r2=1717068&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFRow.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFRow.java Sun Nov 29 14:33:28 2015
@@ -537,5 +537,25 @@ public class SXSSFRow implements Row, Co
         Integer otherRow = other.getRowNum();
         return thisRow.compareTo(otherRow);
     }
+
+    @Override
+    public boolean equals(Object obj)
+    {
+        if (!(obj instanceof SXSSFRow))
+        {
+            return false;
+        }
+        SXSSFRow other = (SXSSFRow) obj;
+
+        return (this.getRowNum() == other.getRowNum()) &&
+               (this.getSheet() == other.getSheet());
+    }
+
+    @Override
+    public int hashCode() {
+        return (getSheet().hashCode() << 16) + getRowNum();
+    }
+
+
 }
 

Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRow.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRow.java?rev=1717068&r1=1717067&r2=1717068&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRow.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRow.java Sun Nov 29 14:33:28 2015
@@ -149,6 +149,24 @@ public class XSSFRow implements Row, Com
         return thisRow.compareTo(otherRow);
     }
 
+    @Override
+    public boolean equals(Object obj)
+    {
+        if (!(obj instanceof XSSFRow))
+        {
+            return false;
+        }
+        XSSFRow other = (XSSFRow) obj;
+
+        return (this.getRowNum() == other.getRowNum()) &&
+               (this.getSheet() == other.getSheet());
+    }
+
+    @Override
+    public int hashCode() {
+        return _row.hashCode();
+    }
+
     /**
      * Use this to create new cells within the row and return it.
      * <p>



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org