svn commit: r1515480 - in /uima/sandbox/ruta/trunk: ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/validator/RutaVarRefChecker.java ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ConditionFactory.java

[pk...@apache.org]

Author: pkluegl
Date: Mon Aug 19 16:05:14 2013
New Revision: 1515480

URL: http://svn.apache.org/r1515480
Log:
UIMA-2428
- last improvements caused problems in validator, fixed

Modified:
    uima/sandbox/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/validator/RutaVarRefChecker.java
    uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ConditionFactory.java

Modified: uima/sandbox/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/validator/RutaVarRefChecker.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/validator/RutaVarRefChecker.java?rev=1515480&r1=1515479&r2=1515480&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/validator/RutaVarRefChecker.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/validator/RutaVarRefChecker.java Mon Aug 19 16:05:14 2013
@@ -89,6 +89,9 @@ import org.eclipse.dltk.core.builder.ISo
 public class RutaVarRefChecker implements IBuildParticipant, IBuildParticipantExtension {
 
   private class VarRefVisitor extends ASTVisitor {
+    
+    private final String implicitString = "Implicit";
+    
     private final Stack<Map<String, Integer>> knownLocalVariables;
 
     private Set<String> knownLocalTypeNames;
@@ -411,7 +414,7 @@ public class RutaVarRefChecker implement
         String[] keywords = RutaKeywordsManager.getKeywords(IRutaKeywords.ACTION);
         List<String> asList = Arrays.asList(keywords);
         if (!StringUtils.isEmpty(actionName) && !"-".equals(actionName)
-                && !asList.contains(actionName)) {
+                && !asList.contains(actionName) && !implicitString.equals(tma.getName())) {
           IProblem problem = problemFactory.createUnknownActionProblem(tma);
           rep.reportProblem(problem);
         }
@@ -485,7 +488,7 @@ public class RutaVarRefChecker implement
         String[] keywords = RutaKeywordsManager.getKeywords(IRutaKeywords.CONDITION);
         List<String> asList = Arrays.asList(keywords);
         if (!StringUtils.isEmpty(conditionName) && !"-".equals(conditionName)
-                && !asList.contains(conditionName)) {
+                && !asList.contains(conditionName) && !implicitString.equals(cond.getName())) {
           IProblem problem = problemFactory.createUnknownConditionProblem(cond);
           rep.reportProblem(problem);
         }

Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ConditionFactory.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ConditionFactory.java?rev=1515480&r1=1515479&r2=1515480&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ConditionFactory.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ConditionFactory.java Mon Aug 19 16:05:14 2013
@@ -76,6 +76,9 @@ public class ConditionFactory extends Ab
   }
 
   public static RutaCondition createEmptyCondition(Token token) {
+    if(token != null && token.getText().equals("->")) {
+      return null;
+    }
     int bounds[] = getBounds(token);
     return new RutaCondition(bounds[0], bounds[1], new ArrayList<Expression>(),
             RutaConditionConstants.CONSTANT_OFFSET, "", bounds[0], bounds[1]);