svn commit: r1748661 - /uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/validator/LanguageCheckerVisitor.java

[pkluegl]

Author: pkluegl
Date: Thu Jun 16 07:20:48 2016
New Revision: 1748661

URL: http://svn.apache.org/viewvc?rev=1748661&view=rev
Log:
no jira - avoid npes in syntax checker

Modified:
    
uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/validator/LanguageCheckerVisitor.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=1748661&r1=1748660&r2=1748661&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 Jun 16 07:20:48 2016
@@ -585,7 +585,8 @@ public class LanguageCheckerVisitor exte
         String text = fme.getFeature().getText();
         int lastIndexOf = text.lastIndexOf('.');
         String twf = text.substring(0, lastIndexOf);
-        if (getVariableType(twf) == RutaTypeConstants.RUTA_TYPE_AT) {
+        Integer variableType = getVariableType(twf);
+        if (variableType != null && variableType == 
RutaTypeConstants.RUTA_TYPE_AT) {
           matchedType = twf;
         } else {
           twf = expand(twf);
@@ -634,9 +635,13 @@ public class LanguageCheckerVisitor exte
         }
         if (namespaces.keySet().contains(name) || 
namespaces.values().contains(name)
                 || allLongTypeNames.contains(name)
-                || getVariableType(name) == RutaTypeConstants.RUTA_TYPE_AT
-                || getVariableType(name) == RutaTypeConstants.RUTA_TYPE_UA
-                || getVariableType(name) == RutaTypeConstants.RUTA_TYPE_UAL) {
+                 ) {
+          return false;
+        }
+        Integer variableType = getVariableType(name);
+        if(variableType != null && variableType == 
RutaTypeConstants.RUTA_TYPE_AT
+                || variableType == RutaTypeConstants.RUTA_TYPE_UA
+                || variableType == RutaTypeConstants.RUTA_TYPE_UAL) {
           return false;
         }
         if (isFeatureMatch(name) != null) {
@@ -896,8 +901,10 @@ public class LanguageCheckerVisitor exte
       return;
     }
     String match = isFeatureMatch(aref);
-    if (match == null && (getVariableType(aref) == 
RutaTypeConstants.RUTA_TYPE_AT
-            || getVariableType(bref) == RutaTypeConstants.RUTA_TYPE_AT)) {
+    Integer variableType1 = getVariableType(aref);
+    Integer variableType2 = getVariableType(bref);
+    if (match == null && variableType1 != null && variableType2 != null && 
(variableType1 == RutaTypeConstants.RUTA_TYPE_AT
+            || variableType2 == RutaTypeConstants.RUTA_TYPE_AT)) {
       // do not check on variables!
       return;
     }