add toString() methods to PieceDescriptor and TextPiece; add hashCode() to PieceDescr...

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

diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/PieceDescriptor.java b/src/scratchpad/src/org/apache/poi/hwpf/model/PieceDescriptor.java
index 2af7b7a6f3ee76887d842f30dda843453169617e..5d3c50911b697bf108c00d0d310908f5dadbc92a 100644 (file)
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/PieceDescriptor.java
+++ b/src/scratchpad/src/org/apache/poi/hwpf/model/PieceDescriptor.java
@@ -97,10 +97,40 @@ public final class PieceDescriptor
     return 8;
   }
 
-  public boolean equals(Object o)
-  {
-    PieceDescriptor pd = (PieceDescriptor)o;
+    @Override
+    public int hashCode()
+    {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + descriptor;
+        result = prime * result + prm;
+        result = prime * result + ( unicode ? 1231 : 1237 );
+        return result;
+    }
 
-    return descriptor == pd.descriptor && prm == pd.prm && unicode == pd.unicode;
-  }
+    @Override
+    public boolean equals( Object obj )
+    {
+        if ( this == obj )
+            return true;
+        if ( obj == null )
+            return false;
+        if ( getClass() != obj.getClass() )
+            return false;
+        PieceDescriptor other = (PieceDescriptor) obj;
+        if ( descriptor != other.descriptor )
+            return false;
+        if ( prm != other.prm )
+            return false;
+        if ( unicode != other.unicode )
+            return false;
+        return true;
+    }
+
+    @Override
+    public String toString()
+    {
+        return "PieceDescriptor (pos: " + getFilePosition() + "; "
+                + ( isUnicode() ? "unicode" : "non-unicode" ) + ")";
+    }
 }

diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/TextPiece.java b/src/scratchpad/src/org/apache/poi/hwpf/model/TextPiece.java
index d7bb2984b56c311420bc078c447992a249a9cc0e..1ae5f604d291120b2f8c8bdf71ece69f82d0194c 100644 (file)
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/TextPiece.java
+++ b/src/scratchpad/src/org/apache/poi/hwpf/model/TextPiece.java
@@ -185,4 +185,10 @@ public final class TextPiece extends PropertyNode implements Comparable
    {
      return getStart();
    }
+
+    public String toString()
+    {
+        return "TextPiece from " + getStart() + " to " + getEnd() + " ("
+                + getPieceDescriptor() + ")";
+    }
 }