Registered the save task as background task

This makes the dialog that pops up if background tasks are running wait for pending saves.
btut · May 10, 2020 · d7442cc · d7442cc
1 parent e9a7176
commit d7442cc
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 55 deletions.
diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -14,6 +14,7 @@
 import javafx.application.Platform;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
+import javafx.concurrent.Task;
 import javafx.geometry.Orientation;
 import javafx.scene.Group;
 import javafx.scene.Node;
@@ -402,15 +403,6 @@ private void tearDownJabRef(List<String> filenames) {
      * @return true if the user chose to quit; false otherwise
      */
     public boolean quit() {
-        // First ask if the user really wants to close, if there are still background tasks running
-        if (stateManager.anyTaskRunningBinding.getValue()) {
-            WaitForBackgroundtasksFinishedDialog waitForBackgroundtasksFinishedDialog = new WaitForBackgroundtasksFinishedDialog(dialogService);
-            if (!waitForBackgroundtasksFinishedDialog.showAndWait(stateManager)) {
-                return false;
-            }
-        }
-
-        // Then ask if the user really wants to close, if the library has not been saved since last save.
         List<String> filenames = new ArrayList<>();
         for (int i = 0; i < tabbedPane.getTabs().size(); i++) {
             BasePanel panel = getBasePanelAt(i);
@@ -431,8 +423,35 @@ public boolean quit() {
             context.getDatabasePath().map(Path::toAbsolutePath).map(Path::toString).ifPresent(filenames::add);
         }
 
-        WaitForSaveFinishedDialog waitForSaveFinishedDialog = new WaitForSaveFinishedDialog(dialogService);
-        waitForSaveFinishedDialog.showAndWait(getBasePanelList());
+        // Check if any tabs are saving. If so, create a task waiting for them
+        if (getBasePanelList().stream().anyMatch(BasePanel::isSaving)) {
+            Task<Void> waitForSaveFinished = new Task<Void>() {
+                @Override
+                protected Void call() throws Exception {
+                    updateTitle("Saving");
+                    while (getBasePanelList().stream().anyMatch(BasePanel::isSaving)) {
+                        if (isCancelled()) {
+                            return null;
+                        } else {
+                            Thread.sleep(100);
+                        }
+                    }
+                    return null;
+                }
+            };
+
+            stateManager.getBackgroundTasks().add(waitForSaveFinished);
+            Globals.TASK_EXECUTOR.execute(waitForSaveFinished);
+
+        }
+
+        // Ask if the user really wants to close, if there are background tasks running.
+        if (stateManager.anyTaskRunningBinding.getValue()) {
+            WaitForBackgroundtasksFinishedDialog waitForBackgroundtasksFinishedDialog = new WaitForBackgroundtasksFinishedDialog(dialogService);
+            if (!waitForBackgroundtasksFinishedDialog.showAndWait(stateManager)) {
+                return false;
+            }
+        }
 
         // Good bye!
         tearDownJabRef(filenames);

diff --git a/src/main/java/org/jabref/gui/WaitForSaveFinishedDialog.java b/src/main/java/org/jabref/gui/WaitForSaveFinishedDialog.java
diff --git a/src/main/java/org/jabref/gui/util/BackgroundTask.java b/src/main/java/org/jabref/gui/util/BackgroundTask.java
@@ -35,7 +35,8 @@
 public abstract class BackgroundTask<V> {
 
     public static ImmutableMap<String, Node> iconMap = ImmutableMap.of(
-            Localization.lang("Downloading"), IconTheme.JabRefIcons.DOWNLOAD.getGraphicNode()
+            Localization.lang("Downloading"), IconTheme.JabRefIcons.DOWNLOAD.getGraphicNode(),
+            Localization.lang("Saving"), IconTheme.JabRefIcons.SAVE_ALL.getGraphicNode()
     );
 
     public static Callback<Task<?>, Node> iconCallback = task -> {