You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by pk...@apache.org on 2013/04/29 15:43:40 UTC
svn commit: r1477065 - in
/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression:
bool/ list/ number/ resource/ string/ type/
Author: pkluegl
Date: Mon Apr 29 13:43:39 2013
New Revision: 1477065
URL: http://svn.apache.org/r1477065
Log:
UIMA-2850
- renaming
Modified:
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/bool/BooleanExpression.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/bool/BooleanFunctionExpression.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/bool/BooleanNumberExpression.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/bool/BooleanTypeExpression.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/bool/ReferenceBooleanExpression.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/bool/SimpleBooleanExpression.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/bool/SimpleBooleanFunction.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/BooleanListExpression.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/ListExpression.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/NumberListExpression.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/ReferenceBooleanListExpression.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/ReferenceNumberListExpression.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/ReferenceStringListExpression.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/ReferenceTypeListExpression.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/SimpleBooleanListExpression.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/SimpleNumberListExpression.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/SimpleStringListExpression.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/SimpleTypeListExpression.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/StringListExpression.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/TypeListExpression.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/number/AbstractNumberExpression.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/number/ComposedNumberExpression.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/number/NegativeNumberExpression.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/number/NumberExpression.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/number/NumberFunctionExpression.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/number/ReferenceNumberExpression.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/number/SimpleNumberExpression.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/resource/LiteralWordListExpression.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/resource/LiteralWordTableExpression.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/resource/ReferenceWordListExpression.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/resource/ReferenceWordTableExpression.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/resource/WordListExpression.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/resource/WordTableExpression.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/string/ComposedStringExpression.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/string/LiteralStringExpression.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/string/ReferenceStringExpression.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/string/RemoveFunction.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/string/SimpleStringExpression.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/string/StringExpression.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/string/StringFunctionExpression.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/string/StringFunctionFactory.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/type/ReferenceTypeExpression.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/type/SimpleTypeExpression.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/type/TypeExpression.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/type/TypeFunctionExpression.java
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/bool/BooleanExpression.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/bool/BooleanExpression.java?rev=1477065&r1=1477064&r2=1477065&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/bool/BooleanExpression.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/bool/BooleanExpression.java Mon Apr 29 13:43:39 2013
@@ -17,13 +17,13 @@
* under the License.
*/
-package org.apache.uima.textmarker.expression.bool;
+package org.apache.uima.ruta.expression.bool;
-import org.apache.uima.textmarker.TextMarkerStatement;
-import org.apache.uima.textmarker.expression.string.StringExpression;
+import org.apache.uima.ruta.RutaStatement;
+import org.apache.uima.ruta.expression.string.StringExpression;
public abstract class BooleanExpression extends StringExpression {
- public abstract boolean getBooleanValue(TextMarkerStatement parent);
+ public abstract boolean getBooleanValue(RutaStatement parent);
}
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/bool/BooleanFunctionExpression.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/bool/BooleanFunctionExpression.java?rev=1477065&r1=1477064&r2=1477065&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/bool/BooleanFunctionExpression.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/bool/BooleanFunctionExpression.java Mon Apr 29 13:43:39 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.textmarker.expression.bool;
+package org.apache.uima.ruta.expression.bool;
public abstract class BooleanFunctionExpression extends BooleanExpression {
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/bool/BooleanNumberExpression.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/bool/BooleanNumberExpression.java?rev=1477065&r1=1477064&r2=1477065&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/bool/BooleanNumberExpression.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/bool/BooleanNumberExpression.java Mon Apr 29 13:43:39 2013
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.uima.textmarker.expression.bool;
+package org.apache.uima.ruta.expression.bool;
-import org.apache.uima.textmarker.TextMarkerStatement;
-import org.apache.uima.textmarker.expression.number.NumberExpression;
+import org.apache.uima.ruta.RutaStatement;
+import org.apache.uima.ruta.expression.number.NumberExpression;
public class BooleanNumberExpression extends BooleanExpression {
@@ -38,7 +38,7 @@ public class BooleanNumberExpression ext
}
@Override
- public boolean getBooleanValue(TextMarkerStatement parent) {
+ public boolean getBooleanValue(RutaStatement parent) {
double doubleValue1 = getFristExpression().getDoubleValue(parent);
double doubleValue2 = getSecondExpression().getDoubleValue(parent);
return eval(doubleValue1, getOperator(), doubleValue2);
@@ -74,7 +74,7 @@ public class BooleanNumberExpression ext
}
@Override
- public String getStringValue(TextMarkerStatement parent) {
+ public String getStringValue(RutaStatement parent) {
return e1.getStringValue(parent) + " " + op + " " + e2.getStringValue(parent);
}
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/bool/BooleanTypeExpression.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/bool/BooleanTypeExpression.java?rev=1477065&r1=1477064&r2=1477065&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/bool/BooleanTypeExpression.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/bool/BooleanTypeExpression.java Mon Apr 29 13:43:39 2013
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.uima.textmarker.expression.bool;
+package org.apache.uima.ruta.expression.bool;
import org.apache.uima.cas.Type;
-import org.apache.uima.textmarker.TextMarkerStatement;
-import org.apache.uima.textmarker.expression.type.TypeExpression;
+import org.apache.uima.ruta.RutaStatement;
+import org.apache.uima.ruta.expression.type.TypeExpression;
public class BooleanTypeExpression extends BooleanExpression {
@@ -39,7 +39,7 @@ public class BooleanTypeExpression exten
}
@Override
- public boolean getBooleanValue(TextMarkerStatement parent) {
+ public boolean getBooleanValue(RutaStatement parent) {
Type type1 = getFristExpression().getType(parent);
String first = type1.getName();
Type type2 = getSecondExpression().getType(parent);
@@ -69,7 +69,7 @@ public class BooleanTypeExpression exten
}
@Override
- public String getStringValue(TextMarkerStatement parent) {
+ public String getStringValue(RutaStatement parent) {
return e1.getStringValue(parent) + " " + op + " " + e2.getStringValue(parent);
}
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/bool/ReferenceBooleanExpression.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/bool/ReferenceBooleanExpression.java?rev=1477065&r1=1477064&r2=1477065&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/bool/ReferenceBooleanExpression.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/bool/ReferenceBooleanExpression.java Mon Apr 29 13:43:39 2013
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.uima.textmarker.expression.bool;
+package org.apache.uima.ruta.expression.bool;
-import org.apache.uima.textmarker.TextMarkerStatement;
+import org.apache.uima.ruta.RutaStatement;
public class ReferenceBooleanExpression extends BooleanExpression {
@@ -31,7 +31,7 @@ public class ReferenceBooleanExpression
}
@Override
- public boolean getBooleanValue(TextMarkerStatement parent) {
+ public boolean getBooleanValue(RutaStatement parent) {
Boolean variableValue = parent.getEnvironment().getVariableValue(var, Boolean.class);
if (variableValue == null) {
return false;
@@ -44,7 +44,7 @@ public class ReferenceBooleanExpression
}
@Override
- public String getStringValue(TextMarkerStatement parent) {
+ public String getStringValue(RutaStatement parent) {
return getBooleanValue(parent) ? "true" : "false";
}
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/bool/SimpleBooleanExpression.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/bool/SimpleBooleanExpression.java?rev=1477065&r1=1477064&r2=1477065&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/bool/SimpleBooleanExpression.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/bool/SimpleBooleanExpression.java Mon Apr 29 13:43:39 2013
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.uima.textmarker.expression.bool;
+package org.apache.uima.ruta.expression.bool;
-import org.apache.uima.textmarker.TextMarkerStatement;
+import org.apache.uima.ruta.RutaStatement;
public class SimpleBooleanExpression extends BooleanExpression {
@@ -31,7 +31,7 @@ public class SimpleBooleanExpression ext
}
@Override
- public boolean getBooleanValue(TextMarkerStatement parent) {
+ public boolean getBooleanValue(RutaStatement parent) {
return getPrimitiveValue();
}
@@ -40,7 +40,7 @@ public class SimpleBooleanExpression ext
}
@Override
- public String getStringValue(TextMarkerStatement parent) {
+ public String getStringValue(RutaStatement parent) {
return getBooleanValue(parent) ? "true" : "false";
}
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/bool/SimpleBooleanFunction.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/bool/SimpleBooleanFunction.java?rev=1477065&r1=1477064&r2=1477065&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/bool/SimpleBooleanFunction.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/bool/SimpleBooleanFunction.java Mon Apr 29 13:43:39 2013
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.uima.textmarker.expression.bool;
+package org.apache.uima.ruta.expression.bool;
-import org.apache.uima.textmarker.TextMarkerStatement;
+import org.apache.uima.ruta.RutaStatement;
public class SimpleBooleanFunction extends BooleanExpression {
@@ -37,7 +37,7 @@ public class SimpleBooleanFunction exten
}
@Override
- public boolean getBooleanValue(TextMarkerStatement parent) {
+ public boolean getBooleanValue(RutaStatement parent) {
boolean b1 = e1.getBooleanValue(parent);
boolean b2 = e2.getBooleanValue(parent);
if ("XOR".equals(op)) {
@@ -51,7 +51,7 @@ public class SimpleBooleanFunction exten
}
@Override
- public String getStringValue(TextMarkerStatement parent) {
+ public String getStringValue(RutaStatement parent) {
return e1.getStringValue(parent) + " " + op + " " + e2.getStringValue(parent);
}
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/BooleanListExpression.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/BooleanListExpression.java?rev=1477065&r1=1477064&r2=1477065&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/BooleanListExpression.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/BooleanListExpression.java Mon Apr 29 13:43:39 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.textmarker.expression.list;
+package org.apache.uima.ruta.expression.list;
public abstract class BooleanListExpression extends ListExpression<Boolean> {
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/ListExpression.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/ListExpression.java?rev=1477065&r1=1477064&r2=1477065&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/ListExpression.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/ListExpression.java Mon Apr 29 13:43:39 2013
@@ -17,20 +17,20 @@
* under the License.
*/
-package org.apache.uima.textmarker.expression.list;
+package org.apache.uima.ruta.expression.list;
import java.util.List;
-import org.apache.uima.textmarker.TextMarkerStatement;
-import org.apache.uima.textmarker.expression.string.StringExpression;
+import org.apache.uima.ruta.RutaStatement;
+import org.apache.uima.ruta.expression.string.StringExpression;
public abstract class ListExpression<T> extends StringExpression {
- public abstract List<T> getList(TextMarkerStatement parent);
+ public abstract List<T> getList(RutaStatement parent);
@Override
- public String getStringValue(TextMarkerStatement parent) {
+ public String getStringValue(RutaStatement parent) {
return getList(parent).toString();
}
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/NumberListExpression.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/NumberListExpression.java?rev=1477065&r1=1477064&r2=1477065&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/NumberListExpression.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/NumberListExpression.java Mon Apr 29 13:43:39 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.textmarker.expression.list;
+package org.apache.uima.ruta.expression.list;
public abstract class NumberListExpression extends ListExpression<Number> {
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/ReferenceBooleanListExpression.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/ReferenceBooleanListExpression.java?rev=1477065&r1=1477064&r2=1477065&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/ReferenceBooleanListExpression.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/ReferenceBooleanListExpression.java Mon Apr 29 13:43:39 2013
@@ -17,13 +17,13 @@
* under the License.
*/
-package org.apache.uima.textmarker.expression.list;
+package org.apache.uima.ruta.expression.list;
import java.util.ArrayList;
import java.util.List;
-import org.apache.uima.textmarker.TextMarkerStatement;
-import org.apache.uima.textmarker.expression.bool.BooleanExpression;
+import org.apache.uima.ruta.RutaStatement;
+import org.apache.uima.ruta.expression.bool.BooleanExpression;
public class ReferenceBooleanListExpression extends BooleanListExpression {
@@ -37,7 +37,7 @@ public class ReferenceBooleanListExpress
@SuppressWarnings("unchecked")
@Override
- public List<Boolean> getList(TextMarkerStatement parent) {
+ public List<Boolean> getList(RutaStatement parent) {
List<Object> list = parent.getEnvironment().getVariableValue(var, List.class);
List<Boolean> result = new ArrayList<Boolean>();
for (Object each : list) {
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/ReferenceNumberListExpression.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/ReferenceNumberListExpression.java?rev=1477065&r1=1477064&r2=1477065&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/ReferenceNumberListExpression.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/ReferenceNumberListExpression.java Mon Apr 29 13:43:39 2013
@@ -17,13 +17,13 @@
* under the License.
*/
-package org.apache.uima.textmarker.expression.list;
+package org.apache.uima.ruta.expression.list;
import java.util.ArrayList;
import java.util.List;
-import org.apache.uima.textmarker.TextMarkerStatement;
-import org.apache.uima.textmarker.expression.number.NumberExpression;
+import org.apache.uima.ruta.RutaStatement;
+import org.apache.uima.ruta.expression.number.NumberExpression;
public class ReferenceNumberListExpression extends NumberListExpression {
@@ -37,7 +37,7 @@ public class ReferenceNumberListExpressi
@SuppressWarnings("unchecked")
@Override
- public List<Number> getList(TextMarkerStatement parent) {
+ public List<Number> getList(RutaStatement parent) {
List<Object> list = parent.getEnvironment().getVariableValue(var, List.class);
List<Number> result = new ArrayList<Number>();
for (Object each : list) {
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/ReferenceStringListExpression.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/ReferenceStringListExpression.java?rev=1477065&r1=1477064&r2=1477065&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/ReferenceStringListExpression.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/ReferenceStringListExpression.java Mon Apr 29 13:43:39 2013
@@ -17,13 +17,13 @@
* under the License.
*/
-package org.apache.uima.textmarker.expression.list;
+package org.apache.uima.ruta.expression.list;
import java.util.ArrayList;
import java.util.List;
-import org.apache.uima.textmarker.TextMarkerStatement;
-import org.apache.uima.textmarker.expression.string.StringExpression;
+import org.apache.uima.ruta.RutaStatement;
+import org.apache.uima.ruta.expression.string.StringExpression;
public class ReferenceStringListExpression extends StringListExpression {
@@ -37,7 +37,7 @@ public class ReferenceStringListExpressi
@SuppressWarnings("unchecked")
@Override
- public List<String> getList(TextMarkerStatement parent) {
+ public List<String> getList(RutaStatement parent) {
List<Object> list = parent.getEnvironment().getVariableValue(var, List.class);
List<String> result = new ArrayList<String>();
for (Object each : list) {
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/ReferenceTypeListExpression.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/ReferenceTypeListExpression.java?rev=1477065&r1=1477064&r2=1477065&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/ReferenceTypeListExpression.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/ReferenceTypeListExpression.java Mon Apr 29 13:43:39 2013
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.apache.uima.textmarker.expression.list;
+package org.apache.uima.ruta.expression.list;
import java.util.ArrayList;
import java.util.List;
import org.apache.uima.cas.Type;
-import org.apache.uima.textmarker.TextMarkerStatement;
-import org.apache.uima.textmarker.expression.type.TypeExpression;
+import org.apache.uima.ruta.RutaStatement;
+import org.apache.uima.ruta.expression.type.TypeExpression;
public class ReferenceTypeListExpression extends TypeListExpression {
@@ -37,7 +37,7 @@ public class ReferenceTypeListExpression
@SuppressWarnings("unchecked")
@Override
- public List<Type> getList(TextMarkerStatement parent) {
+ public List<Type> getList(RutaStatement parent) {
List<Object> list = parent.getEnvironment().getVariableValue(var, List.class);
List<Type> result = new ArrayList<Type>();
for (Object each : list) {
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/SimpleBooleanListExpression.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/SimpleBooleanListExpression.java?rev=1477065&r1=1477064&r2=1477065&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/SimpleBooleanListExpression.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/SimpleBooleanListExpression.java Mon Apr 29 13:43:39 2013
@@ -17,13 +17,13 @@
* under the License.
*/
-package org.apache.uima.textmarker.expression.list;
+package org.apache.uima.ruta.expression.list;
import java.util.ArrayList;
import java.util.List;
-import org.apache.uima.textmarker.TextMarkerStatement;
-import org.apache.uima.textmarker.expression.bool.BooleanExpression;
+import org.apache.uima.ruta.RutaStatement;
+import org.apache.uima.ruta.expression.bool.BooleanExpression;
public class SimpleBooleanListExpression extends BooleanListExpression {
@@ -36,7 +36,7 @@ public class SimpleBooleanListExpression
}
@Override
- public List<Boolean> getList(TextMarkerStatement parent) {
+ public List<Boolean> getList(RutaStatement parent) {
List<Boolean> result = new ArrayList<Boolean>();
for (BooleanExpression each : list) {
result.add(each.getBooleanValue(parent));
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/SimpleNumberListExpression.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/SimpleNumberListExpression.java?rev=1477065&r1=1477064&r2=1477065&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/SimpleNumberListExpression.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/SimpleNumberListExpression.java Mon Apr 29 13:43:39 2013
@@ -17,13 +17,13 @@
* under the License.
*/
-package org.apache.uima.textmarker.expression.list;
+package org.apache.uima.ruta.expression.list;
import java.util.ArrayList;
import java.util.List;
-import org.apache.uima.textmarker.TextMarkerStatement;
-import org.apache.uima.textmarker.expression.number.NumberExpression;
+import org.apache.uima.ruta.RutaStatement;
+import org.apache.uima.ruta.expression.number.NumberExpression;
public class SimpleNumberListExpression extends NumberListExpression {
@@ -36,7 +36,7 @@ public class SimpleNumberListExpression
}
@Override
- public List<Number> getList(TextMarkerStatement parent) {
+ public List<Number> getList(RutaStatement parent) {
List<Number> result = new ArrayList<Number>();
for (NumberExpression each : list) {
result.add(each.getDoubleValue(parent));
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/SimpleStringListExpression.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/SimpleStringListExpression.java?rev=1477065&r1=1477064&r2=1477065&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/SimpleStringListExpression.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/SimpleStringListExpression.java Mon Apr 29 13:43:39 2013
@@ -17,13 +17,13 @@
* under the License.
*/
-package org.apache.uima.textmarker.expression.list;
+package org.apache.uima.ruta.expression.list;
import java.util.ArrayList;
import java.util.List;
-import org.apache.uima.textmarker.TextMarkerStatement;
-import org.apache.uima.textmarker.expression.string.StringExpression;
+import org.apache.uima.ruta.RutaStatement;
+import org.apache.uima.ruta.expression.string.StringExpression;
public class SimpleStringListExpression extends StringListExpression {
@@ -36,7 +36,7 @@ public class SimpleStringListExpression
}
@Override
- public List<String> getList(TextMarkerStatement parent) {
+ public List<String> getList(RutaStatement parent) {
List<String> result = new ArrayList<String>();
for (StringExpression each : list) {
result.add(each.getStringValue(parent));
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/SimpleTypeListExpression.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/SimpleTypeListExpression.java?rev=1477065&r1=1477064&r2=1477065&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/SimpleTypeListExpression.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/SimpleTypeListExpression.java Mon Apr 29 13:43:39 2013
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.apache.uima.textmarker.expression.list;
+package org.apache.uima.ruta.expression.list;
import java.util.ArrayList;
import java.util.List;
import org.apache.uima.cas.Type;
-import org.apache.uima.textmarker.TextMarkerStatement;
-import org.apache.uima.textmarker.expression.type.TypeExpression;
+import org.apache.uima.ruta.RutaStatement;
+import org.apache.uima.ruta.expression.type.TypeExpression;
public class SimpleTypeListExpression extends TypeListExpression {
@@ -36,7 +36,7 @@ public class SimpleTypeListExpression ex
}
@Override
- public List<Type> getList(TextMarkerStatement parent) {
+ public List<Type> getList(RutaStatement parent) {
List<Type> result = new ArrayList<Type>();
for (TypeExpression each : list) {
result.add(each.getType(parent));
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/StringListExpression.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/StringListExpression.java?rev=1477065&r1=1477064&r2=1477065&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/StringListExpression.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/StringListExpression.java Mon Apr 29 13:43:39 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.textmarker.expression.list;
+package org.apache.uima.ruta.expression.list;
public abstract class StringListExpression extends ListExpression<String> {
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/TypeListExpression.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/TypeListExpression.java?rev=1477065&r1=1477064&r2=1477065&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/TypeListExpression.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/list/TypeListExpression.java Mon Apr 29 13:43:39 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.textmarker.expression.list;
+package org.apache.uima.ruta.expression.list;
import org.apache.uima.cas.Type;
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/number/AbstractNumberExpression.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/number/AbstractNumberExpression.java?rev=1477065&r1=1477064&r2=1477065&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/number/AbstractNumberExpression.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/number/AbstractNumberExpression.java Mon Apr 29 13:43:39 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.textmarker.expression.number;
+package org.apache.uima.ruta.expression.number;
public abstract class AbstractNumberExpression extends NumberExpression {
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/number/ComposedNumberExpression.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/number/ComposedNumberExpression.java?rev=1477065&r1=1477064&r2=1477065&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/number/ComposedNumberExpression.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/number/ComposedNumberExpression.java Mon Apr 29 13:43:39 2013
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.uima.textmarker.expression.number;
+package org.apache.uima.ruta.expression.number;
import java.util.List;
-import org.apache.uima.textmarker.TextMarkerStatement;
+import org.apache.uima.ruta.RutaStatement;
public class ComposedNumberExpression extends AbstractNumberExpression {
@@ -37,7 +37,7 @@ public class ComposedNumberExpression ex
}
@Override
- public double getDoubleValue(TextMarkerStatement parent) {
+ public double getDoubleValue(RutaStatement parent) {
NumberExpression numberExpression = getExpressions().get(0);
if (numberExpression == null) {
return 0;
@@ -54,7 +54,7 @@ public class ComposedNumberExpression ex
}
@Override
- public float getFloatValue(TextMarkerStatement parent) {
+ public float getFloatValue(RutaStatement parent) {
NumberExpression numberExpression = getExpressions().get(0);
if (numberExpression == null) {
return 0;
@@ -71,7 +71,7 @@ public class ComposedNumberExpression ex
}
@Override
- public int getIntegerValue(TextMarkerStatement parent) {
+ public int getIntegerValue(RutaStatement parent) {
int result = getExpressions().get(0).getIntegerValue(parent);
for (int i = 0; i < getOperators().size(); i++) {
int second = 0;
@@ -84,7 +84,7 @@ public class ComposedNumberExpression ex
}
@Override
- public String getStringValue(TextMarkerStatement parent) {
+ public String getStringValue(RutaStatement parent) {
return "" + getDoubleValue(parent);
}
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/number/NegativeNumberExpression.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/number/NegativeNumberExpression.java?rev=1477065&r1=1477064&r2=1477065&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/number/NegativeNumberExpression.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/number/NegativeNumberExpression.java Mon Apr 29 13:43:39 2013
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.uima.textmarker.expression.number;
+package org.apache.uima.ruta.expression.number;
-import org.apache.uima.textmarker.TextMarkerStatement;
+import org.apache.uima.ruta.RutaStatement;
public class NegativeNumberExpression extends NumberExpression {
@@ -31,22 +31,22 @@ public class NegativeNumberExpression ex
}
@Override
- public double getDoubleValue(TextMarkerStatement parent) {
+ public double getDoubleValue(RutaStatement parent) {
return -ne.getDoubleValue(parent);
}
@Override
- public float getFloatValue(TextMarkerStatement parent) {
+ public float getFloatValue(RutaStatement parent) {
return -ne.getFloatValue(parent);
}
@Override
- public int getIntegerValue(TextMarkerStatement parent) {
+ public int getIntegerValue(RutaStatement parent) {
return -ne.getIntegerValue(parent);
}
@Override
- public String getStringValue(TextMarkerStatement parent) {
+ public String getStringValue(RutaStatement parent) {
return "-" + ne.getStringValue(parent);
}
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/number/NumberExpression.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/number/NumberExpression.java?rev=1477065&r1=1477064&r2=1477065&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/number/NumberExpression.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/number/NumberExpression.java Mon Apr 29 13:43:39 2013
@@ -17,17 +17,17 @@
* under the License.
*/
-package org.apache.uima.textmarker.expression.number;
+package org.apache.uima.ruta.expression.number;
-import org.apache.uima.textmarker.TextMarkerStatement;
-import org.apache.uima.textmarker.expression.string.StringExpression;
+import org.apache.uima.ruta.RutaStatement;
+import org.apache.uima.ruta.expression.string.StringExpression;
public abstract class NumberExpression extends StringExpression {
- public abstract int getIntegerValue(TextMarkerStatement parent);
+ public abstract int getIntegerValue(RutaStatement parent);
- public abstract double getDoubleValue(TextMarkerStatement parent);
+ public abstract double getDoubleValue(RutaStatement parent);
- public abstract float getFloatValue(TextMarkerStatement parent);
+ public abstract float getFloatValue(RutaStatement parent);
}
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/number/NumberFunctionExpression.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/number/NumberFunctionExpression.java?rev=1477065&r1=1477064&r2=1477065&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/number/NumberFunctionExpression.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/number/NumberFunctionExpression.java Mon Apr 29 13:43:39 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.textmarker.expression.number;
+package org.apache.uima.ruta.expression.number;
public abstract class NumberFunctionExpression extends NumberExpression {
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/number/ReferenceNumberExpression.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/number/ReferenceNumberExpression.java?rev=1477065&r1=1477064&r2=1477065&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/number/ReferenceNumberExpression.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/number/ReferenceNumberExpression.java Mon Apr 29 13:43:39 2013
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.uima.textmarker.expression.number;
+package org.apache.uima.ruta.expression.number;
-import org.apache.uima.textmarker.TextMarkerStatement;
+import org.apache.uima.ruta.RutaStatement;
public class ReferenceNumberExpression extends NumberExpression {
@@ -31,7 +31,7 @@ public class ReferenceNumberExpression e
}
@Override
- public double getDoubleValue(TextMarkerStatement parent) {
+ public double getDoubleValue(RutaStatement parent) {
Object value = parent.getEnvironment().getVariableValue(getVar());
double variableValue = 0;
if (value instanceof Number) {
@@ -41,7 +41,7 @@ public class ReferenceNumberExpression e
}
@Override
- public float getFloatValue(TextMarkerStatement parent) {
+ public float getFloatValue(RutaStatement parent) {
Object value = parent.getEnvironment().getVariableValue(getVar());
float variableValue = 0;
if (value instanceof Number) {
@@ -51,7 +51,7 @@ public class ReferenceNumberExpression e
}
@Override
- public int getIntegerValue(TextMarkerStatement parent) {
+ public int getIntegerValue(RutaStatement parent) {
Object value = parent.getEnvironment().getVariableValue(getVar());
int variableValue = 0;
if (value instanceof Number) {
@@ -61,7 +61,7 @@ public class ReferenceNumberExpression e
}
@Override
- public String getStringValue(TextMarkerStatement parent) {
+ public String getStringValue(RutaStatement parent) {
Class<?> variableType = parent.getEnvironment().getVariableType(getVar());
if (variableType.equals(Integer.class)) {
return "" + getIntegerValue(parent);
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/number/SimpleNumberExpression.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/number/SimpleNumberExpression.java?rev=1477065&r1=1477064&r2=1477065&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/number/SimpleNumberExpression.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/number/SimpleNumberExpression.java Mon Apr 29 13:43:39 2013
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.uima.textmarker.expression.number;
+package org.apache.uima.ruta.expression.number;
-import org.apache.uima.textmarker.TextMarkerStatement;
+import org.apache.uima.ruta.RutaStatement;
public class SimpleNumberExpression extends NumberExpression {
@@ -31,17 +31,17 @@ public class SimpleNumberExpression exte
}
@Override
- public double getDoubleValue(TextMarkerStatement parent) {
+ public double getDoubleValue(RutaStatement parent) {
return number.doubleValue();
}
@Override
- public float getFloatValue(TextMarkerStatement parent) {
+ public float getFloatValue(RutaStatement parent) {
return number.floatValue();
}
@Override
- public int getIntegerValue(TextMarkerStatement parent) {
+ public int getIntegerValue(RutaStatement parent) {
return number.intValue();
}
@@ -50,7 +50,7 @@ public class SimpleNumberExpression exte
}
@Override
- public String getStringValue(TextMarkerStatement parent) {
+ public String getStringValue(RutaStatement parent) {
boolean floating = number.intValue() != number.doubleValue();
if (floating) {
return "" + getDoubleValue(parent);
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/resource/LiteralWordListExpression.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/resource/LiteralWordListExpression.java?rev=1477065&r1=1477064&r2=1477065&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/resource/LiteralWordListExpression.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/resource/LiteralWordListExpression.java Mon Apr 29 13:43:39 2013
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.uima.textmarker.expression.resource;
+package org.apache.uima.ruta.expression.resource;
-import org.apache.uima.textmarker.TextMarkerStatement;
-import org.apache.uima.textmarker.resource.TextMarkerWordList;
+import org.apache.uima.ruta.RutaStatement;
+import org.apache.uima.ruta.resource.RutaWordList;
public class LiteralWordListExpression extends WordListExpression {
@@ -40,8 +40,8 @@ public class LiteralWordListExpression e
}
@Override
- public TextMarkerWordList getList(TextMarkerStatement element) {
- TextMarkerWordList list = element.getEnvironment().getWordList(getText());
+ public RutaWordList getList(RutaStatement element) {
+ RutaWordList list = element.getEnvironment().getWordList(getText());
return list;
}
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/resource/LiteralWordTableExpression.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/resource/LiteralWordTableExpression.java?rev=1477065&r1=1477064&r2=1477065&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/resource/LiteralWordTableExpression.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/resource/LiteralWordTableExpression.java Mon Apr 29 13:43:39 2013
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.uima.textmarker.expression.resource;
+package org.apache.uima.ruta.expression.resource;
-import org.apache.uima.textmarker.TextMarkerStatement;
-import org.apache.uima.textmarker.resource.TextMarkerTable;
+import org.apache.uima.ruta.RutaStatement;
+import org.apache.uima.ruta.resource.RutaTable;
public class LiteralWordTableExpression extends WordTableExpression {
@@ -40,8 +40,8 @@ public class LiteralWordTableExpression
}
@Override
- public TextMarkerTable getTable(TextMarkerStatement element) {
- TextMarkerTable table = element.getEnvironment().getWordTable(getText());
+ public RutaTable getTable(RutaStatement element) {
+ RutaTable table = element.getEnvironment().getWordTable(getText());
return table;
}
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/resource/ReferenceWordListExpression.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/resource/ReferenceWordListExpression.java?rev=1477065&r1=1477064&r2=1477065&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/resource/ReferenceWordListExpression.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/resource/ReferenceWordListExpression.java Mon Apr 29 13:43:39 2013
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.uima.textmarker.expression.resource;
+package org.apache.uima.ruta.expression.resource;
-import org.apache.uima.textmarker.TextMarkerStatement;
-import org.apache.uima.textmarker.resource.TextMarkerWordList;
+import org.apache.uima.ruta.RutaStatement;
+import org.apache.uima.ruta.resource.RutaWordList;
public class ReferenceWordListExpression extends WordListExpression {
@@ -32,8 +32,8 @@ public class ReferenceWordListExpression
}
@Override
- public TextMarkerWordList getList(TextMarkerStatement element) {
- return element.getEnvironment().getVariableValue(ref, TextMarkerWordList.class);
+ public RutaWordList getList(RutaStatement element) {
+ return element.getEnvironment().getVariableValue(ref, RutaWordList.class);
}
public String getRef() {
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/resource/ReferenceWordTableExpression.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/resource/ReferenceWordTableExpression.java?rev=1477065&r1=1477064&r2=1477065&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/resource/ReferenceWordTableExpression.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/resource/ReferenceWordTableExpression.java Mon Apr 29 13:43:39 2013
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.uima.textmarker.expression.resource;
+package org.apache.uima.ruta.expression.resource;
-import org.apache.uima.textmarker.TextMarkerStatement;
-import org.apache.uima.textmarker.resource.TextMarkerTable;
+import org.apache.uima.ruta.RutaStatement;
+import org.apache.uima.ruta.resource.RutaTable;
public class ReferenceWordTableExpression extends WordTableExpression {
@@ -32,8 +32,8 @@ public class ReferenceWordTableExpressio
}
@Override
- public TextMarkerTable getTable(TextMarkerStatement element) {
- return element.getEnvironment().getVariableValue(ref, TextMarkerTable.class);
+ public RutaTable getTable(RutaStatement element) {
+ return element.getEnvironment().getVariableValue(ref, RutaTable.class);
}
public String getRef() {
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/resource/WordListExpression.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/resource/WordListExpression.java?rev=1477065&r1=1477064&r2=1477065&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/resource/WordListExpression.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/resource/WordListExpression.java Mon Apr 29 13:43:39 2013
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.apache.uima.textmarker.expression.resource;
+package org.apache.uima.ruta.expression.resource;
-import org.apache.uima.textmarker.TextMarkerStatement;
-import org.apache.uima.textmarker.expression.TextMarkerExpression;
-import org.apache.uima.textmarker.resource.TextMarkerWordList;
+import org.apache.uima.ruta.RutaStatement;
+import org.apache.uima.ruta.expression.RutaExpression;
+import org.apache.uima.ruta.resource.RutaWordList;
-public abstract class WordListExpression extends TextMarkerExpression {
+public abstract class WordListExpression extends RutaExpression {
- public abstract TextMarkerWordList getList(TextMarkerStatement element);
+ public abstract RutaWordList getList(RutaStatement element);
}
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/resource/WordTableExpression.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/resource/WordTableExpression.java?rev=1477065&r1=1477064&r2=1477065&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/resource/WordTableExpression.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/resource/WordTableExpression.java Mon Apr 29 13:43:39 2013
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.apache.uima.textmarker.expression.resource;
+package org.apache.uima.ruta.expression.resource;
-import org.apache.uima.textmarker.TextMarkerStatement;
-import org.apache.uima.textmarker.expression.TextMarkerExpression;
-import org.apache.uima.textmarker.resource.TextMarkerTable;
+import org.apache.uima.ruta.RutaStatement;
+import org.apache.uima.ruta.expression.RutaExpression;
+import org.apache.uima.ruta.resource.RutaTable;
-public abstract class WordTableExpression extends TextMarkerExpression {
+public abstract class WordTableExpression extends RutaExpression {
- public abstract TextMarkerTable getTable(TextMarkerStatement element);
+ public abstract RutaTable getTable(RutaStatement element);
}
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/string/ComposedStringExpression.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/string/ComposedStringExpression.java?rev=1477065&r1=1477064&r2=1477065&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/string/ComposedStringExpression.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/string/ComposedStringExpression.java Mon Apr 29 13:43:39 2013
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.uima.textmarker.expression.string;
+package org.apache.uima.ruta.expression.string;
import java.util.List;
-import org.apache.uima.textmarker.TextMarkerStatement;
+import org.apache.uima.ruta.RutaStatement;
public class ComposedStringExpression extends LiteralStringExpression {
@@ -34,7 +34,7 @@ public class ComposedStringExpression ex
}
@Override
- public String getStringValue(TextMarkerStatement parent) {
+ public String getStringValue(RutaStatement parent) {
StringBuilder result = new StringBuilder();
for (StringExpression each : getExpressions()) {
result.append(each.getStringValue(parent));
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/string/LiteralStringExpression.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/string/LiteralStringExpression.java?rev=1477065&r1=1477064&r2=1477065&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/string/LiteralStringExpression.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/string/LiteralStringExpression.java Mon Apr 29 13:43:39 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.textmarker.expression.string;
+package org.apache.uima.ruta.expression.string;
public abstract class LiteralStringExpression extends StringExpression {
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/string/ReferenceStringExpression.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/string/ReferenceStringExpression.java?rev=1477065&r1=1477064&r2=1477065&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/string/ReferenceStringExpression.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/string/ReferenceStringExpression.java Mon Apr 29 13:43:39 2013
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.uima.textmarker.expression.string;
+package org.apache.uima.ruta.expression.string;
-import org.apache.uima.textmarker.TextMarkerStatement;
+import org.apache.uima.ruta.RutaStatement;
public class ReferenceStringExpression extends LiteralStringExpression {
@@ -31,7 +31,7 @@ public class ReferenceStringExpression e
}
@Override
- public String getStringValue(TextMarkerStatement parent) {
+ public String getStringValue(RutaStatement parent) {
String variableValue = parent.getEnvironment().getVariableValue(getVar(), String.class);
return variableValue;
}
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/string/RemoveFunction.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/string/RemoveFunction.java?rev=1477065&r1=1477064&r2=1477065&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/string/RemoveFunction.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/string/RemoveFunction.java Mon Apr 29 13:43:39 2013
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.uima.textmarker.expression.string;
+package org.apache.uima.ruta.expression.string;
import java.util.List;
-import org.apache.uima.textmarker.TextMarkerStatement;
+import org.apache.uima.ruta.RutaStatement;
public class RemoveFunction extends StringFunctionExpression {
@@ -37,7 +37,7 @@ public class RemoveFunction extends Stri
}
@Override
- public String getStringValue(TextMarkerStatement parent) {
+ public String getStringValue(RutaStatement parent) {
StringBuilder result = new StringBuilder();
String value = parent.getEnvironment().getVariableValue(var, String.class);
for (StringExpression each : list) {
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/string/SimpleStringExpression.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/string/SimpleStringExpression.java?rev=1477065&r1=1477064&r2=1477065&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/string/SimpleStringExpression.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/string/SimpleStringExpression.java Mon Apr 29 13:43:39 2013
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.uima.textmarker.expression.string;
+package org.apache.uima.ruta.expression.string;
-import org.apache.uima.textmarker.TextMarkerStatement;
+import org.apache.uima.ruta.RutaStatement;
public class SimpleStringExpression extends LiteralStringExpression {
@@ -39,7 +39,7 @@ public class SimpleStringExpression exte
}
@Override
- public String getStringValue(TextMarkerStatement parent) {
+ public String getStringValue(RutaStatement parent) {
return getValue();
}
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/string/StringExpression.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/string/StringExpression.java?rev=1477065&r1=1477064&r2=1477065&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/string/StringExpression.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/string/StringExpression.java Mon Apr 29 13:43:39 2013
@@ -17,13 +17,13 @@
* under the License.
*/
-package org.apache.uima.textmarker.expression.string;
+package org.apache.uima.ruta.expression.string;
-import org.apache.uima.textmarker.TextMarkerStatement;
-import org.apache.uima.textmarker.expression.TextMarkerExpression;
+import org.apache.uima.ruta.RutaStatement;
+import org.apache.uima.ruta.expression.RutaExpression;
-public abstract class StringExpression extends TextMarkerExpression {
+public abstract class StringExpression extends RutaExpression {
- public abstract String getStringValue(TextMarkerStatement parent);
+ public abstract String getStringValue(RutaStatement parent);
}
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/string/StringFunctionExpression.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/string/StringFunctionExpression.java?rev=1477065&r1=1477064&r2=1477065&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/string/StringFunctionExpression.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/string/StringFunctionExpression.java Mon Apr 29 13:43:39 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.textmarker.expression.string;
+package org.apache.uima.ruta.expression.string;
public abstract class StringFunctionExpression extends StringExpression {
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/string/StringFunctionFactory.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/string/StringFunctionFactory.java?rev=1477065&r1=1477064&r2=1477065&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/string/StringFunctionFactory.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/string/StringFunctionFactory.java Mon Apr 29 13:43:39 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.textmarker.expression.string;
+package org.apache.uima.ruta.expression.string;
import java.util.List;
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/type/ReferenceTypeExpression.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/type/ReferenceTypeExpression.java?rev=1477065&r1=1477064&r2=1477065&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/type/ReferenceTypeExpression.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/type/ReferenceTypeExpression.java Mon Apr 29 13:43:39 2013
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.uima.textmarker.expression.type;
+package org.apache.uima.ruta.expression.type;
import org.apache.uima.cas.Type;
-import org.apache.uima.textmarker.TextMarkerStatement;
+import org.apache.uima.ruta.RutaStatement;
public class ReferenceTypeExpression extends TypeExpression {
@@ -41,12 +41,12 @@ public class ReferenceTypeExpression ext
}
@Override
- public Type getType(TextMarkerStatement parent) {
+ public Type getType(RutaStatement parent) {
return parent.getEnvironment().getVariableValue(var, Type.class);
}
@Override
- public String getStringValue(TextMarkerStatement parent) {
+ public String getStringValue(RutaStatement parent) {
Type type = getType(parent);
return type != null ? type.getName() : "null";
}
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/type/SimpleTypeExpression.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/type/SimpleTypeExpression.java?rev=1477065&r1=1477064&r2=1477065&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/type/SimpleTypeExpression.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/type/SimpleTypeExpression.java Mon Apr 29 13:43:39 2013
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.uima.textmarker.expression.type;
+package org.apache.uima.ruta.expression.type;
import org.apache.uima.cas.Type;
-import org.apache.uima.textmarker.TextMarkerStatement;
+import org.apache.uima.ruta.RutaStatement;
public class SimpleTypeExpression extends TypeExpression {
@@ -32,7 +32,7 @@ public class SimpleTypeExpression extend
}
@Override
- public Type getType(TextMarkerStatement parent) {
+ public Type getType(RutaStatement parent) {
return parent.getEnvironment().getType(typeString);
}
@@ -42,7 +42,7 @@ public class SimpleTypeExpression extend
}
@Override
- public String getStringValue(TextMarkerStatement parent) {
+ public String getStringValue(RutaStatement parent) {
return typeString;
}
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/type/TypeExpression.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/type/TypeExpression.java?rev=1477065&r1=1477064&r2=1477065&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/type/TypeExpression.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/type/TypeExpression.java Mon Apr 29 13:43:39 2013
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.apache.uima.textmarker.expression.type;
+package org.apache.uima.ruta.expression.type;
import org.apache.uima.cas.Type;
-import org.apache.uima.textmarker.TextMarkerStatement;
-import org.apache.uima.textmarker.expression.string.StringExpression;
+import org.apache.uima.ruta.RutaStatement;
+import org.apache.uima.ruta.expression.string.StringExpression;
public abstract class TypeExpression extends StringExpression {
- public abstract Type getType(TextMarkerStatement parent);
+ public abstract Type getType(RutaStatement parent);
}
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/type/TypeFunctionExpression.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/type/TypeFunctionExpression.java?rev=1477065&r1=1477064&r2=1477065&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/type/TypeFunctionExpression.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/type/TypeFunctionExpression.java Mon Apr 29 13:43:39 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.textmarker.expression.type;
+package org.apache.uima.ruta.expression.type;
public abstract class TypeFunctionExpression extends TypeExpression {