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/12/06 09:41:09 UTC
svn commit: r1548429 [2/5] - in /uima/ruta/trunk:
example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/
ruta-core/src/main/antlr3/org/apache/uima/ruta/parser/
ruta-core/src/main/java/org/apache/uima/ruta/ ru...
Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ConfigureAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ConfigureAction.java?rev=1548429&r1=1548428&r2=1548429&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ConfigureAction.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ConfigureAction.java Fri Dec 6 08:41:07 2013
@@ -33,14 +33,14 @@ import org.apache.uima.resource.metadata
import org.apache.uima.ruta.RutaBlock;
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.IRutaExpression;
+import org.apache.uima.ruta.expression.bool.IBooleanExpression;
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.number.INumberExpression;
+import org.apache.uima.ruta.expression.string.IStringExpression;
import org.apache.uima.ruta.expression.type.TypeExpression;
import org.apache.uima.ruta.rule.RuleElement;
import org.apache.uima.ruta.rule.RuleMatch;
@@ -50,9 +50,9 @@ public class ConfigureAction extends Abs
private final String namespace;
- private final Map<StringExpression, RutaExpression> parameterMap;
+ private final Map<IStringExpression, IRutaExpression> parameterMap;
- public ConfigureAction(String ns, Map<StringExpression, RutaExpression> map) {
+ public ConfigureAction(String ns, Map<IStringExpression, IRutaExpression> map) {
super();
this.namespace = ns;
this.parameterMap = map;
@@ -66,14 +66,14 @@ public class ConfigureAction extends Abs
ConfigurationParameterDeclarations configurationParameterDeclarations = targetEngine
.getAnalysisEngineMetaData().getConfigurationParameterDeclarations();
- Set<Entry<StringExpression, RutaExpression>> entrySet = parameterMap.entrySet();
- for (Entry<StringExpression, RutaExpression> entry : entrySet) {
- StringExpression key = entry.getKey();
+ Set<Entry<IStringExpression, IRutaExpression>> entrySet = parameterMap.entrySet();
+ for (Entry<IStringExpression, IRutaExpression> entry : entrySet) {
+ IStringExpression key = entry.getKey();
String stringValue = key.getStringValue(parent, match, element, stream);
ConfigurationParameter configurationParameter = configurationParameterDeclarations
.getConfigurationParameter(null, stringValue);
if (configurationParameter != null) {
- RutaExpression value = entry.getValue();
+ IRutaExpression value = entry.getValue();
String type = configurationParameter.getType();
if (type.equals("String")) {
if (configurationParameter.isMultiValued()) {
@@ -91,8 +91,8 @@ public class ConfigureAction extends Abs
targetEngine.setConfigParameterValue(stringValue, stringList.toArray());
}
} else {
- if (value instanceof StringExpression) {
- StringExpression se = (StringExpression) value;
+ if (value instanceof IStringExpression) {
+ IStringExpression se = (IStringExpression) value;
String string = se.getStringValue(parent, match, element, stream);
targetEngine.setConfigParameterValue(stringValue, string);
} else if (value instanceof TypeExpression) {
@@ -111,8 +111,8 @@ public class ConfigureAction extends Abs
}
targetEngine.setConfigParameterValue(stringValue, numbers.toArray());
} else {
- if (value instanceof NumberExpression) {
- NumberExpression ne = (NumberExpression) value;
+ if (value instanceof INumberExpression) {
+ INumberExpression ne = (INumberExpression) value;
Double d = ne.getDoubleValue(parent, match, element, stream);
targetEngine.setConfigParameterValue(stringValue, d.floatValue());
}
@@ -127,8 +127,8 @@ public class ConfigureAction extends Abs
}
targetEngine.setConfigParameterValue(stringValue, numbers.toArray());
} else {
- if (value instanceof NumberExpression) {
- NumberExpression ne = (NumberExpression) value;
+ if (value instanceof INumberExpression) {
+ INumberExpression ne = (INumberExpression) value;
Integer i = ne.getIntegerValue(parent, match, element, stream);
targetEngine.setConfigParameterValue(stringValue, i);
}
@@ -139,8 +139,8 @@ public class ConfigureAction extends Abs
List<Boolean> list = ble.getList(parent, stream);
targetEngine.setConfigParameterValue(stringValue, list.toArray());
} else {
- if (value instanceof BooleanExpression) {
- BooleanExpression be = (BooleanExpression) value;
+ if (value instanceof IBooleanExpression) {
+ IBooleanExpression be = (IBooleanExpression) value;
Boolean b = be.getBooleanValue(parent, match, element, stream);
targetEngine.setConfigParameterValue(stringValue, b);
}
@@ -160,7 +160,7 @@ public class ConfigureAction extends Abs
return namespace;
}
- public Map<StringExpression, RutaExpression> getParameterMap() {
+ public Map<IStringExpression, IRutaExpression> getParameterMap() {
return parameterMap;
}
Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/CreateAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/CreateAction.java?rev=1548429&r1=1548428&r2=1548429&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/CreateAction.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/CreateAction.java Fri Dec 6 08:41:07 2013
@@ -30,9 +30,9 @@ import org.apache.uima.cas.text.Annotati
import org.apache.uima.jcas.cas.TOP;
import org.apache.uima.jcas.tcas.Annotation;
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.IRutaExpression;
+import org.apache.uima.ruta.expression.number.INumberExpression;
+import org.apache.uima.ruta.expression.string.IStringExpression;
import org.apache.uima.ruta.expression.type.TypeExpression;
import org.apache.uima.ruta.rule.RuleElement;
import org.apache.uima.ruta.rule.RuleMatch;
@@ -42,15 +42,15 @@ public class CreateAction extends Abstra
private TypeExpression structureType;
- private Map<StringExpression, RutaExpression> features;
+ private Map<IStringExpression, IRutaExpression> features;
- private List<NumberExpression> indexes;
+ private List<INumberExpression> indexes;
- public CreateAction(TypeExpression structureType, Map<StringExpression, RutaExpression> features,
- List<NumberExpression> indexes) {
+ public CreateAction(TypeExpression structureType, Map<IStringExpression, IRutaExpression> features,
+ List<INumberExpression> indexes) {
super();
this.structureType = structureType;
- this.features = features == null ? new HashMap<StringExpression, RutaExpression>() : features;
+ this.features = features == null ? new HashMap<IStringExpression, IRutaExpression>() : features;
this.indexes = (indexes == null || indexes.isEmpty()) ? null : indexes;
}
@@ -90,7 +90,7 @@ public class CreateAction extends Abstra
return indexList;
}
int last = Integer.MAX_VALUE - 1;
- for (NumberExpression each : indexes) {
+ for (INumberExpression each : indexes) {
int value = each.getIntegerValue(element.getParent(), null, stream);
for (int i = Math.min(value, last + 1); i < value; i++) {
indexList.add(i);
@@ -104,11 +104,11 @@ public class CreateAction extends Abstra
return structureType;
}
- public Map<StringExpression, RutaExpression> getFeatures() {
+ public Map<IStringExpression, IRutaExpression> getFeatures() {
return features;
}
- public List<NumberExpression> getIndexes() {
+ public List<INumberExpression> getIndexes() {
return indexes;
}
}
Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/DynamicAnchoringAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/DynamicAnchoringAction.java?rev=1548429&r1=1548428&r2=1548429&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/DynamicAnchoringAction.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/DynamicAnchoringAction.java Fri Dec 6 08:41:07 2013
@@ -21,22 +21,22 @@ package org.apache.uima.ruta.action;
import org.apache.uima.ruta.RutaBlock;
import org.apache.uima.ruta.RutaStream;
-import org.apache.uima.ruta.expression.bool.BooleanExpression;
-import org.apache.uima.ruta.expression.number.NumberExpression;
+import org.apache.uima.ruta.expression.bool.IBooleanExpression;
+import org.apache.uima.ruta.expression.number.INumberExpression;
import org.apache.uima.ruta.rule.RuleElement;
import org.apache.uima.ruta.rule.RuleMatch;
import org.apache.uima.ruta.visitor.InferenceCrowd;
public class DynamicAnchoringAction extends AbstractRutaAction {
- private final BooleanExpression active;
+ private final IBooleanExpression active;
- private final NumberExpression panelty;
+ private final INumberExpression panelty;
- private final NumberExpression factor;
+ private final INumberExpression factor;
- public DynamicAnchoringAction(BooleanExpression active, NumberExpression panelty,
- NumberExpression factor) {
+ public DynamicAnchoringAction(IBooleanExpression active, INumberExpression panelty,
+ INumberExpression factor) {
super();
this.active = active;
this.panelty = panelty;
@@ -58,15 +58,15 @@ public class DynamicAnchoringAction exte
}
}
- public BooleanExpression getActive() {
+ public IBooleanExpression getActive() {
return active;
}
- public NumberExpression getPanelty() {
+ public INumberExpression getPanelty() {
return panelty;
}
- public NumberExpression getFactor() {
+ public INumberExpression getFactor() {
return factor;
}
Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ExecAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ExecAction.java?rev=1548429&r1=1548428&r2=1548429&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ExecAction.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ExecAction.java Fri Dec 6 08:41:07 2013
@@ -43,7 +43,7 @@ import org.apache.uima.ruta.RutaModule;
import org.apache.uima.ruta.RutaStream;
import org.apache.uima.ruta.ScriptApply;
import org.apache.uima.ruta.expression.list.TypeListExpression;
-import org.apache.uima.ruta.expression.string.StringExpression;
+import org.apache.uima.ruta.expression.string.IStringExpression;
import org.apache.uima.ruta.rule.RuleElement;
import org.apache.uima.ruta.rule.RuleMatch;
import org.apache.uima.ruta.type.RutaBasic;
@@ -54,13 +54,13 @@ public class ExecAction extends CallActi
private TypeListExpression typeList;
- private StringExpression view;
+ private IStringExpression view;
public ExecAction(String namespace) {
super(namespace);
}
- public ExecAction(String ns, TypeListExpression tl, StringExpression view) {
+ public ExecAction(String ns, TypeListExpression tl, IStringExpression view) {
this(ns);
this.typeList = tl;
this.view = view;
@@ -134,11 +134,11 @@ public class ExecAction extends CallActi
return typeList;
}
- public StringExpression getView() {
+ public IStringExpression getView() {
return view;
}
- public void setView(StringExpression view) {
+ public void setView(IStringExpression view) {
this.view = view;
}
Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/FillAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/FillAction.java?rev=1548429&r1=1548428&r2=1548429&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/FillAction.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/FillAction.java Fri Dec 6 08:41:07 2013
@@ -26,8 +26,8 @@ import org.apache.uima.cas.Type;
import org.apache.uima.cas.text.AnnotationFS;
import org.apache.uima.jcas.tcas.Annotation;
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.IRutaExpression;
+import org.apache.uima.ruta.expression.string.IStringExpression;
import org.apache.uima.ruta.expression.type.TypeExpression;
import org.apache.uima.ruta.rule.RuleElement;
import org.apache.uima.ruta.rule.RuleMatch;
@@ -35,11 +35,11 @@ import org.apache.uima.ruta.visitor.Infe
public class FillAction extends AbstractStructureAction {
- private Map<StringExpression, RutaExpression> features;
+ private Map<IStringExpression, IRutaExpression> features;
private TypeExpression structureType;
- public FillAction(TypeExpression structureType, Map<StringExpression, RutaExpression> features) {
+ public FillAction(TypeExpression structureType, Map<IStringExpression, IRutaExpression> features) {
super();
this.structureType = structureType;
this.features = features;
@@ -72,7 +72,7 @@ public class FillAction extends Abstract
}
- public Map<StringExpression, RutaExpression> getFeatures() {
+ public Map<IStringExpression, IRutaExpression> getFeatures() {
return features;
}
Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/GatherAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/GatherAction.java?rev=1548429&r1=1548428&r2=1548429&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/GatherAction.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/GatherAction.java Fri Dec 6 08:41:07 2013
@@ -40,10 +40,10 @@ import org.apache.uima.jcas.cas.TOP;
import org.apache.uima.jcas.tcas.Annotation;
import org.apache.uima.ruta.RutaBlock;
import org.apache.uima.ruta.RutaStream;
-import org.apache.uima.ruta.expression.RutaExpression;
+import org.apache.uima.ruta.expression.IRutaExpression;
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.number.INumberExpression;
+import org.apache.uima.ruta.expression.string.IStringExpression;
import org.apache.uima.ruta.expression.type.TypeExpression;
import org.apache.uima.ruta.rule.RuleElement;
import org.apache.uima.ruta.rule.RuleElementMatch;
@@ -56,15 +56,15 @@ public class GatherAction extends Abstra
private TypeExpression structureType;
- private Map<StringExpression, RutaExpression> features;
+ private Map<IStringExpression, IRutaExpression> features;
- private List<NumberExpression> indexes;
+ private List<INumberExpression> indexes;
- public GatherAction(TypeExpression structureType, Map<StringExpression, RutaExpression> features,
- List<NumberExpression> indexes) {
+ public GatherAction(TypeExpression structureType, Map<IStringExpression, IRutaExpression> features,
+ List<INumberExpression> indexes) {
super();
this.structureType = structureType;
- this.features = features == null ? new HashMap<StringExpression, RutaExpression>() : features;
+ this.features = features == null ? new HashMap<IStringExpression, IRutaExpression>() : features;
this.indexes = (indexes == null || indexes.isEmpty()) ? null : indexes;
}
@@ -95,16 +95,16 @@ public class GatherAction extends Abstra
}
- private void gatherFeatures(TOP structure, Map<StringExpression, RutaExpression> features,
+ private void gatherFeatures(TOP structure, Map<IStringExpression, IRutaExpression> features,
AnnotationFS matchedAnnotation, RuleElement element, RuleMatch match, RutaStream stream) {
Map<String, List<Number>> map = new HashMap<String, List<Number>>();
- for (Entry<StringExpression, RutaExpression> each : features.entrySet()) {
+ for (Entry<IStringExpression, IRutaExpression> each : features.entrySet()) {
RutaBlock parent = element.getParent();
String value = each.getKey().getStringValue(parent, match, element, stream);
- RutaExpression expr = each.getValue();
+ IRutaExpression expr = each.getValue();
List<Number> ints = new ArrayList<Number>();
- if (expr instanceof NumberExpression) {
- NumberExpression ne = (NumberExpression) expr;
+ if (expr instanceof INumberExpression) {
+ INumberExpression ne = (INumberExpression) expr;
ints.add(ne.getIntegerValue(parent, match, element, stream));
map.put(value, ints);
} else if (expr instanceof NumberListExpression) {
@@ -213,7 +213,7 @@ public class GatherAction extends Abstra
return indexList;
}
int last = Integer.MAX_VALUE - 1;
- for (NumberExpression each : indexes) {
+ for (INumberExpression each : indexes) {
int value = each.getIntegerValue(element.getParent(), null, stream);
for (int i = Math.min(value, last + 1); i < value; i++) {
indexList.add(i);
@@ -227,11 +227,11 @@ public class GatherAction extends Abstra
return structureType;
}
- public Map<StringExpression, RutaExpression> getFeatures() {
+ public Map<IStringExpression, IRutaExpression> getFeatures() {
return features;
}
- public List<NumberExpression> getIndexes() {
+ public List<INumberExpression> getIndexes() {
return indexes;
}
}
Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/GetAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/GetAction.java?rev=1548429&r1=1548428&r2=1548429&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/GetAction.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/GetAction.java Fri Dec 6 08:41:07 2013
@@ -24,22 +24,22 @@ import java.util.List;
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.IRutaExpression;
import org.apache.uima.ruta.expression.list.ListExpression;
-import org.apache.uima.ruta.expression.string.StringExpression;
+import org.apache.uima.ruta.expression.string.IStringExpression;
import org.apache.uima.ruta.rule.RuleElement;
import org.apache.uima.ruta.rule.RuleMatch;
import org.apache.uima.ruta.visitor.InferenceCrowd;
public class GetAction extends AbstractRutaAction {
- private ListExpression<RutaExpression> listExpr;
+ private ListExpression<IRutaExpression> listExpr;
private String var;
- private StringExpression opExpr;
+ private IStringExpression opExpr;
- public GetAction(ListExpression<RutaExpression> f, String string, StringExpression op) {
+ public GetAction(ListExpression<IRutaExpression> f, String string, IStringExpression op) {
super();
this.listExpr = f;
this.var = string;
@@ -83,7 +83,7 @@ public class GetAction extends AbstractR
return dominant;
}
- public ListExpression<RutaExpression> getListExpr() {
+ public ListExpression<IRutaExpression> getListExpr() {
return listExpr;
}
@@ -91,7 +91,7 @@ public class GetAction extends AbstractR
return var;
}
- public StringExpression getOpExpr() {
+ public IStringExpression getOpExpr() {
return opExpr;
}
Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/GetFeatureAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/GetFeatureAction.java?rev=1548429&r1=1548428&r2=1548429&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/GetFeatureAction.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/GetFeatureAction.java Fri Dec 6 08:41:07 2013
@@ -29,7 +29,7 @@ import org.apache.uima.ruta.RutaBlock;
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.expression.string.IStringExpression;
import org.apache.uima.ruta.rule.RuleElement;
import org.apache.uima.ruta.rule.RuleMatch;
import org.apache.uima.ruta.rule.RutaRuleElement;
@@ -37,11 +37,11 @@ import org.apache.uima.ruta.visitor.Infe
public class GetFeatureAction extends AbstractRutaAction {
- private StringExpression featureStringExpression;
+ private IStringExpression featureStringExpression;
private String variable;
- public GetFeatureAction(StringExpression f, String variable) {
+ public GetFeatureAction(IStringExpression f, String variable) {
super();
this.featureStringExpression = f;
this.variable = variable;
@@ -107,7 +107,7 @@ public class GetFeatureAction extends Ab
}
- public StringExpression getFeatureStringExpression() {
+ public IStringExpression getFeatureStringExpression() {
return featureStringExpression;
}
Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/GetListAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/GetListAction.java?rev=1548429&r1=1548428&r2=1548429&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/GetListAction.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/GetListAction.java Fri Dec 6 08:41:07 2013
@@ -29,7 +29,7 @@ import org.apache.uima.cas.Type;
import org.apache.uima.cas.text.AnnotationFS;
import org.apache.uima.ruta.RutaBlock;
import org.apache.uima.ruta.RutaStream;
-import org.apache.uima.ruta.expression.string.StringExpression;
+import org.apache.uima.ruta.expression.string.IStringExpression;
import org.apache.uima.ruta.rule.RuleElement;
import org.apache.uima.ruta.rule.RuleMatch;
import org.apache.uima.ruta.type.RutaBasic;
@@ -45,9 +45,9 @@ public class GetListAction extends Abstr
private String var;
- private StringExpression opExpr;
+ private IStringExpression opExpr;
- public GetListAction(String var, StringExpression op) {
+ public GetListAction(String var, IStringExpression op) {
super();
this.var = var;
this.opExpr = op;
@@ -106,7 +106,7 @@ public class GetListAction extends Abstr
return var;
}
- public StringExpression getOpExpr() {
+ public IStringExpression getOpExpr() {
return opExpr;
}
Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/GreedyAnchoringAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/GreedyAnchoringAction.java?rev=1548429&r1=1548428&r2=1548429&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/GreedyAnchoringAction.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/GreedyAnchoringAction.java Fri Dec 6 08:41:07 2013
@@ -21,16 +21,16 @@ package org.apache.uima.ruta.action;
import org.apache.uima.ruta.RutaBlock;
import org.apache.uima.ruta.RutaStream;
-import org.apache.uima.ruta.expression.bool.BooleanExpression;
+import org.apache.uima.ruta.expression.bool.IBooleanExpression;
import org.apache.uima.ruta.rule.RuleElement;
import org.apache.uima.ruta.rule.RuleMatch;
import org.apache.uima.ruta.visitor.InferenceCrowd;
public class GreedyAnchoringAction extends AbstractRutaAction {
- private final BooleanExpression active;
+ private final IBooleanExpression active;
- public GreedyAnchoringAction(BooleanExpression active) {
+ public GreedyAnchoringAction(IBooleanExpression active) {
super();
this.active = active;
}
@@ -42,7 +42,7 @@ public class GreedyAnchoringAction exten
stream.setGreedyAnchoring(activated);
}
- public BooleanExpression getActive() {
+ public IBooleanExpression getActive() {
return active;
}
Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ImplicitFeatureAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ImplicitFeatureAction.java?rev=1548429&r1=1548428&r2=1548429&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ImplicitFeatureAction.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ImplicitFeatureAction.java Fri Dec 6 08:41:07 2013
@@ -33,11 +33,11 @@ import org.apache.uima.cas.TypeSystem;
import org.apache.uima.cas.text.AnnotationFS;
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.IRutaExpression;
+import org.apache.uima.ruta.expression.bool.IBooleanExpression;
import org.apache.uima.ruta.expression.feature.FeatureMatchExpression;
-import org.apache.uima.ruta.expression.number.NumberExpression;
-import org.apache.uima.ruta.expression.string.StringExpression;
+import org.apache.uima.ruta.expression.number.INumberExpression;
+import org.apache.uima.ruta.expression.string.IStringExpression;
import org.apache.uima.ruta.expression.type.TypeExpression;
import org.apache.uima.ruta.rule.AnnotationComparator;
import org.apache.uima.ruta.rule.RuleElement;
@@ -71,7 +71,7 @@ public class ImplicitFeatureAction exten
Collection<AnnotationFS> featureAnnotations = expr.getFeatureAnnotations(annotations, stream,
element.getParent(), false);
Feature feature = expr.getFeature(element.getParent());
- RutaExpression arg = expr.getArg();
+ IRutaExpression arg = expr.getArg();
for (AnnotationFS each : featureAnnotations) {
setFeatureValue(each, feature, arg, element, stream);
}
@@ -80,36 +80,36 @@ public class ImplicitFeatureAction exten
}
}
- private void setFeatureValue(AnnotationFS a, Feature feature, RutaExpression argExpr,
+ private void setFeatureValue(AnnotationFS a, Feature feature, IRutaExpression argExpr,
RuleElement element, RutaStream stream) {
String range = feature.getRange().getName();
if (range.equals(UIMAConstants.TYPE_STRING)) {
- if (argExpr instanceof StringExpression) {
- StringExpression stringExpr = (StringExpression) argExpr;
+ if (argExpr instanceof IStringExpression) {
+ IStringExpression stringExpr = (IStringExpression) argExpr;
String string = stringExpr.getStringValue(element.getParent(), null, stream);
a.setStringValue(feature, string);
}
- } else if (argExpr instanceof NumberExpression
+ } else if (argExpr instanceof INumberExpression
&& (range.equals(UIMAConstants.TYPE_INTEGER) || range.equals(UIMAConstants.TYPE_LONG)
|| range.equals(UIMAConstants.TYPE_SHORT) || range
.equals(UIMAConstants.TYPE_BYTE))) {
- NumberExpression numberExpr = (NumberExpression) argExpr;
+ INumberExpression numberExpr = (INumberExpression) argExpr;
int v = numberExpr.getIntegerValue(element.getParent(), a, stream);
a.setIntValue(feature, v);
- } else if (argExpr instanceof NumberExpression && (range.equals(UIMAConstants.TYPE_DOUBLE))) {
- NumberExpression numberExpr = (NumberExpression) argExpr;
+ } else if (argExpr instanceof INumberExpression && (range.equals(UIMAConstants.TYPE_DOUBLE))) {
+ INumberExpression numberExpr = (INumberExpression) argExpr;
double v = numberExpr.getDoubleValue(element.getParent(), a, stream);
a.setDoubleValue(feature, v);
- } else if (argExpr instanceof NumberExpression && (range.equals(UIMAConstants.TYPE_FLOAT))) {
- NumberExpression numberExpr = (NumberExpression) argExpr;
+ } else if (argExpr instanceof INumberExpression && (range.equals(UIMAConstants.TYPE_FLOAT))) {
+ INumberExpression numberExpr = (INumberExpression) argExpr;
float v = numberExpr.getFloatValue(element.getParent(), a, stream);
a.setFloatValue(feature, v);
- } else if (argExpr instanceof BooleanExpression && (range.equals(UIMAConstants.TYPE_BOOLEAN))) {
- BooleanExpression booleanExpr = (BooleanExpression) argExpr;
+ } else if (argExpr instanceof IBooleanExpression && (range.equals(UIMAConstants.TYPE_BOOLEAN))) {
+ IBooleanExpression booleanExpr = (IBooleanExpression) argExpr;
boolean v = booleanExpr.getBooleanValue(element.getParent(), a, stream);
a.setBooleanValue(feature, v);
- } else if (argExpr instanceof BooleanExpression && (range.equals(UIMAConstants.TYPE_BOOLEAN))) {
- BooleanExpression booleanExpr = (BooleanExpression) argExpr;
+ } else if (argExpr instanceof IBooleanExpression && (range.equals(UIMAConstants.TYPE_BOOLEAN))) {
+ IBooleanExpression booleanExpr = (IBooleanExpression) argExpr;
boolean v = booleanExpr.getBooleanValue(element.getParent(), a, stream);
a.setBooleanValue(feature, v);
} else if (argExpr instanceof TypeExpression && !feature.getRange().isPrimitive()) {
Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/LogAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/LogAction.java?rev=1548429&r1=1548428&r2=1548429&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/LogAction.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/LogAction.java Fri Dec 6 08:41:07 2013
@@ -24,7 +24,7 @@ import java.util.logging.Logger;
import org.apache.uima.ruta.RutaBlock;
import org.apache.uima.ruta.RutaStream;
-import org.apache.uima.ruta.expression.string.StringExpression;
+import org.apache.uima.ruta.expression.string.IStringExpression;
import org.apache.uima.ruta.rule.RuleElement;
import org.apache.uima.ruta.rule.RuleMatch;
import org.apache.uima.ruta.visitor.InferenceCrowd;
@@ -33,11 +33,11 @@ public class LogAction extends AbstractR
public static final String LOGGER_NAME = Logger.global.getName();
- private final StringExpression text;
+ private final IStringExpression text;
private final Level level;
- public LogAction(StringExpression text, Level level) {
+ public LogAction(IStringExpression text, Level level) {
super();
this.text = text;
this.level = level == null ? Level.INFO : level;
@@ -50,7 +50,7 @@ public class LogAction extends AbstractR
Logger.getLogger(LOGGER_NAME).log(level, msg);
}
- public StringExpression getText() {
+ public IStringExpression getText() {
return text;
}
Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkAction.java?rev=1548429&r1=1548428&r2=1548429&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkAction.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkAction.java Fri Dec 6 08:41:07 2013
@@ -25,7 +25,7 @@ import org.apache.uima.cas.Type;
import org.apache.uima.cas.text.AnnotationFS;
import org.apache.uima.jcas.tcas.Annotation;
import org.apache.uima.ruta.RutaStream;
-import org.apache.uima.ruta.expression.number.NumberExpression;
+import org.apache.uima.ruta.expression.number.INumberExpression;
import org.apache.uima.ruta.expression.type.TypeExpression;
import org.apache.uima.ruta.rule.RuleElement;
import org.apache.uima.ruta.rule.RuleMatch;
@@ -34,11 +34,11 @@ import org.apache.uima.ruta.visitor.Infe
public class MarkAction extends AbstractMarkAction {
- protected final NumberExpression score;
+ protected final INumberExpression score;
- protected final List<NumberExpression> list;
+ protected final List<INumberExpression> list;
- public MarkAction(TypeExpression type, NumberExpression scoreValue, List<NumberExpression> list) {
+ public MarkAction(TypeExpression type, INumberExpression scoreValue, List<INumberExpression> list) {
super(type);
this.score = scoreValue;
this.list = list;
@@ -96,11 +96,11 @@ public class MarkAction extends Abstract
}
- public NumberExpression getScore() {
+ public INumberExpression getScore() {
return score;
}
- public List<NumberExpression> getList() {
+ public List<INumberExpression> getList() {
return list;
}
}
Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkFastAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkFastAction.java?rev=1548429&r1=1548428&r2=1548429&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkFastAction.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkFastAction.java Fri Dec 6 08:41:07 2013
@@ -25,10 +25,10 @@ import java.util.List;
import org.apache.uima.cas.text.AnnotationFS;
import org.apache.uima.ruta.RutaBlock;
import org.apache.uima.ruta.RutaStream;
-import org.apache.uima.ruta.expression.bool.BooleanExpression;
+import org.apache.uima.ruta.expression.bool.IBooleanExpression;
import org.apache.uima.ruta.expression.bool.SimpleBooleanExpression;
import org.apache.uima.ruta.expression.list.StringListExpression;
-import org.apache.uima.ruta.expression.number.NumberExpression;
+import org.apache.uima.ruta.expression.number.INumberExpression;
import org.apache.uima.ruta.expression.number.SimpleNumberExpression;
import org.apache.uima.ruta.expression.resource.WordListExpression;
import org.apache.uima.ruta.expression.type.TypeExpression;
@@ -44,14 +44,14 @@ public class MarkFastAction extends Abst
private StringListExpression stringList;
- private BooleanExpression ignore;
+ private IBooleanExpression ignore;
- private NumberExpression ignoreLength;
+ private INumberExpression ignoreLength;
- private BooleanExpression ignoreWS;
+ private IBooleanExpression ignoreWS;
- public MarkFastAction(TypeExpression type, WordListExpression list, BooleanExpression ignore,
- NumberExpression ignoreLength, BooleanExpression ignoreWS) {
+ public MarkFastAction(TypeExpression type, WordListExpression list, IBooleanExpression ignore,
+ INumberExpression ignoreLength, IBooleanExpression ignoreWS) {
super(type);
this.list = list;
this.ignore = ignore == null ? new SimpleBooleanExpression(false) : ignore;
@@ -60,8 +60,8 @@ public class MarkFastAction extends Abst
this.ignoreWS = ignoreWS == null ? new SimpleBooleanExpression(true) : ignoreWS;
}
- public MarkFastAction(TypeExpression type, StringListExpression list, BooleanExpression ignore,
- NumberExpression ignoreLength, BooleanExpression ignoreWS) {
+ public MarkFastAction(TypeExpression type, StringListExpression list, IBooleanExpression ignore,
+ INumberExpression ignoreLength, IBooleanExpression ignoreWS) {
super(type);
this.stringList = list;
this.ignore = ignore == null ? new SimpleBooleanExpression(false) : ignore;
@@ -102,15 +102,15 @@ public class MarkFastAction extends Abst
return stringList;
}
- public BooleanExpression getIgnore() {
+ public IBooleanExpression getIgnore() {
return ignore;
}
- public NumberExpression getIgnoreLength() {
+ public INumberExpression getIgnoreLength() {
return ignoreLength;
}
- public BooleanExpression getIgnoreWS() {
+ public IBooleanExpression getIgnoreWS() {
return ignoreWS;
}
Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkOnceAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkOnceAction.java?rev=1548429&r1=1548428&r2=1548429&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkOnceAction.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkOnceAction.java Fri Dec 6 08:41:07 2013
@@ -24,7 +24,7 @@ import java.util.List;
import org.apache.uima.cas.Type;
import org.apache.uima.cas.text.AnnotationFS;
import org.apache.uima.ruta.RutaStream;
-import org.apache.uima.ruta.expression.number.NumberExpression;
+import org.apache.uima.ruta.expression.number.INumberExpression;
import org.apache.uima.ruta.expression.type.TypeExpression;
import org.apache.uima.ruta.rule.RuleElement;
import org.apache.uima.ruta.rule.RuleMatch;
@@ -33,8 +33,8 @@ import org.apache.uima.ruta.visitor.Infe
public class MarkOnceAction extends MarkAction {
- public MarkOnceAction(TypeExpression type, NumberExpression scoreValue,
- List<NumberExpression> list) {
+ public MarkOnceAction(TypeExpression type, INumberExpression scoreValue,
+ List<INumberExpression> list) {
super(type, scoreValue, list);
}
Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkTableAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkTableAction.java?rev=1548429&r1=1548428&r2=1548429&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkTableAction.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkTableAction.java Fri Dec 6 08:41:07 2013
@@ -33,10 +33,10 @@ import org.apache.uima.jcas.tcas.Annotat
import org.apache.uima.ruta.RutaBlock;
import org.apache.uima.ruta.RutaStream;
import org.apache.uima.ruta.UIMAConstants;
-import org.apache.uima.ruta.expression.bool.BooleanExpression;
-import org.apache.uima.ruta.expression.number.NumberExpression;
+import org.apache.uima.ruta.expression.bool.IBooleanExpression;
+import org.apache.uima.ruta.expression.number.INumberExpression;
import org.apache.uima.ruta.expression.resource.WordTableExpression;
-import org.apache.uima.ruta.expression.string.StringExpression;
+import org.apache.uima.ruta.expression.string.IStringExpression;
import org.apache.uima.ruta.expression.type.TypeExpression;
import org.apache.uima.ruta.resource.RutaTable;
import org.apache.uima.ruta.resource.RutaWordList;
@@ -50,22 +50,22 @@ public class MarkTableAction extends Abs
private final WordTableExpression tableExpr;
- private final Map<StringExpression, NumberExpression> featureMap;
+ private final Map<IStringExpression, INumberExpression> featureMap;
- private final NumberExpression indexExpr;
+ private final INumberExpression indexExpr;
- private final BooleanExpression ignoreCase;
+ private final IBooleanExpression ignoreCase;
- private final NumberExpression ignoreLength;
+ private final INumberExpression ignoreLength;
- private final StringExpression ignoreChar;
+ private final IStringExpression ignoreChar;
- private final NumberExpression maxIgnoreChar;
+ private final INumberExpression maxIgnoreChar;
- public MarkTableAction(TypeExpression typeExpr, NumberExpression indexExpr,
- WordTableExpression tableExpr, Map<StringExpression, NumberExpression> featureMap,
- BooleanExpression ignoreCase, NumberExpression ignoreLength, StringExpression ignoreChar,
- NumberExpression maxIgnoreChar) {
+ public MarkTableAction(TypeExpression typeExpr, INumberExpression indexExpr,
+ WordTableExpression tableExpr, Map<IStringExpression, INumberExpression> featureMap,
+ IBooleanExpression ignoreCase, INumberExpression ignoreLength, IStringExpression ignoreChar,
+ INumberExpression maxIgnoreChar) {
super();
this.typeExpr = typeExpr;
this.indexExpr = indexExpr;
@@ -84,7 +84,7 @@ public class MarkTableAction extends Abs
int index = indexExpr.getIntegerValue(block, match, element, stream);
Type type = typeExpr.getType(block);
Map<String, Integer> map = new HashMap<String, Integer>();
- for (StringExpression each : featureMap.keySet()) {
+ for (IStringExpression each : featureMap.keySet()) {
map.put(each.getStringValue(block, match, element, stream), featureMap.get(each)
.getIntegerValue(block, match, element, stream));
}
@@ -168,27 +168,27 @@ public class MarkTableAction extends Abs
return tableExpr;
}
- public Map<StringExpression, NumberExpression> getFeatureMap() {
+ public Map<IStringExpression, INumberExpression> getFeatureMap() {
return featureMap;
}
- public NumberExpression getIndexExpr() {
+ public INumberExpression getIndexExpr() {
return indexExpr;
}
- public BooleanExpression getIgnoreCase() {
+ public IBooleanExpression getIgnoreCase() {
return ignoreCase;
}
- public NumberExpression getIgnoreLength() {
+ public INumberExpression getIgnoreLength() {
return ignoreLength;
}
- public StringExpression getIgnoreChar() {
+ public IStringExpression getIgnoreChar() {
return ignoreChar;
}
- public NumberExpression getMaxIgnoreChar() {
+ public INumberExpression getMaxIgnoreChar() {
return maxIgnoreChar;
}
}
Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MatchedTextAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MatchedTextAction.java?rev=1548429&r1=1548428&r2=1548429&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MatchedTextAction.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MatchedTextAction.java Fri Dec 6 08:41:07 2013
@@ -24,7 +24,7 @@ import java.util.List;
import org.apache.uima.cas.text.AnnotationFS;
import org.apache.uima.ruta.RutaStream;
-import org.apache.uima.ruta.expression.number.NumberExpression;
+import org.apache.uima.ruta.expression.number.INumberExpression;
import org.apache.uima.ruta.rule.RuleElement;
import org.apache.uima.ruta.rule.RuleMatch;
import org.apache.uima.ruta.visitor.InferenceCrowd;
@@ -33,9 +33,9 @@ public class MatchedTextAction extends A
private final String var;
- private final List<NumberExpression> list;
+ private final List<INumberExpression> list;
- public MatchedTextAction(String var, List<NumberExpression> list) {
+ public MatchedTextAction(String var, List<INumberExpression> list) {
super();
this.var = var;
this.list = list;
@@ -56,7 +56,7 @@ public class MatchedTextAction extends A
return var;
}
- public List<NumberExpression> getList() {
+ public List<INumberExpression> getList() {
return list;
}
@@ -68,7 +68,7 @@ public class MatchedTextAction extends A
return indexList;
}
int last = Integer.MAX_VALUE - 1;
- for (NumberExpression each : list) {
+ for (INumberExpression each : list) {
int value = each.getIntegerValue(element.getParent(), null, stream);
for (int i = Math.min(value, last + 1); i < value; i++) {
indexList.add(i);
Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MergeAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MergeAction.java?rev=1548429&r1=1548428&r2=1548429&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MergeAction.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MergeAction.java Fri Dec 6 08:41:07 2013
@@ -24,7 +24,7 @@ import java.util.List;
import org.apache.commons.collections.ListUtils;
import org.apache.uima.ruta.RutaStream;
-import org.apache.uima.ruta.expression.bool.BooleanExpression;
+import org.apache.uima.ruta.expression.bool.IBooleanExpression;
import org.apache.uima.ruta.expression.list.ListExpression;
import org.apache.uima.ruta.rule.RuleElement;
import org.apache.uima.ruta.rule.RuleMatch;
@@ -35,12 +35,12 @@ public class MergeAction extends Abstrac
@SuppressWarnings("rawtypes")
private List<ListExpression> lists;
- private BooleanExpression unionExpr;
+ private IBooleanExpression unionExpr;
private String target;
@SuppressWarnings("rawtypes")
- public MergeAction(BooleanExpression union, String target, List<ListExpression> list) {
+ public MergeAction(IBooleanExpression union, String target, List<ListExpression> list) {
super();
this.unionExpr = union;
this.target = target;
@@ -74,7 +74,7 @@ public class MergeAction extends Abstrac
}
}
- public BooleanExpression getUnion() {
+ public IBooleanExpression getUnion() {
return unionExpr;
}
Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/RemoveAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/RemoveAction.java?rev=1548429&r1=1548428&r2=1548429&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/RemoveAction.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/RemoveAction.java Fri Dec 6 08:41:07 2013
@@ -24,11 +24,11 @@ import java.util.List;
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.bool.BooleanExpression;
+import org.apache.uima.ruta.expression.IRutaExpression;
+import org.apache.uima.ruta.expression.bool.IBooleanExpression;
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.number.INumberExpression;
+import org.apache.uima.ruta.expression.string.IStringExpression;
import org.apache.uima.ruta.expression.type.TypeExpression;
import org.apache.uima.ruta.rule.RuleElement;
import org.apache.uima.ruta.rule.RuleMatch;
@@ -38,9 +38,9 @@ public class RemoveAction extends Abstra
private String var;
- private List<RutaExpression> elements;
+ private List<IRutaExpression> elements;
- public RemoveAction(String var, List<RutaExpression> list) {
+ public RemoveAction(String var, List<IRutaExpression> list) {
super();
this.var = var;
this.elements = list;
@@ -50,7 +50,7 @@ public class RemoveAction extends Abstra
return var;
}
- public List<RutaExpression> getElements() {
+ public List<IRutaExpression> getElements() {
return elements;
}
@@ -62,7 +62,7 @@ public class RemoveAction extends Abstra
List<Object> toRemove = new ArrayList<Object>();
for (Object entry : list) {
Object value1 = getValue(entry, parent, stream);
- for (RutaExpression arg : elements) {
+ for (IRutaExpression arg : elements) {
if (arg instanceof ListExpression) {
ListExpression l = (ListExpression) arg;
List list2 = l.getList(parent, stream);
@@ -87,14 +87,14 @@ public class RemoveAction extends Abstra
}
private Object getValue(Object obj, RutaBlock parent, RutaStream stream) {
- if (obj instanceof NumberExpression) {
- return ((NumberExpression) obj).getDoubleValue(parent, null, stream);
- } else if (obj instanceof BooleanExpression) {
- return ((BooleanExpression) obj).getBooleanValue(parent, null, stream);
+ if (obj instanceof INumberExpression) {
+ return ((INumberExpression) obj).getDoubleValue(parent, null, stream);
+ } else if (obj instanceof IBooleanExpression) {
+ return ((IBooleanExpression) obj).getBooleanValue(parent, null, stream);
} else if (obj instanceof TypeExpression) {
return ((TypeExpression) obj).getType(parent);
- } else if (obj instanceof StringExpression) {
- return ((StringExpression) obj).getStringValue(parent, null, stream);
+ } else if (obj instanceof IStringExpression) {
+ return ((IStringExpression) obj).getStringValue(parent, null, stream);
}
return null;
}
Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/RemoveDuplicateAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/RemoveDuplicateAction.java?rev=1548429&r1=1548428&r2=1548429&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/RemoveDuplicateAction.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/RemoveDuplicateAction.java Fri Dec 6 08:41:07 2013
@@ -26,9 +26,9 @@ import java.util.List;
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.expression.string.StringExpression;
+import org.apache.uima.ruta.expression.bool.IBooleanExpression;
+import org.apache.uima.ruta.expression.number.INumberExpression;
+import org.apache.uima.ruta.expression.string.IStringExpression;
import org.apache.uima.ruta.expression.type.TypeExpression;
import org.apache.uima.ruta.rule.RuleElement;
import org.apache.uima.ruta.rule.RuleMatch;
@@ -66,14 +66,14 @@ public class RemoveDuplicateAction exten
}
private Object getValue(Object obj, RutaBlock parent, RutaStream stream) {
- if (obj instanceof NumberExpression) {
- return ((NumberExpression) obj).getDoubleValue(parent, null, stream);
- } else if (obj instanceof BooleanExpression) {
- return ((BooleanExpression) obj).getBooleanValue(parent, null, stream);
+ if (obj instanceof INumberExpression) {
+ return ((INumberExpression) obj).getDoubleValue(parent, null, stream);
+ } else if (obj instanceof IBooleanExpression) {
+ return ((IBooleanExpression) obj).getBooleanValue(parent, null, stream);
} else if (obj instanceof TypeExpression) {
return ((TypeExpression) obj).getType(parent);
- } else if (obj instanceof StringExpression) {
- return ((StringExpression) obj).getStringValue(parent, null, stream);
+ } else if (obj instanceof IStringExpression) {
+ return ((IStringExpression) obj).getStringValue(parent, null, stream);
}
return null;
}
Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ReplaceAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ReplaceAction.java?rev=1548429&r1=1548428&r2=1548429&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ReplaceAction.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ReplaceAction.java Fri Dec 6 08:41:07 2013
@@ -24,7 +24,7 @@ import java.util.List;
import org.apache.uima.cas.text.AnnotationFS;
import org.apache.uima.ruta.RutaBlock;
import org.apache.uima.ruta.RutaStream;
-import org.apache.uima.ruta.expression.string.StringExpression;
+import org.apache.uima.ruta.expression.string.IStringExpression;
import org.apache.uima.ruta.rule.RuleElement;
import org.apache.uima.ruta.rule.RuleMatch;
import org.apache.uima.ruta.type.RutaBasic;
@@ -32,13 +32,13 @@ import org.apache.uima.ruta.visitor.Infe
public class ReplaceAction extends AbstractRutaAction {
- public StringExpression getReplacement() {
+ public IStringExpression getReplacement() {
return replacement;
}
- private final StringExpression replacement;
+ private final IStringExpression replacement;
- public ReplaceAction(StringExpression replacement) {
+ public ReplaceAction(IStringExpression replacement) {
super();
this.replacement = replacement;
}
Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/SetFeatureAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/SetFeatureAction.java?rev=1548429&r1=1548428&r2=1548429&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/SetFeatureAction.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/SetFeatureAction.java Fri Dec 6 08:41:07 2013
@@ -27,9 +27,9 @@ import org.apache.uima.cas.text.Annotati
import org.apache.uima.ruta.RutaBlock;
import org.apache.uima.ruta.RutaStream;
import org.apache.uima.ruta.UIMAConstants;
-import org.apache.uima.ruta.expression.bool.BooleanExpression;
-import org.apache.uima.ruta.expression.number.NumberExpression;
-import org.apache.uima.ruta.expression.string.StringExpression;
+import org.apache.uima.ruta.expression.bool.IBooleanExpression;
+import org.apache.uima.ruta.expression.number.INumberExpression;
+import org.apache.uima.ruta.expression.string.IStringExpression;
import org.apache.uima.ruta.expression.type.TypeExpression;
import org.apache.uima.ruta.rule.RuleElement;
import org.apache.uima.ruta.rule.RuleMatch;
@@ -38,54 +38,54 @@ import org.apache.uima.ruta.visitor.Infe
public class SetFeatureAction extends AbstractRutaAction {
- private final StringExpression featureStringExpression;
+ private final IStringExpression featureStringExpression;
- private StringExpression stringExpr;
+ private IStringExpression stringExpr;
- private NumberExpression numberExpr;
+ private INumberExpression numberExpr;
- private BooleanExpression booleanExpr;
+ private IBooleanExpression booleanExpr;
private TypeExpression typeExpr;
- protected SetFeatureAction(StringExpression feature) {
+ protected SetFeatureAction(IStringExpression feature) {
super();
this.featureStringExpression = feature;
}
- public SetFeatureAction(StringExpression feature, StringExpression stringExpr) {
+ public SetFeatureAction(IStringExpression feature, IStringExpression stringExpr) {
this(feature);
this.stringExpr = stringExpr;
}
- public SetFeatureAction(StringExpression feature, NumberExpression numberExpr) {
+ public SetFeatureAction(IStringExpression feature, INumberExpression numberExpr) {
this(feature);
this.numberExpr = numberExpr;
}
- public SetFeatureAction(StringExpression feature, BooleanExpression booleanExpr) {
+ public SetFeatureAction(IStringExpression feature, IBooleanExpression booleanExpr) {
this(feature);
this.booleanExpr = booleanExpr;
}
- public SetFeatureAction(StringExpression feature, TypeExpression typeExpr) {
+ public SetFeatureAction(IStringExpression feature, TypeExpression typeExpr) {
this(feature);
this.typeExpr = typeExpr;
}
- public StringExpression getFeatureStringExpression() {
+ public IStringExpression getFeatureStringExpression() {
return featureStringExpression;
}
- public StringExpression getStringExpr() {
+ public IStringExpression getStringExpr() {
return stringExpr;
}
- public NumberExpression getNumberExpr() {
+ public INumberExpression getNumberExpr() {
return numberExpr;
}
- public BooleanExpression getBooleanExpr() {
+ public IBooleanExpression getBooleanExpr() {
return booleanExpr;
}
Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ShiftAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ShiftAction.java?rev=1548429&r1=1548428&r2=1548429&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ShiftAction.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ShiftAction.java Fri Dec 6 08:41:07 2013
@@ -27,7 +27,7 @@ import org.apache.uima.cas.Type;
import org.apache.uima.cas.text.AnnotationFS;
import org.apache.uima.jcas.tcas.Annotation;
import org.apache.uima.ruta.RutaStream;
-import org.apache.uima.ruta.expression.number.NumberExpression;
+import org.apache.uima.ruta.expression.number.INumberExpression;
import org.apache.uima.ruta.expression.type.TypeExpression;
import org.apache.uima.ruta.rule.AnnotationComparator;
import org.apache.uima.ruta.rule.RuleElement;
@@ -36,7 +36,7 @@ import org.apache.uima.ruta.visitor.Infe
public class ShiftAction extends MarkAction {
- public ShiftAction(TypeExpression type, List<NumberExpression> list) {
+ public ShiftAction(TypeExpression type, List<INumberExpression> list) {
super(type, null, list);
}
Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/TrieAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/TrieAction.java?rev=1548429&r1=1548428&r2=1548429&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/TrieAction.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/TrieAction.java Fri Dec 6 08:41:07 2013
@@ -27,10 +27,10 @@ import org.apache.uima.cas.Type;
import org.apache.uima.cas.text.AnnotationFS;
import org.apache.uima.ruta.RutaBlock;
import org.apache.uima.ruta.RutaStream;
-import org.apache.uima.ruta.expression.bool.BooleanExpression;
-import org.apache.uima.ruta.expression.number.NumberExpression;
+import org.apache.uima.ruta.expression.bool.IBooleanExpression;
+import org.apache.uima.ruta.expression.number.INumberExpression;
import org.apache.uima.ruta.expression.resource.WordListExpression;
-import org.apache.uima.ruta.expression.string.StringExpression;
+import org.apache.uima.ruta.expression.string.IStringExpression;
import org.apache.uima.ruta.expression.type.TypeExpression;
import org.apache.uima.ruta.resource.RutaWordList;
import org.apache.uima.ruta.rule.RuleElement;
@@ -41,21 +41,21 @@ public class TrieAction extends Abstract
private final WordListExpression list;
- private final Map<StringExpression, TypeExpression> map;
+ private final Map<IStringExpression, TypeExpression> map;
- private final BooleanExpression ignoreCase;
+ private final IBooleanExpression ignoreCase;
- private final NumberExpression ignoreLength;
+ private final INumberExpression ignoreLength;
- private final BooleanExpression edit;
+ private final IBooleanExpression edit;
- private final NumberExpression distance;
+ private final INumberExpression distance;
- private final StringExpression ignoreChar;
+ private final IStringExpression ignoreChar;
- public TrieAction(WordListExpression list, Map<StringExpression, TypeExpression> map,
- BooleanExpression ignoreCase, NumberExpression ignoreLength, BooleanExpression edit,
- NumberExpression distance, StringExpression ignoreChar) {
+ public TrieAction(WordListExpression list, Map<IStringExpression, TypeExpression> map,
+ IBooleanExpression ignoreCase, INumberExpression ignoreLength, IBooleanExpression edit,
+ INumberExpression distance, IStringExpression ignoreChar) {
super();
this.list = list;
this.map = map;
@@ -71,7 +71,7 @@ public class TrieAction extends Abstract
Map<String, Type> typeMap = new HashMap<String, Type>();
RutaBlock parent = element.getParent();
- for (StringExpression eachKey : map.keySet()) {
+ for (IStringExpression eachKey : map.keySet()) {
String stringValue = eachKey.getStringValue(parent, match, element, stream);
TypeExpression typeExpression = map.get(eachKey);
if (typeExpression != null) {
@@ -102,27 +102,27 @@ public class TrieAction extends Abstract
return list;
}
- public Map<StringExpression, TypeExpression> getMap() {
+ public Map<IStringExpression, TypeExpression> getMap() {
return map;
}
- public BooleanExpression getIgnoreCase() {
+ public IBooleanExpression getIgnoreCase() {
return ignoreCase;
}
- public NumberExpression getIgnoreLength() {
+ public INumberExpression getIgnoreLength() {
return ignoreLength;
}
- public BooleanExpression getEdit() {
+ public IBooleanExpression getEdit() {
return edit;
}
- public NumberExpression getDistance() {
+ public INumberExpression getDistance() {
return distance;
}
- public StringExpression getIgnoreChar() {
+ public IStringExpression getIgnoreChar() {
return ignoreChar;
}
Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/UnmarkAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/UnmarkAction.java?rev=1548429&r1=1548428&r2=1548429&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/UnmarkAction.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/UnmarkAction.java Fri Dec 6 08:41:07 2013
@@ -26,8 +26,8 @@ import java.util.Set;
import org.apache.uima.cas.Type;
import org.apache.uima.cas.text.AnnotationFS;
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.expression.bool.IBooleanExpression;
+import org.apache.uima.ruta.expression.number.INumberExpression;
import org.apache.uima.ruta.expression.type.TypeExpression;
import org.apache.uima.ruta.rule.RuleElement;
import org.apache.uima.ruta.rule.RuleMatch;
@@ -36,11 +36,11 @@ import org.apache.uima.ruta.visitor.Infe
public class UnmarkAction extends TypeSensitiveAction {
- private List<NumberExpression> list;
+ private List<INumberExpression> list;
- private BooleanExpression allAnchor;
+ private IBooleanExpression allAnchor;
- public UnmarkAction(TypeExpression type, List<NumberExpression> list, BooleanExpression b) {
+ public UnmarkAction(TypeExpression type, List<INumberExpression> list, IBooleanExpression b) {
super(type);
this.list = list;
this.allAnchor = b;
@@ -77,15 +77,15 @@ public class UnmarkAction extends TypeSe
}
- public List<NumberExpression> getList() {
+ public List<INumberExpression> getList() {
return list;
}
- public BooleanExpression getAllAnchor() {
+ public IBooleanExpression getAllAnchor() {
return allAnchor;
}
- protected List<Integer> getIndexList(RuleElement element, List<NumberExpression> list,
+ protected List<Integer> getIndexList(RuleElement element, List<INumberExpression> list,
RutaStream stream) {
List<Integer> indexList = new ArrayList<Integer>();
if (list == null || list.isEmpty()) {
@@ -94,7 +94,7 @@ public class UnmarkAction extends TypeSe
return indexList;
}
int last = Integer.MAX_VALUE - 1;
- for (NumberExpression each : list) {
+ for (INumberExpression each : list) {
int value = each.getIntegerValue(element.getParent(), null, stream);
for (int i = Math.min(value, last + 1); i < value; i++) {
indexList.add(i);
Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ConditionFactory.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ConditionFactory.java?rev=1548429&r1=1548428&r2=1548429&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ConditionFactory.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ConditionFactory.java Fri Dec 6 08:41:07 2013
@@ -23,14 +23,14 @@ import java.util.List;
import org.antlr.runtime.Token;
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.IRutaExpression;
+import org.apache.uima.ruta.expression.bool.IBooleanExpression;
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.number.INumberExpression;
import org.apache.uima.ruta.expression.resource.WordListExpression;
-import org.apache.uima.ruta.expression.string.StringExpression;
+import org.apache.uima.ruta.expression.string.IStringExpression;
import org.apache.uima.ruta.expression.type.TypeExpression;
public class ConditionFactory {
@@ -54,12 +54,12 @@ public class ConditionFactory {
}
public static AbstractRutaCondition createConditionContains(TypeExpression typeExpr,
- NumberExpression min, NumberExpression max, BooleanExpression percent, RutaBlock parent) {
+ INumberExpression min, INumberExpression max, IBooleanExpression percent, RutaBlock parent) {
return new ContainsCondition(typeExpr, min, max, percent);
}
public static AbstractRutaCondition createConditionContextCount(TypeExpression typeExpr,
- NumberExpression min, NumberExpression max, Token var, RutaBlock parent) {
+ INumberExpression min, INumberExpression max, Token var, RutaBlock parent) {
String varString = null;
if (var != null) {
varString = var.getText();
@@ -68,7 +68,7 @@ public class ConditionFactory {
}
public static AbstractRutaCondition createConditionCurrentCount(TypeExpression typeExpr,
- NumberExpression min, NumberExpression max, Token var, RutaBlock parent) {
+ INumberExpression min, INumberExpression max, Token var, RutaBlock parent) {
String varString = null;
if (var != null) {
varString = var.getText();
@@ -77,7 +77,7 @@ public class ConditionFactory {
}
public static AbstractRutaCondition createConditionCount(TypeExpression typeExpr,
- NumberExpression min, NumberExpression max, Token var, RutaBlock parent) {
+ INumberExpression min, INumberExpression max, Token var, RutaBlock parent) {
String varString = null;
if (var != null) {
varString = var.getText();
@@ -86,7 +86,7 @@ public class ConditionFactory {
}
public static AbstractRutaCondition createConditionTotalCount(TypeExpression typeExpr,
- NumberExpression min, NumberExpression max, Token var, RutaBlock parent) {
+ INumberExpression min, INumberExpression max, Token var, RutaBlock parent) {
String varString = null;
if (var != null) {
varString = var.getText();
@@ -95,18 +95,18 @@ public class ConditionFactory {
}
public static AbstractRutaCondition createConditionInList(WordListExpression listExpr,
- NumberExpression dist, BooleanExpression rel, RutaBlock parent) {
+ INumberExpression dist, IBooleanExpression rel, RutaBlock parent) {
return new InListCondition(listExpr, dist, rel);
}
public static AbstractRutaCondition createConditionMOfN(List<AbstractRutaCondition> conds,
- NumberExpression min, NumberExpression max, RutaBlock parent) {
+ INumberExpression min, INumberExpression max, RutaBlock parent) {
return new MOfNCondition(conds, min, max);
}
public static AbstractRutaCondition createConditionNear(TypeExpression typeExpr,
- NumberExpression min, NumberExpression max, BooleanExpression direction,
- BooleanExpression filtered, RutaBlock parent) {
+ INumberExpression min, INumberExpression max, IBooleanExpression direction,
+ IBooleanExpression filtered, RutaBlock parent) {
return new NearCondition(typeExpr, min, max, direction, filtered);
}
@@ -120,22 +120,22 @@ public class ConditionFactory {
}
public static AbstractRutaCondition createConditionPosition(TypeExpression typeExpr,
- NumberExpression pos, BooleanExpression rel, RutaBlock parent) {
+ INumberExpression pos, IBooleanExpression rel, RutaBlock parent) {
return new PositionCondition(typeExpr, pos, rel);
}
- public static AbstractRutaCondition createConditionRegExp(StringExpression patternExpr,
- BooleanExpression ignoreCase, RutaBlock parent) {
+ public static AbstractRutaCondition createConditionRegExp(IStringExpression patternExpr,
+ IBooleanExpression ignoreCase, RutaBlock parent) {
return new RegExpCondition(patternExpr, ignoreCase);
}
- public static AbstractRutaCondition createConditionRegExp(StringExpression v,
- StringExpression patternExpr, BooleanExpression ignoreCase, RutaBlock parent) {
+ public static AbstractRutaCondition createConditionRegExp(IStringExpression v,
+ IStringExpression patternExpr, IBooleanExpression ignoreCase, RutaBlock parent) {
return new RegExpCondition(v, patternExpr, ignoreCase);
}
- public static AbstractRutaCondition createConditionScore(NumberExpression min,
- NumberExpression max, Token var, RutaBlock parent) {
+ public static AbstractRutaCondition createConditionScore(INumberExpression min,
+ INumberExpression max, Token var, RutaBlock parent) {
String varString = null;
if (var != null) {
varString = var.getText();
@@ -152,18 +152,18 @@ public class ConditionFactory {
return new LastCondition(typeExpr);
}
- public static AbstractRutaCondition createConditionIf(BooleanExpression e, RutaBlock parent) {
+ public static AbstractRutaCondition createConditionIf(IBooleanExpression e, RutaBlock parent) {
return new IfCondition(e);
}
- public static AbstractRutaCondition createConditionFeature(StringExpression se, Object v,
+ public static AbstractRutaCondition createConditionFeature(IStringExpression se, Object v,
RutaBlock parent) {
- if (v instanceof NumberExpression) {
- return new FeatureCondition(se, (NumberExpression) v);
- } else if (v instanceof BooleanExpression) {
- return new FeatureCondition(se, (BooleanExpression) v);
- } else if (v instanceof StringExpression) {
- return new FeatureCondition(se, (StringExpression) v);
+ if (v instanceof INumberExpression) {
+ return new FeatureCondition(se, (INumberExpression) v);
+ } else if (v instanceof IBooleanExpression) {
+ return new FeatureCondition(se, (IBooleanExpression) v);
+ } else if (v instanceof IStringExpression) {
+ return new FeatureCondition(se, (IStringExpression) v);
}
return null;
}
@@ -232,27 +232,27 @@ public class ConditionFactory {
}
public static AbstractRutaCondition createConditionSize(ListExpression<?> list,
- NumberExpression min, NumberExpression max, Token var, RutaBlock env) {
+ INumberExpression min, INumberExpression max, Token var, RutaBlock env) {
return new SizeCondition(list, min, max, var == null ? null : var.getText());
}
public static AbstractRutaCondition createConditionInList(StringListExpression list,
- NumberExpression dist, BooleanExpression rel, RutaBlock env) {
+ INumberExpression dist, IBooleanExpression rel, RutaBlock env) {
return new InListCondition(list, dist, rel);
}
public static AbstractRutaCondition createConditionCount(ListExpression<Object> type,
- RutaExpression a, NumberExpression min, NumberExpression max, Token var, RutaBlock env) {
+ IRutaExpression a, INumberExpression min, INumberExpression max, Token var, RutaBlock env) {
return new CountCondition(type, a, min, max, var == null ? null : var.getText());
}
public static AbstractRutaCondition createConditionContains(ListExpression list,
- RutaExpression a, NumberExpression min, NumberExpression max, BooleanExpression percent,
+ IRutaExpression a, INumberExpression min, INumberExpression max, IBooleanExpression percent,
RutaBlock env) {
return new ContainsCondition(list, a, min, max, percent);
}
- public static AbstractRutaCondition createImplicitCondition(RutaExpression expr) {
+ public static AbstractRutaCondition createImplicitCondition(IRutaExpression expr) {
return new ImplicitCondition(expr);
}
Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ContainsCondition.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ContainsCondition.java?rev=1548429&r1=1548428&r2=1548429&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ContainsCondition.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ContainsCondition.java Fri Dec 6 08:41:07 2013
@@ -25,17 +25,17 @@ import java.util.List;
import org.apache.uima.cas.Type;
import org.apache.uima.cas.text.AnnotationFS;
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.IRutaExpression;
+import org.apache.uima.ruta.expression.bool.IBooleanExpression;
import org.apache.uima.ruta.expression.bool.SimpleBooleanExpression;
import org.apache.uima.ruta.expression.list.BooleanListExpression;
import org.apache.uima.ruta.expression.list.ListExpression;
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.number.INumberExpression;
import org.apache.uima.ruta.expression.number.SimpleNumberExpression;
-import org.apache.uima.ruta.expression.string.StringExpression;
+import org.apache.uima.ruta.expression.string.IStringExpression;
import org.apache.uima.ruta.expression.type.TypeExpression;
import org.apache.uima.ruta.rule.EvaluatedCondition;
import org.apache.uima.ruta.rule.RuleElement;
@@ -44,26 +44,26 @@ import org.apache.uima.ruta.visitor.Infe
public class ContainsCondition extends TypeSentiveCondition {
- private final NumberExpression min;
+ private final INumberExpression min;
- private final NumberExpression max;
+ private final INumberExpression max;
- private final BooleanExpression percent;
+ private final IBooleanExpression percent;
- private RutaExpression arg;
+ private IRutaExpression arg;
private ListExpression argList;
- public ContainsCondition(TypeExpression type, NumberExpression min, NumberExpression max,
- BooleanExpression percent) {
+ public ContainsCondition(TypeExpression type, INumberExpression min, INumberExpression max,
+ IBooleanExpression percent) {
super(type);
this.min = min == null ? new SimpleNumberExpression(Integer.valueOf(1)) : min;
this.max = max == null ? new SimpleNumberExpression(Integer.MAX_VALUE) : max;
this.percent = percent == null ? new SimpleBooleanExpression(false) : percent;
}
- public ContainsCondition(ListExpression list, RutaExpression a, NumberExpression min,
- NumberExpression max, BooleanExpression percent) {
+ public ContainsCondition(ListExpression list, IRutaExpression a, INumberExpression min,
+ INumberExpression max, IBooleanExpression percent) {
super((TypeExpression) null);
this.min = min == null ? new SimpleNumberExpression(Integer.valueOf(1)) : min;
this.max = max == null ? new SimpleNumberExpression(Integer.MAX_VALUE) : max;
@@ -95,24 +95,24 @@ public class ContainsCondition extends T
}
} else {
totalCount = argList.getList(element.getParent(), stream).size();
- if (arg instanceof BooleanExpression && argList instanceof BooleanListExpression) {
- BooleanExpression e = (BooleanExpression) arg;
+ if (arg instanceof IBooleanExpression && argList instanceof BooleanListExpression) {
+ IBooleanExpression e = (IBooleanExpression) arg;
BooleanListExpression le = (BooleanListExpression) argList;
boolean v = e.getBooleanValue(element.getParent(), annotation, stream);
List<Boolean> l = new ArrayList<Boolean>(le.getList(element.getParent(), stream));
while (l.remove(v)) {
basicCount++;
}
- } else if (arg instanceof NumberExpression && argList instanceof NumberListExpression) {
- NumberExpression e = (NumberExpression) arg;
+ } else if (arg instanceof INumberExpression && argList instanceof NumberListExpression) {
+ INumberExpression e = (INumberExpression) arg;
NumberListExpression le = (NumberListExpression) argList;
Number v = e.getDoubleValue(element.getParent(), annotation, stream);
List<Number> l = new ArrayList<Number>(le.getList(element.getParent(), stream));
while (l.remove(v)) {
basicCount++;
}
- } else if (arg instanceof StringExpression && argList instanceof StringListExpression) {
- StringExpression e = (StringExpression) arg;
+ } else if (arg instanceof IStringExpression && argList instanceof StringListExpression) {
+ IStringExpression e = (IStringExpression) arg;
StringListExpression le = (StringListExpression) argList;
String v = e.getStringValue(element.getParent(), annotation, stream);
List<String> l = new ArrayList<String>(le.getList(element.getParent(), stream));
@@ -145,19 +145,19 @@ public class ContainsCondition extends T
}
}
- public NumberExpression getMin() {
+ public INumberExpression getMin() {
return min;
}
- public NumberExpression getMax() {
+ public INumberExpression getMax() {
return max;
}
- public BooleanExpression getPercent() {
+ public IBooleanExpression getPercent() {
return percent;
}
- public RutaExpression getArg() {
+ public IRutaExpression getArg() {
return arg;
}
Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ContextCountCondition.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ContextCountCondition.java?rev=1548429&r1=1548428&r2=1548429&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ContextCountCondition.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ContextCountCondition.java Fri Dec 6 08:41:07 2013
@@ -26,7 +26,7 @@ import java.util.Set;
import org.apache.uima.cas.Type;
import org.apache.uima.cas.text.AnnotationFS;
import org.apache.uima.ruta.RutaStream;
-import org.apache.uima.ruta.expression.number.NumberExpression;
+import org.apache.uima.ruta.expression.number.INumberExpression;
import org.apache.uima.ruta.expression.number.SimpleNumberExpression;
import org.apache.uima.ruta.expression.type.TypeExpression;
import org.apache.uima.ruta.rule.EvaluatedCondition;
@@ -36,13 +36,13 @@ import org.apache.uima.ruta.visitor.Infe
public class ContextCountCondition extends TypeSentiveCondition {
- private final NumberExpression min;
+ private final INumberExpression min;
- private final NumberExpression max;
+ private final INumberExpression max;
private final String var;
- public ContextCountCondition(TypeExpression type, NumberExpression min, NumberExpression max,
+ public ContextCountCondition(TypeExpression type, INumberExpression min, INumberExpression max,
String var) {
super(type);
this.min = min == null ? new SimpleNumberExpression(Integer.MIN_VALUE) : min;
@@ -105,11 +105,11 @@ public class ContextCountCondition exten
return new EvaluatedCondition(this, result);
}
- public NumberExpression getMin() {
+ public INumberExpression getMin() {
return min;
}
- public NumberExpression getMax() {
+ public INumberExpression getMax() {
return max;
}