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 15:39:14 UTC
svn commit: r1477060 [1/2] -
/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/
Author: pkluegl
Date: Mon Apr 29 13:39:13 2013
New Revision: 1477060
URL: http://svn.apache.org/r1477060
Log:
UIMA-2850
- renaming
Modified:
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/AbstractMarkAction.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/AbstractStructureAction.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ActionFactory.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/AddAction.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/AddFilterTypeAction.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/AddRetainTypeAction.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/AssignAction.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/CallAction.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ClearAction.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ColorAction.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ComposedAction.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ConfigureAction.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/CreateAction.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/DelAction.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/DynamicAnchoringAction.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ExecAction.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/FillAction.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/FilterTypeAction.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/GatherAction.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/GetAction.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/GetFeatureAction.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/GetListAction.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/LogAction.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkAction.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkFastAction.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkLastAction.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkOnceAction.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkTableAction.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MatchedTextAction.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MergeAction.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/RemoveAction.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/RemoveDuplicateAction.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/RemoveFilterTypeAction.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/RemoveRetainTypeAction.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ReplaceAction.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/RetainTypeAction.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/SetFeatureAction.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ShiftAction.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/TransferAction.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/TrieAction.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/TrimAction.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/TypeSensitiveAction.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/UnmarkAction.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/UnmarkAllAction.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/VariableAction.java
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/AbstractMarkAction.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/AbstractMarkAction.java?rev=1477060&r1=1477059&r2=1477060&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/AbstractMarkAction.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/AbstractMarkAction.java Mon Apr 29 13:39:13 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
import java.util.ArrayList;
import java.util.List;
@@ -25,11 +25,11 @@ import java.util.List;
import org.apache.uima.cas.Type;
import org.apache.uima.cas.text.AnnotationFS;
import org.apache.uima.jcas.tcas.Annotation;
-import org.apache.uima.textmarker.TextMarkerStream;
-import org.apache.uima.textmarker.expression.number.NumberExpression;
-import org.apache.uima.textmarker.expression.type.TypeExpression;
-import org.apache.uima.textmarker.rule.RuleElement;
-import org.apache.uima.textmarker.rule.RuleMatch;
+import org.apache.uima.ruta.RutaStream;
+import org.apache.uima.ruta.expression.number.NumberExpression;
+import org.apache.uima.ruta.expression.type.TypeExpression;
+import org.apache.uima.ruta.rule.RuleElement;
+import org.apache.uima.ruta.rule.RuleMatch;
public abstract class AbstractMarkAction extends TypeSensitiveAction {
@@ -38,7 +38,7 @@ public abstract class AbstractMarkAction
}
protected Annotation createAnnotation(AnnotationFS matchedAnnotation, RuleElement element,
- TextMarkerStream stream, RuleMatch match) {
+ RutaStream stream, RuleMatch match) {
Type t = type.getType(element.getParent());
AnnotationFS newAnnotationFS = stream.getCas().createAnnotation(t,
matchedAnnotation.getBegin(), matchedAnnotation.getEnd());
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/AbstractStructureAction.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/AbstractStructureAction.java?rev=1477060&r1=1477059&r2=1477060&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/AbstractStructureAction.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/AbstractStructureAction.java Mon Apr 29 13:39:13 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
import java.util.HashMap;
import java.util.List;
@@ -31,26 +31,26 @@ 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.textmarker.TextMarkerStream;
-import org.apache.uima.textmarker.UIMAConstants;
-import org.apache.uima.textmarker.expression.TextMarkerExpression;
-import org.apache.uima.textmarker.expression.bool.BooleanExpression;
-import org.apache.uima.textmarker.expression.number.NumberExpression;
-import org.apache.uima.textmarker.expression.string.StringExpression;
-import org.apache.uima.textmarker.expression.type.TypeExpression;
-import org.apache.uima.textmarker.rule.RuleElement;
-import org.apache.uima.textmarker.utils.UIMAUtils;
+import org.apache.uima.ruta.RutaStream;
+import org.apache.uima.ruta.UIMAConstants;
+import org.apache.uima.ruta.expression.RutaExpression;
+import org.apache.uima.ruta.expression.bool.BooleanExpression;
+import org.apache.uima.ruta.expression.number.NumberExpression;
+import org.apache.uima.ruta.expression.string.StringExpression;
+import org.apache.uima.ruta.expression.type.TypeExpression;
+import org.apache.uima.ruta.rule.RuleElement;
+import org.apache.uima.ruta.utils.UIMAUtils;
-public abstract class AbstractStructureAction extends AbstractTextMarkerAction {
+public abstract class AbstractStructureAction extends AbstractRutaAction {
public AbstractStructureAction() {
super();
}
- protected void fillFeatures(TOP structure, Map<StringExpression, TextMarkerExpression> features,
- AnnotationFS matchedAnnotation, RuleElement element, TextMarkerStream stream) {
- Map<String, TextMarkerExpression> map = new HashMap<String, TextMarkerExpression>();
- for (Entry<StringExpression, TextMarkerExpression> each : features.entrySet()) {
+ protected void fillFeatures(TOP structure, Map<StringExpression, RutaExpression> features,
+ AnnotationFS matchedAnnotation, RuleElement element, RutaStream stream) {
+ Map<String, RutaExpression> map = new HashMap<String, RutaExpression>();
+ for (Entry<StringExpression, RutaExpression> each : features.entrySet()) {
String value = each.getKey().getStringValue(element.getParent());
map.put(value, each.getValue());
}
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ActionFactory.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ActionFactory.java?rev=1477060&r1=1477059&r2=1477060&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ActionFactory.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ActionFactory.java Mon Apr 29 13:39:13 2013
@@ -17,142 +17,142 @@
* under the License.
*/
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
import java.util.List;
import java.util.Map;
import java.util.logging.Level;
import org.antlr.runtime.Token;
-import org.apache.uima.textmarker.TextMarkerBlock;
-import org.apache.uima.textmarker.expression.TextMarkerExpression;
-import org.apache.uima.textmarker.expression.bool.BooleanExpression;
-import org.apache.uima.textmarker.expression.list.ListExpression;
-import org.apache.uima.textmarker.expression.list.StringListExpression;
-import org.apache.uima.textmarker.expression.list.TypeListExpression;
-import org.apache.uima.textmarker.expression.number.NumberExpression;
-import org.apache.uima.textmarker.expression.resource.WordListExpression;
-import org.apache.uima.textmarker.expression.resource.WordTableExpression;
-import org.apache.uima.textmarker.expression.string.StringExpression;
-import org.apache.uima.textmarker.expression.type.TypeExpression;
+import org.apache.uima.ruta.RutaBlock;
+import org.apache.uima.ruta.expression.RutaExpression;
+import org.apache.uima.ruta.expression.bool.BooleanExpression;
+import org.apache.uima.ruta.expression.list.ListExpression;
+import org.apache.uima.ruta.expression.list.StringListExpression;
+import org.apache.uima.ruta.expression.list.TypeListExpression;
+import org.apache.uima.ruta.expression.number.NumberExpression;
+import org.apache.uima.ruta.expression.resource.WordListExpression;
+import org.apache.uima.ruta.expression.resource.WordTableExpression;
+import org.apache.uima.ruta.expression.string.StringExpression;
+import org.apache.uima.ruta.expression.type.TypeExpression;
public class ActionFactory {
private ActionFactory() {
}
- public static AbstractTextMarkerAction createColorAction(TypeExpression typeExpr,
+ public static AbstractRutaAction createColorAction(TypeExpression typeExpr,
StringExpression bgcolor, StringExpression fgcolor, BooleanExpression selected,
- TextMarkerBlock parent) {
+ RutaBlock parent) {
return new ColorAction(typeExpr, bgcolor, fgcolor, selected);
}
- public static AbstractTextMarkerAction createDelAction(TextMarkerBlock parent) {
+ public static AbstractRutaAction createDelAction(RutaBlock parent) {
return new DelAction();
}
- public static AbstractTextMarkerAction createMarkFastAction(TypeExpression type,
+ public static AbstractRutaAction createMarkFastAction(TypeExpression type,
WordListExpression list, BooleanExpression ignore, NumberExpression ignoreLength,
- BooleanExpression ignoreWS, TextMarkerBlock parent) {
+ BooleanExpression ignoreWS, RutaBlock parent) {
return new MarkFastAction(type, list, ignore, ignoreLength, ignoreWS);
}
- public static AbstractTextMarkerAction createMarkFastAction(TypeExpression type,
+ public static AbstractRutaAction createMarkFastAction(TypeExpression type,
StringListExpression list, BooleanExpression ignore, NumberExpression ignoreLength,
- BooleanExpression ignoreWS, TextMarkerBlock env) {
+ BooleanExpression ignoreWS, RutaBlock env) {
return new MarkFastAction(type, list, ignore, ignoreLength, ignoreWS);
}
- public static AbstractTextMarkerAction createMarkLastAction(TypeExpression type,
- TextMarkerBlock parent) {
+ public static AbstractRutaAction createMarkLastAction(TypeExpression type,
+ RutaBlock parent) {
return new MarkLastAction(type);
}
- public static AbstractTextMarkerAction createRetainTypeAction(List<TypeExpression> types,
- TextMarkerBlock parent) {
+ public static AbstractRutaAction createRetainTypeAction(List<TypeExpression> types,
+ RutaBlock parent) {
return new RetainTypeAction(types);
}
- public static AbstractTextMarkerAction createLogAction(StringExpression expr, Token log,
- TextMarkerBlock parent) {
+ public static AbstractRutaAction createLogAction(StringExpression expr, Token log,
+ RutaBlock parent) {
String logString = log == null ? "INFO" : log.getText();
Level level = Level.parse(logString.toUpperCase());
return new LogAction(expr, level);
}
- public static AbstractTextMarkerAction createMarkAction(NumberExpression score,
- TypeExpression type, List<NumberExpression> list, TextMarkerBlock parent) {
+ public static AbstractRutaAction createMarkAction(NumberExpression score,
+ TypeExpression type, List<NumberExpression> list, RutaBlock parent) {
return new MarkAction(type, score, list);
}
- public static AbstractTextMarkerAction createMarkOnceAction(NumberExpression score,
- TypeExpression type, List<NumberExpression> list, TextMarkerBlock env) {
+ public static AbstractRutaAction createMarkOnceAction(NumberExpression score,
+ TypeExpression type, List<NumberExpression> list, RutaBlock env) {
return new MarkOnceAction(type, score, list);
}
- public static AbstractTextMarkerAction createReplaceAction(StringExpression lit,
- TextMarkerBlock parent) {
+ public static AbstractRutaAction createReplaceAction(StringExpression lit,
+ RutaBlock parent) {
return new ReplaceAction(lit);
}
- public static AbstractTextMarkerAction createCreateAction(TypeExpression typeExpr,
- Map<StringExpression, TextMarkerExpression> map, List<NumberExpression> indexes,
- TextMarkerBlock parent) {
+ public static AbstractRutaAction createCreateAction(TypeExpression typeExpr,
+ Map<StringExpression, RutaExpression> map, List<NumberExpression> indexes,
+ RutaBlock parent) {
return new CreateAction(typeExpr, map, indexes);
}
- public static AbstractTextMarkerAction createGatherAction(TypeExpression typeExpr,
- Map<StringExpression, TextMarkerExpression> map, List<NumberExpression> indexes,
- TextMarkerBlock parent) {
+ public static AbstractRutaAction createGatherAction(TypeExpression typeExpr,
+ Map<StringExpression, RutaExpression> map, List<NumberExpression> indexes,
+ RutaBlock parent) {
return new GatherAction(typeExpr, map, indexes);
}
- public static AbstractTextMarkerAction createFillAction(TypeExpression type,
- Map<StringExpression, TextMarkerExpression> map, TextMarkerBlock parent) {
+ public static AbstractRutaAction createFillAction(TypeExpression type,
+ Map<StringExpression, RutaExpression> map, RutaBlock parent) {
return new FillAction(type, map);
}
- public static AbstractTextMarkerAction createCallAction(String ns, TextMarkerBlock parent) {
+ public static AbstractRutaAction createCallAction(String ns, RutaBlock parent) {
return new CallAction(ns);
}
- public static AbstractTextMarkerAction createConfigureAction(String ns,
- Map<StringExpression, TextMarkerExpression> map, TextMarkerBlock env) {
+ public static AbstractRutaAction createConfigureAction(String ns,
+ Map<StringExpression, RutaExpression> map, RutaBlock env) {
return new ConfigureAction(ns, map);
}
- public static AbstractTextMarkerAction createAssignAction(Token nv, TextMarkerExpression e,
- TextMarkerBlock parent) {
+ public static AbstractRutaAction createAssignAction(Token nv, RutaExpression e,
+ RutaBlock parent) {
return new AssignAction(nv.getText(), e);
}
- public static AbstractTextMarkerAction createFilterTypeAction(List<TypeExpression> types,
- TextMarkerBlock parent) {
+ public static AbstractRutaAction createFilterTypeAction(List<TypeExpression> types,
+ RutaBlock parent) {
return new FilterTypeAction(types);
}
- public static AbstractTextMarkerAction createAddRetainTypeAction(List<TypeExpression> types,
- TextMarkerBlock env) {
+ public static AbstractRutaAction createAddRetainTypeAction(List<TypeExpression> types,
+ RutaBlock env) {
return new AddRetainTypeAction(types);
}
- public static AbstractTextMarkerAction createRemoveRetainTypeAction(List<TypeExpression> types,
- TextMarkerBlock env) {
+ public static AbstractRutaAction createRemoveRetainTypeAction(List<TypeExpression> types,
+ RutaBlock env) {
return new RemoveRetainTypeAction(types);
}
- public static AbstractTextMarkerAction createAddFilterTypeAction(List<TypeExpression> types,
- TextMarkerBlock env) {
+ public static AbstractRutaAction createAddFilterTypeAction(List<TypeExpression> types,
+ RutaBlock env) {
return new AddFilterTypeAction(types);
}
- public static AbstractTextMarkerAction createRemoveFilterTypeAction(List<TypeExpression> types,
- TextMarkerBlock env) {
+ public static AbstractRutaAction createRemoveFilterTypeAction(List<TypeExpression> types,
+ RutaBlock env) {
return new RemoveFilterTypeAction(types);
}
- public static AbstractTextMarkerAction createSetFeatureAction(StringExpression f, Object v,
- TextMarkerBlock parent) {
+ public static AbstractRutaAction createSetFeatureAction(StringExpression f, Object v,
+ RutaBlock parent) {
if (v instanceof NumberExpression) {
return new SetFeatureAction(f, (NumberExpression) v);
} else if (v instanceof StringExpression) {
@@ -163,104 +163,104 @@ public class ActionFactory {
return null;
}
- public static AbstractTextMarkerAction createUnmarkAction(TypeExpression f, List<NumberExpression> list, BooleanExpression b, TextMarkerBlock env) {
+ public static AbstractRutaAction createUnmarkAction(TypeExpression f, List<NumberExpression> list, BooleanExpression b, RutaBlock env) {
return new UnmarkAction(f, list, b);
}
- public static AbstractTextMarkerAction createUnmarkAllAction(TypeExpression f,
- TypeListExpression list, TextMarkerBlock env) {
+ public static AbstractRutaAction createUnmarkAllAction(TypeExpression f,
+ TypeListExpression list, RutaBlock env) {
return new UnmarkAllAction(f, list);
}
- public static AbstractTextMarkerAction createComposedAction(
- List<AbstractTextMarkerAction> actions, TextMarkerBlock env) {
+ public static AbstractRutaAction createComposedAction(
+ List<AbstractRutaAction> actions, RutaBlock env) {
return new ComposedAction(actions);
}
- public static AbstractTextMarkerAction createActionVariable(Token id) {
+ public static AbstractRutaAction createActionVariable(Token id) {
return new VariableAction(id.getText());
}
- public static AbstractTextMarkerAction createTransferAction(TypeExpression f, TextMarkerBlock env) {
+ public static AbstractRutaAction createTransferAction(TypeExpression f, RutaBlock env) {
return new TransferAction(f);
}
- public static AbstractTextMarkerAction createTrieAction(WordListExpression list,
+ public static AbstractRutaAction createTrieAction(WordListExpression list,
Map<StringExpression, TypeExpression> map, BooleanExpression ignoreCase,
NumberExpression ignoreLength, BooleanExpression edit, NumberExpression distance,
- StringExpression ignoreChar, TextMarkerBlock parent) {
+ StringExpression ignoreChar, RutaBlock parent) {
return new TrieAction(list, map, ignoreCase, ignoreLength, edit, distance, ignoreChar);
}
- public static AbstractTextMarkerAction createExecAction(String ns, TypeListExpression tl,
- TextMarkerBlock env) {
+ public static AbstractRutaAction createExecAction(String ns, TypeListExpression tl,
+ RutaBlock env) {
return new ExecAction(ns, tl);
}
- public static AbstractTextMarkerAction createMarkTableAction(TypeExpression structure,
+ public static AbstractRutaAction createMarkTableAction(TypeExpression structure,
NumberExpression index, WordTableExpression table,
Map<StringExpression, NumberExpression> map, BooleanExpression ignoreCase,
NumberExpression ignoreLength, StringExpression ignoreChar,
- NumberExpression maxIgnoreChar, TextMarkerBlock env) {
+ NumberExpression maxIgnoreChar, RutaBlock env) {
return new MarkTableAction(structure, index, table, map, ignoreCase, ignoreLength, ignoreChar,
maxIgnoreChar);
}
- public static AbstractTextMarkerAction createMergeAction(BooleanExpression union, Token target,
- List<ListExpression> list, TextMarkerBlock env) {
+ public static AbstractRutaAction createMergeAction(BooleanExpression union, Token target,
+ List<ListExpression> list, RutaBlock env) {
return new MergeAction(union, target == null ? null : target.getText(), list);
}
- public static AbstractTextMarkerAction createGetAction(ListExpression<TextMarkerExpression> f,
- Token var, StringExpression op, TextMarkerBlock env) {
+ public static AbstractRutaAction createGetAction(ListExpression<RutaExpression> f,
+ Token var, StringExpression op, RutaBlock env) {
return new GetAction(f, var == null ? null : var.getText(), op);
}
- public static AbstractTextMarkerAction createRemoveAction(Token var,
- List<TextMarkerExpression> list, TextMarkerBlock env) {
+ public static AbstractRutaAction createRemoveAction(Token var,
+ List<RutaExpression> list, RutaBlock env) {
return new RemoveAction(var == null ? null : var.getText(), list);
}
- public static AbstractTextMarkerAction createAddAction(Token var,
- List<TextMarkerExpression> list, TextMarkerBlock env) {
+ public static AbstractRutaAction createAddAction(Token var,
+ List<RutaExpression> list, RutaBlock env) {
return new AddAction(var == null ? null : var.getText(), list);
}
- public static AbstractTextMarkerAction createGetListAction(Token var, StringExpression op,
- TextMarkerBlock env) {
+ public static AbstractRutaAction createGetListAction(Token var, StringExpression op,
+ RutaBlock env) {
return new GetListAction(var == null ? null : var.getText(), op);
}
- public static AbstractTextMarkerAction createRemoveDuplicateAction(Token var, TextMarkerBlock env) {
+ public static AbstractRutaAction createRemoveDuplicateAction(Token var, RutaBlock env) {
return new RemoveDuplicateAction(var == null ? null : var.getText());
}
- public static AbstractTextMarkerAction createGetFeatureAction(StringExpression f, Token var,
- TextMarkerBlock env) {
+ public static AbstractRutaAction createGetFeatureAction(StringExpression f, Token var,
+ RutaBlock env) {
return new GetFeatureAction(f, var == null ? null : var.getText());
}
- public static AbstractTextMarkerAction createMatchedTextAction(Token var,
- List<NumberExpression> list, TextMarkerBlock env) {
+ public static AbstractRutaAction createMatchedTextAction(Token var,
+ List<NumberExpression> list, RutaBlock env) {
return new MatchedTextAction(var == null ? null : var.getText(), list);
}
- public static AbstractTextMarkerAction createClearAction(Token var, TextMarkerBlock env) {
+ public static AbstractRutaAction createClearAction(Token var, RutaBlock env) {
return new ClearAction(var == null ? null : var.getText());
}
- public static AbstractTextMarkerAction createShiftAction(TypeExpression type,
- List<NumberExpression> list, TextMarkerBlock env) {
+ public static AbstractRutaAction createShiftAction(TypeExpression type,
+ List<NumberExpression> list, RutaBlock env) {
return new ShiftAction(type, list);
}
- public static AbstractTextMarkerAction createDynamicAnchoringAction(BooleanExpression active,
- NumberExpression penalty, NumberExpression factor, TextMarkerBlock env) {
+ public static AbstractRutaAction createDynamicAnchoringAction(BooleanExpression active,
+ NumberExpression penalty, NumberExpression factor, RutaBlock env) {
return new DynamicAnchoringAction(active, penalty, factor);
}
- public static AbstractTextMarkerAction createTrimAction(List<TypeExpression> types,
- TypeListExpression typeList, TextMarkerBlock env) {
+ public static AbstractRutaAction createTrimAction(List<TypeExpression> types,
+ TypeListExpression typeList, RutaBlock env) {
return new TrimAction(types, typeList);
}
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/AddAction.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/AddAction.java?rev=1477060&r1=1477059&r2=1477060&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/AddAction.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/AddAction.java Mon Apr 29 13:39:13 2013
@@ -17,31 +17,31 @@
* under the License.
*/
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
import java.util.List;
import org.apache.uima.cas.Type;
-import org.apache.uima.textmarker.TextMarkerBlock;
-import org.apache.uima.textmarker.TextMarkerEnvironment;
-import org.apache.uima.textmarker.TextMarkerStream;
-import org.apache.uima.textmarker.expression.TextMarkerExpression;
-import org.apache.uima.textmarker.expression.bool.BooleanExpression;
-import org.apache.uima.textmarker.expression.list.ListExpression;
-import org.apache.uima.textmarker.expression.number.NumberExpression;
-import org.apache.uima.textmarker.expression.string.StringExpression;
-import org.apache.uima.textmarker.expression.type.TypeExpression;
-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.RutaBlock;
+import org.apache.uima.ruta.RutaEnvironment;
+import org.apache.uima.ruta.RutaStream;
+import org.apache.uima.ruta.expression.RutaExpression;
+import org.apache.uima.ruta.expression.bool.BooleanExpression;
+import org.apache.uima.ruta.expression.list.ListExpression;
+import org.apache.uima.ruta.expression.number.NumberExpression;
+import org.apache.uima.ruta.expression.string.StringExpression;
+import org.apache.uima.ruta.expression.type.TypeExpression;
+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 AbstractTextMarkerAction {
+public class AddAction extends AbstractRutaAction {
private String var;
- private List<TextMarkerExpression> elements;
+ private List<RutaExpression> elements;
- public AddAction(String var, List<TextMarkerExpression> list) {
+ public AddAction(String var, List<RutaExpression> list) {
super();
this.var = var;
this.elements = list;
@@ -51,20 +51,20 @@ public class AddAction extends AbstractT
return var;
}
- public List<TextMarkerExpression> getElements() {
+ public List<RutaExpression> getElements() {
return elements;
}
@SuppressWarnings({ "unchecked", "rawtypes" })
@Override
- public void execute(RuleMatch match, RuleElement element, TextMarkerStream stream,
+ public void execute(RuleMatch match, RuleElement element, RutaStream stream,
InferenceCrowd crowd) {
- TextMarkerBlock parent = element.getParent();
- TextMarkerEnvironment environment = parent.getEnvironment();
+ RutaBlock parent = element.getParent();
+ RutaEnvironment environment = parent.getEnvironment();
List list = environment.getVariableValue(var, List.class);
// Class<?> vtype = environment.getVariableType(var);
Class<?> vgtype = environment.getVariableGenericType(var);
- for (TextMarkerExpression each : elements) {
+ for (RutaExpression each : elements) {
if (each instanceof ListExpression) {
ListExpression l = (ListExpression) each;
list.addAll(l.getList(parent));
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/AddFilterTypeAction.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/AddFilterTypeAction.java?rev=1477060&r1=1477059&r2=1477060&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/AddFilterTypeAction.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/AddFilterTypeAction.java Mon Apr 29 13:39:13 2013
@@ -17,19 +17,19 @@
* under the License.
*/
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
import java.util.ArrayList;
import java.util.List;
import org.apache.uima.cas.Type;
-import org.apache.uima.textmarker.TextMarkerStream;
-import org.apache.uima.textmarker.expression.type.TypeExpression;
-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.RutaStream;
+import org.apache.uima.ruta.expression.type.TypeExpression;
+import org.apache.uima.ruta.rule.RuleElement;
+import org.apache.uima.ruta.rule.RuleMatch;
+import org.apache.uima.ruta.visitor.InferenceCrowd;
-public class AddFilterTypeAction extends AbstractTextMarkerAction {
+public class AddFilterTypeAction extends AbstractRutaAction {
public List<TypeExpression> getList() {
return list;
@@ -43,7 +43,7 @@ public class AddFilterTypeAction extends
}
@Override
- public void execute(RuleMatch match, RuleElement element, TextMarkerStream stream,
+ public void execute(RuleMatch match, RuleElement element, RutaStream stream,
InferenceCrowd crowd) {
List<Type> types = new ArrayList<Type>();
for (TypeExpression each : list) {
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/AddRetainTypeAction.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/AddRetainTypeAction.java?rev=1477060&r1=1477059&r2=1477060&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/AddRetainTypeAction.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/AddRetainTypeAction.java Mon Apr 29 13:39:13 2013
@@ -18,19 +18,19 @@
*/
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
import java.util.ArrayList;
import java.util.List;
import org.apache.uima.cas.Type;
-import org.apache.uima.textmarker.TextMarkerStream;
-import org.apache.uima.textmarker.expression.type.TypeExpression;
-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.RutaStream;
+import org.apache.uima.ruta.expression.type.TypeExpression;
+import org.apache.uima.ruta.rule.RuleElement;
+import org.apache.uima.ruta.rule.RuleMatch;
+import org.apache.uima.ruta.visitor.InferenceCrowd;
-public class AddRetainTypeAction extends AbstractTextMarkerAction {
+public class AddRetainTypeAction extends AbstractRutaAction {
public List<TypeExpression> getList() {
return list;
@@ -44,7 +44,7 @@ public class AddRetainTypeAction extends
}
@Override
- public void execute(RuleMatch match, RuleElement element, TextMarkerStream stream,
+ public void execute(RuleMatch match, RuleElement element, RutaStream stream,
InferenceCrowd crowd) {
List<Type> types = new ArrayList<Type>();
for (TypeExpression each : list) {
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/AssignAction.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/AssignAction.java?rev=1477060&r1=1477059&r2=1477060&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/AssignAction.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/AssignAction.java Mon Apr 29 13:39:13 2013
@@ -17,38 +17,38 @@
* under the License.
*/
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
import org.apache.uima.cas.Type;
-import org.apache.uima.textmarker.TextMarkerBlock;
-import org.apache.uima.textmarker.TextMarkerEnvironment;
-import org.apache.uima.textmarker.TextMarkerStream;
-import org.apache.uima.textmarker.expression.TextMarkerExpression;
-import org.apache.uima.textmarker.expression.bool.BooleanExpression;
-import org.apache.uima.textmarker.expression.number.NumberExpression;
-import org.apache.uima.textmarker.expression.string.StringExpression;
-import org.apache.uima.textmarker.expression.type.TypeExpression;
-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.RutaBlock;
+import org.apache.uima.ruta.RutaEnvironment;
+import org.apache.uima.ruta.RutaStream;
+import org.apache.uima.ruta.expression.RutaExpression;
+import org.apache.uima.ruta.expression.bool.BooleanExpression;
+import org.apache.uima.ruta.expression.number.NumberExpression;
+import org.apache.uima.ruta.expression.string.StringExpression;
+import org.apache.uima.ruta.expression.type.TypeExpression;
+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 AbstractTextMarkerAction {
+public class AssignAction extends AbstractRutaAction {
private String var;
- private TextMarkerExpression expression;
+ private RutaExpression expression;
- public AssignAction(String var, TextMarkerExpression e) {
+ public AssignAction(String var, RutaExpression e) {
super();
this.var = var;
this.expression = e;
}
@Override
- public void execute(RuleMatch match, RuleElement element, TextMarkerStream stream,
+ public void execute(RuleMatch match, RuleElement element, RutaStream stream,
InferenceCrowd crowd) {
- TextMarkerBlock parent = element.getParent();
- TextMarkerEnvironment environment = parent.getEnvironment();
+ RutaBlock parent = element.getParent();
+ RutaEnvironment environment = parent.getEnvironment();
Class<?> clazz = environment.getVariableType(var);
if (clazz.equals(Integer.class) && expression instanceof NumberExpression) {
int v = ((NumberExpression) expression).getIntegerValue(parent);
@@ -72,7 +72,7 @@ public class AssignAction extends Abstra
return var;
}
- public TextMarkerExpression getExpression() {
+ public RutaExpression getExpression() {
return expression;
}
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/CallAction.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/CallAction.java?rev=1477060&r1=1477059&r2=1477060&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/CallAction.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/CallAction.java Mon Apr 29 13:39:13 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
import java.util.Collection;
import java.util.HashSet;
@@ -36,16 +36,16 @@ import org.apache.uima.cas.Type;
import org.apache.uima.cas.text.AnnotationFS;
import org.apache.uima.jcas.tcas.Annotation;
import org.apache.uima.resource.ResourceInitializationException;
-import org.apache.uima.textmarker.ScriptApply;
-import org.apache.uima.textmarker.TextMarkerBlock;
-import org.apache.uima.textmarker.TextMarkerModule;
-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.type.TextMarkerBasic;
-import org.apache.uima.textmarker.visitor.InferenceCrowd;
+import org.apache.uima.ruta.ScriptApply;
+import org.apache.uima.ruta.RutaBlock;
+import org.apache.uima.ruta.RutaModule;
+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.type.RutaBasic;
+import org.apache.uima.ruta.visitor.InferenceCrowd;
-public class CallAction extends AbstractTextMarkerAction {
+public class CallAction extends AbstractRutaAction {
protected String namespace;
@@ -55,10 +55,10 @@ public class CallAction extends Abstract
}
@Override
- public void execute(RuleMatch match, RuleElement element, TextMarkerStream stream,
+ public void execute(RuleMatch match, RuleElement element, RutaStream stream,
InferenceCrowd crowd) {
- TextMarkerModule thisScript = element.getParent().getScript();
+ RutaModule thisScript = element.getParent().getScript();
AnalysisEngine targetEngine = thisScript.getEngine(namespace);
if (targetEngine != null) {
@@ -77,7 +77,7 @@ public class CallAction extends Abstract
scriptName = split[0];
blockName = split[split.length - 1];
}
- TextMarkerModule targetScript = thisScript.getScript(scriptName);
+ RutaModule targetScript = thisScript.getScript(scriptName);
if (targetScript != null) {
callScript(blockName, match, element, stream, crowd, targetScript);
} else {
@@ -88,14 +88,14 @@ public class CallAction extends Abstract
}
protected void callScript(String blockName, RuleMatch match, RuleElement element,
- TextMarkerStream stream, InferenceCrowd crowd, TextMarkerModule targetScript) {
- TextMarkerBlock block = targetScript.getBlock(blockName);
+ RutaStream stream, InferenceCrowd crowd, RutaModule targetScript) {
+ RutaBlock block = targetScript.getBlock(blockName);
if (block == null) {
return;
}
List<AnnotationFS> matchedAnnotationsOf = match.getMatchedAnnotationsOf(element, stream);
for (AnnotationFS annotationFS : matchedAnnotationsOf) {
- TextMarkerStream windowStream = stream.getWindowStream(annotationFS,
+ RutaStream windowStream = stream.getWindowStream(annotationFS,
stream.getDocumentAnnotationType());
ScriptApply apply = block.apply(windowStream, crowd);
match.addDelegateApply(this, apply);
@@ -104,7 +104,7 @@ public class CallAction extends Abstract
}
protected void callEngine(RuleMatch match, InferenceCrowd crowd, AnalysisEngine targetEngine,
- RuleElement element, TextMarkerStream stream) throws ResourceInitializationException,
+ RuleElement element, RutaStream stream) throws ResourceInitializationException,
AnalysisEngineProcessException {
List<AnnotationFS> matchedAnnotations = match.getMatchedAnnotations(stream, null,
@@ -112,7 +112,7 @@ public class CallAction extends Abstract
for (AnnotationFS matchedAnnotation : matchedAnnotations) {
StringBuilder newDocument = new StringBuilder();
- TextMarkerStream windowStream = stream.getWindowStream(matchedAnnotation,
+ RutaStream windowStream = stream.getWindowStream(matchedAnnotation,
stream.getDocumentAnnotationType());
windowStream.moveToFirst();
@@ -131,13 +131,13 @@ public class CallAction extends Abstract
int localEnd = 0;
while (windowStream.isValid()) {
FeatureStructure fs = windowStream.get();
- if (fs instanceof TextMarkerBasic) {
- TextMarkerBasic basic = (TextMarkerBasic) fs;
+ if (fs instanceof RutaBasic) {
+ RutaBasic basic = (RutaBasic) fs;
for (Type type : types) {
Set<AnnotationFS> beginAnchors = basic.getBeginAnchors(type);
for (AnnotationFS a : beginAnchors) {
if (a != null && !a.getType().getName().equals("uima.tcas.DocumentAnnotation")
- && !(a instanceof TextMarkerBasic)) {
+ && !(a instanceof RutaBasic)) {
fsToAdd.add(a);
}
}
@@ -212,12 +212,12 @@ public class CallAction extends Abstract
private void transform(FeatureStructure each, Map<Integer, Integer> new2oldBegin,
Map<Integer, Integer> new2oldEnd, Collection<AnnotationFS> fsToAdd,
- TextMarkerStream stream, RuleMatch match) {
+ RutaStream stream, RuleMatch match) {
CAS cas = stream.getCas();
Type newType = cas.getTypeSystem().getType(each.getType().getName());
if (newType != null && !fsToAdd.contains(each)
&& !newType.getName().equals("uima.tcas.DocumentAnnotation")
- && !(each instanceof TextMarkerBasic)) {
+ && !(each instanceof RutaBasic)) {
FeatureStructure newFS = null;
if (each instanceof AnnotationFS) {
@@ -232,7 +232,7 @@ public class CallAction extends Abstract
private FeatureStructure transformAnnotation(AnnotationFS annotation, Type newType,
Map<Integer, Integer> new2oldBegin, Map<Integer, Integer> new2oldEnd,
- TextMarkerStream stream, RuleMatch match) {
+ RutaStream stream, RuleMatch match) {
CAS cas = stream.getCas();
Integer beginOld = annotation.getBegin();
Integer endOld = annotation.getEnd();
@@ -278,7 +278,7 @@ public class CallAction extends Abstract
private void fillFeatures(FeatureStructure oldFS, FeatureStructure newFS, Type newType,
Map<Integer, Integer> new2oldBegin, Map<Integer, Integer> new2oldEnd,
- TextMarkerStream stream, RuleMatch match) {
+ RutaStream stream, RuleMatch match) {
for (Object obj : newType.getFeatures()) {
Feature feature = (Feature) obj;
String sn = feature.getShortName();
@@ -291,7 +291,7 @@ public class CallAction extends Abstract
private void fillFeature(FeatureStructure oldFS, Feature oldFeature, FeatureStructure newFS,
Feature feature, Map<Integer, Integer> new2oldBegin, Map<Integer, Integer> new2oldEnd,
- TextMarkerStream stream, RuleMatch match) {
+ RutaStream stream, RuleMatch match) {
CAS cas = stream.getCas();
Type oldRange = oldFeature.getRange();
if (oldRange.isPrimitive()) {
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ClearAction.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ClearAction.java?rev=1477060&r1=1477059&r2=1477060&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ClearAction.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ClearAction.java Mon Apr 29 13:39:13 2013
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
-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.RutaStream;
+import org.apache.uima.ruta.rule.RuleElement;
+import org.apache.uima.ruta.rule.RuleMatch;
+import org.apache.uima.ruta.visitor.InferenceCrowd;
-public class ClearAction extends AbstractTextMarkerAction {
+public class ClearAction extends AbstractRutaAction {
private final String list;
@@ -34,7 +34,7 @@ public class ClearAction extends Abstrac
}
@Override
- public void execute(RuleMatch match, RuleElement element, TextMarkerStream stream,
+ public void execute(RuleMatch match, RuleElement element, RutaStream stream,
InferenceCrowd crowd) {
element.getParent().getEnvironment().setVariableValue(list, null);
}
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ColorAction.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ColorAction.java?rev=1477060&r1=1477059&r2=1477060&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ColorAction.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ColorAction.java Mon Apr 29 13:39:13 2013
@@ -17,22 +17,22 @@
* under the License.
*/
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
import org.apache.uima.cas.FeatureStructure;
import org.apache.uima.cas.Type;
-import org.apache.uima.textmarker.TextMarkerStream;
-import org.apache.uima.textmarker.expression.bool.BooleanExpression;
-import org.apache.uima.textmarker.expression.bool.SimpleBooleanExpression;
-import org.apache.uima.textmarker.expression.string.SimpleStringExpression;
-import org.apache.uima.textmarker.expression.string.StringExpression;
-import org.apache.uima.textmarker.expression.type.TypeExpression;
-import org.apache.uima.textmarker.rule.RuleElement;
-import org.apache.uima.textmarker.rule.RuleMatch;
-import org.apache.uima.textmarker.type.TextMarkerColoring;
-import org.apache.uima.textmarker.visitor.InferenceCrowd;
+import org.apache.uima.ruta.RutaStream;
+import org.apache.uima.ruta.expression.bool.BooleanExpression;
+import org.apache.uima.ruta.expression.bool.SimpleBooleanExpression;
+import org.apache.uima.ruta.expression.string.SimpleStringExpression;
+import org.apache.uima.ruta.expression.string.StringExpression;
+import org.apache.uima.ruta.expression.type.TypeExpression;
+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;
-public class ColorAction extends AbstractTextMarkerAction {
+public class ColorAction extends AbstractRutaAction {
private StringExpression bgcolor;
@@ -52,13 +52,13 @@ public class ColorAction extends Abstrac
}
@Override
- public void execute(RuleMatch match, RuleElement element, TextMarkerStream stream,
+ public void execute(RuleMatch match, RuleElement element, RutaStream stream,
InferenceCrowd crowd) {
- Type casType = stream.getJCas().getCasType(TextMarkerColoring.type);
+ Type casType = stream.getJCas().getCasType(RutaColoring.type);
FeatureStructure newAnnotationFS = stream.getCas().createFS(casType);
- TextMarkerColoring coloring = null;
- if (newAnnotationFS instanceof TextMarkerColoring) {
- coloring = (TextMarkerColoring) newAnnotationFS;
+ RutaColoring coloring = null;
+ if (newAnnotationFS instanceof RutaColoring) {
+ coloring = (RutaColoring) newAnnotationFS;
coloring.setBgColor(bgcolor.getStringValue(element.getParent()));
coloring.setFgColor(fgcolor.getStringValue(element.getParent()));
coloring.setSelected(selected.getBooleanValue(element.getParent()));
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ComposedAction.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ComposedAction.java?rev=1477060&r1=1477059&r2=1477060&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ComposedAction.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ComposedAction.java Mon Apr 29 13:39:13 2013
@@ -17,35 +17,35 @@
* under the License.
*/
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
import java.util.List;
-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.RutaStream;
+import org.apache.uima.ruta.rule.RuleElement;
+import org.apache.uima.ruta.rule.RuleMatch;
+import org.apache.uima.ruta.visitor.InferenceCrowd;
-public class ComposedAction extends AbstractTextMarkerAction {
+public class ComposedAction extends AbstractRutaAction {
- private final List<AbstractTextMarkerAction> actions;
+ private final List<AbstractRutaAction> actions;
- public ComposedAction(List<AbstractTextMarkerAction> actions) {
+ public ComposedAction(List<AbstractRutaAction> actions) {
super();
this.actions = actions;
}
@Override
- public void execute(RuleMatch match, RuleElement element, TextMarkerStream stream,
+ public void execute(RuleMatch match, RuleElement element, RutaStream stream,
InferenceCrowd crowd) {
- for (AbstractTextMarkerAction each : actions) {
+ for (AbstractRutaAction each : actions) {
crowd.beginVisit(each, null);
each.execute(match, element, stream, crowd);
crowd.endVisit(each, null);
}
}
- public List<AbstractTextMarkerAction> getActions() {
+ public List<AbstractRutaAction> getActions() {
return actions;
}
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ConfigureAction.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ConfigureAction.java?rev=1477060&r1=1477059&r2=1477060&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ConfigureAction.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ConfigureAction.java Mon Apr 29 13:39:13 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
import java.util.ArrayList;
import java.util.List;
@@ -30,49 +30,49 @@ import org.apache.uima.cas.Type;
import org.apache.uima.resource.ResourceConfigurationException;
import org.apache.uima.resource.metadata.ConfigurationParameter;
import org.apache.uima.resource.metadata.ConfigurationParameterDeclarations;
-import org.apache.uima.textmarker.TextMarkerModule;
-import org.apache.uima.textmarker.TextMarkerStream;
-import org.apache.uima.textmarker.expression.TextMarkerExpression;
-import org.apache.uima.textmarker.expression.bool.BooleanExpression;
-import org.apache.uima.textmarker.expression.list.BooleanListExpression;
-import org.apache.uima.textmarker.expression.list.NumberListExpression;
-import org.apache.uima.textmarker.expression.list.StringListExpression;
-import org.apache.uima.textmarker.expression.list.TypeListExpression;
-import org.apache.uima.textmarker.expression.number.NumberExpression;
-import org.apache.uima.textmarker.expression.string.StringExpression;
-import org.apache.uima.textmarker.expression.type.TypeExpression;
-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.RutaModule;
+import org.apache.uima.ruta.RutaStream;
+import org.apache.uima.ruta.expression.RutaExpression;
+import org.apache.uima.ruta.expression.bool.BooleanExpression;
+import org.apache.uima.ruta.expression.list.BooleanListExpression;
+import org.apache.uima.ruta.expression.list.NumberListExpression;
+import org.apache.uima.ruta.expression.list.StringListExpression;
+import org.apache.uima.ruta.expression.list.TypeListExpression;
+import org.apache.uima.ruta.expression.number.NumberExpression;
+import org.apache.uima.ruta.expression.string.StringExpression;
+import org.apache.uima.ruta.expression.type.TypeExpression;
+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 AbstractTextMarkerAction {
+public class ConfigureAction extends AbstractRutaAction {
private final String namespace;
- private final Map<StringExpression, TextMarkerExpression> parameterMap;
+ private final Map<StringExpression, RutaExpression> parameterMap;
- public ConfigureAction(String ns, Map<StringExpression, TextMarkerExpression> map) {
+ public ConfigureAction(String ns, Map<StringExpression, RutaExpression> map) {
super();
this.namespace = ns;
this.parameterMap = map;
}
@Override
- public void execute(RuleMatch match, RuleElement element, TextMarkerStream stream,
+ public void execute(RuleMatch match, RuleElement element, RutaStream stream,
InferenceCrowd crowd) {
- TextMarkerModule thisScript = element.getParent().getScript();
+ RutaModule thisScript = element.getParent().getScript();
AnalysisEngine targetEngine = thisScript.getEngine(namespace);
ConfigurationParameterDeclarations configurationParameterDeclarations = targetEngine
.getAnalysisEngineMetaData().getConfigurationParameterDeclarations();
- Set<Entry<StringExpression, TextMarkerExpression>> entrySet = parameterMap.entrySet();
- for (Entry<StringExpression, TextMarkerExpression> entry : entrySet) {
+ Set<Entry<StringExpression, RutaExpression>> entrySet = parameterMap.entrySet();
+ for (Entry<StringExpression, RutaExpression> entry : entrySet) {
StringExpression key = entry.getKey();
String stringValue = key.getStringValue(element.getParent());
ConfigurationParameter configurationParameter = configurationParameterDeclarations
.getConfigurationParameter(null, stringValue);
if (configurationParameter != null) {
- TextMarkerExpression value = entry.getValue();
+ RutaExpression value = entry.getValue();
String type = configurationParameter.getType();
if (type.equals("String")) {
if (configurationParameter.isMultiValued()) {
@@ -159,7 +159,7 @@ public class ConfigureAction extends Abs
return namespace;
}
- public Map<StringExpression, TextMarkerExpression> getParameterMap() {
+ public Map<StringExpression, RutaExpression> getParameterMap() {
return parameterMap;
}
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/CreateAction.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/CreateAction.java?rev=1477060&r1=1477059&r2=1477060&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/CreateAction.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/CreateAction.java Mon Apr 29 13:39:13 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
import java.util.ArrayList;
import java.util.HashMap;
@@ -29,34 +29,34 @@ 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.textmarker.TextMarkerStream;
-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.TypeExpression;
-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.RutaStream;
+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.TypeExpression;
+import org.apache.uima.ruta.rule.RuleElement;
+import org.apache.uima.ruta.rule.RuleMatch;
+import org.apache.uima.ruta.visitor.InferenceCrowd;
public class CreateAction extends AbstractStructureAction {
private TypeExpression structureType;
- private Map<StringExpression, TextMarkerExpression> features;
+ private Map<StringExpression, RutaExpression> features;
private List<NumberExpression> indexes;
public CreateAction(TypeExpression structureType,
- Map<StringExpression, TextMarkerExpression> features, List<NumberExpression> indexes) {
+ Map<StringExpression, RutaExpression> features, List<NumberExpression> indexes) {
super();
this.structureType = structureType;
- this.features = features == null ? new HashMap<StringExpression, TextMarkerExpression>()
+ this.features = features == null ? new HashMap<StringExpression, RutaExpression>()
: features;
this.indexes = (indexes == null || indexes.isEmpty()) ? null : indexes;
}
@Override
- public void execute(RuleMatch match, RuleElement element, TextMarkerStream stream,
+ public void execute(RuleMatch match, RuleElement element, RutaStream stream,
InferenceCrowd crowd) {
List<Integer> indexList = getIndexList(match, element);
List<AnnotationFS> matchedAnnotations = match.getMatchedAnnotations(stream, indexList,
@@ -106,7 +106,7 @@ public class CreateAction extends Abstra
return structureType;
}
- public Map<StringExpression, TextMarkerExpression> getFeatures() {
+ public Map<StringExpression, RutaExpression> getFeatures() {
return features;
}
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/DelAction.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/DelAction.java?rev=1477060&r1=1477059&r2=1477060&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/DelAction.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/DelAction.java Mon Apr 29 13:39:13 2013
@@ -17,30 +17,30 @@
* under the License.
*/
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
import java.util.List;
import org.apache.uima.cas.text.AnnotationFS;
-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.type.TextMarkerBasic;
-import org.apache.uima.textmarker.visitor.InferenceCrowd;
+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.type.RutaBasic;
+import org.apache.uima.ruta.visitor.InferenceCrowd;
-public class DelAction extends AbstractTextMarkerAction {
+public class DelAction extends AbstractRutaAction {
public DelAction() {
super();
}
@Override
- public void execute(RuleMatch match, RuleElement element, TextMarkerStream stream,
+ public void execute(RuleMatch match, RuleElement element, RutaStream stream,
InferenceCrowd crowd) {
List<AnnotationFS> matchedAnnotationsOf = match.getMatchedAnnotationsOf(element, stream);
for (AnnotationFS annotationFS : matchedAnnotationsOf) {
- List<TextMarkerBasic> basicsInWindow = stream.getBasicsInWindow(annotationFS);
- for (TextMarkerBasic basic : basicsInWindow) {
+ List<RutaBasic> basicsInWindow = stream.getBasicsInWindow(annotationFS);
+ for (RutaBasic basic : basicsInWindow) {
basic.setReplacement("");
}
}
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/DynamicAnchoringAction.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/DynamicAnchoringAction.java?rev=1477060&r1=1477059&r2=1477060&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/DynamicAnchoringAction.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/DynamicAnchoringAction.java Mon Apr 29 13:39:13 2013
@@ -17,17 +17,17 @@
* under the License.
*/
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
-import org.apache.uima.textmarker.TextMarkerBlock;
-import org.apache.uima.textmarker.TextMarkerStream;
-import org.apache.uima.textmarker.expression.bool.BooleanExpression;
-import org.apache.uima.textmarker.expression.number.NumberExpression;
-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.RutaBlock;
+import org.apache.uima.ruta.RutaStream;
+import org.apache.uima.ruta.expression.bool.BooleanExpression;
+import org.apache.uima.ruta.expression.number.NumberExpression;
+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 AbstractTextMarkerAction {
+public class DynamicAnchoringAction extends AbstractRutaAction {
private final BooleanExpression active;
@@ -44,9 +44,9 @@ public class DynamicAnchoringAction exte
}
@Override
- public void execute(RuleMatch match, RuleElement element, TextMarkerStream stream,
+ public void execute(RuleMatch match, RuleElement element, RutaStream stream,
InferenceCrowd crowd) {
- TextMarkerBlock parent = element.getParent();
+ RutaBlock parent = element.getParent();
boolean activated = active.getBooleanValue(parent);
stream.setDynamicAnchoring(activated);
if (panelty != null) {
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ExecAction.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ExecAction.java?rev=1477060&r1=1477059&r2=1477060&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ExecAction.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ExecAction.java Mon Apr 29 13:39:13 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
import java.util.Collection;
import java.util.HashMap;
@@ -34,15 +34,15 @@ import org.apache.uima.cas.Type;
import org.apache.uima.cas.text.AnnotationFS;
import org.apache.uima.cas.text.AnnotationIndex;
import org.apache.uima.resource.ResourceInitializationException;
-import org.apache.uima.textmarker.ScriptApply;
-import org.apache.uima.textmarker.TextMarkerBlock;
-import org.apache.uima.textmarker.TextMarkerModule;
-import org.apache.uima.textmarker.TextMarkerStream;
-import org.apache.uima.textmarker.expression.list.TypeListExpression;
-import org.apache.uima.textmarker.rule.RuleElement;
-import org.apache.uima.textmarker.rule.RuleMatch;
-import org.apache.uima.textmarker.type.TextMarkerBasic;
-import org.apache.uima.textmarker.visitor.InferenceCrowd;
+import org.apache.uima.ruta.ScriptApply;
+import org.apache.uima.ruta.RutaBlock;
+import org.apache.uima.ruta.RutaModule;
+import org.apache.uima.ruta.RutaStream;
+import org.apache.uima.ruta.expression.list.TypeListExpression;
+import org.apache.uima.ruta.rule.RuleElement;
+import org.apache.uima.ruta.rule.RuleMatch;
+import org.apache.uima.ruta.type.RutaBasic;
+import org.apache.uima.ruta.visitor.InferenceCrowd;
public class ExecAction extends CallAction {
@@ -59,19 +59,19 @@ public class ExecAction extends CallActi
@Override
protected void callScript(String blockName, RuleMatch match, RuleElement element,
- TextMarkerStream stream, InferenceCrowd crowd, TextMarkerModule targetScript) {
- TextMarkerBlock block = targetScript.getBlock(blockName);
+ RutaStream stream, InferenceCrowd crowd, RutaModule targetScript) {
+ RutaBlock block = targetScript.getBlock(blockName);
if (block == null) {
return;
}
- TextMarkerStream completeStream = stream.getCompleteStream();
+ RutaStream completeStream = stream.getCompleteStream();
ScriptApply apply = block.apply(completeStream, crowd);
match.addDelegateApply(this, apply);
}
@Override
protected void callEngine(RuleMatch match, InferenceCrowd crowd, AnalysisEngine targetEngine,
- RuleElement element, TextMarkerStream stream) throws ResourceInitializationException,
+ RuleElement element, RutaStream stream) throws ResourceInitializationException,
AnalysisEngineProcessException {
CAS cas = stream.getCas();
targetEngine.process(cas);
@@ -79,10 +79,10 @@ public class ExecAction extends CallActi
if (typeList != null) {
List<Type> list = typeList.getList(element.getParent());
for (Type type : list) {
- Map<TextMarkerBasic, Collection<AnnotationFS>> map = new HashMap<TextMarkerBasic, Collection<AnnotationFS>>();
+ Map<RutaBasic, Collection<AnnotationFS>> map = new HashMap<RutaBasic, Collection<AnnotationFS>>();
AnnotationIndex<AnnotationFS> ai = cas.getAnnotationIndex(type);
for (AnnotationFS fs : ai) {
- TextMarkerBasic basic = stream.getFirstBasicInWindow(fs);
+ RutaBasic basic = stream.getFirstBasicInWindow(fs);
if (basic != null) {
Collection<AnnotationFS> collection = map.get(basic);
if (collection == null) {
@@ -92,8 +92,8 @@ public class ExecAction extends CallActi
collection.add(fs);
}
}
- Set<Entry<TextMarkerBasic, Collection<AnnotationFS>>> entrySet = map.entrySet();
- for (Entry<TextMarkerBasic, Collection<AnnotationFS>> entry : entrySet) {
+ Set<Entry<RutaBasic, Collection<AnnotationFS>>> entrySet = map.entrySet();
+ for (Entry<RutaBasic, Collection<AnnotationFS>> entry : entrySet) {
for (AnnotationFS each : entry.getValue()) {
stream.removeAnnotation(each);
stream.addAnnotation(each, true, match);
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/FillAction.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/FillAction.java?rev=1477060&r1=1477059&r2=1477060&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/FillAction.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/FillAction.java Mon Apr 29 13:39:13 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
import java.util.List;
import java.util.Map;
@@ -25,29 +25,29 @@ import java.util.Map;
import org.apache.uima.cas.Type;
import org.apache.uima.cas.text.AnnotationFS;
import org.apache.uima.jcas.tcas.Annotation;
-import org.apache.uima.textmarker.TextMarkerStream;
-import org.apache.uima.textmarker.expression.TextMarkerExpression;
-import org.apache.uima.textmarker.expression.string.StringExpression;
-import org.apache.uima.textmarker.expression.type.TypeExpression;
-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.RutaStream;
+import org.apache.uima.ruta.expression.RutaExpression;
+import org.apache.uima.ruta.expression.string.StringExpression;
+import org.apache.uima.ruta.expression.type.TypeExpression;
+import org.apache.uima.ruta.rule.RuleElement;
+import org.apache.uima.ruta.rule.RuleMatch;
+import org.apache.uima.ruta.visitor.InferenceCrowd;
public class FillAction extends AbstractStructureAction {
- private Map<StringExpression, TextMarkerExpression> features;
+ private Map<StringExpression, RutaExpression> features;
private TypeExpression structureType;
public FillAction(TypeExpression structureType,
- Map<StringExpression, TextMarkerExpression> features) {
+ Map<StringExpression, RutaExpression> features) {
super();
this.structureType = structureType;
this.features = features;
}
@Override
- public void execute(RuleMatch match, RuleElement element, TextMarkerStream stream,
+ public void execute(RuleMatch match, RuleElement element, RutaStream stream,
InferenceCrowd crowd) {
List<AnnotationFS> matchedAnnotations = match.getMatchedAnnotations(stream, null,
element.getContainer());
@@ -74,7 +74,7 @@ public class FillAction extends Abstract
}
- public Map<StringExpression, TextMarkerExpression> getFeatures() {
+ public Map<StringExpression, RutaExpression> getFeatures() {
return features;
}
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/FilterTypeAction.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/FilterTypeAction.java?rev=1477060&r1=1477059&r2=1477060&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/FilterTypeAction.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/FilterTypeAction.java Mon Apr 29 13:39:13 2013
@@ -17,19 +17,19 @@
* under the License.
*/
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
import java.util.ArrayList;
import java.util.List;
import org.apache.uima.cas.Type;
-import org.apache.uima.textmarker.TextMarkerStream;
-import org.apache.uima.textmarker.expression.type.TypeExpression;
-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.RutaStream;
+import org.apache.uima.ruta.expression.type.TypeExpression;
+import org.apache.uima.ruta.rule.RuleElement;
+import org.apache.uima.ruta.rule.RuleMatch;
+import org.apache.uima.ruta.visitor.InferenceCrowd;
-public class FilterTypeAction extends AbstractTextMarkerAction {
+public class FilterTypeAction extends AbstractRutaAction {
public List<TypeExpression> getList() {
return list;
@@ -43,7 +43,7 @@ public class FilterTypeAction extends Ab
}
@Override
- public void execute(RuleMatch match, RuleElement element, TextMarkerStream stream,
+ public void execute(RuleMatch match, RuleElement element, RutaStream stream,
InferenceCrowd crowd) {
List<Type> types = new ArrayList<Type>();
for (TypeExpression each : list) {
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/GatherAction.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/GatherAction.java?rev=1477060&r1=1477059&r2=1477060&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/GatherAction.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/GatherAction.java Mon Apr 29 13:39:13 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
import java.util.ArrayList;
import java.util.HashMap;
@@ -35,38 +35,38 @@ 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.textmarker.TextMarkerStream;
-import org.apache.uima.textmarker.expression.TextMarkerExpression;
-import org.apache.uima.textmarker.expression.list.NumberListExpression;
-import org.apache.uima.textmarker.expression.number.NumberExpression;
-import org.apache.uima.textmarker.expression.string.StringExpression;
-import org.apache.uima.textmarker.expression.type.TypeExpression;
-import org.apache.uima.textmarker.rule.RuleElement;
-import org.apache.uima.textmarker.rule.RuleElementMatch;
-import org.apache.uima.textmarker.rule.RuleMatch;
-import org.apache.uima.textmarker.type.TextMarkerFrame;
-import org.apache.uima.textmarker.utils.UIMAUtils;
-import org.apache.uima.textmarker.visitor.InferenceCrowd;
+import org.apache.uima.ruta.RutaStream;
+import org.apache.uima.ruta.expression.RutaExpression;
+import org.apache.uima.ruta.expression.list.NumberListExpression;
+import org.apache.uima.ruta.expression.number.NumberExpression;
+import org.apache.uima.ruta.expression.string.StringExpression;
+import org.apache.uima.ruta.expression.type.TypeExpression;
+import org.apache.uima.ruta.rule.RuleElement;
+import org.apache.uima.ruta.rule.RuleElementMatch;
+import org.apache.uima.ruta.rule.RuleMatch;
+import org.apache.uima.ruta.type.RutaFrame;
+import org.apache.uima.ruta.utils.UIMAUtils;
+import org.apache.uima.ruta.visitor.InferenceCrowd;
public class GatherAction extends AbstractStructureAction {
private TypeExpression structureType;
- private Map<StringExpression, TextMarkerExpression> features;
+ private Map<StringExpression, RutaExpression> features;
private List<NumberExpression> indexes;
public GatherAction(TypeExpression structureType,
- Map<StringExpression, TextMarkerExpression> features, List<NumberExpression> indexes) {
+ Map<StringExpression, RutaExpression> features, List<NumberExpression> indexes) {
super();
this.structureType = structureType;
- this.features = features == null ? new HashMap<StringExpression, TextMarkerExpression>()
+ this.features = features == null ? new HashMap<StringExpression, RutaExpression>()
: features;
this.indexes = (indexes == null || indexes.isEmpty()) ? null : indexes;
}
@Override
- public void execute(RuleMatch match, RuleElement element, TextMarkerStream stream,
+ public void execute(RuleMatch match, RuleElement element, RutaStream stream,
InferenceCrowd crowd) {
List<Integer> indexList = getIndexList(match, element);
List<AnnotationFS> matchedAnnotations = match.getMatchedAnnotations(stream, indexList,
@@ -93,13 +93,13 @@ public class GatherAction extends Abstra
}
- private void gatherFeatures(TOP structure, Map<StringExpression, TextMarkerExpression> features,
+ private void gatherFeatures(TOP structure, Map<StringExpression, RutaExpression> features,
AnnotationFS matchedAnnotation, RuleElement element, RuleMatch match,
- TextMarkerStream stream) {
+ RutaStream stream) {
Map<String, List<Number>> map = new HashMap<String, List<Number>>();
- for (Entry<StringExpression, TextMarkerExpression> each : features.entrySet()) {
+ for (Entry<StringExpression, RutaExpression> each : features.entrySet()) {
String value = each.getKey().getStringValue(element.getParent());
- TextMarkerExpression expr = each.getValue();
+ RutaExpression expr = each.getValue();
List<Number> ints = new ArrayList<Number>();
if (expr instanceof NumberExpression) {
NumberExpression ne = (NumberExpression) expr;
@@ -145,7 +145,7 @@ public class GatherAction extends Abstra
} else {
int begin = textsMatched.get(0).getBegin();
int end = textsMatched.get(textsMatched.size() - 1).getEnd();
- TextMarkerFrame frame = new TextMarkerFrame(jcas, begin, end);
+ RutaFrame frame = new RutaFrame(jcas, begin, end);
FSIterator<Annotation> iterator = jcas.getAnnotationIndex(range).iterator(frame);
AnnotationFS newA = null;
while (iterator.isValid()) {
@@ -214,7 +214,7 @@ public class GatherAction extends Abstra
return structureType;
}
- public Map<StringExpression, TextMarkerExpression> getFeatures() {
+ public Map<StringExpression, RutaExpression> getFeatures() {
return features;
}
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/GetAction.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/GetAction.java?rev=1477060&r1=1477059&r2=1477060&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/GetAction.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/GetAction.java Mon Apr 29 13:39:13 2013
@@ -17,29 +17,29 @@
* under the License.
*/
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
import java.util.ArrayList;
import java.util.List;
-import org.apache.uima.textmarker.TextMarkerBlock;
-import org.apache.uima.textmarker.TextMarkerStream;
-import org.apache.uima.textmarker.expression.TextMarkerExpression;
-import org.apache.uima.textmarker.expression.list.ListExpression;
-import org.apache.uima.textmarker.expression.string.StringExpression;
-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.RutaBlock;
+import org.apache.uima.ruta.RutaStream;
+import org.apache.uima.ruta.expression.RutaExpression;
+import org.apache.uima.ruta.expression.list.ListExpression;
+import org.apache.uima.ruta.expression.string.StringExpression;
+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 AbstractTextMarkerAction {
+public class GetAction extends AbstractRutaAction {
- private ListExpression<TextMarkerExpression> listExpr;
+ private ListExpression<RutaExpression> listExpr;
private String var;
private StringExpression opExpr;
- public GetAction(ListExpression<TextMarkerExpression> f, String string, StringExpression op) {
+ public GetAction(ListExpression<RutaExpression> f, String string, StringExpression op) {
super();
this.listExpr = f;
this.var = string;
@@ -47,7 +47,7 @@ public class GetAction extends AbstractT
}
@Override
- public void execute(RuleMatch match, RuleElement element, TextMarkerStream stream,
+ public void execute(RuleMatch match, RuleElement element, RutaStream stream,
InferenceCrowd crowd) {
String op = opExpr.getStringValue(element.getParent());
List<?> list = listExpr.getList(element.getParent());
@@ -57,7 +57,7 @@ public class GetAction extends AbstractT
}
}
- private Object getDominant(List<?> list, TextMarkerBlock parent) {
+ private Object getDominant(List<?> list, RutaBlock parent) {
List<Object> objs = new ArrayList<Object>();
List<Integer> counts = new ArrayList<Integer>();
for (Object each : list) {
@@ -84,7 +84,7 @@ public class GetAction extends AbstractT
return dominant;
}
- public ListExpression<TextMarkerExpression> getListExpr() {
+ public ListExpression<RutaExpression> getListExpr() {
return listExpr;
}
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/GetFeatureAction.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/GetFeatureAction.java?rev=1477060&r1=1477059&r2=1477060&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/GetFeatureAction.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/GetFeatureAction.java Mon Apr 29 13:39:13 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
import java.util.ArrayList;
import java.util.List;
@@ -25,16 +25,16 @@ import java.util.List;
import org.apache.uima.cas.Feature;
import org.apache.uima.cas.Type;
import org.apache.uima.cas.text.AnnotationFS;
-import org.apache.uima.textmarker.TextMarkerEnvironment;
-import org.apache.uima.textmarker.TextMarkerStream;
-import org.apache.uima.textmarker.UIMAConstants;
-import org.apache.uima.textmarker.expression.string.StringExpression;
-import org.apache.uima.textmarker.rule.RuleElement;
-import org.apache.uima.textmarker.rule.RuleMatch;
-import org.apache.uima.textmarker.rule.TextMarkerRuleElement;
-import org.apache.uima.textmarker.visitor.InferenceCrowd;
+import org.apache.uima.ruta.RutaEnvironment;
+import org.apache.uima.ruta.RutaStream;
+import org.apache.uima.ruta.UIMAConstants;
+import org.apache.uima.ruta.expression.string.StringExpression;
+import org.apache.uima.ruta.rule.RuleElement;
+import org.apache.uima.ruta.rule.RuleMatch;
+import org.apache.uima.ruta.rule.RutaRuleElement;
+import org.apache.uima.ruta.visitor.InferenceCrowd;
-public class GetFeatureAction extends AbstractTextMarkerAction {
+public class GetFeatureAction extends AbstractRutaAction {
private StringExpression featureStringExpression;
@@ -47,11 +47,11 @@ public class GetFeatureAction extends Ab
}
@Override
- public void execute(RuleMatch match, RuleElement element, TextMarkerStream stream,
+ public void execute(RuleMatch match, RuleElement element, RutaStream stream,
InferenceCrowd crowd) {
List<Type> types = new ArrayList<Type>();
- if (element instanceof TextMarkerRuleElement) {
- types = ((TextMarkerRuleElement) element).getMatcher().getTypes(element.getParent(), stream);
+ if (element instanceof RutaRuleElement) {
+ types = ((RutaRuleElement) element).getMatcher().getTypes(element.getParent(), stream);
}
if (types == null)
return;
@@ -59,7 +59,7 @@ public class GetFeatureAction extends Ab
for (Type type : types) {
String stringValue = featureStringExpression.getStringValue(element.getParent());
Feature featureByBaseName = type.getFeatureByBaseName(stringValue);
- TextMarkerEnvironment environment = element.getParent().getEnvironment();
+ RutaEnvironment environment = element.getParent().getEnvironment();
List<AnnotationFS> matchedAnnotations = match.getMatchedAnnotationsOf(element, stream);
for (AnnotationFS annotationFS : matchedAnnotations) {
if (annotationFS.getType().getFeatureByBaseName(stringValue) == null) {