Merge branch 'master' of github.com:processing/processing

benfry · benfry · commit 229f40834dcd · 2014-05-10T19:06:33.000-04:00
diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java
@@ -127,6 +127,8 @@ public class Base {
   private JMenu sketchbookMenu;
 
   private Recent recent;
+
+  private JFileChooser fileChooser; // to remember the current directory
 //  private JMenu recentMenu;
 
   static protected File sketchbookFolder;
@@ -862,10 +864,13 @@ public boolean accept(File dir, String name) {
       }
 
     } else {
-      JFileChooser fc = new JFileChooser();
-      fc.setDialogTitle(prompt);
+      if (fileChooser == null)
+      {
+        fileChooser = new JFileChooser();
+      }
+      fileChooser.setDialogTitle(prompt);
 
-      fc.setFileFilter(new javax.swing.filechooser.FileFilter() {
+      fileChooser.setFileFilter(new javax.swing.filechooser.FileFilter() {
         public boolean accept(File file) {
           // JFileChooser requires you to explicitly say yes to directories
           // as well (unlike the AWT chooser). Useful, but... different.
@@ -885,8 +890,8 @@ public String getDescription() {
           return "Processing Sketch";
         }
       });
-      if (fc.showOpenDialog(activeEditor) == JFileChooser.APPROVE_OPTION) {
-        handleOpen(fc.getSelectedFile().getAbsolutePath());
+      if (fileChooser.showOpenDialog(activeEditor) == JFileChooser.APPROVE_OPTION) {
+        handleOpen(fileChooser.getSelectedFile().getAbsolutePath());
       }
     }
   }
