You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2016/05/06 20:33:34 UTC
svn commit: r1742616 - in
/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl:
FSIndexRepositoryImpl.java FsIterator_subtypes.java
Author: schor
Date: Fri May 6 20:33:34 2016
New Revision: 1742616
URL: http://svn.apache.org/viewvc?rev=1742616&view=rev
Log:
[UIMA-4674] remove redundant empty fs iterator definition
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/FsIterator_subtypes.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=1742616&r1=1742615&r2=1742616&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 May 6 20:33:34 2016
@@ -1390,7 +1390,7 @@ public class FSIndexRepositoryImpl imple
getAllIndexedFS(type, iteratorList);
final int iteratorListSize = iteratorList.size();
if (iteratorListSize == 0) {
- return (LowLevelIterator<T>) FsIterator_subtypes.FS_ITERATOR_EMPTY;
+ return (LowLevelIterator<T>) LowLevelIterator.FS_ITERATOR_LOW_LEVEL_EMPTY;
}
if (iteratorListSize == 1) {
return iteratorList.get(0);
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_subtypes.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_subtypes.java?rev=1742616&r1=1742615&r2=1742616&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_subtypes.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_subtypes.java Fri May 6 20:33:34 2016
@@ -51,31 +51,6 @@ public abstract class FsIterator_subtype
public int ll_indexSize() {
return ll_getIndex().size();
}
-
- final static FsIterator_subtypes<TOP> FS_ITERATOR_EMPTY = new FsIterator_subtypes<TOP>(null) {
- @Override
- public boolean isValid() {return false;}
- @Override
- public TOP get() throws NoSuchElementException { throw new NoSuchElementException(); }
- @Override
- public TOP getNvc() { throw new NoSuchElementException(); }
- @Override
- public void moveToNext() {}
- @Override
- public void moveToNextNvc() {}
- @Override
- public void moveToPrevious() {}
- @Override
- public void moveToFirst() {}
- @Override
- public void moveToLast() {}
- @Override
- public void moveTo(FeatureStructure fs) {}
- @Override
- public FSIterator<TOP> copy() { return this; }
- @Override
- public int ll_indexSize() { return 0; }
- };
@Override
public String toString() {