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

[sc...@apache.org]

Author: schor
Date: Wed Oct 26 14:06:13 2016
New Revision: 1766687

URL: http://svn.apache.org/viewvc?rev=1766687&view=rev
Log:
no Jira - commented out first pass at some unique id impls

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

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=1766687&r1=1766686&r2=1766687&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 Wed Oct 26 14:06:13 2016
@@ -235,6 +235,12 @@ public class FeatureStructureImplC imple
     if (traceFSs && !(this instanceof CommonArray)) {
       _casView.traceFSCreate(this);
     }
+    
+//    if (_typeImpl.featUimaUID != null) {
+//      final int id = _casView.getAndIncrUimaUID();
+//      _setLongValueNcNj(_typeImpl.featUimaUID, id);
+//      _casView.add2uid2fs(id, (TOP)this);
+//    }
   }
   
   private int[] _allocIntData() {

Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeImpl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeImpl.java?rev=1766687&r1=1766686&r2=1766687&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeImpl.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeImpl.java Wed Oct 26 14:06:13 2016
@@ -82,6 +82,7 @@ public class TypeImpl implements Type, C
   
   protected final boolean isLongOrDouble;  // for code generation
   
+  
   int nbrOfLongOrDoubleFeatures = 0; 
   
   /**
@@ -150,6 +151,8 @@ public class TypeImpl implements Type, C
   // for journalling allocation: This is a 0-based offset for all features in feature order
   int highestOffset = -1;
   
+//  FeatureImpl featUimaUID = null;  // null or the feature named uimaUID with range type long
+
   private TypeImpl() {
     this.name = null;
     this.shortName = null;
@@ -543,6 +546,12 @@ public class TypeImpl implements Type, C
 
     staticMergedFeatures.put(fi.getShortName(), fi);
     staticMergedFeaturesIntroducedByThisType.add(fi);
+    
+//    if (fi.getShortName().equals(CAS.FEATURE_BASE_NAME_UIMA_UID) &&
+//        fi.getRangeImpl().getName().equals(CAS.TYPE_NAME_LONG)) {
+//      featUimaUID = fi;
+//    }
+    
 //    List<FeatureImpl> featuresSharingRange = getFeaturesSharingRange(fi.getRange());
 //    if (featuresSharingRange == null) {
 //      featuresSharingRange = new ArrayList<>();

Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemImpl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemImpl.java?rev=1766687&r1=1766686&r2=1766687&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemImpl.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemImpl.java Wed Oct 26 14:06:13 2016
@@ -2570,5 +2570,26 @@ public class TypeSystemImpl implements T
       return g;
     }
   }
+  
+//  /**
+//   * Get a list of types which have OID feature, filtered down to being just the top-most
+//   * (in the type hierarchy)
+//   */
+//  public List<TypeImpl> getTopOidTypes() {
+//    List<TypeImpl> r = new ArrayList<>();
+//    
+//   outer:
+//    for (TypeImpl t : types) {
+//      if (t.featUimaUID != null) {
+//        for (TypeImpl prev : r) {
+//          if (prev.subsumes(t)) {
+//            continue outer;
+//          }
+//        }
+//        r.add(t);
+//      }
+//    }
+//    return r;
+//  }
 
 }