eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-03 21:59:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

moving this into JavaMode

Browse Source
This commit is contained in:
Ben Fry
2015-08-17 08:57:36 -04:00
parent 4ae51ba139
commit e3795d4748
4 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -306,34 +306,34 @@ public class ASTGenerator {
protected void loadJars() {
factory = new ClassPathFactory();
StringBuilder tehPath = new StringBuilder();
String modeClassPath = editor.getMode().getSearchPath();
StringBuilder path = new StringBuilder();
String modeClassPath = ((JavaMode) editor.getMode()).getSearchPath();
if (modeClassPath != null) {
tehPath.append(modeClassPath);
path.append(modeClassPath);
}
if (errorCheckerService.classpathJars != null) {
synchronized (errorCheckerService.classpathJars) {
for (URL jarPath : errorCheckerService.classpathJars) {
//log(jarPath.getPath());
tehPath.append(jarPath.getPath() + File.pathSeparatorChar);
path.append(jarPath.getPath() + File.pathSeparatorChar);
}
}
}
classPath = factory.createFromPath(tehPath.toString());
classPath = factory.createFromPath(path.toString());
log("Classpath created " + (classPath != null));
log("Sketch classpath jars loaded.");
if (Platform.isMacOS()) {
File f = new File(System.getProperty("java.home") + File.separator + "bundle"
+ File.separator + "Classes" + File.separator + "classes.jar");
log(f.getAbsolutePath() + " | classes.jar found?"
+ f.exists());
File f = new File(System.getProperty("java.home") +
File.separator + "bundle" +
File.separator + "Classes" +
File.separator + "classes.jar");
log(f.getAbsolutePath() + " | classes.jar found?" + f.exists());
} else {
File f = new File(System.getProperty("java.home") + File.separator
+ "lib" + File.separator + "rt.jar" + File.separator);
log(f.getAbsolutePath() + " | rt.jar found?"
+ f.exists());
File f = new File(System.getProperty("java.home") + File.separator +
"lib" + File.separator + "rt.jar" + File.separator);
log(f.getAbsolutePath() + " | rt.jar found?" + f.exists());
}
}
@@ -3523,8 +3523,7 @@ public class ASTGenerator {
if (impName.startsWith("processing")) {
if (JavaMode.suggestionsMap.get(processingInclude).contains(impName)) {
return false;
} else if (JavaMode.suggestionsMap.get(processingExclude)
.contains(impName)) {
} else if (JavaMode.suggestionsMap.get(processingExclude).contains(impName)) {
return true;
}
} else if (impName.startsWith("java")) {