From 0ff712c397a1a4f8a3a81f6b0d07a6f6a95703ee Mon Sep 17 00:00:00 2001
From: Manindra Moharana <mkmoharana29@gmail.com>
Date: Tue, 30 Jun 2015 22:48:13 -0700
Subject: [PATCH] clean up

---
 app/src/processing/app/contrib/LocalContribution.java |  3 +++
 app/src/processing/app/contrib/ModeContribution.java  | 10 +++-------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/src/processing/app/contrib/LocalContribution.java b/app/src/processing/app/contrib/LocalContribution.java
index 4738bbc95..a0963d9a5 100644
--- a/app/src/processing/app/contrib/LocalContribution.java
+++ b/app/src/processing/app/contrib/LocalContribution.java
@@ -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);
diff --git a/app/src/processing/app/contrib/ModeContribution.java b/app/src/processing/app/contrib/ModeContribution.java
index 67523e308..1d09ac4af 100644
--- a/app/src/processing/app/contrib/ModeContribution.java
+++ b/app/src/processing/app/contrib/ModeContribution.java
@@ -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.");
       }
     }
   }