From ac8d8589ea526c7ab38f91524507b7422c5bc866 Mon Sep 17 00:00:00 2001
From: Manindra Moharana <mkmoharana29@gmail.com>
Date: Mon, 28 Jul 2014 10:02:59 +0530
Subject: [PATCH] minor code changes

---
 .../mode/experimental/ASTGenerator.java          | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/pdex/src/processing/mode/experimental/ASTGenerator.java b/pdex/src/processing/mode/experimental/ASTGenerator.java
index f68f8c2c1..3b1740127 100644
--- a/pdex/src/processing/mode/experimental/ASTGenerator.java
+++ b/pdex/src/processing/mode/experimental/ASTGenerator.java
@@ -895,7 +895,7 @@ public class ASTGenerator {
         logE("Typed: " + word2 + "|" + " temp Node type: " + testnode.getClass().getSimpleName());
         if(testnode instanceof MethodInvocation){
           MethodInvocation mi = (MethodInvocation)testnode;
-          System.out.println(mi.getName() + "," + mi.getExpression() + "," + mi.typeArguments().size());
+          log(mi.getName() + "," + mi.getExpression() + "," + mi.typeArguments().size());
         }
         
         // find nearest ASTNode
@@ -1259,8 +1259,7 @@ public class ASTGenerator {
     // First, see if the classname is a fully qualified name and loads straightaway
     tehClass = loadClass(className);
     
-    // do you mean to check for 'null' here? otherwise, this expression is always true [fry]
-    if (tehClass instanceof Class) {    
+    if (tehClass != null) {    
       //log(tehClass.getName() + " located straightaway");
       return tehClass;
     }
@@ -1282,7 +1281,7 @@ public class ASTGenerator {
         }
       }
       tehClass = loadClass(temp);
-      if (tehClass instanceof Class) {
+      if (tehClass != null) {
         log(tehClass.getName() + " located.");
         return tehClass;
       }
@@ -1294,7 +1293,7 @@ public class ASTGenerator {
     PdePreprocessor p = new PdePreprocessor(null);
     for (String impS : p.getCoreImports()) {
       tehClass = loadClass(impS.substring(0,impS.length()-1) + className);
-      if (tehClass instanceof Class) {
+      if (tehClass != null) {
         log(tehClass.getName() + " located.");
         return tehClass;
       }
@@ -1304,7 +1303,7 @@ public class ASTGenerator {
     for (String impS : p.getDefaultImports()) {
       if(className.equals(impS) || impS.endsWith(className)){
         tehClass = loadClass(impS);                    
-        if (tehClass instanceof Class) {
+        if (tehClass != null) {
           log(tehClass.getName() + " located.");
           return tehClass;
         }
@@ -1315,7 +1314,7 @@ public class ASTGenerator {
     // And finally, the daddy
     String daddy = "java.lang." + className;
     tehClass = loadClass(daddy);                    
-    if (tehClass instanceof Class) {
+    if (tehClass != null) {
       log(tehClass.getName() + " located.");
       return tehClass;
     }
@@ -1886,7 +1885,6 @@ public class ASTGenerator {
                     + lineElement.getEndOffset());
                 log("PL " + pdeLine);
               } catch (BadLocationException e) {
-                // TODO Auto-generated catch block
                 e.printStackTrace();
               }
             }
@@ -3011,7 +3009,7 @@ public class ASTGenerator {
   /**
    * A wrapper for java.lang.reflect types.
    * Will have to see if the usage turns out to be internal only here or not
-   * and then accordingly decide where to place this class. TODO
+   * and then accordingly decide where to place this class.
    * @author quarkninja
    *
    */