JAL-3032 part2 local file reading by JFileChooser

[jalview.git] / src / jalview / gui / AlignFrame.java

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index a2b1e47..26c5548 100644 (file)
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -122,6 +122,7 @@ import java.awt.event.MouseEvent;
 import java.awt.print.PageFormat;
 import java.awt.print.PrinterJob;
 import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.PrintWriter;
@@ -136,6 +137,7 @@ import java.util.Vector;
 
 import javax.swing.JCheckBoxMenuItem;
 import javax.swing.JEditorPane;
+import javax.swing.JFileChooser;
 import javax.swing.JInternalFrame;
 import javax.swing.JLayeredPane;
 import javax.swing.JMenu;
@@ -150,7 +152,8 @@ import javax.swing.SwingUtilities;
  * @version $Revision$
  */
 public class AlignFrame extends GAlignFrame implements DropTargetListener,
-        IProgressIndicator, AlignViewControllerGuiI, ColourChangeListener
+        IProgressIndicator, AlignViewControllerGuiI, ColourChangeListener,
+        PropertyChangeListener
 {
 
   public static final int DEFAULT_WIDTH = 700;
@@ -324,6 +327,12 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
     init();
   }
 
+  @Override
+  public void propertyChange(PropertyChangeEvent evt)
+  {
+    Desktop.getDesktop().propertyChange(evt);
+  }
+
   /**
    * initalise the alignframe from the underlying viewport data and the
    * configurations
@@ -1121,6 +1130,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
 
     int value = chooser.showSaveDialog(this);
 
+
     if (value == JalviewFileChooser.APPROVE_OPTION)
     {
       currentFileFormat = chooser.getSelectedFormat();
@@ -1421,14 +1431,30 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
     chooser.setToolTipText(
             MessageManager.getString("label.load_jalview_annotations"));
 
-    int value = chooser.showOpenDialog(null);
+    Desktop.getDesktop().dialogData = new Object[] { "SelectedFile",
+        new Runnable()
+        {
+
+          @Override
+          public void run()
+          {
+            Object[] data = Desktop.getDesktop().dialogData;
+            int value = ((Integer) data[0]).intValue();
+
+            if (value == JFileChooser.APPROVE_OPTION)
+            {
+              JalviewFileChooser chooser = (JalviewFileChooser) data[2];
+              String choice = chooser.getSelectedFile().getPath();
+              jalview.bin.Cache.setProperty("LAST_DIRECTORY", choice);
+              loadJalviewDataFile(choice, null, null, null);
+            }
+          }
+
+        }, chooser };
+
+    chooser.showOpenDialog(null);
+
 
-    if (value == JalviewFileChooser.APPROVE_OPTION)
-    {
-      String choice = chooser.getSelectedFile().getPath();
-      jalview.bin.Cache.setProperty("LAST_DIRECTORY", choice);
-      loadJalviewDataFile(choice, null, null, null);
-    }
 
   }
 
@@ -5618,6 +5644,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
     }
 
   }
+
 }
 
 class PrintThread extends Thread