svn commit: r1678362 - in /uima/uimaj/trunk/uimaj-core/src: main/java/org/apache/uima/cas/impl/UnambiguousIteratorImpl.java test/java/org/apache/uima/cas/test/SubiteratorTest.java

[schor]

Author: schor
Date: Fri May  8 14:31:00 2015
New Revision: 1678362

URL: http://svn.apache.org/r1678362
Log:
[UIMA-4385] remove UnambiguousIteratorImpl class, fix one test case that ref'd 
it to use the actual impl.

Removed:
    
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/UnambiguousIteratorImpl.java
Modified:
    
uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/SubiteratorTest.java

Modified: 
uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/SubiteratorTest.java
URL: 
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/SubiteratorTest.java?rev=1678362&r1=1678361&r2=1678362&view=diff
==============================================================================
--- 
uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/SubiteratorTest.java
 (original)
+++ 
uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/SubiteratorTest.java
 Fri May  8 14:31:00 2015
@@ -28,7 +28,6 @@ import org.apache.uima.UIMAFramework;
 import org.apache.uima.analysis_engine.AnalysisEngine;
 import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
 import org.apache.uima.cas.FSIterator;
-import org.apache.uima.cas.impl.UnambiguousIteratorImpl;
 import org.apache.uima.cas.text.AnnotationIndex;
 import org.apache.uima.jcas.JCas;
 import org.apache.uima.jcas.tcas.Annotation;
@@ -118,8 +117,11 @@ public class SubiteratorTest extends Tes
     Annotation sentence = 
jcas.getAnnotationIndex(Sentence.class).iterator().next();
     FSIterator<Token> tokenIterator = tokenIndex.subiterator(sentence);
     Annotation token = tokenIndex.iterator().next();
-    tokenIterator.moveTo(token); //throws ClassCastException    
-    UnambiguousIteratorImpl<Token> it = new 
UnambiguousIteratorImpl<Token>(tokenIndex.iterator());
+    tokenIterator.moveTo(token); //throws ClassCastException 
+    
+    // check unambiguous iterator creation
+    
+    FSIterator<Token> it = tokenIndex.iterator(false);
     it.moveTo(token);
   }