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 2012/11/26 15:21:17 UTC
svn commit: r1413639 -
/uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/verbalize/ConditionVerbalizer.java
Author: pkluegl
Date: Mon Nov 26 14:21:16 2012
New Revision: 1413639
URL: http://svn.apache.org/viewvc?rev=1413639&view=rev
Log:
no jira
- fixed some verbalizations of arguments of condition, which can also handle lists of types
Modified:
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/verbalize/ConditionVerbalizer.java
Modified: uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/verbalize/ConditionVerbalizer.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/verbalize/ConditionVerbalizer.java?rev=1413639&r1=1413638&r2=1413639&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/verbalize/ConditionVerbalizer.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/verbalize/ConditionVerbalizer.java Mon Nov 26 14:21:16 2012
@@ -317,7 +317,11 @@ public class ConditionVerbalizer {
}
} else if (condition instanceof PartOfNeqCondition) {
PartOfNeqCondition c = (PartOfNeqCondition) condition;
- return "PARTOFNEQ(" + verbalizer.verbalize(c.getType()) + ")";
+ if (c.getType() == null) {
+ return "PARTOFNEQ(" + verbalizer.verbalize(c.getList()) + ")";
+ } else {
+ return "PARTOFNEQ(" + verbalizer.verbalize(c.getType()) + ")";
+ }
} else if (condition instanceof PositionCondition) {
PositionCondition c = (PositionCondition) condition;
String relative = "";
@@ -379,27 +383,52 @@ public class ConditionVerbalizer {
} else if (condition instanceof IsCondition) {
IsCondition c = (IsCondition) condition;
String name = "IS(";
- String type = verbalizer.verbalize(c.getType());
+ String type = "";
+ if(c.getType()!= null) {
+ type = verbalizer.verbalize(c.getType());
+ } else {
+ type = verbalizer.verbalize(c.getList());
+ }
return name + type + ")";
} else if (condition instanceof BeforeCondition) {
BeforeCondition c = (BeforeCondition) condition;
String name = "BEFORE(";
- String type = verbalizer.verbalize(c.getType());
+ String type = "";
+ if(c.getType()!= null) {
+ type = verbalizer.verbalize(c.getType());
+ } else {
+ type = verbalizer.verbalize(c.getList());
+ }
return name + type + ")";
} else if (condition instanceof AfterCondition) {
AfterCondition c = (AfterCondition) condition;
String name = "AFTER(";
- String type = verbalizer.verbalize(c.getType());
+ String type = "";
+ if(c.getType()!= null) {
+ type = verbalizer.verbalize(c.getType());
+ } else {
+ type = verbalizer.verbalize(c.getList());
+ }
return name + type + ")";
} else if (condition instanceof StartsWithCondition) {
StartsWithCondition c = (StartsWithCondition) condition;
String name = "STARTSWITH(";
- String type = verbalizer.verbalize(c.getType());
- return name + type + ")";
+ String arg = "";
+ if(c.getType() != null) {
+ arg = verbalizer.verbalize(c.getType());
+ } else {
+ arg = verbalizer.verbalize(c.getList());
+ }
+ return name + arg + ")";
} else if (condition instanceof EndsWithCondition) {
EndsWithCondition c = (EndsWithCondition) condition;
String name = "ENDSWITH(";
- String type = verbalizer.verbalize(c.getType());
+ String type = "";
+ if(c.getType()!= null) {
+ type = verbalizer.verbalize(c.getType());
+ } else {
+ type = verbalizer.verbalize(c.getList());
+ }
return name + type + ")";
} else if (condition instanceof SizeCondition) {
SizeCondition c = (SizeCondition) condition;