couple tweaks for Mode debugging

benfry · benfry · commit f15316d0e9c4 · 2016-05-10T22:14:52.000-04:00
diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java
@@ -397,13 +397,18 @@ void rebuildContribModes() {
             contribModes.add(new ModeContribution(this, folder, null));
           } catch (NoSuchMethodError nsme) {
             System.err.println(folder.getName() + " is not compatible with this version of Processing");
+            if (DEBUG) nsme.printStackTrace();
           } catch (NoClassDefFoundError ncdfe) {
             System.err.println(folder.getName() + " is not compatible with this version of Processing");
+            if (DEBUG) ncdfe.printStackTrace();
           } catch (InvocationTargetException ite) {
             System.err.println(folder.getName() + " could not be loaded and may not compatible with this version of Processing");
+            if (DEBUG) ite.printStackTrace();
           } catch (IgnorableException ig) {
             Messages.log(ig.getMessage());
+            if (DEBUG) ig.printStackTrace();
           } catch (Throwable e) {
+            System.err.println("Could not load Mode from " + folder);
             e.printStackTrace();
           }
         } else {
diff --git a/app/src/processing/app/contrib/ModeContribution.java b/app/src/processing/app/contrib/ModeContribution.java
@@ -137,11 +137,11 @@ public boolean equals(Object o) {
     return loader.equals(other.loader) && mode.equals(other.getMode());
   }
 
-  public String initLoader(Base base, String className) throws Exception {
 
+  public String initLoader(Base base, String className) throws Exception {
     File modeDirectory = new File(folder, getTypeName());
     if (modeDirectory.exists()) {
-      Messages.log("checking mode folder regarding " + className);
+      Messages.log("checking mode folder regarding class name " + className);
       // If no class name specified, search the main <modename>.jar for the
       // full name package and mode name.
       if (className == null) {
@@ -170,7 +170,7 @@ public String initLoader(Base base, String className) throws Exception {
           installedModes.put(m.getClass().getName(), m);
         }
 
-        for(String modeImport: imports){
+        for (String modeImport: imports) {
           if (installedModes.containsKey(modeImport)) {
             Messages.log("Found mode dependency " + modeImport);
             File modeFolder = installedModes.get(modeImport).getFolder();
@@ -182,8 +182,9 @@ public String initLoader(Base base, String className) throws Exception {
               }
             }
           } else {
-            throw new IgnorableException("Dependency mode "+ modeImport + " could not be"
-              + " found. Can't load " + className);
+            throw new IgnorableException("Can't load " + className +
+                                         " because the import " + modeImport +
+                                         " could not be found. ");
           }
         }
       }

Original file line number	Diff line number	Diff line change
`@@ -137,11 +137,11 @@ public boolean equals(Object o) {`
`137`	`137`	`return loader.equals(other.loader) && mode.equals(other.getMode());`
`138`	`138`	`}`
`139`	`139`
`140`		`- public String initLoader(Base base, String className) throws Exception {`
`141`	`140`
	`141`	`+ public String initLoader(Base base, String className) throws Exception {`
`142`	`142`	`File modeDirectory = new File(folder, getTypeName());`
`143`	`143`	`if (modeDirectory.exists()) {`
`144`		`- Messages.log("checking mode folder regarding " + className);`
	`144`	`+ Messages.log("checking mode folder regarding class name " + className);`
`145`	`145`	`// If no class name specified, search the main <modename>.jar for the`
`146`	`146`	`// full name package and mode name.`
`147`	`147`	`if (className == null) {`
`@@ -170,7 +170,7 @@ public String initLoader(Base base, String className) throws Exception {`
`170`	`170`	`installedModes.put(m.getClass().getName(), m);`
`171`	`171`	`}`
`172`	`172`
`173`		`- for(String modeImport: imports){`
	`173`	`+ for (String modeImport: imports) {`
`174`	`174`	`if (installedModes.containsKey(modeImport)) {`
`175`	`175`	`Messages.log("Found mode dependency " + modeImport);`
`176`	`176`	`File modeFolder = installedModes.get(modeImport).getFolder();`
`@@ -182,8 +182,9 @@ public String initLoader(Base base, String className) throws Exception {`
`182`	`182`	`}`
`183`	`183`	`}`
`184`	`184`	`} else {`
`185`		`- throw new IgnorableException("Dependency mode "+ modeImport + " could not be"`
`186`		`- + " found. Can't load " + className);`
	`185`	`+ throw new IgnorableException("Can't load " + className +`
	`186`	`+ " because the import " + modeImport +`
	`187`	`+ " could not be found. ");`
`187`	`188`	`}`
`188`	`189`	`}`
`189`	`190`	`}`