svn commit: r1763598 - in /uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/validator: LanguageCheckerVisitor.java RutaCheckerDefaultProblem.java RutaCheckerProblemFactory.java RutaCheckerUtils.java

[pk...@apache.org]

Author: pkluegl
Date: Thu Oct  6 14:52:54 2016
New Revision: 1763598

URL: http://svn.apache.org/viewvc?rev=1763598&view=rev
Log:
UIMA-5128
- ignore labels
- avoid some warnings

Modified:
    uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/validator/LanguageCheckerVisitor.java
    uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/validator/RutaCheckerDefaultProblem.java
    uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/validator/RutaCheckerProblemFactory.java
    uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/validator/RutaCheckerUtils.java

Modified: uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/validator/LanguageCheckerVisitor.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/validator/LanguageCheckerVisitor.java?rev=1763598&r1=1763597&r2=1763598&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/validator/LanguageCheckerVisitor.java (original)
+++ uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/validator/LanguageCheckerVisitor.java Thu Oct  6 14:52:54 2016
@@ -897,7 +897,7 @@ public class LanguageCheckerVisitor exte
     String bref = featText.substring(0, firstIndexOf);
     String aref = featText.substring(0, lastIndexOf);
     String fref = featText.substring(lastIndexOf + 1, featText.length());
-    if (currentLabels.contains(aref)) {
+    if (currentLabels.contains(aref) || currentLabels.contains(bref)) {
       return;
     }
     String match = isFeatureMatch(aref);

Modified: uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/validator/RutaCheckerDefaultProblem.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/validator/RutaCheckerDefaultProblem.java?rev=1763598&r1=1763597&r2=1763598&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/validator/RutaCheckerDefaultProblem.java (original)
+++ uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/validator/RutaCheckerDefaultProblem.java Thu Oct  6 14:52:54 2016
@@ -32,6 +32,7 @@ public class RutaCheckerDefaultProblem e
             .getNameStart(), node.getNameEnd(), line, column);
   }
 
+  @SuppressWarnings("deprecation")
   public RutaCheckerDefaultProblem(String fileName, String message, RutaAbstractDeclaration node,
           int line) {
     super(fileName, message, 0, new String[] {}, ProblemSeverity.ERROR, node.getNameStart(), node
@@ -42,6 +43,7 @@ public class RutaCheckerDefaultProblem e
     this(fileName, message, node, line, ProblemSeverity.ERROR);
   }
 
+  @SuppressWarnings("deprecation")
   public RutaCheckerDefaultProblem(String fileName, String message, ASTNode node, int line,
           ProblemSeverity severity) {
     super(fileName, message, 0, new String[] {}, severity, node.sourceStart(), node.sourceEnd(),

Modified: uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/validator/RutaCheckerProblemFactory.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/validator/RutaCheckerProblemFactory.java?rev=1763598&r1=1763597&r2=1763598&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/validator/RutaCheckerProblemFactory.java (original)
+++ uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/validator/RutaCheckerProblemFactory.java Thu Oct  6 14:52:54 2016
@@ -131,10 +131,6 @@ public class RutaCheckerProblemFactory i
     return problem;
   }
 
-  private String generateFileNotFoundProblemMsg(ASTNode node) {
-    return generateFileNotFoundProblemMsg(node.toString());
-  }
-
   private String generateFileNotFoundProblemMsg(String fileName) {
     return "error: \"" + fileName + "\" not found.";
   }
@@ -165,11 +161,11 @@ public class RutaCheckerProblemFactory i
   public IProblem createUnknownFeatureProblem(Expression var, String matchedType) {
     // TODO refactor and find better solution
     String feat = var.toString();
-    List childs = var.getChilds();
+    List<?> childs = var.getChilds();
     if (childs != null && !childs.isEmpty()) {
       Object object = childs.get(0);
       if (object instanceof ASTListNode) {
-        List childs2 = ((ASTListNode) object).getChilds();
+        List<?> childs2 = ((ASTListNode) object).getChilds();
         if (childs2 != null && !childs2.isEmpty()) {
           Object object2 = childs2.get(0);
           if (object2 instanceof StringLiteral) {

Modified: uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/validator/RutaCheckerUtils.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/validator/RutaCheckerUtils.java?rev=1763598&r1=1763597&r2=1763598&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/validator/RutaCheckerUtils.java (original)
+++ uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/validator/RutaCheckerUtils.java Thu Oct  6 14:52:54 2016
@@ -129,7 +129,7 @@ public class RutaCheckerUtils {
     return imports;
   }
 
-  private static Set<String> collectElements(IMethod element, int type, Stack stack)
+  private static Set<String> collectElements(IMethod element, int type, Stack<String> stack)
           throws ModelException {
     Set<String> fieldsCollection = new HashSet<String>();
     IModelElement elements[] = element.getChildren();