avoid NPE case on startup

benfry · benfry · commit 5582f487c61e · 2015-08-21T10:22:17.000-04:00
diff --git a/java/src/processing/mode/java/pdex/ASTGenerator.java b/java/src/processing/mode/java/pdex/ASTGenerator.java
@@ -2741,31 +2741,31 @@ protected static ASTNode findDeclaration(Name findMe) {
 //                  .toString()));
 
           SimpleType stp = extracTypeInfo(findDeclaration((qnn.getQualifier())));
-//          log(qnn.getQualifier() + "->" + qnn.getName());
-          declaringClass = findDeclaration(stp.getName());
-
-//          log("QN decl class: "
-//              + getNodeAsString(declaringClass));
-          constrains.clear();
-          constrains.add(ASTNode.TYPE_DECLARATION);
-          constrains.add(ASTNode.FIELD_DECLARATION);
-          return definedIn(declaringClass, qnn.getName().toString(), constrains,
-                           null);
+          if (stp != null) {
+            declaringClass = findDeclaration(stp.getName());
+            constrains.clear();
+            constrains.add(ASTNode.TYPE_DECLARATION);
+            constrains.add(ASTNode.FIELD_DECLARATION);
+            return definedIn(declaringClass, qnn.getName().toString(),
+                             constrains, null);
+          } else {
+            return null;
+          }
         }
       }
     } else if (parent.getNodeType() == ASTNode.SIMPLE_TYPE) {
       constrains.add(ASTNode.TYPE_DECLARATION);
-      if (parent.getParent().getNodeType() == ASTNode.CLASS_INSTANCE_CREATION)
+      if (parent.getParent().getNodeType() == ASTNode.CLASS_INSTANCE_CREATION) {
         constrains.add(ASTNode.CLASS_INSTANCE_CREATION);
-    } else if(parent.getNodeType() == ASTNode.TYPE_DECLARATION){
+      }
+    } else if (parent.getNodeType() == ASTNode.TYPE_DECLARATION) {
       // The condition where we look up the name of a class decl
       TypeDeclaration td = (TypeDeclaration) parent;
-      if(findMe.equals(td.getName()))
-      {
+      if (findMe.equals(td.getName())) {
         return parent;
       }
-    }
-    else if (parent instanceof Expression) {
+
+    } else if (parent instanceof Expression) {
 //      constrains.add(ASTNode.TYPE_DECLARATION);
 //      constrains.add(ASTNode.METHOD_DECLARATION);
 //      constrains.add(ASTNode.FIELD_DECLARATION);
