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/02/13 21:21:51 UTC
svn commit: r1659662 - /uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/verbalize/ExpressionVerbalizer.java

Author: pkluegl
Date: Fri Feb 13 20:21:50 2015
New Revision: 1659662

URL: http://svn.apache.org/r1659662
Log:
UIMA-4240
- use match reference for verbalization

Modified:
    uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/verbalize/ExpressionVerbalizer.java

Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/verbalize/ExpressionVerbalizer.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/verbalize/ExpressionVerbalizer.java?rev=1659662&r1=1659661&r2=1659662&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/verbalize/ExpressionVerbalizer.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/verbalize/ExpressionVerbalizer.java Fri Feb 13 20:21:50 2015
@@ -33,6 +33,7 @@ import org.apache.uima.ruta.expression.b
 import org.apache.uima.ruta.expression.feature.FeatureExpression;
 import org.apache.uima.ruta.expression.feature.FeatureMatchExpression;
 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;
@@ -247,6 +248,9 @@ public class ExpressionVerbalizer {
   }
 
   public String verbalize(TypeExpression expression) {
+    if (expression == null) {
+      return null;
+    }
     if (expression instanceof SimpleTypeExpression) {
       SimpleTypeExpression e = (SimpleTypeExpression) expression;
       String type = e.getTypeString();
@@ -279,11 +283,18 @@ public class ExpressionVerbalizer {
 
   public String verbalize(FeatureExpression expression) {
     StringBuilder sb = new StringBuilder();
-    sb.append(verbalize(expression.getTypeExpr(null)));
-    List<String> list = expression.getFeatureStringList(null);
-    for (String string : list) {
-      sb.append(".");
-      sb.append(string);
+    if (expression instanceof SimpleFeatureExpression) {
+      SimpleFeatureExpression sfe = (SimpleFeatureExpression) expression;
+      sb.append(sfe.getMatchReference().getMatch());
+    } else {
+      sb.append(verbalize(expression.getTypeExpr(null)));
+      List<String> list = expression.getFeatureStringList(null);
+      if (list != null) {
+        for (String string : list) {
+          sb.append(".");
+          sb.append(string);
+        }
+      }
     }
     return sb.toString();
   }