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 2015/12/29 18:01:15 UTC
svn commit: r1722188 -
/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/Subiterator.java
Author: schor
Date: Tue Dec 29 17:01:14 2015
New Revision: 1722188
URL: http://svn.apache.org/viewvc?rev=1722188&view=rev
Log:
[UIMA-4669] undo some changes to more specific types, to achieve better backwards compatibility
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/Subiterator.java
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/Subiterator.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/Subiterator.java?rev=1722188&r1=1722187&r2=1722188&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/Subiterator.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/Subiterator.java Tue Dec 29 17:01:14 2015
@@ -202,13 +202,13 @@ public class Subiterator<T extends Annot
* adjusted for strict exclusions
*/
private void movePastAnnot() {
- Comparator<TOP> annotationComparator = getAnnotationComparator();
- while (isValid() && (0 == annotationComparator.compare(boundingAnnotation, (TOP) it.get()))) {
+ Comparator<FeatureStructure> annotationComparator = getAnnotationComparator();
+ while (isValid() && (0 == annotationComparator.compare(boundingAnnotation, it.get()))) {
it.moveToNext();
}
}
- private Comparator<TOP> getAnnotationComparator() {
+ private Comparator<FeatureStructure> getAnnotationComparator() {
return fsIndexRepo.getAnnotationFsComparator();
}
@@ -418,7 +418,7 @@ public class Subiterator<T extends Annot
convertToListForm();
}
if (isListForm) {
- Comparator<TOP> annotationComparator = getAnnotationComparator();
+ Comparator<FeatureStructure> annotationComparator = getAnnotationComparator();
pos = Collections.binarySearch(this.list, (Annotation) fs, annotationComparator);
if (pos >= 0) {
if (!isValid()) {