svn commit: r1750164 - in /uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl: FSIndexRepositoryImpl.java FsIndex_set_sorted.java

[schor]

Author: schor
Date: Fri Jun 24 21:10:12 2016
New Revision: 1750164

URL: http://svn.apache.org/viewvc?rev=1750164&view=rev
Log:
no Jira - commented out debug code and comment additions

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

Modified: 
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIndexRepositoryImpl.java
URL: 
http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIndexRepositoryImpl.java?rev=1750164&r1=1750163&r2=1750164&view=diff
==============================================================================
--- 
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIndexRepositoryImpl.java
 (original)
+++ 
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIndexRepositoryImpl.java
 Fri Jun 24 21:10:12 2016
@@ -1078,7 +1078,12 @@ public class FSIndexRepositoryImpl imple
      *   bag preferred over sorted; 
      */
     for (int i = 0; i < this.usedIndexes.size(); i++) {
+//      // debug
+//      int vs1 = v.size();
       getNonSetSingleIndexForUsedType(i).bulkAddTo(v);
+//      for (int di = vs1; di < v.size(); di ++) {  // debug
+//        assert v.get(di) != null;                 // debug verify not null
+//      }
     }  
    
     return (List<T>) v;

Modified: 
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_set_sorted.java
URL: 
http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_set_sorted.java?rev=1750164&r1=1750163&r2=1750164&view=diff
==============================================================================
--- 
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_set_sorted.java
 (original)
+++ 
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_set_sorted.java
 Fri Jun 24 21:10:12 2016
@@ -200,7 +200,7 @@ public class FsIndex_set_sorted<T extend
 //        largestItemNotYetAdded = fs;
 //        return;
 //      }       
-////      maybeProcessBulkAdds();
+////      maybeProcessBulkAdds(); // moved to OrderedFsSet_array class
 //    }
 //    
     // past the initial load, or item is not > previous largest item to be 
added 
@@ -232,7 +232,7 @@ public class FsIndex_set_sorted<T extend
    */
   @Override
   public T find(FeatureStructure templateKey) {
-//    maybeProcessBulkAdds();
+//    maybeProcessBulkAdds(); // moved to OrderedFsSet_array class
     if (null == templateKey || this.indexedFSs.isEmpty()) {
       return null;
     }
@@ -265,7 +265,7 @@ public class FsIndex_set_sorted<T extend
   }
 
   public T findLeftmost(TOP templateKey) {
-//    maybeProcessBulkAdds();
+//    maybeProcessBulkAdds(); // moved to OrderedFsSet_array class
     // descending iterator over elements LessThan templateKey
     // iterator is over TOP, not T, to make compare easier
     Iterator<TOP> it = indexedFSs.headSet(templateKey, 
false).descendingIterator();
@@ -307,13 +307,13 @@ public class FsIndex_set_sorted<T extend
    */
   @Override
   public boolean deleteFS(T fs) {
-//    maybeProcessBulkAdds();
+//    maybeProcessBulkAdds(); // moved to OrderedFsSet_array class
     return this.indexedFSs.remove(fs);
   }
   
   @Override
   protected void bulkAddTo(List<T> v) {
-//    maybeProcessBulkAdds();
+//    maybeProcessBulkAdds(); // moved to OrderedFsSet_array class
     v.addAll((Collection<? extends T>) indexedFSs);
   }
   
@@ -323,13 +323,13 @@ public class FsIndex_set_sorted<T extend
 //  }
   
   NavigableSet<T> getNavigableSet() { //used by FsIterator_set_sorted to 
compute various derivitive nav sets
-//    maybeProcessBulkAdds();
+//    maybeProcessBulkAdds(); // moved to OrderedFsSet_array class
     return (NavigableSet<T>) indexedFSs;
   }
    
   @Override
   public FSIterator<T> iterator() {
-//    maybeProcessBulkAdds();
+//    maybeProcessBulkAdds(); // moved to OrderedFsSet_array class
     return new FsIterator_set_sorted<T>(this, type, this);
   }