funnel exceptions to one method, implement uncaught ex handler so OS X will quit on first attempt

benfry · benfry · commit 2c6b2ee9b74c · 2016-08-17T22:12:58.000-04:00
diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java
@@ -732,6 +732,9 @@ public class PApplet implements PConstants {
   /** true if the sketch has stopped permanently. */
   public volatile boolean finished;
 
+  /** used by the UncaughtExceptionHandler, so has to be static */
+  static Throwable uncaughtThrowable;
+
   // public, but undocumented.. removing for 3.0a5
 //  /**
 //   * true if the animation thread is paused.
@@ -5297,7 +5300,7 @@ public PImage loadImage(String filename, String extension) { //, Object params)
 //        }
         return image;
       } catch (IOException e) {
-        e.printStackTrace();
+        printStackTrace(e);
         return null;
       }
     }
@@ -5367,7 +5370,7 @@ public PImage loadImage(String filename, String extension) { //, Object params)
       }
     } catch (Exception e) {
       // show error, but move on to the stuff below, see if it'll work
-      e.printStackTrace();
+      printStackTrace(e);
     }
 
     if (loadImageFormats == null) {
@@ -5557,7 +5560,7 @@ protected PImage loadImageIO(String filename) {
       return outgoing;
 
     } catch (Exception e) {
-      e.printStackTrace();
+      printStackTrace(e);
       return null;
     }
   }
@@ -6029,7 +6032,7 @@ public Table loadTable(String filename, String options) {
       return new Table(input, optionStr);
 
     } catch (IOException e) {
-      e.printStackTrace();
+      printStackTrace(e);
       return null;
     }
   }
@@ -6069,7 +6072,7 @@ public boolean saveTable(Table table, String filename, String options) {
       return table.save(outputFile, options);
 
     } catch (IOException e) {
-      e.printStackTrace();
+      printStackTrace(e);
       return false;
     }
   }
@@ -6739,7 +6742,7 @@ public InputStream createInput(String filename) {
       try {
         return new GZIPInputStream(input);
       } catch (IOException e) {
-        e.printStackTrace();
+        printStackTrace(e);
         return null;
       }
     }
@@ -6794,7 +6797,7 @@ public InputStream createInputRaw(String filename) {
 
       } catch (IOException e) {
         // changed for 0117, shouldn't be throwing exception
-        e.printStackTrace();
+        printStackTrace(e);
         //System.err.println("Error downloading from URL " + filename);
         return null;
         //throw new RuntimeException("Error downloading from URL " + filename);
@@ -6900,8 +6903,7 @@ public InputStream createInputRaw(String filename) {
       } catch (SecurityException se) { }  // online, whups
 
     } catch (Exception e) {
-      //die(e.getMessage(), e);
-      e.printStackTrace();
+      printStackTrace(e);
     }
 
     return null;
@@ -6957,7 +6959,7 @@ public byte[] loadBytes(String filename) {
       try {
         is.close();
       } catch (IOException e) {
-        e.printStackTrace();  // shouldn't happen
+        printStackTrace(e);  // shouldn't happen
       }
       return outgoing;
     }
@@ -7073,7 +7075,7 @@ public String[] loadStrings(String filename) {
       try {
         is.close();
       } catch (IOException e) {
-        e.printStackTrace();
+        printStackTrace(e);
       }
       return strArr;
     }
@@ -10114,6 +10116,13 @@ static public void runSketch(final String[] args,
     // Remove 60fps limit on the JavaFX "pulse" timer
     System.setProperty("javafx.animation.fullspeed", "true");
 
+    Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
+      public void uncaughtException(Thread t, Throwable e) {
+        e.printStackTrace();
+        uncaughtThrowable = e;
+      }
+    });
+
     // This doesn't work, need to mess with Info.plist instead
     /*
     // In an exported application, add the Contents/Java folder to the
diff --git a/core/src/processing/core/ThinkDifferent.java b/core/src/processing/core/ThinkDifferent.java
@@ -60,7 +60,8 @@ static public void init(final PApplet sketch) {
     application.setQuitHandler(new QuitHandler() {
       public void handleQuitRequestWith(QuitEvent event, QuitResponse response) {
         sketch.exit();
-        if (!attemptedQuit) {
+        if (PApplet.uncaughtThrowable == null &&  // no known crash
+            !attemptedQuit) {  // haven't tried yet
           response.cancelQuit();  // tell OS X we'll handle this
           attemptedQuit = true;
         } else {
diff --git a/core/todo.txt b/core/todo.txt
@@ -1,4 +1,6 @@
 0253 (3.2.1)
+_ listPaths(), listFiles()? 
+_   https://github.com/processing/processing/issues/4622
 
 
 started

-Original file line number
+Diff line change
@@ @@ -1,4 +1,6 @@ @@
 (3.2.1)
 +_ listPaths(), listFiles()?
 +_   https://github.com/processing/processing/issues/4622
 started