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 2016/06/17 08:56:10 UTC

svn commit: r1748814 - in /poi/trunk/src: java/org/apache/poi/hssf/usermodel/HSSFComment.java ooxml/java/org/apache/poi/xssf/usermodel/XSSFComment.java

Author: onealj
Date: Fri Jun 17 08:56:10 2016
New Revision: 1748814

URL: http://svn.apache.org/viewvc?rev=1748814&view=rev
Log:
bug 59279: add Comment.equals and hashCode methods

Modified:
    poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFComment.java   (contents, props changed)
    poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFComment.java

Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFComment.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFComment.java?rev=1748814&r1=1748813&r2=1748814&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFComment.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFComment.java Fri Jun 17 08:56:10 2016
@@ -320,4 +320,18 @@ public class HSSFComment extends HSSFTex
             setPropertyValue(new EscherSimpleProperty(EscherProperties.GROUPSHAPE__PRINT, false, false, property.getPropertyValue() & GROUP_SHAPE_NOT_HIDDEN_MASK));
         }
     }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof HSSFComment)) {
+            return false;
+        }
+        HSSFComment other = (HSSFComment) obj;
+        return getNoteRecord().equals(other.getNoteRecord());
+    }
+
+    @Override
+    public int hashCode() {
+        return ((getRow()*17) + getColumn())*31;
+    }
 }

Propchange: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFComment.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFComment.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFComment.java?rev=1748814&r1=1748813&r2=1748814&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFComment.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFComment.java Fri Jun 17 08:56:10 2016
@@ -239,4 +239,19 @@ public class XSSFComment implements Comm
     protected CTShape getCTShape(){
         return _vmlShape;
     }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof XSSFComment)) {
+            return false;
+        }
+        XSSFComment other = (XSSFComment) obj;
+        return ((getCTComment() == other.getCTComment()) &&
+                (getCTShape() == other.getCTShape())); 
+    }
+
+    @Override
+    public int hashCode() {
+        return ((getRow()*17) + getColumn())*31;
+    }
 }



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