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 2017/10/17 13:17:07 UTC
svn commit: r1812400 - in
/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas:
FSIterator.java impl/FsIndex_iicp.java impl/FsIndex_singletype.java
impl/FsIndex_snapshot.java
Author: schor
Date: Tue Oct 17 13:17:07 2017
New Revision: 1812400
URL: http://svn.apache.org/viewvc?rev=1812400&view=rev
Log:
[UIMA-5619] FSIndex impl Collection, cleanup supers of FSIterator
Modified:
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/FSIterator.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_iicp.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_singletype.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_snapshot.java
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/FSIterator.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/FSIterator.java?rev=1812400&r1=1812399&r2=1812400&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/FSIterator.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/FSIterator.java Tue Oct 17 13:17:07 2017
@@ -20,7 +20,6 @@
package org.apache.uima.cas;
import java.util.ConcurrentModificationException;
-import java.util.Iterator;
import java.util.ListIterator;
import java.util.NoSuchElementException;
import java.util.Spliterator;
@@ -71,7 +70,7 @@ import org.apache.uima.cas.impl.LowLevel
* {@link FSIterator#moveToLast() moveToLast()} in such cases.
*
*/
-public interface FSIterator<T extends FeatureStructure> extends ListIterator<T>, Iterable<T>{
+public interface FSIterator<T extends FeatureStructure> extends ListIterator<T> {
/**
* Check if this iterator is valid.
@@ -312,8 +311,4 @@ public interface FSIterator<T extends Fe
((LowLevelIterator<T>)this).ll_remove();
}
- @Override
- default Iterator<T> iterator() {
- return 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=1812400&r1=1812399&r2=1812400&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 Oct 17 13:17:07 2017
@@ -19,6 +19,7 @@
package org.apache.uima.cas.impl;
+import java.util.AbstractCollection;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
@@ -48,6 +49,7 @@ import org.apache.uima.jcas.cas.TOP;
* For Internal Use
*/
class FsIndex_iicp<T extends FeatureStructure>
+ extends AbstractCollection<T>
implements Comparable<FsIndex_iicp<? extends FeatureStructure>>,
Comparator<FeatureStructure>,
LowLevelIndex<T> {
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_singletype.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_singletype.java?rev=1812400&r1=1812399&r2=1812400&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_singletype.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_singletype.java Tue Oct 17 13:17:07 2017
@@ -20,6 +20,7 @@
package org.apache.uima.cas.impl;
import java.lang.ref.WeakReference;
+import java.util.AbstractCollection;
import java.util.Comparator;
import java.util.List;
import java.util.WeakHashMap;
@@ -34,8 +35,6 @@ import org.apache.uima.cas.admin.LinearT
import org.apache.uima.internal.util.Misc;
import org.apache.uima.jcas.cas.TOP;
-import com.strobel.core.IStrongBox;
-
/**
* The common (among all index kinds - set, sorted, bag) info for an index over
* 1 type (excluding subtypes)
@@ -47,7 +46,8 @@ import com.strobel.core.IStrongBox;
* the Java cover class type for this index, passed along to (wrapped)
* iterators producing Java cover classes
*/
-public abstract class FsIndex_singletype<T extends FeatureStructure>
+public abstract class FsIndex_singletype<T extends FeatureStructure>
+ extends AbstractCollection<T>
implements Comparator<FeatureStructure>, LowLevelIndex<T> {
private final static String[] indexTypes = new String[] {
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_snapshot.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_snapshot.java?rev=1812400&r1=1812399&r2=1812400&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_snapshot.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_snapshot.java Tue Oct 17 13:17:07 2017
@@ -19,6 +19,7 @@
package org.apache.uima.cas.impl;
+import java.util.AbstractCollection;
import java.util.Comparator;
import org.apache.uima.cas.FSIndex;
@@ -31,7 +32,9 @@ import org.apache.uima.jcas.cas.TOP;
* Implementation of light-weight wrapper of normal indexes, which support special kinds of iterators
* base on the setting of IteratorExtraFunction
*/
-public class FsIndex_snapshot <T extends FeatureStructure> implements LowLevelIndex<T>, Comparator<FeatureStructure> {
+public class FsIndex_snapshot <T extends FeatureStructure>
+ extends AbstractCollection<T>
+ implements LowLevelIndex<T>, Comparator<FeatureStructure> {
/**
* wrapped index