fix the messages during Export to Application

Author: benfry

app/src/processing/app/ui/ExportPrompt.java

@@ -23,15 +23,6 @@
 
 package processing.app.ui;
 
-import processing.app.Language;
-import processing.app.Platform;
-import processing.app.Preferences;
-import processing.app.SketchException;
-import processing.app.platform.MacPlatform;
-import processing.core.PApplet;
-import processing.data.StringDict;
-import processing.data.StringList;
-
 import javax.swing.*;
 import javax.swing.border.EmptyBorder;
 import javax.swing.border.TitledBorder;
@@ -43,6 +34,15 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import processing.app.Language;
+import processing.app.Platform;
+import processing.app.Preferences;
+import processing.app.platform.MacPlatform;
+
+import processing.core.PApplet;
+import processing.data.StringDict;
+import processing.data.StringList;
+
 
 public class ExportPrompt {
   static final String MACOS_EXPORT_WIKI =
@@ -111,7 +111,7 @@ protected boolean anyExportButton() {
   }
 
 
-  public boolean trigger() throws SketchException {
+  public void trigger() {
     final JDialog dialog = new JDialog(editor, Language.text("export"), true);
 
     JPanel panel = new JPanel();
@@ -347,7 +347,7 @@ public void mousePressed(MouseEvent event) {
       // closed window by hitting Cancel or ESC
       editor.statusNotice(Language.text("export.notice.exporting.cancel"));
     }
-    return false;
+//    return false;
   }
 
 

java/src/processing/mode/java/JavaEditor.java

@@ -469,34 +469,23 @@ public String getCommentPrefix() {
 
 
   /**
-   * Handler for Sketch → Export Application
+   * Handler for Sketch → Export Application
    */
   public void handleExportApplication() {
     if (handleExportCheckModified()) {
       statusNotice(Language.text("export.notice.exporting"));
-      try {
-        ExportPrompt ep = new ExportPrompt(this, () -> {
-          try {
-            jmode.handleExportApplication(getSketch());
-          } catch (Exception e) {
-            statusNotice(Language.text("export.notice.exporting.error"));
-            e.printStackTrace();
+      ExportPrompt ep = new ExportPrompt(this, () -> {
+        try {
+          if (jmode.handleExportApplication(getSketch())) {
+            Platform.openFolder(sketch.getFolder());
+            statusNotice(Language.text("export.notice.exporting.done"));
           }
-        });
-        if (ep.trigger()) {
-          Platform.openFolder(sketch.getFolder());
-          statusNotice(Language.text("export.notice.exporting.done"));
-          //} else {
-          // error message will already be visible
-          // or there was no error, in which case it was canceled.
+        } catch (Exception e) {
+          statusNotice(Language.text("export.notice.exporting.error"));
+          e.printStackTrace();
         }
-      } catch (SketchException se) {
-        EventQueue.invokeLater(() -> statusError(se));
-
-      } catch (Exception e) {
-        statusNotice(Language.text("export.notice.exporting.error"));
-        e.printStackTrace();
-      }
+      });
+      ep.trigger();
     }
   }
 

todo.txt

@@ -24,12 +24,12 @@ X move ExportDialog to processing.app.ui (out of Java Mode) so it can be used by
 X move isXcodeInstalled() methods from JavaBuild into MacPlatform
 X add activateIgnoringOtherApps() to ThinkDifferent
 
+export
 X Exported project to Windows cannot find Java
 X   https://github.com/processing/processing4/issues/667
-
-_ when not exporting Java as well, the "exporting application" message doesn't seem to clear
-
-_ after exporting application, open the sketch folder
+X when exporting, the "exporting application" message doesn't seem to clear
+X   was a regression caused by ExportPrompt changes
+X   after exporting application, open the sketch folder
 
 _ exporting application while still running on Windows
 _   just says "Error during export" rather than something more useful about deleting dir