Use Inject for DialogService

Author: ricantech

src/main/java/org/jabref/gui/actions/ManageContentSelectorAction.java

@@ -15,11 +15,12 @@ public ManageContentSelectorAction(JabRefFrame jabRefFrame) {
 
     @Override
     public void execute() {
-        if (noActiveConnectionExists(jabRefFrame.getCurrentBasePanel())) {
+        BasePanel basePanel = jabRefFrame.getCurrentBasePanel();
+        if (noActiveConnectionExists(basePanel)) {
             jabRefFrame.getDialogService().showErrorDialogAndWait(Localization.lang("Active database connection do not exists!"));
             return;
         }
-        new ContentSelectorDialogView(jabRefFrame).showAndWait();
+        new ContentSelectorDialogView(basePanel).showAndWait();
     }
 
     private boolean noActiveConnectionExists(BasePanel basePanel) {

src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogView.java

@@ -3,6 +3,8 @@
 import java.util.Optional;
 import java.util.function.Supplier;
 
+import javax.inject.Inject;
+
 import javafx.beans.property.ListProperty;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
@@ -12,11 +14,9 @@
 
 import org.jabref.gui.BasePanel;
 import org.jabref.gui.DialogService;
-import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.gui.util.ControlHelper;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.model.metadata.MetaData;
 
 import com.airhacks.afterburner.views.ViewLoader;
 import org.fxmisc.easybind.EasyBind;
@@ -38,19 +38,16 @@ public class ContentSelectorDialogView extends BaseDialog<Void> {
     @FXML
     private ButtonType saveButton;
 
-    private ContentSelectorDialogViewModel viewModel;
-
+    @Inject
+    private DialogService dialogService;
     private final BasePanel basePanel;
-    private final DialogService dialogService;
-    private final MetaData metaData;
+    private ContentSelectorDialogViewModel viewModel;
 
-    public ContentSelectorDialogView(JabRefFrame jabRefFrame) {
+    public ContentSelectorDialogView(BasePanel basePanel) {
         this.setTitle(Localization.lang("Manage content selectors"));
         this.getDialogPane().setPrefSize(375, 475);
 
-        this.basePanel = jabRefFrame.getCurrentBasePanel();
-        this.dialogService = jabRefFrame.getDialogService();
-        this.metaData = basePanel.getBibDatabaseContext().getMetaData();
+        this.basePanel = basePanel;
 
         ViewLoader.view(this)
                 .load()
@@ -61,7 +58,7 @@ public ContentSelectorDialogView(JabRefFrame jabRefFrame) {
 
     @FXML
     public void initialize() {
-        viewModel = new ContentSelectorDialogViewModel(metaData, basePanel, dialogService);
+        viewModel = new ContentSelectorDialogViewModel(basePanel, dialogService);
 
         initFieldNameComponents();
         initKeywordsComponents();

src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogViewModel.java

@@ -31,20 +31,20 @@ class ContentSelectorDialogViewModel extends AbstractViewModel {
 
     private static final List<String> DEFAULT_FIELD_NAMES = of(FieldName.AUTHOR, FieldName.JOURNAL, FieldName.KEYWORDS, FieldName.PUBLISHER);
 
+    private final BasePanel basePanel;
     private final MetaData metaData;
     private final DialogService dialogService;
-    private final BasePanel basePanel;
     private final Map<String, List<String>> fieldNameKeywordsMap = new HashMap<>();
 
     private ListProperty<String> fieldNames = new SimpleListProperty<>(FXCollections.observableArrayList());
     private ListProperty<String> keywords = new SimpleListProperty<>(FXCollections.observableArrayList());
     private StringProperty selectedFieldName = new SimpleStringProperty();
     private StringProperty selectedKeyword = new SimpleStringProperty();
 
-    ContentSelectorDialogViewModel(MetaData metaData, BasePanel basePanel, DialogService dialogService) {
-        this.metaData = metaData;
-        this.dialogService = dialogService;
+    ContentSelectorDialogViewModel(BasePanel basePanel, DialogService dialogService) {
         this.basePanel = basePanel;
+        this.metaData = basePanel.getBibDatabaseContext().getMetaData();
+        this.dialogService = dialogService;
         populateFieldNameKeywordsMapWithExistingValues();
         populateFieldNamesListWithValues();
     }