eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-04 06:09:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

cleaning up #3648

Browse Source
This commit is contained in:
Ben Fry
2015-08-17 08:42:57 -04:00
parent 3696894f16
commit 4ae51ba139
3 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
java/src/processing/mode/java/JavaMode.java
View File

@@ -263,19 +263,13 @@ public class JavaMode extends Mode {
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";
}

6
java/src/processing/mode/java/pdex/ASTGenerator.java
View File

@@ -306,7 +306,11 @@ public class ASTGenerator {
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) {