svn commit: r1802315 - in /uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl: FsIndex_bag.java FsIndex_flat.java FsIndex_iicp.java

[sc...@apache.org]

Author: schor
Date: Tue Jul 18 15:50:51 2017
New Revision: 1802315

URL: http://svn.apache.org/viewvc?rev=1802315&view=rev
Log:
no Jira, specialize the return type for iterator to most specific.

Modified:
    uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_bag.java
    uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_flat.java
    uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_iicp.java

Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_bag.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_bag.java?rev=1802315&r1=1802314&r2=1802315&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_bag.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_bag.java Tue Jul 18 15:50:51 2017
@@ -22,7 +22,6 @@ package org.apache.uima.cas.impl;
 import java.util.Collection;
 import java.util.List;
 
-import org.apache.uima.cas.FSIterator;
 import org.apache.uima.cas.FeatureStructure;
 import org.apache.uima.cas.Type;
 import org.apache.uima.cas.admin.FSIndexComparator;
@@ -204,7 +203,7 @@ public class FsIndex_bag<T extends Featu
    * @see org.apache.uima.cas.FSIndex#iterator()
    */
   @Override
-  public FSIterator<T> iterator() {
+  public FsIterator_bag<T> iterator() {
     CopyOnWriteIndexPart cow_index_wrapper = getNonNullCow();
     return casImpl.inPearContext()
              ? new FsIterator_bag_pear<>(this, type, cow_index_wrapper)

Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_flat.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_flat.java?rev=1802315&r1=1802314&r2=1802315&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_flat.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_flat.java Tue Jul 18 15:50:51 2017
@@ -86,7 +86,7 @@ public class FsIndex_flat<T extends Feat
    * @see org.apache.uima.cas.FSIndex#iterator()
    */
   @Override
-  public FSIterator<T> iterator() {
+  public LowLevelIterator<T> iterator() {
     return new FsIterator_subtypes_snapshot<T>(this);
   }
 

Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_iicp.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_iicp.java?rev=1802315&r1=1802314&r2=1802315&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_iicp.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_iicp.java Tue Jul 18 15:50:51 2017
@@ -262,6 +262,7 @@ class FsIndex_iicp<T extends FeatureStru
     return size;
   }
   
+  @Override
   public int ll_maxAnnotSpan() {
     createIndexIteratorCache();  // does nothing if already created
     int span = -1;
@@ -465,11 +466,11 @@ class FsIndex_iicp<T extends FeatureStru
              : new FsIterator_aggregation_common<T>(new FsIterator_subtypes_unordered<T>(this).allIterators, fsIndex_singletype);
   } 
   
-  public FSIterator<T> iteratorUnordered() {
+  public LowLevelIterator<T> iteratorUnordered() {
     createIndexIteratorCache();  
     
     return (cachedSubFsLeafIndexes.length == 1)
-           ? (FSIterator<T>) fsIndex_singletype.iterator()
+           ? (FsIterator_singletype<T>) fsIndex_singletype.iterator()
            : new FsIterator_aggregation_common<T>(new FsIterator_subtypes_unordered<T>(this).allIterators, fsIndex_singletype); 
   }