From: hansonr <hansonr@STO24954W.ad.stolaf.edu>
Date: Sat, 22 Dec 2018 18:49:52 +0000 (-0600)
Subject: Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git... 
X-Git-Tag: Develop-2_11_2_0-d20201215~24^2~68^2~334
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=e07017f606a3c6cb26e75ef117c27698cd307fa8;hp=f0b482fcd6b3055031658f3ff9f9895910322988;p=jalview.git

Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git/jalview.git into Jalview-BH/JAL-3026-JAL-3063-JAXB
---

diff --git a/src/jalview/io/JalviewFileChooser.java b/src/jalview/io/JalviewFileChooser.java
index c275ef0..56b8637 100755
--- a/src/jalview/io/JalviewFileChooser.java
+++ b/src/jalview/io/JalviewFileChooser.java
@@ -22,6 +22,7 @@
 package jalview.io;
 
 import jalview.bin.Cache;
+import jalview.bin.Jalview;
 import jalview.gui.JvOptionPane;
 import jalview.util.MessageManager;
 import jalview.util.Platform;
@@ -193,15 +194,13 @@ public class JalviewFileChooser extends JFileChooser implements DialogRunnerI,
   {
     int value = super.showOpenDialog(this);
     
-    /*
-     * code below here is not reached in JalviewJS, instead
-     * propertyChange() is called for dialog action
-     */
-    /**
-     * @j2sNative
-     */
+    if (!Jalview.isJS())
     {
-    handleResponse(value);
+      /*
+       * code here is not run in JalviewJS, instead
+       * propertyChange() is called for dialog action
+       */
+      handleResponse(value);
     }
     return value;
   }