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 2015/11/06 18:56:47 UTC
svn commit: r1712996 [1/5] - in /uima/ruta/branches/UIMA-4408/ruta-core/src:
main/java/org/apache/uima/ruta/ main/java/org/apache/uima/ruta/action/
main/java/org/apache/uima/ruta/condition/
main/java/org/apache/uima/ruta/constraint/ main/java/org/apach...
Author: pkluegl
Date: Fri Nov 6 17:56:45 2015
New Revision: 1712996
URL: http://svn.apache.org/viewvc?rev=1712996&view=rev
Log:
UIMA-4408
- removed some warnings, unused code
- format + organize imports
Modified:
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/FilterManager.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/RutaEnvironment.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/RutaModule.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/RutaScriptFactory.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/UIMAConstants.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/AbstractMarkAction.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/AbstractStructureAction.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/ActionFactory.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/AddAction.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/AddFilterTypeAction.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/AddRetainTypeAction.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/AssignAction.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/CallAction.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/ClearAction.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/ColorAction.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/ConfigureAction.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/CreateAction.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/DelAction.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/DynamicAnchoringAction.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/ExecAction.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/FillAction.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/FilterTypeAction.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/GatherAction.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/GetAction.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/GetFeatureAction.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/GetListAction.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/GreedyAnchoringAction.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/ImplicitFeatureAction.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/ImplicitMarkAction.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/LogAction.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkAction.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkFastAction.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkFirstAction.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkLastAction.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkOnceAction.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkTableAction.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/MatchedTextAction.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/MergeAction.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/RemoveAction.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/RemoveDuplicateAction.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/RemoveFilterTypeAction.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/RemoveRetainTypeAction.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/ReplaceAction.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/RetainTypeAction.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/SetFeatureAction.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/ShiftAction.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/SplitAction.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/TransferAction.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/TrieAction.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/TrimAction.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/UnmarkAction.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/UnmarkAllAction.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/condition/AfterCondition.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/condition/AndCondition.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/condition/BeforeCondition.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/condition/ConditionFactory.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/condition/ContainsCondition.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/condition/ContextCountCondition.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/condition/CountCondition.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/condition/CurrentCountCondition.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/condition/EndsWithCondition.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/condition/FeatureCondition.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/condition/IfCondition.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/condition/ImplicitCondition.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/condition/InListCondition.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/condition/IsCondition.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/condition/LastCondition.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/condition/MOfNCondition.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/condition/NearCondition.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/condition/OrCondition.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/condition/ParseCondition.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/condition/PartOfCondition.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/condition/PartOfNeqCondition.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/condition/PositionCondition.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/condition/RegExpCondition.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/condition/ScoreCondition.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/condition/SizeCondition.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/condition/StartsWithCondition.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/condition/TotalCountCondition.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/condition/VoteCondition.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/constraint/BasicTypeConstraint.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/descriptor/RutaDescriptorBuilder.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/descriptor/RutaDescriptorFactory.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/engine/HtmlAnnotator.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/engine/HtmlConverter.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/engine/PlainTextAnnotator.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/engine/Ruta.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaTestUtils.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/engine/ViewWriter.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/ExpressionFactory.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/MatchReference.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/NullExpression.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/RutaExpression.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/annotation/AbstractAnnotationExpression.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/annotation/IAnnotationExpression.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/annotation/LabelAnnotationExpression.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/bool/AbstractBooleanExpression.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/bool/BooleanFeatureExpression.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/bool/BooleanNumberExpression.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/bool/BooleanTypeExpression.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/bool/BooleanVariableExpression.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/bool/IBooleanExpression.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/bool/SimpleBooleanFunction.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/feature/FeatureExpression.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/feature/FeatureMatchExpression.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/feature/GenericFeatureExpression.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/feature/SimpleFeatureExpression.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/BooleanListVariableExpression.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/NumberListVariableExpression.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/SimpleBooleanListExpression.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/SimpleNumberListExpression.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/SimpleStringListExpression.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/StringListVariableExpression.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/TypeListVariableExpression.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/UntypedListExpression.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/number/AbstractNumberExpression.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/number/INumberExpression.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/number/NumberFeatureExpression.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/resource/ExternalWordListExpression.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/resource/ExternalWordTableExpression.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/string/AbstractStringExpression.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/string/IStringExpression.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/string/StringFeatureExpression.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/string/StringFunctionFactory.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/string/StringVariableExpression.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/type/ITypeExpression.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/type/SimpleTypeExpression.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/type/TypeExpression.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/type/TypeVariableExpression.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaBlockExtension.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/extensions/RutaParseException.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/resource/AnonymousWordList.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/resource/MultiTextNode.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/resource/MultiTreeWordList.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/resource/ResourcePathResourceLoader.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/resource/RutaResourceLoader.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/resource/RutaWordList.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/rule/AbstractRuleElement.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/rule/ComposedRuleElement.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/rule/ComposedRuleElementMatch.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/rule/ConjunctRulesRuleElement.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/rule/RegExpRule.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/rule/RuleElement.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/rule/RuleElementCaretaker.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/rule/RuleElementMatch.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/rule/RuleMatch.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/rule/RutaRule.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/rule/RutaRuleElement.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/rule/RutaTypeMatcher.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/rule/WildCardRuleElement.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/MinMaxGreedy.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/MinMaxReluctant.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/NormalQuantifier.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/PlusGreedy.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/PlusReluctant.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/QuestionGreedy.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/QuestionReluctant.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/StarGreedy.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/StarReluctant.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/seed/SeedLexer.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/verbalize/ConditionVerbalizer.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/verbalize/ExpressionVerbalizer.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/verbalize/RutaVerbalizer.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/visitor/InferenceCrowd.java
uima/ruta/branches/UIMA-4408/ruta-core/src/test/java/org/apache/uima/ruta/engine/HtmlConverterTest.java
uima/ruta/branches/UIMA-4408/ruta-core/src/test/java/org/apache/uima/ruta/verbalizer/ActionVerbalizerTest.java
uima/ruta/branches/UIMA-4408/ruta-core/src/test/java/org/apache/uima/ruta/verbalizer/ConditionVerbalizerTest.java
uima/ruta/branches/UIMA-4408/ruta-core/src/test/java/org/apache/uima/ruta/verbalizer/ExpressionVerbalizerTest.java
Modified: uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/FilterManager.java
URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/FilterManager.java?rev=1712996&r1=1712995&r2=1712996&view=diff
==============================================================================
--- uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/FilterManager.java (original)
+++ uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/FilterManager.java Fri Nov 6 17:56:45 2015
@@ -205,5 +205,4 @@ public class FilterManager {
return currentHiddenTypes;
}
-
}
Modified: uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/RutaEnvironment.java
URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/RutaEnvironment.java?rev=1712996&r1=1712995&r2=1712996&view=diff
==============================================================================
--- uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/RutaEnvironment.java (original)
+++ uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/RutaEnvironment.java Fri Nov 6 17:56:45 2015
@@ -572,8 +572,7 @@ public class RutaEnvironment {
UimaContext context = owner.getContext();
Boolean dictRemoveWS = false;
if (context != null) {
- dictRemoveWS = (Boolean) context
- .getConfigParameterValue(RutaEngine.PARAM_DICT_REMOVE_WS);
+ dictRemoveWS = (Boolean) context.getConfigParameterValue(RutaEngine.PARAM_DICT_REMOVE_WS);
if (dictRemoveWS == null) {
dictRemoveWS = false;
}
@@ -752,11 +751,11 @@ public class RutaEnvironment {
}
if (result != null) {
MatchContext context = new MatchContext(owner);
- if(RutaWordList.class.isAssignableFrom(type) && result instanceof WordListExpression) {
+ if (RutaWordList.class.isAssignableFrom(type) && result instanceof WordListExpression) {
WordListExpression wle = (WordListExpression) result;
RutaWordList list = wle.getList(context);
return type.cast(list);
- } else if(RutaTable.class.isAssignableFrom(type) && result instanceof WordTableExpression) {
+ } else if (RutaTable.class.isAssignableFrom(type) && result instanceof WordTableExpression) {
WordTableExpression wte = (WordTableExpression) result;
RutaTable table = wte.getTable(context);
return type.cast(table);
Modified: uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/RutaModule.java
URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/RutaModule.java?rev=1712996&r1=1712995&r2=1712996&view=diff
==============================================================================
--- uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/RutaModule.java (original)
+++ uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/RutaModule.java Fri Nov 6 17:56:45 2015
@@ -55,20 +55,20 @@ public class RutaModule extends RutaElem
return rootBlock;
}
RutaBlock ownBlock = blocks.get(id);
- if(ownBlock != null) {
+ if (ownBlock != null) {
return ownBlock;
}
int indexOf = id.indexOf('.');
- if(indexOf != -1) {
+ if (indexOf != -1) {
String otherScriptName = id.substring(0, indexOf);
String tail = id.substring(indexOf + 1, id.length());
RutaModule otherScript = getScript(otherScriptName);
- if(otherScript != null) {
+ if (otherScript != null) {
return otherScript.getBlock(tail);
}
} else {
RutaModule otherScript = getScript(id);
- if(otherScript != null) {
+ if (otherScript != null) {
return otherScript.getBlock(null);
}
}
Modified: uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/RutaScriptFactory.java
URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/RutaScriptFactory.java?rev=1712996&r1=1712995&r2=1712996&view=diff
==============================================================================
--- uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/RutaScriptFactory.java (original)
+++ uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/RutaScriptFactory.java Fri Nov 6 17:56:45 2015
@@ -121,13 +121,14 @@ public class RutaScriptFactory {
public RutaStatement createImplicitRule(List<AbstractRutaAction> actions, RutaBlock parent) {
List<RuleElement> elements = new ArrayList<RuleElement>();
IRutaExpression documentExpression = new SimpleTypeExpression("Document");
- RutaRuleElement element = createRuleElement(documentExpression, null, null, actions, null, parent);
+ RutaRuleElement element = createRuleElement(documentExpression, null, null, actions, null,
+ parent);
elements.add(element);
RutaRule rule = createRule(elements, parent);
element.setContainer(rule.getRoot());
return rule;
}
-
+
public RutaRule createRule(List<RuleElement> elements, RutaBlock parent) {
return new RutaRule(elements, parent, idCounter++);
}
@@ -263,5 +264,4 @@ public class RutaScriptFactory {
this.context = context;
}
-
}
Modified: uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java
URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java?rev=1712996&r1=1712995&r2=1712996&view=diff
==============================================================================
--- uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java (original)
+++ uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java Fri Nov 6 17:56:45 2015
@@ -154,7 +154,7 @@ public class RutaStream extends FSIterat
AnnotationIndex<AnnotationFS> annotationIndex = cas.getAnnotationIndex();
final List<AnnotationFS> allAnnotations = new LinkedList<AnnotationFS>();
for (AnnotationFS a : annotationIndex) {
- if(a.getBegin() != a.getEnd()) {
+ if (a.getBegin() != a.getEnd()) {
allAnnotations.add(a);
}
}
@@ -178,12 +178,12 @@ public class RutaStream extends FSIterat
break;
}
Integer second = anchors.first();
- if(first < second) {
- RutaBasic newTMB = new RutaBasic(getJCas(), first, second);
- newTMB.setLowMemoryProfile(lowMemoryProfile);
- beginAnchors.put(first, newTMB);
- endAnchors.put(second, newTMB);
- cas.addFsToIndexes(newTMB);
+ if (first < second) {
+ RutaBasic newTMB = new RutaBasic(getJCas(), first, second);
+ newTMB.setLowMemoryProfile(lowMemoryProfile);
+ beginAnchors.put(first, newTMB);
+ endAnchors.put(second, newTMB);
+ cas.addFsToIndexes(newTMB);
}
}
}
@@ -300,7 +300,7 @@ public class RutaStream extends FSIterat
toSplit = ceiling;
}
int newEnd = toSplit.getEnd();
- if(newEnd == anchor) {
+ if (newEnd == anchor) {
return false;
}
cas.removeFsFromIndexes(toSplit);
@@ -330,7 +330,7 @@ public class RutaStream extends FSIterat
}
public void removeAnnotation(AnnotationFS annotation, Type type) {
- if(type.getName().equals(UIMAConstants.TYPE_DOCUMENT)) {
+ if (type.getName().equals(UIMAConstants.TYPE_DOCUMENT)) {
// do not remove DocumentAnnotation
return;
}
@@ -341,11 +341,11 @@ public class RutaStream extends FSIterat
Type parent = type;
RutaBasic beginAnchor = getBeginAnchor(annotation.getBegin());
RutaBasic endAnchor = getEndAnchor(annotation.getEnd());
- if(beginAnchor != null) {
- beginAnchor.removeBegin(annotation, parent);
+ if (beginAnchor != null) {
+ beginAnchor.removeBegin(annotation, parent);
}
- if(endAnchor != null) {
- endAnchor.removeEnd(annotation, parent);
+ if (endAnchor != null) {
+ endAnchor.removeEnd(annotation, parent);
}
if (!(annotation instanceof RutaBasic)) {
cas.removeFsFromIndexes(annotation);
@@ -369,13 +369,14 @@ public class RutaStream extends FSIterat
filter.getCurrentFilterTypes(), filter.getCurrentRetainTypes(), windowAnnotation,
windowType, cas);
-// NavigableMap<Integer, RutaBasic> newBeginAnchors = beginAnchors.subMap(
-// windowAnnotation.getBegin(), true, windowAnnotation.getEnd(), false);
-// NavigableMap<Integer, RutaBasic> newEndAnchors = endAnchors.subMap(windowAnnotation.getBegin(),
-// false, windowAnnotation.getEnd(), true);
+ // NavigableMap<Integer, RutaBasic> newBeginAnchors = beginAnchors.subMap(
+ // windowAnnotation.getBegin(), true, windowAnnotation.getEnd(), false);
+ // NavigableMap<Integer, RutaBasic> newEndAnchors =
+ // endAnchors.subMap(windowAnnotation.getBegin(),
+ // false, windowAnnotation.getEnd(), true);
- RutaStream stream = new RutaStream(cas, basicType, beginAnchors, endAnchors,
- filterManager, lowMemoryProfile, simpleGreedyForComposed, crowd);
+ RutaStream stream = new RutaStream(cas, basicType, beginAnchors, endAnchors, filterManager,
+ lowMemoryProfile, simpleGreedyForComposed, crowd);
stream.setDynamicAnchoring(dynamicAnchoring);
stream.setGreedyRuleElement(greedyRuleElement);
stream.setGreedyRule(greedyRule);
@@ -403,7 +404,7 @@ public class RutaStream extends FSIterat
try {
currentIt.moveTo(fs);
} catch (Exception e) {
-// e.printStackTrace();
+ // e.printStackTrace();
}
}
@@ -468,7 +469,7 @@ public class RutaStream extends FSIterat
try {
return cas.getJCas();
} catch (CASException e) {
-// e.printStackTrace();
+ // e.printStackTrace();
}
return null;
}
@@ -523,7 +524,8 @@ public class RutaStream extends FSIterat
}
public List<AnnotationFS> getAnnotationsInWindow(AnnotationFS windowAnnotation, Type type) {
- if(type == null) return null;
+ if (type == null)
+ return null;
List<AnnotationFS> result = new ArrayList<AnnotationFS>();
List<AnnotationFS> inWindow = getAnnotationsInWindow2(windowAnnotation, type);
result = inWindow;
@@ -561,7 +563,7 @@ public class RutaStream extends FSIterat
if (isVisible(pointer) || !isValid()) {
moveToPrevious();
}
- if(!isValid()) {
+ if (!isValid()) {
moveToLast();
}
if (isValid()) {
@@ -790,26 +792,26 @@ public class RutaStream extends FSIterat
public boolean isOnlyOnce() {
return onlyOnce;
}
-
+
public void setOnlyOnce(Boolean onlyOnce) {
this.onlyOnce = onlyOnce;
}
-
-
+
public boolean isVisible(AnnotationFS annotationFS) {
return isVisible(annotationFS, false);
}
-
+
public boolean isVisible(AnnotationFS annotationFS, boolean ignoreWindow) {
if (annotationFS == null) {
return false;
}
- if(annotationFS.getBegin() >= annotationFS.getEnd()) {
+ if (annotationFS.getBegin() >= annotationFS.getEnd()) {
return false;
}
-
+
AnnotationFS windowAnnotation = filter.getWindowAnnotation();
- if (!ignoreWindow && windowAnnotation != null
+ if (!ignoreWindow
+ && windowAnnotation != null
&& (annotationFS.getBegin() < windowAnnotation.getBegin() || annotationFS.getEnd() > windowAnnotation
.getEnd())) {
return false;
@@ -884,13 +886,11 @@ public class RutaStream extends FSIterat
StringBuilder result = new StringBuilder();
List<RutaBasic> basicsInWindow = getBasicsInWindow(annotationFS);
for (RutaBasic each : basicsInWindow) {
- if(isVisible(each)) {
+ if (isVisible(each)) {
result.append(each.getCoveredText());
}
}
return result.toString();
}
-
-
}
Modified: uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/UIMAConstants.java
URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/UIMAConstants.java?rev=1712996&r1=1712995&r2=1712996&view=diff
==============================================================================
--- uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/UIMAConstants.java (original)
+++ uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/UIMAConstants.java Fri Nov 6 17:56:45 2015
@@ -36,11 +36,11 @@ public class UIMAConstants {
public static final String TYPE_DOUBLE = "uima.cas.Double";
public static final String TYPE_STRING = "uima.cas.String";
-
+
public static final String TYPE_DOCUMENT = "uima.tcas.DocumentAnnotation";
-
+
public static final String FEATURE_COVERED_TEXT = "coveredText";
-
+
public static final String FEATURE_COVERED_TEXT_SHORT = "ct";
}
Modified: uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/AbstractMarkAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/AbstractMarkAction.java?rev=1712996&r1=1712995&r2=1712996&view=diff
==============================================================================
--- uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/AbstractMarkAction.java (original)
+++ uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/AbstractMarkAction.java Fri Nov 6 17:56:45 2015
@@ -37,10 +37,11 @@ public abstract class AbstractMarkAction
super(type);
}
- protected Annotation createAnnotation(AnnotationFS annotation, MatchContext context, RutaStream stream) {
+ protected Annotation createAnnotation(AnnotationFS annotation, MatchContext context,
+ RutaStream stream) {
Type t = type.getType(context, stream);
- AnnotationFS newAnnotationFS = stream.getCas().createAnnotation(t,
- annotation.getBegin(), annotation.getEnd());
+ AnnotationFS newAnnotationFS = stream.getCas().createAnnotation(t, annotation.getBegin(),
+ annotation.getEnd());
Annotation newAnnotation = null;
if (newAnnotationFS instanceof Annotation) {
newAnnotation = (Annotation) newAnnotationFS;
Modified: uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/AbstractStructureAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/AbstractStructureAction.java?rev=1712996&r1=1712995&r2=1712996&view=diff
==============================================================================
--- uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/AbstractStructureAction.java (original)
+++ uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/AbstractStructureAction.java Fri Nov 6 17:56:45 2015
@@ -32,7 +32,6 @@ import org.apache.uima.cas.text.Annotati
import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.cas.FSArray;
import org.apache.uima.jcas.cas.TOP;
-import org.apache.uima.ruta.RutaBlock;
import org.apache.uima.ruta.RutaStream;
import org.apache.uima.ruta.UIMAConstants;
import org.apache.uima.ruta.expression.IRutaExpression;
@@ -43,7 +42,6 @@ import org.apache.uima.ruta.expression.n
import org.apache.uima.ruta.expression.string.IStringExpression;
import org.apache.uima.ruta.expression.type.TypeExpression;
import org.apache.uima.ruta.rule.MatchContext;
-import org.apache.uima.ruta.rule.RuleElement;
import org.apache.uima.ruta.utils.UIMAUtils;
public abstract class AbstractStructureAction extends AbstractRutaAction {
@@ -55,7 +53,6 @@ public abstract class AbstractStructureA
protected void fillFeatures(TOP structure, Map<IStringExpression, IRutaExpression> features,
AnnotationFS matchedAnnotation, MatchContext context, RutaStream stream) {
Map<String, IRutaExpression> map = new HashMap<String, IRutaExpression>();
- RutaBlock parent = context.getParent();
for (Entry<IStringExpression, IRutaExpression> each : features.entrySet()) {
String value = each.getKey().getStringValue(context, stream);
map.put(value, each.getValue());
@@ -101,33 +98,33 @@ public abstract class AbstractStructureA
}
} else if (valueObject instanceof IStringExpression
&& range.getName().equals(UIMAConstants.TYPE_STRING)) {
- structure.setStringValue(targetFeature, ((IStringExpression) valueObject).getStringValue(
- context, stream));
+ structure.setStringValue(targetFeature,
+ ((IStringExpression) valueObject).getStringValue(context, stream));
} else if (valueObject instanceof INumberExpression) {
if (range.getName().equals(UIMAConstants.TYPE_DOUBLE)) {
- structure.setDoubleValue(targetFeature, ((INumberExpression) valueObject)
- .getDoubleValue(context, stream));
+ structure.setDoubleValue(targetFeature,
+ ((INumberExpression) valueObject).getDoubleValue(context, stream));
} else if (range.getName().equals(UIMAConstants.TYPE_INTEGER)) {
- structure.setIntValue(targetFeature, ((INumberExpression) valueObject).getIntegerValue(
- context, stream));
+ structure.setIntValue(targetFeature,
+ ((INumberExpression) valueObject).getIntegerValue(context, stream));
} else if (range.getName().equals(UIMAConstants.TYPE_FLOAT)) {
- structure.setFloatValue(targetFeature, ((INumberExpression) valueObject).getFloatValue(
- context, stream));
+ structure.setFloatValue(targetFeature,
+ ((INumberExpression) valueObject).getFloatValue(context, stream));
} else if (range.getName().equals(UIMAConstants.TYPE_BYTE)) {
- structure.setByteValue(targetFeature, (byte) ((INumberExpression) valueObject)
- .getIntegerValue(context, stream));
+ structure.setByteValue(targetFeature,
+ (byte) ((INumberExpression) valueObject).getIntegerValue(context, stream));
} else if (range.getName().equals(UIMAConstants.TYPE_SHORT)) {
- structure.setShortValue(targetFeature, (short) ((INumberExpression) valueObject)
- .getIntegerValue(context, stream));
+ structure.setShortValue(targetFeature,
+ (short) ((INumberExpression) valueObject).getIntegerValue(context, stream));
} else if (range.getName().equals(UIMAConstants.TYPE_LONG)) {
- structure.setLongValue(targetFeature, (long) ((INumberExpression) valueObject)
- .getIntegerValue(context, stream));
+ structure.setLongValue(targetFeature,
+ ((INumberExpression) valueObject).getIntegerValue(context, stream));
}
} else if (valueObject instanceof IBooleanExpression
&& range.getName().equals(UIMAConstants.TYPE_BOOLEAN)) {
- structure.setBooleanValue(targetFeature, ((IBooleanExpression) valueObject)
- .getBooleanValue(context, stream));
+ structure.setBooleanValue(targetFeature,
+ ((IBooleanExpression) valueObject).getBooleanValue(context, stream));
} else if (valueObject instanceof TypeExpression) {
TypeExpression type = (TypeExpression) valueObject;
List<AnnotationFS> annotationsInWindow = stream.getAnnotationsInWindow(matchedAnnotation,
Modified: uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/ActionFactory.java
URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/ActionFactory.java?rev=1712996&r1=1712995&r2=1712996&view=diff
==============================================================================
--- uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/ActionFactory.java (original)
+++ uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/ActionFactory.java Fri Nov 6 17:56:45 2015
@@ -199,7 +199,7 @@ public class ActionFactory {
}
@SuppressWarnings("rawtypes")
-public static AbstractRutaAction createMergeAction(IBooleanExpression union, Token target,
+ public static AbstractRutaAction createMergeAction(IBooleanExpression union, Token target,
List<ListExpression> list, RutaBlock env) {
return new MergeAction(union, target == null ? null : target.getText(), list);
}
Modified: uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/AddAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/AddAction.java?rev=1712996&r1=1712995&r2=1712996&view=diff
==============================================================================
--- uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/AddAction.java (original)
+++ uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/AddAction.java Fri Nov 6 17:56:45 2015
@@ -33,7 +33,6 @@ import org.apache.uima.ruta.expression.s
import org.apache.uima.ruta.expression.type.TypeExpression;
import org.apache.uima.ruta.rule.MatchContext;
import org.apache.uima.ruta.rule.RuleElement;
-import org.apache.uima.ruta.rule.RuleMatch;
import org.apache.uima.ruta.visitor.InferenceCrowd;
public class AddAction extends AbstractRutaAction {
@@ -59,8 +58,7 @@ public class AddAction extends AbstractR
@SuppressWarnings({ "unchecked", "rawtypes" })
@Override
public void execute(MatchContext context, RutaStream stream, InferenceCrowd crowd) {
- RuleMatch match = context.getRuleMatch();
- RuleElement element = context.getElement();
+ RuleElement element = context.getElement();
RutaBlock parent = element.getParent();
RutaEnvironment environment = parent.getEnvironment();
List list = environment.getVariableValue(var, List.class);
Modified: uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/AddFilterTypeAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/AddFilterTypeAction.java?rev=1712996&r1=1712995&r2=1712996&view=diff
==============================================================================
--- uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/AddFilterTypeAction.java (original)
+++ uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/AddFilterTypeAction.java Fri Nov 6 17:56:45 2015
@@ -26,7 +26,6 @@ import org.apache.uima.cas.Type;
import org.apache.uima.ruta.RutaStream;
import org.apache.uima.ruta.expression.type.TypeExpression;
import org.apache.uima.ruta.rule.MatchContext;
-import org.apache.uima.ruta.rule.RuleElement;
import org.apache.uima.ruta.visitor.InferenceCrowd;
public class AddFilterTypeAction extends AbstractRutaAction {
@@ -44,7 +43,6 @@ public class AddFilterTypeAction extends
@Override
public void execute(MatchContext context, RutaStream stream, InferenceCrowd crowd) {
- RuleElement element = context.getElement();
List<Type> types = new ArrayList<Type>();
for (TypeExpression each : list) {
types.add(each.getType(context, stream));
Modified: uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/AddRetainTypeAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/AddRetainTypeAction.java?rev=1712996&r1=1712995&r2=1712996&view=diff
==============================================================================
--- uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/AddRetainTypeAction.java (original)
+++ uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/AddRetainTypeAction.java Fri Nov 6 17:56:45 2015
@@ -26,7 +26,6 @@ import org.apache.uima.cas.Type;
import org.apache.uima.ruta.RutaStream;
import org.apache.uima.ruta.expression.type.TypeExpression;
import org.apache.uima.ruta.rule.MatchContext;
-import org.apache.uima.ruta.rule.RuleElement;
import org.apache.uima.ruta.visitor.InferenceCrowd;
public class AddRetainTypeAction extends AbstractRutaAction {
@@ -44,7 +43,6 @@ public class AddRetainTypeAction extends
@Override
public void execute(MatchContext context, RutaStream stream, InferenceCrowd crowd) {
- RuleElement element = context.getElement();
List<Type> types = new ArrayList<Type>();
for (TypeExpression each : list) {
types.add(each.getType(context, stream));
Modified: uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/AssignAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/AssignAction.java?rev=1712996&r1=1712995&r2=1712996&view=diff
==============================================================================
--- uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/AssignAction.java (original)
+++ uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/AssignAction.java Fri Nov 6 17:56:45 2015
@@ -30,7 +30,6 @@ import org.apache.uima.ruta.expression.s
import org.apache.uima.ruta.expression.type.TypeExpression;
import org.apache.uima.ruta.rule.MatchContext;
import org.apache.uima.ruta.rule.RuleElement;
-import org.apache.uima.ruta.rule.RuleMatch;
import org.apache.uima.ruta.visitor.InferenceCrowd;
public class AssignAction extends AbstractRutaAction {
@@ -47,8 +46,7 @@ public class AssignAction extends Abstra
@Override
public void execute(MatchContext context, RutaStream stream, InferenceCrowd crowd) {
- RuleMatch match = context.getRuleMatch();
- RuleElement element = context.getElement();
+ RuleElement element = context.getElement();
RutaBlock parent = element.getParent();
RutaEnvironment environment = parent.getEnvironment();
Class<?> clazz = environment.getVariableType(var);
Modified: uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/CallAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/CallAction.java?rev=1712996&r1=1712995&r2=1712996&view=diff
==============================================================================
--- uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/CallAction.java (original)
+++ uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/CallAction.java Fri Nov 6 17:56:45 2015
@@ -56,8 +56,7 @@ public class CallAction extends Abstract
@Override
public void execute(MatchContext context, RutaStream stream, InferenceCrowd crowd) {
- RuleMatch match = context.getRuleMatch();
- RuleElement element = context.getElement();
+ RuleElement element = context.getElement();
RutaModule thisScript = element.getParent().getScript();
AnalysisEngine targetEngine = thisScript.getEngine(namespace);
if (targetEngine != null) {
@@ -79,7 +78,8 @@ public class CallAction extends Abstract
}
- protected void callScript(RutaBlock block, MatchContext context, RutaStream stream, InferenceCrowd crowd) {
+ protected void callScript(RutaBlock block, MatchContext context, RutaStream stream,
+ InferenceCrowd crowd) {
RuleElement element = context.getElement();
RuleMatch match = context.getRuleMatch();
List<AnnotationFS> matchedAnnotationsOf = match.getMatchedAnnotationsOfElement(element);
@@ -92,13 +92,13 @@ public class CallAction extends Abstract
}
- protected void callEngine(MatchContext context, InferenceCrowd crowd, AnalysisEngine targetEngine,
- RutaStream stream) throws ResourceInitializationException,
+ protected void callEngine(MatchContext context, InferenceCrowd crowd,
+ AnalysisEngine targetEngine, RutaStream stream) throws ResourceInitializationException,
AnalysisEngineProcessException {
RuleElement element = context.getElement();
RuleMatch match = context.getRuleMatch();
-
+
List<AnnotationFS> matchedAnnotations = match.getMatchedAnnotations(null,
element.getContainer());
for (AnnotationFS matchedAnnotation : matchedAnnotations) {
Modified: uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/ClearAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/ClearAction.java?rev=1712996&r1=1712995&r2=1712996&view=diff
==============================================================================
--- uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/ClearAction.java (original)
+++ uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/ClearAction.java Fri Nov 6 17:56:45 2015
@@ -35,7 +35,7 @@ public class ClearAction extends Abstrac
@Override
public void execute(MatchContext context, RutaStream stream, InferenceCrowd crowd) {
- RuleElement element = context.getElement();
+ RuleElement element = context.getElement();
element.getParent().getEnvironment().setVariableValue(list, null);
}
Modified: uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/ColorAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/ColorAction.java?rev=1712996&r1=1712995&r2=1712996&view=diff
==============================================================================
--- uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/ColorAction.java (original)
+++ uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/ColorAction.java Fri Nov 6 17:56:45 2015
@@ -21,7 +21,6 @@ package org.apache.uima.ruta.action;
import org.apache.uima.cas.FeatureStructure;
import org.apache.uima.cas.Type;
-import org.apache.uima.ruta.RutaBlock;
import org.apache.uima.ruta.RutaStream;
import org.apache.uima.ruta.expression.bool.IBooleanExpression;
import org.apache.uima.ruta.expression.bool.SimpleBooleanExpression;
@@ -30,7 +29,6 @@ import org.apache.uima.ruta.expression.s
import org.apache.uima.ruta.expression.type.TypeExpression;
import org.apache.uima.ruta.rule.MatchContext;
import org.apache.uima.ruta.rule.RuleElement;
-import org.apache.uima.ruta.rule.RuleMatch;
import org.apache.uima.ruta.type.RutaColoring;
import org.apache.uima.ruta.visitor.InferenceCrowd;
@@ -55,14 +53,13 @@ public class ColorAction extends Abstrac
@Override
public void execute(MatchContext context, RutaStream stream, InferenceCrowd crowd) {
- RuleMatch match = context.getRuleMatch();
- RuleElement element = context.getElement();
+ RuleElement element = context.getElement();
Type casType = stream.getJCas().getCasType(RutaColoring.type);
FeatureStructure newAnnotationFS = stream.getCas().createFS(casType);
RutaColoring coloring = null;
if (newAnnotationFS instanceof RutaColoring) {
coloring = (RutaColoring) newAnnotationFS;
- RutaBlock parent = element.getParent();
+ element.getParent();
coloring.setBgColor(bgcolor.getStringValue(context, stream));
coloring.setFgColor(fgcolor.getStringValue(context, stream));
coloring.setSelected(selected.getBooleanValue(context, stream));
Modified: uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/ConfigureAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/ConfigureAction.java?rev=1712996&r1=1712995&r2=1712996&view=diff
==============================================================================
--- uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/ConfigureAction.java (original)
+++ uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/ConfigureAction.java Fri Nov 6 17:56:45 2015
@@ -44,7 +44,6 @@ import org.apache.uima.ruta.expression.s
import org.apache.uima.ruta.expression.type.TypeExpression;
import org.apache.uima.ruta.rule.MatchContext;
import org.apache.uima.ruta.rule.RuleElement;
-import org.apache.uima.ruta.rule.RuleMatch;
import org.apache.uima.ruta.visitor.InferenceCrowd;
public class ConfigureAction extends AbstractRutaAction {
@@ -61,8 +60,7 @@ public class ConfigureAction extends Abs
@Override
public void execute(MatchContext context, RutaStream stream, InferenceCrowd crowd) {
- RuleMatch match = context.getRuleMatch();
- RuleElement element = context.getElement();
+ RuleElement element = context.getElement();
RutaBlock parent = element.getParent();
RutaModule thisScript = parent.getScript();
AnalysisEngine targetEngine = thisScript.getEngine(namespace);
Modified: uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/CreateAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/CreateAction.java?rev=1712996&r1=1712995&r2=1712996&view=diff
==============================================================================
--- uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/CreateAction.java (original)
+++ uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/CreateAction.java Fri Nov 6 17:56:45 2015
@@ -47,8 +47,8 @@ public class CreateAction extends Abstra
private List<INumberExpression> indexes;
- public CreateAction(TypeExpression structureType, Map<IStringExpression, IRutaExpression> features,
- List<INumberExpression> indexes) {
+ public CreateAction(TypeExpression structureType,
+ Map<IStringExpression, IRutaExpression> features, List<INumberExpression> indexes) {
super();
this.structureType = structureType;
this.features = features == null ? new HashMap<IStringExpression, IRutaExpression>() : features;
@@ -57,8 +57,8 @@ public class CreateAction extends Abstra
@Override
public void execute(MatchContext context, RutaStream stream, InferenceCrowd crowd) {
- RuleMatch match = context.getRuleMatch();
- RuleElement element = context.getElement();
+ RuleMatch match = context.getRuleMatch();
+ RuleElement element = context.getElement();
List<Integer> indexList = getIndexList(context, stream);
List<AnnotationFS> matchedAnnotations = match.getMatchedAnnotations(indexList,
element.getContainer());
Modified: uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/DelAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/DelAction.java?rev=1712996&r1=1712995&r2=1712996&view=diff
==============================================================================
--- uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/DelAction.java (original)
+++ uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/DelAction.java Fri Nov 6 17:56:45 2015
@@ -37,8 +37,8 @@ public class DelAction extends AbstractR
@Override
public void execute(MatchContext context, RutaStream stream, InferenceCrowd crowd) {
- RuleMatch match = context.getRuleMatch();
- RuleElement element = context.getElement();
+ RuleMatch match = context.getRuleMatch();
+ RuleElement element = context.getElement();
List<AnnotationFS> matchedAnnotationsOf = match.getMatchedAnnotationsOfElement(element);
for (AnnotationFS annotationFS : matchedAnnotationsOf) {
List<RutaBasic> basicsInWindow = stream.getBasicsInWindow(annotationFS);
Modified: uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/DynamicAnchoringAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/DynamicAnchoringAction.java?rev=1712996&r1=1712995&r2=1712996&view=diff
==============================================================================
--- uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/DynamicAnchoringAction.java (original)
+++ uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/DynamicAnchoringAction.java Fri Nov 6 17:56:45 2015
@@ -19,13 +19,10 @@
package org.apache.uima.ruta.action;
-import org.apache.uima.ruta.RutaBlock;
import org.apache.uima.ruta.RutaStream;
import org.apache.uima.ruta.expression.bool.IBooleanExpression;
import org.apache.uima.ruta.expression.number.INumberExpression;
import org.apache.uima.ruta.rule.MatchContext;
-import org.apache.uima.ruta.rule.RuleElement;
-import org.apache.uima.ruta.rule.RuleMatch;
import org.apache.uima.ruta.visitor.InferenceCrowd;
public class DynamicAnchoringAction extends AbstractRutaAction {
@@ -46,9 +43,7 @@ public class DynamicAnchoringAction exte
@Override
public void execute(MatchContext context, RutaStream stream, InferenceCrowd crowd) {
- RuleMatch match = context.getRuleMatch();
- RuleElement element = context.getElement();
- RutaBlock parent = element.getParent();
+ context.getElement();
boolean activated = active.getBooleanValue(context, stream);
stream.setDynamicAnchoring(activated);
if (panelty != null) {
Modified: uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/ExecAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/ExecAction.java?rev=1712996&r1=1712995&r2=1712996&view=diff
==============================================================================
--- uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/ExecAction.java (original)
+++ uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/ExecAction.java Fri Nov 6 17:56:45 2015
@@ -40,8 +40,6 @@ import org.apache.uima.ruta.ScriptApply;
import org.apache.uima.ruta.expression.list.TypeListExpression;
import org.apache.uima.ruta.expression.string.IStringExpression;
import org.apache.uima.ruta.rule.MatchContext;
-import org.apache.uima.ruta.rule.RuleElement;
-import org.apache.uima.ruta.rule.RuleMatch;
import org.apache.uima.ruta.visitor.InferenceCrowd;
import org.apache.uima.util.XMLInputSource;
@@ -62,15 +60,15 @@ public class ExecAction extends CallActi
}
@Override
- protected void callScript(RutaBlock block, MatchContext context,
- RutaStream stream, InferenceCrowd crowd) {
+ protected void callScript(RutaBlock block, MatchContext context, RutaStream stream,
+ InferenceCrowd crowd) {
ScriptApply apply = block.apply(stream, crowd);
context.getRuleMatch().addDelegateApply(this, apply);
}
@Override
- protected void callEngine(MatchContext context, InferenceCrowd crowd, AnalysisEngine targetEngine,
- RutaStream stream) throws ResourceInitializationException,
+ protected void callEngine(MatchContext context, InferenceCrowd crowd,
+ AnalysisEngine targetEngine, RutaStream stream) throws ResourceInitializationException,
AnalysisEngineProcessException {
CAS cas = stream.getCas();
if (view != null) {
@@ -109,8 +107,7 @@ public class ExecAction extends CallActi
}
}
}
-
-
+
}
public TypeListExpression getTypeList() {
Modified: uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/FillAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/FillAction.java?rev=1712996&r1=1712995&r2=1712996&view=diff
==============================================================================
--- uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/FillAction.java (original)
+++ uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/FillAction.java Fri Nov 6 17:56:45 2015
@@ -48,8 +48,8 @@ public class FillAction extends Abstract
@Override
public void execute(MatchContext context, RutaStream stream, InferenceCrowd crowd) {
- RuleMatch match = context.getRuleMatch();
- RuleElement element = context.getElement();
+ RuleMatch match = context.getRuleMatch();
+ RuleElement element = context.getElement();
List<AnnotationFS> matchedAnnotations = match.getMatchedAnnotationsOfElement(element);
for (AnnotationFS matchedAnnotation : matchedAnnotations) {
if (matchedAnnotation == null) {
Modified: uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/FilterTypeAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/FilterTypeAction.java?rev=1712996&r1=1712995&r2=1712996&view=diff
==============================================================================
--- uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/FilterTypeAction.java (original)
+++ uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/FilterTypeAction.java Fri Nov 6 17:56:45 2015
@@ -26,7 +26,6 @@ import org.apache.uima.cas.Type;
import org.apache.uima.ruta.RutaStream;
import org.apache.uima.ruta.expression.type.TypeExpression;
import org.apache.uima.ruta.rule.MatchContext;
-import org.apache.uima.ruta.rule.RuleElement;
import org.apache.uima.ruta.visitor.InferenceCrowd;
public class FilterTypeAction extends AbstractRutaAction {
@@ -44,7 +43,7 @@ public class FilterTypeAction extends Ab
@Override
public void execute(MatchContext context, RutaStream stream, InferenceCrowd crowd) {
- RuleElement element = context.getElement();
+ context.getElement();
List<Type> types = new ArrayList<Type>();
for (TypeExpression each : list) {
types.add(each.getType(context, stream));
Modified: uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/GatherAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/GatherAction.java?rev=1712996&r1=1712995&r2=1712996&view=diff
==============================================================================
--- uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/GatherAction.java (original)
+++ uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/GatherAction.java Fri Nov 6 17:56:45 2015
@@ -37,7 +37,6 @@ import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.cas.FSArray;
import org.apache.uima.jcas.cas.TOP;
import org.apache.uima.jcas.tcas.Annotation;
-import org.apache.uima.ruta.RutaBlock;
import org.apache.uima.ruta.RutaStream;
import org.apache.uima.ruta.expression.IRutaExpression;
import org.apache.uima.ruta.expression.list.NumberListExpression;
@@ -70,8 +69,8 @@ public class GatherAction extends Abstra
@Override
public void execute(MatchContext context, RutaStream stream, InferenceCrowd crowd) {
- RuleMatch match = context.getRuleMatch();
- RuleElement element = context.getElement();
+ RuleMatch match = context.getRuleMatch();
+ RuleElement element = context.getElement();
List<Integer> indexList = getIndexList(context, stream);
List<AnnotationFS> matchedAnnotations = match.getMatchedAnnotations(indexList,
element.getContainer());
@@ -101,7 +100,7 @@ public class GatherAction extends Abstra
AnnotationFS matchedAnnotation, MatchContext context, RutaStream stream) {
Map<String, List<Number>> map = new HashMap<String, List<Number>>();
for (Entry<IStringExpression, IRutaExpression> each : features.entrySet()) {
- RutaBlock parent = context.getParent();
+ context.getParent();
String value = each.getKey().getStringValue(context, stream);
IRutaExpression expr = each.getValue();
List<Number> ints = new ArrayList<Number>();
@@ -126,7 +125,8 @@ public class GatherAction extends Abstra
if (reIndexes != null && !reIndexes.isEmpty()) {
Type range = targetFeature.getRange();
- List<RuleElementMatch> tms = getMatchInfo(context.getRuleMatch(), context.getElement(), reIndexes);
+ List<RuleElementMatch> tms = getMatchInfo(context.getRuleMatch(), context.getElement(),
+ reIndexes);
if (tms.size() == 0) {// do nothing
} else if (tms.size() == 1) {
Modified: uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/GetAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/GetAction.java?rev=1712996&r1=1712995&r2=1712996&view=diff
==============================================================================
--- uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/GetAction.java (original)
+++ uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/GetAction.java Fri Nov 6 17:56:45 2015
@@ -29,7 +29,6 @@ import org.apache.uima.ruta.expression.l
import org.apache.uima.ruta.expression.string.IStringExpression;
import org.apache.uima.ruta.rule.MatchContext;
import org.apache.uima.ruta.rule.RuleElement;
-import org.apache.uima.ruta.rule.RuleMatch;
import org.apache.uima.ruta.visitor.InferenceCrowd;
public class GetAction extends AbstractRutaAction {
@@ -49,8 +48,8 @@ public class GetAction extends AbstractR
@Override
public void execute(MatchContext context, RutaStream stream, InferenceCrowd crowd) {
- RuleMatch match = context.getRuleMatch();
- RuleElement element = context.getElement();
+ context.getRuleMatch();
+ RuleElement element = context.getElement();
RutaBlock parent = element.getParent();
String op = opExpr.getStringValue(context, stream);
List<?> list = listExpr.getList(context, stream);
Modified: uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/GetFeatureAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/GetFeatureAction.java?rev=1712996&r1=1712995&r2=1712996&view=diff
==============================================================================
--- uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/GetFeatureAction.java (original)
+++ uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/GetFeatureAction.java Fri Nov 6 17:56:45 2015
@@ -50,8 +50,8 @@ public class GetFeatureAction extends Ab
@Override
public void execute(MatchContext context, RutaStream stream, InferenceCrowd crowd) {
- RuleMatch match = context.getRuleMatch();
- RuleElement element = context.getElement();
+ RuleMatch match = context.getRuleMatch();
+ RuleElement element = context.getElement();
List<Type> types = new ArrayList<Type>();
RutaBlock parent = element.getParent();
if (element instanceof RutaRuleElement) {
Modified: uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/GetListAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/GetListAction.java?rev=1712996&r1=1712995&r2=1712996&view=diff
==============================================================================
--- uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/GetListAction.java (original)
+++ uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/GetListAction.java Fri Nov 6 17:56:45 2015
@@ -57,8 +57,8 @@ public class GetListAction extends Abstr
@SuppressWarnings("unchecked")
@Override
public void execute(MatchContext context, RutaStream stream, InferenceCrowd crowd) {
- RuleMatch match = context.getRuleMatch();
- RuleElement element = context.getElement();
+ RuleMatch match = context.getRuleMatch();
+ RuleElement element = context.getElement();
RutaBlock parent = element.getParent();
String op = opExpr.getStringValue(context, stream);
List<Type> list = new ArrayList<Type>();
@@ -75,7 +75,7 @@ public class GetListAction extends Abstr
Collection<?>[] beginMap = beginAnchor.getBeginMap();
Set<AnnotationFS> aset = new HashSet<AnnotationFS>();
for (Collection<?> set : beginMap) {
- if(set != null) {
+ if (set != null) {
aset.addAll((Collection<? extends AnnotationFS>) set);
}
}
@@ -84,11 +84,11 @@ public class GetListAction extends Abstr
}
} else if (TYPES_AT_END.equals(op)) {
RutaBasic endAnchor = stream.getEndAnchor(matched.getEnd());
-// Collection<Set<AnnotationFS>> values = endAnchor.getEndMap().values();
+ // Collection<Set<AnnotationFS>> values = endAnchor.getEndMap().values();
Collection<?>[] endMap = endAnchor.getEndMap();
Set<AnnotationFS> aset = new HashSet<AnnotationFS>();
for (Collection<?> set : endMap) {
- if(set != null) {
+ if (set != null) {
aset.addAll((Collection<? extends AnnotationFS>) set);
}
}
Modified: uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/GreedyAnchoringAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/GreedyAnchoringAction.java?rev=1712996&r1=1712995&r2=1712996&view=diff
==============================================================================
--- uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/GreedyAnchoringAction.java (original)
+++ uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/GreedyAnchoringAction.java Fri Nov 6 17:56:45 2015
@@ -19,13 +19,11 @@
package org.apache.uima.ruta.action;
-import org.apache.uima.ruta.RutaBlock;
import org.apache.uima.ruta.RutaStream;
import org.apache.uima.ruta.expression.bool.IBooleanExpression;
import org.apache.uima.ruta.expression.bool.SimpleBooleanExpression;
import org.apache.uima.ruta.rule.MatchContext;
import org.apache.uima.ruta.rule.RuleElement;
-import org.apache.uima.ruta.rule.RuleMatch;
import org.apache.uima.ruta.visitor.InferenceCrowd;
public class GreedyAnchoringAction extends AbstractRutaAction {
@@ -33,7 +31,7 @@ public class GreedyAnchoringAction exten
private final IBooleanExpression greedyRuleElement;
private final IBooleanExpression greedyRule;
-
+
public GreedyAnchoringAction(IBooleanExpression active, IBooleanExpression active2) {
super();
this.greedyRuleElement = active;
@@ -42,9 +40,9 @@ public class GreedyAnchoringAction exten
@Override
public void execute(MatchContext context, RutaStream stream, InferenceCrowd crowd) {
- RuleMatch match = context.getRuleMatch();
- RuleElement element = context.getElement();
- RutaBlock parent = element.getParent();
+ context.getRuleMatch();
+ RuleElement element = context.getElement();
+ element.getParent();
boolean greedy1 = greedyRuleElement.getBooleanValue(context, stream);
boolean greedy2 = greedyRule.getBooleanValue(context, stream);
stream.setGreedyRuleElement(greedy1);
@@ -59,6 +57,4 @@ public class GreedyAnchoringAction exten
return greedyRule;
}
-
-
}
Modified: uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/ImplicitFeatureAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/ImplicitFeatureAction.java?rev=1712996&r1=1712995&r2=1712996&view=diff
==============================================================================
--- uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/ImplicitFeatureAction.java (original)
+++ uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/ImplicitFeatureAction.java Fri Nov 6 17:56:45 2015
@@ -62,8 +62,8 @@ public class ImplicitFeatureAction exten
@Override
public void execute(MatchContext context, RutaStream stream, InferenceCrowd crowd) {
- RuleMatch match = context.getRuleMatch();
- RuleElement element = context.getElement();
+ RuleMatch match = context.getRuleMatch();
+ RuleElement element = context.getElement();
TypeExpression typeExpr = expr.getTypeExpr(context, stream);
Type type = typeExpr.getType(context, stream);
List<AnnotationFS> matchedAnnotations = match.getMatchedAnnotationsOfElement(element);
@@ -75,7 +75,7 @@ public class ImplicitFeatureAction exten
stream.getCas().removeFsFromIndexes(each);
}
Collection<AnnotationFS> featureAnnotations = expr.getFeatureAnnotations(annotations, stream,
- context, false);
+ context, false);
if (featureAnnotations.isEmpty()) {
// null value in feature, but we require the host
featureAnnotations = annotations;
Modified: uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/ImplicitMarkAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/ImplicitMarkAction.java?rev=1712996&r1=1712995&r2=1712996&view=diff
==============================================================================
--- uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/ImplicitMarkAction.java (original)
+++ uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/ImplicitMarkAction.java Fri Nov 6 17:56:45 2015
@@ -37,8 +37,8 @@ public class ImplicitMarkAction extends
@Override
public void execute(MatchContext context, RutaStream stream, InferenceCrowd crowd) {
- RuleMatch match = context.getRuleMatch();
- RuleElement element = context.getElement();
+ RuleMatch match = context.getRuleMatch();
+ RuleElement element = context.getElement();
List<AnnotationFS> matchedAnnotations = match.getMatchedAnnotationsOfElement(element);
for (AnnotationFS matchedAnnotation : matchedAnnotations) {
if (matchedAnnotation == null) {
Modified: uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/LogAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/LogAction.java?rev=1712996&r1=1712995&r2=1712996&view=diff
==============================================================================
--- uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/LogAction.java (original)
+++ uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/LogAction.java Fri Nov 6 17:56:45 2015
@@ -22,17 +22,14 @@ package org.apache.uima.ruta.action;
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.apache.uima.ruta.RutaBlock;
import org.apache.uima.ruta.RutaStream;
import org.apache.uima.ruta.expression.string.IStringExpression;
import org.apache.uima.ruta.rule.MatchContext;
-import org.apache.uima.ruta.rule.RuleElement;
-import org.apache.uima.ruta.rule.RuleMatch;
import org.apache.uima.ruta.visitor.InferenceCrowd;
public class LogAction extends AbstractRutaAction {
- public static final String LOGGER_NAME = Logger.global.getName();
+ public static final String LOGGER_NAME = Logger.getGlobal().getName();
private final IStringExpression text;
Modified: uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkAction.java?rev=1712996&r1=1712995&r2=1712996&view=diff
==============================================================================
--- uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkAction.java (original)
+++ uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkAction.java Fri Nov 6 17:56:45 2015
@@ -47,8 +47,8 @@ public class MarkAction extends Abstract
@Override
public void execute(MatchContext context, RutaStream stream, InferenceCrowd crowd) {
- RuleMatch match = context.getRuleMatch();
- RuleElement element = context.getElement();
+ RuleMatch match = context.getRuleMatch();
+ RuleElement element = context.getElement();
List<Integer> indexList = getIndexList(context, list, stream);
List<AnnotationFS> matchedAnnotations = match.getMatchedAnnotations(indexList,
element.getContainer());
Modified: uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkFastAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkFastAction.java?rev=1712996&r1=1712995&r2=1712996&view=diff
==============================================================================
--- uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkFastAction.java (original)
+++ uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkFastAction.java Fri Nov 6 17:56:45 2015
@@ -23,7 +23,6 @@ import java.util.Collection;
import java.util.List;
import org.apache.uima.cas.text.AnnotationFS;
-import org.apache.uima.ruta.RutaBlock;
import org.apache.uima.ruta.RutaStream;
import org.apache.uima.ruta.expression.bool.IBooleanExpression;
import org.apache.uima.ruta.expression.bool.SimpleBooleanExpression;
@@ -73,13 +72,13 @@ public class MarkFastAction extends Abst
@Override
public void execute(MatchContext context, RutaStream stream, InferenceCrowd crowd) {
- RuleMatch match = context.getRuleMatch();
- RuleElement element = context.getElement();
+ RuleMatch match = context.getRuleMatch();
+ RuleElement element = context.getElement();
List<AnnotationFS> matchedAnnotationsOf = match.getMatchedAnnotationsOfElement(element);
for (AnnotationFS annotationFS : matchedAnnotationsOf) {
RutaStream windowStream = stream.getWindowStream(annotationFS, annotationFS.getType());
RutaWordList wl = null;
- RutaBlock parent = element.getParent();
+ element.getParent();
if (list != null) {
wl = list.getList(context);
} else if (stringList != null) {
Modified: uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkFirstAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkFirstAction.java?rev=1712996&r1=1712995&r2=1712996&view=diff
==============================================================================
--- uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkFirstAction.java (original)
+++ uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkFirstAction.java Fri Nov 6 17:56:45 2015
@@ -38,8 +38,8 @@ public class MarkFirstAction extends Abs
@Override
public void execute(MatchContext context, RutaStream stream, InferenceCrowd crowd) {
- RuleMatch match = context.getRuleMatch();
- RuleElement element = context.getElement();
+ RuleMatch match = context.getRuleMatch();
+ RuleElement element = context.getElement();
List<AnnotationFS> matchedAnnotations = match.getMatchedAnnotations(null,
element.getContainer());
for (AnnotationFS matchedAnnotation : matchedAnnotations) {
Modified: uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkLastAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkLastAction.java?rev=1712996&r1=1712995&r2=1712996&view=diff
==============================================================================
--- uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkLastAction.java (original)
+++ uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkLastAction.java Fri Nov 6 17:56:45 2015
@@ -38,8 +38,8 @@ public class MarkLastAction extends Abst
@Override
public void execute(MatchContext context, RutaStream stream, InferenceCrowd crowd) {
- RuleMatch match = context.getRuleMatch();
- RuleElement element = context.getElement();
+ RuleMatch match = context.getRuleMatch();
+ RuleElement element = context.getElement();
List<AnnotationFS> matchedAnnotations = match.getMatchedAnnotations(null,
element.getContainer());
for (AnnotationFS matchedAnnotation : matchedAnnotations) {
Modified: uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkOnceAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkOnceAction.java?rev=1712996&r1=1712995&r2=1712996&view=diff
==============================================================================
--- uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkOnceAction.java (original)
+++ uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkOnceAction.java Fri Nov 6 17:56:45 2015
@@ -41,8 +41,8 @@ public class MarkOnceAction extends Mark
@Override
public void execute(MatchContext context, RutaStream stream, InferenceCrowd crowd) {
- RuleMatch match = context.getRuleMatch();
- RuleElement element = context.getElement();
+ RuleMatch match = context.getRuleMatch();
+ RuleElement element = context.getElement();
List<Integer> indexList = getIndexList(context, list, stream);
List<AnnotationFS> matchedAnnotations = match.getMatchedAnnotations(indexList,
element.getContainer());
Modified: uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkTableAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkTableAction.java?rev=1712996&r1=1712995&r2=1712996&view=diff
==============================================================================
--- uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkTableAction.java (original)
+++ uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkTableAction.java Fri Nov 6 17:56:45 2015
@@ -31,7 +31,6 @@ import org.apache.uima.cas.Type;
import org.apache.uima.cas.text.AnnotationFS;
import org.apache.uima.jcas.cas.TOP;
import org.apache.uima.jcas.tcas.Annotation;
-import org.apache.uima.ruta.RutaBlock;
import org.apache.uima.ruta.RutaStream;
import org.apache.uima.ruta.UIMAConstants;
import org.apache.uima.ruta.expression.bool.IBooleanExpression;
@@ -64,7 +63,7 @@ public class MarkTableAction extends Abs
private final IStringExpression ignoreChar;
private final INumberExpression maxIgnoreChar;
-
+
private IBooleanExpression ignoreWS = new SimpleBooleanExpression(true);
public MarkTableAction(TypeExpression typeExpr, INumberExpression indexExpr,
@@ -81,31 +80,32 @@ public class MarkTableAction extends Abs
this.ignoreChar = ignoreChar;
this.maxIgnoreChar = maxIgnoreChar;
}
-
+
public void setIgnoreWS(IBooleanExpression ignoreWS) {
this.ignoreWS = ignoreWS;
}
@Override
public void execute(MatchContext context, RutaStream stream, InferenceCrowd crowd) {
- RuleMatch match = context.getRuleMatch();
- RuleElement element = context.getElement();
- RutaBlock block = element.getParent();
+ RuleMatch match = context.getRuleMatch();
+ RuleElement element = context.getElement();
+ element.getParent();
RutaTable table = tableExpr.getTable(context);
int index = indexExpr.getIntegerValue(context, stream);
Type type = typeExpr.getType(context, stream);
Map<String, Integer> map = new HashMap<String, Integer>();
for (IStringExpression each : featureMap.keySet()) {
- map.put(each.getStringValue(context, stream), featureMap.get(each)
- .getIntegerValue(context, stream));
+ map.put(each.getStringValue(context, stream),
+ featureMap.get(each).getIntegerValue(context, stream));
}
- boolean ignoreCaseValue = ignoreCase != null ? ignoreCase.getBooleanValue(context, stream) : false;
- int ignoreLengthValue = ignoreLength != null ? ignoreLength.getIntegerValue(
- context, stream) : 0;
+ boolean ignoreCaseValue = ignoreCase != null ? ignoreCase.getBooleanValue(context, stream)
+ : false;
+ int ignoreLengthValue = ignoreLength != null ? ignoreLength.getIntegerValue(context, stream)
+ : 0;
String ignoreCharValue = ignoreChar != null ? ignoreChar.getStringValue(context, stream) : "";
- int maxIgnoreCharValue = maxIgnoreChar != null ? maxIgnoreChar.getIntegerValue(
- context, stream) : 0;
+ int maxIgnoreCharValue = maxIgnoreChar != null ? maxIgnoreChar.getIntegerValue(context, stream)
+ : 0;
boolean ignoreWSValue = ignoreWS != null ? ignoreWS.getBooleanValue(context, stream) : false;
RutaWordList wordList = table.getWordList(index, element.getParent());
@@ -114,7 +114,7 @@ public class MarkTableAction extends Abs
for (AnnotationFS annotationFS : found) {
// HOTFIX: for feature assignment
String candidate = stream.getVisibleCoveredText(annotationFS);
- if(!StringUtils.isBlank(ignoreCharValue)) {
+ if (!StringUtils.isBlank(ignoreCharValue)) {
for (int i = 0; i < maxIgnoreCharValue; i++) {
candidate = candidate.replaceFirst("[" + ignoreCharValue + "]", "");
}
Modified: uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/MatchedTextAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/MatchedTextAction.java?rev=1712996&r1=1712995&r2=1712996&view=diff
==============================================================================
--- uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/MatchedTextAction.java (original)
+++ uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/MatchedTextAction.java Fri Nov 6 17:56:45 2015
@@ -44,8 +44,8 @@ public class MatchedTextAction extends A
@Override
public void execute(MatchContext context, RutaStream stream, InferenceCrowd crowd) {
- RuleMatch match = context.getRuleMatch();
- RuleElement element = context.getElement();
+ RuleMatch match = context.getRuleMatch();
+ RuleElement element = context.getElement();
List<Integer> indexList = getIndexList(context, stream);
List<AnnotationFS> matchedAnnotations = match.getMatchedAnnotations(indexList,
element.getContainer());
Modified: uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/MergeAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/MergeAction.java?rev=1712996&r1=1712995&r2=1712996&view=diff
==============================================================================
--- uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/MergeAction.java (original)
+++ uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/action/MergeAction.java Fri Nov 6 17:56:45 2015
@@ -28,7 +28,6 @@ import org.apache.uima.ruta.expression.b
import org.apache.uima.ruta.expression.list.ListExpression;
import org.apache.uima.ruta.rule.MatchContext;
import org.apache.uima.ruta.rule.RuleElement;
-import org.apache.uima.ruta.rule.RuleMatch;
import org.apache.uima.ruta.visitor.InferenceCrowd;
public class MergeAction extends AbstractRutaAction {
@@ -51,8 +50,8 @@ public class MergeAction extends Abstrac
@SuppressWarnings({ "unchecked", "rawtypes" })
@Override
public void execute(MatchContext context, RutaStream stream, InferenceCrowd crowd) {
- RuleMatch match = context.getRuleMatch();
- RuleElement element = context.getElement();
+ context.getRuleMatch();
+ RuleElement element = context.getElement();
boolean union = unionExpr.getBooleanValue(context, stream);
List<Object> list = new ArrayList<Object>();
if (union) {