@@ -107,7 +107,6 @@ public class Base {
   // A single instance of the library manager window
   ContributionManagerDialog contributionManagerFrame;
 
-  
   // Location for untitled items
   static File untitledFolder;
 
@@ -353,23 +352,9 @@ void rebuildContribExamples() {
 
 
   public Base(String[] args) throws Exception {
-//    // Get the sketchbook path, and make sure it's set properly
-//    determineSketchbookFolder();
-
-    // Delete all modes and tools that have been flagged for deletion before
-    // they are initialized by an editor.
-//    ArrayList<InstalledContribution> contribs = new ArrayList<InstalledContribution>();
-//    contribs.addAll(ModeContribution.list(getSketchbookModesFolder()));
-//    contribs.addAll(ToolContribution.list(getSketchbookToolsFolder(), false));
-//    for (InstalledContribution contrib : contribs) {
-//      if (ContributionManager.isDeletionFlagSet(contrib)) {
-//        removeDir(contrib.getFolder());
-//      }
-//    }
     ContributionManager.cleanup(this);
     buildCoreModes();
     rebuildContribModes();
-
     rebuildContribExamples();
 
     // Needs to happen after the sketchbook folder has been located.
@@ -394,8 +379,7 @@ public Base(String[] args) throws Exception {
       }
     }
 
-    contributionManagerFrame =
-      new ContributionManagerDialog();
+    contributionManagerFrame = new ContributionManagerDialog();
 
     // Make sure ThinkDifferent has library examples too
     nextMode.rebuildLibraryList();
 
@@ -5,21 +5,20 @@
 import java.util.*;
 import java.util.zip.*;
 
-//import javax.swing.SwingUtilities;
 
 /**
  * This code is placed here in anticipation of running the reference from an
  * internal web server that reads the docs from a zip file, instead of using
  * thousands of .html files on the disk, which is really inefficient.
  * <p/>
- * This is a very simple, multi-threaded HTTP server, originally based on 
+ * This is a very simple, multi-threaded HTTP server, originally based on
  * <a href="http://j.mp/6BQwpI">this</a> article on java.sun.com.
  */
 public class WebServer implements HttpConstants {
 
     /* Where worker threads stand idle */
     static Vector threads = new Vector();
- 
+
     /* the web server's virtual root */
     //static File root;
 
@@ -29,7 +28,7 @@ public class WebServer implements HttpConstants {
     /* max # worker threads */
     static int workers = 5;
 
-//    static PrintStream log = System.out; 
+//    static PrintStream log = System.out;
 
 
     /*
@@ -88,7 +87,7 @@ static void printProps() {
     }
     */
 
-    
+
     /* print to stdout */
 //    protected static void p(String s) {
 //        System.out.println(s);
@@ -105,7 +104,7 @@ protected static void log(String s) {
 //        }
     }
 
-    
+
     //public static void main(String[] a) throws Exception {
     static public int launch(String zipPath) throws IOException {
       final ZipFile zip = new ZipFile(zipPath);
@@ -226,7 +225,7 @@ public synchronized void run() {
         }
     }
 
-    
+
     void handleClient() throws IOException {
         InputStream is = new BufferedInputStream(s.getInputStream());
         PrintStream ps = new PrintStream(s.getOutputStream());
@@ -240,7 +239,7 @@ void handleClient() throws IOException {
             buf[i] = 0;
         }
         try {
-          // We only support HTTP GET/HEAD, and don't support any fancy HTTP 
+          // We only support HTTP GET/HEAD, and don't support any fancy HTTP
           // options, so we're only interested really in the first line.
             int nread = 0, r = 0;
 
@@ -254,7 +253,7 @@ void handleClient() throws IOException {
                 nread += r;
                 for (; i < nread; i++) {
                     if (buf[i] == (byte)'\n' || buf[i] == (byte)'\r') {
-                        break outerloop;  // read one line 
+                        break outerloop;  // read one line
                     }
                 }
             }
@@ -312,7 +311,7 @@ void handleClient() throws IOException {
               send404(ps);
             }
             /*
-            String fname = 
+            String fname =
               (new String(buf, 0, index, i-index)).replace('/', File.separatorChar);
             if (fname.startsWith(File.separator)) {
                 fname = fname.substring(1);
@@ -338,7 +337,7 @@ void handleClient() throws IOException {
         }
     }
 
-    
+
     boolean printHeaders(ZipEntry targ, PrintStream ps) throws IOException {
       boolean ret = false;
       int rCode = 0;
@@ -386,8 +385,8 @@ boolean printHeaders(ZipEntry targ, PrintStream ps) throws IOException {
       ps.write(EOL);  // adding another newline here [fry]
       return ret;
   }
-    
-    
+
+
     boolean printHeaders(File targ, PrintStream ps) throws IOException {
         boolean ret = false;
         int rCode = 0;
@@ -432,7 +431,7 @@ boolean printHeaders(File targ, PrintStream ps) throws IOException {
         return ret;
     }
 
-    
+
     void send404(PrintStream ps) throws IOException {
         ps.write(EOL);
         ps.write(EOL);
@@ -442,7 +441,7 @@ void send404(PrintStream ps) throws IOException {
         ps.write(EOL);
     }
 
-    
+
     void sendFile(File targ, PrintStream ps) throws IOException {
         InputStream is = null;
         ps.write(EOL);
@@ -454,8 +453,8 @@ void sendFile(File targ, PrintStream ps) throws IOException {
         }
         sendFile(is, ps);
     }
-    
-    
+
+
     void sendFile(InputStream is, PrintStream ps) throws IOException {
         try {
             int n;
@@ -489,19 +488,19 @@ static void fillMap() {
         setSuffix(".snd", "audio/basic");
         setSuffix(".au", "audio/basic");
         setSuffix(".wav", "audio/x-wav");
-        
+
         setSuffix(".gif", "image/gif");
         setSuffix(".jpg", "image/jpeg");
         setSuffix(".jpeg", "image/jpeg");
-        
+
         setSuffix(".htm", "text/html");
         setSuffix(".html", "text/html");
-        setSuffix(".css", "text/css"); 
+        setSuffix(".css", "text/css");
         setSuffix(".java", "text/javascript");
-        
+
         setSuffix(".txt", "text/plain");
         setSuffix(".java", "text/plain");
-        
+
         setSuffix(".c", "text/plain");
         setSuffix(".cc", "text/plain");
         setSuffix(".c++", "text/plain");
 
@@ -27,10 +27,14 @@
 import java.io.PrintStream;
 import java.io.UnsupportedEncodingException;
 
-import processing.app.*;
+import processing.app.Base;
+import processing.app.Preferences;
+import processing.app.RunnerListener;
+import processing.app.Sketch;
+import processing.app.SketchException;
 import processing.app.contrib.ModeContribution;
 import processing.core.PApplet;
-import processing.mode.java.runner.*;
+import processing.mode.java.runner.Runner;
 
 
 /**
 
@@ -12,6 +12,9 @@ X Add more code for handling low-level errors on startup
 X update the "Supported Platforms" wiki page with current status
 X displayDensity() not functioning properly
 X   https://github.com/processing/processing/issues/3436
+X error message caused by curly bracket in a println string
+X   ((?<![\\])['"])((?:.(?!(?<![\\])\1))*.?)\1 to match quoted strings
+X   https://github.com/processing/processing/issues/3394
 
 manager
 X changed compatibleModesList to modes in examples.properties
@@ -119,9 +122,6 @@ _ recent menu gets huge with other p5 versions on osx
 
 
 pde/build
-_ error message caused by curly bracket in a println string
-_   ((?<![\\])['"])((?:.(?!(?<![\\])\1))*.?)\1 to match quoted strings
-_   https://github.com/processing/processing/issues/3394
 _ dim out the Run button if there are compile errors detected
 _   the AST checker has better error message handling for those cases
 _   and hitting Run replaces the useful error with something weird