Modes can now specifiy additional jars for ecs/cc classpath

Manindra29 · Manindra29 · commit 76a9facff4b5 · 2015-08-27T23:07:06.000-07:00
diff --git a/java/src/processing/mode/java/JavaMode.java b/java/src/processing/mode/java/JavaMode.java
@@ -265,10 +265,14 @@ public boolean handleExportApplication(Sketch sketch) throws SketchException, IO
   }
 
 
+  /**
+   * Any modes that extend JavaMode can override this method to add additional jars to be
+   * included in the classpath for code completion and error checking
+   * @return searchPath: file-paths separated by File.pathSeparatorChar
+   */
   public String getSearchPath() {
-    return System.getProperty("java.class.path") +
-      File.pathSeparatorChar + System.getProperty("java.home") +
-      File.separator + "lib" + File.separator + "rt.jar";
+    // Java Mode doesn't need any default external jars at the moment.
+    return "";
   }
 
 
diff --git a/java/src/processing/mode/java/pdex/ASTGenerator.java b/java/src/processing/mode/java/pdex/ASTGenerator.java
@@ -300,14 +300,20 @@ protected void done() {
 
   //protected JFrame frmJavaDoc;
 
+  protected String getJavaSearchPath() {
+    return System.getProperty("java.class.path") +
+            File.pathSeparatorChar + System.getProperty("java.home") +
+            File.separator + "lib" + File.separator + "rt.jar";
+  }
+
   /**
    * Loads up .jar files and classes defined in it for completion lookup
    */
   protected void loadJars() {
     factory = new ClassPathFactory();
 
     StringBuilder path = new StringBuilder();
-    String modeClassPath = ((JavaMode) editor.getMode()).getSearchPath();
+    String modeClassPath = getJavaSearchPath() + File.pathSeparatorChar + ((JavaMode) editor.getMode()).getSearchPath();
     if (modeClassPath != null) {
       path.append(modeClassPath);
     }
diff --git a/java/src/processing/mode/java/pdex/ErrorCheckerService.java b/java/src/processing/mode/java/pdex/ErrorCheckerService.java
@@ -21,6 +21,7 @@
 package processing.mode.java.pdex;
 
 import java.io.File;
+import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.ArrayList;
@@ -871,8 +872,17 @@ protected void prepareCompilerClasspath() {
           }
         }
       }
-    }
 
+      // Also add jars specified in mode's search path
+      String modeJars[] = ((JavaMode) getEditor().getMode()).getSearchPath().split(File.pathSeparatorChar + "");
+      for (String mj : modeJars) {
+        try {
+          classpathJars.add(new File(mj).toURI().toURL());
+        } catch (MalformedURLException e) {
+          e.printStackTrace();
+        }
+      }
+    }
     new Thread(new Runnable() {
       public void run() {
         astGenerator.loadJars(); // update jar file for completion lookup
@@ -1119,8 +1129,8 @@ protected String getPdeCodeAtLine(int tab, int linenumber){
    * Calculates the tab number and line number of the error in that particular
    * tab. Provides mapping between pure java and pde code.
    *
-   * @param problem
-   *            - IProblem
+   * @param javalineNumber
+   *            - int
    * @return int[0] - tab number, int[1] - line number
    */
   protected int[] calculateTabIndexAndLineNumber(int javalineNumber) {
@@ -1335,7 +1345,7 @@ protected String preprocessCode(String pdeCode) {
   /**
    * Now defunct.
    * The super method that highlights any ASTNode in the pde editor =D
-   * @param node
+   * @param awrap
    * @return true - if highlighting happened correctly.
    */
   private boolean highlightNode(ASTNodeWrapper awrap){

Original file line number	Diff line number	Diff line change
`@@ -265,10 +265,14 @@ public boolean handleExportApplication(Sketch sketch) throws SketchException, IO`
`265`	`265`	`}`
`266`	`266`
`267`	`267`
	`268`	`+ /**`
	`269`	`+ * Any modes that extend JavaMode can override this method to add additional jars to be`
	`270`	`+ * included in the classpath for code completion and error checking`
	`271`	`+ * @return searchPath: file-paths separated by File.pathSeparatorChar`
	`272`	`+ */`
`268`	`273`	`public String getSearchPath() {`
`269`		`- return System.getProperty("java.class.path") +`
`270`		`- File.pathSeparatorChar + System.getProperty("java.home") +`
`271`		`- File.separator + "lib" + File.separator + "rt.jar";`
	`274`	`+ // Java Mode doesn't need any default external jars at the moment.`
	`275`	`+ return "";`
`272`	`276`	`}`
`273`	`277`
`274`	`278`