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 2020/11/10 07:03:57 UTC

[uima-uimaj] 01/01: Merge pull request #84 from apache/bugfix/UIMA-6294-SelectFS-at-annotation-does-not-return-the-correct-result

This is an automated email from the ASF dual-hosted git repository.

rec pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git

commit f239f41e73d6a381f893e60588fd32bee60f145e
Merge: cf73cf3 3e102f7
Author: Richard Eckart de Castilho <re...@apache.org>
AuthorDate: Tue Nov 10 08:03:47 2020 +0100

    Merge pull request #84 from apache/bugfix/UIMA-6294-SelectFS-at-annotation-does-not-return-the-correct-result
    
    [UIMA-6294] SelectFS.at(annotation) does not return the correct result

 .../annotation_predicates/annotation-relations.ods | Bin 18737 -> 67477 bytes
 .../annotation_predicates/annotation-relations.png | Bin 375980 -> 328700 bytes
 uimaj-core/pom.xml                                 |   5 -
 .../apache/uima/cas/impl/FsIndex_annotation.java   |   9 +-
 .../uima/cas/impl/FsIterator_set_sorted2.java      |   5 +-
 .../org/apache/uima/cas/impl/SelectFSs_impl.java   |   3 +-
 .../java/org/apache/uima/cas/impl/Subiterator.java | 213 +++++++++++-------
 .../apache/uima/cas/text/AnnotationPredicates.java |  12 +-
 .../org/apache/uima/cas/impl/SelectFsAssert.java   | 158 ++++++++++---
 .../cas/impl/SelectFsPredicateAlignmentTest.java   | 246 ++++++++++-----------
 .../org/apache/uima/cas/impl/SelectFsTest.java     | 243 +++++++++++++++++++-
 .../uima/cas/test/AnnotationIteratorTest.java      | 118 ++++++++--
 .../uima/cas/text/AnnotationPredicateTestData.java |  56 ++---
 13 files changed, 765 insertions(+), 303 deletions(-)