svn commit: r1342619 - in /uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker: action/TransferAction.java rule/RuleMatch.java

[pkluegl]

Author: pkluegl
Date: Fri May 25 13:35:19 2012
New Revision: 1342619

URL: http://svn.apache.org/viewvc?rev=1342619&view=rev
Log:
UIMA-2411
deleted empty method and fixed TRANSFER action

Modified:
    
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/action/TransferAction.java
    
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/rule/RuleMatch.java

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/action/TransferAction.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/action/TransferAction.java?rev=1342619&r1=1342618&r2=1342619&view=diff
==============================================================================
--- 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/action/TransferAction.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/action/TransferAction.java
 Fri May 25 13:35:19 2012
@@ -42,18 +42,20 @@ public class TransferAction extends Type
   @Override
   public void execute(RuleMatch match, RuleElement element, TextMarkerStream 
stream,
           InferenceCrowd crowd) {
-    List<RuleElementMatch> list = match.getMatchInfos().get(element);
+    List<List<RuleElementMatch>> list = match.getMatchInfo(element);
     CAS cas = stream.getCas();
     Type t = type.getType(element.getParent());
-    for (RuleElementMatch each : list) {
-      List<AnnotationFS> matched = each.getTextsMatched();
-      for (AnnotationFS annotationFS : matched) {
-        FeatureStructure createFS = cas.createFS(t);
-        copyFeatures(annotationFS, createFS, cas);
-        if (createFS instanceof AnnotationFS) {
-          stream.addAnnotation((AnnotationFS) createFS);
+    for (List<RuleElementMatch> eachList : list) {
+      for (RuleElementMatch each : eachList) {
+        List<AnnotationFS> matched = each.getTextsMatched();
+        for (AnnotationFS annotationFS : matched) {
+          FeatureStructure createFS = cas.createFS(t);
+          copyFeatures(annotationFS, createFS, cas);
+          if (createFS instanceof AnnotationFS) {
+            stream.addAnnotation((AnnotationFS) createFS);
+          }
+          cas.addFsToIndexes(createFS);
         }
-        cas.addFsToIndexes(createFS);
       }
     }
 

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/rule/RuleMatch.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/rule/RuleMatch.java?rev=1342619&r1=1342618&r2=1342619&view=diff
==============================================================================
--- 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/rule/RuleMatch.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/rule/RuleMatch.java
 Fri May 25 13:35:19 2012
@@ -239,11 +239,6 @@ public class RuleMatch {
     this.rootMatch = rootMatch;
   }
 
-  public Map<RuleElement, List<RuleElementMatch>> getMatchInfos() {
-    assert (false);
-    return null;
-  }
-
   public List<List<RuleElementMatch>> getMatchInfo(RuleElement element) {
     return getMatchInfo(rootMatch, element);
   }