JAL-3048 AlignFrame->File->Load Tree adapted for js

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

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index 2587866..dafeafc 100644 (file)
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -1118,6 +1118,8 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
   @Override
   public void saveAs_actionPerformed(ActionEvent e)
   {
+    // TODO: JAL-3048 JalviewFileChooser - Save option
+
     String format = currentFileFormat == null ? null
             : currentFileFormat.getName();
     JalviewFileChooser chooser = JalviewFileChooser
@@ -1422,7 +1424,6 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
   @Override
   public void associatedData_actionPerformed(ActionEvent e)
   {
-    // Pick the tree file
     JalviewFileChooser chooser = new JalviewFileChooser(
             jalview.bin.Cache.getProperty("LAST_DIRECTORY"));
     chooser.setFileView(new JalviewFileView());
@@ -3904,6 +3905,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
   @Override
   protected void loadTreeMenuItem_actionPerformed(ActionEvent e)
   {
+    // TODO: JAL-3048 JalviewFileChooser
     // Pick the tree file
     JalviewFileChooser chooser = new JalviewFileChooser(
             jalview.bin.Cache.getProperty("LAST_DIRECTORY"));
@@ -3913,33 +3915,39 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
     chooser.setToolTipText(
             MessageManager.getString("label.load_tree_file"));
 
-    int value = chooser.showOpenDialog(null);
-
-    if (value == JalviewFileChooser.APPROVE_OPTION)
-    {
-      String filePath = chooser.getSelectedFile().getPath();
-      Cache.setProperty("LAST_DIRECTORY", filePath);
-      NewickFile fin = null;
-      try
-      {
-        fin = new NewickFile(filePath, DataSourceType.FILE);
-        viewport.setCurrentTree(showNewickTree(fin, filePath).getTree());
-      } catch (Exception ex)
-      {
-        JvOptionPane.showMessageDialog(Desktop.desktop, ex.getMessage(),
-                MessageManager.getString("label.problem_reading_tree_file"),
-                JvOptionPane.WARNING_MESSAGE);
-        ex.printStackTrace();
-      }
-      if (fin != null && fin.hasWarningMessage())
-      {
-        JvOptionPane.showMessageDialog(Desktop.desktop,
-                fin.getWarningMessage(),
-                MessageManager
-                        .getString("label.possible_problem_with_tree_file"),
-                JvOptionPane.WARNING_MESSAGE);
-      }
-    }
+    chooser.response(
+            new jalview.util.dialogrunner.RunResponse(JalviewFileChooser.APPROVE_OPTION)
+            {
+              @Override
+              public void run()
+              {
+                String filePath = chooser.getSelectedFile().getPath();
+                Cache.setProperty("LAST_DIRECTORY", filePath);
+                NewickFile fin = null;
+                try
+                {
+                  fin = new NewickFile(filePath, DataSourceType.FILE);
+                  viewport.setCurrentTree(
+                          showNewickTree(fin, filePath).getTree());
+                } catch (Exception ex)
+                {
+                  JvOptionPane.showMessageDialog(Desktop.desktop,
+                          ex.getMessage(),
+                          MessageManager.getString(
+                                  "label.problem_reading_tree_file"),
+                          JvOptionPane.WARNING_MESSAGE);
+                  ex.printStackTrace();
+                }
+                if (fin != null && fin.hasWarningMessage())
+                {
+                  JvOptionPane.showMessageDialog(Desktop.desktop,
+                          fin.getWarningMessage(),
+                          MessageManager.getString(
+                                  "label.possible_problem_with_tree_file"),
+                          JvOptionPane.WARNING_MESSAGE);
+                }
+              }
+            }).openDialog(this);
   }
 
   public TreePanel showNewickTree(NewickFile nf, String treeTitle)
@@ -4550,7 +4558,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
                  */
                 for (Object[] o : filesmatched)
                 {
-                  filesnotmatched.add((String) o[0]);
+                  filesnotmatched.add(o[0]);
                 }
               }
             }
@@ -5633,6 +5641,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
   @Override
   protected void loadVcf_actionPerformed()
   {
+    // TODO: JAL-3048 - No VCF support in JsJalview
     JalviewFileChooser chooser = new JalviewFileChooser(
             Cache.getProperty("LAST_DIRECTORY"));
     chooser.setFileView(new JalviewFileView());