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 2021/03/23 16:36:53 UTC
[uima-ruta] 01/01: Merge branch 'main' into
bugfix/UIMA-6247-Ruta-not-able-to-check-label-expression-on-null-as-implicit-condition
This is an automated email from the ASF dual-hosted git repository.
pkluegl pushed a commit to branch bugfix/UIMA-6247-Ruta-not-able-to-check-label-expression-on-null-as-implicit-condition
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git
commit 0287deed43fcfe37e88251fcbbf7cc05fefe650d
Merge: 94494d2 1e8b42a
Author: Peter Klügl <pe...@averbis.com>
AuthorDate: Tue Mar 23 17:36:14 2021 +0100
Merge branch 'main' into bugfix/UIMA-6247-Ruta-not-able-to-check-label-expression-on-null-as-implicit-condition
# Conflicts:
# ruta-core/src/test/java/org/apache/uima/ruta/expression/annotation/AnnotationLabelExpressionTest.java
README | 5 +-
RELEASE_NOTES.html | 25 ++-
.../ruta-ep-example-extensions/.gitignore | 2 +-
.../ruta-ep-example-extensions/pom.xml | 3 +-
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 | 7 +-
.../java/org/apache/uima/ruta/RutaEnvironment.java | 1 -
.../main/java/org/apache/uima/ruta/RutaStream.java | 113 ++++++----
.../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 | 32 ++-
.../apache/uima/ruta/ReindexUpdateModeTest.java | 2 +
.../uima/ruta/engine/MultipleSeedersTest.java | 100 ++++-----
.../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 +-
.../tools.ruta.language.internal_indexing.xml | 52 ++---
ruta-eclipse-feature/pom.xml | 2 +-
ruta-eclipse-update-site/category.xml | 2 +-
ruta-eclipse-update-site/pom.xml | 22 +-
ruta-ep-addons/pom.xml | 2 +-
.../uima/ruta/cde/ui/ConstraintSelectView.java | 3 +-
.../org/apache/uima/ruta/cde/ui/DocumentView.java | 3 +-
.../org/apache/uima/ruta/cde/ui/ResultView.java | 2 +-
.../uima/ruta/check/AnnotationCheckView.java | 2 +-
.../apache/uima/ruta/explain/apply/ApplyView.java | 2 +-
.../uima/ruta/explain/createdBy/CreatedByView.java | 4 +-
.../uima/ruta/explain/element/ElementView.java | 2 +-
.../uima/ruta/explain/failed/FailedView.java | 2 +-
.../uima/ruta/explain/inlined/InlinedView.java | 2 +-
.../uima/ruta/explain/matched/MatchedView.java | 2 +-
.../uima/ruta/explain/rulelist/RuleListView.java | 2 +-
.../explain/selection/ExplainSelectionView.java | 2 +-
.../apache/uima/ruta/explain/tree/ExplainTree.java | 6 +-
.../ruta/explain/tree/RuleElementMatchNode.java | 7 +-
.../org/apache/uima/ruta/query/ui/QueryView.java | 6 +-
.../uima/ruta/statistics/StatisticsView.java | 5 +-
.../ruta/testing/ui/views/TestPageBookView.java | 5 +-
.../testing/ui/views/fn/FalseNegativeView.java | 3 +-
.../testing/ui/views/fp/FalsePositiveView.java | 3 +-
.../ruta/testing/ui/views/tp/TruePositiveView.java | 5 +-
ruta-ep-caseditor/.gitignore | 2 +-
ruta-ep-caseditor/pom.xml | 2 +-
.../view/browser/AnnotationBrowserView.java | 2 -
.../uima/ruta/caseditor/view/html/HtmlView.java | 47 +++--
.../caseditor/view/selection/SelectionView.java | 3 +-
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 +-
.../launching/RutaLaunchConfigurationDelegate.java | 27 ++-
ruta-ep-ide/.gitignore | 2 +-
ruta-ep-ide/pom.xml | 6 +-
ruta-ep-parent/pom.xml | 82 +-------
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 +-
72 files changed, 654 insertions(+), 707 deletions(-)