You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2017/03/02 15:05:42 UTC

svn commit: r1785151 - in /uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl: BinaryCasSerDes6.java FeatureStructureImplC.java

Author: schor
Date: Thu Mar  2 15:05:42 2017
New Revision: 1785151

URL: http://svn.apache.org/viewvc?rev=1785151&view=rev
Log:
[UIMA-5346] fix equals and sortCompare

Modified:
    uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes6.java
    uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureStructureImplC.java

Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes6.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes6.java?rev=1785151&r1=1785150&r2=1785151&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes6.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes6.java Thu Mar  2 15:05:42 2017
@@ -3532,10 +3532,10 @@ public class BinaryCasSerDes6 implements
           
         default: 
           Misc.internalError(); 
-          return 0;
+          return Integer.compare(scFs1._id, scFs2._id);
         } // end of switch
       } // end of for loop
-      return 0;
+      return Integer.compare(scFs1._id, scFs2._id);
     } // end of sort compare
       
     private int sortArray(TOP afs1, TOP afs2) {

Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureStructureImplC.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureStructureImplC.java?rev=1785151&r1=1785150&r2=1785151&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureStructureImplC.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureStructureImplC.java Thu Mar  2 15:05:42 2017
@@ -883,6 +883,20 @@ public class FeatureStructureImplC imple
   public int hashCode() {
     return _id;
   }
+  
+  
+
+  /* (non-Javadoc)
+   * @see java.lang.Object#equals(java.lang.Object)
+   * must match hashCode
+   * must match comparator == 0, equal == true
+   */
+  @Override
+  public boolean equals(Object obj) {
+    return (obj instanceof FeatureStructureImplC) &&
+            ((FeatureStructureImplC)obj)._id == this._id;
+  }
+
 
   // ///////////////////////////////////////////////////////////////////////////
   // Pretty printing.