You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by re...@apache.org on 2021/01/20 09:32:20 UTC
[uima-uimaj] 01/01: Merge pull request #85 from
apache/bugfix/UIMA-6296-SelectFS-fsIterator-may-yield-different-result-set-than-asList
This is an automated email from the ASF dual-hosted git repository.
rec pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
commit bb9e3b4a18f8288327c98903819d1ac217bfbd32
Merge: 8fe9924 254361a
Author: Richard Eckart de Castilho <re...@apache.org>
AuthorDate: Wed Jan 20 10:32:13 2021 +0100
Merge pull request #85 from apache/bugfix/UIMA-6296-SelectFS-fsIterator-may-yield-different-result-set-than-asList
[UIMA-6296] SelectFS fsIterator may yield different result set than asList
uima-doc-v3-users-guide/pom.xml | 2 +-
.../annotation-relations-definition.png | Bin 0 -> 195446 bytes
.../annotation-relations-table.png | Bin 0 -> 278179 bytes
.../annotation_predicates/annotation-relations.ods | Bin 67477 -> 83417 bytes
.../docs/asciidoc/uv3.annotation_predicates.adoc | 30 +-
.../docs/asciidoc/uv3.backwards_compatibility.adoc | 12 +-
.../src/docs/asciidoc/uv3.select.adoc | 129 ++-
.../main/java/org/apache/uima/cas/SelectFSs.java | 3 +-
.../org/apache/uima/cas/impl/FilteredIterator.java | 2 -
.../apache/uima/cas/impl/FsIndex_annotation.java | 17 +-
.../apache/uima/cas/impl/FsIterator_backwards.java | 10 +-
.../apache/uima/cas/impl/FsIterator_limited.java | 143 ++-
.../uima/cas/impl/FsIterator_set_sorted2.java | 6 +-
.../uima/cas/impl/FsIterator_subtypes_ordered.java | 117 +-
.../org/apache/uima/cas/impl/SelectFSs_impl.java | 453 +++++---
.../java/org/apache/uima/cas/impl/Subiterator.java | 656 +++++++-----
.../apache/uima/cas/text/AnnotationPredicates.java | 21 +-
.../cas/{test => impl}/AnnotationIteratorTest.java | 172 ++-
.../org/apache/uima/cas/impl/SelectFsAssert.java | 763 +++++++++++--
.../cas/impl/SelectFsPredicateAlignmentTest.java | 243 ++++-
.../org/apache/uima/cas/impl/SelectFsTest.java | 1120 +++++++++++++++++++-
.../uima/cas/text/AnnotationPredicateTestData.java | 11 +-
.../uima/cas/text/AnnotationPredicatesTest.java | 59 +-
.../cas/text/AxiomaticAnnotationPredicates.java | 78 ++
24 files changed, 3267 insertions(+), 780 deletions(-)