Merge pull request JabRef#10416 from JabRef/fixFXThread

Fix fetcher worker execution on background thread

Author: Siedlerchr

src/main/java/org/jabref/gui/EntryTypeView.java

@@ -92,15 +92,15 @@ public EntryTypeView(LibraryTab libraryTab, DialogService dialogService, Prefere
         btnGenerate.textProperty().bind(EasyBind.map(viewModel.searchingProperty(), searching -> searching ? Localization.lang("Searching...") : Localization.lang("Generate")));
         btnGenerate.disableProperty().bind(viewModel.idFieldValidationStatus().validProperty().not().or(viewModel.searchingProperty()));
 
-        EasyBind.subscribe(viewModel.searchSuccesfulProperty(), value -> {
-            if (value) {
+        EasyBind.subscribe(viewModel.searchSuccesfulProperty(), isSuccessful -> {
+            if (isSuccessful) {
                 setEntryTypeForReturnAndClose(Optional.empty());
             }
         });
     }
 
-    private void addEntriesToPane(FlowPane pane, Collection<? extends BibEntryType> entries) {
-        for (BibEntryType entryType : entries) {
+    private void addEntriesToPane(FlowPane pane, Collection<? extends BibEntryType> entryTypes) {
+        for (BibEntryType entryType : entryTypes) {
             Button entryButton = new Button(entryType.getType().getDisplayName());
             entryButton.setUserData(entryType);
             entryButton.setOnAction(event -> setEntryTypeForReturnAndClose(Optional.of(entryType)));

src/main/java/org/jabref/gui/EntryTypeViewModel.java

@@ -131,7 +131,6 @@ private class FetcherWorker extends Task<Optional<BibEntry>> {
 
         @Override
         protected Optional<BibEntry> call() throws FetcherException {
-            searchingProperty().setValue(true);
             storeSelectedFetcher();
             fetcher = selectedItemProperty().getValue();
             searchID = idText.getValue();
@@ -143,9 +142,10 @@ protected Optional<BibEntry> call() throws FetcherException {
     }
 
     public void runFetcherWorker() {
-        searchSuccesfulProperty.set(false);
-        fetcherWorker.run();
+        fetcherWorker.setOnRunning(event -> searchingProperty().setValue(true));
+
         fetcherWorker.setOnFailed(event -> {
+            searchSuccesfulProperty.set(false);
             Throwable exception = fetcherWorker.getException();
             String fetcherExceptionMessage = exception.getMessage();
             String fetcher = selectedItemProperty().getValue().getName();
@@ -159,7 +159,7 @@ public void runFetcherWorker() {
                 dialogService.showInformationDialogAndWait(Localization.lang("Failed to import by ID"), Localization.lang("Error message %0", fetcherExceptionMessage));
             }
 
-            LOGGER.error(String.format("Exception during fetching when using fetcher '%s' with entry id '%s'.", fetcher, searchId), exception);
+            LOGGER.error("Exception during fetching when using fetcher '{}' with entry id '{}'.", fetcher, searchId, exception);
 
             searchingProperty.set(false);
             fetcherWorker = new FetcherWorker();
@@ -204,10 +204,11 @@ public void runFetcherWorker() {
                     searchSuccesfulProperty.set(true);
                 }
             }
-            fetcherWorker = new FetcherWorker();
 
             focusAndSelectAllProperty.set(true);
-            searchingProperty().setValue(false);
+            searchingProperty().set(false);
+            fetcherWorker = new FetcherWorker();
         });
+        taskExecutor.execute(fetcherWorker);
     }
 }