JAL-3048 wip externalise trigger from RunResponse

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

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index 7dbed05..a1d97e7 100644 (file)
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -1299,8 +1299,8 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
     {
       AlignExportOptions choices = new AlignExportOptions(
               alignPanel.getAlignViewport(), format, options);
-      choices.setResponseAction(outputAction);
-      choices.setResponseAction(cancelAction);
+      choices.setResponseAction(0, outputAction);
+      choices.setResponseAction(1, cancelAction);
       choices.showDialog();
     }
     else
@@ -1359,7 +1359,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
     {
       AlignExportOptions choices = new AlignExportOptions(
               alignPanel.getAlignViewport(), fileFormat, options);
-      choices.setResponseAction(outputAction);
+      choices.setResponseAction(0, outputAction);
       choices.showDialog();
     }
     else
@@ -1472,9 +1472,8 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
             MessageManager.getString("label.load_jalview_annotations"));
     chooser.setToolTipText(
             MessageManager.getString("label.load_jalview_annotations"));
-    chooser.addResponse(new RunResponse(JalviewFileChooser.APPROVE_OPTION)
+    chooser.addResponse(0, new RunResponse(JalviewFileChooser.APPROVE_OPTION)
     {
-
       @Override
       public void run()
       {
@@ -1482,7 +1481,6 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
         jalview.bin.Cache.setProperty("LAST_DIRECTORY", choice);
         loadJalviewDataFile(chooser.getSelectedFile(), null, null, null);
       }
-
     });
 
     chooser.showOpenDialog(this);
@@ -3966,8 +3964,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
     chooser.setToolTipText(
             MessageManager.getString("label.load_tree_file"));
 
-    chooser.addResponse(new jalview.util.dialogrunner.RunResponse(
-            JalviewFileChooser.APPROVE_OPTION)
+    chooser.addResponse(0,new RunResponse(JalviewFileChooser.APPROVE_OPTION)
     {
       @Override
       public void run()
@@ -5698,19 +5695,15 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
     chooser.setDialogTitle(MessageManager.getString("label.load_vcf_file"));
     chooser.setToolTipText(MessageManager.getString("label.load_vcf_file"));
     final AlignFrame us = this;
-    chooser.addResponse(new RunResponse(JalviewFileChooser.APPROVE_OPTION)
+    chooser.addResponse(0, new RunResponse(JalviewFileChooser.APPROVE_OPTION)
     {
       @Override
       public void run()
       {
-
-        {
-          String choice = chooser.getSelectedFile().getPath();
-          Cache.setProperty("LAST_DIRECTORY", choice);
-          SequenceI[] seqs = viewport.getAlignment().getSequencesArray();
-          new VCFLoader(choice).loadVCF(seqs, us);
-        }
-
+        String choice = chooser.getSelectedFile().getPath();
+        Cache.setProperty("LAST_DIRECTORY", choice);
+        SequenceI[] seqs = viewport.getAlignment().getSequencesArray();
+        new VCFLoader(choice).loadVCF(seqs, us);
       };
     });
     chooser.showOpenDialog(null);