MacOSX: faster startup, fixed double clicking on a .ino file. Fixes #4057

Author: Federico Fissore

app/src/processing/app/Editor.java

@@ -2171,72 +2171,56 @@ protected boolean handleOpenInternal(File sketchFile) {
 
     File file = SketchData.checkSketchFile(sketchFile);
 
-    if (file == null)
-    {
+    if (file == null) {
       if (!fileName.endsWith(".ino") && !fileName.endsWith(".pde")) {
 
-        Base.showWarning(tr("Bad file selected"),
-                         tr("Arduino can only open its own sketches\n" +
-                           "and other files ending in .ino or .pde"), null);
+        Base.showWarning(tr("Bad file selected"), tr("Arduino can only open its own sketches\n" +
+          "and other files ending in .ino or .pde"), null);
         return false;
 
       } else {
-        String properParent =
-          fileName.substring(0, fileName.length() - 4);
+        String properParent = fileName.substring(0, fileName.length() - 4);
 
-        Object[] options = { tr("OK"), tr("Cancel") };
+        Object[] options = {tr("OK"), tr("Cancel")};
         String prompt = I18n.format(tr("The file \"{0}\" needs to be inside\n" +
-	                                "a sketch folder named \"{1}\".\n" +
-	                                "Create this folder, move the file, and continue?"),
-	                              fileName,
-	                              properParent);
-
-        int result = JOptionPane.showOptionDialog(this,
-                                                  prompt,
-                                                  tr("Moving"),
-                                                  JOptionPane.YES_NO_OPTION,
-                                                  JOptionPane.QUESTION_MESSAGE,
-                                                  null,
-                                                  options,
-                                                  options[0]);
-
-        if (result == JOptionPane.YES_OPTION) {
-          // create properly named folder
-          File properFolder = new File(sketchFile.getParent(), properParent);
-          if (properFolder.exists()) {
-            Base.showWarning(tr("Error"),
-                             I18n.format(
-                               tr("A folder named \"{0}\" already exists. " +
-                                 "Can't open sketch."),
-                               properParent
-                             ),
-			   null);
-            return false;
-          }
-          if (!properFolder.mkdirs()) {
-            //throw new IOException("Couldn't create sketch folder");
-            Base.showWarning(tr("Error"),
-                             tr("Could not create the sketch folder."), null);
-            return false;
-          }
-          // copy the sketch inside
-          File properPdeFile = new File(properFolder, sketchFile.getName());
-          try {
-            Base.copyFile(sketchFile, properPdeFile);
-          } catch (IOException e) {
-            Base.showWarning(tr("Error"), tr("Could not copy to a proper location."), e);
-            return false;
-          }
+            "a sketch folder named \"{1}\".\n" +
+            "Create this folder, move the file, and continue?"),
+          fileName,
+          properParent);
 
-          // remove the original file, so user doesn't get confused
-          sketchFile.delete();
+        int result = JOptionPane.showOptionDialog(this, prompt, tr("Moving"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, null, options, options[0]);
 
-          // update with the new path
-          file = properPdeFile;
+        if (result != JOptionPane.YES_OPTION) {
+          return false;
+        }
 
-        } else if (result == JOptionPane.NO_OPTION) {
+        // create properly named folder
+        File properFolder = new File(sketchFile.getParent(), properParent);
+        if (properFolder.exists()) {
+          Base.showWarning(tr("Error"), I18n.format(tr("A folder named \"{0}\" already exists. " +
+            "Can't open sketch."), properParent), null);
+          return false;
+        }
+        if (!properFolder.mkdirs()) {
+          //throw new IOException("Couldn't create sketch folder");
+          Base.showWarning(tr("Error"), tr("Could not create the sketch folder."), null);
           return false;
         }
+        // copy the sketch inside
+        File properPdeFile = new File(properFolder, sketchFile.getName());
+        try {
+          Base.copyFile(sketchFile, properPdeFile);
+        } catch (IOException e) {
+          Base.showWarning(tr("Error"), tr("Could not copy to a proper location."), e);
+          return false;
+        }
+
+        // remove the original file, so user doesn't get confused
+        sketchFile.delete();
+
+        // update with the new path
+        file = properPdeFile;
+
       }
     }
 
@@ -2253,12 +2237,6 @@ protected boolean handleOpenInternal(File sketchFile) {
 
     // opening was successful
     return true;
-
-//    } catch (Exception e) {
-//      e.printStackTrace();
-//      statusError(e);
-//      return false;
-//    }
   }
 
   private void updateTitle() {

app/src/processing/app/macosx/ThinkDifferent.java

@@ -33,62 +33,71 @@
 /**
  * Deal with issues related to thinking different. This handles the basic
  * Mac OS X menu commands (and apple events) for open, about, prefs, etc.
- * <p/>
+ * <p>
  * Based on OSXAdapter.java from Apple DTS.
- * <p/>
+ * </p>
  * As of 0140, this code need not be built on platforms other than OS X,
  * because of the new platform structure which isolates through reflection.
  */
 public class ThinkDifferent {
 
-  private static final int MAX_WAIT_FOR_BASE = 10000;
+  private static final int MAX_WAIT_FOR_BASE = 30000;
 
   static public void init() {
     Application application = Application.getApplication();
     application.setAboutHandler(new AboutHandler() {
       @Override
       public void handleAbout(AppEvent.AboutEvent aboutEvent) {
-        if (waitForBase()) {
-          Base.INSTANCE.handleAbout();
-        }
+        new Thread(() -> {
+          if (waitForBase()) {
+            Base.INSTANCE.handleAbout();
+          }
+        }).start();
       }
     });
     application.setPreferencesHandler(new PreferencesHandler() {
       @Override
       public void handlePreferences(AppEvent.PreferencesEvent preferencesEvent) {
-        if (waitForBase()) {
-          Base.INSTANCE.handlePrefs();
-        }
+        new Thread(() -> {
+          if (waitForBase()) {
+            Base.INSTANCE.handlePrefs();
+          }
+        }).start();
       }
     });
     application.setOpenFileHandler(new OpenFilesHandler() {
       @Override
       public void openFiles(final AppEvent.OpenFilesEvent openFilesEvent) {
-        if (waitForBase()) {
-          for (File file : openFilesEvent.getFiles()) {
-            try {
-              Base.INSTANCE.handleOpen(file);
-              List<Editor> editors = Base.INSTANCE.getEditors();
-              if (editors.size() == 2 && editors.get(0).getSketch().isUntitled()) {
-                Base.INSTANCE.handleClose(editors.get(0));
+        new Thread(() -> {
+          if (waitForBase()) {
+            for (File file : openFilesEvent.getFiles()) {
+              System.out.println(file);
+              try {
+                Base.INSTANCE.handleOpen(file);
+                List<Editor> editors = Base.INSTANCE.getEditors();
+                if (editors.size() == 2 && editors.get(0).getSketch().isUntitled()) {
+                  Base.INSTANCE.handleClose(editors.get(0));
+                }
+              } catch (Exception e) {
+                throw new RuntimeException(e);
               }
-            } catch (Exception e) {
-              throw new RuntimeException(e);
             }
           }
-        }
+        }).start();
       }
     });
     application.setQuitHandler(new QuitHandler() {
       @Override
       public void handleQuitRequestWith(AppEvent.QuitEvent quitEvent, QuitResponse quitResponse) {
-        if (waitForBase()) {
-          if (Base.INSTANCE.handleQuit()) {
-            quitResponse.performQuit();
-          } else {
-            quitResponse.cancelQuit();
+        new Thread(() -> {
+          if (waitForBase()) {
+            if (Base.INSTANCE.handleQuit()) {
+              quitResponse.performQuit();
+            } else {
+              quitResponse.cancelQuit();
+            }
           }
-        }
+        }).start();
       }
     });
   }