Merge pull request #2737 from gephi/u/totetmatt/bug_fix_empty_gephi_file_on_save

#2736 Fix issue with empty gephi file when save on close

modules/DesktopImport/src/main/java/org/gephi/desktop/importer/DesktopImportControllerUI.java

@@ -356,24 +356,21 @@ public class DesktopImportControllerUI implements ImportControllerUI {
                 importer.getClass().getSimpleName()));
         String taskName =
             NbBundle.getMessage(DesktopImportControllerUI.class, "DesktopImportControllerUI.taskName", containerSource);
-        executor.execute(task, new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    Container container;
-                    if (importer instanceof FileImporter.FileAware && file != null) {
-                        container = controller.importFile(file, importer);
-                    } else {
-                        container = controller.importFile(reader, importer);
-                    }
+        executor.execute(task, () -> {
+            try {
+                Container container;
+                if (importer instanceof FileImporter.FileAware && file != null) {
+                    container = controller.importFile(file, importer);
+                } else {
+                    container = controller.importFile(reader, importer);
+                }
 
-                    if (container != null) {
-                        container.setSource(containerSource);
-                        results.add(container);
-                    }
-                } catch (Exception ex) {
-                    throw new RuntimeException(ex);
+                if (container != null) {
+                    container.setSource(containerSource);
+                    results.add(container);
                 }
+            } catch (Exception ex) {
+                throw new RuntimeException(ex);
             }
         }, taskName, errorHandler.createHandler(containerSource));
     }

modules/DesktopProject/src/main/java/org/gephi/desktop/project/ProjectControllerUIImpl.java

@@ -47,6 +47,10 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
 import javax.swing.JFileChooser;
 import javax.swing.JFrame;
 import javax.swing.JOptionPane;
@@ -222,22 +226,28 @@ public class ProjectControllerUIImpl implements ProjectListener {
         });
     }
 
-    private void saveProject(Project project, File file) {
-        longTaskExecutor.execute(null, () -> {
-            controller.saveProject(project, file);
+    private Future<Void> saveProject(Project project, File file) {
+
+
+        return longTaskExecutor.execute(null,   new Callable<Void>() {
+            @Override
+            public Void call() throws Exception {
+                controller.saveProject(project, file);
+                return null;
+            }
         });
     }
 
-    public void saveProject() {
+    public Future<Void> saveProject() {
         Project project = controller.getCurrentProject();
         if (project.hasFile()) {
-            saveProject(project, project.getFile());
+            return saveProject(project, project.getFile());
         } else {
-            saveAsProject();
+            return saveAsProject();
         }
     }
 
-    public void saveAsProject() {
+    public Future<Void> saveAsProject() {
         final String LAST_PATH = "SaveAsProject_Last_Path";
         final String LAST_PATH_DEFAULT = "SaveAsProject_Last_Path_Default";
 
@@ -281,8 +291,9 @@ public class ProjectControllerUIImpl implements ProjectListener {
             NbPreferences.forModule(ProjectControllerUIImpl.class).put(LAST_PATH, file.getAbsolutePath());
 
             // Save file
-            saveProject(controller.getCurrentProject(), file);
+            return saveProject(controller.getCurrentProject(), file);
         }
+        return CompletableFuture.completedFuture(null);
     }
 
     private boolean canExport(JFileChooser chooser) {
@@ -335,7 +346,14 @@ public class ProjectControllerUIImpl implements ProjectListener {
                 new Object[] {saveBundle, doNotSaveBundle, cancelBundle}, saveBundle);
             Object result = DialogDisplayer.getDefault().notify(msg);
             if (result == saveBundle) {
-                saveProject();
+                Future<Void> saveTask = saveProject();
+                if(saveTask !=null){
+                    try {
+                        saveTask.get();
+                    } catch (InterruptedException | ExecutionException ex) {
+                        Exceptions.printStackTrace(ex);
+                    }
+                }
             } else if (result == cancelBundle) {
                 return false;
             }