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 2013/08/05 15:44:06 UTC

svn commit: r1510476 - in /uima/sandbox/ruta/trunk: ruta-core/src/main/java/org/apache/uima/ruta/rule/RuleMatch.java ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/launching/RutaLauncher.java

Author: pkluegl
Date: Mon Aug  5 13:44:05 2013
New Revision: 1510476

URL: http://svn.apache.org/r1510476
Log:
no jira - use UTF-8 for default encoding, hotfix for optional matches

Modified:
    uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RuleMatch.java
    uima/sandbox/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/launching/RutaLauncher.java

Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RuleMatch.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RuleMatch.java?rev=1510476&r1=1510475&r2=1510476&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RuleMatch.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RuleMatch.java Mon Aug  5 13:44:05 2013
@@ -114,7 +114,10 @@ public class RuleMatch extends AbstractR
         if (list != null && list.size() == 1) {
           List<AnnotationFS> textsMatched = list.get(0).getTextsMatched();
           if (textsMatched.size() == 1) {
-            return textsMatched;
+            AnnotationFS firstNormal = getFirstNormal(textsMatched);
+            if (firstNormal != null) {
+              return textsMatched;
+            }
           }
         }
       }

Modified: uima/sandbox/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/launching/RutaLauncher.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/launching/RutaLauncher.java?rev=1510476&r1=1510475&r2=1510476&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/launching/RutaLauncher.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/launching/RutaLauncher.java Mon Aug  5 13:44:05 2013
@@ -53,7 +53,7 @@ public class RutaLauncher {
 
   private static boolean addSDI = false;
 
-  private static String inputEncoding = java.nio.charset.Charset.defaultCharset().name();
+  private static String inputEncoding = "UTF-8";
 
   private static String launchMode = "run";