[WIP] Modify behaviour of OSX close

Author: facchinm

app/src/processing/app/Base.java

@@ -45,6 +45,7 @@
 import processing.app.debug.TargetPackage;
 import processing.app.debug.TargetPlatform;
 import processing.app.helpers.*;
+import processing.app.helpers.OSUtils;
 import processing.app.helpers.filefilters.OnlyDirs;
 import processing.app.helpers.filefilters.OnlyFilesWithExtension;
 import processing.app.javax.swing.filechooser.FileNameExtensionFilter;
@@ -921,7 +922,10 @@ public boolean handleClose(Editor editor) {
       storeSketches();
 
       // This will store the sketch count as zero
+      editor.setVisible(false);
+      editor.dispose();
       editors.remove(editor);
+
       try {
         Editor.serialMonitor.close();
       } catch (Exception e) {
@@ -932,9 +936,10 @@ public boolean handleClose(Editor editor) {
       // Save out the current prefs state
       PreferencesData.save();
 
-      // Since this wasn't an actual Quit event, call System.exit()
-      System.exit(0);
-
+      // Since this wasn't an actual Quit event, call System.exit() (not on OSX)
+      if (!OSUtils.isMacOS()) {
+        System.exit(0);
+      }
     } else {
       // More than one editor window open,
       // proceed with closing the current window.
@@ -976,7 +981,7 @@ public boolean handleQuit() {
       // Save out the current prefs state
       PreferencesData.save();
 
-      if (!OSUtils.hasMacOSStyleMenus()) {
+      if (!OSUtils.isMacOS()) {
         // If this was fired from the menu or an AppleEvent (the Finder),
         // then Mac OS X will send the terminate signal itself.
         System.exit(0);

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

@@ -23,6 +23,8 @@
 package processing.app.macosx;
 
 import com.apple.eawt.*;
+import com.apple.eawt.AppEvent.AppReOpenedEvent;
+
 import processing.app.Base;
 import processing.app.Editor;
 
@@ -45,6 +47,19 @@ public class ThinkDifferent {
 
   static public void init() {
     Application application = Application.getApplication();
+
+    application.addAppEventListener(new AppReOpenedListener() {
+      @Override
+        public void appReOpened(AppReOpenedEvent aroe) {
+          try {
+            Base.INSTANCE.handleNew();
+          } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+          }
+      }
+    });
+
     application.setAboutHandler(new AboutHandler() {
       @Override
       public void handleAbout(AppEvent.AboutEvent aboutEvent) {