Merge pull request processing#3648 from omerjerk/master

benfry · benfry · commit b24f5d4ac9ff · 2015-08-17T08:39:47.000-04:00
Let the mode decide in which jars to search for during auto completion
diff --git a/app/src/processing/app/Mode.java b/app/src/processing/app/Mode.java
@@ -936,6 +936,12 @@ public void prepareExportFolder(File targetFolder) {
 //    base.handleNewReplace();
 //  }
 
+
+  public String getSearchPath() {
+    return "";
+  }
+
+
   @Override
   public String toString() {
     return getTitle();
diff --git a/java/src/processing/mode/java/JavaMode.java b/java/src/processing/mode/java/JavaMode.java
@@ -263,6 +263,20 @@ public boolean handleExportApplication(Sketch sketch) throws SketchException, IO
     JavaBuild build = new JavaBuild(sketch);
     return build.exportApplication();
   }
+  
+  
+  @Override
+  public String getSearchPath() {
+    StringBuilder tehPath =  new StringBuilder(System.getProperty("java.class.path"));
+
+    // Starting with JDK 1.7, no longer using Apple's Java, so
+    // rt.jar has the same path on all OSes
+    tehPath.append(File.pathSeparatorChar
+               + System.getProperty("java.home") + File.separator + "lib"
+               + File.separator + "rt.jar");
+  
+    return tehPath.toString();
+  }
 
 
   // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
diff --git a/java/src/processing/mode/java/pdex/ASTGenerator.java b/java/src/processing/mode/java/pdex/ASTGenerator.java
@@ -306,14 +306,7 @@ protected void done() {
   protected void loadJars() {
     factory = new ClassPathFactory();
 
-    StringBuilder tehPath =
-      new StringBuilder(System.getProperty("java.class.path"));
-
-    // Starting with JDK 1.7, no longer using Apple's Java, so
-    // rt.jar has the same path on all OSes
-    tehPath.append(File.pathSeparatorChar
-                   + System.getProperty("java.home") + File.separator + "lib"
-                   + File.separator + "rt.jar" + File.pathSeparatorChar);
+    StringBuilder tehPath = new StringBuilder(editor.getMode().getSearchPath());
 
     if (errorCheckerService.classpathJars != null) {
       synchronized (errorCheckerService.classpathJars) {
