svn commit: r1803732 - in /uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl: FsIterator_multiple_indexes.java FsIterator_set_sorted2.java FsIterator_singletype.java

[sc...@apache.org]

Author: schor
Date: Wed Aug  2 02:00:09 2017
New Revision: 1803732

URL: http://svn.apache.org/viewvc?rev=1803732&view=rev
Log:
no Jira - rename a method to remind users of its actual meaning, update toString

Modified:
    uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_multiple_indexes.java
    uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_set_sorted2.java
    uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_singletype.java

Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_multiple_indexes.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_multiple_indexes.java?rev=1803732&r1=1803731&r2=1803732&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_multiple_indexes.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_multiple_indexes.java Wed Aug  2 02:00:09 2017
@@ -73,9 +73,9 @@ public abstract class FsIterator_multipl
         
     ArrayList<LowLevelIterator<T>> emptyIteratorsAl = new ArrayList<>();
     ArrayList<LowLevelIterator<T>> nonEmptyIteratorsAl = new ArrayList<>();
-    
     for (LowLevelIterator<T> it : allIterators) {
-      if (it.ll_indexSize() == 0) {
+      LowLevelIndex<T> idx = it.ll_getIndex();
+      if (idx == null || idx.size() == 0) {
         emptyIteratorsAl.add(it);  
       } else {
         nonEmptyIteratorsAl.add(it); 
@@ -110,10 +110,10 @@ public abstract class FsIterator_multipl
    * @see org.apache.uima.cas.impl.LowLevelIterator#ll_indexSize()
    */
   @Override
-  public int ll_indexSize() {
+  public int ll_indexSizeMaybeNotCurrent() {
     int sz = 0;
     for (LowLevelIterator<T> it : nonEmptyIterators) {
-      sz += it.ll_indexSize();      
+      sz += it.ll_indexSizeMaybeNotCurrent();      
     }
     return sz;
   }

Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_set_sorted2.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_set_sorted2.java?rev=1803732&r1=1803731&r2=1803732&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_set_sorted2.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_set_sorted2.java Wed Aug  2 02:00:09 2017
@@ -166,7 +166,7 @@ class FsIterator_set_sorted2<T extends F
    * @see org.apache.uima.cas.impl.LowLevelIterator#ll_indexSize()
    */
   @Override
-  public int ll_indexSize() {
+  public int ll_indexSizeMaybeNotCurrent() {
     return ofsa.size();
   }
 

Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_singletype.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_singletype.java?rev=1803732&r1=1803731&r2=1803732&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_singletype.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_singletype.java Wed Aug  2 02:00:09 2017
@@ -94,7 +94,7 @@ public abstract class FsIterator_singlet
     Type type = ti;
     StringBuilder sb = new StringBuilder(this.getClass().getSimpleName()).append(":").append(System.identityHashCode(this));
     sb.append(" over Type: ").append(type.getName()).append(":").append(ti.getCode());
-    sb.append(", index size: ").append(this.ll_indexSize());
+    sb.append(", index size (may not match current index size): ").append(this.ll_indexSizeMaybeNotCurrent());
     return sb.toString();
   }