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 2018/09/17 09:24:32 UTC

svn commit: r1841056 - in /uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta: ./ action/ expression/ expression/feature/ expression/type/

Author: pkluegl
Date: Mon Sep 17 09:24:31 2018
New Revision: 1841056

URL: http://svn.apache.org/viewvc?rev=1841056&view=rev
Log:
UIMA-5861 - applied patch

Modified:
    uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java
    uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/SetFeatureAction.java
    uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/MatchReference.java
    uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/feature/SimpleFeatureExpression.java
    uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/type/SimpleTypeExpression.java
    uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/type/TypeListVariableExpression.java
    uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/type/TypeVariableExpression.java

Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java?rev=1841056&r1=1841055&r2=1841056&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java Mon Sep 17 09:24:31 2018
@@ -967,7 +967,8 @@ public class RutaStream extends FSIterat
       Feature feature = type.getFeatureByBaseName(featureName);
       if (feature == null) {
         throw new IllegalArgumentException("Not able to assign feature value for feature '"
-                + featureName + "'. Feature is not defined for type '" + type.getName() + "'");
+                + featureName + "'. Feature is not defined for type '" + type.getName() + "'" 
+                + " in script " +context.getParent().getName());
       }
       assignFeatureValue(annotation, feature, value, context);
     }
@@ -976,7 +977,7 @@ public class RutaStream extends FSIterat
   public void assignFeatureValue(FeatureStructure annotation, Feature feature,
           IRutaExpression value, MatchContext context) {
     if (feature == null) {
-      throw new IllegalArgumentException("Not able to assign feature value (e.g., coveredText).");
+      throw new IllegalArgumentException("Not able to assign feature value (e.g., coveredText) in script " +context.getParent().getName());
     }
     CAS cas = annotation.getCAS();
     Type range = feature.getRange();

Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/SetFeatureAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/SetFeatureAction.java?rev=1841056&r1=1841055&r2=1841056&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/SetFeatureAction.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/SetFeatureAction.java Mon Sep 17 09:24:31 2018
@@ -61,7 +61,7 @@ public class SetFeatureAction extends Ab
         stream.assignFeatureValue(annotationFS, feature, expr, context);
         stream.getCas().addFsToIndexes(annotationFS);
       } else {
-        throw new IllegalArgumentException("Not able to assign feature value (e.g., coveredText).");
+        throw new IllegalArgumentException("Not able to assign feature value (e.g., coveredText) in script "+context.getParent().getName());
       }
     }
   }

Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/MatchReference.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/MatchReference.java?rev=1841056&r1=1841055&r2=1841056&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/MatchReference.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/MatchReference.java Mon Sep 17 09:24:31 2018
@@ -130,7 +130,8 @@ public class MatchReference extends Ruta
     if (typeExpression == null && annotationExpression == null
             && annotationListExpression == null) {
       throw new IllegalArgumentException(
-              "Not able to resolve annotation/type expression: " + reference);
+              "Not able to resolve annotation/type expression: " + reference + 
+              " in script " +context.getParent().getName());
     }
   }
 

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=1841056&r1=1841055&r2=1841056&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 Mon Sep 17 09:24:31 2018
@@ -81,7 +81,8 @@ public class SimpleFeatureExpression ext
           feature = new IndexedFeature(delegate, indexedReference.index);
         } else {
           throw new IllegalArgumentException(
-                  "Not able to access feature " + each + " of type " + type.getName());
+                  "Not able to access feature " + each + " of type " + type.getName() + 
+                  "in script " + context.getParent().getName());
         }
       } else if (StringUtils.equals(each, UIMAConstants.FEATURE_COVERED_TEXT)
               || StringUtils.equals(each, UIMAConstants.FEATURE_COVERED_TEXT_SHORT)) {

Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/type/SimpleTypeExpression.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/type/SimpleTypeExpression.java?rev=1841056&r1=1841055&r2=1841056&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/type/SimpleTypeExpression.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/type/SimpleTypeExpression.java Mon Sep 17 09:24:31 2018
@@ -45,7 +45,8 @@ public class SimpleTypeExpression extend
     RutaBlock parent = context.getParent();
     Type type = parent.getEnvironment().getType(typeString);
     if (type == null) {
-      throw new IllegalArgumentException("Not able to resolve type: " + typeString);
+      throw new IllegalArgumentException("Not able to resolve type: " + typeString +
+              " in script "+context.getParent().getName());
     }
     return type;
   }

Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/type/TypeListVariableExpression.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/type/TypeListVariableExpression.java?rev=1841056&r1=1841055&r2=1841056&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/type/TypeListVariableExpression.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/type/TypeListVariableExpression.java Mon Sep 17 09:24:31 2018
@@ -52,7 +52,8 @@ public class TypeListVariableExpression
         if(type != null) {
           result.add(type);
         } else {
-          throw new IllegalArgumentException("Not able to resolve type: " + each);
+          throw new IllegalArgumentException("Not able to resolve type: " + each + 
+                  " in script " +context.getParent().getName());
         }
       }
     }

Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/type/TypeVariableExpression.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/type/TypeVariableExpression.java?rev=1841056&r1=1841055&r2=1841056&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/type/TypeVariableExpression.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/type/TypeVariableExpression.java Mon Sep 17 09:24:31 2018
@@ -54,7 +54,8 @@ public class TypeVariableExpression exte
     RutaBlock parent = context.getParent();
     Type type = parent.getEnvironment().getVariableValue(var, Type.class, stream);
     if (type == null) {
-      throw new IllegalArgumentException("Not able to resolve type variable: " + var);
+      throw new IllegalArgumentException("Not able to resolve type variable: " + var + 
+              " in script " +context.getParent().getName());
     }
     return type;
   }