svn commit: r1783085 - /uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/feature/SimpleFeatureExpression.java

[pkluegl]

Author: pkluegl
Date: Wed Feb 15 09:53:44 2017
New Revision: 1783085

URL: http://svn.apache.org/viewvc?rev=1783085&view=rev
Log:
no jira - guess type also for lists

Modified:
    
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/feature/SimpleFeatureExpression.java

Modified: 
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/feature/SimpleFeatureExpression.java
URL: 
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/feature/SimpleFeatureExpression.java?rev=1783085&r1=1783084&r2=1783085&view=diff
==============================================================================
--- 
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/feature/SimpleFeatureExpression.java
 (original)
+++ 
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/feature/SimpleFeatureExpression.java
 Wed Feb 15 09:53:44 2017
@@ -118,15 +118,19 @@ public class SimpleFeatureExpression ext
   @Override
   public Type getInitialType(MatchContext context, RutaStream stream) {
     ITypeExpression typeExpression = mr.getTypeExpression(context, stream);
-    if (typeExpression != null) {
+    IAnnotationExpression annotationExpression = 
mr.getAnnotationExpression(context, stream);
+    IAnnotationExpression annotationListExpression = 
mr.getAnnotationExpression(context, stream);
+    if (typeExpression!= null) {
       return typeExpression.getType(context, stream);
-    } else {
-      IAnnotationExpression annotationExpression = 
mr.getAnnotationExpression(context, stream);
-      if (annotationExpression != null) {
+    } else if(annotationExpression != null) {
         AnnotationFS annotation = annotationExpression.getAnnotation(context, 
stream);
         if (annotation != null) {
           return annotation.getType();
         }
+    } else if(annotationListExpression != null) {
+      AnnotationFS annotation = 
annotationListExpression.getAnnotation(context, stream);
+      if (annotation != null) {
+        return annotation.getType();
       }
     }
     return null;