svn commit: r1811854 - in /uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima: cas/FeatureStructure.java cas/impl/CASImpl.java jcas/cas/FSHashSet.java

[sc...@apache.org]

Author: schor
Date: Wed Oct 11 17:32:07 2017
New Revision: 1811854

URL: http://svn.apache.org/viewvc?rev=1811854&view=rev
Log:
no Jira - make FeatureStructure interface more compatible with v2, add comment to CASImpl, change some fields to private in FSHashSet

Modified:
    uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/FeatureStructure.java
    uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java
    uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSHashSet.java

Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/FeatureStructure.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/FeatureStructure.java?rev=1811854&r1=1811853&r2=1811854&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/FeatureStructure.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/FeatureStructure.java Wed Oct 11 17:32:07 2017
@@ -327,7 +327,7 @@ public interface FeatureStructure extend
    * @return a FeatureStructure that is the cloned copy of this FeatureStructure.
    * @throws CASRuntimeException passthru
    */
-  FeatureStructureImplC clone() throws CASRuntimeException;
+  Object clone() throws CASRuntimeException;
   
   /**
    * Compatibility for v2 code.
@@ -338,5 +338,22 @@ public interface FeatureStructure extend
    */
   int getAddress(); 
   
+  /**
+   * A feature structure is equal to another feature structure iff it is identical in the underlying
+   * representation.
+   * 
+   * @exception ClassCastException
+   *              If <code>o</code> is not a FS.
+   */
+  boolean equals(Object o) throws ClassCastException;
+
+  /**
+   * Will return a hash code that's consistent with equality, i.e., if two FSs are equal, they will
+   * also return the same hash code.
+   * 
+   * @return The hash code.
+   */
+  int hashCode();
+
 }
 

Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java?rev=1811854&r1=1811853&r2=1811854&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java Wed Oct 11 17:32:07 2017
@@ -2479,7 +2479,7 @@ public class CASImpl extends AbstractCas
       if (IS_ALWAYS_HOLD_ONTO_FSS) {
         svd.id2fs.putUnconditionally(fs);  // hold on to it if nothing else is
       } else {
-        svd.id2fs.put(fs);
+        svd.id2fs.put(fs);  // just like above, but has assert that wasn't there previously
       }
     }
     return fs._id;

Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSHashSet.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSHashSet.java?rev=1811854&r1=1811853&r2=1811854&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSHashSet.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSHashSet.java Wed Oct 11 17:32:07 2017
@@ -94,8 +94,8 @@ public class FSHashSet <T extends TOP> e
 
   /* Feature Adjusted Offsets */
 //  public final static int _FI_fsArray = TypeSystemImpl.getAdjustedFeatureOffset("fsArray");
-  public final static CallSite _FC_fsArray = TypeSystemImpl.createCallSite(FSHashSet.class, "fsArray");
-  public final static MethodHandle _FH_fsArray = _FC_fsArray.dynamicInvoker();
+  private final static CallSite _FC_fsArray = TypeSystemImpl.createCallSite(FSHashSet.class, "fsArray");
+  private final static MethodHandle _FH_fsArray = _FC_fsArray.dynamicInvoker();
 
    
   /** Never called.  Disable default constructor