Changed callback to method in BackgroundTask

Addresses #6443 (comment)
JabRef · May 11, 2020 · 396411a · 396411a
1 parent fcb1d0c
commit 396411a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/src/main/java/org/jabref/gui/JabRefDialogService.java b/src/main/java/org/jabref/gui/JabRefDialogService.java
@@ -296,7 +296,7 @@ public <V> Optional<ButtonType> showBackgroundProgressDialogAndWait(String title
         TaskProgressView taskProgressView = new TaskProgressView();
         EasyBind.listBind(taskProgressView.getTasks(), stateManager.getBackgroundTasks());
         taskProgressView.setRetainTasks(false);
-        taskProgressView.setGraphicFactory(BackgroundTask.iconCallback);
+        taskProgressView.setGraphicFactory(BackgroundTask::getIcon);
 
         Label message = new Label(content);
 

diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -984,7 +984,7 @@ hide it and clip it to a square of (width x width) each time width is updated.
             TaskProgressView taskProgressView = new TaskProgressView();
             EasyBind.listBind(taskProgressView.getTasks(), stateManager.getBackgroundTasks());
             taskProgressView.setRetainTasks(true);
-            taskProgressView.setGraphicFactory(BackgroundTask.iconCallback);
+            taskProgressView.setGraphicFactory(BackgroundTask::getIcon);
 
             PopOver progressViewPopOver = new PopOver(taskProgressView);
             progressViewPopOver.setTitle(Localization.lang("Background Tasks"));

diff --git a/src/main/java/org/jabref/gui/util/BackgroundTask.java b/src/main/java/org/jabref/gui/util/BackgroundTask.java
@@ -16,7 +16,6 @@
 import javafx.beans.property.StringProperty;
 import javafx.concurrent.Task;
 import javafx.scene.Node;
-import javafx.util.Callback;
 
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.logic.l10n.Localization;
@@ -38,14 +37,6 @@ public abstract class BackgroundTask<V> {
             Localization.lang("Downloading"), IconTheme.JabRefIcons.DOWNLOAD.getGraphicNode()
     );
 
-    public static Callback<Task<?>, Node> iconCallback = task -> {
-        if (BackgroundTask.iconMap.containsKey(task.getTitle())) {
-            return BackgroundTask.iconMap.get(task.getTitle());
-        } else {
-            return null;
-        }
-    };
-
     private Runnable onRunning;
     private Consumer<V> onSuccess;
     private Consumer<Exception> onException;
@@ -266,6 +257,13 @@ public BackgroundTask<V> withInitialMessage(String message) {
         return this;
     }
 
+    public static Node getIcon(Object task) {
+        if (task instanceof Task) {
+            return BackgroundTask.iconMap.getOrDefault(((Task<?>) task).getTitle(), null);
+        }
+        return null;
+    }
+
     static class BackgroundProgress {
 
         private final double workDone;