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 2013/04/29 16:09:55 UTC
svn commit: r1477088 [1/3] - in /uima/sandbox/ruta/trunk/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/engine/ main/java/org/apache/uima/ru...
Author: pkluegl
Date: Mon Apr 29 14:09:53 2013
New Revision: 1477088
URL: http://svn.apache.org/r1477088
Log:
UIMA-2850
- renaming
Added:
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaAutomataBlock.java
- copied, changed from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/TextMarkerAutomataBlock.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaAutomataFactory.java
- copied, changed from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/TextMarkerAutomataFactory.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaBlock.java
- copied, changed from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/TextMarkerBlock.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaElement.java
- copied, changed from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/TextMarkerElement.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaEnvironment.java
- copied, changed from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/TextMarkerEnvironment.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaModule.java
- copied, changed from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/TextMarkerModule.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaScriptBlock.java
- copied, changed from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/TextMarkerScriptBlock.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaScriptFactory.java
- copied, changed from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/TextMarkerScriptFactory.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaStatement.java
- copied, changed from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/TextMarkerStatement.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java
- copied, changed from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/TextMarkerStream.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/AbstractRutaAction.java
- copied, changed from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/AbstractTextMarkerAction.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/AbstractRutaCondition.java
- copied, changed from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/AbstractTextMarkerCondition.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ComposedRutaCondition.java
- copied, changed from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ComposedTextMarkerCondition.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/TerminalRutaCondition.java
- copied, changed from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/TerminalTextMarkerCondition.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/Ruta.java
- copied, changed from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/TextMarker.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java
- copied, changed from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/TextMarkerEngine.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaModifier.java
- copied, changed from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/TextMarkerModifier.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/RutaExpression.java
- copied, changed from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/TextMarkerExpression.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaActionExtension.java
- copied, changed from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/ITextMarkerActionExtension.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaBooleanFunctionExtension.java
- copied, changed from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/ITextMarkerBooleanFunctionExtension.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaConditionExtension.java
- copied, changed from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/ITextMarkerConditionExtension.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaExtension.java
- copied, changed from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/ITextMarkerExtension.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaNumberFunctionExtension.java
- copied, changed from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/ITextMarkerNumberFunctionExtension.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaStringFunctionExtension.java
- copied, changed from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/ITextMarkerStringFunctionExtension.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaTypeFunctionExtension.java
- copied, changed from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/ITextMarkerTypeFunctionExtension.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/RutaEngineLoader.java
- copied, changed from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/TextMarkerEngineLoader.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/RutaExternalFactory.java
- copied, changed from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/TextMarkerExternalFactory.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/RutaTable.java
- copied, changed from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/TextMarkerTable.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/RutaWordList.java
- copied, changed from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/TextMarkerWordList.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RutaDisjunctiveMatcher.java
- copied, changed from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/TextMarkerDisjunctiveMatcher.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RutaLiteralMatcher.java
- copied, changed from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/TextMarkerLiteralMatcher.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RutaMatcher.java
- copied, changed from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/TextMarkerMatcher.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RutaRule.java
- copied, changed from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/TextMarkerRule.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RutaRuleElement.java
- copied, changed from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/TextMarkerRuleElement.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RutaTypeMatcher.java
- copied, changed from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/TextMarkerTypeMatcher.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/seed/RutaAnnotationSeeder.java
- copied, changed from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/seed/TextMarkerAnnotationSeeder.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/type/RutaAnnotation.java
- copied, changed from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/type/TextMarkerAnnotation.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/type/RutaAnnotation_Type.java
- copied, changed from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/type/TextMarkerAnnotation_Type.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/type/RutaBasic.java
- copied, changed from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/type/TextMarkerBasic.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/type/RutaBasic_Type.java
- copied, changed from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/type/TextMarkerBasic_Type.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/type/RutaColoring.java
- copied, changed from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/type/TextMarkerColoring.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/type/RutaColoring_Type.java
- copied, changed from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/type/TextMarkerColoring_Type.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/type/RutaFrame.java
- copied, changed from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/type/TextMarkerFrame.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/type/RutaFrame_Type.java
- copied, changed from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/type/TextMarkerFrame_Type.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/verbalize/RutaVerbalizer.java
- copied, changed from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/verbalize/TextMarkerVerbalizer.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/visitor/RutaInferenceVisitor.java
- copied, changed from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/visitor/TextMarkerInferenceVisitor.java
uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/RutaTestUtils.java
- copied, changed from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/TextMarkerTestUtils.java
uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/RutaModifierTest.java
- copied, changed from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/TextMarkerModifierTest.java
uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/RutaTest.java
- copied, changed from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/TextMarkerTest.java
Removed:
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/TextMarkerAutomataBlock.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/TextMarkerAutomataFactory.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/TextMarkerBlock.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/TextMarkerElement.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/TextMarkerEnvironment.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/TextMarkerModule.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/TextMarkerScriptBlock.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/TextMarkerScriptFactory.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/TextMarkerStatement.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/TextMarkerStream.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/AbstractTextMarkerAction.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/AbstractTextMarkerCondition.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ComposedTextMarkerCondition.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/TerminalTextMarkerCondition.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/TextMarker.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/TextMarkerEngine.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/TextMarkerModifier.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/TextMarkerExpression.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/ITextMarkerActionExtension.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/ITextMarkerBooleanFunctionExtension.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/ITextMarkerConditionExtension.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/ITextMarkerExtension.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/ITextMarkerNumberFunctionExtension.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/ITextMarkerStringFunctionExtension.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/ITextMarkerTypeFunctionExtension.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/TextMarkerEngineLoader.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/TextMarkerExternalFactory.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/TextMarkerTable.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/TextMarkerWordList.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/TextMarkerDisjunctiveMatcher.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/TextMarkerLiteralMatcher.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/TextMarkerMatcher.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/TextMarkerRule.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/TextMarkerRuleElement.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/TextMarkerTypeMatcher.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/seed/TextMarkerAnnotationSeeder.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/type/TextMarkerAnnotation.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/type/TextMarkerAnnotation_Type.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/type/TextMarkerBasic.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/type/TextMarkerBasic_Type.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/type/TextMarkerColoring.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/type/TextMarkerColoring_Type.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/type/TextMarkerFrame.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/type/TextMarkerFrame_Type.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/verbalize/TextMarkerVerbalizer.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/visitor/TextMarkerInferenceVisitor.java
uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/TextMarkerTestUtils.java
uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/TextMarkerModifierTest.java
uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/TextMarkerTest.java
Copied: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaAutomataBlock.java (from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/TextMarkerAutomataBlock.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaAutomataBlock.java?p2=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaAutomataBlock.java&p1=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/TextMarkerAutomataBlock.java&r1=1477049&r2=1477088&rev=1477088&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/TextMarkerAutomataBlock.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaAutomataBlock.java Mon Apr 29 14:09:53 2013
@@ -17,29 +17,29 @@
* under the License.
*/
-package org.apache.uima.textmarker;
+package org.apache.uima.ruta;
import java.util.List;
import org.apache.uima.cas.Type;
import org.apache.uima.cas.text.AnnotationFS;
-import org.apache.uima.textmarker.rule.AbstractRule;
-import org.apache.uima.textmarker.rule.AbstractRuleMatch;
-import org.apache.uima.textmarker.rule.RuleApply;
-import org.apache.uima.textmarker.rule.RuleMatch;
-import org.apache.uima.textmarker.rule.TextMarkerRule;
-import org.apache.uima.textmarker.rule.TextMarkerRuleElement;
-import org.apache.uima.textmarker.visitor.InferenceCrowd;
+import org.apache.uima.ruta.rule.AbstractRule;
+import org.apache.uima.ruta.rule.AbstractRuleMatch;
+import org.apache.uima.ruta.rule.RuleApply;
+import org.apache.uima.ruta.rule.RuleMatch;
+import org.apache.uima.ruta.rule.RutaRule;
+import org.apache.uima.ruta.rule.RutaRuleElement;
+import org.apache.uima.ruta.visitor.InferenceCrowd;
-public class TextMarkerAutomataBlock extends TextMarkerBlock {
+public class RutaAutomataBlock extends RutaBlock {
- public TextMarkerAutomataBlock(String id, TextMarkerRule rule,
- List<TextMarkerStatement> elements, TextMarkerBlock parent, String defaultNamespace) {
+ public RutaAutomataBlock(String id, RutaRule rule,
+ List<RutaStatement> elements, RutaBlock parent, String defaultNamespace) {
super(id, rule, elements, parent, defaultNamespace);
}
@Override
- public ScriptApply apply(TextMarkerStream stream, InferenceCrowd crowd) {
+ public ScriptApply apply(RutaStream stream, InferenceCrowd crowd) {
BlockApply result = new BlockApply(this);
crowd.beginVisit(this, result);
RuleApply apply = rule.apply(stream, crowd, true);
@@ -50,11 +50,11 @@ public class TextMarkerAutomataBlock ext
if (each == null) {
continue;
}
- List<Type> types = ((TextMarkerRuleElement) rule.getRuleElements().get(0)).getMatcher()
+ List<Type> types = ((RutaRuleElement) rule.getRuleElements().get(0)).getMatcher()
.getTypes(getParent(), stream);
for (Type eachType : types) {
- TextMarkerStream window = stream.getWindowStream(each, eachType);
- for (TextMarkerStatement element : getElements()) {
+ RutaStream window = stream.getWindowStream(each, eachType);
+ for (RutaStatement element : getElements()) {
if (element != null) {
element.apply(window, crowd);
}
@@ -72,7 +72,7 @@ public class TextMarkerAutomataBlock ext
return "RULES(" + name + ") " + ruleString + " containing " + elements.size() + " Elements";
}
- public void setMatchRule(TextMarkerRule rule) {
+ public void setMatchRule(RutaRule rule) {
this.rule = rule;
}
Copied: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaAutomataFactory.java (from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/TextMarkerAutomataFactory.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaAutomataFactory.java?p2=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaAutomataFactory.java&p1=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/TextMarkerAutomataFactory.java&r1=1477049&r2=1477088&rev=1477088&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/TextMarkerAutomataFactory.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaAutomataFactory.java Mon Apr 29 14:09:53 2013
@@ -17,17 +17,17 @@
* under the License.
*/
-package org.apache.uima.textmarker;
+package org.apache.uima.ruta;
import java.util.List;
import org.antlr.runtime.Token;
-import org.apache.uima.textmarker.rule.TextMarkerRuleElement;
+import org.apache.uima.ruta.rule.RutaRuleElement;
-public class TextMarkerAutomataFactory extends TextMarkerScriptFactory {
+public class RutaAutomataFactory extends RutaScriptFactory {
- public TextMarkerBlock createAutomataBlock(Token id, TextMarkerRuleElement re,
- List<TextMarkerStatement> body, TextMarkerBlock env) {
+ public RutaBlock createAutomataBlock(Token id, RutaRuleElement re,
+ List<RutaStatement> body, RutaBlock env) {
return createScriptBlock(id, re, body, env);
}
Copied: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaBlock.java (from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/TextMarkerBlock.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaBlock.java?p2=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaBlock.java&p1=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/TextMarkerBlock.java&r1=1477049&r2=1477088&rev=1477088&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/TextMarkerBlock.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaBlock.java Mon Apr 29 14:09:53 2013
@@ -17,58 +17,58 @@
* under the License.
*/
-package org.apache.uima.textmarker;
+package org.apache.uima.ruta;
import java.util.List;
-import org.apache.uima.textmarker.rule.TextMarkerRule;
+import org.apache.uima.ruta.rule.RutaRule;
-public abstract class TextMarkerBlock extends TextMarkerStatement {
+public abstract class RutaBlock extends RutaStatement {
protected final String name;
- protected TextMarkerEnvironment environment;
+ protected RutaEnvironment environment;
- protected TextMarkerRule rule;
+ protected RutaRule rule;
- protected List<TextMarkerStatement> elements;
+ protected List<RutaStatement> elements;
private String namespace;
- private TextMarkerModule script;
+ private RutaModule script;
- public TextMarkerBlock(String name, TextMarkerRule rule, List<TextMarkerStatement> elements,
- TextMarkerBlock parent, String defaultNamespace) {
+ public RutaBlock(String name, RutaRule rule, List<RutaStatement> elements,
+ RutaBlock parent, String defaultNamespace) {
super(parent);
this.name = name;
this.rule = rule;
this.elements = elements;
- this.environment = new TextMarkerEnvironment(this);
+ this.environment = new RutaEnvironment(this);
this.namespace = defaultNamespace;
}
- public TextMarkerRule getRule() {
+ public RutaRule getRule() {
return rule;
}
- public void setRule(TextMarkerRule rule) {
+ public void setRule(RutaRule rule) {
this.rule = rule;
}
@Override
- public TextMarkerEnvironment getEnvironment() {
+ public RutaEnvironment getEnvironment() {
return environment;
}
- public List<TextMarkerStatement> getElements() {
+ public List<RutaStatement> getElements() {
return elements;
}
- public void setElements(List<TextMarkerStatement> elements) {
+ public void setElements(List<RutaStatement> elements) {
this.elements = elements;
}
- public TextMarkerModule getScript() {
+ public RutaModule getScript() {
if (script != null) {
return script;
} else if (getParent() != null) {
@@ -81,7 +81,7 @@ public abstract class TextMarkerBlock ex
}
}
- public void setScript(TextMarkerModule script) {
+ public void setScript(RutaModule script) {
this.script = script;
}
Copied: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaElement.java (from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/TextMarkerElement.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaElement.java?p2=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaElement.java&p1=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/TextMarkerElement.java&r1=1477049&r2=1477088&rev=1477088&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/TextMarkerElement.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaElement.java Mon Apr 29 14:09:53 2013
@@ -17,8 +17,8 @@
* under the License.
*/
-package org.apache.uima.textmarker;
+package org.apache.uima.ruta;
-public class TextMarkerElement {
+public class RutaElement {
}
Copied: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaEnvironment.java (from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/TextMarkerEnvironment.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaEnvironment.java?p2=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaEnvironment.java&p1=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/TextMarkerEnvironment.java&r1=1477049&r2=1477088&rev=1477088&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/TextMarkerEnvironment.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaEnvironment.java Mon Apr 29 14:09:53 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.textmarker;
+package org.apache.uima.ruta;
import java.io.File;
import java.io.IOException;
@@ -38,35 +38,35 @@ import org.apache.uima.cas.CASException;
import org.apache.uima.cas.Type;
import org.apache.uima.jcas.cas.TOP;
import org.apache.uima.jcas.tcas.DocumentAnnotation;
-import org.apache.uima.textmarker.action.AbstractTextMarkerAction;
-import org.apache.uima.textmarker.condition.AbstractTextMarkerCondition;
-import org.apache.uima.textmarker.expression.bool.BooleanExpression;
-import org.apache.uima.textmarker.expression.list.ListExpression;
-import org.apache.uima.textmarker.expression.list.SimpleBooleanListExpression;
-import org.apache.uima.textmarker.expression.list.SimpleNumberListExpression;
-import org.apache.uima.textmarker.expression.list.SimpleStringListExpression;
-import org.apache.uima.textmarker.expression.list.SimpleTypeListExpression;
-import org.apache.uima.textmarker.expression.number.NumberExpression;
-import org.apache.uima.textmarker.expression.resource.LiteralWordListExpression;
-import org.apache.uima.textmarker.expression.resource.LiteralWordTableExpression;
-import org.apache.uima.textmarker.expression.string.StringExpression;
-import org.apache.uima.textmarker.resource.CSVTable;
-import org.apache.uima.textmarker.resource.MultiTreeWordList;
-import org.apache.uima.textmarker.resource.TextMarkerTable;
-import org.apache.uima.textmarker.resource.TextMarkerWordList;
-import org.apache.uima.textmarker.resource.TreeWordList;
+import org.apache.uima.ruta.action.AbstractRutaAction;
+import org.apache.uima.ruta.condition.AbstractRutaCondition;
+import org.apache.uima.ruta.expression.bool.BooleanExpression;
+import org.apache.uima.ruta.expression.list.ListExpression;
+import org.apache.uima.ruta.expression.list.SimpleBooleanListExpression;
+import org.apache.uima.ruta.expression.list.SimpleNumberListExpression;
+import org.apache.uima.ruta.expression.list.SimpleStringListExpression;
+import org.apache.uima.ruta.expression.list.SimpleTypeListExpression;
+import org.apache.uima.ruta.expression.number.NumberExpression;
+import org.apache.uima.ruta.expression.resource.LiteralWordListExpression;
+import org.apache.uima.ruta.expression.resource.LiteralWordTableExpression;
+import org.apache.uima.ruta.expression.string.StringExpression;
+import org.apache.uima.ruta.resource.CSVTable;
+import org.apache.uima.ruta.resource.MultiTreeWordList;
+import org.apache.uima.ruta.resource.RutaTable;
+import org.apache.uima.ruta.resource.RutaWordList;
+import org.apache.uima.ruta.resource.TreeWordList;
-public class TextMarkerEnvironment {
+public class RutaEnvironment {
private final Object annotationTypeDummy = new Object();
private Map<String, Type> types;
- private Map<String, TextMarkerWordList> wordLists;
+ private Map<String, RutaWordList> wordLists;
private Map<String, CSVTable> tables;
- private TextMarkerBlock owner;
+ private RutaBlock owner;
private Map<String, String> namespaces;
@@ -86,12 +86,12 @@ public class TextMarkerEnvironment {
private Map<String, Object> initializedVariables;
- public TextMarkerEnvironment(TextMarkerBlock owner) {
+ public RutaEnvironment(RutaBlock owner) {
super();
this.owner = owner;
types = new HashMap<String, Type>();
namespaces = new HashMap<String, String>();
- wordLists = new HashMap<String, TextMarkerWordList>();
+ wordLists = new HashMap<String, RutaWordList>();
tables = new HashMap<String, CSVTable>();
variableValues = new HashMap<String, Object>();
variableTypes = new HashMap<String, Class<?>>();
@@ -103,10 +103,10 @@ public class TextMarkerEnvironment {
availableTypes.put("FLOAT", Float.class);
availableTypes.put("BOOLEAN", Boolean.class);
availableTypes.put("TYPE", Type.class);
- availableTypes.put("CONDITION", AbstractTextMarkerCondition.class);
- availableTypes.put("ACTION", AbstractTextMarkerAction.class);
- availableTypes.put("WORDLIST", TextMarkerWordList.class);
- availableTypes.put("WORDTABLE", TextMarkerTable.class);
+ availableTypes.put("CONDITION", AbstractRutaCondition.class);
+ availableTypes.put("ACTION", AbstractRutaAction.class);
+ availableTypes.put("WORDLIST", RutaWordList.class);
+ availableTypes.put("WORDTABLE", RutaTable.class);
availableTypes.put("BOOLEANLIST", List.class);
availableTypes.put("INTLIST", List.class);
availableTypes.put("DOUBLELIST", List.class);
@@ -146,7 +146,7 @@ public class TextMarkerEnvironment {
public String[] getResourcePaths() {
if (resourcePaths == null) {
- TextMarkerBlock parent = owner.getParent();
+ RutaBlock parent = owner.getParent();
if (parent != null) {
return parent.getEnvironment().getResourcePaths();
}
@@ -183,7 +183,7 @@ public class TextMarkerEnvironment {
String expanded = expand(match);
Type type = types.get(expanded);
if (type == null) {
- TextMarkerBlock parent = owner.getParent();
+ RutaBlock parent = owner.getParent();
if (parent != null) {
type = parent.getEnvironment().getType(match);
}
@@ -200,8 +200,8 @@ public class TextMarkerEnvironment {
addType(type.getShortName(), type);
}
- public TextMarkerWordList getWordList(String list) {
- TextMarkerWordList result = wordLists.get(list);
+ public RutaWordList getWordList(String list) {
+ RutaWordList result = wordLists.get(list);
if (result == null) {
boolean found = false;
if (resourcePaths != null) {
@@ -248,8 +248,8 @@ public class TextMarkerEnvironment {
return wordLists.get(list);
}
- public TextMarkerTable getWordTable(String table) {
- TextMarkerTable result = tables.get(table);
+ public RutaTable getWordTable(String table) {
+ RutaTable result = tables.get(table);
if (result == null) {
boolean found = false;
for (String eachPath : resourcePaths) {
@@ -410,21 +410,21 @@ public class TextMarkerEnvironment {
BooleanExpression be = (BooleanExpression) value;
return be.getBooleanValue(owner);
}
- if (clazz.equals(TextMarkerWordList.class) && value instanceof LiteralWordListExpression) {
+ if (clazz.equals(RutaWordList.class) && value instanceof LiteralWordListExpression) {
LiteralWordListExpression lle = (LiteralWordListExpression) value;
String path = lle.getText();
- TextMarkerWordList wordList = getWordList(path);
+ RutaWordList wordList = getWordList(path);
return wordList;
- } else if (clazz.equals(TextMarkerWordList.class)) {
- TextMarkerWordList list = getWordList((String) value);
+ } else if (clazz.equals(RutaWordList.class)) {
+ RutaWordList list = getWordList((String) value);
return list;
- } else if (clazz.equals(TextMarkerTable.class) && value instanceof LiteralWordTableExpression) {
+ } else if (clazz.equals(RutaTable.class) && value instanceof LiteralWordTableExpression) {
LiteralWordTableExpression lte = (LiteralWordTableExpression) value;
String path = lte.getText();
- TextMarkerTable table = getWordTable(path);
+ RutaTable table = getWordTable(path);
return table;
- } else if (clazz.equals(TextMarkerTable.class)) {
- TextMarkerTable table = getWordTable((String) value);
+ } else if (clazz.equals(RutaTable.class)) {
+ RutaTable table = getWordTable((String) value);
return table;
} else if (clazz.equals(List.class) && value instanceof ListExpression) {
List list = getList((ListExpression) value);
Copied: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaModule.java (from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/TextMarkerModule.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaModule.java?p2=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaModule.java&p1=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/TextMarkerModule.java&r1=1477049&r2=1477088&rev=1477088&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/TextMarkerModule.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaModule.java Mon Apr 29 14:09:53 2013
@@ -17,51 +17,51 @@
* under the License.
*/
-package org.apache.uima.textmarker;
+package org.apache.uima.ruta;
import java.util.HashMap;
import java.util.Map;
import org.apache.uima.analysis_engine.AnalysisEngine;
-import org.apache.uima.textmarker.visitor.InferenceCrowd;
+import org.apache.uima.ruta.visitor.InferenceCrowd;
-public class TextMarkerModule extends TextMarkerElement {
+public class RutaModule extends RutaElement {
- private final TextMarkerBlock rootBlock;
+ private final RutaBlock rootBlock;
- private Map<String, TextMarkerModule> scripts;
+ private Map<String, RutaModule> scripts;
private Map<String, AnalysisEngine> engines;
- private Map<String, TextMarkerBlock> blocks;
+ private Map<String, RutaBlock> blocks;
- public TextMarkerModule(TextMarkerBlock rootBlock) {
+ public RutaModule(RutaBlock rootBlock) {
super();
this.rootBlock = rootBlock;
- scripts = new HashMap<String, TextMarkerModule>();
+ scripts = new HashMap<String, RutaModule>();
engines = new HashMap<String, AnalysisEngine>();
- blocks = new HashMap<String, TextMarkerBlock>();
+ blocks = new HashMap<String, RutaBlock>();
}
- public ScriptApply apply(TextMarkerStream stream, InferenceCrowd crowd) {
+ public ScriptApply apply(RutaStream stream, InferenceCrowd crowd) {
crowd.beginVisit(this, null);
ScriptApply result = rootBlock.apply(stream, crowd);
crowd.endVisit(this, result);
return result;
}
- public TextMarkerBlock getBlock(String id) {
+ public RutaBlock getBlock(String id) {
if (id == null || id.equals(rootBlock.getName())) {
return rootBlock;
}
return blocks.get(id);
}
- public TextMarkerModule getScript(String name) {
+ public RutaModule getScript(String name) {
if (name.equals(rootBlock.getName())) {
return this;
}
- TextMarkerModule result = scripts.get(name);
+ RutaModule result = scripts.get(name);
if (result == null) {
for (String each : scripts.keySet()) {
String[] split = each.split("\\.");
@@ -74,17 +74,17 @@ public class TextMarkerModule extends Te
return result;
}
- public void addScript(String name, TextMarkerModule script) {
+ public void addScript(String name, RutaModule script) {
scripts.put(name, script);
}
- public void addBlock(String id, TextMarkerBlock block) {
+ public void addBlock(String id, RutaBlock block) {
blocks.put(id, block);
}
- public void setScriptDependencies(Map<String, TextMarkerModule> additionalScripts) {
+ public void setScriptDependencies(Map<String, RutaModule> additionalScripts) {
for (String eachTarget : scripts.keySet()) {
- TextMarkerModule textMarkerModule = additionalScripts.get(eachTarget);
+ RutaModule textMarkerModule = additionalScripts.get(eachTarget);
addScript(eachTarget, textMarkerModule);
}
}
@@ -114,11 +114,11 @@ public class TextMarkerModule extends Te
}
}
- public Map<String, TextMarkerModule> getScripts() {
+ public Map<String, RutaModule> getScripts() {
return scripts;
}
- public Map<String, TextMarkerBlock> getBlocks() {
+ public Map<String, RutaBlock> getBlocks() {
return blocks;
}
@@ -126,7 +126,7 @@ public class TextMarkerModule extends Te
return engines;
}
- public TextMarkerBlock getRootBlock() {
+ public RutaBlock getRootBlock() {
return rootBlock;
}
Copied: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaScriptBlock.java (from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/TextMarkerScriptBlock.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaScriptBlock.java?p2=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaScriptBlock.java&p1=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/TextMarkerScriptBlock.java&r1=1477049&r2=1477088&rev=1477088&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/TextMarkerScriptBlock.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaScriptBlock.java Mon Apr 29 14:09:53 2013
@@ -17,29 +17,29 @@
* under the License.
*/
-package org.apache.uima.textmarker;
+package org.apache.uima.ruta;
import java.util.List;
import org.apache.uima.cas.Type;
import org.apache.uima.cas.text.AnnotationFS;
-import org.apache.uima.textmarker.rule.AbstractRule;
-import org.apache.uima.textmarker.rule.AbstractRuleMatch;
-import org.apache.uima.textmarker.rule.RuleApply;
-import org.apache.uima.textmarker.rule.RuleMatch;
-import org.apache.uima.textmarker.rule.TextMarkerRule;
-import org.apache.uima.textmarker.rule.TextMarkerRuleElement;
-import org.apache.uima.textmarker.visitor.InferenceCrowd;
+import org.apache.uima.ruta.rule.AbstractRule;
+import org.apache.uima.ruta.rule.AbstractRuleMatch;
+import org.apache.uima.ruta.rule.RuleApply;
+import org.apache.uima.ruta.rule.RuleMatch;
+import org.apache.uima.ruta.rule.RutaRule;
+import org.apache.uima.ruta.rule.RutaRuleElement;
+import org.apache.uima.ruta.visitor.InferenceCrowd;
-public class TextMarkerScriptBlock extends TextMarkerBlock {
+public class RutaScriptBlock extends RutaBlock {
- public TextMarkerScriptBlock(String id, TextMarkerRule rule, List<TextMarkerStatement> elements,
- TextMarkerBlock parent, String defaultNamespace) {
+ public RutaScriptBlock(String id, RutaRule rule, List<RutaStatement> elements,
+ RutaBlock parent, String defaultNamespace) {
super(id, rule, elements, parent, defaultNamespace);
}
@Override
- public ScriptApply apply(TextMarkerStream stream, InferenceCrowd crowd) {
+ public ScriptApply apply(RutaStream stream, InferenceCrowd crowd) {
BlockApply result = new BlockApply(this);
crowd.beginVisit(this, result);
RuleApply apply = rule.apply(stream, crowd, true);
@@ -54,11 +54,11 @@ public class TextMarkerScriptBlock exten
if (each == null) {
continue;
}
- List<Type> types = ((TextMarkerRuleElement) rule.getRuleElements().get(0)).getMatcher()
+ List<Type> types = ((RutaRuleElement) rule.getRuleElements().get(0)).getMatcher()
.getTypes(getParent() == null ? this : getParent(), stream);
for (Type eachType : types) {
- TextMarkerStream window = stream.getWindowStream(each, eachType);
- for (TextMarkerStatement element : getElements()) {
+ RutaStream window = stream.getWindowStream(each, eachType);
+ for (RutaStatement element : getElements()) {
if (element != null) {
element.apply(window, crowd);
}
Copied: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaScriptFactory.java (from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/TextMarkerScriptFactory.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaScriptFactory.java?p2=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaScriptFactory.java&p1=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/TextMarkerScriptFactory.java&r1=1477049&r2=1477088&rev=1477088&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/TextMarkerScriptFactory.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaScriptFactory.java Mon Apr 29 14:09:53 2013
@@ -17,52 +17,52 @@
* under the License.
*/
-package org.apache.uima.textmarker;
+package org.apache.uima.ruta;
import java.util.ArrayList;
import java.util.List;
import org.antlr.runtime.Token;
import org.apache.uima.resource.metadata.TypeSystemDescription;
-import org.apache.uima.textmarker.action.AbstractTextMarkerAction;
-import org.apache.uima.textmarker.condition.AbstractTextMarkerCondition;
-import org.apache.uima.textmarker.expression.TextMarkerExpression;
-import org.apache.uima.textmarker.expression.number.NumberExpression;
-import org.apache.uima.textmarker.expression.string.StringExpression;
-import org.apache.uima.textmarker.expression.type.SimpleTypeExpression;
-import org.apache.uima.textmarker.expression.type.TypeExpression;
-import org.apache.uima.textmarker.rule.AbstractRuleElement;
-import org.apache.uima.textmarker.rule.ComposedRuleElement;
-import org.apache.uima.textmarker.rule.RegExpRule;
-import org.apache.uima.textmarker.rule.RuleElement;
-import org.apache.uima.textmarker.rule.RuleElementContainer;
-import org.apache.uima.textmarker.rule.RuleElementIsolator;
-import org.apache.uima.textmarker.rule.TextMarkerDisjunctiveMatcher;
-import org.apache.uima.textmarker.rule.TextMarkerLiteralMatcher;
-import org.apache.uima.textmarker.rule.TextMarkerRule;
-import org.apache.uima.textmarker.rule.TextMarkerRuleElement;
-import org.apache.uima.textmarker.rule.TextMarkerTypeMatcher;
-import org.apache.uima.textmarker.rule.WildCardRuleElement;
-import org.apache.uima.textmarker.rule.quantifier.MinMaxGreedy;
-import org.apache.uima.textmarker.rule.quantifier.MinMaxReluctant;
-import org.apache.uima.textmarker.rule.quantifier.PlusGreedy;
-import org.apache.uima.textmarker.rule.quantifier.PlusReluctant;
-import org.apache.uima.textmarker.rule.quantifier.QuestionGreedy;
-import org.apache.uima.textmarker.rule.quantifier.QuestionReluctant;
-import org.apache.uima.textmarker.rule.quantifier.RuleElementQuantifier;
-import org.apache.uima.textmarker.rule.quantifier.StarGreedy;
-import org.apache.uima.textmarker.rule.quantifier.StarReluctant;
+import org.apache.uima.ruta.action.AbstractRutaAction;
+import org.apache.uima.ruta.condition.AbstractRutaCondition;
+import org.apache.uima.ruta.expression.RutaExpression;
+import org.apache.uima.ruta.expression.number.NumberExpression;
+import org.apache.uima.ruta.expression.string.StringExpression;
+import org.apache.uima.ruta.expression.type.SimpleTypeExpression;
+import org.apache.uima.ruta.expression.type.TypeExpression;
+import org.apache.uima.ruta.rule.AbstractRuleElement;
+import org.apache.uima.ruta.rule.ComposedRuleElement;
+import org.apache.uima.ruta.rule.RegExpRule;
+import org.apache.uima.ruta.rule.RuleElement;
+import org.apache.uima.ruta.rule.RuleElementContainer;
+import org.apache.uima.ruta.rule.RuleElementIsolator;
+import org.apache.uima.ruta.rule.RutaDisjunctiveMatcher;
+import org.apache.uima.ruta.rule.RutaLiteralMatcher;
+import org.apache.uima.ruta.rule.RutaRule;
+import org.apache.uima.ruta.rule.RutaRuleElement;
+import org.apache.uima.ruta.rule.RutaTypeMatcher;
+import org.apache.uima.ruta.rule.WildCardRuleElement;
+import org.apache.uima.ruta.rule.quantifier.MinMaxGreedy;
+import org.apache.uima.ruta.rule.quantifier.MinMaxReluctant;
+import org.apache.uima.ruta.rule.quantifier.PlusGreedy;
+import org.apache.uima.ruta.rule.quantifier.PlusReluctant;
+import org.apache.uima.ruta.rule.quantifier.QuestionGreedy;
+import org.apache.uima.ruta.rule.quantifier.QuestionReluctant;
+import org.apache.uima.ruta.rule.quantifier.RuleElementQuantifier;
+import org.apache.uima.ruta.rule.quantifier.StarGreedy;
+import org.apache.uima.ruta.rule.quantifier.StarReluctant;
-public class TextMarkerScriptFactory {
+public class RutaScriptFactory {
private int idCounter = 0;
- public TextMarkerScriptFactory() {
+ public RutaScriptFactory() {
super();
}
- public TextMarkerScriptBlock createScriptBlock(Token id, TextMarkerRuleElement ruleElement,
- List<TextMarkerStatement> body, TextMarkerBlock parent) {
+ public RutaScriptBlock createScriptBlock(Token id, RutaRuleElement ruleElement,
+ List<RutaStatement> body, RutaBlock parent) {
String text = id == null ? "root" : id.getText();
String defaultNamespace = parent.getNamespace();
if (id != null) {
@@ -71,89 +71,89 @@ public class TextMarkerScriptFactory {
return createScriptBlock(text, ruleElement, body, parent, defaultNamespace);
}
- public TextMarkerScriptBlock createScriptBlock(String text, TextMarkerRuleElement ruleElement,
- List<TextMarkerStatement> body, TextMarkerBlock parent, String defaultNamespace) {
- TextMarkerRule rule = null;
+ public RutaScriptBlock createScriptBlock(String text, RutaRuleElement ruleElement,
+ List<RutaStatement> body, RutaBlock parent, String defaultNamespace) {
+ RutaRule rule = null;
if (ruleElement != null) {
rule = createRule(ruleElement, parent);
}
- List<TextMarkerStatement> elements = new ArrayList<TextMarkerStatement>();
+ List<RutaStatement> elements = new ArrayList<RutaStatement>();
if (body != null) {
- for (TextMarkerStatement each : body) {
+ for (RutaStatement each : body) {
if (each != null) {
elements.add(each);
}
}
}
- return new TextMarkerScriptBlock(text, rule, elements, parent, defaultNamespace);
+ return new RutaScriptBlock(text, rule, elements, parent, defaultNamespace);
}
- public TextMarkerScriptBlock createRootScriptBlock(String module, String pack,
+ public RutaScriptBlock createRootScriptBlock(String module, String pack,
TypeSystemDescription localTSD) {
String defaultNamespace = pack + "." + module;
- TextMarkerScriptBlock result = createScriptBlock(module, null, null, null, defaultNamespace);
+ RutaScriptBlock result = createScriptBlock(module, null, null, null, defaultNamespace);
List<RuleElement> ruleElements = new ArrayList<RuleElement>();
RuleElementIsolator container = new RuleElementIsolator();
ruleElements.add(createRuleElement(new SimpleTypeExpression("uima.tcas.DocumentAnnotation"),
null, null, null, container, result));
- TextMarkerRule createRule = createRule(ruleElements, result);
+ RutaRule createRule = createRule(ruleElements, result);
container.setContainer(createRule);
result.setRule(createRule);
return result;
}
- public TextMarkerRule createRule(RuleElement element, TextMarkerBlock parent) {
+ public RutaRule createRule(RuleElement element, RutaBlock parent) {
List<RuleElement> elements = new ArrayList<RuleElement>();
elements.add(element);
return createRule(elements, parent);
}
- public TextMarkerRule createRule(List<RuleElement> elements, TextMarkerBlock parent) {
- return new TextMarkerRule(elements, parent, idCounter++);
+ public RutaRule createRule(List<RuleElement> elements, RutaBlock parent) {
+ return new RutaRule(elements, parent, idCounter++);
}
- public TextMarkerRuleElement createRuleElement(TypeExpression typeExpression,
- RuleElementQuantifier quantifier, List<AbstractTextMarkerCondition> conditions,
- List<AbstractTextMarkerAction> actions, RuleElementContainer container,
- TextMarkerBlock parent) {
- TextMarkerTypeMatcher matcher = new TextMarkerTypeMatcher(typeExpression);
- return new TextMarkerRuleElement(matcher, quantifier, conditions, actions, container, parent);
+ public RutaRuleElement createRuleElement(TypeExpression typeExpression,
+ RuleElementQuantifier quantifier, List<AbstractRutaCondition> conditions,
+ List<AbstractRutaAction> actions, RuleElementContainer container,
+ RutaBlock parent) {
+ RutaTypeMatcher matcher = new RutaTypeMatcher(typeExpression);
+ return new RutaRuleElement(matcher, quantifier, conditions, actions, container, parent);
}
- public AbstractRuleElement createWildCardRuleElement(List<AbstractTextMarkerCondition> conditions,
- List<AbstractTextMarkerAction> actions, RuleElementContainer container,
- TextMarkerBlock parent) {
+ public AbstractRuleElement createWildCardRuleElement(List<AbstractRutaCondition> conditions,
+ List<AbstractRutaAction> actions, RuleElementContainer container,
+ RutaBlock parent) {
return new WildCardRuleElement(conditions, actions, container, parent);
}
- public TextMarkerRuleElement createRuleElement(List<TextMarkerExpression> exprs,
- RuleElementQuantifier quantifier, List<AbstractTextMarkerCondition> conditions,
- List<AbstractTextMarkerAction> actions, RuleElementContainer container,
- TextMarkerBlock parent) {
- TextMarkerDisjunctiveMatcher matcher = new TextMarkerDisjunctiveMatcher(exprs);
- return new TextMarkerRuleElement(matcher, quantifier, conditions, actions, container, parent);
+ public RutaRuleElement createRuleElement(List<RutaExpression> exprs,
+ RuleElementQuantifier quantifier, List<AbstractRutaCondition> conditions,
+ List<AbstractRutaAction> actions, RuleElementContainer container,
+ RutaBlock parent) {
+ RutaDisjunctiveMatcher matcher = new RutaDisjunctiveMatcher(exprs);
+ return new RutaRuleElement(matcher, quantifier, conditions, actions, container, parent);
}
- public TextMarkerRuleElement createRuleElement(StringExpression stringExpression,
- RuleElementQuantifier quantifier, List<AbstractTextMarkerCondition> conditions,
- List<AbstractTextMarkerAction> actions, RuleElementContainer container,
- TextMarkerBlock parent) {
- TextMarkerLiteralMatcher matcher = new TextMarkerLiteralMatcher(stringExpression);
- return new TextMarkerRuleElement(matcher, quantifier, conditions, actions, container, parent);
+ public RutaRuleElement createRuleElement(StringExpression stringExpression,
+ RuleElementQuantifier quantifier, List<AbstractRutaCondition> conditions,
+ List<AbstractRutaAction> actions, RuleElementContainer container,
+ RutaBlock parent) {
+ RutaLiteralMatcher matcher = new RutaLiteralMatcher(stringExpression);
+ return new RutaRuleElement(matcher, quantifier, conditions, actions, container, parent);
}
public ComposedRuleElement createComposedRuleElement(List<RuleElement> res,
- RuleElementQuantifier quantifier, List<AbstractTextMarkerCondition> conditions,
- List<AbstractTextMarkerAction> actions, RuleElementContainer container,
- TextMarkerBlock parent) {
+ RuleElementQuantifier quantifier, List<AbstractRutaCondition> conditions,
+ List<AbstractRutaAction> actions, RuleElementContainer container,
+ RutaBlock parent) {
return new ComposedRuleElement(res, quantifier, conditions, actions, container, parent);
}
public ComposedRuleElement createComposedRuleElement(RuleElementContainer container,
- TextMarkerBlock parent) {
+ RutaBlock parent) {
return new ComposedRuleElement(null, null, null, null, container, parent);
}
@@ -191,12 +191,12 @@ public class TextMarkerScriptFactory {
return new QuestionGreedy();
}
- public TextMarkerBlock createAutomataBlock(Token id, TextMarkerRuleElement re,
- List<TextMarkerStatement> body, TextMarkerBlock env) {
+ public RutaBlock createAutomataBlock(Token id, RutaRuleElement re,
+ List<RutaStatement> body, RutaBlock env) {
return createScriptBlock(id, re, body, env);
}
- public RegExpRule createRegExpRule(TextMarkerBlock env) {
+ public RegExpRule createRegExpRule(RutaBlock env) {
return new RegExpRule(null, null, idCounter++, env);
}
Copied: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaStatement.java (from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/TextMarkerStatement.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaStatement.java?p2=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaStatement.java&p1=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/TextMarkerStatement.java&r1=1477049&r2=1477088&rev=1477088&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/TextMarkerStatement.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaStatement.java Mon Apr 29 14:09:53 2013
@@ -17,28 +17,28 @@
* under the License.
*/
-package org.apache.uima.textmarker;
+package org.apache.uima.ruta;
-import org.apache.uima.textmarker.visitor.InferenceCrowd;
+import org.apache.uima.ruta.visitor.InferenceCrowd;
-public abstract class TextMarkerStatement extends TextMarkerElement {
+public abstract class RutaStatement extends RutaElement {
- private TextMarkerBlock parent;
+ private RutaBlock parent;
- public TextMarkerStatement(TextMarkerBlock parent) {
+ public RutaStatement(RutaBlock parent) {
super();
this.parent = parent;
}
- public abstract ScriptApply apply(TextMarkerStream stream, InferenceCrowd crowd);
+ public abstract ScriptApply apply(RutaStream stream, InferenceCrowd crowd);
- public abstract TextMarkerEnvironment getEnvironment();
+ public abstract RutaEnvironment getEnvironment();
- public TextMarkerBlock getParent() {
+ public RutaBlock getParent() {
return parent;
}
- public void setParent(TextMarkerBlock parent) {
+ public void setParent(RutaBlock parent) {
this.parent = parent;
}
Copied: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java (from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/TextMarkerStream.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java?p2=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java&p1=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/TextMarkerStream.java&r1=1477049&r2=1477088&rev=1477088&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/TextMarkerStream.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java Mon Apr 29 14:09:53 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.textmarker;
+package org.apache.uima.ruta;
import java.util.ArrayList;
import java.util.Collection;
@@ -41,13 +41,13 @@ import org.apache.uima.cas.text.Annotati
import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.tcas.Annotation;
import org.apache.uima.jcas.tcas.DocumentAnnotation;
-import org.apache.uima.textmarker.rule.AbstractRule;
-import org.apache.uima.textmarker.rule.AbstractRuleMatch;
-import org.apache.uima.textmarker.type.TextMarkerAnnotation;
-import org.apache.uima.textmarker.type.TextMarkerBasic;
-import org.apache.uima.textmarker.visitor.InferenceCrowd;
+import org.apache.uima.ruta.rule.AbstractRule;
+import org.apache.uima.ruta.rule.AbstractRuleMatch;
+import org.apache.uima.ruta.type.RutaAnnotation;
+import org.apache.uima.ruta.type.RutaBasic;
+import org.apache.uima.ruta.visitor.InferenceCrowd;
-public class TextMarkerStream extends FSIteratorImplBase<AnnotationFS> {
+public class RutaStream extends FSIteratorImplBase<AnnotationFS> {
private final CAS cas;
@@ -61,11 +61,11 @@ public class TextMarkerStream extends FS
private Type basicType;
- private final TreeSet<TextMarkerBasic> basics;
+ private final TreeSet<RutaBasic> basics;
- private TreeMap<Integer, TextMarkerBasic> beginAnchors;
+ private TreeMap<Integer, RutaBasic> beginAnchors;
- private TreeMap<Integer, TextMarkerBasic> endAnchors;
+ private TreeMap<Integer, RutaBasic> endAnchors;
private FilterManager filter;
@@ -81,7 +81,7 @@ public class TextMarkerStream extends FS
private InferenceCrowd crowd;
- protected TextMarkerStream(CAS cas, FSIterator<AnnotationFS> current, Type basicType,
+ protected RutaStream(CAS cas, FSIterator<AnnotationFS> current, Type basicType,
FilterManager filter, boolean lowMemoryProfile, boolean simpleGreedyForComposed,
InferenceCrowd crowd) {
super();
@@ -104,14 +104,14 @@ public class TextMarkerStream extends FS
}
// // really faster???
// TODO this needs to be changed!! use collection of prior stream
- org.apache.uima.textmarker.rule.AnnotationComparator comparator = new org.apache.uima.textmarker.rule.AnnotationComparator();
- basics = new TreeSet<TextMarkerBasic>(comparator);
- beginAnchors = new TreeMap<Integer, TextMarkerBasic>();
- endAnchors = new TreeMap<Integer, TextMarkerBasic>();
+ org.apache.uima.ruta.rule.AnnotationComparator comparator = new org.apache.uima.ruta.rule.AnnotationComparator();
+ basics = new TreeSet<RutaBasic>(comparator);
+ beginAnchors = new TreeMap<Integer, RutaBasic>();
+ endAnchors = new TreeMap<Integer, RutaBasic>();
FSIterator<AnnotationFS> iterator = cas.getAnnotationIndex(basicType).subiterator(
documentAnnotation);
while (iterator.isValid()) {
- TextMarkerBasic e = (TextMarkerBasic) iterator.get();
+ RutaBasic e = (RutaBasic) iterator.get();
beginAnchors.put(e.getBegin(), e);
endAnchors.put(e.getEnd(), e);
basics.add(e);
@@ -134,7 +134,7 @@ public class TextMarkerStream extends FS
currentIt = filter.createFilteredIterator(cas, basicType);
}
- public TextMarkerStream(CAS cas, Type basicType, FilterManager filter, boolean lowMemoryProfile,
+ public RutaStream(CAS cas, Type basicType, FilterManager filter, boolean lowMemoryProfile,
boolean simpleGreedyForComposed, InferenceCrowd crowd) {
this(cas, null, basicType, filter, lowMemoryProfile, simpleGreedyForComposed, crowd);
}
@@ -157,7 +157,7 @@ public class TextMarkerStream extends FS
// Integer first = anchors.pollFirst();
Integer first = anchors.first();
anchors.remove(first);
- TextMarkerBasic newTMB = new TextMarkerBasic(getJCas(), first, first);
+ RutaBasic newTMB = new RutaBasic(getJCas(), first, first);
newTMB.setLowMemoryProfile(lowMemoryProfile);
beginAnchors.put(first, newTMB);
endAnchors.put(first, newTMB);
@@ -170,7 +170,7 @@ public class TextMarkerStream extends FS
Integer first = anchors.first();
anchors.remove(first);
Integer second = anchors.first();
- TextMarkerBasic newTMB = new TextMarkerBasic(getJCas(), first, second);
+ RutaBasic newTMB = new RutaBasic(getJCas(), first, second);
newTMB.setLowMemoryProfile(lowMemoryProfile);
beginAnchors.put(first, newTMB);
endAnchors.put(second, newTMB);
@@ -207,14 +207,14 @@ public class TextMarkerStream extends FS
if (modified && updateInternal) {
updateIterators(filter.getWindowAnnotation());
}
- TextMarkerBasic beginAnchor = getBeginAnchor(annotation.getBegin());
- TextMarkerBasic endAnchor = getEndAnchor(annotation.getEnd());
+ RutaBasic beginAnchor = getBeginAnchor(annotation.getBegin());
+ RutaBasic endAnchor = getEndAnchor(annotation.getEnd());
beginAnchor.addBegin(annotation, type);
if (endAnchor != null) {
endAnchor.addEnd(annotation, type);
}
- Collection<TextMarkerBasic> basicAnnotationsInWindow = getAllBasicsInWindow(annotation);
- for (TextMarkerBasic basic : basicAnnotationsInWindow) {
+ Collection<RutaBasic> basicAnnotationsInWindow = getAllBasicsInWindow(annotation);
+ for (RutaBasic basic : basicAnnotationsInWindow) {
basic.addPartOf(type);
}
if (addToIndex) {
@@ -227,8 +227,8 @@ public class TextMarkerStream extends FS
boolean result = false;
int begin = annotation.getBegin();
int end = annotation.getEnd();
- TextMarkerBasic beginAnchor = getBeginAnchor(begin);
- TextMarkerBasic endAnchor = getEndAnchor(end);
+ RutaBasic beginAnchor = getBeginAnchor(begin);
+ RutaBasic endAnchor = getEndAnchor(end);
if (beginAnchor != null && endAnchor != null) {
result = false;
} else {
@@ -244,18 +244,18 @@ public class TextMarkerStream extends FS
private boolean checkAnchor(int anchor) {
// was for Java 6:
- // Entry<Integer, TextMarkerBasic> floorEntry = endAnchors.floorEntry(anchor);
- // Entry<Integer, TextMarkerBasic> ceilingEntry = endAnchors.ceilingEntry(anchor);
+ // Entry<Integer, RutaBasic> floorEntry = endAnchors.floorEntry(anchor);
+ // Entry<Integer, RutaBasic> ceilingEntry = endAnchors.ceilingEntry(anchor);
// if (floorEntry != null && ceilingEntry != null) {
- // TextMarkerBasic floor = floorEntry.getValue();
- // TextMarkerBasic ceiling = ceilingEntry.getValue();
- TextMarkerBasic floor = getFloor(endAnchors, anchor);
+ // RutaBasic floor = floorEntry.getValue();
+ // RutaBasic ceiling = ceilingEntry.getValue();
+ RutaBasic floor = getFloor(endAnchors, anchor);
if (floor == null) {
floor = getFloor(beginAnchors, anchor);
}
- TextMarkerBasic ceiling = getCeiling(endAnchors, anchor);
+ RutaBasic ceiling = getCeiling(endAnchors, anchor);
if (floor != null && ceiling != null) {
- TextMarkerBasic toSplit = null;
+ RutaBasic toSplit = null;
if (floor.getEnd() > anchor) {
toSplit = floor;
} else {
@@ -264,7 +264,7 @@ public class TextMarkerStream extends FS
int newEnd = toSplit.getEnd();
cas.removeFsFromIndexes(toSplit);
toSplit.setEnd(anchor);
- TextMarkerBasic newTMB = new TextMarkerBasic(getJCas(), anchor, newEnd);
+ RutaBasic newTMB = new RutaBasic(getJCas(), anchor, newEnd);
cas.addFsToIndexes(toSplit);
cas.addFsToIndexes(newTMB);
beginAnchors.put(floor.getBegin(), floor);
@@ -280,8 +280,8 @@ public class TextMarkerStream extends FS
return false;
}
- private TextMarkerBasic getCeiling(TreeMap<Integer, TextMarkerBasic> anchors, int anchor) {
- TextMarkerBasic basic = anchors.get(anchor);
+ private RutaBasic getCeiling(TreeMap<Integer, RutaBasic> anchors, int anchor) {
+ RutaBasic basic = anchors.get(anchor);
if (basic != null) {
return basic;
} else if (anchor <= anchors.lastKey()) {
@@ -291,8 +291,8 @@ public class TextMarkerStream extends FS
return null;
}
- private TextMarkerBasic getFloor(TreeMap<Integer, TextMarkerBasic> anchors, int anchor) {
- TextMarkerBasic basic = anchors.get(anchor);
+ private RutaBasic getFloor(TreeMap<Integer, RutaBasic> anchors, int anchor) {
+ RutaBasic basic = anchors.get(anchor);
if (basic != null) {
return basic;
} else if (anchor >= 0) {
@@ -307,16 +307,16 @@ public class TextMarkerStream extends FS
}
public void removeAnnotation(AnnotationFS annotation, Type type) {
- Collection<TextMarkerBasic> basicAnnotationsInWindow = getAllBasicsInWindow(annotation);
- for (TextMarkerBasic basic : basicAnnotationsInWindow) {
+ Collection<RutaBasic> basicAnnotationsInWindow = getAllBasicsInWindow(annotation);
+ for (RutaBasic basic : basicAnnotationsInWindow) {
basic.removePartOf(type);
}
Type parent = type;
- TextMarkerBasic beginAnchor = getBeginAnchor(annotation.getBegin());
- TextMarkerBasic endAnchor = getEndAnchor(annotation.getEnd());
+ RutaBasic beginAnchor = getBeginAnchor(annotation.getBegin());
+ RutaBasic endAnchor = getEndAnchor(annotation.getEnd());
beginAnchor.removeBegin(annotation, parent);
endAnchor.removeEnd(annotation, parent);
- if (!(annotation instanceof TextMarkerBasic)) {
+ if (!(annotation instanceof RutaBasic)) {
cas.removeFsFromIndexes(annotation);
}
@@ -328,7 +328,7 @@ public class TextMarkerStream extends FS
return cas.createFilteredIterator(basicIt, matchConstraint);
}
- public TextMarkerStream getWindowStream(AnnotationFS windowAnnotation, Type windowType) {
+ public RutaStream getWindowStream(AnnotationFS windowAnnotation, Type windowType) {
if (windowAnnotation.getBegin() == documentAnnotation.getBegin()
&& windowAnnotation.getEnd() == documentAnnotation.getEnd()) {
return this;
@@ -337,13 +337,13 @@ public class TextMarkerStream extends FS
FilterManager filterManager = new FilterManager(filter.getDefaultFilterTypes(),
filter.getCurrentFilterTypes(), filter.getCurrentRetainTypes(), windowAnnotation,
windowType, cas);
- TextMarkerStream stream = new TextMarkerStream(cas, basicIt, basicType, filterManager,
+ RutaStream stream = new RutaStream(cas, basicIt, basicType, filterManager,
lowMemoryProfile, simpleGreedyForComposed, crowd);
return stream;
}
public FSIterator<AnnotationFS> copy() {
- return new TextMarkerStream(cas, currentIt.copy(), basicType, filter, lowMemoryProfile,
+ return new RutaStream(cas, currentIt.copy(), basicType, filter, lowMemoryProfile,
simpleGreedyForComposed, crowd);
}
@@ -485,36 +485,36 @@ public class TextMarkerStream extends FS
return result;
}
- public Collection<TextMarkerBasic> getAllBasicsInWindow(AnnotationFS windowAnnotation) {
+ public Collection<RutaBasic> getAllBasicsInWindow(AnnotationFS windowAnnotation) {
if (windowAnnotation.getBegin() >= windowAnnotation.getEnd()) {
return Collections.emptySet();
}
- TextMarkerBasic beginAnchor = getBeginAnchor(windowAnnotation.getBegin());
+ RutaBasic beginAnchor = getBeginAnchor(windowAnnotation.getBegin());
if (beginAnchor.getEnd() == windowAnnotation.getEnd()) {
- Collection<TextMarkerBasic> result = new ArrayList<TextMarkerBasic>(1);
+ Collection<RutaBasic> result = new ArrayList<RutaBasic>(1);
result.add(beginAnchor);
return result;
}
// was Java 6:
- // TextMarkerBasic endAnchor = getEndAnchor(windowAnnotation.getEnd());
- // NavigableSet<TextMarkerBasic> subSet = basics.subSet(beginAnchor, true, endAnchor, true);
+ // RutaBasic endAnchor = getEndAnchor(windowAnnotation.getEnd());
+ // NavigableSet<RutaBasic> subSet = basics.subSet(beginAnchor, true, endAnchor, true);
- Collection<TextMarkerBasic> subSet = null;
+ Collection<RutaBasic> subSet = null;
if (windowAnnotation.getEnd() == cas.getDocumentAnnotation().getEnd()
&& windowAnnotation.getBegin() == 0) {
subSet = basics;
} else if (windowAnnotation.getEnd() == cas.getDocumentAnnotation().getEnd()) {
subSet = basics.tailSet(beginAnchor);
} else {
- TextMarkerBasic endAnchor1 = getCeiling(endAnchors, windowAnnotation.getEnd() + 1);
+ RutaBasic endAnchor1 = getCeiling(endAnchors, windowAnnotation.getEnd() + 1);
if (endAnchor1 != null) {
subSet = basics.subSet(beginAnchor, endAnchor1);
} else {
// hotfix for limited window stream with a window on the complete document
- subSet = new LinkedList<TextMarkerBasic>();
- TextMarkerBasic floor = getFloor(endAnchors, windowAnnotation.getEnd());
- Collection<TextMarkerBasic> subSetHead = basics.subSet(beginAnchor, floor);
- TextMarkerBasic endAnchorTail = endAnchors.get(windowAnnotation.getEnd());
+ subSet = new LinkedList<RutaBasic>();
+ RutaBasic floor = getFloor(endAnchors, windowAnnotation.getEnd());
+ Collection<RutaBasic> subSetHead = basics.subSet(beginAnchor, floor);
+ RutaBasic endAnchorTail = endAnchors.get(windowAnnotation.getEnd());
subSet.addAll(subSetHead);
subSet.add(endAnchorTail);
}
@@ -522,36 +522,36 @@ public class TextMarkerStream extends FS
return subSet;
}
- public TextMarkerBasic getBasicNextTo(boolean before, AnnotationFS annotation) {
+ public RutaBasic getBasicNextTo(boolean before, AnnotationFS annotation) {
if(annotation == null) {
return beginAnchors.get(0);
}
if (before) {
- TextMarkerBasic pointer = beginAnchors.get(annotation.getBegin());
+ RutaBasic pointer = beginAnchors.get(annotation.getBegin());
moveTo(pointer);
if(isVisible(pointer)) {
moveToPrevious();
}
if (isValid()) {
- return (TextMarkerBasic) get();
+ return (RutaBasic) get();
}
} else {
- TextMarkerBasic pointer = endAnchors.get(annotation.getEnd());
+ RutaBasic pointer = endAnchors.get(annotation.getEnd());
moveTo(pointer);
if(isVisible(pointer)) {
moveToNext();
}
if (isValid()) {
- return (TextMarkerBasic) get();
+ return (RutaBasic) get();
}
}
return null;
}
- public List<TextMarkerBasic> getBasicsInWindow(AnnotationFS windowAnnotation) {
- List<TextMarkerBasic> result = new ArrayList<TextMarkerBasic>();
- if (windowAnnotation instanceof TextMarkerBasic) {
- result.add((TextMarkerBasic) windowAnnotation);
+ public List<RutaBasic> getBasicsInWindow(AnnotationFS windowAnnotation) {
+ List<RutaBasic> result = new ArrayList<RutaBasic>();
+ if (windowAnnotation instanceof RutaBasic) {
+ result.add((RutaBasic) windowAnnotation);
return result;
}
FSMatchConstraint defaultConstraint = filter.getDefaultConstraint();
@@ -559,33 +559,33 @@ public class TextMarkerStream extends FS
.getAnnotationIndex(basicType).subiterator(windowAnnotation), defaultConstraint);
while (iterator.isValid()) {
- result.add((TextMarkerBasic) iterator.get());
+ result.add((RutaBasic) iterator.get());
iterator.moveToNext();
}
return result;
}
- public TextMarkerBasic getFirstBasicInWindow(AnnotationFS windowAnnotation) {
+ public RutaBasic getFirstBasicInWindow(AnnotationFS windowAnnotation) {
return getFirstBasicInWindow(windowAnnotation, currentIt);
}
- public TextMarkerBasic getFirstBasicInWindow(AnnotationFS windowAnnotation,
+ public RutaBasic getFirstBasicInWindow(AnnotationFS windowAnnotation,
FSIterator<AnnotationFS> it) {
- if (windowAnnotation instanceof TextMarkerBasic) {
- return (TextMarkerBasic) windowAnnotation;
+ if (windowAnnotation instanceof RutaBasic) {
+ return (RutaBasic) windowAnnotation;
}
it.moveTo(windowAnnotation);
if (it.isValid()) {
- return (TextMarkerBasic) it.get();
+ return (RutaBasic) it.get();
}
return null;
}
- public List<TextMarkerBasic> getAnnotationsOverlappingWindow(AnnotationFS annotation) {
+ public List<RutaBasic> getAnnotationsOverlappingWindow(AnnotationFS annotation) {
if (annotation != null) {
return getBasicsInWindow(annotation);
} else {
- return new ArrayList<TextMarkerBasic>();
+ return new ArrayList<RutaBasic>();
}
}
@@ -597,11 +597,11 @@ public class TextMarkerStream extends FS
return documentAnnotation;
}
- public TextMarkerAnnotation getCorrectTMA(List<AnnotationFS> annotationsInWindow,
- TextMarkerAnnotation heuristicAnnotation) {
+ public RutaAnnotation getCorrectTMA(List<AnnotationFS> annotationsInWindow,
+ RutaAnnotation heuristicAnnotation) {
for (AnnotationFS annotation : annotationsInWindow) {
- if (annotation instanceof TextMarkerAnnotation) {
- TextMarkerAnnotation tma = (TextMarkerAnnotation) annotation;
+ if (annotation instanceof RutaAnnotation) {
+ RutaAnnotation tma = (RutaAnnotation) annotation;
if (tma.getBegin() == heuristicAnnotation.getBegin()
&& tma.getEnd() == heuristicAnnotation.getEnd()
&& tma.getAnnotation().getType()
@@ -647,7 +647,7 @@ public class TextMarkerStream extends FS
return filter;
}
- public TextMarkerBasic getFirstBasicOfAll() {
+ public RutaBasic getFirstBasicOfAll() {
if (basics.isEmpty()) {
return null;
}
@@ -658,20 +658,20 @@ public class TextMarkerStream extends FS
return documentAnnotationType;
}
- public TextMarkerBasic getNextBasic2(AnnotationFS previous) {
+ public RutaBasic getNextBasic2(AnnotationFS previous) {
AnnotationFS pointer = cas
.createAnnotation(basicType, previous.getEnd() - 1, previous.getEnd());
currentIt.moveTo(pointer);
if (currentIt.isValid()) {
- TextMarkerBasic basic = (TextMarkerBasic) currentIt.get();
+ RutaBasic basic = (RutaBasic) currentIt.get();
return basic;
}
return null;
}
- public TextMarkerStream getCompleteStream() {
+ public RutaStream getCompleteStream() {
FilterManager defaultFilter = new FilterManager(filter.getDefaultFilterTypes(), getCas());
- return new TextMarkerStream(getCas(), basicIt, basicType, defaultFilter, lowMemoryProfile,
+ return new RutaStream(getCas(), basicIt, basicType, defaultFilter, lowMemoryProfile,
simpleGreedyForComposed, crowd);
}
@@ -683,11 +683,11 @@ public class TextMarkerStream extends FS
return indexPenalty;
}
- public TextMarkerBasic getEndAnchor(int end) {
+ public RutaBasic getEndAnchor(int end) {
return endAnchors.get(end);
}
- public TextMarkerBasic getBeginAnchor(int begin) {
+ public RutaBasic getBeginAnchor(int begin) {
return beginAnchors.get(begin);
}
@@ -729,7 +729,7 @@ public class TextMarkerStream extends FS
return defaultConstraint.match(annotationFS);
}
- public TextMarkerBasic getAnchor(boolean direction, int pointer) {
+ public RutaBasic getAnchor(boolean direction, int pointer) {
if(direction) {
return getBeginAnchor(pointer);
} else {
Copied: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/AbstractRutaAction.java (from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/AbstractTextMarkerAction.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/AbstractRutaAction.java?p2=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/AbstractRutaAction.java&p1=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/AbstractTextMarkerAction.java&r1=1477049&r2=1477088&rev=1477088&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/AbstractTextMarkerAction.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/AbstractRutaAction.java Mon Apr 29 14:09:53 2013
@@ -17,21 +17,21 @@
* under the License.
*/
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
-import org.apache.uima.textmarker.TextMarkerElement;
-import org.apache.uima.textmarker.TextMarkerStream;
-import org.apache.uima.textmarker.rule.RuleElement;
-import org.apache.uima.textmarker.rule.RuleMatch;
-import org.apache.uima.textmarker.visitor.InferenceCrowd;
+import org.apache.uima.ruta.RutaElement;
+import org.apache.uima.ruta.RutaStream;
+import org.apache.uima.ruta.rule.RuleElement;
+import org.apache.uima.ruta.rule.RuleMatch;
+import org.apache.uima.ruta.visitor.InferenceCrowd;
-public abstract class AbstractTextMarkerAction extends TextMarkerElement {
+public abstract class AbstractRutaAction extends RutaElement {
- public AbstractTextMarkerAction() {
+ public AbstractRutaAction() {
super();
}
- public abstract void execute(RuleMatch match, RuleElement element, TextMarkerStream stream,
+ public abstract void execute(RuleMatch match, RuleElement element, RutaStream stream,
InferenceCrowd crowd);
@Override
Copied: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/AbstractRutaCondition.java (from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/AbstractTextMarkerCondition.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/AbstractRutaCondition.java?p2=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/AbstractRutaCondition.java&p1=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/AbstractTextMarkerCondition.java&r1=1477049&r2=1477088&rev=1477088&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/AbstractTextMarkerCondition.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/AbstractRutaCondition.java Mon Apr 29 14:09:53 2013
@@ -17,23 +17,23 @@
* under the License.
*/
-package org.apache.uima.textmarker.condition;
+package org.apache.uima.ruta.condition;
import org.apache.uima.cas.text.AnnotationFS;
-import org.apache.uima.textmarker.TextMarkerElement;
-import org.apache.uima.textmarker.TextMarkerStream;
-import org.apache.uima.textmarker.rule.EvaluatedCondition;
-import org.apache.uima.textmarker.rule.RuleElement;
-import org.apache.uima.textmarker.visitor.InferenceCrowd;
+import org.apache.uima.ruta.RutaElement;
+import org.apache.uima.ruta.RutaStream;
+import org.apache.uima.ruta.rule.EvaluatedCondition;
+import org.apache.uima.ruta.rule.RuleElement;
+import org.apache.uima.ruta.visitor.InferenceCrowd;
-public abstract class AbstractTextMarkerCondition extends TextMarkerElement {
+public abstract class AbstractRutaCondition extends RutaElement {
- public AbstractTextMarkerCondition() {
+ public AbstractRutaCondition() {
super();
}
public abstract EvaluatedCondition eval(AnnotationFS annotation, RuleElement element,
- TextMarkerStream stream, InferenceCrowd crowd);
+ RutaStream stream, InferenceCrowd crowd);
@Override
public String toString() {
Copied: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ComposedRutaCondition.java (from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ComposedTextMarkerCondition.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ComposedRutaCondition.java?p2=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ComposedRutaCondition.java&p1=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ComposedTextMarkerCondition.java&r1=1477049&r2=1477088&rev=1477088&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ComposedTextMarkerCondition.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ComposedRutaCondition.java Mon Apr 29 14:09:53 2013
@@ -17,27 +17,27 @@
* under the License.
*/
-package org.apache.uima.textmarker.condition;
+package org.apache.uima.ruta.condition;
import java.util.ArrayList;
import java.util.List;
-public abstract class ComposedTextMarkerCondition extends AbstractTextMarkerCondition {
+public abstract class ComposedRutaCondition extends AbstractRutaCondition {
- protected List<AbstractTextMarkerCondition> conditions;
+ protected List<AbstractRutaCondition> conditions;
- public ComposedTextMarkerCondition(List<AbstractTextMarkerCondition> conditions) {
+ public ComposedRutaCondition(List<AbstractRutaCondition> conditions) {
super();
this.conditions = conditions;
}
- public ComposedTextMarkerCondition(AbstractTextMarkerCondition condition) {
+ public ComposedRutaCondition(AbstractRutaCondition condition) {
super();
- this.conditions = new ArrayList<AbstractTextMarkerCondition>();
+ this.conditions = new ArrayList<AbstractRutaCondition>();
this.conditions.add(condition);
}
- public List<AbstractTextMarkerCondition> getConditions() {
+ public List<AbstractRutaCondition> getConditions() {
return conditions;
}
}
Copied: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/TerminalRutaCondition.java (from r1477049, uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/TerminalTextMarkerCondition.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/TerminalRutaCondition.java?p2=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/TerminalRutaCondition.java&p1=uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/TerminalTextMarkerCondition.java&r1=1477049&r2=1477088&rev=1477088&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/TerminalTextMarkerCondition.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/TerminalRutaCondition.java Mon Apr 29 14:09:53 2013
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.apache.uima.textmarker.condition;
+package org.apache.uima.ruta.condition;
-public abstract class TerminalTextMarkerCondition extends AbstractTextMarkerCondition {
+public abstract class TerminalRutaCondition extends AbstractRutaCondition {
- public TerminalTextMarkerCondition() {
+ public TerminalRutaCondition() {
super();
}