Fix Export Bug and Automatically Close JDialog

Fix the bug that raised a null error whenever an export did not go through, and made the JDialog automatically close whenever the user opens a remote file making for a smoother experience.
virtualcell · Dec 13, 2023 · fb5cc80 · fb5cc80
1 parent 6fe7e7d
commit fb5cc80
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/main/java/org/vcell/vcellfiji/N5ImageHandler.java b/src/main/java/org/vcell/vcellfiji/N5ImageHandler.java
@@ -71,7 +71,9 @@ protected ArrayList<String> doInBackground() throws Exception {
                 protected void done() {
                     enableCriticalButtons(true);
                     try{
-                        get();
+                        if(vGui.jFileChooserResult == JFileChooser.APPROVE_OPTION){
+                            get();
+                        }
                     }
                     catch (Exception exception){
                         logService.error(exception);
@@ -125,6 +127,7 @@ protected void done() {
                     enableCriticalButtons(true);
                     try{
                         get();
+                        vGui.remoteFileSelection.dispose();
                     }
                     catch (Exception exception){
                         logService.error(exception);

diff --git a/src/main/java/org/vcell/vcellfiji/UI/N5ViewerGUI.java b/src/main/java/org/vcell/vcellfiji/UI/N5ViewerGUI.java
@@ -20,6 +20,7 @@ public class N5ViewerGUI extends JFrame {
     private JPanel datasetListPanel;
     private JLabel datasetLabel;
     private JLabel openInMemory;
+    public int jFileChooserResult;
 
     public RemoteFileSelection remoteFileSelection;
 
@@ -95,7 +96,7 @@ public N5ViewerGUI() {
             @Override
             public void actionPerformed(ActionEvent e) {
                 localFileDialog.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES);
-                localFileDialog.showOpenDialog(thisJFrame);
+                jFileChooserResult = localFileDialog.showOpenDialog(thisJFrame);
 //                System.out.print(localFileDialog.getSelectedFile());
             }
         });