You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by pk...@apache.org on 2015/11/06 11:43:52 UTC
svn commit: r1712934 - in /uima/ruta/branches/UIMA-4408/ruta-core/src:
main/antlr3/org/apache/uima/ruta/parser/output/
main/java/org/apache/uima/ruta/expression/
main/java/org/apache/uima/ruta/expression/list/
main/java/org/apache/uima/ruta/expression/...
Author: pkluegl
Date: Fri Nov 6 10:43:52 2015
New Revision: 1712934
URL: http://svn.apache.org/viewvc?rev=1712934&view=rev
Log:
UIMA-4408
- some renaming
Added:
uima/ruta/branches/UIMA-4408/ruta-core/src/main/antlr3/org/apache/uima/ruta/parser/output/
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/BooleanListVariableExpression.java
- copied, changed from r1711496, uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/ReferenceBooleanListExpression.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/NumberListVariableExpression.java
- copied, changed from r1711496, uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/ReferenceNumberListExpression.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/StringListVariableExpression.java
- copied, changed from r1711496, uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/ReferenceStringListExpression.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/TypeListVariableExpression.java
- copied, changed from r1711496, uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/ReferenceTypeListExpression.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/number/NumberVariableExpression.java
- copied, changed from r1711496, uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/number/ReferenceNumberExpression.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/string/StringVariableExpression.java
- copied, changed from r1711496, uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/string/ReferenceStringExpression.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/type/TypeVariableExpression.java
- copied, changed from r1711496, uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/type/ReferenceTypeExpression.java
Removed:
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/ReferenceBooleanListExpression.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/ReferenceNumberListExpression.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/ReferenceStringListExpression.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/ReferenceTypeListExpression.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/number/ReferenceNumberExpression.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/string/ReferenceStringExpression.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/type/ReferenceTypeExpression.java
Modified:
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/ExpressionFactory.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/MatchReference.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/type/ITypeExpression.java
uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/verbalize/ExpressionVerbalizer.java
uima/ruta/branches/UIMA-4408/ruta-core/src/test/java/org/apache/uima/ruta/verbalizer/ActionVerbalizerTest.java
uima/ruta/branches/UIMA-4408/ruta-core/src/test/java/org/apache/uima/ruta/verbalizer/ConditionVerbalizerTest.java
uima/ruta/branches/UIMA-4408/ruta-core/src/test/java/org/apache/uima/ruta/verbalizer/ExpressionVerbalizerTest.java
Modified: uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/ExpressionFactory.java
URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/ExpressionFactory.java?rev=1712934&r1=1712933&r2=1712934&view=diff
==============================================================================
--- uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/ExpressionFactory.java (original)
+++ uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/ExpressionFactory.java Fri Nov 6 10:43:52 2015
@@ -38,10 +38,10 @@ import org.apache.uima.ruta.expression.f
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.ReferenceBooleanListExpression;
-import org.apache.uima.ruta.expression.list.ReferenceNumberListExpression;
-import org.apache.uima.ruta.expression.list.ReferenceStringListExpression;
-import org.apache.uima.ruta.expression.list.ReferenceTypeListExpression;
+import org.apache.uima.ruta.expression.list.BooleanListVariableExpression;
+import org.apache.uima.ruta.expression.list.NumberListVariableExpression;
+import org.apache.uima.ruta.expression.list.StringListVariableExpression;
+import org.apache.uima.ruta.expression.list.TypeListVariableExpression;
import org.apache.uima.ruta.expression.list.SimpleBooleanListExpression;
import org.apache.uima.ruta.expression.list.SimpleNumberListExpression;
import org.apache.uima.ruta.expression.list.SimpleStringListExpression;
@@ -53,7 +53,7 @@ import org.apache.uima.ruta.expression.n
import org.apache.uima.ruta.expression.number.INumberExpression;
import org.apache.uima.ruta.expression.number.NegativeNumberExpression;
import org.apache.uima.ruta.expression.number.NumberFeatureExpression;
-import org.apache.uima.ruta.expression.number.ReferenceNumberExpression;
+import org.apache.uima.ruta.expression.number.NumberVariableExpression;
import org.apache.uima.ruta.expression.number.SimpleNumberExpression;
import org.apache.uima.ruta.expression.resource.ExternalWordListExpression;
import org.apache.uima.ruta.expression.resource.ExternalWordTableExpression;
@@ -66,10 +66,10 @@ import org.apache.uima.ruta.expression.r
import org.apache.uima.ruta.expression.string.AbstractStringExpression;
import org.apache.uima.ruta.expression.string.ComposedStringExpression;
import org.apache.uima.ruta.expression.string.IStringExpression;
-import org.apache.uima.ruta.expression.string.ReferenceStringExpression;
+import org.apache.uima.ruta.expression.string.StringVariableExpression;
import org.apache.uima.ruta.expression.string.SimpleStringExpression;
import org.apache.uima.ruta.expression.string.StringFeatureExpression;
-import org.apache.uima.ruta.expression.type.ReferenceTypeExpression;
+import org.apache.uima.ruta.expression.type.TypeVariableExpression;
import org.apache.uima.ruta.expression.type.SimpleTypeExpression;
import org.apache.uima.ruta.expression.type.TypeExpression;
@@ -104,7 +104,7 @@ public class ExpressionFactory {
public static INumberExpression createReferenceNumberExpression(Token var,
Token minus) {
- ReferenceNumberExpression simpleNumberExpression = new ReferenceNumberExpression(
+ NumberVariableExpression simpleNumberExpression = new NumberVariableExpression(
var.getText());
if (minus != null) {
return new NegativeNumberExpression(simpleNumberExpression);
@@ -156,7 +156,7 @@ public class ExpressionFactory {
public static AbstractStringExpression createReferenceStringExpression(
Token var) {
- return new ReferenceStringExpression(var.getText());
+ return new StringVariableExpression(var.getText());
}
public static IBooleanExpression createBooleanNumberExpression(
@@ -181,7 +181,7 @@ public class ExpressionFactory {
public static TypeExpression createReferenceTypeExpression(Token varToken) {
String varString = varToken == null ? "" : varToken.getText();
- return new ReferenceTypeExpression(varString);
+ return new TypeVariableExpression(varString);
}
public static TypeExpression createSimpleTypeExpression(String typeString,
@@ -219,31 +219,31 @@ public class ExpressionFactory {
public static BooleanListExpression createReferenceBooleanListExpression(
Token var) {
- return new ReferenceBooleanListExpression(var.getText());
+ return new BooleanListVariableExpression(var.getText());
}
public static StringListExpression createReferenceStringListExpression(
Token var) {
- return new ReferenceStringListExpression(var.getText());
+ return new StringListVariableExpression(var.getText());
}
public static TypeListExpression createReferenceTypeListExpression(Token var) {
- return new ReferenceTypeListExpression(var.getText());
+ return new TypeListVariableExpression(var.getText());
}
public static NumberListExpression createReferenceDoubleListExpression(
Token var) {
- return new ReferenceNumberListExpression(var.getText());
+ return new NumberListVariableExpression(var.getText());
}
public static NumberListExpression createReferenceIntListExpression(
Token var) {
- return new ReferenceNumberListExpression(var.getText());
+ return new NumberListVariableExpression(var.getText());
}
public static NumberListExpression createReferenceFloatListExpression(
Token var) {
- return new ReferenceNumberListExpression(var.getText());
+ return new NumberListVariableExpression(var.getText());
}
public static BooleanListExpression createBooleanListExpression(
Modified: uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/MatchReference.java
URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/MatchReference.java?rev=1712934&r1=1712933&r2=1712934&view=diff
==============================================================================
--- uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/MatchReference.java (original)
+++ uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/MatchReference.java Fri Nov 6 10:43:52 2015
@@ -24,14 +24,12 @@ import java.util.List;
import org.apache.uima.ruta.RutaBlock;
import org.apache.uima.ruta.RutaEnvironment;
-import org.apache.uima.ruta.RutaStatement;
-import org.apache.uima.ruta.RutaStream;
import org.apache.uima.ruta.expression.feature.FeatureExpression;
import org.apache.uima.ruta.expression.feature.FeatureMatchExpression;
import org.apache.uima.ruta.expression.feature.SimpleFeatureExpression;
-import org.apache.uima.ruta.expression.type.ReferenceTypeExpression;
import org.apache.uima.ruta.expression.type.SimpleTypeExpression;
import org.apache.uima.ruta.expression.type.TypeExpression;
+import org.apache.uima.ruta.expression.type.TypeVariableExpression;
public class MatchReference extends RutaExpression {
@@ -97,7 +95,7 @@ public class MatchReference extends Ruta
private TypeExpression buildTypeExpression(String candidate, RutaEnvironment e) {
if (e.isVariableOfType(candidate, "TYPE")) {
- return new ReferenceTypeExpression(candidate);
+ return new TypeVariableExpression(candidate);
} else if (e.getType(candidate) != null) {
return new SimpleTypeExpression(candidate);
}
Copied: uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/BooleanListVariableExpression.java (from r1711496, uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/ReferenceBooleanListExpression.java)
URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/BooleanListVariableExpression.java?p2=uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/BooleanListVariableExpression.java&p1=uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/ReferenceBooleanListExpression.java&r1=1711496&r2=1712934&rev=1712934&view=diff
==============================================================================
--- uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/ReferenceBooleanListExpression.java (original)
+++ uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/BooleanListVariableExpression.java Fri Nov 6 10:43:52 2015
@@ -26,11 +26,11 @@ import org.apache.uima.ruta.RutaBlock;
import org.apache.uima.ruta.RutaStream;
import org.apache.uima.ruta.expression.bool.IBooleanExpression;
-public class ReferenceBooleanListExpression extends BooleanListExpression {
+public class BooleanListVariableExpression extends BooleanListExpression {
private String var;
- public ReferenceBooleanListExpression(String var) {
+ public BooleanListVariableExpression(String var) {
super();
this.var = var;
}
Copied: uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/NumberListVariableExpression.java (from r1711496, uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/ReferenceNumberListExpression.java)
URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/NumberListVariableExpression.java?p2=uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/NumberListVariableExpression.java&p1=uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/ReferenceNumberListExpression.java&r1=1711496&r2=1712934&rev=1712934&view=diff
==============================================================================
--- uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/ReferenceNumberListExpression.java (original)
+++ uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/NumberListVariableExpression.java Fri Nov 6 10:43:52 2015
@@ -26,11 +26,11 @@ import org.apache.uima.ruta.RutaBlock;
import org.apache.uima.ruta.RutaStream;
import org.apache.uima.ruta.expression.number.INumberExpression;
-public class ReferenceNumberListExpression extends NumberListExpression {
+public class NumberListVariableExpression extends NumberListExpression {
private String var;
- public ReferenceNumberListExpression(String var) {
+ public NumberListVariableExpression(String var) {
super();
this.var = var;
}
Copied: uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/StringListVariableExpression.java (from r1711496, uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/ReferenceStringListExpression.java)
URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/StringListVariableExpression.java?p2=uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/StringListVariableExpression.java&p1=uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/ReferenceStringListExpression.java&r1=1711496&r2=1712934&rev=1712934&view=diff
==============================================================================
--- uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/ReferenceStringListExpression.java (original)
+++ uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/StringListVariableExpression.java Fri Nov 6 10:43:52 2015
@@ -26,11 +26,11 @@ import org.apache.uima.ruta.RutaBlock;
import org.apache.uima.ruta.RutaStream;
import org.apache.uima.ruta.expression.string.AbstractStringExpression;
-public class ReferenceStringListExpression extends StringListExpression {
+public class StringListVariableExpression extends StringListExpression {
private String var;
- public ReferenceStringListExpression(String var) {
+ public StringListVariableExpression(String var) {
super();
this.var = var;
}
Copied: uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/TypeListVariableExpression.java (from r1711496, uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/ReferenceTypeListExpression.java)
URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/TypeListVariableExpression.java?p2=uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/TypeListVariableExpression.java&p1=uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/ReferenceTypeListExpression.java&r1=1711496&r2=1712934&rev=1712934&view=diff
==============================================================================
--- uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/ReferenceTypeListExpression.java (original)
+++ uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/TypeListVariableExpression.java Fri Nov 6 10:43:52 2015
@@ -27,11 +27,11 @@ import org.apache.uima.ruta.RutaBlock;
import org.apache.uima.ruta.RutaStream;
import org.apache.uima.ruta.expression.type.TypeExpression;
-public class ReferenceTypeListExpression extends TypeListExpression {
+public class TypeListVariableExpression extends TypeListExpression {
private String var;
- public ReferenceTypeListExpression(String var) {
+ public TypeListVariableExpression(String var) {
super();
this.var = var;
}
Copied: uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/number/NumberVariableExpression.java (from r1711496, uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/number/ReferenceNumberExpression.java)
URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/number/NumberVariableExpression.java?p2=uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/number/NumberVariableExpression.java&p1=uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/number/ReferenceNumberExpression.java&r1=1711496&r2=1712934&rev=1712934&view=diff
==============================================================================
--- uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/number/ReferenceNumberExpression.java (original)
+++ uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/number/NumberVariableExpression.java Fri Nov 6 10:43:52 2015
@@ -23,11 +23,11 @@ import org.apache.uima.cas.text.Annotati
import org.apache.uima.ruta.RutaBlock;
import org.apache.uima.ruta.RutaStream;
-public class ReferenceNumberExpression extends AbstractNumberExpression {
+public class NumberVariableExpression extends AbstractNumberExpression {
private final String var;
- public ReferenceNumberExpression(String var) {
+ public NumberVariableExpression(String var) {
super();
this.var = var;
}
Copied: uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/string/StringVariableExpression.java (from r1711496, uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/string/ReferenceStringExpression.java)
URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/string/StringVariableExpression.java?p2=uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/string/StringVariableExpression.java&p1=uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/string/ReferenceStringExpression.java&r1=1711496&r2=1712934&rev=1712934&view=diff
==============================================================================
--- uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/string/ReferenceStringExpression.java (original)
+++ uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/string/StringVariableExpression.java Fri Nov 6 10:43:52 2015
@@ -23,11 +23,11 @@ import org.apache.uima.cas.text.Annotati
import org.apache.uima.ruta.RutaBlock;
import org.apache.uima.ruta.RutaStream;
-public class ReferenceStringExpression extends LiteralStringExpression {
+public class StringVariableExpression extends LiteralStringExpression {
private final String var;
- public ReferenceStringExpression(String var) {
+ public StringVariableExpression(String var) {
super();
this.var = var;
}
Modified: uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/type/ITypeExpression.java
URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/type/ITypeExpression.java?rev=1712934&r1=1712933&r2=1712934&view=diff
==============================================================================
--- uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/type/ITypeExpression.java (original)
+++ uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/type/ITypeExpression.java Fri Nov 6 10:43:52 2015
@@ -21,8 +21,9 @@ package org.apache.uima.ruta.expression.
import org.apache.uima.cas.Type;
import org.apache.uima.ruta.RutaBlock;
+import org.apache.uima.ruta.expression.string.IStringExpression;
-public interface ITypeExpression {
+public interface ITypeExpression extends IStringExpression {
/**
* Returns the actual type of the TypeExpression
Copied: uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/type/TypeVariableExpression.java (from r1711496, uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/type/ReferenceTypeExpression.java)
URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/type/TypeVariableExpression.java?p2=uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/type/TypeVariableExpression.java&p1=uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/type/ReferenceTypeExpression.java&r1=1711496&r2=1712934&rev=1712934&view=diff
==============================================================================
--- uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/type/ReferenceTypeExpression.java (original)
+++ uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/type/TypeVariableExpression.java Fri Nov 6 10:43:52 2015
@@ -24,11 +24,11 @@ import org.apache.uima.cas.text.Annotati
import org.apache.uima.ruta.RutaBlock;
import org.apache.uima.ruta.RutaStream;
-public class ReferenceTypeExpression extends TypeExpression {
+public class TypeVariableExpression extends TypeExpression {
private final String var;
- public ReferenceTypeExpression(String varString) {
+ public TypeVariableExpression(String varString) {
super();
this.var = varString;
}
Modified: uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/verbalize/ExpressionVerbalizer.java
URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/verbalize/ExpressionVerbalizer.java?rev=1712934&r1=1712933&r2=1712934&view=diff
==============================================================================
--- uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/verbalize/ExpressionVerbalizer.java (original)
+++ uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/verbalize/ExpressionVerbalizer.java Fri Nov 6 10:43:52 2015
@@ -35,10 +35,10 @@ import org.apache.uima.ruta.expression.f
import org.apache.uima.ruta.expression.feature.GenericFeatureExpression;
import org.apache.uima.ruta.expression.feature.SimpleFeatureExpression;
import org.apache.uima.ruta.expression.list.ListExpression;
-import org.apache.uima.ruta.expression.list.ReferenceBooleanListExpression;
-import org.apache.uima.ruta.expression.list.ReferenceNumberListExpression;
-import org.apache.uima.ruta.expression.list.ReferenceStringListExpression;
-import org.apache.uima.ruta.expression.list.ReferenceTypeListExpression;
+import org.apache.uima.ruta.expression.list.BooleanListVariableExpression;
+import org.apache.uima.ruta.expression.list.NumberListVariableExpression;
+import org.apache.uima.ruta.expression.list.StringListVariableExpression;
+import org.apache.uima.ruta.expression.list.TypeListVariableExpression;
import org.apache.uima.ruta.expression.list.SimpleBooleanListExpression;
import org.apache.uima.ruta.expression.list.SimpleNumberListExpression;
import org.apache.uima.ruta.expression.list.SimpleStringListExpression;
@@ -48,7 +48,7 @@ import org.apache.uima.ruta.expression.n
import org.apache.uima.ruta.expression.number.INumberExpression;
import org.apache.uima.ruta.expression.number.NegativeNumberExpression;
import org.apache.uima.ruta.expression.number.NumberFeatureExpression;
-import org.apache.uima.ruta.expression.number.ReferenceNumberExpression;
+import org.apache.uima.ruta.expression.number.NumberVariableExpression;
import org.apache.uima.ruta.expression.number.SimpleNumberExpression;
import org.apache.uima.ruta.expression.resource.ReferenceWordListExpression;
import org.apache.uima.ruta.expression.resource.ReferenceWordTableExpression;
@@ -57,10 +57,10 @@ import org.apache.uima.ruta.expression.r
import org.apache.uima.ruta.expression.string.ComposedStringExpression;
import org.apache.uima.ruta.expression.string.IStringExpression;
import org.apache.uima.ruta.expression.string.LiteralStringExpression;
-import org.apache.uima.ruta.expression.string.ReferenceStringExpression;
+import org.apache.uima.ruta.expression.string.StringVariableExpression;
import org.apache.uima.ruta.expression.string.SimpleStringExpression;
import org.apache.uima.ruta.expression.string.StringFeatureExpression;
-import org.apache.uima.ruta.expression.type.ReferenceTypeExpression;
+import org.apache.uima.ruta.expression.type.TypeVariableExpression;
import org.apache.uima.ruta.expression.type.SimpleTypeExpression;
import org.apache.uima.ruta.expression.type.TypeExpression;
@@ -120,26 +120,26 @@ public class ExpressionVerbalizer {
if (expression instanceof SimpleBooleanListExpression) {
SimpleBooleanListExpression e = (SimpleBooleanListExpression) expression;
return "{" + verbalizer.verbalizeExpressionList(e.getList()) + "}";
- } else if (expression instanceof ReferenceBooleanListExpression) {
- ReferenceBooleanListExpression e = (ReferenceBooleanListExpression) expression;
+ } else if (expression instanceof BooleanListVariableExpression) {
+ BooleanListVariableExpression e = (BooleanListVariableExpression) expression;
return e.getVar();
} else if (expression instanceof SimpleNumberListExpression) {
SimpleNumberListExpression e = (SimpleNumberListExpression) expression;
return "{" + verbalizer.verbalizeExpressionList(e.getList()) + "}";
- } else if (expression instanceof ReferenceNumberListExpression) {
- ReferenceNumberListExpression e = (ReferenceNumberListExpression) expression;
+ } else if (expression instanceof NumberListVariableExpression) {
+ NumberListVariableExpression e = (NumberListVariableExpression) expression;
return e.getVar();
} else if (expression instanceof SimpleStringListExpression) {
SimpleStringListExpression e = (SimpleStringListExpression) expression;
return "{" + verbalizer.verbalizeExpressionList(e.getList()) + "}";
- } else if (expression instanceof ReferenceStringListExpression) {
- ReferenceStringListExpression e = (ReferenceStringListExpression) expression;
+ } else if (expression instanceof StringListVariableExpression) {
+ StringListVariableExpression e = (StringListVariableExpression) expression;
return e.getVar();
} else if (expression instanceof SimpleTypeListExpression) {
SimpleTypeListExpression e = (SimpleTypeListExpression) expression;
return "{" + verbalizer.verbalizeExpressionList(e.getList()) + "}";
- } else if (expression instanceof ReferenceTypeListExpression) {
- ReferenceTypeListExpression e = (ReferenceTypeListExpression) expression;
+ } else if (expression instanceof TypeListVariableExpression) {
+ TypeListVariableExpression e = (TypeListVariableExpression) expression;
return e.getVar();
} else if (expression instanceof UntypedListExpression) {
UntypedListExpression e = (UntypedListExpression) expression;
@@ -154,8 +154,8 @@ public class ExpressionVerbalizer {
} else if (expression instanceof NegativeNumberExpression) {
NegativeNumberExpression e = (NegativeNumberExpression) expression;
return "-(" + e.getExpression() + ")";
- } else if (expression instanceof ReferenceNumberExpression) {
- ReferenceNumberExpression e = (ReferenceNumberExpression) expression;
+ } else if (expression instanceof NumberVariableExpression) {
+ NumberVariableExpression e = (NumberVariableExpression) expression;
return e.getVar();
} else if (expression instanceof SimpleNumberExpression) {
SimpleNumberExpression e = (SimpleNumberExpression) expression;
@@ -237,8 +237,8 @@ public class ExpressionVerbalizer {
}
}
return sb.toString();
- } else if (expression instanceof ReferenceStringExpression) {
- ReferenceStringExpression e = (ReferenceStringExpression) expression;
+ } else if (expression instanceof StringVariableExpression) {
+ StringVariableExpression e = (StringVariableExpression) expression;
return e.getVar();
} else if (expression instanceof SimpleStringExpression) {
SimpleStringExpression e = (SimpleStringExpression) expression;
@@ -262,8 +262,8 @@ public class ExpressionVerbalizer {
type = "Document";
}
return type;
- } else if (expression instanceof ReferenceTypeExpression) {
- ReferenceTypeExpression e = (ReferenceTypeExpression) expression;
+ } else if (expression instanceof TypeVariableExpression) {
+ TypeVariableExpression e = (TypeVariableExpression) expression;
return e.getVar();
}
return expression.getClass().getSimpleName();
Modified: uima/ruta/branches/UIMA-4408/ruta-core/src/test/java/org/apache/uima/ruta/verbalizer/ActionVerbalizerTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4408/ruta-core/src/test/java/org/apache/uima/ruta/verbalizer/ActionVerbalizerTest.java?rev=1712934&r1=1712933&r2=1712934&view=diff
==============================================================================
--- uima/ruta/branches/UIMA-4408/ruta-core/src/test/java/org/apache/uima/ruta/verbalizer/ActionVerbalizerTest.java (original)
+++ uima/ruta/branches/UIMA-4408/ruta-core/src/test/java/org/apache/uima/ruta/verbalizer/ActionVerbalizerTest.java Fri Nov 6 10:43:52 2015
@@ -70,7 +70,7 @@ import org.apache.uima.ruta.expression.l
import org.apache.uima.ruta.expression.list.StringListExpression;
import org.apache.uima.ruta.expression.list.TypeListExpression;
import org.apache.uima.ruta.expression.number.INumberExpression;
-import org.apache.uima.ruta.expression.number.ReferenceNumberExpression;
+import org.apache.uima.ruta.expression.number.NumberVariableExpression;
import org.apache.uima.ruta.expression.number.SimpleNumberExpression;
import org.apache.uima.ruta.expression.resource.ReferenceWordListExpression;
import org.apache.uima.ruta.expression.resource.ReferenceWordTableExpression;
@@ -79,7 +79,7 @@ import org.apache.uima.ruta.expression.r
import org.apache.uima.ruta.expression.string.AbstractStringExpression;
import org.apache.uima.ruta.expression.string.IStringExpression;
import org.apache.uima.ruta.expression.string.SimpleStringExpression;
-import org.apache.uima.ruta.expression.type.ReferenceTypeExpression;
+import org.apache.uima.ruta.expression.type.TypeVariableExpression;
import org.apache.uima.ruta.expression.type.SimpleTypeExpression;
import org.apache.uima.ruta.expression.type.TypeExpression;
import org.apache.uima.ruta.verbalize.RutaVerbalizer;
@@ -97,11 +97,11 @@ public class ActionVerbalizerTest {
List<INumberExpression> indexes = new ArrayList<INumberExpression>();
String var = "anyVar";
TypeExpression typeExpr1 = new SimpleTypeExpression("Type1");
- TypeExpression typeExpr2 = new ReferenceTypeExpression("typeVar");
+ TypeExpression typeExpr2 = new TypeVariableExpression("typeVar");
typeExprList.add(typeExpr1);
typeExprList.add(typeExpr2);
INumberExpression numExpr1 = new SimpleNumberExpression(4);
- INumberExpression numExpr2 = new ReferenceNumberExpression("numVar");
+ INumberExpression numExpr2 = new NumberVariableExpression("numVar");
IBooleanExpression boolExpr1 = new SimpleBooleanExpression(true);
AbstractStringExpression stringExpr = new SimpleStringExpression("string");
stringExprList.add(stringExpr);
Modified: uima/ruta/branches/UIMA-4408/ruta-core/src/test/java/org/apache/uima/ruta/verbalizer/ConditionVerbalizerTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4408/ruta-core/src/test/java/org/apache/uima/ruta/verbalizer/ConditionVerbalizerTest.java?rev=1712934&r1=1712933&r2=1712934&view=diff
==============================================================================
--- uima/ruta/branches/UIMA-4408/ruta-core/src/test/java/org/apache/uima/ruta/verbalizer/ConditionVerbalizerTest.java (original)
+++ uima/ruta/branches/UIMA-4408/ruta-core/src/test/java/org/apache/uima/ruta/verbalizer/ConditionVerbalizerTest.java Fri Nov 6 10:43:52 2015
@@ -59,11 +59,11 @@ import org.apache.uima.ruta.expression.l
import org.apache.uima.ruta.expression.list.StringListExpression;
import org.apache.uima.ruta.expression.list.TypeListExpression;
import org.apache.uima.ruta.expression.number.INumberExpression;
-import org.apache.uima.ruta.expression.number.ReferenceNumberExpression;
+import org.apache.uima.ruta.expression.number.NumberVariableExpression;
import org.apache.uima.ruta.expression.number.SimpleNumberExpression;
import org.apache.uima.ruta.expression.string.IStringExpression;
import org.apache.uima.ruta.expression.string.SimpleStringExpression;
-import org.apache.uima.ruta.expression.type.ReferenceTypeExpression;
+import org.apache.uima.ruta.expression.type.TypeVariableExpression;
import org.apache.uima.ruta.expression.type.SimpleTypeExpression;
import org.apache.uima.ruta.expression.type.TypeExpression;
import org.apache.uima.ruta.verbalize.RutaVerbalizer;
@@ -77,13 +77,13 @@ public class ConditionVerbalizerTest {
List<TypeExpression> typeExprList = new ArrayList<TypeExpression>();
List<IStringExpression> stringExprList = new ArrayList<IStringExpression>();
String var = "anyVar";
- IStringExpression varExpr = new ReferenceNumberExpression(var);
+ IStringExpression varExpr = new NumberVariableExpression(var);
TypeExpression typeExpr1 = new SimpleTypeExpression("Type1");
- TypeExpression typeExpr2 = new ReferenceTypeExpression("typeVar");
+ TypeExpression typeExpr2 = new TypeVariableExpression("typeVar");
typeExprList.add(typeExpr1);
typeExprList.add(typeExpr2);
INumberExpression numExpr1 = new SimpleNumberExpression(4);
- INumberExpression numExpr2 = new ReferenceNumberExpression("numVar");
+ INumberExpression numExpr2 = new NumberVariableExpression("numVar");
IBooleanExpression boolExpr1 = new SimpleBooleanExpression(true);
IStringExpression stringExpr = new SimpleStringExpression("string");
stringExprList.add(stringExpr);
Modified: uima/ruta/branches/UIMA-4408/ruta-core/src/test/java/org/apache/uima/ruta/verbalizer/ExpressionVerbalizerTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4408/ruta-core/src/test/java/org/apache/uima/ruta/verbalizer/ExpressionVerbalizerTest.java?rev=1712934&r1=1712933&r2=1712934&view=diff
==============================================================================
--- uima/ruta/branches/UIMA-4408/ruta-core/src/test/java/org/apache/uima/ruta/verbalizer/ExpressionVerbalizerTest.java (original)
+++ uima/ruta/branches/UIMA-4408/ruta-core/src/test/java/org/apache/uima/ruta/verbalizer/ExpressionVerbalizerTest.java Fri Nov 6 10:43:52 2015
@@ -31,10 +31,10 @@ import org.apache.uima.ruta.expression.b
import org.apache.uima.ruta.expression.bool.SimpleBooleanExpression;
import org.apache.uima.ruta.expression.list.BooleanListExpression;
import org.apache.uima.ruta.expression.list.NumberListExpression;
-import org.apache.uima.ruta.expression.list.ReferenceBooleanListExpression;
-import org.apache.uima.ruta.expression.list.ReferenceNumberListExpression;
-import org.apache.uima.ruta.expression.list.ReferenceStringListExpression;
-import org.apache.uima.ruta.expression.list.ReferenceTypeListExpression;
+import org.apache.uima.ruta.expression.list.BooleanListVariableExpression;
+import org.apache.uima.ruta.expression.list.NumberListVariableExpression;
+import org.apache.uima.ruta.expression.list.StringListVariableExpression;
+import org.apache.uima.ruta.expression.list.TypeListVariableExpression;
import org.apache.uima.ruta.expression.list.SimpleBooleanListExpression;
import org.apache.uima.ruta.expression.list.SimpleNumberListExpression;
import org.apache.uima.ruta.expression.list.SimpleStringListExpression;
@@ -43,14 +43,14 @@ import org.apache.uima.ruta.expression.l
import org.apache.uima.ruta.expression.list.TypeListExpression;
import org.apache.uima.ruta.expression.number.ComposedNumberExpression;
import org.apache.uima.ruta.expression.number.INumberExpression;
-import org.apache.uima.ruta.expression.number.ReferenceNumberExpression;
+import org.apache.uima.ruta.expression.number.NumberVariableExpression;
import org.apache.uima.ruta.expression.number.SimpleNumberExpression;
import org.apache.uima.ruta.expression.string.AbstractStringExpression;
import org.apache.uima.ruta.expression.string.ComposedStringExpression;
import org.apache.uima.ruta.expression.string.IStringExpression;
-import org.apache.uima.ruta.expression.string.ReferenceStringExpression;
+import org.apache.uima.ruta.expression.string.StringVariableExpression;
import org.apache.uima.ruta.expression.string.SimpleStringExpression;
-import org.apache.uima.ruta.expression.type.ReferenceTypeExpression;
+import org.apache.uima.ruta.expression.type.TypeVariableExpression;
import org.apache.uima.ruta.expression.type.SimpleTypeExpression;
import org.apache.uima.ruta.expression.type.TypeExpression;
import org.apache.uima.ruta.verbalize.RutaVerbalizer;
@@ -96,16 +96,16 @@ public class ExpressionVerbalizerTest {
String s = null;
String var = "anyVar";
TypeExpression typeExpr1 = new SimpleTypeExpression("Type1");
- TypeExpression typeExpr2 = new ReferenceTypeExpression("typeVar");
+ TypeExpression typeExpr2 = new TypeVariableExpression("typeVar");
List<INumberExpression> numExprList1 = new ArrayList<INumberExpression>();
List<INumberExpression> numExprList2 = new ArrayList<INumberExpression>();
List<String> opList1 = new ArrayList<String>();
List<String> opList2 = new ArrayList<String>();
INumberExpression numExpr1 = new SimpleNumberExpression(4);
- INumberExpression numExpr2 = new ReferenceNumberExpression("numVar");
- INumberExpression numExpr3 = new ReferenceNumberExpression("4.9");
- INumberExpression numExpr4 = new ReferenceNumberExpression("-4");
+ INumberExpression numExpr2 = new NumberVariableExpression("numVar");
+ INumberExpression numExpr3 = new NumberVariableExpression("4.9");
+ INumberExpression numExpr4 = new NumberVariableExpression("-4");
numExprList1.add(numExpr1);
numExprList1.add(numExpr2);
opList1.add("+");
@@ -167,7 +167,7 @@ public class ExpressionVerbalizerTest {
List<IStringExpression> stringExprList = new ArrayList<IStringExpression>();
AbstractStringExpression stringExpr1 = new SimpleStringExpression("string");
- AbstractStringExpression stringExpr2 = new ReferenceStringExpression(var);
+ AbstractStringExpression stringExpr2 = new StringVariableExpression(var);
stringExprList.add(stringExpr1);
stringExprList.add(stringExpr2);
AbstractStringExpression stringExpr3 = new ComposedStringExpression(stringExprList);
@@ -181,7 +181,7 @@ public class ExpressionVerbalizerTest {
StringListExpression sle1 = new SimpleStringListExpression(stringExprList);
- StringListExpression sle2 = new ReferenceStringListExpression(var);
+ StringListExpression sle2 = new StringListVariableExpression(var);
s = v.verbalize(sle1);
assertEquals("{\"string\", anyVar}", s);
s = v.verbalize(sle2);
@@ -191,7 +191,7 @@ public class ExpressionVerbalizerTest {
boolExprList.add(boolExpr1);
boolExprList.add(boolExpr3);
BooleanListExpression ble1 = new SimpleBooleanListExpression(boolExprList);
- BooleanListExpression ble2 = new ReferenceBooleanListExpression(var);
+ BooleanListExpression ble2 = new BooleanListVariableExpression(var);
s = v.verbalize(ble1);
assertEquals("{true, anyVar}", s);
s = v.verbalize(ble2);
@@ -201,7 +201,7 @@ public class ExpressionVerbalizerTest {
numExprList.add(numExpr1);
numExprList.add(numExpr3);
NumberListExpression nle1 = new SimpleNumberListExpression(numExprList);
- NumberListExpression nle2 = new ReferenceNumberListExpression(var);
+ NumberListExpression nle2 = new NumberListVariableExpression(var);
s = v.verbalize(nle1);
assertEquals("{4, 4.9}", s);
s = v.verbalize(nle2);
@@ -211,7 +211,7 @@ public class ExpressionVerbalizerTest {
typeExprList.add(typeExpr1);
typeExprList.add(typeExpr2);
TypeListExpression tle1 = new SimpleTypeListExpression(typeExprList);
- TypeListExpression tle2 = new ReferenceTypeListExpression(var);
+ TypeListExpression tle2 = new TypeListVariableExpression(var);
s = v.verbalize(tle1);
assertEquals("{Type1, typeVar}", s);
s = v.verbalize(tle2);