From 79367fa5b9564b383a4aaecbb2437a649aabd593 Mon Sep 17 00:00:00 2001
From: ricantech <Humburkz#50>
Date: Tue, 12 Feb 2019 20:14:11 +0100
Subject: [PATCH 01/12] Design of content selector dialog + initial view commit

---
 .../ContentSelectorDialog.fxml                | 67 +++++++++++++++++++
 .../ContentSelectorDialogView.java            | 21 ++++++
 2 files changed, 88 insertions(+)
 create mode 100644 src/main/java/org/jabref/gui/contentselector/ContentSelectorDialog.fxml
 create mode 100644 src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogView.java

diff --git a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialog.fxml b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialog.fxml
new file mode 100644
index 00000000000..918da614988
--- /dev/null
+++ b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialog.fxml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ButtonType?>
+<?import javafx.scene.control.DialogPane?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.ListView?>
+<?import javafx.scene.control.Separator?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+
+<DialogPane minHeight="450.0" minWidth="375.0" prefHeight="450.0" prefWidth="407.0" xmlns="http://javafx.com/javafx/8.0.172-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.contentselector.ContentSelectorDialogView">
+    <content>
+        <VBox>
+         <children>
+            <Label prefHeight="27.0" prefWidth="108.0" text="Field names" />
+            <HBox prefHeight="140.0" prefWidth="385.0">
+               <children>
+                  <VBox alignment="TOP_CENTER" prefHeight="200.0" prefWidth="100.0">
+                     <children>
+                        <Button fx:id="addFieldNameButton" alignment="CENTER" mnemonicParsing="false" prefHeight="26.0" prefWidth="72.0" text="Add">
+                           <VBox.margin>
+                              <Insets top="5.0" />
+                           </VBox.margin>
+                        </Button>
+                        <Button fx:id="removeFieldNameButton" mnemonicParsing="false" text="Remove">
+                           <VBox.margin>
+                              <Insets top="5.0" />
+                           </VBox.margin>
+                        </Button>
+                     </children>
+                  </VBox>
+                  <ListView fx:id="fieldNamesListView" prefHeight="140.0" prefWidth="297.0" />
+               </children>
+            </HBox>
+            <Separator prefWidth="200.0">
+               <VBox.margin>
+                  <Insets top="20.0" />
+               </VBox.margin>
+            </Separator>
+             <Label prefHeight="27.0" prefWidth="108.0" text="Keywords" />
+             <HBox prefHeight="140.0" prefWidth="385.0">
+                 <children>
+                     <VBox alignment="TOP_CENTER" prefHeight="200.0" prefWidth="100.0">
+                         <children>
+                             <Button fx:id="addKeywordButton" alignment="CENTER" mnemonicParsing="false" prefHeight="26.0" prefWidth="72.0" text="Add">
+                                 <VBox.margin>
+                                     <Insets top="5.0" />
+                                 </VBox.margin>
+                             </Button>
+                             <Button fx:id="removeKeywordButton" mnemonicParsing="false" text="Remove">
+                                 <VBox.margin>
+                                     <Insets top="5.0" />
+                                 </VBox.margin>
+                             </Button>
+                         </children>
+                     </VBox>
+                     <ListView fx:id="keywordsListView" prefHeight="140.0" prefWidth="297.0" />
+                 </children>
+             </HBox>
+         </children>
+        </VBox>
+    </content>
+    <ButtonType fx:id="saveButton" buttonData="OK_DONE" text="%Save" />
+    <ButtonType fx:constant="CANCEL" />
+</DialogPane>
diff --git a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogView.java b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogView.java
new file mode 100644
index 00000000000..d7a3d273531
--- /dev/null
+++ b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogView.java
@@ -0,0 +1,21 @@
+package org.jabref.gui.contentselector;
+
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.ButtonType;
+import javafx.scene.control.ListView;
+import org.jabref.gui.util.BaseDialog;
+
+public class ContentSelectorDialogView extends BaseDialog<Void> {
+
+    @FXML private Button addFieldNameButton;
+    @FXML private Button removeFieldNameButton;
+    @FXML private Button addKeywordButton;
+    @FXML private Button removeKeywordButton;
+    @FXML private ListView<String> fieldNamesListView;
+    @FXML private ListView<String> keywordsListView;
+    @FXML private ButtonType saveButton;
+
+
+
+}

From 27e44b12b1883b481afb4c4fdd50ee2673b98815 Mon Sep 17 00:00:00 2001
From: ricantech <Humburkz#50>
Date: Wed, 13 Feb 2019 22:00:31 +0100
Subject: [PATCH 02/12] Restyle dialog design + add basic functionalities for
 field names

---
 .../actions/ManageContentSelectorAction.java  | 18 +++++++
 .../ContentSelectorDialog.fxml                | 12 ++---
 .../ContentSelectorDialogView.java            | 51 ++++++++++++++++++
 .../ContentSelectorDialogViewModel.java       | 54 +++++++++++++++++++
 4 files changed, 129 insertions(+), 6 deletions(-)
 create mode 100644 src/main/java/org/jabref/gui/actions/ManageContentSelectorAction.java
 create mode 100644 src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogViewModel.java

diff --git a/src/main/java/org/jabref/gui/actions/ManageContentSelectorAction.java b/src/main/java/org/jabref/gui/actions/ManageContentSelectorAction.java
new file mode 100644
index 00000000000..529dedc7ddb
--- /dev/null
+++ b/src/main/java/org/jabref/gui/actions/ManageContentSelectorAction.java
@@ -0,0 +1,18 @@
+package org.jabref.gui.actions;
+
+import org.jabref.gui.JabRefFrame;
+import org.jabref.gui.contentselector.ContentSelectorDialogView;
+
+public class ManageContentSelectorAction extends SimpleCommand {
+
+    private final JabRefFrame jabRefFrame;
+
+    public ManageContentSelectorAction(JabRefFrame jabRefFrame) {
+        this.jabRefFrame = jabRefFrame;
+    }
+
+    @Override
+    public void execute() {
+        new ContentSelectorDialogView(jabRefFrame).show();
+    }
+}
diff --git a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialog.fxml b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialog.fxml
index 918da614988..1fadff458e0 100644
--- a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialog.fxml
+++ b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialog.fxml
@@ -17,21 +17,21 @@
             <Label prefHeight="27.0" prefWidth="108.0" text="Field names" />
             <HBox prefHeight="140.0" prefWidth="385.0">
                <children>
+                  <ListView fx:id="fieldNamesListView" prefHeight="140.0" prefWidth="297.0"/>
                   <VBox alignment="TOP_CENTER" prefHeight="200.0" prefWidth="100.0">
                      <children>
-                        <Button fx:id="addFieldNameButton" alignment="CENTER" mnemonicParsing="false" prefHeight="26.0" prefWidth="72.0" text="Add">
+                        <Button fx:id="addFieldNameButton" alignment="CENTER" mnemonicParsing="false" prefHeight="26.0" prefWidth="72.0" text="\%Add" onAction="#addNewFieldName">
                            <VBox.margin>
                               <Insets top="5.0" />
                            </VBox.margin>
                         </Button>
-                        <Button fx:id="removeFieldNameButton" mnemonicParsing="false" text="Remove">
+                        <Button fx:id="removeFieldNameButton" mnemonicParsing="false" text="\%Remove" onAction="#removeFieldName">
                            <VBox.margin>
                               <Insets top="5.0" />
                            </VBox.margin>
                         </Button>
                      </children>
                   </VBox>
-                  <ListView fx:id="fieldNamesListView" prefHeight="140.0" prefWidth="297.0" />
                </children>
             </HBox>
             <Separator prefWidth="200.0">
@@ -42,21 +42,21 @@
              <Label prefHeight="27.0" prefWidth="108.0" text="Keywords" />
              <HBox prefHeight="140.0" prefWidth="385.0">
                  <children>
+                     <ListView fx:id="keywordsListView" prefHeight="140.0" prefWidth="297.0" />
                      <VBox alignment="TOP_CENTER" prefHeight="200.0" prefWidth="100.0">
                          <children>
-                             <Button fx:id="addKeywordButton" alignment="CENTER" mnemonicParsing="false" prefHeight="26.0" prefWidth="72.0" text="Add">
+                             <Button fx:id="addKeywordButton" alignment="CENTER" mnemonicParsing="false" prefHeight="26.0" prefWidth="72.0" text="\%Add">
                                  <VBox.margin>
                                      <Insets top="5.0" />
                                  </VBox.margin>
                              </Button>
-                             <Button fx:id="removeKeywordButton" mnemonicParsing="false" text="Remove">
+                             <Button fx:id="removeKeywordButton" mnemonicParsing="false" text="\%Remove">
                                  <VBox.margin>
                                      <Insets top="5.0" />
                                  </VBox.margin>
                              </Button>
                          </children>
                      </VBox>
-                     <ListView fx:id="keywordsListView" prefHeight="140.0" prefWidth="297.0" />
                  </children>
              </HBox>
          </children>
diff --git a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogView.java b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogView.java
index d7a3d273531..6fbd58fca76 100644
--- a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogView.java
+++ b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogView.java
@@ -1,10 +1,19 @@
 package org.jabref.gui.contentselector;
 
+import com.airhacks.afterburner.views.ViewLoader;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.ListView;
+import org.jabref.Globals;
+import org.jabref.gui.DialogService;
+import org.jabref.gui.JabRefFrame;
+import org.jabref.gui.StateManager;
 import org.jabref.gui.util.BaseDialog;
+import org.jabref.gui.util.ControlHelper;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.metadata.MetaData;
 
 public class ContentSelectorDialogView extends BaseDialog<Void> {
 
@@ -16,6 +25,48 @@ public class ContentSelectorDialogView extends BaseDialog<Void> {
     @FXML private ListView<String> keywordsListView;
     @FXML private ButtonType saveButton;
 
+    private ContentSelectorDialogViewModel viewModel;
 
+    private final JabRefFrame jabRefFrame;
+    private final DialogService dialogService;
+    private final StateManager stateManager;
+    private final MetaData metaData;
 
+    public ContentSelectorDialogView(JabRefFrame jabRefFrame) {
+        this.setTitle(Localization.lang("Manage content selectors"));
+        this.getDialogPane().setPrefSize(375, 475);
+
+        this.jabRefFrame = jabRefFrame;
+        this.dialogService = jabRefFrame.getDialogService();
+        this.stateManager = Globals.stateManager;
+        this.metaData = stateManager.getActiveDatabase().map(BibDatabaseContext::getMetaData).orElseGet(MetaData::new);
+
+        ViewLoader.view(this)
+                .load()
+                .setAsDialogPane(this);
+
+        ControlHelper.setAction(saveButton, getDialogPane(), event -> System.out.println("test"));
+    }
+
+    @FXML
+    public void initialize() {
+        viewModel = new ContentSelectorDialogViewModel(metaData, dialogService);
+
+        initFieldNameListView();
+    }
+
+    @FXML
+    private void addNewFieldName() {
+        viewModel.showInputFieldNameDialog();
+    }
+
+    @FXML
+    private void removeFieldName() {
+        String selectedFieldName = fieldNamesListView.getFocusModel().getFocusedItem();
+        viewModel.showRemoveFieldNameConfirmationDialog(selectedFieldName);
+    }
+
+    private void initFieldNameListView() {
+        fieldNamesListView.setItems(viewModel.loadFieldNames());
+    }
 }
diff --git a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogViewModel.java b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogViewModel.java
new file mode 100644
index 00000000000..063f6377666
--- /dev/null
+++ b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogViewModel.java
@@ -0,0 +1,54 @@
+package org.jabref.gui.contentselector;
+
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import org.jabref.gui.DialogService;
+import org.jabref.model.entry.FieldName;
+import org.jabref.model.metadata.ContentSelectors;
+import org.jabref.model.metadata.MetaData;
+
+import java.util.List;
+
+import static com.google.common.collect.ImmutableList.of;
+
+class ContentSelectorDialogViewModel {
+
+    private static final List<String> DEFAULT_FIELD_NAMES = of(FieldName.AUTHOR, FieldName.JOURNAL, FieldName.KEYWORDS, FieldName.PUBLISHER);
+
+    private final MetaData metaData;
+    private final DialogService dialogService;
+
+    private ObservableList<String> fieldNames = FXCollections.observableArrayList();
+
+    ContentSelectorDialogViewModel(MetaData metaData, DialogService dialogService) {
+        this.metaData = metaData;
+        this.dialogService = dialogService;
+    }
+
+    ObservableList<String> loadFieldNames() {
+        ContentSelectors contentSelectors = metaData.getContentSelectors();
+        fieldNames.addAll(contentSelectors.getFieldNamesWithSelectors());
+
+        if (fieldNames.isEmpty()) {
+            fieldNames.addAll(DEFAULT_FIELD_NAMES);
+        }
+        return fieldNames;
+    }
+
+    void showInputFieldNameDialog() {
+        dialogService.showInputDialogAndWait("Add new field name", "Field name:")
+                .ifPresent(fieldNames::add);
+    }
+
+    void showRemoveFieldNameConfirmationDialog(String fieldNameToRemove) {
+        if (fieldNameToRemove == null) {
+            dialogService.showErrorDialogAndWait("No field name selected!");
+            return;
+        }
+
+        boolean deleteConfirmed = dialogService.showConfirmationDialogAndWait("Remove field name", "Are you sure you want to remove field name: \"" + fieldNameToRemove + "\"");
+        if (deleteConfirmed) {
+            fieldNames.remove(fieldNameToRemove);
+        }
+    }
+}

From f3d18cfbe1135cf44e814942b97bfc6f52b4cd90 Mon Sep 17 00:00:00 2001
From: ricantech <Humburkz#50>
Date: Thu, 14 Feb 2019 08:31:53 +0100
Subject: [PATCH 03/12] Add logic regarding keywords

---
 .../ContentSelectorDialog.fxml                |  4 +-
 .../ContentSelectorDialogView.java            | 46 +++++++++-
 .../ContentSelectorDialogViewModel.java       | 84 +++++++++++++++++--
 3 files changed, 123 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialog.fxml b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialog.fxml
index 1fadff458e0..cc18519fa01 100644
--- a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialog.fxml
+++ b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialog.fxml
@@ -45,12 +45,12 @@
                      <ListView fx:id="keywordsListView" prefHeight="140.0" prefWidth="297.0" />
                      <VBox alignment="TOP_CENTER" prefHeight="200.0" prefWidth="100.0">
                          <children>
-                             <Button fx:id="addKeywordButton" alignment="CENTER" mnemonicParsing="false" prefHeight="26.0" prefWidth="72.0" text="\%Add">
+                             <Button fx:id="addKeywordButton" alignment="CENTER" mnemonicParsing="false" prefHeight="26.0" prefWidth="72.0" text="\%Add" onAction="#addNewKeyword">
                                  <VBox.margin>
                                      <Insets top="5.0" />
                                  </VBox.margin>
                              </Button>
-                             <Button fx:id="removeKeywordButton" mnemonicParsing="false" text="\%Remove">
+                             <Button fx:id="removeKeywordButton" mnemonicParsing="false" text="\%Remove" onAction="#removeKeyword">
                                  <VBox.margin>
                                      <Insets top="5.0" />
                                  </VBox.margin>
diff --git a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogView.java b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogView.java
index 6fbd58fca76..0333583c82d 100644
--- a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogView.java
+++ b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogView.java
@@ -5,6 +5,7 @@
 import javafx.scene.control.Button;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.ListView;
+import javafx.scene.control.SelectionModel;
 import org.jabref.Globals;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.JabRefFrame;
@@ -15,8 +16,12 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.metadata.MetaData;
 
+import java.util.Optional;
+
 public class ContentSelectorDialogView extends BaseDialog<Void> {
 
+    private static final int FIRST_ELEMENT = 0;
+
     @FXML private Button addFieldNameButton;
     @FXML private Button removeFieldNameButton;
     @FXML private Button addKeywordButton;
@@ -51,8 +56,14 @@ public ContentSelectorDialogView(JabRefFrame jabRefFrame) {
     @FXML
     public void initialize() {
         viewModel = new ContentSelectorDialogViewModel(metaData, dialogService);
-
         initFieldNameListView();
+        initKeywordsListView();
+    }
+
+    private void initKeywordsListView() {
+        keywordsListView.setItems(viewModel.getKeywordsBackingList());
+        keywordsListView.getSelectionModel().select(FIRST_ELEMENT);
+        keywordsListView.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> removeKeywordButton.setDisable(viewModel.shouldBeRemoveKeywordButtonDisabled()));
     }
 
     @FXML
@@ -62,11 +73,40 @@ private void addNewFieldName() {
 
     @FXML
     private void removeFieldName() {
-        String selectedFieldName = fieldNamesListView.getFocusModel().getFocusedItem();
-        viewModel.showRemoveFieldNameConfirmationDialog(selectedFieldName);
+        getSelectedFieldName().ifPresent(viewModel::showRemoveFieldNameConfirmationDialog);
+    }
+
+    @FXML
+    private void addNewKeyword() {
+        getSelectedFieldName().ifPresent(viewModel::showInputKeywordDialog);
+    }
+
+    @FXML
+    private void removeKeyword() {
+        Optional<String> fieldName = getSelectedFieldName();
+        Optional<String> keywordToRemove = getSelectedKeyword();
+        if (fieldName.isPresent() && keywordToRemove.isPresent()) {
+            viewModel.showRemoveKeywordConfirmationDialog(fieldName.get(), keywordToRemove.get());
+        }
+    }
+
+    private Optional<String> getSelectedFieldName() {
+        return Optional.of(fieldNamesListView).map(ListView::getSelectionModel).map(SelectionModel::getSelectedItem);
+    }
+
+    private Optional<String> getSelectedKeyword() {
+        return Optional.of(keywordsListView).map(ListView::getSelectionModel).map(SelectionModel::getSelectedItem);
     }
 
     private void initFieldNameListView() {
+        fieldNamesListView.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> {
+            viewModel.populateKeywordsFor(newValue);
+            if (!keywordsListView.getItems().isEmpty()) {
+                keywordsListView.getSelectionModel().select(FIRST_ELEMENT);
+            }
+            removeKeywordButton.setDisable(viewModel.shouldBeRemoveKeywordButtonDisabled());
+        });
         fieldNamesListView.setItems(viewModel.loadFieldNames());
+        fieldNamesListView.getSelectionModel().select(FIRST_ELEMENT);
     }
 }
diff --git a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogViewModel.java b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogViewModel.java
index 063f6377666..f4de1547411 100644
--- a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogViewModel.java
@@ -4,12 +4,15 @@
 import javafx.collections.ObservableList;
 import org.jabref.gui.DialogService;
 import org.jabref.model.entry.FieldName;
-import org.jabref.model.metadata.ContentSelectors;
 import org.jabref.model.metadata.MetaData;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import static com.google.common.collect.ImmutableList.of;
+import static java.lang.String.format;
 
 class ContentSelectorDialogViewModel {
 
@@ -17,27 +20,56 @@ class ContentSelectorDialogViewModel {
 
     private final MetaData metaData;
     private final DialogService dialogService;
+    private final Map<String, List<String>> fieldNameKeywordsMap = new HashMap<>();
 
     private ObservableList<String> fieldNames = FXCollections.observableArrayList();
+    private ObservableList<String> keywords = FXCollections.observableArrayList();
 
     ContentSelectorDialogViewModel(MetaData metaData, DialogService dialogService) {
         this.metaData = metaData;
         this.dialogService = dialogService;
+        initFieldNameKeywordsMapWithExistingValues();
+
+    }
+
+    private void initFieldNameKeywordsMapWithExistingValues() {
+        metaData.getContentSelectors().getContentSelectors().forEach(
+                existingContentSelector -> fieldNameKeywordsMap.put(existingContentSelector.getFieldName(), existingContentSelector.getValues())
+        );
     }
 
     ObservableList<String> loadFieldNames() {
-        ContentSelectors contentSelectors = metaData.getContentSelectors();
-        fieldNames.addAll(contentSelectors.getFieldNamesWithSelectors());
+        fieldNames.addAll(fieldNameKeywordsMap.keySet());
 
         if (fieldNames.isEmpty()) {
-            fieldNames.addAll(DEFAULT_FIELD_NAMES);
+            DEFAULT_FIELD_NAMES.forEach(this::addFieldNameIfUnique);
         }
         return fieldNames;
     }
 
+    ObservableList<String> getKeywordsBackingList() {
+        return keywords;
+    }
+
+    private void addFieldNameIfUnique(String fieldNameToAdd) {
+        boolean exists = fieldNameKeywordsMap.containsKey(fieldNameToAdd);
+        if (exists) {
+            dialogService.showErrorDialogAndWait(format("Field name \"%s\" already exists", fieldNameToAdd));
+            return;
+        }
+
+        fieldNameKeywordsMap.put(fieldNameToAdd, new ArrayList<>());
+        fieldNames.add(fieldNameToAdd);
+    }
+
+    private void removeFieldName(String fieldNameToRemove) {
+        fieldNameKeywordsMap.remove(fieldNameToRemove);
+        fieldNames.remove(fieldNameToRemove);
+    }
+
     void showInputFieldNameDialog() {
         dialogService.showInputDialogAndWait("Add new field name", "Field name:")
-                .ifPresent(fieldNames::add);
+                .ifPresent(this::addFieldNameIfUnique);
     }
 
     void showRemoveFieldNameConfirmationDialog(String fieldNameToRemove) {
@@ -48,7 +80,47 @@ void showRemoveFieldNameConfirmationDialog(String fieldNameToRemove) {
 
         boolean deleteConfirmed = dialogService.showConfirmationDialogAndWait("Remove field name", "Are you sure you want to remove field name: \"" + fieldNameToRemove + "\"");
         if (deleteConfirmed) {
-            fieldNames.remove(fieldNameToRemove);
+            removeFieldName(fieldNameToRemove);
+        }
+    }
+
+    void populateKeywordsFor(String selectedFieldName) {
+        keywords.clear();
+        keywords.addAll(fieldNameKeywordsMap.get(selectedFieldName));
+    }
+
+    void showInputKeywordDialog(String selectedFieldName) {
+        dialogService.showInputDialogAndWait("Add new field name", "Field name:")
+                .ifPresent(newKeyword -> addKeyword(selectedFieldName, newKeyword));
+    }
+
+    private void addKeyword(String fieldName, String keywordToAdd) {
+        boolean exists = fieldNameKeywordsMap.get(fieldName).contains(keywordToAdd);
+        if (exists) {
+            dialogService.showErrorDialogAndWait(format("Keyword \"%s\" already exists", keywordToAdd));
+            return;
+        }
+
+        List<String> existingKeywords = fieldNameKeywordsMap.getOrDefault(fieldName, new ArrayList<>());
+        existingKeywords.add(keywordToAdd);
+        fieldNameKeywordsMap.put(fieldName, existingKeywords);
+        keywords.add(keywordToAdd);
+        populateKeywordsFor(fieldName);
+    }
+
+    void showRemoveKeywordConfirmationDialog(String fieldName, String keywordToRemove) {
+        boolean deleteConfirmed = dialogService.showConfirmationDialogAndWait("Remove field name", "Are you sure you want to remove field name: \"" + keywordToRemove + "\"");
+        if (deleteConfirmed) {
+            removeKeyword(fieldName, keywordToRemove);
         }
     }
+
+    private void removeKeyword(String fieldName, String keywordToRemove) {
+        fieldNameKeywordsMap.get(fieldName).remove(keywordToRemove);
+        keywords.remove(keywordToRemove);
+    }
+
+    boolean shouldBeRemoveKeywordButtonDisabled() {
+        return keywords.isEmpty();
+    }
 }

From 7b2a2dcd8de1487502e29fbd0185ab1e8b625de9 Mon Sep 17 00:00:00 2001
From: ricantech <Humburkz#50>
Date: Thu, 14 Feb 2019 21:16:31 +0100
Subject: [PATCH 04/12] Minor rework of keywords logic + toggling of delete
 button

---
 .../ContentSelectorDialogView.java            | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogView.java b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogView.java
index 0333583c82d..6afcfe4ba0a 100644
--- a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogView.java
+++ b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogView.java
@@ -22,13 +22,20 @@ public class ContentSelectorDialogView extends BaseDialog<Void> {
 
     private static final int FIRST_ELEMENT = 0;
 
-    @FXML private Button addFieldNameButton;
-    @FXML private Button removeFieldNameButton;
-    @FXML private Button addKeywordButton;
-    @FXML private Button removeKeywordButton;
-    @FXML private ListView<String> fieldNamesListView;
-    @FXML private ListView<String> keywordsListView;
-    @FXML private ButtonType saveButton;
+    @FXML
+    private Button addFieldNameButton;
+    @FXML
+    private Button removeFieldNameButton;
+    @FXML
+    private Button addKeywordButton;
+    @FXML
+    private Button removeKeywordButton;
+    @FXML
+    private ListView<String> fieldNamesListView;
+    @FXML
+    private ListView<String> keywordsListView;
+    @FXML
+    private ButtonType saveButton;
 
     private ContentSelectorDialogViewModel viewModel;
 
@@ -63,7 +70,9 @@ public void initialize() {
     private void initKeywordsListView() {
         keywordsListView.setItems(viewModel.getKeywordsBackingList());
         keywordsListView.getSelectionModel().select(FIRST_ELEMENT);
-        keywordsListView.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> removeKeywordButton.setDisable(viewModel.shouldBeRemoveKeywordButtonDisabled()));
+        keywordsListView.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) ->
+                removeKeywordButton.setDisable(!getSelectedKeyword().isPresent())
+        );
     }
 
     @FXML
@@ -101,10 +110,7 @@ private Optional<String> getSelectedKeyword() {
     private void initFieldNameListView() {
         fieldNamesListView.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> {
             viewModel.populateKeywordsFor(newValue);
-            if (!keywordsListView.getItems().isEmpty()) {
-                keywordsListView.getSelectionModel().select(FIRST_ELEMENT);
-            }
-            removeKeywordButton.setDisable(viewModel.shouldBeRemoveKeywordButtonDisabled());
+            removeKeywordButton.setDisable(!getSelectedKeyword().isPresent());
         });
         fieldNamesListView.setItems(viewModel.loadFieldNames());
         fieldNamesListView.getSelectionModel().select(FIRST_ELEMENT);

From dd036eb602e79992faa5b3cf791506f1537b23eb Mon Sep 17 00:00:00 2001
From: ricantech <Humburkz#50>
Date: Thu, 14 Feb 2019 21:17:37 +0100
Subject: [PATCH 05/12] Unify naming convention

---
 .../jabref/gui/contentselector/ContentSelectorDialogView.java   | 2 +-
 .../gui/contentselector/ContentSelectorDialogViewModel.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogView.java b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogView.java
index 6afcfe4ba0a..4f881b836ac 100644
--- a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogView.java
+++ b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogView.java
@@ -112,7 +112,7 @@ private void initFieldNameListView() {
             viewModel.populateKeywordsFor(newValue);
             removeKeywordButton.setDisable(!getSelectedKeyword().isPresent());
         });
-        fieldNamesListView.setItems(viewModel.loadFieldNames());
+        fieldNamesListView.setItems(viewModel.getFieldNamesBackingList());
         fieldNamesListView.getSelectionModel().select(FIRST_ELEMENT);
     }
 }
diff --git a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogViewModel.java b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogViewModel.java
index f4de1547411..02862736bd0 100644
--- a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogViewModel.java
@@ -38,7 +38,7 @@ private void initFieldNameKeywordsMapWithExistingValues() {
         );
     }
 
-    ObservableList<String> loadFieldNames() {
+    ObservableList<String> getFieldNamesBackingList() {
         fieldNames.addAll(fieldNameKeywordsMap.keySet());
 
         if (fieldNames.isEmpty()) {

From 98b423ed94e4f7da35413f2e818a7121dab722d9 Mon Sep 17 00:00:00 2001
From: ricantech <Humburkz#50>
Date: Sat, 16 Feb 2019 22:23:38 +0100
Subject: [PATCH 06/12] Logic tuneup

---
 src/main/java/org/jabref/gui/BasePanel.java   |   6 -
 src/main/java/org/jabref/gui/JabRefFrame.java |   3 +-
 .../actions/ManageContentSelectorAction.java  |  12 +-
 .../ContentSelectorDialog.fxml                |   8 +-
 .../ContentSelectorDialog.java                | 499 ------------------
 .../ContentSelectorDialogView.java            |  61 ++-
 .../ContentSelectorDialogViewModel.java       | 118 +++--
 7 files changed, 136 insertions(+), 571 deletions(-)
 delete mode 100644 src/main/java/org/jabref/gui/contentselector/ContentSelectorDialog.java

diff --git a/src/main/java/org/jabref/gui/BasePanel.java b/src/main/java/org/jabref/gui/BasePanel.java
index ef5e2875994..8c99cc4a68a 100644
--- a/src/main/java/org/jabref/gui/BasePanel.java
+++ b/src/main/java/org/jabref/gui/BasePanel.java
@@ -43,7 +43,6 @@
 import org.jabref.gui.bibtexkeypattern.SearchFixDuplicateLabels;
 import org.jabref.gui.collab.DatabaseChangeMonitor;
 import org.jabref.gui.collab.FileUpdatePanel;
-import org.jabref.gui.contentselector.ContentSelectorDialog;
 import org.jabref.gui.desktop.JabRefDesktop;
 import org.jabref.gui.edit.ReplaceStringAction;
 import org.jabref.gui.entryeditor.EntryEditor;
@@ -399,11 +398,6 @@ private void setupActions() {
         actions.put(Actions.NEXT_PREVIEW_STYLE, this::nextPreviewStyle);
         actions.put(Actions.PREVIOUS_PREVIEW_STYLE, this::previousPreviewStyle);
 
-        actions.put(Actions.MANAGE_SELECTORS, () -> {
-            ContentSelectorDialog csd = new ContentSelectorDialog(frame, BasePanel.this, false, null);
-            csd.setVisible(true);
-        });
-
         actions.put(Actions.SEND_AS_EMAIL, new SendAsEMailAction(frame));
 
         actions.put(Actions.WRITE_XMP, new WriteXMPAction(this)::execute);
diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index b657ee1e1db..8cd5360a36d 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -81,6 +81,7 @@
 import org.jabref.gui.actions.ShowPreferencesAction;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.actions.StandardActions;
+import org.jabref.gui.actions.ManageContentSelectorAction;
 import org.jabref.gui.dialogs.AutosaveUIManager;
 import org.jabref.gui.edit.MassSetFieldsAction;
 import org.jabref.gui.exporter.ExportCommand;
@@ -941,7 +942,7 @@ private MenuBar createMenu() {
 
                 new SeparatorMenuItem(),
 
-                factory.createMenuItem(StandardActions.MANAGE_CONTENT_SELECTORS, new OldDatabaseCommandWrapper(Actions.MANAGE_SELECTORS, this, Globals.stateManager)),
+                factory.createMenuItem(StandardActions.MANAGE_CONTENT_SELECTORS, new ManageContentSelectorAction(this)),
                 factory.createMenuItem(StandardActions.CUSTOMIZE_ENTRY_TYPES, new CustomizeEntryAction(this)),
                 factory.createMenuItem(StandardActions.MANAGE_CITE_KEY_PATTERNS, new BibtexKeyPatternAction(this)));
 
diff --git a/src/main/java/org/jabref/gui/actions/ManageContentSelectorAction.java b/src/main/java/org/jabref/gui/actions/ManageContentSelectorAction.java
index 529dedc7ddb..41a24ca2162 100644
--- a/src/main/java/org/jabref/gui/actions/ManageContentSelectorAction.java
+++ b/src/main/java/org/jabref/gui/actions/ManageContentSelectorAction.java
@@ -1,7 +1,9 @@
 package org.jabref.gui.actions;
 
+import org.jabref.gui.BasePanel;
 import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.contentselector.ContentSelectorDialogView;
+import org.jabref.logic.l10n.Localization;
 
 public class ManageContentSelectorAction extends SimpleCommand {
 
@@ -13,6 +15,14 @@ public ManageContentSelectorAction(JabRefFrame jabRefFrame) {
 
     @Override
     public void execute() {
-        new ContentSelectorDialogView(jabRefFrame).show();
+        if (noActiveConnectionExists(jabRefFrame.getCurrentBasePanel())) {
+            jabRefFrame.getDialogService().showErrorDialogAndWait(Localization.lang("Active database connection do not exists!"));
+            return;
+        }
+        new ContentSelectorDialogView(jabRefFrame).showAndWait();
+    }
+
+    private boolean noActiveConnectionExists(BasePanel basePanel) {
+        return basePanel == null || basePanel.getBibDatabaseContext() == null;
     }
 }
diff --git a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialog.fxml b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialog.fxml
index cc18519fa01..94744038b42 100644
--- a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialog.fxml
+++ b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialog.fxml
@@ -20,12 +20,12 @@
                   <ListView fx:id="fieldNamesListView" prefHeight="140.0" prefWidth="297.0"/>
                   <VBox alignment="TOP_CENTER" prefHeight="200.0" prefWidth="100.0">
                      <children>
-                        <Button fx:id="addFieldNameButton" alignment="CENTER" mnemonicParsing="false" prefHeight="26.0" prefWidth="72.0" text="\%Add" onAction="#addNewFieldName">
+                        <Button fx:id="addFieldNameButton" alignment="CENTER" mnemonicParsing="false" prefHeight="26.0" prefWidth="72.0" text="%Add" onAction="#addNewFieldName">
                            <VBox.margin>
                               <Insets top="5.0" />
                            </VBox.margin>
                         </Button>
-                        <Button fx:id="removeFieldNameButton" mnemonicParsing="false" text="\%Remove" onAction="#removeFieldName">
+                        <Button fx:id="removeFieldNameButton" mnemonicParsing="false" text="%Remove" onAction="#removeFieldName">
                            <VBox.margin>
                               <Insets top="5.0" />
                            </VBox.margin>
@@ -45,12 +45,12 @@
                      <ListView fx:id="keywordsListView" prefHeight="140.0" prefWidth="297.0" />
                      <VBox alignment="TOP_CENTER" prefHeight="200.0" prefWidth="100.0">
                          <children>
-                             <Button fx:id="addKeywordButton" alignment="CENTER" mnemonicParsing="false" prefHeight="26.0" prefWidth="72.0" text="\%Add" onAction="#addNewKeyword">
+                             <Button fx:id="addKeywordButton" alignment="CENTER" mnemonicParsing="false" prefHeight="26.0" prefWidth="72.0" text="%Add" onAction="#addNewKeyword">
                                  <VBox.margin>
                                      <Insets top="5.0" />
                                  </VBox.margin>
                              </Button>
-                             <Button fx:id="removeKeywordButton" mnemonicParsing="false" text="\%Remove" onAction="#removeKeyword">
+                             <Button fx:id="removeKeywordButton" mnemonicParsing="false" text="%Remove" onAction="#removeKeyword">
                                  <VBox.margin>
                                      <Insets top="5.0" />
                                  </VBox.margin>
diff --git a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialog.java b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialog.java
deleted file mode 100644
index a188c1fca8a..00000000000
--- a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialog.java
+++ /dev/null
@@ -1,499 +0,0 @@
-package org.jabref.gui.contentselector;
-
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.FocusAdapter;
-import java.awt.event.FocusEvent;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-import javax.swing.AbstractAction;
-import javax.swing.Action;
-import javax.swing.BorderFactory;
-import javax.swing.DefaultListModel;
-import javax.swing.JButton;
-import javax.swing.JList;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTextField;
-
-import org.jabref.gui.BasePanel;
-import org.jabref.gui.JabRefDialog;
-import org.jabref.gui.JabRefFrame;
-import org.jabref.gui.help.HelpAction;
-import org.jabref.gui.keyboard.KeyBinder;
-import org.jabref.logic.help.HelpFile;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.model.entry.FieldName;
-import org.jabref.model.metadata.ContentSelector;
-import org.jabref.model.metadata.ContentSelectors;
-import org.jabref.model.metadata.MetaData;
-
-import com.jgoodies.forms.builder.ButtonBarBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class ContentSelectorDialog extends JabRefDialog {
-
-    private static final String WORD_FIRSTLINE_TEXT = Localization.lang("<select word>");
-    private static final String FIELD_FIRST_LINE = Localization.lang("<field name>");
-    private static final Logger LOGGER = LoggerFactory.getLogger(ContentSelectorDialog.class);
-    private final GridBagLayout gbl = new GridBagLayout();
-    private final GridBagConstraints con = new GridBagConstraints();
-    private final JPanel fieldPan = new JPanel();
-    private final JPanel wordPan = new JPanel();
-    private final JPanel buttonPan = new JPanel();
-
-    private final JPanel fieldNamePan = new JPanel();
-    private final JPanel wordEditPan = new JPanel();
-    private final MetaData metaData;
-    private final JabRefFrame frame;
-    private final BasePanel panel;
-    private final JButton newField = new JButton(Localization.lang("New"));
-    private final JButton removeField = new JButton(Localization.lang("Remove"));
-    private final JButton newWord = new JButton(Localization.lang("New"));
-    private final JButton removeWord = new JButton(Localization.lang("Remove"));
-    private final JButton ok = new JButton(Localization.lang("OK"));
-    private final JButton cancel = new JButton();
-    private final JButton apply = new JButton(Localization.lang("Apply"));
-    private final DefaultListModel<String> fieldListModel = new DefaultListModel<>();
-    private final JList<String> fieldList = new JList<>(fieldListModel);
-    private final JTextField fieldNameField = new JTextField("", 20);
-    private final JTextField wordEditField = new JTextField("", 20);
-    private final JScrollPane fPane = new JScrollPane(fieldList);
-    private final Map<String, DefaultListModel<String>> wordListModels = new HashMap<>();
-    private final List<String> removedFields = new ArrayList<>();
-    private DefaultListModel<String> wordListModel = new DefaultListModel<>();
-    private JList<String> wordList = new JList<>(wordListModel);
-    private JScrollPane wPane = new JScrollPane(wordList);
-    private String currentField;
-
-
-    /**
-     *
-     * @param frame the JabRef Frame
-     * @param panel the currently selected BasePanel
-     * @param modal should this dialog be modal?
-     * @param fieldName the field this selector is initialized for. May be null.
-     */
-    public ContentSelectorDialog(JabRefFrame frame, BasePanel panel, boolean modal, String fieldName) {
-        super(Localization.lang("Manage content selectors"), ContentSelectorDialog.class);
-        this.setModal(modal);
-        this.metaData = panel.getBibDatabaseContext().getMetaData();
-        this.frame = frame;
-        this.panel = panel;
-        this.currentField = fieldName;
-
-        initLayout();
-
-        setupFieldSelector();
-        if (currentField != null) {
-            int fieldInd = fieldListModel.indexOf(currentField);
-            if (fieldInd >= 0) {
-                fieldList.setSelectedIndex(fieldInd);
-            }
-        } else {
-            if (!fieldListModel.isEmpty()) {
-                fieldList.setSelectedIndex(0);
-                currentField = fieldList.getSelectedValue();
-            }
-        }
-
-        setupWordSelector();
-        setupActions();
-        KeyBinder.bindCloseDialogKeyToCancelAction(this.rootPane, cancel.getAction());
-
-        pack();
-    }
-
-    private static int findPos(DefaultListModel<String> lm, String item) {
-        for (int i = 0; i < lm.size(); i++) {
-            String s = lm.get(i);
-            if (item.compareToIgnoreCase(s) < 0) { // item precedes s
-                return i;
-            }
-        }
-        return lm.size();
-    }
-
-    private void setupActions() {
-
-        wordList.addListSelectionListener(e -> {
-            wordEditField.setText(wordList.getSelectedValue());
-            wordEditField.selectAll();
-            wordEditField.requestFocus();
-        });
-
-        newWord.addActionListener(e -> newWordAction());
-
-        ActionListener wordEditFieldListener = e -> actOnWordEdit();
-        wordEditField.addActionListener(wordEditFieldListener);
-
-        removeWord.addActionListener(e -> {
-            int index = wordList.getSelectedIndex();
-            if (index == -1) {
-                return;
-            }
-            wordListModel.remove(index);
-            wordEditField.setText("");
-            if (!wordListModel.isEmpty()) {
-                wordList.setSelectedIndex(Math.min(index, wordListModel.size() - 1));
-            }
-        });
-
-        fieldList.addListSelectionListener(e -> {
-            currentField = fieldList.getSelectedValue();
-            fieldNameField.setText("");
-            setupWordSelector();
-        });
-
-        newField.addActionListener(e -> {
-            if (!fieldListModel.get(0).equals(FIELD_FIRST_LINE)) {
-                // only add <field name> once
-                fieldListModel.add(0, FIELD_FIRST_LINE);
-            }
-            fieldList.setSelectedIndex(0);
-            fPane.getVerticalScrollBar().setValue(0);
-            fieldNameField.setEnabled(true);
-            fieldNameField.setText(currentField);
-            fieldNameField.selectAll();
-            fieldNameField.requestFocus();
-        });
-
-        fieldNameField.addActionListener(e -> fieldNameField.transferFocus());
-
-        fieldNameField.addFocusListener(new FieldNameFocusAdapter());
-
-        removeField.addActionListener(e -> {
-            int index = fieldList.getSelectedIndex();
-            if (index == -1) {
-                return;
-            }
-            String fieldName = fieldListModel.get(index);
-            removedFields.add(fieldName);
-            fieldListModel.remove(index);
-            wordListModels.remove(fieldName);
-            fieldNameField.setText("");
-            if (!fieldListModel.isEmpty()) {
-                fieldList.setSelectedIndex(Math.min(index, wordListModel.size() - 1));
-            }
-        });
-
-        ok.addActionListener(e -> {
-            try {
-                applyChanges();
-                dispose();
-            } catch (Exception ex) {
-                LOGGER.info("Could not apply changes in \"Manage content selectors\"", ex);
-                JOptionPane.showMessageDialog(null, Localization.lang("Could not apply changes."));
-            }
-        });
-
-        apply.addActionListener(e -> {
-            // Store if an entry is currently being edited:
-            if (!"".equals(wordEditField.getText())) {
-                wordEditFieldListener.actionPerformed(null);
-            }
-            try {
-                applyChanges();
-            } catch (Exception ex) {
-                LOGGER.info("Could not apply changes in \"Manage content selectors\"", ex);
-                JOptionPane.showMessageDialog(null, Localization.lang("Could not apply changes."));
-            }
-        });
-
-        Action cancelAction = new AbstractAction() {
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                dispose();
-            }
-        };
-        cancelAction.putValue(Action.NAME, Localization.lang("Cancel"));
-        cancel.setAction(cancelAction);
-    }
-
-    private void actOnWordEdit() {
-        String old = wordList.getSelectedValue();
-        String newVal = wordEditField.getText();
-        if ("".equals(newVal) || newVal.equals(old)) {
-            return; // Empty string or no change.
-        }
-        int index = wordList.getSelectedIndex();
-        if (wordListModel.contains(newVal)) {
-            // ensure that word already in list is visible
-            index = wordListModel.indexOf(newVal);
-            wordList.ensureIndexIsVisible(index);
-            return;
-        }
-
-        int newIndex = findPos(wordListModel, newVal);
-        if (index >= 0) {
-            // initiate replacement of selected word
-            wordListModel.remove(index);
-            if (newIndex > index) {
-                // newIndex has to be adjusted after removal of previous entry
-                newIndex--;
-            }
-        }
-        wordListModel.add(newIndex, newVal);
-        wordList.ensureIndexIsVisible(newIndex);
-        wordEditField.selectAll();
-    }
-
-    private void newWordAction() {
-        if (wordListModel.isEmpty() || !wordListModel.get(0).equals(WORD_FIRSTLINE_TEXT)) {
-            wordListModel.add(0, WORD_FIRSTLINE_TEXT);
-        }
-        wordList.setSelectedIndex(0);
-        wPane.getVerticalScrollBar().setValue(0);
-    }
-
-    private void applyChanges() {
-        boolean anythingChanged = false; // Watch if we should mark as there is data changed
-
-        // First remove the mappings for fields that have been deleted.
-        // If these were re-added, they will be added below, so it doesn't
-        // cause any harm to remove them here.
-        for (String fieldName : removedFields) {
-            metaData.clearContentSelectors(fieldName);
-            anythingChanged = true;
-        }
-
-        // Cycle through all fields that we have created listmodels for:
-        for (Map.Entry<String, DefaultListModel<String>> entry : wordListModels.entrySet()) {
-            // For each field name, store the values:
-            if ((entry.getKey() == null) || FIELD_FIRST_LINE.equals(entry.getKey())) {
-                continue;
-            }
-            DefaultListModel<String> lm = entry.getValue();
-            int start = 0;
-            // Avoid storing the <new word> marker if it is there:
-            if (!lm.isEmpty()) {
-                while ((start < lm.size()) && lm.get(start).equals(WORD_FIRSTLINE_TEXT)) {
-                    start++;
-                }
-            }
-
-            Set<String> data = new HashSet<>();
-            for (int wrd = start; wrd < lm.size(); wrd++) {
-                String word = lm.get(wrd);
-                data.add(word);
-            }
-
-            // Check if any words have been added
-            if (!data.equals(new HashSet<>(metaData.getContentSelectorValuesForField(entry.getKey())))) {
-                anythingChanged = true;
-            }
-
-            // Check if there are words to be added and previously there were no content selector for the field
-            if (!data.isEmpty() && metaData.getContentSelectorValuesForField(entry.getKey()).isEmpty()) {
-                anythingChanged = true;
-            }
-
-            metaData.addContentSelector(new ContentSelector(entry.getKey(), new ArrayList<>(data)));
-        }
-
-        if (anythingChanged) {
-            // Update all selectors in the current BasePanel.
-            panel.setupMainPanel();
-
-            // Mark the database updated so changes are not lost
-            panel.markNonUndoableBaseChanged();
-        }
-    }
-
-    /**
-     * Set the contents of the field selector list.
-     *
-     */
-    private void setupFieldSelector() {
-        fieldListModel.clear();
-        SortedSet<String> contents = new TreeSet<>();
-        ContentSelectors selectors = metaData.getContentSelectors();
-        for (String s : selectors.getFieldNamesWithSelectors()) {
-            contents.add(s);
-        }
-        if (contents.isEmpty()) {
-            // if nothing was added, put the default fields (as described in the help)
-            fieldListModel.addElement(FieldName.AUTHOR);
-            fieldListModel.addElement(FieldName.JOURNAL);
-            fieldListModel.addElement(FieldName.KEYWORDS);
-            fieldListModel.addElement(FieldName.PUBLISHER);
-        } else {
-            for (String s : contents) {
-                fieldListModel.addElement(s);
-            }
-        }
-
-        if (currentField == null) {
-            // if dialog is created for the whole database,
-            // select the first field to avoid confusions in GUI usage
-            fieldList.setSelectedIndex(0);
-        } else {
-            // a specific field has been chosen at the constructor
-            // select this field
-            int i = fieldListModel.indexOf(currentField);
-            if (i != -1) {
-                // field has been found in list, select it
-                fieldList.setSelectedIndex(i);
-            }
-        }
-    }
-
-    private void setupWordSelector() {
-
-        // Have we already created a listmodel for this field?
-        wordListModel = wordListModels.get(currentField);
-        if (wordListModel == null) {
-            wordListModel = new DefaultListModel<>();
-            wordList.setModel(wordListModel);
-            wordListModels.put(currentField, wordListModel);
-
-            int index = 0;
-            for (String s : metaData.getContentSelectorValuesForField(currentField)) {
-                wordListModel.add(index, s);
-                index++;
-            }
-        } else {
-            wordList.setModel(wordListModel);
-        }
-    }
-
-    private void initLayout() {
-        fieldNameField.setEnabled(false);
-        fieldList.setVisibleRowCount(4);
-        wordList.setVisibleRowCount(10);
-        final String VAL = "Uren luren himmelturen, ja Besseggen.";
-        fieldList.setPrototypeCellValue(VAL);
-        wordList.setPrototypeCellValue(VAL);
-
-        fieldPan.setBorder(
-                BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), Localization.lang("Field name")));
-        wordPan.setBorder(
-                BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), Localization.lang("Keyword")));
-        fieldPan.setLayout(gbl);
-        wordPan.setLayout(gbl);
-        con.insets = new Insets(2, 2, 2, 2);
-        con.fill = GridBagConstraints.BOTH;
-        con.gridwidth = 2;
-        con.weightx = 1;
-        con.weighty = 1;
-        con.gridx = 0;
-        con.gridy = 0;
-        gbl.setConstraints(fPane, con);
-        fieldPan.add(fPane);
-        gbl.setConstraints(wPane, con);
-        wordPan.add(wPane);
-        con.gridwidth = 1;
-        con.gridx = 2;
-        //con.weightx = 0.7;
-        con.gridheight = 2;
-        gbl.setConstraints(fieldNamePan, con);
-        fieldPan.add(fieldNamePan);
-        gbl.setConstraints(wordEditPan, con);
-        wordPan.add(wordEditPan);
-        con.gridx = 0;
-        con.gridy = 1;
-        con.weightx = 0;
-        con.weighty = 0;
-        con.gridwidth = 1;
-        con.gridheight = 1;
-        con.fill = GridBagConstraints.NONE;
-        con.anchor = GridBagConstraints.WEST;
-        gbl.setConstraints(newField, con);
-        fieldPan.add(newField);
-        gbl.setConstraints(newWord, con);
-        wordPan.add(newWord);
-        con.gridx = 1;
-        //con.anchor = GridBagConstraints.EAST;
-        gbl.setConstraints(removeField, con);
-        fieldPan.add(removeField);
-        gbl.setConstraints(removeWord, con);
-        wordPan.add(removeWord);
-        con.anchor = GridBagConstraints.WEST;
-        con.gridx = 0;
-        con.gridy = 0;
-        gbl.setConstraints(fieldNameField, con);
-        fieldNamePan.add(fieldNameField);
-        gbl.setConstraints(wordEditField, con);
-        wordEditPan.add(wordEditField);
-
-        // Add buttons:
-        ButtonBarBuilder bsb = new ButtonBarBuilder(buttonPan);
-        bsb.addGlue();
-        bsb.addButton(ok);
-        bsb.addButton(apply);
-        bsb.addButton(cancel);
-        bsb.addRelatedGap();
-        bsb.addButton(new HelpAction(HelpFile.CONTENT_SELECTOR).getHelpButton());
-        bsb.addGlue();
-
-        // Add panels to dialog:
-        con.fill = GridBagConstraints.BOTH;
-        getContentPane().setLayout(gbl);
-        con.weightx = 1;
-        con.weighty = 0.5;
-        con.gridwidth = 1;
-        con.gridheight = 1;
-        con.gridx = 0;
-        con.gridy = 0;
-        gbl.setConstraints(fieldPan, con);
-        getContentPane().add(fieldPan);
-        con.gridy = 1;
-        gbl.setConstraints(wordPan, con);
-        getContentPane().add(wordPan);
-        con.weighty = 0;
-        con.gridy = 2;
-        con.insets = new Insets(12, 2, 2, 2);
-        gbl.setConstraints(buttonPan, con);
-        getContentPane().add(buttonPan);
-
-    }
-
-    private class FieldNameFocusAdapter extends FocusAdapter {
-
-        /**
-         * Adds the text value to the list
-         */
-        @Override
-        public void focusLost(FocusEvent e) {
-            String s = fieldNameField.getText();
-            fieldNameField.setText("");
-            fieldNameField.setEnabled(false);
-            if (!FIELD_FIRST_LINE.equals(s) && !"".equals(s)) {
-                // user has typed something
-
-                // remove "<first name>" from list
-                fieldListModel.remove(0);
-
-                int pos;
-                if (fieldListModel.contains(s)) {
-                    // field already exists, scroll to that field (below)
-                    pos = fieldListModel.indexOf(s);
-                } else {
-                    // Add new field.
-                    pos = findPos(fieldListModel, s);
-                    fieldListModel.add(Math.max(0, pos), s);
-                }
-                fieldList.setSelectedIndex(pos);
-                fieldList.ensureIndexIsVisible(pos);
-                currentField = s;
-                setupWordSelector();
-                newWordAction();
-            }
-        }
-
-    }
-
-}
diff --git a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogView.java b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogView.java
index 4f881b836ac..e23be5a8731 100644
--- a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogView.java
+++ b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogView.java
@@ -1,22 +1,23 @@
 package org.jabref.gui.contentselector;
 
 import com.airhacks.afterburner.views.ViewLoader;
+import javafx.beans.value.ChangeListener;
+import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.ListView;
 import javafx.scene.control.SelectionModel;
-import org.jabref.Globals;
+import org.jabref.gui.BasePanel;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.JabRefFrame;
-import org.jabref.gui.StateManager;
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.gui.util.ControlHelper;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.metadata.MetaData;
 
 import java.util.Optional;
+import java.util.function.Supplier;
 
 public class ContentSelectorDialogView extends BaseDialog<Void> {
 
@@ -39,40 +40,31 @@ public class ContentSelectorDialogView extends BaseDialog<Void> {
 
     private ContentSelectorDialogViewModel viewModel;
 
-    private final JabRefFrame jabRefFrame;
+    private final BasePanel basePanel;
     private final DialogService dialogService;
-    private final StateManager stateManager;
     private final MetaData metaData;
 
     public ContentSelectorDialogView(JabRefFrame jabRefFrame) {
         this.setTitle(Localization.lang("Manage content selectors"));
         this.getDialogPane().setPrefSize(375, 475);
 
-        this.jabRefFrame = jabRefFrame;
+        this.basePanel = jabRefFrame.getCurrentBasePanel();
         this.dialogService = jabRefFrame.getDialogService();
-        this.stateManager = Globals.stateManager;
-        this.metaData = stateManager.getActiveDatabase().map(BibDatabaseContext::getMetaData).orElseGet(MetaData::new);
+        this.metaData = basePanel.getBibDatabaseContext().getMetaData();
 
         ViewLoader.view(this)
                 .load()
                 .setAsDialogPane(this);
 
-        ControlHelper.setAction(saveButton, getDialogPane(), event -> System.out.println("test"));
+        ControlHelper.setAction(saveButton, getDialogPane(), event -> saveChangesAndClose());
     }
 
     @FXML
     public void initialize() {
-        viewModel = new ContentSelectorDialogViewModel(metaData, dialogService);
-        initFieldNameListView();
-        initKeywordsListView();
-    }
+        viewModel = new ContentSelectorDialogViewModel(metaData, basePanel, dialogService);
 
-    private void initKeywordsListView() {
-        keywordsListView.setItems(viewModel.getKeywordsBackingList());
-        keywordsListView.getSelectionModel().select(FIRST_ELEMENT);
-        keywordsListView.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) ->
-                removeKeywordButton.setDisable(!getSelectedKeyword().isPresent())
-        );
+        initListView(fieldNamesListView, viewModel::getFieldNamesBackingList, (observable, oldValue, newValue) -> onFieldNameSelected(newValue));
+        initListView(keywordsListView, viewModel::getKeywordsBackingList, (observable, oldValue, newValue) -> onKeywordSelected());
     }
 
     @FXML
@@ -99,20 +91,33 @@ private void removeKeyword() {
         }
     }
 
+    private void initListView(ListView<String> listViewToInit, Supplier<ObservableList<String>> backingList, ChangeListener<String> onSelectedListener) {
+        listViewToInit.setItems(backingList.get());
+        listViewToInit.getSelectionModel().selectedItemProperty().addListener(onSelectedListener);
+        listViewToInit.getSelectionModel().select(FIRST_ELEMENT);
+    }
+
+    private void onFieldNameSelected(String newValue) {
+        removeKeywordButton.setDisable(!getSelectedKeyword().isPresent());
+        removeFieldNameButton.setDisable(!getSelectedFieldName().isPresent());
+        addKeywordButton.setDisable(newValue == null);
+        viewModel.populateKeywordsFor((newValue));
+    }
+
+    private void onKeywordSelected() {
+        removeKeywordButton.setDisable(!getSelectedKeyword().isPresent());
+    }
+
     private Optional<String> getSelectedFieldName() {
-        return Optional.of(fieldNamesListView).map(ListView::getSelectionModel).map(SelectionModel::getSelectedItem);
+        return Optional.of(fieldNamesListView.getSelectionModel()).map(SelectionModel::getSelectedItem);
     }
 
     private Optional<String> getSelectedKeyword() {
-        return Optional.of(keywordsListView).map(ListView::getSelectionModel).map(SelectionModel::getSelectedItem);
+        return Optional.of(keywordsListView.getSelectionModel()).map(SelectionModel::getSelectedItem);
     }
 
-    private void initFieldNameListView() {
-        fieldNamesListView.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> {
-            viewModel.populateKeywordsFor(newValue);
-            removeKeywordButton.setDisable(!getSelectedKeyword().isPresent());
-        });
-        fieldNamesListView.setItems(viewModel.getFieldNamesBackingList());
-        fieldNamesListView.getSelectionModel().select(FIRST_ELEMENT);
+    private void saveChangesAndClose() {
+        viewModel.saveChanges();
+        close();
     }
 }
diff --git a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogViewModel.java b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogViewModel.java
index 02862736bd0..49bdb5c5188 100644
--- a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogViewModel.java
@@ -2,14 +2,15 @@
 
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
+import org.jabref.gui.BasePanel;
 import org.jabref.gui.DialogService;
+import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.FieldName;
+import org.jabref.model.metadata.ContentSelector;
 import org.jabref.model.metadata.MetaData;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
 
 import static com.google.common.collect.ImmutableList.of;
 import static java.lang.String.format;
@@ -20,30 +21,37 @@ class ContentSelectorDialogViewModel {
 
     private final MetaData metaData;
     private final DialogService dialogService;
+    private final BasePanel basePanel;
     private final Map<String, List<String>> fieldNameKeywordsMap = new HashMap<>();
 
     private ObservableList<String> fieldNames = FXCollections.observableArrayList();
     private ObservableList<String> keywords = FXCollections.observableArrayList();
 
-    ContentSelectorDialogViewModel(MetaData metaData, DialogService dialogService) {
+    ContentSelectorDialogViewModel(MetaData metaData, BasePanel basePanel, DialogService dialogService) {
         this.metaData = metaData;
         this.dialogService = dialogService;
-        initFieldNameKeywordsMapWithExistingValues();
+        this.basePanel = basePanel;
+        populateFieldNameKeywordsMapWithExistingValues();
+        populateFieldNamesListWithValues();
+    }
+
+    private void populateFieldNamesListWithValues() {
+        List<String> existingFieldNames = new ArrayList<>(fieldNameKeywordsMap.keySet());
+        Collections.sort(existingFieldNames);
+        fieldNames.addAll(existingFieldNames);
 
+        if (fieldNames.isEmpty()) {
+            DEFAULT_FIELD_NAMES.forEach(this::addFieldNameIfUnique);
+        }
     }
 
-    private void initFieldNameKeywordsMapWithExistingValues() {
+    private void populateFieldNameKeywordsMapWithExistingValues() {
         metaData.getContentSelectors().getContentSelectors().forEach(
-                existingContentSelector -> fieldNameKeywordsMap.put(existingContentSelector.getFieldName(), existingContentSelector.getValues())
+                existingContentSelector -> fieldNameKeywordsMap.put(existingContentSelector.getFieldName(), new ArrayList<>(existingContentSelector.getValues()))
         );
     }
 
     ObservableList<String> getFieldNamesBackingList() {
-        fieldNames.addAll(fieldNameKeywordsMap.keySet());
-
-        if (fieldNames.isEmpty()) {
-            DEFAULT_FIELD_NAMES.forEach(this::addFieldNameIfUnique);
-        }
         return fieldNames;
     }
 
@@ -51,10 +59,15 @@ ObservableList<String> getKeywordsBackingList() {
         return keywords;
     }
 
+    void showInputFieldNameDialog() {
+        dialogService.showInputDialogAndWait(Localization.lang(Localization.lang("Add new field name")), Localization.lang("Field name:"))
+                .ifPresent(this::addFieldNameIfUnique);
+    }
+
     private void addFieldNameIfUnique(String fieldNameToAdd) {
         boolean exists = fieldNameKeywordsMap.containsKey(fieldNameToAdd);
         if (exists) {
-            dialogService.showErrorDialogAndWait(format("Field name \"%s\" already exists", fieldNameToAdd));
+            dialogService.showErrorDialogAndWait(Localization.lang(format("Field name \"%s\" already exists", fieldNameToAdd)));
             return;
         }
 
@@ -62,42 +75,44 @@ private void addFieldNameIfUnique(String fieldNameToAdd) {
         fieldNames.add(fieldNameToAdd);
     }
 
-    private void removeFieldName(String fieldNameToRemove) {
-        fieldNameKeywordsMap.remove(fieldNameToRemove);
-        fieldNames.remove(fieldNameToRemove);
-    }
-
-    void showInputFieldNameDialog() {
-        dialogService.showInputDialogAndWait("Add new field name", "Field name:")
-                .ifPresent(this::addFieldNameIfUnique);
-    }
-
     void showRemoveFieldNameConfirmationDialog(String fieldNameToRemove) {
         if (fieldNameToRemove == null) {
-            dialogService.showErrorDialogAndWait("No field name selected!");
+            dialogService.showErrorDialogAndWait(Localization.lang("No field name selected!"));
             return;
         }
 
-        boolean deleteConfirmed = dialogService.showConfirmationDialogAndWait("Remove field name", "Are you sure you want to remove field name: \"" + fieldNameToRemove + "\"");
+        boolean deleteConfirmed = dialogService.showConfirmationDialogAndWait(
+                Localization.lang("Remove field name"),
+                Localization.lang(format("Are you sure you want to remove field name: \"%s\"", fieldNameToRemove))
+        );
+
         if (deleteConfirmed) {
             removeFieldName(fieldNameToRemove);
         }
     }
 
+    private void removeFieldName(String fieldNameToRemove) {
+        fieldNameKeywordsMap.remove(fieldNameToRemove);
+        fieldNames.remove(fieldNameToRemove);
+    }
+
     void populateKeywordsFor(String selectedFieldName) {
         keywords.clear();
-        keywords.addAll(fieldNameKeywordsMap.get(selectedFieldName));
+        if (selectedFieldName != null) {
+            keywords.addAll(fieldNameKeywordsMap.get(selectedFieldName));
+        }
+
     }
 
     void showInputKeywordDialog(String selectedFieldName) {
-        dialogService.showInputDialogAndWait("Add new field name", "Field name:")
+        dialogService.showInputDialogAndWait(Localization.lang("Add new keyword"), Localization.lang("Keyword:"))
                 .ifPresent(newKeyword -> addKeyword(selectedFieldName, newKeyword));
     }
 
     private void addKeyword(String fieldName, String keywordToAdd) {
         boolean exists = fieldNameKeywordsMap.get(fieldName).contains(keywordToAdd);
         if (exists) {
-            dialogService.showErrorDialogAndWait(format("Keyword \"%s\" already exists", keywordToAdd));
+            dialogService.showErrorDialogAndWait(Localization.lang(format("Keyword \"%s\" already exists", keywordToAdd)));
             return;
         }
 
@@ -109,7 +124,7 @@ private void addKeyword(String fieldName, String keywordToAdd) {
     }
 
     void showRemoveKeywordConfirmationDialog(String fieldName, String keywordToRemove) {
-        boolean deleteConfirmed = dialogService.showConfirmationDialogAndWait("Remove field name", "Are you sure you want to remove field name: \"" + keywordToRemove + "\"");
+        boolean deleteConfirmed = dialogService.showConfirmationDialogAndWait(Localization.lang("Remove field name"), Localization.lang("Are you sure you want to remove field name: \"%s\"", keywordToRemove));
         if (deleteConfirmed) {
             removeKeyword(fieldName, keywordToRemove);
         }
@@ -120,7 +135,46 @@ private void removeKeyword(String fieldName, String keywordToRemove) {
         keywords.remove(keywordToRemove);
     }
 
-    boolean shouldBeRemoveKeywordButtonDisabled() {
-        return keywords.isEmpty();
+    void saveChanges() {
+        List<String> metaDataFieldNames = metaData.getContentSelectors().getFieldNamesWithSelectors();
+        fieldNameKeywordsMap.forEach((fieldName, keywords) -> updateMetaDataContentSelector(metaDataFieldNames, fieldName, keywords));
+
+        List<String> fieldNamesToRemove = filterFieldNamesToRemove();
+        fieldNamesToRemove.forEach(metaData::clearContentSelectors);
+
+        basePanel.setupMainPanel();
+        basePanel.markNonUndoableBaseChanged();
+    }
+
+    private List<String> filterFieldNamesToRemove() {
+        Set<String> newlyAddedKeywords = fieldNameKeywordsMap.keySet();
+        return metaData.getContentSelectors().getFieldNamesWithSelectors().stream()
+                .filter(fieldName -> !newlyAddedKeywords.contains(fieldName))
+                .collect(Collectors.toList());
+    }
+
+    private void updateMetaDataContentSelector(List<String> existingFieldNames, String fieldName, List<String> keywords) {
+        boolean fieldNameDoNotExists = !existingFieldNames.contains(fieldName);
+        if (fieldNameDoNotExists) {
+            metaData.addContentSelector(new ContentSelector(fieldName, keywords));
+        }
+
+        if (keywordsHaveChanged(fieldName, keywords)) {
+            metaData.clearContentSelectors(fieldName);
+            metaData.addContentSelector(new ContentSelector(fieldName, keywords));
+        }
+    }
+
+    private boolean keywordsHaveChanged(String fieldName, List<String> keywords) {
+        HashSet<String> keywordsSet = asHashSet(keywords);
+        List<String> existingKeywords = metaData.getContentSelectorValuesForField(fieldName);
+        if (!keywordsSet.equals(asHashSet(existingKeywords))) {
+            return true;
+        }
+        return !keywordsSet.isEmpty() && existingKeywords.isEmpty();
+    }
+
+    private HashSet<String> asHashSet(List<String> listToConvert) {
+        return new HashSet<>(listToConvert);
     }
 }

From bd0a49ebf3347a79b3a435fc19046d2372599e88 Mon Sep 17 00:00:00 2001
From: ricantech <Humburkz#50>
Date: Sun, 17 Feb 2019 11:31:48 +0100
Subject: [PATCH 07/12] Add english translations

---
 .../ContentSelectorDialogViewModel.java           |  8 ++++----
 src/main/resources/l10n/JabRef_en.properties      | 15 ++++++++++++++-
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogViewModel.java b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogViewModel.java
index 49bdb5c5188..5accb741418 100644
--- a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogViewModel.java
@@ -67,7 +67,7 @@ void showInputFieldNameDialog() {
     private void addFieldNameIfUnique(String fieldNameToAdd) {
         boolean exists = fieldNameKeywordsMap.containsKey(fieldNameToAdd);
         if (exists) {
-            dialogService.showErrorDialogAndWait(Localization.lang(format("Field name \"%s\" already exists", fieldNameToAdd)));
+            dialogService.showErrorDialogAndWait(Localization.lang("Field name \"%0\" already exists", fieldNameToAdd));
             return;
         }
 
@@ -83,7 +83,7 @@ void showRemoveFieldNameConfirmationDialog(String fieldNameToRemove) {
 
         boolean deleteConfirmed = dialogService.showConfirmationDialogAndWait(
                 Localization.lang("Remove field name"),
-                Localization.lang(format("Are you sure you want to remove field name: \"%s\"", fieldNameToRemove))
+                Localization.lang("Are you sure you want to remove field name: \"%0\"?", fieldNameToRemove)
         );
 
         if (deleteConfirmed) {
@@ -112,7 +112,7 @@ void showInputKeywordDialog(String selectedFieldName) {
     private void addKeyword(String fieldName, String keywordToAdd) {
         boolean exists = fieldNameKeywordsMap.get(fieldName).contains(keywordToAdd);
         if (exists) {
-            dialogService.showErrorDialogAndWait(Localization.lang(format("Keyword \"%s\" already exists", keywordToAdd)));
+            dialogService.showErrorDialogAndWait(Localization.lang("Keyword \"%s\" already exists", keywordToAdd));
             return;
         }
 
@@ -124,7 +124,7 @@ private void addKeyword(String fieldName, String keywordToAdd) {
     }
 
     void showRemoveKeywordConfirmationDialog(String fieldName, String keywordToRemove) {
-        boolean deleteConfirmed = dialogService.showConfirmationDialogAndWait(Localization.lang("Remove field name"), Localization.lang("Are you sure you want to remove field name: \"%s\"", keywordToRemove));
+        boolean deleteConfirmed = dialogService.showConfirmationDialogAndWait(Localization.lang("Remove keyword"), Localization.lang("Are you sure you want to remove keyword: \"%0\"?", keywordToRemove));
         if (deleteConfirmed) {
             removeKeyword(fieldName, keywordToRemove);
         }
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 634a80d312c..1d9e0c616dc 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -2175,4 +2175,17 @@ Error\ adding\ discovered\ CitationStyles=Error adding discovered CitationStyles
 Add\ new\ String=Add new String
 Remove\ selected\ Strings=Remove selected Strings
 Must\ not\ be\ empty\!=Must not be empty\!
-Open\ Help\ page=Open Help page
\ No newline at end of file
+Open\ Help\ page=Open Help page
+
+Active\ database\ connection\ do\ not\ exists\!=Active database connection do not exists!
+Add\ new\ field\ name=Add new field name
+Field\ name\:=Field name:
+Field\ name\ \"%0\"\ already\ exists=Field name "%0" already exists
+No\ field\ name\ selected\!=No field name selected!
+Remove\ field\ name=Remove field name
+Are\ you\ sure\ you\ want\ to\ remove\ field\ name\:\ \"%0\"?=Are you sure you want to remove field name: "%0"?
+Add\ new\ keyword=Add new keyword
+Keyword\:=Keyword:
+Keyword\ \"%0\"\ already\ exists=Keyword "%0" already exists
+Remove\ keyword=Remove keyword
+Are\ you\ sure\ you\ want\ to\ remove\ keyword\:\ \"%0\"?=Are you sure you want to remove keyword: "%0"?

From cca70cc9c29d8c64dbcbcbabb376379f2d9bd9ba Mon Sep 17 00:00:00 2001
From: ricantech <Humburkz#50>
Date: Sun, 17 Feb 2019 13:22:28 +0100
Subject: [PATCH 08/12] Add translations + imports

---
 src/main/java/org/jabref/gui/JabRefFrame.java  |  2 +-
 .../ContentSelectorDialogView.java             |  8 +++++---
 .../ContentSelectorDialogViewModel.java        | 18 ++++++++++++------
 src/main/resources/l10n/JabRef_en.properties   |  4 ----
 4 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index 8cd5360a36d..dbbce3f23b3 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -64,6 +64,7 @@
 import org.jabref.gui.actions.EditExternalFileTypesAction;
 import org.jabref.gui.actions.ErrorConsoleAction;
 import org.jabref.gui.actions.LookupIdentifierAction;
+import org.jabref.gui.actions.ManageContentSelectorAction;
 import org.jabref.gui.actions.ManageCustomExportsAction;
 import org.jabref.gui.actions.ManageCustomImportsAction;
 import org.jabref.gui.actions.ManageJournalsAction;
@@ -81,7 +82,6 @@
 import org.jabref.gui.actions.ShowPreferencesAction;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.actions.StandardActions;
-import org.jabref.gui.actions.ManageContentSelectorAction;
 import org.jabref.gui.dialogs.AutosaveUIManager;
 import org.jabref.gui.edit.MassSetFieldsAction;
 import org.jabref.gui.exporter.ExportCommand;
diff --git a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogView.java b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogView.java
index e23be5a8731..8f530e512d3 100644
--- a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogView.java
+++ b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogView.java
@@ -1,6 +1,8 @@
 package org.jabref.gui.contentselector;
 
-import com.airhacks.afterburner.views.ViewLoader;
+import java.util.Optional;
+import java.util.function.Supplier;
+
 import javafx.beans.value.ChangeListener;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
@@ -8,6 +10,7 @@
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.ListView;
 import javafx.scene.control.SelectionModel;
+
 import org.jabref.gui.BasePanel;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.JabRefFrame;
@@ -16,8 +19,7 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.metadata.MetaData;
 
-import java.util.Optional;
-import java.util.function.Supplier;
+import com.airhacks.afterburner.views.ViewLoader;
 
 public class ContentSelectorDialogView extends BaseDialog<Void> {
 
diff --git a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogViewModel.java b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogViewModel.java
index 5accb741418..62d2aff1c11 100644
--- a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogViewModel.java
@@ -1,7 +1,17 @@
 package org.jabref.gui.contentselector;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
+
 import org.jabref.gui.BasePanel;
 import org.jabref.gui.DialogService;
 import org.jabref.logic.l10n.Localization;
@@ -9,11 +19,7 @@
 import org.jabref.model.metadata.ContentSelector;
 import org.jabref.model.metadata.MetaData;
 
-import java.util.*;
-import java.util.stream.Collectors;
-
 import static com.google.common.collect.ImmutableList.of;
-import static java.lang.String.format;
 
 class ContentSelectorDialogViewModel {
 
@@ -60,7 +66,7 @@ ObservableList<String> getKeywordsBackingList() {
     }
 
     void showInputFieldNameDialog() {
-        dialogService.showInputDialogAndWait(Localization.lang(Localization.lang("Add new field name")), Localization.lang("Field name:"))
+        dialogService.showInputDialogAndWait(Localization.lang("Add new field name"), Localization.lang("Field name:"))
                 .ifPresent(this::addFieldNameIfUnique);
     }
 
@@ -112,7 +118,7 @@ void showInputKeywordDialog(String selectedFieldName) {
     private void addKeyword(String fieldName, String keywordToAdd) {
         boolean exists = fieldNameKeywordsMap.get(fieldName).contains(keywordToAdd);
         if (exists) {
-            dialogService.showErrorDialogAndWait(Localization.lang("Keyword \"%s\" already exists", keywordToAdd));
+            dialogService.showErrorDialogAndWait(Localization.lang("Keyword \"%0\" already exists", keywordToAdd));
             return;
         }
 
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 1d9e0c616dc..9275461a40a 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -12,9 +12,6 @@
 
 %0\ matches\ the\ term\ <b>%1</b>=%0 matches the term <b>%1</b>
 
-<field\ name>=<field name>
-
-<select\ word>=<select word>
 Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (ISO\ abbreviation)=Abbreviate journal names of the selected entries (ISO abbreviation)
 Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (MEDLINE\ abbreviation)=Abbreviate journal names of the selected entries (MEDLINE abbreviation)
 
@@ -1470,7 +1467,6 @@ Move\ to\ group=Move to group
 
 Clear\ read\ status=Clear read status
 Convert\ to\ biblatex\ format\ (for\ example,\ move\ the\ value\ of\ the\ 'journal'\ field\ to\ 'journaltitle')=Convert to biblatex format (for example, move the value of the 'journal' field to 'journaltitle')
-Could\ not\ apply\ changes.=Could not apply changes.
 Deprecated\ fields=Deprecated fields
 No\ read\ status\ information=No read status information
 Printed=Printed

From f60ed8c2be5e6fc94ea13cbbd56b88f713aa7ab8 Mon Sep 17 00:00:00 2001
From: ricantech <Humburkz#50>
Date: Sun, 17 Feb 2019 19:39:16 +0100
Subject: [PATCH 09/12] Convert ObservableList into ListProperty - review
 changes

---
 .../contentselector/ContentSelectorDialogView.java |  6 +++---
 .../ContentSelectorDialogViewModel.java            | 14 ++++++++------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogView.java b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogView.java
index 8f530e512d3..bb62a712d7d 100644
--- a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogView.java
+++ b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogView.java
@@ -3,8 +3,8 @@
 import java.util.Optional;
 import java.util.function.Supplier;
 
+import javafx.beans.property.ListProperty;
 import javafx.beans.value.ChangeListener;
-import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.ButtonType;
@@ -93,8 +93,8 @@ private void removeKeyword() {
         }
     }
 
-    private void initListView(ListView<String> listViewToInit, Supplier<ObservableList<String>> backingList, ChangeListener<String> onSelectedListener) {
-        listViewToInit.setItems(backingList.get());
+    private void initListView(ListView<String> listViewToInit, Supplier<ListProperty<String>> backingList, ChangeListener<String> onSelectedListener) {
+        listViewToInit.itemsProperty().bind(backingList.get());
         listViewToInit.getSelectionModel().selectedItemProperty().addListener(onSelectedListener);
         listViewToInit.getSelectionModel().select(FIRST_ELEMENT);
     }
diff --git a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogViewModel.java b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogViewModel.java
index 62d2aff1c11..9d16f531a19 100644
--- a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogViewModel.java
@@ -9,9 +9,11 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import javafx.beans.property.ListProperty;
+import javafx.beans.property.SimpleListProperty;
 import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
 
+import org.jabref.gui.AbstractViewModel;
 import org.jabref.gui.BasePanel;
 import org.jabref.gui.DialogService;
 import org.jabref.logic.l10n.Localization;
@@ -21,7 +23,7 @@
 
 import static com.google.common.collect.ImmutableList.of;
 
-class ContentSelectorDialogViewModel {
+class ContentSelectorDialogViewModel extends AbstractViewModel {
 
     private static final List<String> DEFAULT_FIELD_NAMES = of(FieldName.AUTHOR, FieldName.JOURNAL, FieldName.KEYWORDS, FieldName.PUBLISHER);
 
@@ -30,8 +32,8 @@ class ContentSelectorDialogViewModel {
     private final BasePanel basePanel;
     private final Map<String, List<String>> fieldNameKeywordsMap = new HashMap<>();
 
-    private ObservableList<String> fieldNames = FXCollections.observableArrayList();
-    private ObservableList<String> keywords = FXCollections.observableArrayList();
+    private ListProperty<String> fieldNames = new SimpleListProperty<>(FXCollections.observableArrayList());
+    private ListProperty<String> keywords = new SimpleListProperty<>(FXCollections.observableArrayList());
 
     ContentSelectorDialogViewModel(MetaData metaData, BasePanel basePanel, DialogService dialogService) {
         this.metaData = metaData;
@@ -57,11 +59,11 @@ private void populateFieldNameKeywordsMapWithExistingValues() {
         );
     }
 
-    ObservableList<String> getFieldNamesBackingList() {
+    ListProperty<String> getFieldNamesBackingList() {
         return fieldNames;
     }
 
-    ObservableList<String> getKeywordsBackingList() {
+    ListProperty<String> getKeywordsBackingList() {
         return keywords;
     }
 

From 7d2e62aa4fcfd143a267e3e3562e82c5f37dd5cd Mon Sep 17 00:00:00 2001
From: ricantech <Humburkz#50>
Date: Sun, 17 Feb 2019 21:10:06 +0100
Subject: [PATCH 10/12] Rework actions on bindings instead of using directly
 change listener - review changes

---
 .../ContentSelectorDialogView.java            | 34 +++++++++---------
 .../ContentSelectorDialogViewModel.java       | 35 ++++++++++++++++---
 2 files changed, 48 insertions(+), 21 deletions(-)

diff --git a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogView.java b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogView.java
index bb62a712d7d..2fecb87d026 100644
--- a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogView.java
+++ b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogView.java
@@ -4,7 +4,6 @@
 import java.util.function.Supplier;
 
 import javafx.beans.property.ListProperty;
-import javafx.beans.value.ChangeListener;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.ButtonType;
@@ -20,6 +19,7 @@
 import org.jabref.model.metadata.MetaData;
 
 import com.airhacks.afterburner.views.ViewLoader;
+import org.fxmisc.easybind.EasyBind;
 
 public class ContentSelectorDialogView extends BaseDialog<Void> {
 
@@ -65,8 +65,22 @@ public ContentSelectorDialogView(JabRefFrame jabRefFrame) {
     public void initialize() {
         viewModel = new ContentSelectorDialogViewModel(metaData, basePanel, dialogService);
 
-        initListView(fieldNamesListView, viewModel::getFieldNamesBackingList, (observable, oldValue, newValue) -> onFieldNameSelected(newValue));
-        initListView(keywordsListView, viewModel::getKeywordsBackingList, (observable, oldValue, newValue) -> onKeywordSelected());
+        initFieldNameComponents();
+        initKeywordsComponents();
+    }
+
+    private void initFieldNameComponents() {
+        initListView(fieldNamesListView, viewModel::getFieldNamesBackingList);
+        viewModel.selectedFieldNameProperty().bind(fieldNamesListView.getSelectionModel().selectedItemProperty());
+        removeFieldNameButton.disableProperty().bind(viewModel.isNoFieldNameSelected());
+        EasyBind.subscribe(viewModel.selectedFieldNameProperty(), viewModel::populateKeywords);
+    }
+
+    private void initKeywordsComponents() {
+        initListView(keywordsListView, viewModel::getKeywordsBackingList);
+        viewModel.selectedKeywordProperty().bind(keywordsListView.getSelectionModel().selectedItemProperty());
+        addKeywordButton.disableProperty().bind(viewModel.isFieldNameListEmpty());
+        removeKeywordButton.disableProperty().bind(viewModel.isNoKeywordSelected());
     }
 
     @FXML
@@ -93,23 +107,11 @@ private void removeKeyword() {
         }
     }
 
-    private void initListView(ListView<String> listViewToInit, Supplier<ListProperty<String>> backingList, ChangeListener<String> onSelectedListener) {
+    private void initListView(ListView<String> listViewToInit, Supplier<ListProperty<String>> backingList) {
         listViewToInit.itemsProperty().bind(backingList.get());
-        listViewToInit.getSelectionModel().selectedItemProperty().addListener(onSelectedListener);
         listViewToInit.getSelectionModel().select(FIRST_ELEMENT);
     }
 
-    private void onFieldNameSelected(String newValue) {
-        removeKeywordButton.setDisable(!getSelectedKeyword().isPresent());
-        removeFieldNameButton.setDisable(!getSelectedFieldName().isPresent());
-        addKeywordButton.setDisable(newValue == null);
-        viewModel.populateKeywordsFor((newValue));
-    }
-
-    private void onKeywordSelected() {
-        removeKeywordButton.setDisable(!getSelectedKeyword().isPresent());
-    }
-
     private Optional<String> getSelectedFieldName() {
         return Optional.of(fieldNamesListView.getSelectionModel()).map(SelectionModel::getSelectedItem);
     }
diff --git a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogViewModel.java b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogViewModel.java
index 9d16f531a19..ec82e8bef52 100644
--- a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogViewModel.java
@@ -9,8 +9,12 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.BooleanBinding;
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.SimpleListProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
 
 import org.jabref.gui.AbstractViewModel;
@@ -34,6 +38,8 @@ class ContentSelectorDialogViewModel extends AbstractViewModel {
 
     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;
@@ -63,10 +69,30 @@ ListProperty<String> getFieldNamesBackingList() {
         return fieldNames;
     }
 
+    StringProperty selectedFieldNameProperty() {
+        return selectedFieldName;
+    }
+
+    BooleanBinding isFieldNameListEmpty() {
+        return Bindings.isEmpty(fieldNames);
+    }
+
+    BooleanBinding isNoFieldNameSelected() {
+        return Bindings.isEmpty(selectedFieldName);
+    }
+
     ListProperty<String> getKeywordsBackingList() {
         return keywords;
     }
 
+    StringProperty selectedKeywordProperty() {
+        return selectedKeyword;
+    }
+
+    BooleanBinding isNoKeywordSelected() {
+        return Bindings.isEmpty(selectedKeyword);
+    }
+
     void showInputFieldNameDialog() {
         dialogService.showInputDialogAndWait(Localization.lang("Add new field name"), Localization.lang("Field name:"))
                 .ifPresent(this::addFieldNameIfUnique);
@@ -104,20 +130,19 @@ private void removeFieldName(String fieldNameToRemove) {
         fieldNames.remove(fieldNameToRemove);
     }
 
-    void populateKeywordsFor(String selectedFieldName) {
+    void populateKeywords(String selectedFieldName) {
         keywords.clear();
         if (selectedFieldName != null) {
             keywords.addAll(fieldNameKeywordsMap.get(selectedFieldName));
         }
-
     }
 
     void showInputKeywordDialog(String selectedFieldName) {
         dialogService.showInputDialogAndWait(Localization.lang("Add new keyword"), Localization.lang("Keyword:"))
-                .ifPresent(newKeyword -> addKeyword(selectedFieldName, newKeyword));
+                .ifPresent(newKeyword -> addKeywordIfUnique(selectedFieldName, newKeyword));
     }
 
-    private void addKeyword(String fieldName, String keywordToAdd) {
+    private void addKeywordIfUnique(String fieldName, String keywordToAdd) {
         boolean exists = fieldNameKeywordsMap.get(fieldName).contains(keywordToAdd);
         if (exists) {
             dialogService.showErrorDialogAndWait(Localization.lang("Keyword \"%0\" already exists", keywordToAdd));
@@ -128,7 +153,7 @@ private void addKeyword(String fieldName, String keywordToAdd) {
         existingKeywords.add(keywordToAdd);
         fieldNameKeywordsMap.put(fieldName, existingKeywords);
         keywords.add(keywordToAdd);
-        populateKeywordsFor(fieldName);
+        populateKeywords(fieldName);
     }
 
     void showRemoveKeywordConfirmationDialog(String fieldName, String keywordToRemove) {

From 480487ca8682ca9ae28c77b90511c6bcc024b0cf Mon Sep 17 00:00:00 2001
From: ricantech <Humburkz#50>
Date: Mon, 18 Feb 2019 07:25:04 +0100
Subject: [PATCH 11/12] Replace setting of first element with built-in method
 in selection model

---
 .../jabref/gui/contentselector/ContentSelectorDialogView.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogView.java b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogView.java
index 2fecb87d026..713d3992aa8 100644
--- a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogView.java
+++ b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogView.java
@@ -23,8 +23,6 @@
 
 public class ContentSelectorDialogView extends BaseDialog<Void> {
 
-    private static final int FIRST_ELEMENT = 0;
-
     @FXML
     private Button addFieldNameButton;
     @FXML
@@ -109,7 +107,7 @@ private void removeKeyword() {
 
     private void initListView(ListView<String> listViewToInit, Supplier<ListProperty<String>> backingList) {
         listViewToInit.itemsProperty().bind(backingList.get());
-        listViewToInit.getSelectionModel().select(FIRST_ELEMENT);
+        listViewToInit.getSelectionModel().selectFirst();
     }
 
     private Optional<String> getSelectedFieldName() {

From c32fe6ae4f52a8b49f384f7904275d446e42c602 Mon Sep 17 00:00:00 2001
From: ricantech <Humburkz#50>
Date: Mon, 18 Feb 2019 18:59:17 +0100
Subject: [PATCH 12/12] Use Inject for DialogService

---
 .../actions/ManageContentSelectorAction.java  |  5 +++--
 .../ContentSelectorDialogView.java            | 19 ++++++++-----------
 .../ContentSelectorDialogViewModel.java       |  8 ++++----
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/main/java/org/jabref/gui/actions/ManageContentSelectorAction.java b/src/main/java/org/jabref/gui/actions/ManageContentSelectorAction.java
index 41a24ca2162..31e2b1e1149 100644
--- a/src/main/java/org/jabref/gui/actions/ManageContentSelectorAction.java
+++ b/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) {
diff --git a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogView.java b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogView.java
index 713d3992aa8..013cbcb79ad 100644
--- a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogView.java
+++ b/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();
diff --git a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogViewModel.java b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogViewModel.java
index ec82e8bef52..4ee85925310 100644
--- a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogViewModel.java
@@ -31,9 +31,9 @@ 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());
@@ -41,10 +41,10 @@ class ContentSelectorDialogViewModel extends AbstractViewModel {
     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();
     }