Styling

JakubValtar · JakubValtar · commit 0e68cdf6b581 · 2015-10-22T14:39:05.000+02:00
diff --git a/java/src/processing/mode/java/pdex/ASTGenerator.java b/java/src/processing/mode/java/pdex/ASTGenerator.java
@@ -342,7 +342,7 @@ public boolean accept(File file) {
       }
       jdocMap.put(methodName, msg);
     }
-    System.out.println("JDoc loaded " + jdocMap.size());
+    //System.out.println("JDoc loaded " + jdocMap.size());
   }
 
 
@@ -1522,7 +1522,7 @@ protected static ASTNode findClosestNode(int lineNumber, ASTNode node) {
     } else if (parent instanceof Block) {
       nodes = ((Block) parent).statements();
     } else {
-      System.err.println("findClosestNode() found " + getNodeAsString(parent));
+      log("findClosestNode() found " + getNodeAsString(parent));
       return null;
     }
 
diff --git a/java/src/processing/mode/java/pdex/ErrorCheckerService.java b/java/src/processing/mode/java/pdex/ErrorCheckerService.java
@@ -112,12 +112,12 @@ public class ErrorCheckerService {
   /**
    * URLs of extra imports jar files stored here.
    */
-  protected URL[] classPath;
+  protected URL[] classPath = {};
 
   /**
-   * Stores all Problems in the sketch
+   * Class loader used by compiler check and ASTGenerator, based on classPath
    */
-  //public List<Problem> problemsList;
+  protected URLClassLoader classLoader = new URLClassLoader(classPath);
 
   /**
    * How many lines are present till the initial class declaration? In static
@@ -165,6 +165,11 @@ public class ErrorCheckerService {
    */
   protected final XQPreprocessor xqpreproc;
 
+  /**
+   * ASTGenerator for operations on AST
+   */
+  protected final ASTGenerator astGenerator;
+
   /**
    * Regexp for import statements. (Used from Processing source)
    */
@@ -180,10 +185,11 @@ public ErrorCheckerService(JavaEditor debugEditor) {
 
   /**
    * Error checking doesn't happen before this interval has ellapsed since the
-   * last runManualErrorCheck() call.
+   * last request() call.
    */
   private final static long errorCheckInterval = 650;
 
+  protected volatile CodeCheckResult lastCodeCheckResult = new CodeCheckResult();
 
   private Thread errorCheckerThread;
   private final BlockingQueue<Boolean> requestQueue = new ArrayBlockingQueue<>(1);
@@ -286,6 +292,7 @@ public void start() {
     errorCheckerThread.start();
   }
 
+
   public void stop() {
     cancel();
     running = false;
@@ -332,8 +339,6 @@ protected void checkForMissingImports(CodeCheckResult result) {
   }
 
 
-  protected final ASTGenerator astGenerator;
-
   public ASTGenerator getASTGenerator() {
     return astGenerator;
   }
@@ -488,8 +493,6 @@ protected CodeCheckResult checkCode() {
     return result;
   }
 
-  protected volatile CodeCheckResult lastCodeCheckResult = new CodeCheckResult();
-
   public boolean hasSyntaxErrors(){
     return lastCodeCheckResult.syntaxErrors;
   }
@@ -498,8 +501,6 @@ public boolean hasErrors(){
     return lastCodeCheckResult.containsErrors;
   }
 
-  protected URLClassLoader classLoader;
-
   /**
    * Performs compiler error check.
    * @param sourceName - name of the class

Original file line number	Diff line number	Diff line change
`@@ -342,7 +342,7 @@ public boolean accept(File file) {`
`342`	`342`	`}`
`343`	`343`	`jdocMap.put(methodName, msg);`
`344`	`344`	`}`
`345`		`- System.out.println("JDoc loaded " + jdocMap.size());`
	`345`	`+ //System.out.println("JDoc loaded " + jdocMap.size());`
`346`	`346`	`}`
`347`	`347`
`348`	`348`
`@@ -1522,7 +1522,7 @@ protected static ASTNode findClosestNode(int lineNumber, ASTNode node) {`
`1522`	`1522`	`} else if (parent instanceof Block) {`
`1523`	`1523`	`nodes = ((Block) parent).statements();`
`1524`	`1524`	`} else {`
`1525`		`- System.err.println("findClosestNode() found " + getNodeAsString(parent));`
	`1525`	`+ log("findClosestNode() found " + getNodeAsString(parent));`
`1526`	`1526`	`return null;`
`1527`	`1527`	`}`
`1528`	`1528`