svn commit: r1713011 - in /uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/annotation: AbstractAnnotationExpression.java AnnotationVariableExpression.java IAnnotationExpression.java

[pk...@apache.org]

Author: pkluegl
Date: Fri Nov  6 18:22:39 2015
New Revision: 1713011

URL: http://svn.apache.org/viewvc?rev=1713011&view=rev
Log:
UIMA-4657
- added variable expression

Added:
    uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/annotation/AnnotationVariableExpression.java   (with props)
Modified:
    uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/annotation/AbstractAnnotationExpression.java
    uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/annotation/IAnnotationExpression.java

Modified: uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/annotation/AbstractAnnotationExpression.java
URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/annotation/AbstractAnnotationExpression.java?rev=1713011&r1=1713010&r2=1713011&view=diff
==============================================================================
--- uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/annotation/AbstractAnnotationExpression.java (original)
+++ uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/annotation/AbstractAnnotationExpression.java Fri Nov  6 18:22:39 2015
@@ -19,6 +19,16 @@
 
 package org.apache.uima.ruta.expression.annotation;
 
+import org.apache.uima.cas.text.AnnotationFS;
+import org.apache.uima.ruta.RutaStream;
+import org.apache.uima.ruta.rule.MatchContext;
+
 public abstract class AbstractAnnotationExpression implements IAnnotationExpression {
 
+  @Override
+  public String getStringValue(MatchContext context, RutaStream stream) {
+    AnnotationFS annotation = getAnnotation(context, stream);
+    return annotation.getCoveredText();
+  }
+  
 }

Added: uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/annotation/AnnotationVariableExpression.java
URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/annotation/AnnotationVariableExpression.java?rev=1713011&view=auto
==============================================================================
--- uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/annotation/AnnotationVariableExpression.java (added)
+++ uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/annotation/AnnotationVariableExpression.java Fri Nov  6 18:22:39 2015
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.uima.ruta.expression.annotation;
+
+import org.apache.uima.cas.text.AnnotationFS;
+import org.apache.uima.ruta.RutaBlock;
+import org.apache.uima.ruta.RutaStream;
+import org.apache.uima.ruta.rule.MatchContext;
+
+/**
+ * An expression referring to an annotation stored in a variable.
+ *
+ */
+public class AnnotationVariableExpression extends AbstractAnnotationExpression {
+
+private String var;
+  
+  public AnnotationVariableExpression(String var) {
+    super();
+    this.var = var;
+  }
+  
+  
+  @Override
+  public AnnotationFS getAnnotation(MatchContext context, RutaStream stream) {
+    RutaBlock parent = context.getParent();
+    AnnotationFS variableValue = parent.getEnvironment().getVariableValue(var, AnnotationFS.class);
+    return variableValue;
+  }
+
+
+  public String getVar() {
+    return var;
+  }
+
+}

Propchange: uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/annotation/AnnotationVariableExpression.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/annotation/IAnnotationExpression.java
URL: http://svn.apache.org/viewvc/uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/annotation/IAnnotationExpression.java?rev=1713011&r1=1713010&r2=1713011&view=diff
==============================================================================
--- uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/annotation/IAnnotationExpression.java (original)
+++ uima/ruta/branches/UIMA-4408/ruta-core/src/main/java/org/apache/uima/ruta/expression/annotation/IAnnotationExpression.java Fri Nov  6 18:22:39 2015
@@ -21,6 +21,7 @@ package org.apache.uima.ruta.expression.
 
 import org.apache.uima.cas.text.AnnotationFS;
 import org.apache.uima.ruta.RutaStream;
+import org.apache.uima.ruta.expression.string.IStringExpression;
 import org.apache.uima.ruta.rule.MatchContext;
 
 /**
@@ -28,7 +29,7 @@ import org.apache.uima.ruta.rule.MatchCo
  * annotations.
  *
  */
-public interface IAnnotationExpression {
+public interface IAnnotationExpression extends IStringExpression {
 
   AnnotationFS getAnnotation(MatchContext context, RutaStream stream);