Fix libre office connection and other progress dialogs

Fixes #6477
JabRef · May 14, 2020 · d138f4a · d138f4a
1 parent 16d4938
commit d138f4a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 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 showProgressDialogAndWait(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 showProgressDialogAndWait(String title, String content, Task<V> task) {
         ProgressDialog progressDialog = new ProgressDialog(task);
         progressDialog.setHeaderText(null);
         progressDialog.setTitle(title);
@@ -288,9 +288,10 @@ 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();

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 {