You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by pk...@apache.org on 2020/10/12 08:08:01 UTC
[uima-ruta] 01/01: Merge branch 'master' into
UIMA-6268-internal-indexing
This is an automated email from the ASF dual-hosted git repository.
pkluegl pushed a commit to branch UIMA-6268-internal-indexing
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git
commit 3933cc4c8c6c93c093e59607998122d59457dad0
Merge: cf62401 7fa68db
Author: Peter Klügl <pe...@averbis.com>
AuthorDate: Mon Oct 12 10:06:38 2020 +0200
Merge branch 'master' into UIMA-6268-internal-indexing
# Conflicts:
# ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java
README | 5 +-
RELEASE_NOTES.html | 25 ++-
.../ruta-ep-example-extensions/.gitignore | 2 +-
.../ruta-ep-example-extensions/pom.xml | 2 +-
example-projects/ruta-maven-example/pom.xml | 2 +-
pom.xml | 10 +-
ruta-basic-type/pom.xml | 2 +-
.../java/org/apache/uima/ruta/type/RutaBasic.java | 85 ++++++--
.../org/apache/uima/ruta/type/RutaBasic_Type.java | 107 ----------
ruta-core-ext/pom.xml | 2 +-
ruta-core/pom.xml | 3 +-
.../java/org/apache/uima/ruta/FilterManager.java | 6 +-
.../java/org/apache/uima/ruta/RutaEnvironment.java | 1 -
.../main/java/org/apache/uima/ruta/RutaStream.java | 74 ++++---
.../apache/uima/ruta/condition/NearCondition.java | 2 +-
.../uima/ruta/resource/MultiTreeWordList.java | 2 +-
.../apache/uima/ruta/resource/TreeWordList.java | 2 +-
.../uima/ruta/rule/AnnotationListFSIterator.java | 94 +++++++++
.../uima/ruta/rule/RutaAnnotationTypeMatcher.java | 232 ++++++++-------------
.../apache/uima/ruta/rule/WildCardRuleElement.java | 29 ++-
.../org/apache/uima/ruta/engine/DummySeeder.java | 74 +++----
.../uima/ruta/engine/MultipleSeedersTest.java | 100 ++++-----
.../annotation/AnnotationLabelExpressionTest.java | 13 --
.../apache/uima/ruta/resource/CSVTableTest.java | 150 ++++++-------
.../org/apache/uima/ruta/rule/WildCard2Test.java | 14 ++
ruta-docbook/pom.xml | 3 +-
ruta-docbook/src/docbook/tools.ruta.howtos.xml | 8 +-
ruta-eclipse-feature/pom.xml | 2 +-
ruta-eclipse-update-site/category.xml | 2 +-
ruta-eclipse-update-site/pom.xml | 12 +-
ruta-ep-addons/pom.xml | 2 +-
.../apache/uima/ruta/explain/tree/ExplainTree.java | 6 +-
.../ruta/explain/tree/RuleElementMatchNode.java | 7 +-
ruta-ep-caseditor/.gitignore | 2 +-
ruta-ep-caseditor/pom.xml | 2 +-
ruta-ep-core-ext/pom.xml | 2 +-
ruta-ep-engine/.gitignore | 2 +-
ruta-ep-engine/pom.xml | 2 +-
ruta-ep-ide-ui/.gitignore | 2 +-
ruta-ep-ide-ui/pom.xml | 2 +-
ruta-ep-ide/.gitignore | 2 +-
ruta-ep-ide/pom.xml | 2 +-
ruta-ep-parent/pom.xml | 2 +-
ruta-ep-textruler/.gitignore | 2 +-
ruta-ep-textruler/pom.xml | 2 +-
ruta-maven-archetype/pom.xml | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
ruta-maven-plugin/pom.xml | 6 +-
ruta-parent/pom.xml | 6 +-
ruta-typesystem/pom.xml | 2 +-
50 files changed, 564 insertions(+), 558 deletions(-)
diff --cc ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java
index a63c052,f9a2d07..53bce8a
--- a/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java
+++ b/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java
@@@ -53,8 -53,6 +53,7 @@@ import org.apache.uima.cas.IntArrayFS
import org.apache.uima.cas.StringArrayFS;
import org.apache.uima.cas.Type;
import org.apache.uima.cas.TypeSystem;
- import org.apache.uima.cas.impl.FSIteratorImplBase;
+import org.apache.uima.cas.impl.TypeImpl;
import org.apache.uima.cas.text.AnnotationFS;
import org.apache.uima.cas.text.AnnotationIndex;
import org.apache.uima.fit.util.CasUtil;