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

clean up

Browse Source
This commit is contained in:
Manindra Moharana
2015-06-30 22:48:13 -07:00
parent 6dbaabd4f1
commit 0ff712c397
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/processing/app/contrib/LocalContribution.java
+3
View File
@@ -176,6 +176,9 @@ public abstract class LocalContribution extends Contribution {
}
public String initLoader(String className, URL[] extraUrls) throws Exception {
// initLoader(String) can call this with a null URL array
File modeDirectory = new File(folder, getTypeName());
if (modeDirectory.exists()) {
Base.log("checking mode folder regarding " + className);
app/src/processing/app/contrib/ModeContribution.java
+3 -7
View File
@@ -80,9 +80,7 @@ public class ModeContribution extends LocalContribution {
private ModeContribution(Base base, File folder,
String className) throws Exception {
super(folder);
System.err.println("OOOLALALA ");
className = initLoader(className);
System.err.println("LALALA " + loader.toString());
if (className != null) {
try {
Class<?> modeClass = loader.loadClass(className);
@@ -94,13 +92,11 @@ public class ModeContribution extends LocalContribution {
mode.setupGUI();
}
} catch (NoClassDefFoundError ncdfe) {
System.err.println("OOPS " + ncdfe.getMessage() + " :" + Base.getContentFile("modes/java/mode/JavaMode.jar").exists());
// Reinitialise loader with JaavMode
if (ncdfe.getMessage().equals("processing/mode/java/JavaMode")) {
System.err.println("OOPS2 " + ncdfe.getMessage());
Base.log(folder.getAbsolutePath() + " extends JavaMode, reloading with javamode.");
className = initLoader(className, new URL[]{Base.getContentFile("modes/java/mode/JavaMode.jar").toURI().toURL()});
Class<?> modeClass = loader.loadClass(className);
System.err.println("Reloading mode class " + modeClass + " with JavaMode" + Base.getContentFile("modes/java/mode/JavaMode.jar").toURI().toURL());
Constructor con = modeClass.getConstructor(Base.class, File.class);
mode = (Mode) con.newInstance(base, folder);
mode.setClassLoader(loader);
@@ -108,9 +104,9 @@ public class ModeContribution extends LocalContribution {
mode.setupGUI();
}
} else {
// Some other issue
throw new NoClassDefFoundError(ncdfe.getMessage() + " no class definition found.");
}
// throw new NoClassDefFoundError(ncdfe.getMessage() + " no class definition found.");
}
}
}