cleaning up #3648

benfry · benfry · commit f0dc2319a5a9 · 2015-08-17T08:42:57.000-04:00
diff --git a/app/src/processing/app/Mode.java b/app/src/processing/app/Mode.java
@@ -938,7 +938,7 @@ public void prepareExportFolder(File targetFolder) {
 
 
   public String getSearchPath() {
-    return "";
+    return null;
   }
 
 
diff --git a/java/src/processing/mode/java/JavaMode.java b/java/src/processing/mode/java/JavaMode.java
@@ -263,19 +263,13 @@ 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();
+    return System.getProperty("java.class.path") +
+      File.pathSeparatorChar + System.getProperty("java.home") +
+      File.separator + "lib" + File.separator + "rt.jar";
   }
 
 
diff --git a/java/src/processing/mode/java/pdex/ASTGenerator.java b/java/src/processing/mode/java/pdex/ASTGenerator.java
@@ -306,7 +306,11 @@ protected void done() {
   protected void loadJars() {
     factory = new ClassPathFactory();
 
-    StringBuilder tehPath = new StringBuilder(editor.getMode().getSearchPath());
+    StringBuilder tehPath = new StringBuilder();
+    String modeClassPath = editor.getMode().getSearchPath();
+    if (modeClassPath != null) {
+      tehPath.append(modeClassPath);
+    }
 
     if (errorCheckerService.classpathJars != null) {
       synchronized (errorCheckerService.classpathJars) {

Original file line number	Diff line number	Diff line change
`@@ -938,7 +938,7 @@ public void prepareExportFolder(File targetFolder) {`
`938`	`938`
`939`	`939`
`940`	`940`	`public String getSearchPath() {`
`941`		`- return "";`
	`941`	`+ return null;`
`942`	`942`	`}`
`943`	`943`
`944`	`944`