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/03/18 18:34:48 UTC

[uima-ruta] 01/01: Merge pull request #36 from apache/feature/UIMA-6341-Try-out-p2-layout-resolver

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-ruta.git

commit 71027f2d1326fc8bc3d4517b227dde3bbeb7946d
Merge: 9c3fc3e e248e27
Author: Richard Eckart de Castilho <re...@apache.org>
AuthorDate: Thu Mar 18 19:34:05 2021 +0100

    Merge pull request #36 from apache/feature/UIMA-6341-Try-out-p2-layout-resolver
    
    [UIMA-6341] Try out p2 layout resolver

 .../ruta-ep-example-extensions/pom.xml             |   9 +-
 .../uima/ruta/action/MarkTableReloadTest.java      |   2 +
 .../main/java/org/apache/uima/ruta/RutaStream.java |   6 +-
 .../apache/uima/ruta/condition/AfterCondition.java |  28 ++-
 .../uima/ruta/condition/BeforeCondition.java       |  27 ++-
 .../apache/uima/ruta/condition/VoteCondition.java  |  20 +-
 .../org/apache/uima/ruta/engine/RutaEngine.java    |   2 +-
 .../org/apache/uima/ruta/engine/RutaTestUtils.java |  15 ++
 .../apache/uima/ruta/rule/ComposedRuleElement.java |  14 +-
 .../org/apache/uima/ruta/seed/DefaultSeeder.java   |  27 ++-
 .../jflex/org/apache/uima/ruta/seed/SeedLexer.flex |  20 --
 .../org/apache/uima/ruta/engine/BasicEngine.xml    |   2 +-
 .../org/apache/uima/ruta/WSDictionaryTest.java     |   8 +-
 .../apache/uima/ruta/action/AddFilterTypeTest.java |  10 +-
 .../apache/uima/ruta/action/AddRetainTypeTest.java |   4 +-
 .../apache/uima/ruta/action/FilterTypeTest.java    |  10 +-
 .../org/apache/uima/ruta/action/MarkTableTest.java |  40 ++--
 .../uima/ruta/action/RemoveFilterTypeTest.java     |   4 +-
 .../uima/ruta/action/RemoveRetainTypeTest.java     |  10 +-
 .../org/apache/uima/ruta/action/ReplaceTest.java   |  10 +-
 .../apache/uima/ruta/action/RetainTypeTest.java    |  12 +-
 .../org/apache/uima/ruta/action/Shift1Test.java    |   4 +-
 .../org/apache/uima/ruta/action/Shift2Test.java    |  35 ++--
 .../java/org/apache/uima/ruta/action/TrimTest.java |   8 +-
 .../org/apache/uima/ruta/condition/AfterTest.java  |  39 +++-
 .../org/apache/uima/ruta/condition/BeforeTest.java |  37 +++-
 .../org/apache/uima/ruta/condition/VoteTest.java   |  32 ++-
 .../apache/uima/ruta/engine/RutaModifierTest.java  |  32 ++-
 .../uima/ruta/engine/TestRutaInferenceVisitor.java |   1 -
 .../uima/ruta/rule/ComposedRuleElementTest.java    |  79 ++++++++
 .../uima/ruta/rule/LiteralStringMatchTest.java     |   9 +-
 .../apache/uima/ruta/seed/DefaultSeederTest.java   |  58 +++---
 .../org/apache/uima/ruta/seed/TextSeederTest.java  |  80 ++++++++
 .../org/apache/uima/ruta/TypeAliasTestEngine.xml   |   2 +-
 .../uima/ruta/action/ConfigureTestEngine.xml       |   2 +-
 .../org/apache/uima/ruta/action/Shift2Test.ruta    |   9 -
 .../org/apache/uima/ruta/action/Shift2Test.txt     |   1 -
 .../org/apache/uima/ruta/engine/CWEngine.xml       |   2 +-
 .../uima/ruta/engine/RecursiveConfigureEngine.xml  |   2 +-
 .../org/apache/uima/ruta/engine/SWEngine.xml       |   2 +-
 .../org/apache/uima/ruta/engine/SimpleEngine.xml   |   2 +-
 ruta-docbook/src/docbook/tools.ruta.overview.xml   |   4 +-
 ruta-eclipse-update-site/pom.xml                   |  18 +-
 ruta-ep-addons/pom.xml                             |  56 +++---
 .../uima/ruta/cde/ui/ConstraintSelectView.java     |   9 +-
 .../org/apache/uima/ruta/cde/ui/DocumentView.java  |  12 ++
 .../org/apache/uima/ruta/cde/ui/ResultView.java    |   9 +-
 .../uima/ruta/check/AnnotationCheckView.java       |   6 +
 .../apache/uima/ruta/explain/apply/ApplyView.java  |   6 +
 .../uima/ruta/explain/createdBy/CreatedByView.java |   8 +-
 .../uima/ruta/explain/element/ElementView.java     |   7 +
 .../uima/ruta/explain/failed/FailedView.java       |   7 +
 .../uima/ruta/explain/inlined/InlinedView.java     |   6 +
 .../uima/ruta/explain/matched/MatchedView.java     |   6 +
 .../uima/ruta/explain/rulelist/RuleListView.java   |   7 +
 .../explain/selection/ExplainSelectionView.java    |   7 +
 .../org/apache/uima/ruta/query/ui/QueryView.java   |  15 +-
 .../uima/ruta/statistics/StatisticsView.java       |   8 +-
 .../ruta/testing/ui/views/TestPageBookView.java    |   7 +-
 .../testing/ui/views/fn/FalseNegativeView.java     |   8 +-
 .../testing/ui/views/fp/FalsePositiveView.java     |   8 +-
 .../ruta/testing/ui/views/tp/TruePositiveView.java |   8 +-
 ruta-ep-caseditor/pom.xml                          |  52 ++---
 .../uima/ruta/caseditor/RutaCasEditorPlugin.java   |   3 +-
 .../view/browser/AnnotationBrowserView.java        |   7 +-
 .../uima/ruta/caseditor/view/html/HtmlView.java    |  44 ++--
 .../caseditor/view/selection/SelectionView.java    |   8 +-
 .../caseditor/view/tree/ArrayFeatureTreeNode.java  |   1 -
 .../uima/ruta/caseditor/view/tree/FSTreeNode.java  |   1 -
 .../view/tree/PrimitiveFeatureTreeNode.java        |   2 -
 .../caseditor/view/tree/PrimitiveTreeNode.java     |   1 -
 .../view/tree/TypeOrderedRootTreeNode.java         |   1 -
 .../ruta/caseditor/view/tree/TypeTreeNode.java     |   1 -
 ruta-ep-core-ext/pom.xml                           |   8 +-
 ruta-ep-ide-ui/pom.xml                             | 171 ++++++++--------
 ruta-ep-ide/pom.xml                                |  60 +++---
 ruta-ep-parent/pom.xml                             | 222 +++++++++------------
 ruta-ep-textruler/pom.xml                          |  44 ++--
 ruta-parent/pom.xml                                |  18 +-
 79 files changed, 945 insertions(+), 637 deletions(-)