Use better binding and init default fetcher in view model as it should be

Author: tobiasdiez

src/main/java/org/jabref/gui/importer/fetcher/WebSearchPane.java

@@ -29,15 +29,13 @@
 
 public class WebSearchPane extends SidePaneComponent {
 
-    private final JabRefFrame frame;
     private final JabRefPreferences preferences;
     private final WebSearchPaneViewModel viewModel;
 
     public WebSearchPane(SidePaneManager sidePaneManager, JabRefPreferences preferences, JabRefFrame frame) {
         super(sidePaneManager, IconTheme.JabRefIcons.WWW, Localization.lang("Web search"));
-        this.frame = frame;
         this.preferences = preferences;
-        this.viewModel = new WebSearchPaneViewModel(preferences.getImportFormatPreferences(), frame);
+        this.viewModel = new WebSearchPaneViewModel(preferences.getImportFormatPreferences(), frame, preferences);
     }
 
     @Override
@@ -52,8 +50,8 @@ protected Node createContentPane() {
         new ViewModelListCellFactory<SearchBasedFetcher>()
                 .withText(SearchBasedFetcher::getName)
                 .install(fetchers);
-        viewModel.selectedFetcherProperty().bind(fetchers.getSelectionModel().selectedItemProperty());
         fetchers.itemsProperty().bind(viewModel.fetchersProperty());
+        fetchers.valueProperty().bindBidirectional(viewModel.selectedFetcherProperty());
         fetchers.setMaxWidth(Double.POSITIVE_INFINITY);
 
         // Create help button for currently selected fetcher
@@ -79,17 +77,6 @@ protected Node createContentPane() {
         Button search = new Button(Localization.lang("Search"));
         search.setOnAction(event -> viewModel.search());
 
-        // Poor mans binding of default index
-        // (this logic should actually be in the view model but selected item property is readonly)
-        int defaultFetcher = preferences.getInt(JabRefPreferences.SELECTED_FETCHER_INDEX);
-        if (defaultFetcher <= 0 || defaultFetcher >= fetchers.getItems().size()) {
-            fetchers.getSelectionModel().selectFirst();
-        } else {
-            fetchers.getSelectionModel().select(defaultFetcher);
-        }
-        EasyBind.subscribe(fetchers.getSelectionModel().selectedIndexProperty(),
-                newIndex -> preferences.putInt(JabRefPreferences.SELECTED_FETCHER_INDEX, newIndex));
-
         // Put everything together
         VBox container = new VBox();
         container.setAlignment(Pos.CENTER);

src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java

@@ -22,8 +22,10 @@
 import org.jabref.logic.importer.WebFetchers;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.preferences.JabRefPreferences;
 
 import org.apache.commons.lang3.StringUtils;
+import org.fxmisc.easybind.EasyBind;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -36,13 +38,25 @@ public class WebSearchPaneViewModel {
     private final StringProperty query = new SimpleStringProperty();
     private JabRefFrame frame;
 
-    public WebSearchPaneViewModel(ImportFormatPreferences importPreferences, JabRefFrame frame) {
-        // TODO: Rework so that we don't rely on JabRefFrame
+    public WebSearchPaneViewModel(ImportFormatPreferences importPreferences, JabRefFrame frame, JabRefPreferences preferences) {
+        // TODO: Rework so that we don't rely on JabRefFrame and not the complete preferences
         this.frame = frame;
 
         List<SearchBasedFetcher> allFetchers = WebFetchers.getSearchBasedFetchers(importPreferences);
         allFetchers.sort(Comparator.comparing(WebFetcher::getName));
         fetchers.setAll(allFetchers);
+
+        // Choose last-selected fetcher as default
+        int defaultFetcherIndex = preferences.getInt(JabRefPreferences.SELECTED_FETCHER_INDEX);
+        if (defaultFetcherIndex <= 0 || defaultFetcherIndex >= fetchers.size()) {
+            selectedFetcherProperty().setValue(fetchers.get(0));
+        } else {
+            selectedFetcherProperty().setValue(fetchers.get(defaultFetcherIndex));
+        }
+        EasyBind.subscribe(selectedFetcherProperty(), newFetcher -> {
+            int newIndex = fetchers.indexOf(newFetcher);
+            preferences.putInt(JabRefPreferences.SELECTED_FETCHER_INDEX, newIndex);
+        });
     }
 
     public ObservableList<SearchBasedFetcher> getFetchers() {