Fix libre office connection and other progress dialogs (#6478)

* Fix libre office connection and other progress dialogs Fixes #6477 * fix checkstyle * Rename to show
JabRef · May 14, 2020 · 46777c2 · 46777c2
1 parent 09111be
commit 46777c2
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 12 deletions.
diff --git a/lib/libreoffice.jar b/lib/libreoffice.jar
diff --git a/src/main/java/org/jabref/gui/DialogService.java b/src/main/java/org/jabref/gui/DialogService.java
@@ -193,7 +193,7 @@ Optional<ButtonType> showCustomButtonDialogAndWait(Alert.AlertType type, String
      * @param content message to show above the progress bar
      * @param task    The {@link Task} which executes the work and for which to show the dialog
      */
-    <V> Optional<Void> showProgressDialogAndWait(String title, String content, Task<V> task);
+    <V> void showProgressDialog(String title, String content, Task<V> task);
 
     /**
      * Constructs and shows a dialog showing the progress of running background tasks.

diff --git a/src/main/java/org/jabref/gui/JabRefDialogService.java b/src/main/java/org/jabref/gui/JabRefDialogService.java
@@ -272,7 +272,7 @@ public <R> Optional<R> showCustomDialogAndWait(Dialog<R> dialog) {
     }
 
     @Override
-    public <V> Optional<Void> showProgressDialogAndWait(String title, String content, Task<V> task) {
+    public <V> void showProgressDialog(String title, String content, Task<V> task) {
         ProgressDialog progressDialog = new ProgressDialog(task);
         progressDialog.setHeaderText(null);
         progressDialog.setTitle(title);
@@ -288,12 +288,12 @@ public <V> Optional<Void> showProgressDialogAndWait(String title, String content
             progressDialog.close();
         });
         themeLoader.installCss(progressDialog.getDialogPane().getScene(), preferences);
-        return progressDialog.showAndWait();
+        progressDialog.show();
     }
 
     @Override
     public <V> Optional<ButtonType> showBackgroundProgressDialogAndWait(String title, String content, StateManager stateManager) {
-        TaskProgressView taskProgressView = new TaskProgressView();
+        TaskProgressView taskProgressView = new TaskProgressView<>();
         EasyBind.listBind(taskProgressView.getTasks(), stateManager.getBackgroundTasks());
         taskProgressView.setRetainTasks(false);
         taskProgressView.setGraphicFactory(BackgroundTask::getIcon);

diff --git a/src/main/java/org/jabref/gui/WaitForSaveFinishedDialog.java b/src/main/java/org/jabref/gui/WaitForSaveFinishedDialog.java
@@ -33,7 +33,7 @@ protected Void call() throws Exception {
                 }
             };
 
-            dialogService.showProgressDialogAndWait(
+            dialogService.showProgressDialog(
                     Localization.lang("Please wait..."),
                     Localization.lang("Waiting for save operation to finish") + "...",
                     waitForSaveFinished

diff --git a/src/main/java/org/jabref/gui/copyfiles/CopyFilesAction.java b/src/main/java/org/jabref/gui/copyfiles/CopyFilesAction.java
@@ -51,7 +51,7 @@ public void execute() {
         Optional<Path> exportPath = dialogService.showDirectorySelectionDialog(dirDialogConfiguration);
         exportPath.ifPresent(path -> {
             Task<List<CopyFilesResultItemViewModel>> exportTask = new CopyFilesTask(database, entries, path);
-            dialogService.showProgressDialogAndWait(
+            dialogService.showProgressDialog(
                     Localization.lang("Copy linked files to folder..."),
                     Localization.lang("Copy linked files to folder..."),
                     exportTask);

diff --git a/src/main/java/org/jabref/gui/externalfiles/AutoLinkFilesAction.java b/src/main/java/org/jabref/gui/externalfiles/AutoLinkFilesAction.java
@@ -74,7 +74,7 @@ protected void succeeded() {
             }
         };
 
-        dialogService.showProgressDialogAndWait(
+        dialogService.showProgressDialog(
                 Localization.lang("Automatically setting file links"),
                 Localization.lang("Searching for files"),
                 linkFilesTask);

diff --git a/src/main/java/org/jabref/gui/externalfiles/DownloadFullTextAction.java b/src/main/java/org/jabref/gui/externalfiles/DownloadFullTextAction.java
@@ -100,7 +100,7 @@ protected Map<BibEntry, Optional<URL>> call() {
         findFullTextsTask.setOnSucceeded(value ->
                 downloadFullTexts(findFullTextsTask.getValue(), stateManager.getActiveDatabase().get()));
 
-        dialogService.showProgressDialogAndWait(
+        dialogService.showProgressDialog(
                 Localization.lang("Download full text documents"),
                 Localization.lang("Looking for full text document..."),
                 findFullTextsTask);

diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityCheckAction.java b/src/main/java/org/jabref/gui/integrity/IntegrityCheckAction.java
@@ -77,7 +77,7 @@ protected List<IntegrityMessage> call() {
         });
         task.setOnFailed(event -> dialogService.showErrorDialogAndWait("Integrity check failed."));
 
-        dialogService.showProgressDialogAndWait(
+        dialogService.showProgressDialog(
                 Localization.lang("Checking integrity..."),
                 Localization.lang("Checking integrity..."),
                 task);

diff --git a/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java b/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java
@@ -333,7 +333,7 @@ private void connectAutomatically() {
             connect();
         } else {
 
-            Task<Void> taskConnectIfInstalled = new Task<Void>() {
+            Task<Void> taskConnectIfInstalled = new Task<>() {
 
                 @Override
                 protected Void call() throws Exception {
@@ -350,7 +350,7 @@ protected Void call() throws Exception {
             taskConnectIfInstalled.setOnSucceeded(value -> connect());
             taskConnectIfInstalled.setOnFailed(value -> dialogService.showErrorDialogAndWait(Localization.lang("Autodetection failed"), Localization.lang("Autodetection failed"), taskConnectIfInstalled.getException()));
 
-            dialogService.showProgressDialogAndWait(Localization.lang("Autodetecting paths..."), Localization.lang("Autodetecting paths..."), taskConnectIfInstalled);
+            dialogService.showProgressDialog(Localization.lang("Autodetecting paths..."), Localization.lang("Autodetecting paths..."), taskConnectIfInstalled);
             taskExecutor.execute(taskConnectIfInstalled);
         }
     }
@@ -418,7 +418,7 @@ protected OOBibBase call() throws Exception {
             }
         });
 
-        dialogService.showProgressDialogAndWait(Localization.lang("Autodetecting paths..."), Localization.lang("Autodetecting paths..."), connectTask);
+        dialogService.showProgressDialog(Localization.lang("Autodetecting paths..."), Localization.lang("Autodetecting paths..."), connectTask);
         taskExecutor.execute(connectTask);
     }