From cf7a48fc4124ece286e1085b13ac0793aae42279 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Sat, 17 Feb 2018 17:25:12 +0100
Subject: [PATCH 01/28] Convert String dialog to javafx TODO: store strings
 back to db

---
 src/main/java/org/jabref/gui/JabRefFrame.java |  3 +-
 .../org/jabref/gui/strings/StringAction.java  | 12 +++
 .../gui/strings/StringDialogController.java   | 73 +++++++++++++++++++
 .../jabref/gui/strings/StringDialogView.java  | 18 +++++
 .../gui/strings/StringDialogViewModel.java    | 53 ++++++++++++++
 .../jabref/gui/strings/StringViewModel.java   | 33 +++++++++
 .../org/jabref/gui/strings/StringDialog.fxml  | 30 ++++++++
 7 files changed, 221 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/org/jabref/gui/strings/StringAction.java
 create mode 100644 src/main/java/org/jabref/gui/strings/StringDialogController.java
 create mode 100644 src/main/java/org/jabref/gui/strings/StringDialogView.java
 create mode 100644 src/main/java/org/jabref/gui/strings/StringDialogViewModel.java
 create mode 100644 src/main/java/org/jabref/gui/strings/StringViewModel.java
 create mode 100644 src/main/resources/org/jabref/gui/strings/StringDialog.fxml

diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index 2534c3fb30c..aa9789f2fcc 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -117,6 +117,7 @@
 import org.jabref.gui.push.PushToApplications;
 import org.jabref.gui.search.GlobalSearchBar;
 import org.jabref.gui.specialfields.SpecialFieldValueViewModel;
+import org.jabref.gui.strings.StringAction;
 import org.jabref.gui.undo.CountingUndoManager;
 import org.jabref.gui.util.DefaultTaskExecutor;
 import org.jabref.logic.autosaveandbackup.AutosaveManager;
@@ -965,7 +966,7 @@ private MenuBar createMenu() {
 
                 factory.createMenuItem(ActionsFX.LIBRARY_PROPERTIES, new LibraryPropertiesAction(this)),
                 factory.createMenuItem(ActionsFX.EDIT_PREAMBLE, new OldDatabaseCommandWrapper(Actions.EDIT_PREAMBLE, this, Globals.stateManager)),
-                factory.createMenuItem(ActionsFX.EDIT_STRINGS, new OldDatabaseCommandWrapper(Actions.EDIT_STRINGS, this, Globals.stateManager))
+                factory.createMenuItem(ActionsFX.EDIT_STRINGS, new StringAction())
         );
 
         Menu lookupIdentifiers = factory.createSubMenu(ActionsFX.LOOKUP_DOC_IDENTIFIER);
diff --git a/src/main/java/org/jabref/gui/strings/StringAction.java b/src/main/java/org/jabref/gui/strings/StringAction.java
new file mode 100644
index 00000000000..c5511536505
--- /dev/null
+++ b/src/main/java/org/jabref/gui/strings/StringAction.java
@@ -0,0 +1,12 @@
+package org.jabref.gui.strings;
+
+import org.jabref.gui.actions.SimpleCommand;
+
+public class StringAction extends SimpleCommand {
+
+    @Override
+    public void execute() {
+        new StringDialogView().show();
+    }
+
+}
diff --git a/src/main/java/org/jabref/gui/strings/StringDialogController.java b/src/main/java/org/jabref/gui/strings/StringDialogController.java
new file mode 100644
index 00000000000..bffe0819205
--- /dev/null
+++ b/src/main/java/org/jabref/gui/strings/StringDialogController.java
@@ -0,0 +1,73 @@
+package org.jabref.gui.strings;
+
+import javax.inject.Inject;
+
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.TableColumn;
+import javafx.scene.control.TableColumn.CellEditEvent;
+import javafx.scene.control.TableView;
+import javafx.scene.control.cell.TextFieldTableCell;
+
+import org.jabref.gui.AbstractController;
+import org.jabref.gui.StateManager;
+
+public class StringDialogController extends AbstractController<StringDialogViewModel> {
+
+    @FXML private Button btnNewString;
+
+    @FXML private Button btnRemove;
+
+    @FXML private Button btnHelp;
+
+    @FXML private TableView<StringViewModel> tblStrings;
+
+    @FXML private TableColumn<StringViewModel, String> colLabel;
+
+    @FXML private TableColumn<StringViewModel, String> colContent;
+
+    @Inject private StateManager stateManager;
+
+    @FXML
+    private void initialize() {
+
+        viewModel = new StringDialogViewModel(stateManager);
+        colLabel.setCellValueFactory(cellData -> cellData.getValue().getLabel());
+        colContent.setCellValueFactory(cellData -> cellData.getValue().getContent());
+
+        colLabel.setCellFactory(TextFieldTableCell.<StringViewModel> forTableColumn());
+        colContent.setCellFactory(TextFieldTableCell.<StringViewModel> forTableColumn());
+        colLabel.setOnEditCommit(
+                (CellEditEvent<StringViewModel, String> t) -> {
+                    t.getTableView().getItems().get(
+                            t.getTablePosition().getRow()).setLabel(t.getNewValue());
+                });
+        colContent.setOnEditCommit(
+                (CellEditEvent<StringViewModel, String> t) -> {
+                    t.getTableView().getItems().get(
+                            t.getTablePosition().getRow()).setContent(t.getNewValue());
+                });
+
+        tblStrings.itemsProperty().bindBidirectional(viewModel.allStringsProperty());
+        tblStrings.setEditable(true);
+    }
+
+    @FXML
+    void addString(ActionEvent event) {
+
+        viewModel.addNewString();
+
+    }
+
+    @FXML
+    void openHelp(ActionEvent event) {
+
+    }
+
+    @FXML
+    void removeString(ActionEvent event) {
+        StringViewModel selected = tblStrings.getSelectionModel().getSelectedItem();
+        viewModel.removeString(selected);
+    }
+}
diff --git a/src/main/java/org/jabref/gui/strings/StringDialogView.java b/src/main/java/org/jabref/gui/strings/StringDialogView.java
new file mode 100644
index 00000000000..9419e41d102
--- /dev/null
+++ b/src/main/java/org/jabref/gui/strings/StringDialogView.java
@@ -0,0 +1,18 @@
+package org.jabref.gui.strings;
+
+import javafx.scene.control.Alert.AlertType;
+import javafx.scene.control.DialogPane;
+
+import org.jabref.gui.AbstractDialogView;
+import org.jabref.gui.FXDialog;
+
+public class StringDialogView extends AbstractDialogView {
+
+    @Override
+    public void show() {
+        FXDialog stringDialog = new FXDialog(AlertType.INFORMATION, "Edit Strings");
+        stringDialog.setDialogPane((DialogPane) this.getView());
+        stringDialog.setResizable(true);
+        stringDialog.show();
+    }
+}
diff --git a/src/main/java/org/jabref/gui/strings/StringDialogViewModel.java b/src/main/java/org/jabref/gui/strings/StringDialogViewModel.java
new file mode 100644
index 00000000000..527a377ef62
--- /dev/null
+++ b/src/main/java/org/jabref/gui/strings/StringDialogViewModel.java
@@ -0,0 +1,53 @@
+package org.jabref.gui.strings;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javafx.beans.property.SimpleListProperty;
+import javafx.collections.FXCollections;
+
+import org.jabref.gui.AbstractViewModel;
+import org.jabref.gui.StateManager;
+import org.jabref.logic.bibtex.comparator.BibtexStringComparator;
+import org.jabref.model.database.BibDatabase;
+import org.jabref.model.entry.BibtexString;
+
+public class StringDialogViewModel extends AbstractViewModel {
+
+    private final SimpleListProperty<StringViewModel> allStrings = new SimpleListProperty<>(
+            FXCollections.observableArrayList());
+
+    private final StateManager stateManager;
+
+    public StringDialogViewModel(StateManager stateManager) {
+        this.stateManager = stateManager;
+        addAllStringsFromDB();
+    }
+
+    private void addAllStringsFromDB() {
+        BibDatabase db = stateManager.getActiveDatabase().get().getDatabase();
+        List<StringViewModel> strings = db.getStringKeySet().stream()
+                .map(string -> db.getString(string))
+                .sorted(new BibtexStringComparator(false))
+                .map(this::convertFromBibTexString).collect(Collectors.toList());
+        allStrings.addAll(strings);
+    }
+
+    public SimpleListProperty<StringViewModel> allStringsProperty() {
+        return this.allStrings;
+    }
+
+    public void addNewString() {
+        allStrings.add(new StringViewModel("new Label", "New Content"));
+    }
+
+    public void removeString(StringViewModel selected) {
+        allStrings.remove(selected);
+
+    }
+
+    private StringViewModel convertFromBibTexString(BibtexString bibtexString) {
+        return new StringViewModel(bibtexString.getName(), bibtexString.getContent());
+
+    }
+}
diff --git a/src/main/java/org/jabref/gui/strings/StringViewModel.java b/src/main/java/org/jabref/gui/strings/StringViewModel.java
new file mode 100644
index 00000000000..35be1dde8db
--- /dev/null
+++ b/src/main/java/org/jabref/gui/strings/StringViewModel.java
@@ -0,0 +1,33 @@
+package org.jabref.gui.strings;
+
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+
+
+public class StringViewModel {
+
+    private final StringProperty label;
+    private final StringProperty content;
+
+    public StringViewModel(String label, String content) {
+
+        this.label = new SimpleStringProperty(label);
+        this.content = new SimpleStringProperty(content);
+    }
+
+    public StringProperty getLabel() {
+        return label;
+    }
+
+    public StringProperty getContent() {
+        return content;
+    }
+
+    public void setLabel(String label) {
+        this.label.setValue(label);
+    }
+
+    public void setContent(String content) {
+        this.content.setValue(content);
+    }
+}
diff --git a/src/main/resources/org/jabref/gui/strings/StringDialog.fxml b/src/main/resources/org/jabref/gui/strings/StringDialog.fxml
new file mode 100644
index 00000000000..ddd1178c395
--- /dev/null
+++ b/src/main/resources/org/jabref/gui/strings/StringDialog.fxml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.DialogPane?>
+<?import javafx.scene.control.Separator?>
+<?import javafx.scene.control.TableColumn?>
+<?import javafx.scene.control.TableView?>
+<?import javafx.scene.control.ToolBar?>
+
+
+<DialogPane xmlns="http://javafx.com/javafx/8.0.141" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.strings.StringDialogController">
+   <header>
+      <ToolBar maxWidth="1.7976931348623157E308" prefHeight="40.0" prefWidth="299.0">
+        <items>
+          <Button fx:id="btnNewString" mnemonicParsing="false" onAction="#addString" text="New String" />
+            <Button fx:id="btnRemove" mnemonicParsing="false" onAction="#removeString" text="Remove String" />
+            <Separator orientation="VERTICAL" prefHeight="200.0" />
+            <Button fx:id="btnHelp" mnemonicParsing="false" onAction="#openHelp" text="Help" />
+        </items>
+      </ToolBar>
+   </header>
+   <content>
+      <TableView fx:id="tblStrings" prefHeight="241.0" prefWidth="0.0">
+        <columns>
+          <TableColumn fx:id="colLabel" prefWidth="75.0" text="Label" />
+          <TableColumn fx:id="colContent" prefWidth="75.0" text="Content" />
+        </columns>
+      </TableView>
+   </content>
+</DialogPane>

From 5b15f2631b0edbb53dcbc053747068d2a2e48b99 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Sat, 17 Feb 2018 17:52:31 +0100
Subject: [PATCH 02/28] add save and cancel buttons

---
 .../gui/strings/StringDialogController.java   | 42 +++++++++++++------
 .../org/jabref/gui/strings/StringDialog.fxml  | 36 +++++++++++-----
 2 files changed, 56 insertions(+), 22 deletions(-)

diff --git a/src/main/java/org/jabref/gui/strings/StringDialogController.java b/src/main/java/org/jabref/gui/strings/StringDialogController.java
index bffe0819205..9b6198013f1 100644
--- a/src/main/java/org/jabref/gui/strings/StringDialogController.java
+++ b/src/main/java/org/jabref/gui/strings/StringDialogController.java
@@ -8,30 +8,40 @@
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableColumn.CellEditEvent;
 import javafx.scene.control.TableView;
+import javafx.scene.control.Tooltip;
 import javafx.scene.control.cell.TextFieldTableCell;
 
 import org.jabref.gui.AbstractController;
+import org.jabref.gui.IconTheme.JabRefIcons;
+import org.jabref.gui.help.HelpAction;
+import org.jabref.logic.help.HelpFile;
+import org.jabref.logic.l10n.Localization;
 import org.jabref.gui.StateManager;
 
 public class StringDialogController extends AbstractController<StringDialogViewModel> {
 
     @FXML private Button btnNewString;
-
     @FXML private Button btnRemove;
-
     @FXML private Button btnHelp;
-
+    @FXML private Button btnCancel;
+    @FXML private Button btnSave;
     @FXML private TableView<StringViewModel> tblStrings;
-
     @FXML private TableColumn<StringViewModel, String> colLabel;
-
     @FXML private TableColumn<StringViewModel, String> colContent;
-
     @Inject private StateManager stateManager;
 
     @FXML
     private void initialize() {
 
+        btnHelp.setGraphic(JabRefIcons.HELP.getGraphicNode());
+        btnHelp.setTooltip(new Tooltip(Localization.lang("Open Help page")));
+
+        btnNewString.setGraphic(JabRefIcons.ADD.getGraphicNode());
+        btnNewString.setTooltip(new Tooltip(Localization.lang("New string")));
+
+        btnRemove.setGraphic(JabRefIcons.REMOVE.getGraphicNode());
+        btnRemove.setTooltip(new Tooltip(Localization.lang("Remove string")));
+
         viewModel = new StringDialogViewModel(stateManager);
         colLabel.setCellValueFactory(cellData -> cellData.getValue().getLabel());
         colContent.setCellValueFactory(cellData -> cellData.getValue().getContent());
@@ -54,20 +64,28 @@ private void initialize() {
     }
 
     @FXML
-    void addString(ActionEvent event) {
-
+    private void addString(ActionEvent event) {
         viewModel.addNewString();
-
     }
 
     @FXML
-    void openHelp(ActionEvent event) {
-
+    private void openHelp(ActionEvent event) {
+        HelpAction.openHelpPage(HelpFile.STRING_EDITOR);
     }
 
     @FXML
-    void removeString(ActionEvent event) {
+    private void removeString(ActionEvent event) {
         StringViewModel selected = tblStrings.getSelectionModel().getSelectedItem();
         viewModel.removeString(selected);
     }
+
+    @FXML
+    private void save() {
+
+    }
+
+    @FXML
+    private void close() {
+        getStage().close();
+    }
 }
diff --git a/src/main/resources/org/jabref/gui/strings/StringDialog.fxml b/src/main/resources/org/jabref/gui/strings/StringDialog.fxml
index ddd1178c395..73b0841de97 100644
--- a/src/main/resources/org/jabref/gui/strings/StringDialog.fxml
+++ b/src/main/resources/org/jabref/gui/strings/StringDialog.fxml
@@ -1,30 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ButtonBar?>
 <?import javafx.scene.control.DialogPane?>
 <?import javafx.scene.control.Separator?>
 <?import javafx.scene.control.TableColumn?>
 <?import javafx.scene.control.TableView?>
 <?import javafx.scene.control.ToolBar?>
-
+<?import javafx.scene.layout.BorderPane?>
 
 <DialogPane xmlns="http://javafx.com/javafx/8.0.141" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.strings.StringDialogController">
    <header>
       <ToolBar maxWidth="1.7976931348623157E308" prefHeight="40.0" prefWidth="299.0">
         <items>
-          <Button fx:id="btnNewString" mnemonicParsing="false" onAction="#addString" text="New String" />
-            <Button fx:id="btnRemove" mnemonicParsing="false" onAction="#removeString" text="Remove String" />
+          <Button fx:id="btnNewString" mnemonicParsing="false" onAction="#addString" />
+            <Button fx:id="btnRemove" mnemonicParsing="false" onAction="#removeString" />
             <Separator orientation="VERTICAL" prefHeight="200.0" />
-            <Button fx:id="btnHelp" mnemonicParsing="false" onAction="#openHelp" text="Help" />
+            <Button fx:id="btnHelp" mnemonicParsing="false" onAction="#openHelp" />
         </items>
       </ToolBar>
    </header>
    <content>
-      <TableView fx:id="tblStrings" prefHeight="241.0" prefWidth="0.0">
-        <columns>
-          <TableColumn fx:id="colLabel" prefWidth="75.0" text="Label" />
-          <TableColumn fx:id="colContent" prefWidth="75.0" text="Content" />
-        </columns>
-      </TableView>
+      <BorderPane>
+         <center>
+            <TableView fx:id="tblStrings" prefHeight="250.0" prefWidth="0.0">
+              <columns>
+                <TableColumn fx:id="colLabel" prefWidth="75.0" text="Label" />
+                <TableColumn fx:id="colContent" prefWidth="75.0" text="Content" />
+              </columns>
+               <columnResizePolicy>
+                  <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
+               </columnResizePolicy>
+            </TableView>
+         </center>
+         <bottom>
+            <ButtonBar prefHeight="40.0" prefWidth="200.0" BorderPane.alignment="CENTER">
+              <buttons>
+                  <Button fx:id="btnCancel" cancelButton="true" mnemonicParsing="false" text="Cancel" />
+                <Button fx:id="btnSave" defaultButton="true" mnemonicParsing="false" onAction="#save" text="Save" />
+              </buttons>
+            </ButtonBar>
+         </bottom>
+      </BorderPane>
    </content>
 </DialogPane>

From 017ac37e35c90050ac10831a0e9c0aca9c481b05 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Sun, 18 Feb 2018 13:12:04 +0100
Subject: [PATCH 03/28] add method for saving TODO: validation

---
 .../gui/strings/StringDialogController.java   |  5 +-
 .../gui/strings/StringDialogViewModel.java    | 47 +++++++++++++++----
 .../gui/util/IconValidationDecorator.java     |  4 ++
 .../jabref/model/database/BibDatabase.java    |  2 +-
 .../org/jabref/model/entry/BibtexString.java  | 21 ++++++---
 5 files changed, 62 insertions(+), 17 deletions(-)

diff --git a/src/main/java/org/jabref/gui/strings/StringDialogController.java b/src/main/java/org/jabref/gui/strings/StringDialogController.java
index 9b6198013f1..a187a2e2d14 100644
--- a/src/main/java/org/jabref/gui/strings/StringDialogController.java
+++ b/src/main/java/org/jabref/gui/strings/StringDialogController.java
@@ -61,6 +61,9 @@ private void initialize() {
 
         tblStrings.itemsProperty().bindBidirectional(viewModel.allStringsProperty());
         tblStrings.setEditable(true);
+
+        tblStrings.getSelectionModel().selectedItemProperty().addListener(
+                (observable, oldValue, newValue) -> viewModel.validateInput(newValue));
     }
 
     @FXML
@@ -81,7 +84,7 @@ private void removeString(ActionEvent event) {
 
     @FXML
     private void save() {
-
+        viewModel.save();
     }
 
     @FXML
diff --git a/src/main/java/org/jabref/gui/strings/StringDialogViewModel.java b/src/main/java/org/jabref/gui/strings/StringDialogViewModel.java
index 527a377ef62..251538786d1 100644
--- a/src/main/java/org/jabref/gui/strings/StringDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/strings/StringDialogViewModel.java
@@ -1,8 +1,10 @@
 package org.jabref.gui.strings;
 
-import java.util.List;
+import java.util.Optional;
+import java.util.Set;
 import java.util.stream.Collectors;
 
+import javafx.beans.property.ListProperty;
 import javafx.beans.property.SimpleListProperty;
 import javafx.collections.FXCollections;
 
@@ -14,26 +16,26 @@
 
 public class StringDialogViewModel extends AbstractViewModel {
 
-    private final SimpleListProperty<StringViewModel> allStrings = new SimpleListProperty<>(
-            FXCollections.observableArrayList());
+    private final ListProperty<StringViewModel> allStrings = new SimpleListProperty<>(FXCollections.observableArrayList());
 
-    private final StateManager stateManager;
+    private final BibDatabase db;
 
     public StringDialogViewModel(StateManager stateManager) {
-        this.stateManager = stateManager;
+        this.db = stateManager.getActiveDatabase().get().getDatabase();
         addAllStringsFromDB();
+
     }
 
     private void addAllStringsFromDB() {
-        BibDatabase db = stateManager.getActiveDatabase().get().getDatabase();
-        List<StringViewModel> strings = db.getStringKeySet().stream()
+
+        Set<StringViewModel> strings = db.getStringKeySet().stream()
                 .map(string -> db.getString(string))
                 .sorted(new BibtexStringComparator(false))
-                .map(this::convertFromBibTexString).collect(Collectors.toList());
+                .map(this::convertFromBibTexString).collect(Collectors.toSet());
         allStrings.addAll(strings);
     }
 
-    public SimpleListProperty<StringViewModel> allStringsProperty() {
+    public ListProperty<StringViewModel> allStringsProperty() {
         return this.allStrings;
     }
 
@@ -50,4 +52,31 @@ private StringViewModel convertFromBibTexString(BibtexString bibtexString) {
         return new StringViewModel(bibtexString.getName(), bibtexString.getContent());
 
     }
+
+    public void validateInput(StringViewModel newValue) {
+        if (newValue != null) {
+            String label = newValue.getLabel().getValue();
+            String content = newValue.getContent().getValue();
+
+            //TODO: Validation
+        }
+
+    }
+
+    public void save() {
+        for (StringViewModel model : allStrings) {
+            String label = model.getLabel().getValue();
+            String content = model.getContent().getValue();
+
+            Optional<BibtexString> bibtexString = db.getStringByName(label);
+            if (bibtexString.isPresent()) {
+                if (!(bibtexString.get().getContent().equals(content))) {
+                    bibtexString.get().setContent(content);
+                }
+            } else {
+                db.addString(new BibtexString(label, content));
+            }
+        }
+
+    }
 }
diff --git a/src/main/java/org/jabref/gui/util/IconValidationDecorator.java b/src/main/java/org/jabref/gui/util/IconValidationDecorator.java
index d4e7d2caf8d..54d950852c3 100644
--- a/src/main/java/org/jabref/gui/util/IconValidationDecorator.java
+++ b/src/main/java/org/jabref/gui/util/IconValidationDecorator.java
@@ -31,14 +31,17 @@ public IconValidationDecorator(Pos position) {
         this.position = position;
     }
 
+    @Override
     protected Node createErrorNode() {
         return IconTheme.JabRefIcons.ERROR.getGraphicNode();
     }
 
+    @Override
     protected Node createWarningNode() {
         return IconTheme.JabRefIcons.WARNING.getGraphicNode();
     }
 
+    @Override
     public Node createDecorationNode(ValidationMessage message) {
         Node graphic = Severity.ERROR == message.getSeverity() ? createErrorNode() : createWarningNode();
         graphic.getStyleClass().add(Severity.ERROR == message.getSeverity() ? "error-icon" : "warning-icon");
@@ -49,6 +52,7 @@ public Node createDecorationNode(ValidationMessage message) {
         return label;
     }
 
+    @Override
     protected Tooltip createTooltip(ValidationMessage message) {
         Tooltip tooltip = new Tooltip(message.getText());
         tooltip.getStyleClass().add(Severity.ERROR == message.getSeverity() ? "tooltip-error" : "tooltip-warning");
diff --git a/src/main/java/org/jabref/model/database/BibDatabase.java b/src/main/java/org/jabref/model/database/BibDatabase.java
index 40e6abcc0ff..fe23614e5ca 100644
--- a/src/main/java/org/jabref/model/database/BibDatabase.java
+++ b/src/main/java/org/jabref/model/database/BibDatabase.java
@@ -318,7 +318,7 @@ public BibtexString getString(String id) {
     }
 
     /**
-     * Returns the string with the given name.
+     * Returns the string with the given name/label
      */
     public Optional<BibtexString> getStringByName(String name) {
         for (BibtexString string : getStringValues()) {
diff --git a/src/main/java/org/jabref/model/entry/BibtexString.java b/src/main/java/org/jabref/model/entry/BibtexString.java
index b03d9ba08e7..40e4f84389f 100644
--- a/src/main/java/org/jabref/model/entry/BibtexString.java
+++ b/src/main/java/org/jabref/model/entry/BibtexString.java
@@ -7,6 +7,7 @@
  * This class models a BibTex String ("@String")
  */
 public class BibtexString implements Cloneable {
+
     /**
      * Type of a \@String.
      * <p>
@@ -95,6 +96,10 @@ public void setId(String id) {
         hasChanged = true;
     }
 
+    /**
+     * Returns the name/label of the string
+     * @return
+     */
     public String getName() {
         return name;
     }
@@ -173,15 +178,19 @@ public String toString() {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o) {
+            return true;
+        }
+        if ((o == null) || (getClass() != o.getClass())) {
+            return false;
+        }
         BibtexString that = (BibtexString) o;
-        return hasChanged == that.hasChanged &&
+        return (Objects.equals(hasChanged,that.hasChanged) &&
                 Objects.equals(name, that.name) &&
                 Objects.equals(content, that.content) &&
-                Objects.equals(id, that.id) &&
-                type == that.type &&
-                Objects.equals(parsedSerialization, that.parsedSerialization);
+                Objects.equals(id, that.id)  &&
+                Objects.equals(type, that.type) &&
+                Objects.equals(parsedSerialization, that.parsedSerialization));
     }
 
     @Override

From 4ed242bde1cdc484f0f620c36dfde0514fca71dc Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Sun, 25 Feb 2018 13:13:10 +0100
Subject: [PATCH 04/28] First attempt at validation

---
 .../gui/strings/StringDialogController.java   | 53 ++++++++++++++++---
 .../gui/strings/StringDialogViewModel.java    |  6 ++-
 2 files changed, 50 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/jabref/gui/strings/StringDialogController.java b/src/main/java/org/jabref/gui/strings/StringDialogController.java
index a187a2e2d14..366f1c81062 100644
--- a/src/main/java/org/jabref/gui/strings/StringDialogController.java
+++ b/src/main/java/org/jabref/gui/strings/StringDialogController.java
@@ -5,18 +5,25 @@
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
+import javafx.scene.control.TableCell;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableColumn.CellEditEvent;
 import javafx.scene.control.TableView;
 import javafx.scene.control.Tooltip;
 import javafx.scene.control.cell.TextFieldTableCell;
+import javafx.util.Callback;
+import javafx.util.converter.DefaultStringConverter;
 
 import org.jabref.gui.AbstractController;
 import org.jabref.gui.IconTheme.JabRefIcons;
+import org.jabref.gui.StateManager;
 import org.jabref.gui.help.HelpAction;
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.gui.StateManager;
+
+import org.controlsfx.tools.ValueExtractor;
+import org.controlsfx.validation.ValidationSupport;
+import org.controlsfx.validation.Validator;
 
 public class StringDialogController extends AbstractController<StringDialogViewModel> {
 
@@ -46,17 +53,49 @@ private void initialize() {
         colLabel.setCellValueFactory(cellData -> cellData.getValue().getLabel());
         colContent.setCellValueFactory(cellData -> cellData.getValue().getContent());
 
-        colLabel.setCellFactory(TextFieldTableCell.<StringViewModel> forTableColumn());
-        colContent.setCellFactory(TextFieldTableCell.<StringViewModel> forTableColumn());
+        ValidationSupport validationSupport = new ValidationSupport();
+
+        //Register TextfieldTableCell Control for validation
+        ValueExtractor.addObservableValueExtractor(c -> c instanceof TextFieldTableCell, c -> ((TextFieldTableCell<?, String>) c).textProperty());
+
+        colLabel.setCellFactory(new Callback<TableColumn<StringViewModel, String>, TableCell<StringViewModel, String>>() {
+
+            @Override
+            public TableCell<StringViewModel, String> call(TableColumn<StringViewModel, String> param) {
+
+                TextFieldTableCell<StringViewModel, String> cell = new TextFieldTableCell<>(new DefaultStringConverter());
+                validationSupport.registerValidator(cell, Validator.createEmptyValidator("Text is required"));
+                return cell;
+            }
+
+        });
+
+        colContent.setCellFactory(new Callback<TableColumn<StringViewModel, String>, TableCell<StringViewModel, String>>() {
+
+            @Override
+            public TableCell<StringViewModel, String> call(TableColumn<StringViewModel, String> param) {
+
+                TextFieldTableCell<StringViewModel, String> cell = new TextFieldTableCell<>(new DefaultStringConverter());
+                validationSupport.registerValidator(cell, Validator.createEmptyValidator("Text is required"));
+                return cell;
+            }
+        });
+
         colLabel.setOnEditCommit(
                 (CellEditEvent<StringViewModel, String> t) -> {
-                    t.getTableView().getItems().get(
-                            t.getTablePosition().getRow()).setLabel(t.getNewValue());
+                    t.getTableView()
+                            .getItems()
+                            .get(
+                                    t.getTablePosition().getRow())
+                            .setLabel(t.getNewValue());
                 });
         colContent.setOnEditCommit(
                 (CellEditEvent<StringViewModel, String> t) -> {
-                    t.getTableView().getItems().get(
-                            t.getTablePosition().getRow()).setContent(t.getNewValue());
+                    t.getTableView()
+                            .getItems()
+                            .get(
+                                    t.getTablePosition().getRow())
+                            .setContent(t.getNewValue());
                 });
 
         tblStrings.itemsProperty().bindBidirectional(viewModel.allStringsProperty());
diff --git a/src/main/java/org/jabref/gui/strings/StringDialogViewModel.java b/src/main/java/org/jabref/gui/strings/StringDialogViewModel.java
index 251538786d1..052565d2065 100644
--- a/src/main/java/org/jabref/gui/strings/StringDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/strings/StringDialogViewModel.java
@@ -28,10 +28,12 @@ public StringDialogViewModel(StateManager stateManager) {
 
     private void addAllStringsFromDB() {
 
-        Set<StringViewModel> strings = db.getStringKeySet().stream()
+        Set<StringViewModel> strings = db.getStringKeySet()
+                .stream()
                 .map(string -> db.getString(string))
                 .sorted(new BibtexStringComparator(false))
-                .map(this::convertFromBibTexString).collect(Collectors.toSet());
+                .map(this::convertFromBibTexString)
+                .collect(Collectors.toSet());
         allStrings.addAll(strings);
     }
 

From e764d041e43731d71a13504c1feb34320199e436 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Sun, 25 Feb 2018 18:25:25 +0100
Subject: [PATCH 05/28] use mvvmfx validation

---
 .../gui/strings/StringDialogController.java   | 62 +++++--------------
 .../gui/strings/StringDialogViewModel.java    | 11 ----
 .../jabref/gui/strings/StringViewModel.java   | 32 ++++++++--
 3 files changed, 43 insertions(+), 62 deletions(-)

diff --git a/src/main/java/org/jabref/gui/strings/StringDialogController.java b/src/main/java/org/jabref/gui/strings/StringDialogController.java
index 366f1c81062..975688967b9 100644
--- a/src/main/java/org/jabref/gui/strings/StringDialogController.java
+++ b/src/main/java/org/jabref/gui/strings/StringDialogController.java
@@ -5,14 +5,11 @@
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
-import javafx.scene.control.TableCell;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableColumn.CellEditEvent;
 import javafx.scene.control.TableView;
 import javafx.scene.control.Tooltip;
 import javafx.scene.control.cell.TextFieldTableCell;
-import javafx.util.Callback;
-import javafx.util.converter.DefaultStringConverter;
 
 import org.jabref.gui.AbstractController;
 import org.jabref.gui.IconTheme.JabRefIcons;
@@ -21,9 +18,8 @@
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.l10n.Localization;
 
-import org.controlsfx.tools.ValueExtractor;
-import org.controlsfx.validation.ValidationSupport;
-import org.controlsfx.validation.Validator;
+import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
+import de.saxsys.mvvmfx.utils.validation.visualization.ValidationVisualizer;
 
 public class StringDialogController extends AbstractController<StringDialogViewModel> {
 
@@ -40,6 +36,8 @@ public class StringDialogController extends AbstractController<StringDialogViewM
     @FXML
     private void initialize() {
 
+        viewModel = new StringDialogViewModel(stateManager);
+
         btnHelp.setGraphic(JabRefIcons.HELP.getGraphicNode());
         btnHelp.setTooltip(new Tooltip(Localization.lang("Open Help page")));
 
@@ -49,60 +47,30 @@ private void initialize() {
         btnRemove.setGraphic(JabRefIcons.REMOVE.getGraphicNode());
         btnRemove.setTooltip(new Tooltip(Localization.lang("Remove string")));
 
-        viewModel = new StringDialogViewModel(stateManager);
         colLabel.setCellValueFactory(cellData -> cellData.getValue().getLabel());
         colContent.setCellValueFactory(cellData -> cellData.getValue().getContent());
 
-        ValidationSupport validationSupport = new ValidationSupport();
-
+        colLabel.setCellFactory(TextFieldTableCell.forTableColumn());
+        colContent.setCellFactory(TextFieldTableCell.forTableColumn());
         //Register TextfieldTableCell Control for validation
-        ValueExtractor.addObservableValueExtractor(c -> c instanceof TextFieldTableCell, c -> ((TextFieldTableCell<?, String>) c).textProperty());
-
-        colLabel.setCellFactory(new Callback<TableColumn<StringViewModel, String>, TableCell<StringViewModel, String>>() {
-
-            @Override
-            public TableCell<StringViewModel, String> call(TableColumn<StringViewModel, String> param) {
-
-                TextFieldTableCell<StringViewModel, String> cell = new TextFieldTableCell<>(new DefaultStringConverter());
-                validationSupport.registerValidator(cell, Validator.createEmptyValidator("Text is required"));
-                return cell;
-            }
-
-        });
-
-        colContent.setCellFactory(new Callback<TableColumn<StringViewModel, String>, TableCell<StringViewModel, String>>() {
-
-            @Override
-            public TableCell<StringViewModel, String> call(TableColumn<StringViewModel, String> param) {
-
-                TextFieldTableCell<StringViewModel, String> cell = new TextFieldTableCell<>(new DefaultStringConverter());
-                validationSupport.registerValidator(cell, Validator.createEmptyValidator("Text is required"));
-                return cell;
-            }
-        });
 
         colLabel.setOnEditCommit(
-                (CellEditEvent<StringViewModel, String> t) -> {
-                    t.getTableView()
-                            .getItems()
-                            .get(
-                                    t.getTablePosition().getRow())
-                            .setLabel(t.getNewValue());
+                (CellEditEvent<StringViewModel, String> cell) -> {
+                    cell.getRowValue().setLabel(cell.getNewValue());
                 });
         colContent.setOnEditCommit(
-                (CellEditEvent<StringViewModel, String> t) -> {
-                    t.getTableView()
-                            .getItems()
-                            .get(
-                                    t.getTablePosition().getRow())
-                            .setContent(t.getNewValue());
+                (CellEditEvent<StringViewModel, String> cell) -> {
+                    cell.getRowValue().setContent(cell.getNewValue());
                 });
 
         tblStrings.itemsProperty().bindBidirectional(viewModel.allStringsProperty());
         tblStrings.setEditable(true);
 
-        tblStrings.getSelectionModel().selectedItemProperty().addListener(
-                (observable, oldValue, newValue) -> viewModel.validateInput(newValue));
+        ValidationVisualizer visualizer = new ControlsFxVisualizer();
+
+        //The problemm is that the viewModel here is not the viewModel of the List
+        //visualizer.initVisualization(viewModel.labelValidation(), colLabel, true);
+
     }
 
     @FXML
diff --git a/src/main/java/org/jabref/gui/strings/StringDialogViewModel.java b/src/main/java/org/jabref/gui/strings/StringDialogViewModel.java
index 052565d2065..fd93f03e884 100644
--- a/src/main/java/org/jabref/gui/strings/StringDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/strings/StringDialogViewModel.java
@@ -47,7 +47,6 @@ public void addNewString() {
 
     public void removeString(StringViewModel selected) {
         allStrings.remove(selected);
-
     }
 
     private StringViewModel convertFromBibTexString(BibtexString bibtexString) {
@@ -55,16 +54,6 @@ private StringViewModel convertFromBibTexString(BibtexString bibtexString) {
 
     }
 
-    public void validateInput(StringViewModel newValue) {
-        if (newValue != null) {
-            String label = newValue.getLabel().getValue();
-            String content = newValue.getContent().getValue();
-
-            //TODO: Validation
-        }
-
-    }
-
     public void save() {
         for (StringViewModel model : allStrings) {
             String label = model.getLabel().getValue();
diff --git a/src/main/java/org/jabref/gui/strings/StringViewModel.java b/src/main/java/org/jabref/gui/strings/StringViewModel.java
index 35be1dde8db..0909b260e4c 100644
--- a/src/main/java/org/jabref/gui/strings/StringViewModel.java
+++ b/src/main/java/org/jabref/gui/strings/StringViewModel.java
@@ -1,18 +1,42 @@
 package org.jabref.gui.strings;
 
+import java.util.function.Function;
+
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 
+import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
+import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
+import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
+import de.saxsys.mvvmfx.utils.validation.Validator;
 
 public class StringViewModel {
 
-    private final StringProperty label;
-    private final StringProperty content;
+    private final StringProperty label = new SimpleStringProperty();
+    private final StringProperty content = new SimpleStringProperty();
+
+    private final Validator labelValidator;
+
+    private final Function<String, ValidationMessage> function = input -> {
+        if (input == null) {
+            return ValidationMessage.error("May not be null2");
+        } else if (input.trim().isEmpty()) {
+            return ValidationMessage.warning("Should not be empty");
+        } else {
+            return null; // everything is ok
+        }
+    };
 
     public StringViewModel(String label, String content) {
 
-        this.label = new SimpleStringProperty(label);
-        this.content = new SimpleStringProperty(content);
+        this.label.setValue(label);
+        this.content.setValue(content);
+
+        labelValidator = new FunctionBasedValidator<>(this.label, function);
+    }
+
+    public ValidationStatus labelValidation() {
+        return labelValidator.getValidationStatus();
     }
 
     public StringProperty getLabel() {

From f5e2a270f31f632cbfa1e2669f762cc15ebce801 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Mon, 26 Feb 2018 18:27:49 +0100
Subject: [PATCH 06/28] Add validation in factory

---
 .../gui/strings/StringDialogController.java   | 39 +++++++++++++++----
 .../jabref/gui/strings/StringViewModel.java   |  6 +++
 2 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/jabref/gui/strings/StringDialogController.java b/src/main/java/org/jabref/gui/strings/StringDialogController.java
index 975688967b9..dc1cab8574c 100644
--- a/src/main/java/org/jabref/gui/strings/StringDialogController.java
+++ b/src/main/java/org/jabref/gui/strings/StringDialogController.java
@@ -10,16 +10,18 @@
 import javafx.scene.control.TableView;
 import javafx.scene.control.Tooltip;
 import javafx.scene.control.cell.TextFieldTableCell;
+import javafx.util.converter.DefaultStringConverter;
 
 import org.jabref.gui.AbstractController;
 import org.jabref.gui.IconTheme.JabRefIcons;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.help.HelpAction;
+import org.jabref.gui.util.IconValidationDecorator;
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.l10n.Localization;
 
 import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
-import de.saxsys.mvvmfx.utils.validation.visualization.ValidationVisualizer;
+import org.controlsfx.tools.ValueExtractor;
 
 public class StringDialogController extends AbstractController<StringDialogViewModel> {
 
@@ -46,13 +48,36 @@ private void initialize() {
 
         btnRemove.setGraphic(JabRefIcons.REMOVE.getGraphicNode());
         btnRemove.setTooltip(new Tooltip(Localization.lang("Remove string")));
+        ControlsFxVisualizer visualizer = new ControlsFxVisualizer();
+        visualizer.setDecoration(new IconValidationDecorator());
 
-        colLabel.setCellValueFactory(cellData -> cellData.getValue().getLabel());
-        colContent.setCellValueFactory(cellData -> cellData.getValue().getContent());
-
-        colLabel.setCellFactory(TextFieldTableCell.forTableColumn());
-        colContent.setCellFactory(TextFieldTableCell.forTableColumn());
         //Register TextfieldTableCell Control for validation
+        ValueExtractor.addObservableValueExtractor(c -> c instanceof TextFieldTableCell, c -> ((TextFieldTableCell<?, String>) c).textProperty());
+
+        colLabel.setCellFactory(column -> {
+
+            TextFieldTableCell<StringViewModel, String> cell = new TextFieldTableCell<>(new DefaultStringConverter());
+            column.setCellValueFactory(cellData -> {
+
+                visualizer.initVisualization(cellData.getValue().labelValidation(), cell);
+                return cellData.getValue().getLabel();
+            });
+            return cell;
+
+        });
+
+        colContent.setCellFactory(column -> {
+
+            TextFieldTableCell<StringViewModel, String> cell = new TextFieldTableCell<>(new DefaultStringConverter());
+            column.setCellValueFactory(cellData -> {
+
+                visualizer.initVisualization(cellData.getValue().contentValidation(), cell);
+                return cellData.getValue().getContent();
+            });
+            return cell;
+
+        });
+
 
         colLabel.setOnEditCommit(
                 (CellEditEvent<StringViewModel, String> cell) -> {
@@ -66,8 +91,6 @@ private void initialize() {
         tblStrings.itemsProperty().bindBidirectional(viewModel.allStringsProperty());
         tblStrings.setEditable(true);
 
-        ValidationVisualizer visualizer = new ControlsFxVisualizer();
-
         //The problemm is that the viewModel here is not the viewModel of the List
         //visualizer.initVisualization(viewModel.labelValidation(), colLabel, true);
 
diff --git a/src/main/java/org/jabref/gui/strings/StringViewModel.java b/src/main/java/org/jabref/gui/strings/StringViewModel.java
index 0909b260e4c..09e6b86493e 100644
--- a/src/main/java/org/jabref/gui/strings/StringViewModel.java
+++ b/src/main/java/org/jabref/gui/strings/StringViewModel.java
@@ -16,6 +16,7 @@ public class StringViewModel {
     private final StringProperty content = new SimpleStringProperty();
 
     private final Validator labelValidator;
+    private final Validator contentValidator;
 
     private final Function<String, ValidationMessage> function = input -> {
         if (input == null) {
@@ -33,12 +34,17 @@ public StringViewModel(String label, String content) {
         this.content.setValue(content);
 
         labelValidator = new FunctionBasedValidator<>(this.label, function);
+        contentValidator = new FunctionBasedValidator<>(this.content, function);
     }
 
     public ValidationStatus labelValidation() {
         return labelValidator.getValidationStatus();
     }
 
+    public ValidationStatus contentValidation() {
+        return contentValidator.getValidationStatus();
+    }
+
     public StringProperty getLabel() {
         return label;
     }

From aacd4f96f97aabe92d43e2a6def84ed918ecd038 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Tue, 27 Feb 2018 18:39:13 +0100
Subject: [PATCH 07/28] remove old comment

---
 .../java/org/jabref/gui/strings/StringDialogController.java   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/main/java/org/jabref/gui/strings/StringDialogController.java b/src/main/java/org/jabref/gui/strings/StringDialogController.java
index dc1cab8574c..c4e07051061 100644
--- a/src/main/java/org/jabref/gui/strings/StringDialogController.java
+++ b/src/main/java/org/jabref/gui/strings/StringDialogController.java
@@ -78,7 +78,6 @@ private void initialize() {
 
         });
 
-
         colLabel.setOnEditCommit(
                 (CellEditEvent<StringViewModel, String> cell) -> {
                     cell.getRowValue().setLabel(cell.getNewValue());
@@ -91,8 +90,7 @@ private void initialize() {
         tblStrings.itemsProperty().bindBidirectional(viewModel.allStringsProperty());
         tblStrings.setEditable(true);
 
-        //The problemm is that the viewModel here is not the viewModel of the List
-        //visualizer.initVisualization(viewModel.labelValidation(), colLabel, true);
+
 
     }
 

From ed77f6229438ea54e6db04e7bdabaed4b8d04ed9 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Wed, 28 Feb 2018 00:11:05 +0100
Subject: [PATCH 08/28] add css but still does not work :(

---
 .../gui/strings/StringDialogController.java      | 11 ++++++-----
 .../org/jabref/gui/strings/StringDialog.css      | 16 ++++++++++++++++
 2 files changed, 22 insertions(+), 5 deletions(-)
 create mode 100644 src/main/resources/org/jabref/gui/strings/StringDialog.css

diff --git a/src/main/java/org/jabref/gui/strings/StringDialogController.java b/src/main/java/org/jabref/gui/strings/StringDialogController.java
index c4e07051061..a1e7e190029 100644
--- a/src/main/java/org/jabref/gui/strings/StringDialogController.java
+++ b/src/main/java/org/jabref/gui/strings/StringDialogController.java
@@ -21,7 +21,6 @@
 import org.jabref.logic.l10n.Localization;
 
 import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
-import org.controlsfx.tools.ValueExtractor;
 
 public class StringDialogController extends AbstractController<StringDialogViewModel> {
 
@@ -34,10 +33,12 @@ public class StringDialogController extends AbstractController<StringDialogViewM
     @FXML private TableColumn<StringViewModel, String> colLabel;
     @FXML private TableColumn<StringViewModel, String> colContent;
     @Inject private StateManager stateManager;
+    private final ControlsFxVisualizer visualizer = new ControlsFxVisualizer();
+
 
     @FXML
     private void initialize() {
-
+        visualizer.setDecoration(new IconValidationDecorator());
         viewModel = new StringDialogViewModel(stateManager);
 
         btnHelp.setGraphic(JabRefIcons.HELP.getGraphicNode());
@@ -48,11 +49,9 @@ private void initialize() {
 
         btnRemove.setGraphic(JabRefIcons.REMOVE.getGraphicNode());
         btnRemove.setTooltip(new Tooltip(Localization.lang("Remove string")));
-        ControlsFxVisualizer visualizer = new ControlsFxVisualizer();
-        visualizer.setDecoration(new IconValidationDecorator());
 
         //Register TextfieldTableCell Control for validation
-        ValueExtractor.addObservableValueExtractor(c -> c instanceof TextFieldTableCell, c -> ((TextFieldTableCell<?, String>) c).textProperty());
+        // ValueExtractor.addObservableValueExtractor(c -> c instanceof TextFieldTableCell, c -> ((TextFieldTableCell<?, String>) c).textProperty());
 
         colLabel.setCellFactory(column -> {
 
@@ -80,6 +79,7 @@ private void initialize() {
 
         colLabel.setOnEditCommit(
                 (CellEditEvent<StringViewModel, String> cell) -> {
+
                     cell.getRowValue().setLabel(cell.getNewValue());
                 });
         colContent.setOnEditCommit(
@@ -92,6 +92,7 @@ private void initialize() {
 
 
 
+
     }
 
     @FXML
diff --git a/src/main/resources/org/jabref/gui/strings/StringDialog.css b/src/main/resources/org/jabref/gui/strings/StringDialog.css
new file mode 100644
index 00000000000..124851fe00f
--- /dev/null
+++ b/src/main/resources/org/jabref/gui/strings/StringDialog.css
@@ -0,0 +1,16 @@
+.warning-icon {
+    -fx-fill: #ffb500;
+}
+
+.error-icon {
+    -fx-text-fill: #bb0613;
+    -fx-fill: #bb0613;
+}
+
+.tooltip-warning {
+    -fx-background-color: #d69600;
+}
+
+.tooltip-error {
+    -fx-background-color: #a80511;
+}

From 424d46320af5c8095170781419625cf67d255405 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Sun, 1 Apr 2018 18:51:41 +0200
Subject: [PATCH 09/28] convert to new javafx view/controller

---
 src/main/java/org/jabref/gui/JabRefFrame.java |    2 +-
 .../java/org/jabref/gui/JabRefFrame.java.orig | 1705 +++++++++++++++++
 .../org/jabref/gui/strings/StringAction.java  |   11 +-
 .../org/jabref/gui/strings/StringDialog.css   |    0
 .../org/jabref/gui/strings/StringDialog.fxml  |   10 +-
 .../gui/strings/StringDialogController.java   |  123 --
 .../jabref/gui/strings/StringDialogView.java  |  128 +-
 .../gui/strings/StringDialogViewModel.java    |    6 +-
 .../jabref/gui/strings/StringViewModel.java   |    2 +
 9 files changed, 1838 insertions(+), 149 deletions(-)
 create mode 100644 src/main/java/org/jabref/gui/JabRefFrame.java.orig
 rename src/main/{resources => java}/org/jabref/gui/strings/StringDialog.css (100%)
 rename src/main/{resources => java}/org/jabref/gui/strings/StringDialog.fxml (77%)
 delete mode 100644 src/main/java/org/jabref/gui/strings/StringDialogController.java

diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index 08e5b883c62..354cf99cec6 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -908,7 +908,7 @@ private MenuBar createMenu() {
 
                 factory.createMenuItem(StandardActions.LIBRARY_PROPERTIES, new LibraryPropertiesAction(this)),
                 factory.createMenuItem(StandardActions.EDIT_PREAMBLE, new PreambleEditor(this)),
-     	 	factory.createMenuItem(StandardActions.EDIT_STRINGS, new StringAction())
+                                  factory.createMenuItem(StandardActions.EDIT_STRINGS, new StringAction(this))
 
         );
 
diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java.orig b/src/main/java/org/jabref/gui/JabRefFrame.java.orig
new file mode 100644
index 00000000000..01561669817
--- /dev/null
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java.orig
@@ -0,0 +1,1705 @@
+package org.jabref.gui;
+
+import java.awt.Component;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.TimerTask;
+
+import javax.swing.AbstractAction;
+import javax.swing.Action;
+import javax.swing.Icon;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.JMenu;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JProgressBar;
+import javax.swing.KeyStroke;
+import javax.swing.SwingConstants;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+
+import javafx.application.Platform;
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
+import javafx.collections.ListChangeListener;
+import javafx.scene.Node;
+import javafx.scene.control.Button;
+import javafx.scene.control.Menu;
+import javafx.scene.control.MenuBar;
+import javafx.scene.control.SeparatorMenuItem;
+import javafx.scene.control.SplitPane;
+import javafx.scene.control.Tab;
+import javafx.scene.control.TabPane;
+import javafx.scene.control.ToolBar;
+import javafx.scene.control.Tooltip;
+import javafx.scene.input.KeyEvent;
+import javafx.scene.layout.BorderPane;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Pane;
+import javafx.scene.layout.Priority;
+import javafx.stage.Stage;
+
+import org.jabref.Globals;
+import org.jabref.JabRefExecutorService;
+import org.jabref.gui.actions.ActionFactory;
+import org.jabref.gui.actions.Actions;
+import org.jabref.gui.actions.AutoLinkFilesAction;
+import org.jabref.gui.actions.BibtexKeyPatternAction;
+import org.jabref.gui.actions.ConnectToSharedDatabaseCommand;
+import org.jabref.gui.actions.CopyFilesAction;
+import org.jabref.gui.actions.CustomizeEntryAction;
+import org.jabref.gui.actions.CustomizeKeyBindingAction;
+import org.jabref.gui.actions.EditExternalFileTypesAction;
+import org.jabref.gui.actions.ErrorConsoleAction;
+import org.jabref.gui.actions.FindUnlinkedFilesAction;
+import org.jabref.gui.actions.IntegrityCheckAction;
+import org.jabref.gui.actions.LibraryPropertiesAction;
+import org.jabref.gui.actions.LookupIdentifierAction;
+import org.jabref.gui.actions.ManageCustomExportsAction;
+import org.jabref.gui.actions.ManageCustomImportsAction;
+import org.jabref.gui.actions.ManageJournalsAction;
+import org.jabref.gui.actions.ManageKeywordsAction;
+import org.jabref.gui.actions.ManageProtectedTermsAction;
+import org.jabref.gui.actions.MassSetFieldAction;
+import org.jabref.gui.actions.MergeEntriesAction;
+import org.jabref.gui.actions.MnemonicAwareAction;
+import org.jabref.gui.actions.NewDatabaseAction;
+import org.jabref.gui.actions.NewEntryAction;
+import org.jabref.gui.actions.NewEntryFromPlainTextAction;
+import org.jabref.gui.actions.NewSubLibraryAction;
+import org.jabref.gui.actions.OldDatabaseCommandWrapper;
+import org.jabref.gui.actions.OpenBrowserAction;
+import org.jabref.gui.actions.SearchForUpdateAction;
+import org.jabref.gui.actions.SetupGeneralFieldsAction;
+import org.jabref.gui.actions.ShowDocumentViewerAction;
+import org.jabref.gui.actions.ShowPreferencesAction;
+import org.jabref.gui.actions.SimpleCommand;
+import org.jabref.gui.actions.StandardActions;
+import org.jabref.gui.dialogs.AutosaveUIManager;
+import org.jabref.gui.exporter.ExportCommand;
+import org.jabref.gui.exporter.SaveAllAction;
+import org.jabref.gui.exporter.SaveDatabaseAction;
+import org.jabref.gui.externalfiletype.ExternalFileTypes;
+import org.jabref.gui.help.AboutAction;
+import org.jabref.gui.help.HelpAction;
+import org.jabref.gui.icon.IconTheme;
+import org.jabref.gui.importer.ImportCommand;
+import org.jabref.gui.importer.ImportInspectionDialog;
+import org.jabref.gui.importer.actions.OpenDatabaseAction;
+import org.jabref.gui.keyboard.KeyBinding;
+import org.jabref.gui.menus.FileHistoryMenu;
+import org.jabref.gui.push.PushToApplicationButton;
+import org.jabref.gui.push.PushToApplications;
+import org.jabref.gui.search.GlobalSearchBar;
+import org.jabref.gui.specialfields.SpecialFieldValueViewModel;
+import org.jabref.gui.strings.StringAction;
+import org.jabref.gui.undo.CountingUndoManager;
+import org.jabref.gui.util.DefaultTaskExecutor;
+import org.jabref.logic.autosaveandbackup.AutosaveManager;
+import org.jabref.logic.autosaveandbackup.BackupManager;
+import org.jabref.logic.importer.IdFetcher;
+import org.jabref.logic.importer.OutputPrinter;
+import org.jabref.logic.importer.ParserResult;
+import org.jabref.logic.importer.WebFetchers;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.search.SearchQuery;
+import org.jabref.logic.undo.AddUndoableActionEvent;
+import org.jabref.logic.undo.UndoChangeEvent;
+import org.jabref.logic.undo.UndoRedoEvent;
+import org.jabref.logic.util.OS;
+import org.jabref.logic.util.io.FileUtil;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.database.BibDatabaseMode;
+import org.jabref.model.database.shared.DatabaseLocation;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.BiblatexEntryTypes;
+import org.jabref.model.entry.BibtexEntryTypes;
+import org.jabref.model.entry.FieldName;
+import org.jabref.model.entry.specialfields.SpecialField;
+import org.jabref.preferences.JabRefPreferences;
+import org.jabref.preferences.LastFocusedTabPreferences;
+import org.jabref.preferences.SearchPreferences;
+
+import com.google.common.eventbus.Subscribe;
+import org.eclipse.fx.ui.controls.tabpane.DndTabPane;
+import org.eclipse.fx.ui.controls.tabpane.DndTabPaneFactory;
+import org.fxmisc.easybind.EasyBind;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import osx.macadapter.MacAdapter;
+
+/**
+ * The main window of the application.
+ */
+public class JabRefFrame extends BorderPane implements OutputPrinter {
+
+    // Frame titles.
+    public static final String FRAME_TITLE = "JabRef";
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(JabRefFrame.class);
+
+    private final SplitPane splitPane = new SplitPane();
+    private final JabRefPreferences prefs = Globals.prefs;
+    private final GlobalSearchBar globalSearchBar = new GlobalSearchBar(this);
+    private final JLabel statusLine = new JLabel("", SwingConstants.LEFT);
+    private final JLabel statusLabel = new JLabel(
+            Localization.lang("Status")
+                    + ':',
+            SwingConstants.LEFT);
+    private final JProgressBar progressBar = new JProgressBar();
+    private final FileHistoryMenu fileHistory = new FileHistoryMenu(prefs, this);
+
+    // Here we instantiate menu/toolbar actions. Actions regarding
+    // the currently open database are defined as a GeneralAction
+    // with a unique command string. This causes the appropriate
+    // BasePanel's runCommand() method to be called with that command.
+    // Note: GeneralAction's constructor automatically gets translations
+    // for the name and message strings.
+
+    private final AbstractAction toggleRelevance = new GeneralAction(
+            new SpecialFieldValueViewModel(SpecialField.RELEVANCE.getValues().get(0)).getCommand(),
+            new SpecialFieldValueViewModel(SpecialField.RELEVANCE.getValues().get(0)).getMenuString(),
+            new SpecialFieldValueViewModel(SpecialField.RELEVANCE.getValues().get(0)).getToolTipText(),
+            IconTheme.JabRefIcons.RELEVANCE.getIcon());
+    private final AbstractAction toggleQualityAssured = new GeneralAction(
+            new SpecialFieldValueViewModel(SpecialField.QUALITY.getValues().get(0)).getCommand(),
+            new SpecialFieldValueViewModel(SpecialField.QUALITY.getValues().get(0)).getMenuString(),
+            new SpecialFieldValueViewModel(SpecialField.QUALITY.getValues().get(0)).getToolTipText(),
+            IconTheme.JabRefIcons.QUALITY_ASSURED.getIcon());
+    private final AbstractAction togglePrinted = new GeneralAction(
+            new SpecialFieldValueViewModel(SpecialField.PRINTED.getValues().get(0)).getCommand(),
+            new SpecialFieldValueViewModel(SpecialField.PRINTED.getValues().get(0)).getMenuString(),
+            new SpecialFieldValueViewModel(SpecialField.PRINTED.getValues().get(0)).getToolTipText(),
+            IconTheme.JabRefIcons.PRINTED.getIcon());
+
+    // Lists containing different subsets of actions for different purposes
+    private final List<Object> specialFieldButtons = new LinkedList<>();
+    private final List<Object> openDatabaseOnlyActions = new LinkedList<>();
+    private final List<Object> severalDatabasesOnlyActions = new LinkedList<>();
+    private final List<Object> openAndSavedDatabasesOnlyActions = new LinkedList<>();
+    private final List<Object> sharedDatabaseOnlyActions = new LinkedList<>();
+    private final List<Object> noSharedDatabaseActions = new LinkedList<>();
+    private final List<Object> oneEntryOnlyActions = new LinkedList<>();
+    private final List<Object> oneEntryWithFileOnlyActions = new LinkedList<>();
+    private final List<Object> oneEntryWithURLorDOIOnlyActions = new LinkedList<>();
+    private final List<Object> twoEntriesOnlyActions = new LinkedList<>();
+    private final List<Object> atLeastOneEntryActions = new LinkedList<>();
+    private final Stage mainStage;
+    // The sidepane manager takes care of populating the sidepane.
+    private SidePaneManager sidePaneManager;
+    private TabPane tabbedPane;
+    private PushToApplications pushApplications;
+    private final CountingUndoManager undoManager = new CountingUndoManager();
+    private final DialogService dialogService;
+    private SidePane sidePane;
+
+    public JabRefFrame(Stage mainStage) {
+        this.mainStage = mainStage;
+        this.dialogService = new FXDialogService(mainStage);
+        init();
+    }
+
+    private static JMenu subMenu(String name) {
+        int i = name.indexOf('&');
+        JMenu res;
+        if (i >= 0) {
+            res = new JMenu(name.substring(0, i) + name.substring(i + 1));
+            char mnemonic = Character.toUpperCase(name.charAt(i + 1));
+            res.setMnemonic((int) mnemonic);
+        } else {
+            res = new JMenu(name);
+        }
+
+        return res;
+    }
+
+    /**
+     * Takes a list of Object and calls the method setEnabled on them, depending on whether it is an Action or a
+     * Component.
+     *
+     * @param list List that should contain Actions and Components.
+     */
+    private static void setEnabled(List<Object> list, boolean enabled) {
+        for (Object actionOrComponent : list) {
+            if (actionOrComponent instanceof Action) {
+                ((Action) actionOrComponent).setEnabled(enabled);
+            }
+            if (actionOrComponent instanceof Component) {
+                ((Component) actionOrComponent).setEnabled(enabled);
+                if (actionOrComponent instanceof JPanel) {
+                    JPanel root = (JPanel) actionOrComponent;
+                    for (int index = 0; index < root.getComponentCount(); index++) {
+                        root.getComponent(index).setEnabled(enabled);
+                    }
+                }
+            }
+        }
+    }
+
+    private void init() {
+        sidePaneManager = new SidePaneManager(Globals.prefs, this);
+        sidePane = sidePaneManager.getPane();
+
+        Pane containerPane = DndTabPaneFactory.createDefaultDnDPane(DndTabPaneFactory.FeedbackType.MARKER, null);
+        tabbedPane = (DndTabPane) containerPane.getChildren().get(0);
+
+        initLayout();
+
+        initActions();
+
+        initKeyBindings();
+
+        //setBounds(GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds());
+        //WindowLocation pw = new WindowLocation(this, JabRefPreferences.POS_X, JabRefPreferences.POS_Y, JabRefPreferences.SIZE_X,
+        //        JabRefPreferences.SIZE_Y);
+        //pw.displayWindowAtStoredLocation();
+
+        /*
+         * The following state listener makes sure focus is registered with the
+         * correct database when the user switches tabs. Without this,
+         * cut/paste/copy operations would some times occur in the wrong tab.
+         */
+        EasyBind.subscribe(tabbedPane.getSelectionModel().selectedItemProperty(), e -> {
+            if (e == null) {
+                Globals.stateManager.activeDatabaseProperty().setValue(Optional.empty());
+                return;
+            }
+
+            BasePanel currentBasePanel = getCurrentBasePanel();
+            if (currentBasePanel == null) {
+                return;
+            }
+
+            // Poor-mans binding to global state
+            // We need to invoke this in the JavaFX thread as all the listeners sit there
+            Platform.runLater(() -> Globals.stateManager.activeDatabaseProperty().setValue(Optional.of(currentBasePanel.getBibDatabaseContext())));
+            if (new SearchPreferences(Globals.prefs).isGlobalSearch()) {
+                globalSearchBar.performSearch();
+            } else {
+                String content = "";
+                Optional<SearchQuery> currentSearchQuery = currentBasePanel.getCurrentSearchQuery();
+                if (currentSearchQuery.isPresent()) {
+                    content = currentSearchQuery.get().getQuery();
+                }
+                globalSearchBar.setSearchTerm(content);
+            }
+
+            currentBasePanel.getPreviewPanel().updateLayout(Globals.prefs.getPreviewPreferences());
+
+            // groupSidePane.getToggleCommand().setSelected(sidePaneManager.isComponentVisible(GroupSidePane.class));
+            //previewToggle.setSelected(Globals.prefs.getPreviewPreferences().isPreviewPanelEnabled());
+            //generalFetcher.getToggleCommand().setSelected(sidePaneManager.isComponentVisible(GeneralFetcher.class));
+            //openOfficePanel.getToggleCommand().setSelected(sidePaneManager.isComponentVisible(OpenOfficeSidePanel.class));
+            // TODO: Can't notify focus listener since it is expecting a swing component
+            //Globals.getFocusListener().setFocused(currentBasePanel.getMainTable());
+            setWindowTitle();
+            // Update search autocompleter with information for the correct database:
+            currentBasePanel.updateSearchManager();
+
+            currentBasePanel.getUndoManager().postUndoRedoEvent();
+            currentBasePanel.getMainTable().requestFocus();
+        });
+
+        //Note: The registration of Apple event is at the end of initialization, because
+        //if the events happen too early (ie when the window is not initialized yet), the
+        //opened (double-clicked) documents are not displayed.
+        if (OS.OS_X) {
+            try {
+                new MacAdapter().registerMacEvents(this);
+            } catch (Exception e) {
+                LOGGER.error("Could not interface with Mac OS X methods.", e);
+            }
+        }
+
+        initShowTrackingNotification();
+
+    }
+
+    private void initKeyBindings() {
+        addEventFilter(KeyEvent.KEY_PRESSED, event -> {
+            Optional<KeyBinding> keyBinding = Globals.getKeyPrefs().mapToKeyBinding(event);
+            if (keyBinding.isPresent()) {
+                switch (keyBinding.get()) {
+                    case FOCUS_ENTRY_TABLE:
+                        getCurrentBasePanel().getMainTable().requestFocus();
+                        event.consume();
+                        break;
+                    case NEXT_LIBRARY:
+                        tabbedPane.getSelectionModel().selectNext();
+                        event.consume();
+                        break;
+                    case PREVIOUS_LIBRARY:
+                        tabbedPane.getSelectionModel().selectPrevious();
+                        event.consume();
+                        break;
+                    case INCREASE_TABLE_FONT_SIZE:
+                        increaseTableFontSize();
+                        event.consume();
+                        break;
+                    case DECREASE_TABLE_FONT_SIZE:
+                        decreaseTableFontSize();
+                        event.consume();
+                        break;
+                    case DEFAULT_TABLE_FONT_SIZE:
+                        setDefaultTableFontSize();
+                        event.consume();
+                        break;
+                    default:
+                }
+            }
+        });
+    }
+
+    private void initShowTrackingNotification() {
+        if (!Globals.prefs.shouldAskToCollectTelemetry()) {
+            JabRefExecutorService.INSTANCE.submit(new TimerTask() {
+
+                @Override
+                public void run() {
+                    SwingUtilities.invokeLater(() -> {
+                        DefaultTaskExecutor.runInJavaFXThread(JabRefFrame.this::showTrackingNotification);
+                    });
+                }
+            }, 60000); // run in one minute
+        }
+    }
+
+    private Void showTrackingNotification() {
+        if (!Globals.prefs.shouldCollectTelemetry()) {
+            boolean shouldCollect = dialogService.showConfirmationDialogAndWait(
+                    Localization.lang("Telemetry: Help make JabRef better"),
+                    Localization.lang("To improve the user experience, we would like to collect anonymous statistics on the features you use. We will only record what features you access and how often you do it. We will neither collect any personal data nor the content of bibliographic items. If you choose to allow data collection, you can later disable it via Options -> Preferences -> General."),
+                    Localization.lang("Share anonymous statistics"),
+                    Localization.lang("Don't share"));
+            Globals.prefs.setShouldCollectTelemetry(shouldCollect);
+        }
+
+        Globals.prefs.askedToCollectTelemetry();
+
+        return null;
+    }
+
+    public void refreshTitleAndTabs() {
+        DefaultTaskExecutor.runInJavaFXThread(() -> {
+
+            setWindowTitle();
+            updateAllTabTitles();
+        });
+    }
+
+    /**
+     * Sets the title of the main window.
+     */
+    public void setWindowTitle() {
+        BasePanel panel = getCurrentBasePanel();
+
+        // no database open
+        if (panel == null) {
+            //setTitle(FRAME_TITLE);
+            return;
+        }
+
+        String mode = panel.getBibDatabaseContext().getMode().getFormattedName();
+        String modeInfo = String.format(" (%s)", Localization.lang("%0 mode", mode));
+        boolean isAutosaveEnabled = Globals.prefs.getBoolean(JabRefPreferences.LOCAL_AUTO_SAVE);
+
+        if (panel.getBibDatabaseContext().getLocation() == DatabaseLocation.LOCAL) {
+            String changeFlag = panel.isModified() && !isAutosaveEnabled ? "*" : "";
+            String databaseFile = panel.getBibDatabaseContext()
+                    .getDatabaseFile()
+                    .map(File::getPath)
+                    .orElse(GUIGlobals.UNTITLED_TITLE);
+            //setTitle(FRAME_TITLE + " - " + databaseFile + changeFlag + modeInfo);
+        } else if (panel.getBibDatabaseContext().getLocation() == DatabaseLocation.SHARED) {
+            //setTitle(FRAME_TITLE + " - " + panel.getBibDatabaseContext().getDBMSSynchronizer().getDBName() + " ["
+            //        + Localization.lang("shared") + "]" + modeInfo);
+        }
+    }
+
+    /**
+     * The MacAdapter calls this method when a "BIB" file has been double-clicked from the Finder.
+     */
+    public void openAction(String filePath) {
+        Path file = Paths.get(filePath);
+        // all the logic is done in openIt. Even raising an existing panel
+        getOpenDatabaseAction().openFile(file, true);
+    }
+
+    /**
+     * The MacAdapter calls this method when "About" is selected from the application menu.
+     */
+    public void about() {
+        HelpAction.getCommand().execute();
+    }
+
+    public JabRefPreferences prefs() {
+        return prefs;
+    }
+
+    /**
+     * Tears down all things started by JabRef
+     * <p>
+     * FIXME: Currently some threads remain and therefore hinder JabRef to be closed properly
+     *
+     * @param filenames the filenames of all currently opened files - used for storing them if prefs openLastEdited is set to true
+     */
+    private void tearDownJabRef(List<String> filenames) {
+        Globals.stopBackgroundTasks();
+        Globals.shutdownThreadPools();
+
+        //dispose();
+
+        //prefs.putBoolean(JabRefPreferences.WINDOW_MAXIMISED, getExtendedState() == Frame.MAXIMIZED_BOTH);
+
+        if (prefs.getBoolean(JabRefPreferences.OPEN_LAST_EDITED)) {
+            // Here we store the names of all current files. If
+            // there is no current file, we remove any
+            // previously stored filename.
+            if (filenames.isEmpty()) {
+                prefs.remove(JabRefPreferences.LAST_EDITED);
+            } else {
+                prefs.putStringList(JabRefPreferences.LAST_EDITED, filenames);
+                File focusedDatabase = getCurrentBasePanel().getBibDatabaseContext().getDatabaseFile().orElse(null);
+                new LastFocusedTabPreferences(prefs).setLastFocusedTab(focusedDatabase);
+            }
+
+        }
+
+        fileHistory.storeHistory();
+        prefs.customExports.store(Globals.prefs);
+        prefs.customImports.store();
+
+        prefs.flush();
+
+        // dispose all windows, even if they are not displayed anymore
+        for (Window window : Window.getWindows()) {
+            window.dispose();
+        }
+    }
+
+    /**
+     * General info dialog.  The MacAdapter calls this method when "Quit"
+     * is selected from the application menu, Cmd-Q is pressed, or "Quit" is selected from the Dock.
+     * The function returns a boolean indicating if quitting is ok or not.
+     * <p>
+     * Non-OSX JabRef calls this when choosing "Quit" from the menu
+     * <p>
+     * SIDE EFFECT: tears down JabRef
+     *
+     * @return true if the user chose to quit; false otherwise
+     */
+    public boolean quit() {
+        // Ask here if the user really wants to close, if the base
+        // has not been saved since last save.
+        boolean close = true;
+
+        List<String> filenames = new ArrayList<>();
+        for (int i = 0; i < tabbedPane.getTabs().size(); i++) {
+            BibDatabaseContext context = getBasePanelAt(i).getBibDatabaseContext();
+
+            if (getBasePanelAt(i).isModified() && (context.getLocation() == DatabaseLocation.LOCAL)) {
+                tabbedPane.getSelectionModel().select(i);
+                String filename = context.getDatabaseFile().map(File::getAbsolutePath).orElse(GUIGlobals.UNTITLED_TITLE);
+                int answer = showSaveDialog(filename);
+
+                if ((answer == JOptionPane.CANCEL_OPTION) ||
+                        (answer == JOptionPane.CLOSED_OPTION)) {
+                    return false;
+                }
+                if (answer == JOptionPane.YES_OPTION) {
+                    // The user wants to save.
+                    try {
+                        //getCurrentBasePanel().runCommand("save");
+                        SaveDatabaseAction saveAction = new SaveDatabaseAction(getCurrentBasePanel());
+                        saveAction.runCommand();
+                        if (saveAction.isCanceled() || !saveAction.isSuccess()) {
+                            // The action was either canceled or unsuccessful.
+                            // Break!
+                            output(Localization.lang("Unable to save library"));
+                            close = false;
+                        }
+                    } catch (Throwable ex) {
+                        // Something prevented the file
+                        // from being saved. Break!!!
+                        close = false;
+                        break;
+                    }
+                }
+            } else if (context.getLocation() == DatabaseLocation.SHARED) {
+                context.convertToLocalDatabase();
+                context.getDBMSSynchronizer().closeSharedDatabase();
+                context.clearDBMSSynchronizer();
+            }
+            AutosaveManager.shutdown(context);
+            BackupManager.shutdown(context);
+            context.getDatabaseFile().map(File::getAbsolutePath).ifPresent(filenames::add);
+        }
+
+        if (close) {
+            for (int i = 0; i < tabbedPane.getTabs().size(); i++) {
+                if (getBasePanelAt(i).isSaving()) {
+                    // There is a database still being saved, so we need to wait.
+                    WaitForSaveOperation w = new WaitForSaveOperation(this);
+                    w.show(); // This method won't return until canceled or the save operation is done.
+                    if (w.canceled()) {
+                        return false; // The user clicked cancel.
+                    }
+                }
+            }
+
+            tearDownJabRef(filenames);
+            return true;
+        }
+
+        return false;
+    }
+
+    private void initLayout() {
+        setProgressBarVisible(false);
+
+        pushApplications = new PushToApplications(this.getDialogService());
+
+        BorderPane head = new BorderPane();
+        head.setTop(createMenu());
+        head.setCenter(createToolbar());
+        setTop(head);
+
+        SplitPane.setResizableWithParent(sidePane, Boolean.FALSE);
+        splitPane.getItems().addAll(sidePane, tabbedPane);
+
+        // We need to wait with setting the divider since it gets reset a few times during the initial set-up
+        mainStage.showingProperty().addListener(new ChangeListener<Boolean>() {
+
+            @Override
+            public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean showing) {
+                if (showing) {
+                    setDividerPosition();
+
+                    EasyBind.subscribe(sidePane.visibleProperty(), visible -> {
+                        if (visible) {
+                            if (!splitPane.getItems().contains(sidePane)) {
+                                splitPane.getItems().add(0, sidePane);
+                                setDividerPosition();
+                            }
+                        } else {
+                            splitPane.getItems().remove(sidePane);
+                        }
+                    });
+
+                    mainStage.showingProperty().removeListener(this);
+                    observable.removeListener(this);
+                }
+            }
+        });
+
+        setCenter(splitPane);
+
+        UIManager.put("TabbedPane.contentBorderInsets", new Insets(0, 0, 0, 0));
+
+        GridBagLayout gbl = new GridBagLayout();
+        GridBagConstraints con = new GridBagConstraints();
+        con.fill = GridBagConstraints.BOTH;
+        con.anchor = GridBagConstraints.WEST;
+        JPanel status = new JPanel();
+        status.setLayout(gbl);
+        con.weighty = 0;
+        con.weightx = 0;
+        con.gridwidth = 1;
+        con.insets = new Insets(0, 2, 0, 0);
+        gbl.setConstraints(statusLabel, con);
+        status.add(statusLabel);
+        con.weightx = 1;
+        con.insets = new Insets(0, 4, 0, 0);
+        con.gridwidth = 1;
+        gbl.setConstraints(statusLine, con);
+        status.add(statusLine);
+        con.weightx = 0;
+        con.gridwidth = GridBagConstraints.REMAINDER;
+        con.insets = new Insets(2, 4, 2, 2);
+        gbl.setConstraints(progressBar, con);
+        status.add(progressBar);
+        statusLabel.setForeground(GUIGlobals.ENTRY_EDITOR_LABEL_COLOR.darker());
+    }
+
+    private void setDividerPosition() {
+        splitPane.setDividerPositions(prefs.getDouble(JabRefPreferences.SIDE_PANE_WIDTH));
+        if (!splitPane.getDividers().isEmpty()) {
+            EasyBind.subscribe(splitPane.getDividers().get(0).positionProperty(),
+                    position -> prefs.putDouble(JabRefPreferences.SIDE_PANE_WIDTH, position.doubleValue()));
+        }
+    }
+
+    private Node createToolbar() {
+        Pane leftSpacer = new Pane();
+        HBox.setHgrow(leftSpacer, Priority.SOMETIMES);
+        Pane rightSpacer = new Pane();
+        HBox.setHgrow(rightSpacer, Priority.SOMETIMES);
+
+        ActionFactory factory = new ActionFactory(Globals.getKeyPrefs());
+
+        Button newLibrary;
+        if (Globals.prefs.getBoolean(JabRefPreferences.BIBLATEX_DEFAULT_MODE)) {
+            newLibrary = factory.createIconButton(StandardActions.NEW_LIBRARY_BIBLATEX, new NewDatabaseAction(this, BibDatabaseMode.BIBLATEX));
+        } else {
+            newLibrary = factory.createIconButton(StandardActions.NEW_LIBRARY_BIBTEX, new NewDatabaseAction(this, BibDatabaseMode.BIBTEX));
+        }
+
+        HBox leftSide = new HBox(
+                newLibrary,
+                factory.createIconButton(StandardActions.OPEN_LIBRARY, new OpenDatabaseAction(this)),
+                factory.createIconButton(StandardActions.SAVE_LIBRARY, new OldDatabaseCommandWrapper(Actions.SAVE, this, Globals.stateManager)),
+                leftSpacer);
+        leftSide.setMinWidth(100);
+        leftSide.prefWidthProperty().bind(sidePane.widthProperty());
+        leftSide.maxWidthProperty().bind(sidePane.widthProperty());
+
+        PushToApplicationButton pushToExternal = new PushToApplicationButton(this, pushApplications.getApplications());
+        HBox rightSide = new HBox (
+                factory.createIconButton(StandardActions.NEW_ENTRY, new NewEntryAction(this, BiblatexEntryTypes.ARTICLE)),
+                factory.createIconButton(StandardActions.DELETE_ENTRY, new OldDatabaseCommandWrapper(Actions.DELETE, this, Globals.stateManager)),
+
+                factory.createIconButton(StandardActions.UNDO, new OldDatabaseCommandWrapper(Actions.UNDO, this, Globals.stateManager)),
+                factory.createIconButton(StandardActions.REDO, new OldDatabaseCommandWrapper(Actions.REDO, this, Globals.stateManager)),
+                factory.createIconButton(StandardActions.CUT, new OldDatabaseCommandWrapper(Actions.CUT, this, Globals.stateManager)),
+                factory.createIconButton(StandardActions.COPY, new OldDatabaseCommandWrapper(Actions.COPY, this, Globals.stateManager)),
+                factory.createIconButton(StandardActions.PASTE, new OldDatabaseCommandWrapper(Actions.PASTE, this, Globals.stateManager)),
+
+                factory.createIconButton(StandardActions.CLEANUP_ENTRIES, new OldDatabaseCommandWrapper(Actions.CLEANUP, this, Globals.stateManager)),
+                factory.createIconButton(pushToExternal.getMenuAction(), pushToExternal),
+
+                factory.createIconButton(StandardActions.FORK_ME, new OpenBrowserAction("https://github.com/JabRef/jabref")),
+                factory.createIconButton(StandardActions.OPEN_FACEBOOK, new OpenBrowserAction("https://www.facebook.com/JabRef/")),
+                factory.createIconButton(StandardActions.OPEN_TWITTER, new OpenBrowserAction("https://twitter.com/jabref_org"))
+                );
+
+        HBox.setHgrow(globalSearchBar, Priority.ALWAYS);
+
+        ToolBar toolBar = new ToolBar(
+                leftSide,
+
+                globalSearchBar,
+
+                rightSpacer,
+                rightSide
+                );
+        toolBar.getStyleClass().add("mainToolbar");
+
+        return toolBar;
+    }
+
+    /**
+     * Returns the indexed BasePanel.
+     *
+     * @param i Index of base
+     */
+    public BasePanel getBasePanelAt(int i) {
+        return (BasePanel) tabbedPane.getTabs().get(i).getContent();
+    }
+
+    /**
+     * Returns a list of BasePanel.
+     *
+     */
+    public List<BasePanel> getBasePanelList() {
+        List<BasePanel> returnList = new ArrayList<>();
+        for (int i = 0; i < getBasePanelCount(); i++) {
+            returnList.add(getBasePanelAt(i));
+        }
+        return returnList;
+    }
+
+    public void showBasePanelAt(int i) {
+        tabbedPane.getSelectionModel().select(i);
+    }
+
+    public void showBasePanel(BasePanel bp) {
+        tabbedPane.getSelectionModel().select(getTab(bp));
+    }
+
+    /**
+     * Returns the currently viewed BasePanel.
+     */
+    public BasePanel getCurrentBasePanel() {
+        if ((tabbedPane == null) || (tabbedPane.getSelectionModel().getSelectedItem() == null)) {
+            return null;
+        }
+        return (BasePanel) tabbedPane.getSelectionModel().getSelectedItem().getContent();
+    }
+
+    /**
+     * @return the BasePanel count.
+     */
+    public int getBasePanelCount() {
+        return tabbedPane.getTabs().size();
+    }
+
+    private Tab getTab(BasePanel comp) {
+        for (Tab tab : tabbedPane.getTabs()) {
+            if (tab.getContent() == comp) {
+                return tab;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * @deprecated do not operate on tabs but on BibDatabaseContexts
+     */
+    @Deprecated
+    public TabPane getTabbedPane() {
+        return tabbedPane;
+    }
+
+    public void setTabTitle(BasePanel comp, String title, String toolTip) {
+        DefaultTaskExecutor.runInJavaFXThread(() -> {
+            Tab tab = getTab(comp);
+            tab.setText(title);
+            tab.setTooltip(new Tooltip(toolTip));
+        });
+    }
+
+    /**
+     * JavaFX Menus
+     * @return Menubar
+     */
+    private MenuBar createMenu() {
+        ActionFactory factory = new ActionFactory(Globals.getKeyPrefs());
+        Menu file = new Menu(Localization.menuTitle("File"));
+        Menu edit = new Menu(Localization.menuTitle("Edit"));
+        Menu library = new Menu(Localization.lang("Library"));
+        Menu quality = new Menu(Localization.menuTitle("Quality"));
+        Menu view = new Menu(Localization.menuTitle("View"));
+        Menu tools = new Menu(Localization.menuTitle("Tools"));
+        Menu options = new Menu(Localization.menuTitle("Options"));
+        Menu help = new Menu(Localization.menuTitle("Help"));
+
+        file.getItems().addAll(
+                factory.createMenuItem(StandardActions.NEW_LIBRARY_BIBTEX, new NewDatabaseAction(this, BibDatabaseMode.BIBTEX)),
+                factory.createMenuItem(StandardActions.NEW_LIBRARY_BIBLATEX, new NewDatabaseAction(this, BibDatabaseMode.BIBLATEX)),
+                factory.createMenuItem(StandardActions.OPEN_LIBRARY, getOpenDatabaseAction()),
+                factory.createMenuItem(StandardActions.SAVE_LIBRARY, new OldDatabaseCommandWrapper(Actions.SAVE, this, Globals.stateManager)),
+                factory.createMenuItem(StandardActions.SAVE_LIBRARY_AS, new OldDatabaseCommandWrapper(Actions.SAVE_AS, this, Globals.stateManager)),
+                factory.createMenuItem(StandardActions.SAVE_ALL, new SaveAllAction(this)),
+
+                factory.createSubMenu(StandardActions.IMPORT_EXPORT,
+                        factory.createMenuItem(StandardActions.MERGE_DATABASE, new OldDatabaseCommandWrapper(Actions.MERGE_DATABASE, this, Globals.stateManager)), // TODO: merge with import
+                        factory.createMenuItem(StandardActions.IMPORT_INTO_CURRENT_LIBRARY, new ImportCommand(this, true)),
+                        factory.createMenuItem(StandardActions.IMPORT_INTO_NEW_LIBRARY, new ImportCommand(this, false)),
+                        factory.createMenuItem(StandardActions.EXPORT_ALL, new ExportCommand(this, false)),
+                        factory.createMenuItem(StandardActions.EXPORT_SELECTED, new ExportCommand(this, true)),
+                        factory.createMenuItem(StandardActions.SAVE_SELECTED_AS_PLAIN_BIBTEX, new OldDatabaseCommandWrapper(Actions.SAVE_SELECTED_AS_PLAIN, this, Globals.stateManager))
+                ),
+
+                new SeparatorMenuItem(),
+
+                factory.createMenuItem(StandardActions.CONNECT_TO_SHARED_DB, new ConnectToSharedDatabaseCommand(this)),
+                factory.createMenuItem(StandardActions.PULL_CHANGES_FROM_SHARED_DB, new OldDatabaseCommandWrapper(Actions.PULL_CHANGES_FROM_SHARED_DATABASE, this, Globals.stateManager)),
+
+                new SeparatorMenuItem(),
+
+                fileHistory,
+
+                new SeparatorMenuItem(),
+
+                factory.createMenuItem(StandardActions.CLOSE_LIBRARY, new CloseDatabaseAction()),
+                factory.createMenuItem(StandardActions.QUIT, new CloseAction())
+
+        );
+
+        edit.getItems().addAll(
+                factory.createMenuItem(StandardActions.UNDO, new OldDatabaseCommandWrapper(Actions.UNDO, this, Globals.stateManager)),
+                factory.createMenuItem(StandardActions.REDO, new OldDatabaseCommandWrapper(Actions.REDO, this, Globals.stateManager)),
+
+                new SeparatorMenuItem(),
+
+                factory.createMenuItem(StandardActions.CUT, new EditAction(Actions.CUT)),
+
+                factory.createMenuItem(StandardActions.COPY, new EditAction(Actions.COPY)),
+                factory.createSubMenu(StandardActions.COPY_MORE,
+                        factory.createMenuItem(StandardActions.COPY_TITLE, new OldDatabaseCommandWrapper(Actions.COPY_TITLE, this, Globals.stateManager)),
+                        factory.createMenuItem(StandardActions.COPY_KEY, new OldDatabaseCommandWrapper(Actions.COPY_KEY, this, Globals.stateManager)),
+                        factory.createMenuItem(StandardActions.COPY_CITE_KEY, new OldDatabaseCommandWrapper(Actions.COPY_CITE_KEY, this, Globals.stateManager)),
+                        factory.createMenuItem(StandardActions.COPY_KEY_AND_TITLE, new OldDatabaseCommandWrapper(Actions.COPY_KEY_AND_TITLE, this, Globals.stateManager)),
+                        factory.createMenuItem(StandardActions.COPY_KEY_AND_LINK, new OldDatabaseCommandWrapper(Actions.COPY_KEY_AND_LINK, this, Globals.stateManager)),
+                        factory.createMenuItem(StandardActions.COPY_CITATION_PREVIEW, new OldDatabaseCommandWrapper(Actions.COPY_CITATION_HTML, this, Globals.stateManager)),
+                        factory.createMenuItem(StandardActions.EXPORT_SELECTED_TO_CLIPBOARD, new OldDatabaseCommandWrapper(Actions.EXPORT_TO_CLIPBOARD, this, Globals.stateManager))),
+
+                factory.createMenuItem(StandardActions.PASTE, new EditAction(Actions.PASTE)),
+
+                new SeparatorMenuItem(),
+
+                factory.createMenuItem(StandardActions.SEND_AS_EMAIL, new OldDatabaseCommandWrapper(Actions.SEND_AS_EMAIL, this, Globals.stateManager)),
+
+                new SeparatorMenuItem()
+
+        );
+
+        /* TODO
+        if (Globals.prefs.getBoolean(JabRefPreferences.SPECIALFIELDSENABLED)) {
+            boolean menuitem = false;
+            if (Globals.prefs.getBoolean(JabRefPreferences.SHOWCOLUMN_RANKING)) {
+                rankSubMenu = new JMenu();
+                // TODO RightClickMenu.createSpecialFieldMenu(rankSubMenu, SpecialField.RANKING, this);
+                edit.add(rankSubMenu);
+                menuitem = true;
+            }
+            if (Globals.prefs.getBoolean(JabRefPreferences.SHOWCOLUMN_RELEVANCE)) {
+                edit.add(toggleRelevance);
+                menuitem = true;
+            }
+            if (Globals.prefs.getBoolean(JabRefPreferences.SHOWCOLUMN_QUALITY)) {
+                edit.add(toggleQualityAssured);
+                menuitem = true;
+            }
+            if (Globals.prefs.getBoolean(JabRefPreferences.SHOWCOLUMN_PRIORITY)) {
+                rankSubMenu = new JMenu();
+                // TODO RightClickMenu.createSpecialFieldMenu(rankSubMenu, SpecialField.PRIORITY, this);
+                edit.add(rankSubMenu);
+                menuitem = true;
+            }
+            if (Globals.prefs.getBoolean(JabRefPreferences.SHOWCOLUMN_PRINTED)) {
+                edit.add(togglePrinted);
+                menuitem = true;
+            }
+            if (Globals.prefs.getBoolean(JabRefPreferences.SHOWCOLUMN_READ)) {
+                rankSubMenu = new JMenu();
+                // TODO RightClickMenu.createSpecialFieldMenu(rankSubMenu, SpecialField.READ_STATUS, this);
+                edit.add(rankSubMenu);
+                menuitem = true;
+            }
+            if (menuitem) {
+                edit.addSeparator();
+            }
+        }
+        */
+
+        edit.getItems().addAll(
+                factory.createMenuItem(StandardActions.MANAGE_KEYWORDS, new ManageKeywordsAction(this)),
+                factory.createMenuItem(StandardActions.REPLACE_ALL, new OldDatabaseCommandWrapper(Actions.REPLACE_ALL, this, Globals.stateManager)),
+                factory.createMenuItem(StandardActions.MASS_SET_FIELDS, new MassSetFieldAction(this))
+
+        );
+
+        library.getItems().addAll(
+                factory.createMenuItem(StandardActions.NEW_ARTICLE, new NewEntryAction(this, BibtexEntryTypes.ARTICLE)),
+                factory.createMenuItem(StandardActions.NEW_ENTRY, new NewEntryAction(this)),
+                factory.createMenuItem(StandardActions.NEW_ENTRY_FROM_PLAINTEX, new NewEntryFromPlainTextAction(this, Globals.prefs.getUpdateFieldPreferences())),
+
+                new SeparatorMenuItem(),
+
+<<<<<<< HEAD
+
+                factory.createMenuItem(StandardActions.DELETE_ENTRY, new EditAction(Actions.DELETE)),
+=======
+                factory.createMenuItem(StandardActions.DELETE_ENTRY, new OldDatabaseCommandWrapper(Actions.DELETE, this, Globals.stateManager)),
+>>>>>>> upstream/maintable-beta
+
+                new SeparatorMenuItem(),
+
+                factory.createMenuItem(StandardActions.LIBRARY_PROPERTIES, new LibraryPropertiesAction(this)),
+<<<<<<< HEAD
+                factory.createMenuItem(StandardActions.EDIT_PREAMBLE, new OldDatabaseCommandWrapper(Actions.EDIT_PREAMBLE, this, Globals.stateManager)),
+
+                factory.createMenuItem(StandardActions.EDIT_STRINGS, new StringAction())
+=======
+                factory.createMenuItem(StandardActions.EDIT_PREAMBLE, new PreambleEditor(this)),
+                factory.createMenuItem(StandardActions.EDIT_STRINGS, new OldDatabaseCommandWrapper(Actions.EDIT_STRINGS, this, Globals.stateManager))
+>>>>>>> upstream/maintable-beta
+
+        );
+
+        Menu lookupIdentifiers = factory.createSubMenu(StandardActions.LOOKUP_DOC_IDENTIFIER);
+        for (IdFetcher<?> fetcher : WebFetchers.getIdFetchers(Globals.prefs.getImportFormatPreferences())) {
+            LookupIdentifierAction<?> identifierAction = new LookupIdentifierAction<>(this, fetcher);
+            lookupIdentifiers.getItems().add(factory.createMenuItem(identifierAction.getAction(), identifierAction));
+        }
+
+        quality.getItems().addAll(
+                factory.createMenuItem(StandardActions.FIND_DUPLICATES, new DuplicateSearch(this)),
+                factory.createMenuItem(StandardActions.MERGE_ENTRIES, new MergeEntriesAction(this)),
+
+                new SeparatorMenuItem(),
+
+                factory.createMenuItem(StandardActions.RESOLVE_DUPLICATE_KEYS, new OldDatabaseCommandWrapper(Actions.RESOLVE_DUPLICATE_KEYS, this, Globals.stateManager)),
+                factory.createMenuItem(StandardActions.CHECK_INTEGRITY, new IntegrityCheckAction(this)),
+                factory.createMenuItem(StandardActions.CLEANUP_ENTRIES, new OldDatabaseCommandWrapper(Actions.CLEANUP, this, Globals.stateManager)),
+                factory.createMenuItem(StandardActions.GENERATE_CITE_KEY, new OldDatabaseCommandWrapper(Actions.MAKE_KEY, this, Globals.stateManager)),
+
+                new SeparatorMenuItem(),
+
+                factory.createMenuItem(StandardActions.SET_FILE_LINKS, new AutoLinkFilesAction()),
+                factory.createMenuItem(StandardActions.FIND_UNLINKED_FILES, new FindUnlinkedFilesAction(this)),
+                lookupIdentifiers,
+                factory.createMenuItem(StandardActions.DOWNLOAD_FULL_TEXT, new OldDatabaseCommandWrapper(Actions.DOWNLOAD_FULL_TEXT, this, Globals.stateManager))
+
+        );
+
+        SidePaneComponent webSearch = sidePaneManager.getComponent(SidePaneType.WEB_SEARCH);
+        SidePaneComponent groups = sidePaneManager.getComponent(SidePaneType.GROUPS);
+        SidePaneComponent openOffice = sidePaneManager.getComponent(SidePaneType.OPEN_OFFICE);
+
+        view.getItems().addAll(
+                factory.createMenuItem(webSearch.getToggleAction(), webSearch.getToggleCommand()),
+                factory.createMenuItem(groups.getToggleAction(), groups.getToggleCommand()),
+                factory.createMenuItem(StandardActions.TOGGLE_PREVIEW, new OldDatabaseCommandWrapper(Actions.TOGGLE_PREVIEW, this, Globals.stateManager)),
+                factory.createMenuItem(StandardActions.EDIT_ENTRY, new OldDatabaseCommandWrapper(Actions.EDIT, this, Globals.stateManager)),
+                factory.createMenuItem(StandardActions.SHOW_PDV_VIEWER, new ShowDocumentViewerAction()),
+
+                new SeparatorMenuItem(),
+
+                factory.createMenuItem(StandardActions.SELECT_ALL, new OldDatabaseCommandWrapper(Actions.SELECT_ALL, this, Globals.stateManager)),
+
+                new SeparatorMenuItem(),
+
+                factory.createMenuItem(StandardActions.NEXT_PREVIEW_STYLE, new OldDatabaseCommandWrapper(Actions.NEXT_PREVIEW_STYLE, this, Globals.stateManager)),
+                factory.createMenuItem(StandardActions.PREVIOUS_PREVIEW_STYLE, new OldDatabaseCommandWrapper(Actions.PREVIOUS_PREVIEW_STYLE, this, Globals.stateManager))
+
+        );
+
+        PushToApplicationButton pushToExternal = new PushToApplicationButton(this, pushApplications.getApplications());
+        tools.getItems().addAll(
+                factory.createMenuItem(StandardActions.NEW_SUB_LIBRARY_FROM_AUX, new NewSubLibraryAction(this)),
+                factory.createMenuItem(StandardActions.WRITE_XMP, new OldDatabaseCommandWrapper(Actions.WRITE_XMP, this, Globals.stateManager)),
+
+                new SeparatorMenuItem(),
+
+                factory.createMenuItem(openOffice.getToggleAction(), openOffice.getToggleCommand()),
+                factory.createMenuItem(pushToExternal.getMenuAction(), pushToExternal),
+
+                new SeparatorMenuItem(),
+
+                factory.createMenuItem(StandardActions.OPEN_FOLDER, new OldDatabaseCommandWrapper(Actions.OPEN_FOLDER, this, Globals.stateManager)),
+                factory.createMenuItem(StandardActions.OPEN_FILE, new OldDatabaseCommandWrapper(Actions.OPEN_EXTERNAL_FILE, this, Globals.stateManager)),
+                factory.createMenuItem(StandardActions.OPEN_URL, new OldDatabaseCommandWrapper(Actions.OPEN_URL, this, Globals.stateManager)),
+                factory.createMenuItem(StandardActions.OPEN_CONSOLE, new OldDatabaseCommandWrapper(Actions.OPEN_CONSOLE, this, Globals.stateManager)),
+                factory.createMenuItem(StandardActions.COPY_LINKED_FILES, new CopyFilesAction(this)),
+
+                new SeparatorMenuItem(),
+
+                factory.createMenuItem(StandardActions.ABBREVIATE_ISO, new OldDatabaseCommandWrapper(Actions.ABBREVIATE_ISO, this, Globals.stateManager)),
+                factory.createMenuItem(StandardActions.ABBREVIATE_MEDLINE, new OldDatabaseCommandWrapper(Actions.ABBREVIATE_MEDLINE, this, Globals.stateManager)),
+                factory.createMenuItem(StandardActions.UNABBREVIATE, new OldDatabaseCommandWrapper(Actions.UNABBREVIATE, this, Globals.stateManager))
+
+        );
+
+        options.getItems().addAll(
+                factory.createMenuItem(StandardActions.SHOW_PREFS, new ShowPreferencesAction(this)),
+
+                new SeparatorMenuItem(),
+
+                factory.createMenuItem(StandardActions.SETUP_GENERAL_FIELDS, new SetupGeneralFieldsAction(this)),
+                factory.createMenuItem(StandardActions.MANAGE_CUSTOM_IMPORTS, new ManageCustomImportsAction(this)),
+                factory.createMenuItem(StandardActions.MANAGE_CUSTOM_EXPORTS, new ManageCustomExportsAction(this)),
+                factory.createMenuItem(StandardActions.MANAGE_EXTERNAL_FILETYPES, new EditExternalFileTypesAction()),
+                factory.createMenuItem(StandardActions.MANAGE_JOURNALS, new ManageJournalsAction()),
+                factory.createMenuItem(StandardActions.CUSTOMIZE_KEYBINDING, new CustomizeKeyBindingAction()),
+                factory.createMenuItem(StandardActions.MANAGE_PROTECTED_TERMS, new ManageProtectedTermsAction(this, Globals.protectedTermsLoader)),
+
+                new SeparatorMenuItem(),
+
+                factory.createMenuItem(StandardActions.MANAGE_CONTENT_SELECTORS, new OldDatabaseCommandWrapper(Actions.MANAGE_SELECTORS, this, Globals.stateManager)),
+                factory.createMenuItem(StandardActions.CUSTOMIZE_ENTRY_TYPES, new CustomizeEntryAction(this)),
+                factory.createMenuItem(StandardActions.MANAGE_CITE_KEY_PATTERNS, new BibtexKeyPatternAction(this))
+
+        );
+
+        help.getItems().addAll(
+                factory.createMenuItem(StandardActions.HELP, HelpAction.getCommand()),
+                factory.createMenuItem(StandardActions.OPEN_FORUM, new OpenBrowserAction("http://discourse.jabref.org/")),
+
+                new SeparatorMenuItem(),
+
+                factory.createMenuItem(StandardActions.ERROR_CONSOLE, new ErrorConsoleAction()),
+
+                new SeparatorMenuItem(),
+
+                factory.createMenuItem(StandardActions.SEARCH_FOR_UPDATES, new SearchForUpdateAction()),
+                factory.createSubMenu(StandardActions.WEB_MENU,
+                        factory.createMenuItem(StandardActions.OPEN_WEBPAGE, new OpenBrowserAction("https://jabref.org/")),
+                        factory.createMenuItem(StandardActions.OPEN_BLOG, new OpenBrowserAction("https://blog.jabref.org/")),
+                        factory.createMenuItem(StandardActions.OPEN_FACEBOOK, new OpenBrowserAction("https://www.facebook.com/JabRef/")),
+                        factory.createMenuItem(StandardActions.OPEN_TWITTER, new OpenBrowserAction("https://twitter.com/jabref_org")),
+
+                        new SeparatorMenuItem(),
+
+                        factory.createMenuItem(StandardActions.FORK_ME, new OpenBrowserAction("https://github.com/JabRef/jabref")),
+                        factory.createMenuItem(StandardActions.OPEN_DEV_VERSION_LINK, new OpenBrowserAction("https://builds.jabref.org/master/")),
+                        factory.createMenuItem(StandardActions.OPEN_CHANGELOG, new OpenBrowserAction("https://github.com/JabRef/jabref/blob/master/CHANGELOG.md")),
+
+                        new SeparatorMenuItem(),
+
+                        factory.createMenuItem(StandardActions.DONATE, new OpenBrowserAction("https://donations.jabref.org"))
+
+                ),
+                factory.createMenuItem(StandardActions.ABOUT, new AboutAction())
+
+        );
+
+        MenuBar menu = new MenuBar();
+        menu.getStyleClass().add("mainMenu");
+        menu.getMenus().addAll(
+                file,
+                edit,
+                library,
+                quality,
+                tools,
+                view,
+                options,
+                help);
+        menu.setUseSystemMenuBar(true);
+        return menu;
+    }
+
+    public void addParserResult(ParserResult pr, boolean focusPanel) {
+        if (pr.toOpenTab()) {
+            // Add the entries to the open tab.
+            BasePanel panel = getCurrentBasePanel();
+            if (panel == null) {
+                // There is no open tab to add to, so we create a new tab:
+                addTab(pr.getDatabaseContext(), focusPanel);
+            } else {
+                List<BibEntry> entries = new ArrayList<>(pr.getDatabase().getEntries());
+                addImportedEntries(panel, entries);
+            }
+        } else {
+            // only add tab if DB is not already open
+            Optional<BasePanel> panel = getBasePanelList().stream()
+                    .filter(p -> p.getBibDatabaseContext().getDatabaseFile().equals(pr.getFile()))
+                    .findFirst();
+
+            if (panel.isPresent()) {
+                tabbedPane.getSelectionModel().select(getTab(panel.get()));
+            } else {
+                addTab(pr.getDatabaseContext(), focusPanel);
+            }
+        }
+    }
+
+    /**
+     * displays the String on the Status Line visible on the bottom of the JabRef mainframe
+     */
+    public void output(final String s) {
+        SwingUtilities.invokeLater(() -> {
+            statusLine.setText(s);
+            statusLine.repaint();
+        });
+    }
+
+    private void initActions() {
+        /*
+        openDatabaseOnlyActions.clear();
+        openDatabaseOnlyActions.addAll(Arrays.asList(manageSelectors, mergeDatabaseAction, newSubDatabaseAction, save, copyPreview,
+                saveAs, saveSelectedAs, saveSelectedAsPlain, undo, redo, cut, deleteEntry, copy, paste, mark, markSpecific, unmark,
+                unmarkAll, rankSubMenu, editEntry, selectAll, copyKey, copyCiteKey, copyKeyAndTitle, copyKeyAndLink, editPreamble, editStrings,
+                groupSidePane.getToggleCommand(), makeKeyAction, normalSearch, generalFetcher.getToggleCommand(), mergeEntries, cleanupEntries, exportToClipboard, replaceAll,
+                sendAsEmail, downloadFullText, lookupIdentifiers, writeXmpAction, openOfficePanel.getToggleCommand(), findUnlinkedFiles, addToGroup, removeFromGroup,
+                moveToGroup, autoLinkFile, resolveDuplicateKeys, openUrl, openFolder, openFile, togglePreview,
+                dupliCheck, autoSetFile, newEntryAction, newSpec, customizeAction, plainTextImport, getMassSetField(), getManageKeywords(),
+                pushExternalButton.getMenuAction(), closeDatabaseAction, getNextPreviewStyleAction(), getPreviousPreviewStyleAction(), checkIntegrity,
+                databaseProperties, abbreviateIso, abbreviateMedline,
+                unabbreviate, exportAll, exportSelected, importCurrent, saveAll, focusTable, increaseFontSize, decreseFontSize, defaultFontSize,
+                toggleRelevance, toggleQualityAssured, togglePrinted, pushExternalButton.getComponent()));
+        openDatabaseOnlyActions.addAll(newSpecificEntryAction);
+        openDatabaseOnlyActions.addAll(specialFieldButtons);
+        severalDatabasesOnlyActions.clear();
+        severalDatabasesOnlyActions.addAll(Arrays
+                .asList(nextTab, prevTab, sortTabs));
+        openAndSavedDatabasesOnlyActions.addAll(Collections.singletonList(openConsole));
+        sharedDatabaseOnlyActions.addAll(Collections.singletonList(pullChangesFromSharedDatabase));
+        noSharedDatabaseActions.addAll(Arrays.asList(save, saveAll));
+        oneEntryOnlyActions.clear();
+        oneEntryOnlyActions.addAll(Arrays.asList(editEntry));
+        oneEntryWithFileOnlyActions.clear();
+        oneEntryWithFileOnlyActions.addAll(Arrays.asList(openFolder, openFile));
+        oneEntryWithURLorDOIOnlyActions.clear();
+        oneEntryWithURLorDOIOnlyActions.addAll(Arrays.asList(openUrl));
+        twoEntriesOnlyActions.clear();
+        twoEntriesOnlyActions.addAll(Arrays.asList(mergeEntries));
+        atLeastOneEntryActions.clear();
+        atLeastOneEntryActions.addAll(Arrays.asList(downloadFullText, lookupIdentifiers, exportLinkedFiles));
+        tabbedPane.getTabs().addListener(this::updateEnabledState);
+        */
+    }
+
+    /**
+     * Enable or Disable all actions based on the number of open tabs.
+     * <p>
+     * The action that are affected are set in initActions.
+     */
+    public void updateEnabledState(ListChangeListener.Change<? extends Tab> change) {
+        int tabCount = tabbedPane.getTabs().size();
+        if (!change.next()) {
+            return;
+        }
+        if (change.wasAdded() || change.wasRemoved()) {
+            setEnabled(openDatabaseOnlyActions, tabCount > 0);
+            setEnabled(severalDatabasesOnlyActions, tabCount > 1);
+        }
+        if (tabCount == 0) {
+            setEnabled(openAndSavedDatabasesOnlyActions, false);
+            setEnabled(sharedDatabaseOnlyActions, false);
+            setEnabled(oneEntryOnlyActions, false);
+        }
+
+        if (tabCount > 0) {
+            BasePanel current = getCurrentBasePanel();
+            boolean saved = current.getBibDatabaseContext().getDatabasePath().isPresent();
+            setEnabled(openAndSavedDatabasesOnlyActions, saved);
+
+            boolean isShared = current.getBibDatabaseContext().getLocation() == DatabaseLocation.SHARED;
+            setEnabled(sharedDatabaseOnlyActions, isShared);
+            setEnabled(noSharedDatabaseActions, !isShared);
+
+            boolean oneEntrySelected = current.getSelectedEntries().size() == 1;
+            setEnabled(oneEntryOnlyActions, oneEntrySelected);
+            setEnabled(oneEntryWithFileOnlyActions, isExistFile(current.getSelectedEntries()));
+            setEnabled(oneEntryWithURLorDOIOnlyActions, isExistURLorDOI(current.getSelectedEntries()));
+
+            boolean twoEntriesSelected = current.getSelectedEntries().size() == 2;
+            setEnabled(twoEntriesOnlyActions, twoEntriesSelected);
+
+            boolean atLeastOneEntrySelected = !current.getSelectedEntries().isEmpty();
+            setEnabled(atLeastOneEntryActions, atLeastOneEntrySelected);
+        }
+    }
+
+    /**
+     * This method causes all open BasePanels to set up their tables
+     * anew. When called from PrefsDialog3, this updates to the new
+     * settings.
+     */
+    public void setupAllTables() {
+        // This action can be invoked without an open database, so
+        // we have to check if we have one before trying to invoke
+        // methods to execute changes in the preferences.
+
+        // We want to notify all tabs about the changes to
+        // avoid problems when changing the column set.
+        for (int i = 0; i < tabbedPane.getTabs().size(); i++) {
+            BasePanel bf = getBasePanelAt(i);
+
+            // Update tables:
+            if (bf.getDatabase() != null) {
+                DefaultTaskExecutor.runInJavaFXThread(bf::setupMainPanel);
+            }
+        }
+    }
+
+    private List<String> collectDatabaseFilePaths() {
+        List<String> dbPaths = new ArrayList<>(getBasePanelCount());
+
+        for (BasePanel basePanel : getBasePanelList()) {
+            try {
+                // db file exists
+                if (basePanel.getBibDatabaseContext().getDatabaseFile().isPresent()) {
+                    dbPaths.add(basePanel.getBibDatabaseContext().getDatabaseFile().get().getCanonicalPath());
+                } else {
+                    dbPaths.add("");
+                }
+            } catch (IOException ex) {
+                LOGGER.error("Invalid database file path: " + ex.getMessage());
+            }
+        }
+        return dbPaths;
+    }
+
+    private List<String> getUniquePathParts() {
+        List<String> dbPaths = collectDatabaseFilePaths();
+
+        return FileUtil.uniquePathSubstrings(dbPaths);
+    }
+
+    public void updateAllTabTitles() {
+        List<String> paths = getUniquePathParts();
+        for (int i = 0; i < getBasePanelCount(); i++) {
+            String uniqPath = paths.get(i);
+            Optional<File> file = getBasePanelAt(i).getBibDatabaseContext().getDatabaseFile();
+
+            if (file.isPresent()) {
+                if (!uniqPath.equals(file.get().getName()) && uniqPath.contains(File.separator)) {
+                    // remove filename
+                    uniqPath = uniqPath.substring(0, uniqPath.lastIndexOf(File.separator));
+                    tabbedPane.getTabs().get(i).setText(getBasePanelAt(i).getTabTitle() + " \u2014 " + uniqPath);
+                } else {
+                    // set original filename (again)
+                    tabbedPane.getTabs().get(i).setText(getBasePanelAt(i).getTabTitle());
+                }
+            } else {
+                tabbedPane.getTabs().get(i).setText(getBasePanelAt(i).getTabTitle());
+            }
+            tabbedPane.getTabs().get(i).setTooltip(new Tooltip(file.map(File::getAbsolutePath).orElse(null)));
+        }
+    }
+
+    public void addTab(BasePanel basePanel, boolean raisePanel) {
+        DefaultTaskExecutor.runInJavaFXThread(() -> {
+            // add tab
+            Tab newTab = new Tab(basePanel.getTabTitle(), basePanel);
+            tabbedPane.getTabs().add(newTab);
+
+            // update all tab titles
+            updateAllTabTitles();
+
+            if (raisePanel) {
+                tabbedPane.getSelectionModel().select(newTab);
+            }
+
+            // Register undo/redo listener
+            basePanel.getUndoManager().registerListener(new UndoRedoEventManager());
+
+            BibDatabaseContext context = basePanel.getBibDatabaseContext();
+
+            if (readyForAutosave(context)) {
+                AutosaveManager autosaver = AutosaveManager.start(context);
+                autosaver.registerListener(new AutosaveUIManager(basePanel));
+            }
+
+            BackupManager.start(context);
+
+            // Track opening
+            trackOpenNewDatabase(basePanel);
+        });
+    }
+
+    private void trackOpenNewDatabase(BasePanel basePanel) {
+        Map<String, String> properties = new HashMap<>();
+        Map<String, Double> measurements = new HashMap<>();
+        measurements.put("NumberOfEntries", (double) basePanel.getDatabaseContext().getDatabase().getEntryCount());
+
+        Globals.getTelemetryClient().ifPresent(client -> client.trackEvent("OpenNewDatabase", properties, measurements));
+    }
+
+    public BasePanel addTab(BibDatabaseContext databaseContext, boolean raisePanel) {
+        Objects.requireNonNull(databaseContext);
+
+        BasePanel bp = new BasePanel(this, BasePanelPreferences.from(Globals.prefs), databaseContext, ExternalFileTypes.getInstance());
+        addTab(bp, raisePanel);
+        return bp;
+    }
+
+    private boolean readyForAutosave(BibDatabaseContext context) {
+        return ((context.getLocation() == DatabaseLocation.SHARED) ||
+                ((context.getLocation() == DatabaseLocation.LOCAL) && Globals.prefs.getBoolean(JabRefPreferences.LOCAL_AUTO_SAVE))) &&
+                context.getDatabaseFile().isPresent();
+    }
+
+    /**
+     * This method does the job of adding imported entries into the active
+     * database, or into a new one. It shows the ImportInspectionDialog if
+     * preferences indicate it should be used. Otherwise it imports directly.
+     *  @param panel     The BasePanel to add to.
+     * @param entries   The entries to add.
+     */
+    private void addImportedEntries(final BasePanel panel, final List<BibEntry> entries) {
+        SwingUtilities.invokeLater(() -> {
+            ImportInspectionDialog diag = new ImportInspectionDialog(JabRefFrame.this, panel,
+                    Localization.lang("Import"), false);
+            diag.addEntries(entries);
+            diag.entryListComplete();
+            diag.setVisible(true);
+            diag.toFront();
+        });
+    }
+
+    public FileHistoryMenu getFileHistory() {
+        return fileHistory;
+    }
+
+    /**
+     * Set the visibility of the progress bar in the right end of the
+     * status line at the bottom of the frame.
+     * <p>
+     * If not called on the event dispatch thread, this method uses
+     * SwingUtilities.invokeLater() to do the actual operation on the EDT.
+     */
+    public void setProgressBarVisible(final boolean visible) {
+        if (SwingUtilities.isEventDispatchThread()) {
+            progressBar.setVisible(visible);
+        } else {
+            SwingUtilities.invokeLater(() -> progressBar.setVisible(visible));
+        }
+    }
+
+    /**
+     * Sets the current value of the progress bar.
+     * <p>
+     * If not called on the event dispatch thread, this method uses
+     * SwingUtilities.invokeLater() to do the actual operation on the EDT.
+     */
+    public void setProgressBarValue(final int value) {
+        if (SwingUtilities.isEventDispatchThread()) {
+            progressBar.setValue(value);
+        } else {
+            SwingUtilities.invokeLater(() -> progressBar.setValue(value));
+        }
+
+    }
+
+    /**
+     * Sets the indeterminate status of the progress bar.
+     * <p>
+     * If not called on the event dispatch thread, this method uses
+     * SwingUtilities.invokeLater() to do the actual operation on the EDT.
+     */
+    public void setProgressBarIndeterminate(final boolean value) {
+        if (SwingUtilities.isEventDispatchThread()) {
+            progressBar.setIndeterminate(value);
+        } else {
+            SwingUtilities.invokeLater(() -> progressBar.setIndeterminate(value));
+        }
+
+    }
+
+    /**
+     * Sets the maximum value of the progress bar. Always call this method
+     * before using the progress bar, to set a maximum value appropriate to
+     * the task at hand.
+     * <p>
+     * If not called on the event dispatch thread, this method uses
+     * SwingUtilities.invokeLater() to do the actual operation on the EDT.
+     */
+    public void setProgressBarMaximum(final int value) {
+        if (SwingUtilities.isEventDispatchThread()) {
+            progressBar.setMaximum(value);
+        } else {
+            SwingUtilities.invokeLater(() -> progressBar.setMaximum(value));
+        }
+
+    }
+
+    /**
+     * Return a boolean, if the selected entry have file
+     * @param selectEntryList A selected entries list of the current base pane
+     * @return true, if the selected entry contains file.
+     * false, if multiple entries are selected or the selected entry doesn't contains file
+     */
+    private boolean isExistFile(List<BibEntry> selectEntryList) {
+        if (selectEntryList.size() == 1) {
+            BibEntry selectedEntry = selectEntryList.get(0);
+            return selectedEntry.getField(FieldName.FILE).isPresent();
+        }
+        return false;
+    }
+
+    /**
+     * Return a boolean, if the selected entry have url or doi
+     * @param selectEntryList A selected entries list of the current base pane
+     * @return true, if the selected entry contains url or doi.
+     * false, if multiple entries are selected or the selected entry doesn't contains url or doi
+     */
+    private boolean isExistURLorDOI(List<BibEntry> selectEntryList) {
+        if (selectEntryList.size() == 1) {
+            BibEntry selectedEntry = selectEntryList.get(0);
+            return (selectedEntry.getField(FieldName.URL).isPresent() || selectedEntry.getField(FieldName.DOI).isPresent());
+        }
+        return false;
+    }
+
+    @Override
+    public void showMessage(String message, String title, int msgType) {
+        JOptionPane.showMessageDialog(null, message, title, msgType);
+    }
+
+    @Override
+    public void setStatus(String s) {
+        output(s);
+    }
+
+    @Override
+    public void showMessage(String message) {
+        JOptionPane.showMessageDialog(null, message);
+    }
+
+    private int showSaveDialog(String filename) {
+        Object[] options = {Localization.lang("Save changes"),
+                Localization.lang("Discard changes"),
+                Localization.lang("Return to JabRef")};
+
+        return JOptionPane.showOptionDialog(null,
+                Localization.lang("Library '%0' has changed.", filename),
+                Localization.lang("Save before closing"), JOptionPane.YES_NO_CANCEL_OPTION,
+                JOptionPane.WARNING_MESSAGE, null, options, options[2]);
+    }
+
+    private void closeTab(Tab tab) {
+        closeTab(getBasePanel(tab));
+    }
+
+    private BasePanel getBasePanel(Tab tab) {
+        return (BasePanel) tab.getContent();
+    }
+
+    private void closeTab(BasePanel panel) {
+        // empty tab without database
+        if (panel == null) {
+            return;
+        }
+
+        BibDatabaseContext context = panel.getBibDatabaseContext();
+
+        if (panel.isModified() && (context.getLocation() == DatabaseLocation.LOCAL)) {
+            if (confirmClose(panel)) {
+                removeTab(panel);
+            }
+        } else if (context.getLocation() == DatabaseLocation.SHARED) {
+            context.convertToLocalDatabase();
+            context.getDBMSSynchronizer().closeSharedDatabase();
+            context.clearDBMSSynchronizer();
+            removeTab(panel);
+        } else {
+            removeTab(panel);
+        }
+        AutosaveManager.shutdown(context);
+        BackupManager.shutdown(context);
+    }
+
+    // Ask if the user really wants to close, if the base has not been saved
+    private boolean confirmClose(BasePanel panel) {
+        boolean close = false;
+        String filename;
+
+        filename = panel.getBibDatabaseContext()
+                .getDatabaseFile()
+                .map(File::getAbsolutePath)
+                .orElse(GUIGlobals.UNTITLED_TITLE);
+
+        int answer = showSaveDialog(filename);
+        if (answer == JOptionPane.YES_OPTION) {
+            // The user wants to save.
+            try {
+                SaveDatabaseAction saveAction = new SaveDatabaseAction(panel);
+                saveAction.runCommand();
+                if (saveAction.isSuccess()) {
+                    close = true;
+                }
+            } catch (Throwable ex) {
+                // do not close
+            }
+        } else if (answer == JOptionPane.NO_OPTION) {
+            // discard changes
+            close = true;
+        }
+        return close;
+    }
+
+    private void removeTab(BasePanel panel) {
+        DefaultTaskExecutor.runInJavaFXThread(() -> {
+            panel.cleanUp();
+            tabbedPane.getTabs().remove(getTab(panel));
+            setWindowTitle();
+            output(Localization.lang("Closed library") + '.');
+            // update tab titles
+            updateAllTabTitles();
+        });
+    }
+
+    public void closeCurrentTab() {
+        removeTab(getCurrentBasePanel());
+    }
+
+    public OpenDatabaseAction getOpenDatabaseAction() {
+        return new OpenDatabaseAction(this);
+    }
+
+    public String getStatusLineText() {
+        return statusLine.getText();
+    }
+
+    public SidePaneManager getSidePaneManager() {
+        return sidePaneManager;
+    }
+
+    public PushToApplications getPushApplications() {
+        return pushApplications;
+    }
+
+    public GlobalSearchBar getGlobalSearchBar() {
+        return globalSearchBar;
+    }
+
+    public CountingUndoManager getUndoManager() {
+        return undoManager;
+    }
+
+    public DialogService getDialogService() {
+        return dialogService;
+    }
+
+    private class GeneralAction extends MnemonicAwareAction {
+
+        private final Actions command;
+
+        public GeneralAction(Actions command, String text) {
+            this.command = command;
+            putValue(Action.NAME, text);
+        }
+
+        public GeneralAction(Actions command, String text, String description) {
+            this.command = command;
+            putValue(Action.NAME, text);
+            putValue(Action.SHORT_DESCRIPTION, description);
+        }
+
+        public GeneralAction(Actions command, String text, Icon icon) {
+            super(icon);
+
+            this.command = command;
+            putValue(Action.NAME, text);
+        }
+
+        public GeneralAction(Actions command, String text, String description, Icon icon) {
+            super(icon);
+
+            this.command = command;
+            putValue(Action.NAME, text);
+            putValue(Action.SHORT_DESCRIPTION, description);
+        }
+
+        public GeneralAction(Actions command, String text, KeyStroke key) {
+            this.command = command;
+            putValue(Action.NAME, text);
+            putValue(Action.ACCELERATOR_KEY, key);
+        }
+
+        public GeneralAction(Actions command, String text, String description, KeyStroke key) {
+            this.command = command;
+            putValue(Action.NAME, text);
+            putValue(Action.SHORT_DESCRIPTION, description);
+            putValue(Action.ACCELERATOR_KEY, key);
+        }
+
+        public GeneralAction(Actions command, String text, String description, KeyStroke key, Icon icon) {
+            super(icon);
+
+            this.command = command;
+            putValue(Action.NAME, text);
+            putValue(Action.SHORT_DESCRIPTION, description);
+            putValue(Action.ACCELERATOR_KEY, key);
+        }
+
+        @Override
+        public void actionPerformed(ActionEvent e) {
+            if (tabbedPane.getTabs().size() > 0) {
+                try {
+                    getCurrentBasePanel().runCommand(command);
+                } catch (Throwable ex) {
+                    LOGGER.error("Problem with executing command: " + command, ex);
+                }
+            } else {
+                LOGGER.info("Action '" + command + "' must be disabled when no database is open.");
+            }
+        }
+    }
+
+    /**
+     * The action concerned with closing the window.
+     */
+    private class CloseAction extends SimpleCommand {
+
+        @Override
+        public void execute() {
+            quit();
+            Platform.exit();
+        }
+    }
+
+    /**
+     * Class for handling general actions; cut, copy and paste. The focused component is
+     * kept track of by Globals.focusListener, and we call the action stored under the
+     * relevant name in its action map.
+     */
+    private class EditAction extends SimpleCommand {
+
+        private final Actions command;
+
+        public EditAction(Actions command) {
+            this.command = command;
+        }
+
+        @Override
+        public void execute() {
+            LOGGER.debug(Globals.getFocusListener().getFocused().toString());
+            JComponent source = Globals.getFocusListener().getFocused();
+            Action action = source.getActionMap().get(command);
+            if (action != null) {
+                action.actionPerformed(new ActionEvent(source, 0, command.name()));
+            }
+        }
+    }
+
+    private void setDefaultTableFontSize() {
+        GUIGlobals.setFont(Globals.prefs.getIntDefault(JabRefPreferences.FONT_SIZE));
+        for (BasePanel basePanel : getBasePanelList()) {
+            basePanel.updateTableFont();
+        }
+        setStatus(Localization.lang("Table font size is %0", String.valueOf(GUIGlobals.currentFont.getSize())));
+    }
+
+    private void increaseTableFontSize() {
+        GUIGlobals.setFont(GUIGlobals.currentFont.getSize() + 1);
+        for (BasePanel basePanel : getBasePanelList()) {
+            basePanel.updateTableFont();
+        }
+        setStatus(Localization.lang("Table font size is %0", String.valueOf(GUIGlobals.currentFont.getSize())));
+    }
+
+    private void decreaseTableFontSize() {
+        int currentSize = GUIGlobals.currentFont.getSize();
+        if (currentSize < 2) {
+            return;
+        }
+        GUIGlobals.setFont(currentSize - 1);
+        for (BasePanel basePanel : getBasePanelList()) {
+            basePanel.updateTableFont();
+        }
+        setStatus(Localization.lang("Table font size is %0", String.valueOf(GUIGlobals.currentFont.getSize())));
+    }
+
+    private class CloseDatabaseAction extends SimpleCommand {
+
+        @Override
+        public void execute() {
+            closeTab(getCurrentBasePanel());
+        }
+    }
+
+    private class UndoRedoEventManager {
+
+        @Subscribe
+        public void listen(UndoRedoEvent event) {
+            updateTexts(event);
+            JabRefFrame.this.getCurrentBasePanel().updateEntryEditorIfShowing();
+        }
+
+        @Subscribe
+        public void listen(AddUndoableActionEvent event) {
+            updateTexts(event);
+        }
+
+        private void updateTexts(UndoChangeEvent event) {
+            /* TODO
+            SwingUtilities.invokeLater(() -> {
+                undo.putValue(Action.SHORT_DESCRIPTION, event.getUndoDescription());
+                undo.setEnabled(event.isCanUndo());
+                redo.putValue(Action.SHORT_DESCRIPTION, event.getRedoDescription());
+                redo.setEnabled(event.isCanRedo());
+            });
+            */
+        }
+    }
+}
diff --git a/src/main/java/org/jabref/gui/strings/StringAction.java b/src/main/java/org/jabref/gui/strings/StringAction.java
index c5511536505..2cc26f29cce 100644
--- a/src/main/java/org/jabref/gui/strings/StringAction.java
+++ b/src/main/java/org/jabref/gui/strings/StringAction.java
@@ -1,12 +1,21 @@
 package org.jabref.gui.strings;
 
+import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.actions.SimpleCommand;
+import org.jabref.model.database.BibDatabase;
 
 public class StringAction extends SimpleCommand {
 
+    private final JabRefFrame frame;
+
+    public StringAction(JabRefFrame jabRefFrame) {
+        this.frame = jabRefFrame;
+    }
+
     @Override
     public void execute() {
-        new StringDialogView().show();
+        BibDatabase database = frame.getCurrentBasePanel().getDatabase();
+        new StringDialogView(database).showAndWait();
     }
 
 }
diff --git a/src/main/resources/org/jabref/gui/strings/StringDialog.css b/src/main/java/org/jabref/gui/strings/StringDialog.css
similarity index 100%
rename from src/main/resources/org/jabref/gui/strings/StringDialog.css
rename to src/main/java/org/jabref/gui/strings/StringDialog.css
diff --git a/src/main/resources/org/jabref/gui/strings/StringDialog.fxml b/src/main/java/org/jabref/gui/strings/StringDialog.fxml
similarity index 77%
rename from src/main/resources/org/jabref/gui/strings/StringDialog.fxml
rename to src/main/java/org/jabref/gui/strings/StringDialog.fxml
index 73b0841de97..fffb892ebbb 100644
--- a/src/main/resources/org/jabref/gui/strings/StringDialog.fxml
+++ b/src/main/java/org/jabref/gui/strings/StringDialog.fxml
@@ -9,7 +9,7 @@
 <?import javafx.scene.control.ToolBar?>
 <?import javafx.scene.layout.BorderPane?>
 
-<DialogPane xmlns="http://javafx.com/javafx/8.0.141" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.strings.StringDialogController">
+<DialogPane xmlns="http://javafx.com/javafx/8.0.141" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.strings.StringDialogView">
    <header>
       <ToolBar maxWidth="1.7976931348623157E308" prefHeight="40.0" prefWidth="299.0">
         <items>
@@ -33,14 +33,6 @@
                </columnResizePolicy>
             </TableView>
          </center>
-         <bottom>
-            <ButtonBar prefHeight="40.0" prefWidth="200.0" BorderPane.alignment="CENTER">
-              <buttons>
-                  <Button fx:id="btnCancel" cancelButton="true" mnemonicParsing="false" text="Cancel" />
-                <Button fx:id="btnSave" defaultButton="true" mnemonicParsing="false" onAction="#save" text="Save" />
-              </buttons>
-            </ButtonBar>
-         </bottom>
       </BorderPane>
    </content>
 </DialogPane>
diff --git a/src/main/java/org/jabref/gui/strings/StringDialogController.java b/src/main/java/org/jabref/gui/strings/StringDialogController.java
deleted file mode 100644
index a1e7e190029..00000000000
--- a/src/main/java/org/jabref/gui/strings/StringDialogController.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package org.jabref.gui.strings;
-
-import javax.inject.Inject;
-
-import javafx.event.ActionEvent;
-import javafx.fxml.FXML;
-import javafx.scene.control.Button;
-import javafx.scene.control.TableColumn;
-import javafx.scene.control.TableColumn.CellEditEvent;
-import javafx.scene.control.TableView;
-import javafx.scene.control.Tooltip;
-import javafx.scene.control.cell.TextFieldTableCell;
-import javafx.util.converter.DefaultStringConverter;
-
-import org.jabref.gui.AbstractController;
-import org.jabref.gui.IconTheme.JabRefIcons;
-import org.jabref.gui.StateManager;
-import org.jabref.gui.help.HelpAction;
-import org.jabref.gui.util.IconValidationDecorator;
-import org.jabref.logic.help.HelpFile;
-import org.jabref.logic.l10n.Localization;
-
-import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
-
-public class StringDialogController extends AbstractController<StringDialogViewModel> {
-
-    @FXML private Button btnNewString;
-    @FXML private Button btnRemove;
-    @FXML private Button btnHelp;
-    @FXML private Button btnCancel;
-    @FXML private Button btnSave;
-    @FXML private TableView<StringViewModel> tblStrings;
-    @FXML private TableColumn<StringViewModel, String> colLabel;
-    @FXML private TableColumn<StringViewModel, String> colContent;
-    @Inject private StateManager stateManager;
-    private final ControlsFxVisualizer visualizer = new ControlsFxVisualizer();
-
-
-    @FXML
-    private void initialize() {
-        visualizer.setDecoration(new IconValidationDecorator());
-        viewModel = new StringDialogViewModel(stateManager);
-
-        btnHelp.setGraphic(JabRefIcons.HELP.getGraphicNode());
-        btnHelp.setTooltip(new Tooltip(Localization.lang("Open Help page")));
-
-        btnNewString.setGraphic(JabRefIcons.ADD.getGraphicNode());
-        btnNewString.setTooltip(new Tooltip(Localization.lang("New string")));
-
-        btnRemove.setGraphic(JabRefIcons.REMOVE.getGraphicNode());
-        btnRemove.setTooltip(new Tooltip(Localization.lang("Remove string")));
-
-        //Register TextfieldTableCell Control for validation
-        // ValueExtractor.addObservableValueExtractor(c -> c instanceof TextFieldTableCell, c -> ((TextFieldTableCell<?, String>) c).textProperty());
-
-        colLabel.setCellFactory(column -> {
-
-            TextFieldTableCell<StringViewModel, String> cell = new TextFieldTableCell<>(new DefaultStringConverter());
-            column.setCellValueFactory(cellData -> {
-
-                visualizer.initVisualization(cellData.getValue().labelValidation(), cell);
-                return cellData.getValue().getLabel();
-            });
-            return cell;
-
-        });
-
-        colContent.setCellFactory(column -> {
-
-            TextFieldTableCell<StringViewModel, String> cell = new TextFieldTableCell<>(new DefaultStringConverter());
-            column.setCellValueFactory(cellData -> {
-
-                visualizer.initVisualization(cellData.getValue().contentValidation(), cell);
-                return cellData.getValue().getContent();
-            });
-            return cell;
-
-        });
-
-        colLabel.setOnEditCommit(
-                (CellEditEvent<StringViewModel, String> cell) -> {
-
-                    cell.getRowValue().setLabel(cell.getNewValue());
-                });
-        colContent.setOnEditCommit(
-                (CellEditEvent<StringViewModel, String> cell) -> {
-                    cell.getRowValue().setContent(cell.getNewValue());
-                });
-
-        tblStrings.itemsProperty().bindBidirectional(viewModel.allStringsProperty());
-        tblStrings.setEditable(true);
-
-
-
-
-    }
-
-    @FXML
-    private void addString(ActionEvent event) {
-        viewModel.addNewString();
-    }
-
-    @FXML
-    private void openHelp(ActionEvent event) {
-        HelpAction.openHelpPage(HelpFile.STRING_EDITOR);
-    }
-
-    @FXML
-    private void removeString(ActionEvent event) {
-        StringViewModel selected = tblStrings.getSelectionModel().getSelectedItem();
-        viewModel.removeString(selected);
-    }
-
-    @FXML
-    private void save() {
-        viewModel.save();
-    }
-
-    @FXML
-    private void close() {
-        getStage().close();
-    }
-}
diff --git a/src/main/java/org/jabref/gui/strings/StringDialogView.java b/src/main/java/org/jabref/gui/strings/StringDialogView.java
index 9419e41d102..df8d35e2f61 100644
--- a/src/main/java/org/jabref/gui/strings/StringDialogView.java
+++ b/src/main/java/org/jabref/gui/strings/StringDialogView.java
@@ -1,18 +1,124 @@
 package org.jabref.gui.strings;
 
-import javafx.scene.control.Alert.AlertType;
-import javafx.scene.control.DialogPane;
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.ButtonBar.ButtonData;
+import javafx.scene.control.ButtonType;
+import javafx.scene.control.TableColumn;
+import javafx.scene.control.TableColumn.CellEditEvent;
+import javafx.scene.control.TableView;
+import javafx.scene.control.Tooltip;
+import javafx.scene.control.cell.TextFieldTableCell;
+import javafx.util.converter.DefaultStringConverter;
 
-import org.jabref.gui.AbstractDialogView;
-import org.jabref.gui.FXDialog;
+import org.jabref.gui.help.HelpAction;
+import org.jabref.gui.icon.IconTheme.JabRefIcons;
+import org.jabref.gui.util.BaseDialog;
+import org.jabref.gui.util.IconValidationDecorator;
+import org.jabref.logic.help.HelpFile;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.database.BibDatabase;
 
-public class StringDialogView extends AbstractDialogView {
+import com.airhacks.afterburner.views.ViewLoader;
+import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
+import org.controlsfx.tools.ValueExtractor;
 
-    @Override
-    public void show() {
-        FXDialog stringDialog = new FXDialog(AlertType.INFORMATION, "Edit Strings");
-        stringDialog.setDialogPane((DialogPane) this.getView());
-        stringDialog.setResizable(true);
-        stringDialog.show();
+public class StringDialogView extends BaseDialog<Void> {
+
+    @FXML private Button btnNewString;
+    @FXML private Button btnRemove;
+    @FXML private Button btnHelp;
+    @FXML private Button btnCancel;
+    @FXML private Button btnSave;
+    @FXML private TableView<StringViewModel> tblStrings;
+    @FXML private TableColumn<StringViewModel, String> colLabel;
+    @FXML private TableColumn<StringViewModel, String> colContent;
+
+    private final ControlsFxVisualizer visualizer = new ControlsFxVisualizer();
+    private final StringDialogViewModel viewModel;
+
+    public StringDialogView(BibDatabase database) {
+        viewModel = new StringDialogViewModel(database);
+
+        ButtonType save = new ButtonType("Save", ButtonData.OK_DONE);
+        this.getDialogPane().getButtonTypes().addAll(save);
+
+        ViewLoader.view(this)
+                  .load()
+                  .setAsContent(this.getDialogPane());
+    }
+
+    @FXML
+    private void initialize() {
+        visualizer.setDecoration(new IconValidationDecorator());
+
+        btnHelp.setGraphic(JabRefIcons.HELP.getGraphicNode());
+        btnHelp.setTooltip(new Tooltip(Localization.lang("Open Help page")));
+
+        btnNewString.setGraphic(JabRefIcons.ADD.getGraphicNode());
+        btnNewString.setTooltip(new Tooltip(Localization.lang("New string")));
+
+        btnRemove.setGraphic(JabRefIcons.REMOVE.getGraphicNode());
+        btnRemove.setTooltip(new Tooltip(Localization.lang("Remove string")));
+
+        //Register TextfieldTableCell Control for validation
+        ValueExtractor.addObservableValueExtractor(c -> c instanceof TextFieldTableCell, c -> ((TextFieldTableCell<?, String>) c).textProperty());
+
+        colLabel.setCellFactory(column -> {
+
+            TextFieldTableCell<StringViewModel, String> cell = new TextFieldTableCell<>(new DefaultStringConverter());
+            column.setCellValueFactory(cellData -> {
+
+                visualizer.initVisualization(cellData.getValue().labelValidation(), cell);
+                return cellData.getValue().getLabel();
+            });
+            return cell;
+
+        });
+
+        colContent.setCellFactory(column -> {
+
+            TextFieldTableCell<StringViewModel, String> cell = new TextFieldTableCell<>(new DefaultStringConverter());
+            column.setCellValueFactory(cellData -> {
+
+                visualizer.initVisualization(cellData.getValue().contentValidation(), cell);
+                return cellData.getValue().getContent();
+            });
+            return cell;
+
+        });
+
+        colLabel.setOnEditCommit((CellEditEvent<StringViewModel, String> cell) -> {
+                                     cell.getRowValue().setLabel(cell.getNewValue());
+                                 });
+        colContent.setOnEditCommit((CellEditEvent<StringViewModel, String> cell) -> {
+                                       cell.getRowValue().setContent(cell.getNewValue());
+                                   });
+
+        tblStrings.itemsProperty().bindBidirectional(viewModel.allStringsProperty());
+        tblStrings.setEditable(true);
+
+    }
+
+    @FXML
+    private void addString(ActionEvent event) {
+        viewModel.addNewString();
+    }
+
+    @FXML
+    private void openHelp(ActionEvent event) {
+        HelpAction.openHelpPage(HelpFile.STRING_EDITOR);
+    }
+
+    @FXML
+    private void removeString(ActionEvent event) {
+        StringViewModel selected = tblStrings.getSelectionModel().getSelectedItem();
+        viewModel.removeString(selected);
+    }
+
+    @FXML
+    private void save() {
+        viewModel.save();
     }
 }
diff --git a/src/main/java/org/jabref/gui/strings/StringDialogViewModel.java b/src/main/java/org/jabref/gui/strings/StringDialogViewModel.java
index fd93f03e884..2f30b10aeff 100644
--- a/src/main/java/org/jabref/gui/strings/StringDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/strings/StringDialogViewModel.java
@@ -9,7 +9,6 @@
 import javafx.collections.FXCollections;
 
 import org.jabref.gui.AbstractViewModel;
-import org.jabref.gui.StateManager;
 import org.jabref.logic.bibtex.comparator.BibtexStringComparator;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibtexString;
@@ -20,10 +19,9 @@ public class StringDialogViewModel extends AbstractViewModel {
 
     private final BibDatabase db;
 
-    public StringDialogViewModel(StateManager stateManager) {
-        this.db = stateManager.getActiveDatabase().get().getDatabase();
+    public StringDialogViewModel(BibDatabase bibDatabase) {
+        this.db = bibDatabase;
         addAllStringsFromDB();
-
     }
 
     private void addAllStringsFromDB() {
diff --git a/src/main/java/org/jabref/gui/strings/StringViewModel.java b/src/main/java/org/jabref/gui/strings/StringViewModel.java
index 09e6b86493e..6a32c43fad5 100644
--- a/src/main/java/org/jabref/gui/strings/StringViewModel.java
+++ b/src/main/java/org/jabref/gui/strings/StringViewModel.java
@@ -20,8 +20,10 @@ public class StringViewModel {
 
     private final Function<String, ValidationMessage> function = input -> {
         if (input == null) {
+            System.out.println("Null checker");
             return ValidationMessage.error("May not be null2");
         } else if (input.trim().isEmpty()) {
+            System.out.println("Should not empty");
             return ValidationMessage.warning("Should not be empty");
         } else {
             return null; // everything is ok

From 84c0abafd2b19285b0e46489f4b10bfaecbadac1 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Tue, 3 Apr 2018 14:36:05 +0200
Subject: [PATCH 10/28] play around with validation validation icon is now
 correctly shown, although it needs some css mods fix toolbar max width

---
 .../org/jabref/gui/strings/StringDialog.fxml  |  3 +-
 .../jabref/gui/strings/StringDialogView.java  | 49 ++++++++++++-------
 .../jabref/gui/strings/StringViewModel.java   |  2 +-
 .../gui/util/IconValidationDecorator.java     |  2 +-
 4 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/src/main/java/org/jabref/gui/strings/StringDialog.fxml b/src/main/java/org/jabref/gui/strings/StringDialog.fxml
index fffb892ebbb..73baa01a612 100644
--- a/src/main/java/org/jabref/gui/strings/StringDialog.fxml
+++ b/src/main/java/org/jabref/gui/strings/StringDialog.fxml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import javafx.scene.control.Button?>
-<?import javafx.scene.control.ButtonBar?>
 <?import javafx.scene.control.DialogPane?>
 <?import javafx.scene.control.Separator?>
 <?import javafx.scene.control.TableColumn?>
@@ -11,7 +10,7 @@
 
 <DialogPane xmlns="http://javafx.com/javafx/8.0.141" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.strings.StringDialogView">
    <header>
-      <ToolBar maxWidth="1.7976931348623157E308" prefHeight="40.0" prefWidth="299.0">
+      <ToolBar prefHeight="40.0" prefWidth="299.0">
         <items>
           <Button fx:id="btnNewString" mnemonicParsing="false" onAction="#addString" />
             <Button fx:id="btnRemove" mnemonicParsing="false" onAction="#removeString" />
diff --git a/src/main/java/org/jabref/gui/strings/StringDialogView.java b/src/main/java/org/jabref/gui/strings/StringDialogView.java
index df8d35e2f61..aab3e0e9cdf 100644
--- a/src/main/java/org/jabref/gui/strings/StringDialogView.java
+++ b/src/main/java/org/jabref/gui/strings/StringDialogView.java
@@ -22,7 +22,6 @@
 
 import com.airhacks.afterburner.views.ViewLoader;
 import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
-import org.controlsfx.tools.ValueExtractor;
 
 public class StringDialogView extends BaseDialog<Void> {
 
@@ -62,31 +61,47 @@ private void initialize() {
         btnRemove.setGraphic(JabRefIcons.REMOVE.getGraphicNode());
         btnRemove.setTooltip(new Tooltip(Localization.lang("Remove string")));
 
-        //Register TextfieldTableCell Control for validation
-        ValueExtractor.addObservableValueExtractor(c -> c instanceof TextFieldTableCell, c -> ((TextFieldTableCell<?, String>) c).textProperty());
 
-        colLabel.setCellFactory(column -> {
+        colLabel.setCellValueFactory(cellData -> cellData.getValue().getLabel());
+        colLabel.setCellFactory(column -> new TextFieldTableCell<StringViewModel, String>(new DefaultStringConverter()) {
 
-            TextFieldTableCell<StringViewModel, String> cell = new TextFieldTableCell<>(new DefaultStringConverter());
-            column.setCellValueFactory(cellData -> {
+            @Override
+            public void updateItem(String item, boolean empty) {
+                super.updateItem(item, empty);
 
-                visualizer.initVisualization(cellData.getValue().labelValidation(), cell);
-                return cellData.getValue().getLabel();
-            });
-            return cell;
+                if (!empty) {
+                    if (getTableRow() != null) {
+                        Object rowItem = getTableRow().getItem();
 
+                        if ((rowItem != null) && (rowItem instanceof StringViewModel)) {
+                            StringViewModel vm = (StringViewModel) rowItem;
+
+                            visualizer.initVisualization(vm.labelValidation(), this);
+                        }
+                    }
+                }
+            }
         });
 
-        colContent.setCellFactory(column -> {
+        colContent.setCellValueFactory(cellData -> cellData.getValue().getContent());
+        colContent.setCellFactory(column -> new TextFieldTableCell<StringViewModel, String>(new DefaultStringConverter()) {
+
+            @Override
+            public void updateItem(String item, boolean empty) {
+                super.updateItem(item, empty);
 
-            TextFieldTableCell<StringViewModel, String> cell = new TextFieldTableCell<>(new DefaultStringConverter());
-            column.setCellValueFactory(cellData -> {
+                if (!empty) {
+                    if (getTableRow() != null) {
+                        Object rowItem = getTableRow().getItem();
 
-                visualizer.initVisualization(cellData.getValue().contentValidation(), cell);
-                return cellData.getValue().getContent();
-            });
-            return cell;
+                        if ((rowItem != null) && (rowItem instanceof StringViewModel)) {
+                            StringViewModel vm = (StringViewModel) rowItem;
 
+                            visualizer.initVisualization(vm.contentValidation(), this);
+                        }
+                    }
+                }
+            }
         });
 
         colLabel.setOnEditCommit((CellEditEvent<StringViewModel, String> cell) -> {
diff --git a/src/main/java/org/jabref/gui/strings/StringViewModel.java b/src/main/java/org/jabref/gui/strings/StringViewModel.java
index 6a32c43fad5..89f18729660 100644
--- a/src/main/java/org/jabref/gui/strings/StringViewModel.java
+++ b/src/main/java/org/jabref/gui/strings/StringViewModel.java
@@ -24,7 +24,7 @@ public class StringViewModel {
             return ValidationMessage.error("May not be null2");
         } else if (input.trim().isEmpty()) {
             System.out.println("Should not empty");
-            return ValidationMessage.warning("Should not be empty");
+            return ValidationMessage.error("Should not be empty");
         } else {
             return null; // everything is ok
         }
diff --git a/src/main/java/org/jabref/gui/util/IconValidationDecorator.java b/src/main/java/org/jabref/gui/util/IconValidationDecorator.java
index d1fd432f4b3..ada1bf7ab21 100644
--- a/src/main/java/org/jabref/gui/util/IconValidationDecorator.java
+++ b/src/main/java/org/jabref/gui/util/IconValidationDecorator.java
@@ -48,7 +48,7 @@ public Node createDecorationNode(ValidationMessage message) {
         Label label = new Label();
         label.setGraphic(graphic);
         label.setTooltip(createTooltip(message));
-        label.setAlignment(Pos.CENTER);
+        label.setAlignment(position);
         return label;
     }
 

From 2482bd0fbf20e45c3a49ae922e4e0fc0d1ca57b9 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Sun, 20 Jan 2019 16:15:49 +0100
Subject: [PATCH 11/28] refactor TODO: Fix buttons not working

---
 src/main/java/org/jabref/gui/JabRefFrame.java |   1 +
 .../java/org/jabref/gui/JabRefFrame.java.orig | 633 +++++++-----------
 .../org/jabref/gui/strings/StringDialog.fxml  |  32 +-
 .../jabref/gui/strings/StringDialogView.java  |  40 +-
 .../gui/strings/StringDialogViewModel.java    |  31 +-
 .../jabref/gui/strings/StringViewModel.java   |   2 +-
 6 files changed, 308 insertions(+), 431 deletions(-)

diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index 5a76fd6c02f..36d24d3c9d5 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -102,6 +102,7 @@
 import org.jabref.gui.push.PushToApplications;
 import org.jabref.gui.search.GlobalSearchBar;
 import org.jabref.gui.specialfields.SpecialFieldMenuItemFactory;
+import org.jabref.gui.strings.StringAction;
 import org.jabref.gui.undo.CountingUndoManager;
 import org.jabref.gui.util.DefaultTaskExecutor;
 import org.jabref.logic.autosaveandbackup.AutosaveManager;
diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java.orig b/src/main/java/org/jabref/gui/JabRefFrame.java.orig
index 01561669817..9cd904dd31d 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java.orig
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java.orig
@@ -1,11 +1,7 @@
 package org.jabref.gui;
 
 import java.awt.Component;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
 import java.awt.Window;
-import java.awt.event.ActionEvent;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
@@ -18,41 +14,41 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.TimerTask;
+import java.util.stream.Collectors;
 
-import javax.swing.AbstractAction;
 import javax.swing.Action;
-import javax.swing.Icon;
-import javax.swing.JComponent;
-import javax.swing.JLabel;
-import javax.swing.JMenu;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
-import javax.swing.JProgressBar;
-import javax.swing.KeyStroke;
-import javax.swing.SwingConstants;
 import javax.swing.SwingUtilities;
-import javax.swing.UIManager;
 
 import javafx.application.Platform;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import javafx.collections.ListChangeListener;
 import javafx.scene.Node;
+import javafx.scene.control.Alert;
 import javafx.scene.control.Button;
+import javafx.scene.control.ButtonBar;
+import javafx.scene.control.ButtonType;
 import javafx.scene.control.Menu;
 import javafx.scene.control.MenuBar;
+import javafx.scene.control.ProgressBar;
 import javafx.scene.control.SeparatorMenuItem;
 import javafx.scene.control.SplitPane;
 import javafx.scene.control.Tab;
 import javafx.scene.control.TabPane;
+import javafx.scene.control.TextInputControl;
 import javafx.scene.control.ToolBar;
 import javafx.scene.control.Tooltip;
+import javafx.scene.input.DataFormat;
 import javafx.scene.input.KeyEvent;
+import javafx.scene.input.TransferMode;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Pane;
 import javafx.scene.layout.Priority;
 import javafx.stage.Stage;
+import javafx.util.Duration;
 
 import org.jabref.Globals;
 import org.jabref.JabRefExecutorService;
@@ -64,20 +60,15 @@ import org.jabref.gui.actions.ConnectToSharedDatabaseCommand;
 import org.jabref.gui.actions.CopyFilesAction;
 import org.jabref.gui.actions.CustomizeEntryAction;
 import org.jabref.gui.actions.CustomizeKeyBindingAction;
+import org.jabref.gui.actions.DatabasePropertiesAction;
 import org.jabref.gui.actions.EditExternalFileTypesAction;
 import org.jabref.gui.actions.ErrorConsoleAction;
-import org.jabref.gui.actions.FindUnlinkedFilesAction;
-import org.jabref.gui.actions.IntegrityCheckAction;
-import org.jabref.gui.actions.LibraryPropertiesAction;
 import org.jabref.gui.actions.LookupIdentifierAction;
 import org.jabref.gui.actions.ManageCustomExportsAction;
 import org.jabref.gui.actions.ManageCustomImportsAction;
 import org.jabref.gui.actions.ManageJournalsAction;
 import org.jabref.gui.actions.ManageKeywordsAction;
 import org.jabref.gui.actions.ManageProtectedTermsAction;
-import org.jabref.gui.actions.MassSetFieldAction;
-import org.jabref.gui.actions.MergeEntriesAction;
-import org.jabref.gui.actions.MnemonicAwareAction;
 import org.jabref.gui.actions.NewDatabaseAction;
 import org.jabref.gui.actions.NewEntryAction;
 import org.jabref.gui.actions.NewEntryFromPlainTextAction;
@@ -91,28 +82,37 @@ import org.jabref.gui.actions.ShowPreferencesAction;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.actions.StandardActions;
 import org.jabref.gui.dialogs.AutosaveUIManager;
+import org.jabref.gui.edit.MassSetFieldsAction;
 import org.jabref.gui.exporter.ExportCommand;
+import org.jabref.gui.exporter.ExportToClipboardAction;
 import org.jabref.gui.exporter.SaveAllAction;
 import org.jabref.gui.exporter.SaveDatabaseAction;
+import org.jabref.gui.externalfiles.FindUnlinkedFilesAction;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.help.AboutAction;
 import org.jabref.gui.help.HelpAction;
-import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.importer.ImportCommand;
 import org.jabref.gui.importer.ImportInspectionDialog;
 import org.jabref.gui.importer.actions.OpenDatabaseAction;
+import org.jabref.gui.integrity.IntegrityCheckAction;
 import org.jabref.gui.keyboard.KeyBinding;
 import org.jabref.gui.menus.FileHistoryMenu;
+import org.jabref.gui.mergeentries.MergeEntriesAction;
 import org.jabref.gui.push.PushToApplicationButton;
 import org.jabref.gui.push.PushToApplications;
 import org.jabref.gui.search.GlobalSearchBar;
+<<<<<<< HEAD
 import org.jabref.gui.specialfields.SpecialFieldValueViewModel;
 import org.jabref.gui.strings.StringAction;
+=======
+import org.jabref.gui.specialfields.SpecialFieldMenuItemFactory;
+>>>>>>> upstream/master
 import org.jabref.gui.undo.CountingUndoManager;
 import org.jabref.gui.util.DefaultTaskExecutor;
 import org.jabref.logic.autosaveandbackup.AutosaveManager;
 import org.jabref.logic.autosaveandbackup.BackupManager;
 import org.jabref.logic.importer.IdFetcher;
+import org.jabref.logic.importer.OpenDatabase;
 import org.jabref.logic.importer.OutputPrinter;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.importer.WebFetchers;
@@ -136,6 +136,9 @@ import org.jabref.preferences.LastFocusedTabPreferences;
 import org.jabref.preferences.SearchPreferences;
 
 import com.google.common.eventbus.Subscribe;
+import com.jfoenix.controls.JFXSnackbar;
+import com.jfoenix.controls.JFXSnackbar.SnackbarEvent;
+import com.jfoenix.controls.JFXSnackbarLayout;
 import org.eclipse.fx.ui.controls.tabpane.DndTabPane;
 import org.eclipse.fx.ui.controls.tabpane.DndTabPaneFactory;
 import org.fxmisc.easybind.EasyBind;
@@ -152,41 +155,15 @@ public class JabRefFrame extends BorderPane implements OutputPrinter {
     public static final String FRAME_TITLE = "JabRef";
 
     private static final Logger LOGGER = LoggerFactory.getLogger(JabRefFrame.class);
+    private static final Duration TOAST_MESSAGE_DISPLAY_TIME = Duration.millis(3000);
 
     private final SplitPane splitPane = new SplitPane();
     private final JabRefPreferences prefs = Globals.prefs;
     private final GlobalSearchBar globalSearchBar = new GlobalSearchBar(this);
-    private final JLabel statusLine = new JLabel("", SwingConstants.LEFT);
-    private final JLabel statusLabel = new JLabel(
-            Localization.lang("Status")
-                    + ':',
-            SwingConstants.LEFT);
-    private final JProgressBar progressBar = new JProgressBar();
+    private final JFXSnackbar statusLine = new JFXSnackbar(this);
+    private final ProgressBar progressBar = new ProgressBar();
     private final FileHistoryMenu fileHistory = new FileHistoryMenu(prefs, this);
 
-    // Here we instantiate menu/toolbar actions. Actions regarding
-    // the currently open database are defined as a GeneralAction
-    // with a unique command string. This causes the appropriate
-    // BasePanel's runCommand() method to be called with that command.
-    // Note: GeneralAction's constructor automatically gets translations
-    // for the name and message strings.
-
-    private final AbstractAction toggleRelevance = new GeneralAction(
-            new SpecialFieldValueViewModel(SpecialField.RELEVANCE.getValues().get(0)).getCommand(),
-            new SpecialFieldValueViewModel(SpecialField.RELEVANCE.getValues().get(0)).getMenuString(),
-            new SpecialFieldValueViewModel(SpecialField.RELEVANCE.getValues().get(0)).getToolTipText(),
-            IconTheme.JabRefIcons.RELEVANCE.getIcon());
-    private final AbstractAction toggleQualityAssured = new GeneralAction(
-            new SpecialFieldValueViewModel(SpecialField.QUALITY.getValues().get(0)).getCommand(),
-            new SpecialFieldValueViewModel(SpecialField.QUALITY.getValues().get(0)).getMenuString(),
-            new SpecialFieldValueViewModel(SpecialField.QUALITY.getValues().get(0)).getToolTipText(),
-            IconTheme.JabRefIcons.QUALITY_ASSURED.getIcon());
-    private final AbstractAction togglePrinted = new GeneralAction(
-            new SpecialFieldValueViewModel(SpecialField.PRINTED.getValues().get(0)).getCommand(),
-            new SpecialFieldValueViewModel(SpecialField.PRINTED.getValues().get(0)).getMenuString(),
-            new SpecialFieldValueViewModel(SpecialField.PRINTED.getValues().get(0)).getToolTipText(),
-            IconTheme.JabRefIcons.PRINTED.getIcon());
-
     // Lists containing different subsets of actions for different purposes
     private final List<Object> specialFieldButtons = new LinkedList<>();
     private final List<Object> openDatabaseOnlyActions = new LinkedList<>();
@@ -214,20 +191,6 @@ public class JabRefFrame extends BorderPane implements OutputPrinter {
         init();
     }
 
-    private static JMenu subMenu(String name) {
-        int i = name.indexOf('&');
-        JMenu res;
-        if (i >= 0) {
-            res = new JMenu(name.substring(0, i) + name.substring(i + 1));
-            char mnemonic = Character.toUpperCase(name.charAt(i + 1));
-            res.setMnemonic((int) mnemonic);
-        } else {
-            res = new JMenu(name);
-        }
-
-        return res;
-    }
-
     /**
      * Takes a list of Object and calls the method setEnabled on them, depending on whether it is an Action or a
      * Component.
@@ -264,6 +227,29 @@ public class JabRefFrame extends BorderPane implements OutputPrinter {
 
         initKeyBindings();
 
+        tabbedPane.setOnDragOver(event -> {
+            if (event.getDragboard().hasFiles()) {
+                event.acceptTransferModes(TransferMode.COPY, TransferMode.MOVE, TransferMode.LINK);
+            }
+        });
+
+        tabbedPane.setOnDragDropped(event -> {
+            boolean success = false;
+
+            if (event.getDragboard().hasContent(DataFormat.FILES)) {
+                List<Path> files = event.getDragboard().getFiles().stream().map(File::toPath).filter(FileUtil::isBibFile).collect(Collectors.toList());
+                success = true;
+
+                for (Path file : files) {
+                    ParserResult pr = OpenDatabase.loadDatabase(file.toString(), Globals.prefs.getImportFormatPreferences(), Globals.getFileUpdateMonitor());
+                    addParserResult(pr, true);
+                }
+            }
+
+            event.setDropCompleted(success);
+            event.consume();
+        });
+
         //setBounds(GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds());
         //WindowLocation pw = new WindowLocation(this, JabRefPreferences.POS_X, JabRefPreferences.POS_Y, JabRefPreferences.SIZE_X,
         //        JabRefPreferences.SIZE_Y);
@@ -303,10 +289,9 @@ public class JabRefFrame extends BorderPane implements OutputPrinter {
 
             // groupSidePane.getToggleCommand().setSelected(sidePaneManager.isComponentVisible(GroupSidePane.class));
             //previewToggle.setSelected(Globals.prefs.getPreviewPreferences().isPreviewPanelEnabled());
-            //generalFetcher.getToggleCommand().setSelected(sidePaneManager.isComponentVisible(GeneralFetcher.class));
+            //generalFetcher.getToggleCommand().setSelected(sidePaneManager.isComponentVisible(WebSearchPane.class));
             //openOfficePanel.getToggleCommand().setSelected(sidePaneManager.isComponentVisible(OpenOfficeSidePanel.class));
-            // TODO: Can't notify focus listener since it is expecting a swing component
-            //Globals.getFocusListener().setFocused(currentBasePanel.getMainTable());
+
             setWindowTitle();
             // Update search autocompleter with information for the correct database:
             currentBasePanel.updateSearchManager();
@@ -327,7 +312,6 @@ public class JabRefFrame extends BorderPane implements OutputPrinter {
         }
 
         initShowTrackingNotification();
-
     }
 
     private void initKeyBindings() {
@@ -359,6 +343,9 @@ public class JabRefFrame extends BorderPane implements OutputPrinter {
                         setDefaultTableFontSize();
                         event.consume();
                         break;
+                    case SEARCH:
+                        getGlobalSearchBar().focus();
+                        break;
                     default:
                 }
             }
@@ -421,9 +408,9 @@ public class JabRefFrame extends BorderPane implements OutputPrinter {
         if (panel.getBibDatabaseContext().getLocation() == DatabaseLocation.LOCAL) {
             String changeFlag = panel.isModified() && !isAutosaveEnabled ? "*" : "";
             String databaseFile = panel.getBibDatabaseContext()
-                    .getDatabaseFile()
-                    .map(File::getPath)
-                    .orElse(GUIGlobals.UNTITLED_TITLE);
+                                       .getDatabaseFile()
+                                       .map(File::getPath)
+                                       .orElse(GUIGlobals.UNTITLED_TITLE);
             //setTitle(FRAME_TITLE + " - " + databaseFile + changeFlag + modeInfo);
         } else if (panel.getBibDatabaseContext().getLocation() == DatabaseLocation.SHARED) {
             //setTitle(FRAME_TITLE + " - " + panel.getBibDatabaseContext().getDBMSSynchronizer().getDBName() + " ["
@@ -444,7 +431,7 @@ public class JabRefFrame extends BorderPane implements OutputPrinter {
      * The MacAdapter calls this method when "About" is selected from the application menu.
      */
     public void about() {
-        HelpAction.getCommand().execute();
+        HelpAction.getMainHelpPageCommand().execute();
     }
 
     public JabRefPreferences prefs() {
@@ -456,14 +443,10 @@ public class JabRefFrame extends BorderPane implements OutputPrinter {
      * <p>
      * FIXME: Currently some threads remain and therefore hinder JabRef to be closed properly
      *
-     * @param filenames the filenames of all currently opened files - used for storing them if prefs openLastEdited is set to true
+     * @param filenames the filenames of all currently opened files - used for storing them if prefs openLastEdited is
+     *                  set to true
      */
     private void tearDownJabRef(List<String> filenames) {
-        Globals.stopBackgroundTasks();
-        Globals.shutdownThreadPools();
-
-        //dispose();
-
         //prefs.putBoolean(JabRefPreferences.WINDOW_MAXIMISED, getExtendedState() == Frame.MAXIMIZED_BOTH);
 
         if (prefs.getBoolean(JabRefPreferences.OPEN_LAST_EDITED)) {
@@ -477,13 +460,9 @@ public class JabRefFrame extends BorderPane implements OutputPrinter {
                 File focusedDatabase = getCurrentBasePanel().getBibDatabaseContext().getDatabaseFile().orElse(null);
                 new LastFocusedTabPreferences(prefs).setLastFocusedTab(focusedDatabase);
             }
-
         }
 
         fileHistory.storeHistory();
-        prefs.customExports.store(Globals.prefs);
-        prefs.customImports.store();
-
         prefs.flush();
 
         // dispose all windows, even if they are not displayed anymore
@@ -493,9 +472,9 @@ public class JabRefFrame extends BorderPane implements OutputPrinter {
     }
 
     /**
-     * General info dialog.  The MacAdapter calls this method when "Quit"
-     * is selected from the application menu, Cmd-Q is pressed, or "Quit" is selected from the Dock.
-     * The function returns a boolean indicating if quitting is ok or not.
+     * General info dialog.  The MacAdapter calls this method when "Quit" is selected from the application menu, Cmd-Q
+     * is pressed, or "Quit" is selected from the Dock. The function returns a boolean indicating if quitting is ok or
+     * not.
      * <p>
      * Non-OSX JabRef calls this when choosing "Quit" from the menu
      * <p>
@@ -504,42 +483,17 @@ public class JabRefFrame extends BorderPane implements OutputPrinter {
      * @return true if the user chose to quit; false otherwise
      */
     public boolean quit() {
-        // Ask here if the user really wants to close, if the base
-        // has not been saved since last save.
-        boolean close = true;
-
+        // First ask if the user really wants to close, if the library has not been saved since last save.
         List<String> filenames = new ArrayList<>();
         for (int i = 0; i < tabbedPane.getTabs().size(); i++) {
-            BibDatabaseContext context = getBasePanelAt(i).getBibDatabaseContext();
+            BasePanel panel = getBasePanelAt(i);
+            BibDatabaseContext context = panel.getBibDatabaseContext();
 
-            if (getBasePanelAt(i).isModified() && (context.getLocation() == DatabaseLocation.LOCAL)) {
+            if (panel.isModified() && (context.getLocation() == DatabaseLocation.LOCAL)) {
                 tabbedPane.getSelectionModel().select(i);
-                String filename = context.getDatabaseFile().map(File::getAbsolutePath).orElse(GUIGlobals.UNTITLED_TITLE);
-                int answer = showSaveDialog(filename);
-
-                if ((answer == JOptionPane.CANCEL_OPTION) ||
-                        (answer == JOptionPane.CLOSED_OPTION)) {
+                if (!confirmClose(panel)) {
                     return false;
                 }
-                if (answer == JOptionPane.YES_OPTION) {
-                    // The user wants to save.
-                    try {
-                        //getCurrentBasePanel().runCommand("save");
-                        SaveDatabaseAction saveAction = new SaveDatabaseAction(getCurrentBasePanel());
-                        saveAction.runCommand();
-                        if (saveAction.isCanceled() || !saveAction.isSuccess()) {
-                            // The action was either canceled or unsuccessful.
-                            // Break!
-                            output(Localization.lang("Unable to save library"));
-                            close = false;
-                        }
-                    } catch (Throwable ex) {
-                        // Something prevented the file
-                        // from being saved. Break!!!
-                        close = false;
-                        break;
-                    }
-                }
             } else if (context.getLocation() == DatabaseLocation.SHARED) {
                 context.convertToLocalDatabase();
                 context.getDBMSSynchronizer().closeSharedDatabase();
@@ -550,23 +504,22 @@ public class JabRefFrame extends BorderPane implements OutputPrinter {
             context.getDatabaseFile().map(File::getAbsolutePath).ifPresent(filenames::add);
         }
 
-        if (close) {
-            for (int i = 0; i < tabbedPane.getTabs().size(); i++) {
-                if (getBasePanelAt(i).isSaving()) {
-                    // There is a database still being saved, so we need to wait.
-                    WaitForSaveOperation w = new WaitForSaveOperation(this);
-                    w.show(); // This method won't return until canceled or the save operation is done.
-                    if (w.canceled()) {
-                        return false; // The user clicked cancel.
-                    }
+        // Wait for save operations to finish
+        for (int i = 0; i < tabbedPane.getTabs().size(); i++) {
+            if (getBasePanelAt(i).isSaving()) {
+                // There is a database still being saved, so we need to wait.
+                WaitForSaveOperation w = new WaitForSaveOperation(this);
+                w.show(); // This method won't return until canceled or the save operation is done.
+                if (w.canceled()) {
+                    return false; // The user clicked cancel.
                 }
             }
-
-            tearDownJabRef(filenames);
-            return true;
         }
 
-        return false;
+        // Good bye!
+        tearDownJabRef(filenames);
+        Platform.exit();
+        return true;
     }
 
     private void initLayout() {
@@ -609,8 +562,7 @@ public class JabRefFrame extends BorderPane implements OutputPrinter {
 
         setCenter(splitPane);
 
-        UIManager.put("TabbedPane.contentBorderInsets", new Insets(0, 0, 0, 0));
-
+        /*
         GridBagLayout gbl = new GridBagLayout();
         GridBagConstraints con = new GridBagConstraints();
         con.fill = GridBagConstraints.BOTH;
@@ -634,6 +586,7 @@ public class JabRefFrame extends BorderPane implements OutputPrinter {
         gbl.setConstraints(progressBar, con);
         status.add(progressBar);
         statusLabel.setForeground(GUIGlobals.ENTRY_EDITOR_LABEL_COLOR.darker());
+        */
     }
 
     private void setDividerPosition() {
@@ -663,14 +616,15 @@ public class JabRefFrame extends BorderPane implements OutputPrinter {
                 newLibrary,
                 factory.createIconButton(StandardActions.OPEN_LIBRARY, new OpenDatabaseAction(this)),
                 factory.createIconButton(StandardActions.SAVE_LIBRARY, new OldDatabaseCommandWrapper(Actions.SAVE, this, Globals.stateManager)),
-                leftSpacer);
+                leftSpacer
+        );
         leftSide.setMinWidth(100);
         leftSide.prefWidthProperty().bind(sidePane.widthProperty());
         leftSide.maxWidthProperty().bind(sidePane.widthProperty());
 
         PushToApplicationButton pushToExternal = new PushToApplicationButton(this, pushApplications.getApplications());
-        HBox rightSide = new HBox (
-                factory.createIconButton(StandardActions.NEW_ENTRY, new NewEntryAction(this, BiblatexEntryTypes.ARTICLE)),
+        HBox rightSide = new HBox(
+                factory.createIconButton(StandardActions.NEW_ARTICLE, new NewEntryAction(this, BiblatexEntryTypes.ARTICLE, dialogService, Globals.prefs)),
                 factory.createIconButton(StandardActions.DELETE_ENTRY, new OldDatabaseCommandWrapper(Actions.DELETE, this, Globals.stateManager)),
 
                 factory.createIconButton(StandardActions.UNDO, new OldDatabaseCommandWrapper(Actions.UNDO, this, Globals.stateManager)),
@@ -685,7 +639,7 @@ public class JabRefFrame extends BorderPane implements OutputPrinter {
                 factory.createIconButton(StandardActions.FORK_ME, new OpenBrowserAction("https://github.com/JabRef/jabref")),
                 factory.createIconButton(StandardActions.OPEN_FACEBOOK, new OpenBrowserAction("https://www.facebook.com/JabRef/")),
                 factory.createIconButton(StandardActions.OPEN_TWITTER, new OpenBrowserAction("https://twitter.com/jabref_org"))
-                );
+        );
 
         HBox.setHgrow(globalSearchBar, Priority.ALWAYS);
 
@@ -695,8 +649,7 @@ public class JabRefFrame extends BorderPane implements OutputPrinter {
                 globalSearchBar,
 
                 rightSpacer,
-                rightSide
-                );
+                rightSide);
         toolBar.getStyleClass().add("mainToolbar");
 
         return toolBar;
@@ -713,7 +666,6 @@ public class JabRefFrame extends BorderPane implements OutputPrinter {
 
     /**
      * Returns a list of BasePanel.
-     *
      */
     public List<BasePanel> getBasePanelList() {
         List<BasePanel> returnList = new ArrayList<>();
@@ -773,20 +725,16 @@ public class JabRefFrame extends BorderPane implements OutputPrinter {
         });
     }
 
-    /**
-     * JavaFX Menus
-     * @return Menubar
-     */
     private MenuBar createMenu() {
         ActionFactory factory = new ActionFactory(Globals.getKeyPrefs());
-        Menu file = new Menu(Localization.menuTitle("File"));
-        Menu edit = new Menu(Localization.menuTitle("Edit"));
+        Menu file = new Menu(Localization.lang("File"));
+        Menu edit = new Menu(Localization.lang("Edit"));
         Menu library = new Menu(Localization.lang("Library"));
-        Menu quality = new Menu(Localization.menuTitle("Quality"));
-        Menu view = new Menu(Localization.menuTitle("View"));
-        Menu tools = new Menu(Localization.menuTitle("Tools"));
-        Menu options = new Menu(Localization.menuTitle("Options"));
-        Menu help = new Menu(Localization.menuTitle("Help"));
+        Menu quality = new Menu(Localization.lang("Quality"));
+        Menu view = new Menu(Localization.lang("View"));
+        Menu tools = new Menu(Localization.lang("Tools"));
+        Menu options = new Menu(Localization.lang("Options"));
+        Menu help = new Menu(Localization.lang("Help"));
 
         file.getItems().addAll(
                 factory.createMenuItem(StandardActions.NEW_LIBRARY_BIBTEX, new NewDatabaseAction(this, BibDatabaseMode.BIBTEX)),
@@ -798,12 +746,11 @@ public class JabRefFrame extends BorderPane implements OutputPrinter {
 
                 factory.createSubMenu(StandardActions.IMPORT_EXPORT,
                         factory.createMenuItem(StandardActions.MERGE_DATABASE, new OldDatabaseCommandWrapper(Actions.MERGE_DATABASE, this, Globals.stateManager)), // TODO: merge with import
-                        factory.createMenuItem(StandardActions.IMPORT_INTO_CURRENT_LIBRARY, new ImportCommand(this, true)),
-                        factory.createMenuItem(StandardActions.IMPORT_INTO_NEW_LIBRARY, new ImportCommand(this, false)),
-                        factory.createMenuItem(StandardActions.EXPORT_ALL, new ExportCommand(this, false)),
-                        factory.createMenuItem(StandardActions.EXPORT_SELECTED, new ExportCommand(this, true)),
-                        factory.createMenuItem(StandardActions.SAVE_SELECTED_AS_PLAIN_BIBTEX, new OldDatabaseCommandWrapper(Actions.SAVE_SELECTED_AS_PLAIN, this, Globals.stateManager))
-                ),
+                        factory.createMenuItem(StandardActions.IMPORT_INTO_CURRENT_LIBRARY, new ImportCommand(this, false)),
+                        factory.createMenuItem(StandardActions.IMPORT_INTO_NEW_LIBRARY, new ImportCommand(this, true)),
+                        factory.createMenuItem(StandardActions.EXPORT_ALL, new ExportCommand(this, false, Globals.prefs)),
+                        factory.createMenuItem(StandardActions.EXPORT_SELECTED, new ExportCommand(this, true, Globals.prefs)),
+                        factory.createMenuItem(StandardActions.SAVE_SELECTED_AS_PLAIN_BIBTEX, new OldDatabaseCommandWrapper(Actions.SAVE_SELECTED_AS_PLAIN, this, Globals.stateManager))),
 
                 new SeparatorMenuItem(),
 
@@ -837,7 +784,7 @@ public class JabRefFrame extends BorderPane implements OutputPrinter {
                         factory.createMenuItem(StandardActions.COPY_KEY_AND_TITLE, new OldDatabaseCommandWrapper(Actions.COPY_KEY_AND_TITLE, this, Globals.stateManager)),
                         factory.createMenuItem(StandardActions.COPY_KEY_AND_LINK, new OldDatabaseCommandWrapper(Actions.COPY_KEY_AND_LINK, this, Globals.stateManager)),
                         factory.createMenuItem(StandardActions.COPY_CITATION_PREVIEW, new OldDatabaseCommandWrapper(Actions.COPY_CITATION_HTML, this, Globals.stateManager)),
-                        factory.createMenuItem(StandardActions.EXPORT_SELECTED_TO_CLIPBOARD, new OldDatabaseCommandWrapper(Actions.EXPORT_TO_CLIPBOARD, this, Globals.stateManager))),
+                        factory.createMenuItem(StandardActions.EXPORT_SELECTED_TO_CLIPBOARD, new ExportToClipboardAction(this, dialogService))),
 
                 factory.createMenuItem(StandardActions.PASTE, new EditAction(Actions.PASTE)),
 
@@ -849,78 +796,69 @@ public class JabRefFrame extends BorderPane implements OutputPrinter {
 
         );
 
-        /* TODO
         if (Globals.prefs.getBoolean(JabRefPreferences.SPECIALFIELDSENABLED)) {
-            boolean menuitem = false;
+            boolean menuItemAdded = false;
             if (Globals.prefs.getBoolean(JabRefPreferences.SHOWCOLUMN_RANKING)) {
-                rankSubMenu = new JMenu();
-                // TODO RightClickMenu.createSpecialFieldMenu(rankSubMenu, SpecialField.RANKING, this);
-                edit.add(rankSubMenu);
-                menuitem = true;
+                edit.getItems().add(SpecialFieldMenuItemFactory.createSpecialFieldMenuForActiveDatabase(SpecialField.RANKING, factory, undoManager));
+                menuItemAdded = true;
             }
+
             if (Globals.prefs.getBoolean(JabRefPreferences.SHOWCOLUMN_RELEVANCE)) {
-                edit.add(toggleRelevance);
-                menuitem = true;
+                edit.getItems().add(SpecialFieldMenuItemFactory.getSpecialFieldSingleItemForActiveDatabase(SpecialField.RELEVANCE, factory));
+                menuItemAdded = true;
             }
+
             if (Globals.prefs.getBoolean(JabRefPreferences.SHOWCOLUMN_QUALITY)) {
-                edit.add(toggleQualityAssured);
-                menuitem = true;
-            }
-            if (Globals.prefs.getBoolean(JabRefPreferences.SHOWCOLUMN_PRIORITY)) {
-                rankSubMenu = new JMenu();
-                // TODO RightClickMenu.createSpecialFieldMenu(rankSubMenu, SpecialField.PRIORITY, this);
-                edit.add(rankSubMenu);
-                menuitem = true;
+                edit.getItems().add(SpecialFieldMenuItemFactory.getSpecialFieldSingleItemForActiveDatabase(SpecialField.QUALITY, factory));
+                menuItemAdded = true;
             }
+
             if (Globals.prefs.getBoolean(JabRefPreferences.SHOWCOLUMN_PRINTED)) {
-                edit.add(togglePrinted);
-                menuitem = true;
+                edit.getItems().add(SpecialFieldMenuItemFactory.getSpecialFieldSingleItemForActiveDatabase(SpecialField.PRINTED, factory));
+                menuItemAdded = true;
             }
+
+            if (Globals.prefs.getBoolean(JabRefPreferences.SHOWCOLUMN_PRIORITY)) {
+                edit.getItems().add(SpecialFieldMenuItemFactory.createSpecialFieldMenuForActiveDatabase(SpecialField.PRIORITY, factory, undoManager));
+                menuItemAdded = true;
+            }
+
             if (Globals.prefs.getBoolean(JabRefPreferences.SHOWCOLUMN_READ)) {
-                rankSubMenu = new JMenu();
-                // TODO RightClickMenu.createSpecialFieldMenu(rankSubMenu, SpecialField.READ_STATUS, this);
-                edit.add(rankSubMenu);
-                menuitem = true;
+                edit.getItems().add(SpecialFieldMenuItemFactory.createSpecialFieldMenuForActiveDatabase(SpecialField.READ_STATUS, factory, undoManager));
+                menuItemAdded = true;
             }
-            if (menuitem) {
-                edit.addSeparator();
+
+            if (menuItemAdded) {
+                edit.getItems().add(new SeparatorMenuItem());
             }
         }
-        */
 
         edit.getItems().addAll(
                 factory.createMenuItem(StandardActions.MANAGE_KEYWORDS, new ManageKeywordsAction(this)),
                 factory.createMenuItem(StandardActions.REPLACE_ALL, new OldDatabaseCommandWrapper(Actions.REPLACE_ALL, this, Globals.stateManager)),
-                factory.createMenuItem(StandardActions.MASS_SET_FIELDS, new MassSetFieldAction(this))
+                factory.createMenuItem(StandardActions.MASS_SET_FIELDS, new MassSetFieldsAction(this))
 
         );
 
         library.getItems().addAll(
-                factory.createMenuItem(StandardActions.NEW_ARTICLE, new NewEntryAction(this, BibtexEntryTypes.ARTICLE)),
-                factory.createMenuItem(StandardActions.NEW_ENTRY, new NewEntryAction(this)),
-                factory.createMenuItem(StandardActions.NEW_ENTRY_FROM_PLAINTEX, new NewEntryFromPlainTextAction(this, Globals.prefs.getUpdateFieldPreferences())),
+                factory.createMenuItem(StandardActions.NEW_ARTICLE, new NewEntryAction(this, BibtexEntryTypes.ARTICLE, dialogService, Globals.prefs)),
+                factory.createMenuItem(StandardActions.NEW_ENTRY, new NewEntryAction(this, dialogService, Globals.prefs)),
+                factory.createMenuItem(StandardActions.NEW_ENTRY_FROM_PLAINTEX, new NewEntryFromPlainTextAction(this, Globals.prefs.getUpdateFieldPreferences(), dialogService, Globals.prefs)),
 
                 new SeparatorMenuItem(),
 
-<<<<<<< HEAD
-
-                factory.createMenuItem(StandardActions.DELETE_ENTRY, new EditAction(Actions.DELETE)),
-=======
                 factory.createMenuItem(StandardActions.DELETE_ENTRY, new OldDatabaseCommandWrapper(Actions.DELETE, this, Globals.stateManager)),
->>>>>>> upstream/maintable-beta
 
                 new SeparatorMenuItem(),
 
-                factory.createMenuItem(StandardActions.LIBRARY_PROPERTIES, new LibraryPropertiesAction(this)),
+                factory.createMenuItem(StandardActions.LIBRARY_PROPERTIES, new DatabasePropertiesAction(this)),
+                factory.createMenuItem(StandardActions.EDIT_PREAMBLE, new PreambleEditor(this)),
 <<<<<<< HEAD
-                factory.createMenuItem(StandardActions.EDIT_PREAMBLE, new OldDatabaseCommandWrapper(Actions.EDIT_PREAMBLE, this, Globals.stateManager)),
+                                  factory.createMenuItem(StandardActions.EDIT_STRINGS, new StringAction(this))
 
-                factory.createMenuItem(StandardActions.EDIT_STRINGS, new StringAction())
 =======
-                factory.createMenuItem(StandardActions.EDIT_PREAMBLE, new PreambleEditor(this)),
                 factory.createMenuItem(StandardActions.EDIT_STRINGS, new OldDatabaseCommandWrapper(Actions.EDIT_STRINGS, this, Globals.stateManager))
->>>>>>> upstream/maintable-beta
-
+>>>>>>> upstream/master
         );
 
         Menu lookupIdentifiers = factory.createSubMenu(StandardActions.LOOKUP_DOC_IDENTIFIER);
@@ -938,7 +876,7 @@ public class JabRefFrame extends BorderPane implements OutputPrinter {
                 factory.createMenuItem(StandardActions.RESOLVE_DUPLICATE_KEYS, new OldDatabaseCommandWrapper(Actions.RESOLVE_DUPLICATE_KEYS, this, Globals.stateManager)),
                 factory.createMenuItem(StandardActions.CHECK_INTEGRITY, new IntegrityCheckAction(this)),
                 factory.createMenuItem(StandardActions.CLEANUP_ENTRIES, new OldDatabaseCommandWrapper(Actions.CLEANUP, this, Globals.stateManager)),
-                factory.createMenuItem(StandardActions.GENERATE_CITE_KEY, new OldDatabaseCommandWrapper(Actions.MAKE_KEY, this, Globals.stateManager)),
+                factory.createMenuItem(StandardActions.GENERATE_CITE_KEYS, new OldDatabaseCommandWrapper(Actions.MAKE_KEY, this, Globals.stateManager)),
 
                 new SeparatorMenuItem(),
 
@@ -946,7 +884,6 @@ public class JabRefFrame extends BorderPane implements OutputPrinter {
                 factory.createMenuItem(StandardActions.FIND_UNLINKED_FILES, new FindUnlinkedFilesAction(this)),
                 lookupIdentifiers,
                 factory.createMenuItem(StandardActions.DOWNLOAD_FULL_TEXT, new OldDatabaseCommandWrapper(Actions.DOWNLOAD_FULL_TEXT, this, Globals.stateManager))
-
         );
 
         SidePaneComponent webSearch = sidePaneManager.getComponent(SidePaneType.WEB_SEARCH);
@@ -968,7 +905,6 @@ public class JabRefFrame extends BorderPane implements OutputPrinter {
 
                 factory.createMenuItem(StandardActions.NEXT_PREVIEW_STYLE, new OldDatabaseCommandWrapper(Actions.NEXT_PREVIEW_STYLE, this, Globals.stateManager)),
                 factory.createMenuItem(StandardActions.PREVIOUS_PREVIEW_STYLE, new OldDatabaseCommandWrapper(Actions.PREVIOUS_PREVIEW_STYLE, this, Globals.stateManager))
-
         );
 
         PushToApplicationButton pushToExternal = new PushToApplicationButton(this, pushApplications.getApplications());
@@ -994,7 +930,6 @@ public class JabRefFrame extends BorderPane implements OutputPrinter {
                 factory.createMenuItem(StandardActions.ABBREVIATE_ISO, new OldDatabaseCommandWrapper(Actions.ABBREVIATE_ISO, this, Globals.stateManager)),
                 factory.createMenuItem(StandardActions.ABBREVIATE_MEDLINE, new OldDatabaseCommandWrapper(Actions.ABBREVIATE_MEDLINE, this, Globals.stateManager)),
                 factory.createMenuItem(StandardActions.UNABBREVIATE, new OldDatabaseCommandWrapper(Actions.UNABBREVIATE, this, Globals.stateManager))
-
         );
 
         options.getItems().addAll(
@@ -1002,9 +937,9 @@ public class JabRefFrame extends BorderPane implements OutputPrinter {
 
                 new SeparatorMenuItem(),
 
-                factory.createMenuItem(StandardActions.SETUP_GENERAL_FIELDS, new SetupGeneralFieldsAction(this)),
+                factory.createMenuItem(StandardActions.SETUP_GENERAL_FIELDS, new SetupGeneralFieldsAction()),
                 factory.createMenuItem(StandardActions.MANAGE_CUSTOM_IMPORTS, new ManageCustomImportsAction(this)),
-                factory.createMenuItem(StandardActions.MANAGE_CUSTOM_EXPORTS, new ManageCustomExportsAction(this)),
+                factory.createMenuItem(StandardActions.MANAGE_CUSTOM_EXPORTS, new ManageCustomExportsAction()),
                 factory.createMenuItem(StandardActions.MANAGE_EXTERNAL_FILETYPES, new EditExternalFileTypesAction()),
                 factory.createMenuItem(StandardActions.MANAGE_JOURNALS, new ManageJournalsAction()),
                 factory.createMenuItem(StandardActions.CUSTOMIZE_KEYBINDING, new CustomizeKeyBindingAction()),
@@ -1015,11 +950,10 @@ public class JabRefFrame extends BorderPane implements OutputPrinter {
                 factory.createMenuItem(StandardActions.MANAGE_CONTENT_SELECTORS, new OldDatabaseCommandWrapper(Actions.MANAGE_SELECTORS, this, Globals.stateManager)),
                 factory.createMenuItem(StandardActions.CUSTOMIZE_ENTRY_TYPES, new CustomizeEntryAction(this)),
                 factory.createMenuItem(StandardActions.MANAGE_CITE_KEY_PATTERNS, new BibtexKeyPatternAction(this))
-
         );
 
         help.getItems().addAll(
-                factory.createMenuItem(StandardActions.HELP, HelpAction.getCommand()),
+                factory.createMenuItem(StandardActions.HELP, HelpAction.getMainHelpPageCommand()),
                 factory.createMenuItem(StandardActions.OPEN_FORUM, new OpenBrowserAction("http://discourse.jabref.org/")),
 
                 new SeparatorMenuItem(),
@@ -1028,7 +962,7 @@ public class JabRefFrame extends BorderPane implements OutputPrinter {
 
                 new SeparatorMenuItem(),
 
-                factory.createMenuItem(StandardActions.SEARCH_FOR_UPDATES, new SearchForUpdateAction()),
+                factory.createMenuItem(StandardActions.SEARCH_FOR_UPDATES, new SearchForUpdateAction(Globals.BUILD_INFO, prefs.getVersionPreferences(), dialogService, Globals.TASK_EXECUTOR)),
                 factory.createSubMenu(StandardActions.WEB_MENU,
                         factory.createMenuItem(StandardActions.OPEN_WEBPAGE, new OpenBrowserAction("https://jabref.org/")),
                         factory.createMenuItem(StandardActions.OPEN_BLOG, new OpenBrowserAction("https://blog.jabref.org/")),
@@ -1047,7 +981,6 @@ public class JabRefFrame extends BorderPane implements OutputPrinter {
 
                 ),
                 factory.createMenuItem(StandardActions.ABOUT, new AboutAction())
-
         );
 
         MenuBar menu = new MenuBar();
@@ -1079,8 +1012,8 @@ public class JabRefFrame extends BorderPane implements OutputPrinter {
         } else {
             // only add tab if DB is not already open
             Optional<BasePanel> panel = getBasePanelList().stream()
-                    .filter(p -> p.getBibDatabaseContext().getDatabaseFile().equals(pr.getFile()))
-                    .findFirst();
+                                                          .filter(p -> p.getBibDatabaseContext().getDatabasePath().equals(pr.getFile()))
+                                                          .findFirst();
 
             if (panel.isPresent()) {
                 tabbedPane.getSelectionModel().select(getTab(panel.get()));
@@ -1091,13 +1024,13 @@ public class JabRefFrame extends BorderPane implements OutputPrinter {
     }
 
     /**
-     * displays the String on the Status Line visible on the bottom of the JabRef mainframe
+     * Displays the given message at the bottom of the main frame
+     *
+     * @deprecated use {@link DialogService#notify(String)} instead. However, do not remove this method, it's called from the dialogService
      */
-    public void output(final String s) {
-        SwingUtilities.invokeLater(() -> {
-            statusLine.setText(s);
-            statusLine.repaint();
-        });
+    @Deprecated
+    public void output(final String message) {
+        DefaultTaskExecutor.runInJavaFXThread(() -> statusLine.fireEvent(new SnackbarEvent(new JFXSnackbarLayout(message), TOAST_MESSAGE_DISPLAY_TIME, null)));
     }
 
     private void initActions() {
@@ -1179,9 +1112,8 @@ public class JabRefFrame extends BorderPane implements OutputPrinter {
     }
 
     /**
-     * This method causes all open BasePanels to set up their tables
-     * anew. When called from PrefsDialog3, this updates to the new
-     * settings.
+     * This method causes all open BasePanels to set up their tables anew. When called from PrefsDialog3, this updates
+     * to the new settings.
      */
     public void setupAllTables() {
         // This action can be invoked without an open database, so
@@ -1279,7 +1211,7 @@ public class JabRefFrame extends BorderPane implements OutputPrinter {
     private void trackOpenNewDatabase(BasePanel basePanel) {
         Map<String, String> properties = new HashMap<>();
         Map<String, Double> measurements = new HashMap<>();
-        measurements.put("NumberOfEntries", (double) basePanel.getDatabaseContext().getDatabase().getEntryCount());
+        measurements.put("NumberOfEntries", (double) basePanel.getBibDatabaseContext().getDatabase().getEntryCount());
 
         Globals.getTelemetryClient().ifPresent(client -> client.trackEvent("OpenNewDatabase", properties, measurements));
     }
@@ -1294,16 +1226,17 @@ public class JabRefFrame extends BorderPane implements OutputPrinter {
 
     private boolean readyForAutosave(BibDatabaseContext context) {
         return ((context.getLocation() == DatabaseLocation.SHARED) ||
-                ((context.getLocation() == DatabaseLocation.LOCAL) && Globals.prefs.getBoolean(JabRefPreferences.LOCAL_AUTO_SAVE))) &&
+                ((context.getLocation() == DatabaseLocation.LOCAL) && Globals.prefs.getBoolean(JabRefPreferences.LOCAL_AUTO_SAVE)))
+                &&
                 context.getDatabaseFile().isPresent();
     }
 
     /**
-     * This method does the job of adding imported entries into the active
-     * database, or into a new one. It shows the ImportInspectionDialog if
-     * preferences indicate it should be used. Otherwise it imports directly.
-     *  @param panel     The BasePanel to add to.
-     * @param entries   The entries to add.
+     * This method does the job of adding imported entries into the active database, or into a new one. It shows the
+     * ImportInspectionDialog if preferences indicate it should be used. Otherwise it imports directly.
+     *
+     * @param panel   The BasePanel to add to.
+     * @param entries The entries to add.
      */
     private void addImportedEntries(final BasePanel panel, final List<BibEntry> entries) {
         SwingUtilities.invokeLater(() -> {
@@ -1321,72 +1254,35 @@ public class JabRefFrame extends BorderPane implements OutputPrinter {
     }
 
     /**
-     * Set the visibility of the progress bar in the right end of the
-     * status line at the bottom of the frame.
-     * <p>
-     * If not called on the event dispatch thread, this method uses
-     * SwingUtilities.invokeLater() to do the actual operation on the EDT.
+     * Set the visibility of the progress bar in the right end of the status line at the bottom of the frame.
      */
     public void setProgressBarVisible(final boolean visible) {
-        if (SwingUtilities.isEventDispatchThread()) {
-            progressBar.setVisible(visible);
-        } else {
-            SwingUtilities.invokeLater(() -> progressBar.setVisible(visible));
-        }
-    }
-
-    /**
-     * Sets the current value of the progress bar.
-     * <p>
-     * If not called on the event dispatch thread, this method uses
-     * SwingUtilities.invokeLater() to do the actual operation on the EDT.
-     */
-    public void setProgressBarValue(final int value) {
-        if (SwingUtilities.isEventDispatchThread()) {
-            progressBar.setValue(value);
-        } else {
-            SwingUtilities.invokeLater(() -> progressBar.setValue(value));
-        }
-
+        progressBar.setVisible(visible);
     }
 
     /**
      * Sets the indeterminate status of the progress bar.
      * <p>
-     * If not called on the event dispatch thread, this method uses
-     * SwingUtilities.invokeLater() to do the actual operation on the EDT.
+     * If not called on the event dispatch thread, this method uses SwingUtilities.invokeLater() to do the actual
+     * operation on the EDT.
      */
     public void setProgressBarIndeterminate(final boolean value) {
+        // TODO: Reimplement
+        /*
         if (SwingUtilities.isEventDispatchThread()) {
             progressBar.setIndeterminate(value);
         } else {
             SwingUtilities.invokeLater(() -> progressBar.setIndeterminate(value));
         }
-
-    }
-
-    /**
-     * Sets the maximum value of the progress bar. Always call this method
-     * before using the progress bar, to set a maximum value appropriate to
-     * the task at hand.
-     * <p>
-     * If not called on the event dispatch thread, this method uses
-     * SwingUtilities.invokeLater() to do the actual operation on the EDT.
-     */
-    public void setProgressBarMaximum(final int value) {
-        if (SwingUtilities.isEventDispatchThread()) {
-            progressBar.setMaximum(value);
-        } else {
-            SwingUtilities.invokeLater(() -> progressBar.setMaximum(value));
-        }
-
+        */
     }
 
     /**
      * Return a boolean, if the selected entry have file
+     *
      * @param selectEntryList A selected entries list of the current base pane
-     * @return true, if the selected entry contains file.
-     * false, if multiple entries are selected or the selected entry doesn't contains file
+     * @return true, if the selected entry contains file. false, if multiple entries are selected or the selected entry
+     * doesn't contains file
      */
     private boolean isExistFile(List<BibEntry> selectEntryList) {
         if (selectEntryList.size() == 1) {
@@ -1398,9 +1294,10 @@ public class JabRefFrame extends BorderPane implements OutputPrinter {
 
     /**
      * Return a boolean, if the selected entry have url or doi
+     *
      * @param selectEntryList A selected entries list of the current base pane
-     * @return true, if the selected entry contains url or doi.
-     * false, if multiple entries are selected or the selected entry doesn't contains url or doi
+     * @return true, if the selected entry contains url or doi. false, if multiple entries are selected or the selected
+     * entry doesn't contains url or doi
      */
     private boolean isExistURLorDOI(List<BibEntry> selectEntryList) {
         if (selectEntryList.size() == 1) {
@@ -1425,23 +1322,43 @@ public class JabRefFrame extends BorderPane implements OutputPrinter {
         JOptionPane.showMessageDialog(null, message);
     }
 
-    private int showSaveDialog(String filename) {
-        Object[] options = {Localization.lang("Save changes"),
-                Localization.lang("Discard changes"),
-                Localization.lang("Return to JabRef")};
-
-        return JOptionPane.showOptionDialog(null,
+    /**
+     * Ask if the user really wants to close the given database
+     *
+     * @return true if the user choose to close the database
+     */
+    private boolean confirmClose(BasePanel panel) {
+        String filename = panel.getBibDatabaseContext()
+                               .getDatabasePath()
+                               .map(Path::toAbsolutePath)
+                               .map(Path::toString)
+                               .orElse(GUIGlobals.UNTITLED_TITLE);
+
+        ButtonType saveChanges = new ButtonType(Localization.lang("Save changes"), ButtonBar.ButtonData.YES);
+        ButtonType discardChanges = new ButtonType(Localization.lang("Discard changes"), ButtonBar.ButtonData.NO);
+        ButtonType cancel = new ButtonType(Localization.lang("Return to JabRef"), ButtonBar.ButtonData.CANCEL_CLOSE);
+
+        Optional<ButtonType> response = dialogService.showCustomButtonDialogAndWait(Alert.AlertType.CONFIRMATION,
+                Localization.lang("Save before closing"),
                 Localization.lang("Library '%0' has changed.", filename),
-                Localization.lang("Save before closing"), JOptionPane.YES_NO_CANCEL_OPTION,
-                JOptionPane.WARNING_MESSAGE, null, options, options[2]);
-    }
+                saveChanges, discardChanges, cancel);
 
-    private void closeTab(Tab tab) {
-        closeTab(getBasePanel(tab));
-    }
-
-    private BasePanel getBasePanel(Tab tab) {
-        return (BasePanel) tab.getContent();
+        if (response.isPresent() && response.get().equals(saveChanges)) {
+            // The user wants to save.
+            try {
+                SaveDatabaseAction saveAction = new SaveDatabaseAction(panel, Globals.prefs);
+                if (!saveAction.save()) {
+                    // The action was either canceled or unsuccessful.
+                    output(Localization.lang("Unable to save library"));
+                    return false;
+                }
+            } catch (Throwable ex) {
+                return false;
+            }
+        } else {
+            return !response.isPresent() || !response.get().equals(cancel);
+        }
+        return false;
     }
 
     private void closeTab(BasePanel panel) {
@@ -1468,35 +1385,6 @@ public class JabRefFrame extends BorderPane implements OutputPrinter {
         BackupManager.shutdown(context);
     }
 
-    // Ask if the user really wants to close, if the base has not been saved
-    private boolean confirmClose(BasePanel panel) {
-        boolean close = false;
-        String filename;
-
-        filename = panel.getBibDatabaseContext()
-                .getDatabaseFile()
-                .map(File::getAbsolutePath)
-                .orElse(GUIGlobals.UNTITLED_TITLE);
-
-        int answer = showSaveDialog(filename);
-        if (answer == JOptionPane.YES_OPTION) {
-            // The user wants to save.
-            try {
-                SaveDatabaseAction saveAction = new SaveDatabaseAction(panel);
-                saveAction.runCommand();
-                if (saveAction.isSuccess()) {
-                    close = true;
-                }
-            } catch (Throwable ex) {
-                // do not close
-            }
-        } else if (answer == JOptionPane.NO_OPTION) {
-            // discard changes
-            close = true;
-        }
-        return close;
-    }
-
     private void removeTab(BasePanel panel) {
         DefaultTaskExecutor.runInJavaFXThread(() -> {
             panel.cleanUp();
@@ -1516,10 +1404,6 @@ public class JabRefFrame extends BorderPane implements OutputPrinter {
         return new OpenDatabaseAction(this);
     }
 
-    public String getStatusLineText() {
-        return statusLine.getText();
-    }
-
     public SidePaneManager getSidePaneManager() {
         return sidePaneManager;
     }
@@ -1540,72 +1424,6 @@ public class JabRefFrame extends BorderPane implements OutputPrinter {
         return dialogService;
     }
 
-    private class GeneralAction extends MnemonicAwareAction {
-
-        private final Actions command;
-
-        public GeneralAction(Actions command, String text) {
-            this.command = command;
-            putValue(Action.NAME, text);
-        }
-
-        public GeneralAction(Actions command, String text, String description) {
-            this.command = command;
-            putValue(Action.NAME, text);
-            putValue(Action.SHORT_DESCRIPTION, description);
-        }
-
-        public GeneralAction(Actions command, String text, Icon icon) {
-            super(icon);
-
-            this.command = command;
-            putValue(Action.NAME, text);
-        }
-
-        public GeneralAction(Actions command, String text, String description, Icon icon) {
-            super(icon);
-
-            this.command = command;
-            putValue(Action.NAME, text);
-            putValue(Action.SHORT_DESCRIPTION, description);
-        }
-
-        public GeneralAction(Actions command, String text, KeyStroke key) {
-            this.command = command;
-            putValue(Action.NAME, text);
-            putValue(Action.ACCELERATOR_KEY, key);
-        }
-
-        public GeneralAction(Actions command, String text, String description, KeyStroke key) {
-            this.command = command;
-            putValue(Action.NAME, text);
-            putValue(Action.SHORT_DESCRIPTION, description);
-            putValue(Action.ACCELERATOR_KEY, key);
-        }
-
-        public GeneralAction(Actions command, String text, String description, KeyStroke key, Icon icon) {
-            super(icon);
-
-            this.command = command;
-            putValue(Action.NAME, text);
-            putValue(Action.SHORT_DESCRIPTION, description);
-            putValue(Action.ACCELERATOR_KEY, key);
-        }
-
-        @Override
-        public void actionPerformed(ActionEvent e) {
-            if (tabbedPane.getTabs().size() > 0) {
-                try {
-                    getCurrentBasePanel().runCommand(command);
-                } catch (Throwable ex) {
-                    LOGGER.error("Problem with executing command: " + command, ex);
-                }
-            } else {
-                LOGGER.info("Action '" + command + "' must be disabled when no database is open.");
-            }
-        }
-    }
-
     /**
      * The action concerned with closing the window.
      */
@@ -1614,14 +1432,12 @@ public class JabRefFrame extends BorderPane implements OutputPrinter {
         @Override
         public void execute() {
             quit();
-            Platform.exit();
         }
     }
 
     /**
-     * Class for handling general actions; cut, copy and paste. The focused component is
-     * kept track of by Globals.focusListener, and we call the action stored under the
-     * relevant name in its action map.
+     * Class for handling general actions; cut, copy and paste. The focused component is kept track of by
+     * Globals.focusListener, and we call the action stored under the relevant name in its action map.
      */
     private class EditAction extends SimpleCommand {
 
@@ -1633,11 +1449,40 @@ public class JabRefFrame extends BorderPane implements OutputPrinter {
 
         @Override
         public void execute() {
-            LOGGER.debug(Globals.getFocusListener().getFocused().toString());
-            JComponent source = Globals.getFocusListener().getFocused();
-            Action action = source.getActionMap().get(command);
-            if (action != null) {
-                action.actionPerformed(new ActionEvent(source, 0, command.name()));
+            Node focusOwner = mainStage.getScene().getFocusOwner();
+            if (focusOwner != null) {
+                if (focusOwner instanceof TextInputControl) {
+                    // Focus is on text field -> copy/paste/cut selected text
+                    TextInputControl textInput = (TextInputControl) focusOwner;
+                    switch (command) {
+                        case COPY:
+                            textInput.copy();
+                            break;
+                        case CUT:
+                            textInput.cut();
+                            break;
+                        case PASTE:
+                            textInput.paste();
+                            break;
+                        default:
+                            throw new IllegalStateException("Only cut/copy/paste supported but got " + command);
+                    }
+                } else {
+                    // Not sure what is selected -> copy/paste/cut selected entries
+                    switch (command) {
+                        case COPY:
+                            getCurrentBasePanel().copy();
+                            break;
+                        case CUT:
+                            getCurrentBasePanel().cut();
+                            break;
+                        case PASTE:
+                            getCurrentBasePanel().paste();
+                            break;
+                        default:
+                            throw new IllegalStateException("Only cut/copy/paste supported but got " + command);
+                    }
+                }
             }
         }
     }
diff --git a/src/main/java/org/jabref/gui/strings/StringDialog.fxml b/src/main/java/org/jabref/gui/strings/StringDialog.fxml
index 73baa01a612..f742cfb1c34 100644
--- a/src/main/java/org/jabref/gui/strings/StringDialog.fxml
+++ b/src/main/java/org/jabref/gui/strings/StringDialog.fxml
@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ButtonType?>
 <?import javafx.scene.control.DialogPane?>
+<?import javafx.scene.control.Label?>
 <?import javafx.scene.control.Separator?>
 <?import javafx.scene.control.TableColumn?>
 <?import javafx.scene.control.TableView?>
+<?import javafx.scene.control.TextField?>
 <?import javafx.scene.control.ToolBar?>
-<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
 
-<DialogPane xmlns="http://javafx.com/javafx/8.0.141" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.strings.StringDialogView">
+<DialogPane prefHeight="340.0" prefWidth="427.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.strings.StringDialogView">
    <header>
       <ToolBar prefHeight="40.0" prefWidth="299.0">
         <items>
-          <Button fx:id="btnNewString" mnemonicParsing="false" onAction="#addString" />
             <Button fx:id="btnRemove" mnemonicParsing="false" onAction="#removeString" />
             <Separator orientation="VERTICAL" prefHeight="200.0" />
             <Button fx:id="btnHelp" mnemonicParsing="false" onAction="#openHelp" />
@@ -20,18 +23,29 @@
       </ToolBar>
    </header>
    <content>
-      <BorderPane>
-         <center>
+      <VBox>
+         <children>
             <TableView fx:id="tblStrings" prefHeight="250.0" prefWidth="0.0">
               <columns>
-                <TableColumn fx:id="colLabel" prefWidth="75.0" text="Label" />
-                <TableColumn fx:id="colContent" prefWidth="75.0" text="Content" />
+                <TableColumn fx:id="colLabel" prefWidth="75.0" text="%Label" />
+                <TableColumn fx:id="colContent" prefWidth="75.0" text="%Content" />
               </columns>
                <columnResizePolicy>
                   <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
                </columnResizePolicy>
             </TableView>
-         </center>
-      </BorderPane>
+            <HBox prefHeight="100.0" prefWidth="200.0">
+               <children>
+                  <Label text="%Label" />
+                  <TextField fx:id="stringLabel" />
+                <Button fx:id="btnNewString" mnemonicParsing="false" onAction="#addString" />
+               </children>
+            </HBox>
+         </children>
+      </VBox>
    </content>
+   <buttonTypes>
+     <ButtonType fx:constant="CANCEL" />
+     <ButtonType fx:id="saveButton" buttonData="OK_DONE" text="%Save" />
+   </buttonTypes>
 </DialogPane>
diff --git a/src/main/java/org/jabref/gui/strings/StringDialogView.java b/src/main/java/org/jabref/gui/strings/StringDialogView.java
index aab3e0e9cdf..cd2c22c1501 100644
--- a/src/main/java/org/jabref/gui/strings/StringDialogView.java
+++ b/src/main/java/org/jabref/gui/strings/StringDialogView.java
@@ -3,11 +3,11 @@
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
-import javafx.scene.control.ButtonBar.ButtonData;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableColumn.CellEditEvent;
 import javafx.scene.control.TableView;
+import javafx.scene.control.TextField;
 import javafx.scene.control.Tooltip;
 import javafx.scene.control.cell.TextFieldTableCell;
 import javafx.util.converter.DefaultStringConverter;
@@ -28,29 +28,37 @@ public class StringDialogView extends BaseDialog<Void> {
     @FXML private Button btnNewString;
     @FXML private Button btnRemove;
     @FXML private Button btnHelp;
-    @FXML private Button btnCancel;
-    @FXML private Button btnSave;
+    @FXML private ButtonType saveButton;
+
+    @FXML private TextField stringLabel;
     @FXML private TableView<StringViewModel> tblStrings;
     @FXML private TableColumn<StringViewModel, String> colLabel;
     @FXML private TableColumn<StringViewModel, String> colContent;
 
     private final ControlsFxVisualizer visualizer = new ControlsFxVisualizer();
-    private final StringDialogViewModel viewModel;
+    private StringDialogViewModel viewModel;
+    private BibDatabase database;
 
     public StringDialogView(BibDatabase database) {
-        viewModel = new StringDialogViewModel(database);
+        this.database = database;
 
-        ButtonType save = new ButtonType("Save", ButtonData.OK_DONE);
-        this.getDialogPane().getButtonTypes().addAll(save);
+        setResultConverter(btn -> {
+            if (btn == ButtonType.OK) {
+                viewModel.save();
 
+            }
+            return null;
+        });
         ViewLoader.view(this)
                   .load()
                   .setAsContent(this.getDialogPane());
+
     }
 
     @FXML
     private void initialize() {
         visualizer.setDecoration(new IconValidationDecorator());
+        viewModel = new StringDialogViewModel(database);
 
         btnHelp.setGraphic(JabRefIcons.HELP.getGraphicNode());
         btnHelp.setTooltip(new Tooltip(Localization.lang("Open Help page")));
@@ -61,7 +69,6 @@ private void initialize() {
         btnRemove.setGraphic(JabRefIcons.REMOVE.getGraphicNode());
         btnRemove.setTooltip(new Tooltip(Localization.lang("Remove string")));
 
-
         colLabel.setCellValueFactory(cellData -> cellData.getValue().getLabel());
         colLabel.setCellFactory(column -> new TextFieldTableCell<StringViewModel, String>(new DefaultStringConverter()) {
 
@@ -105,15 +112,17 @@ public void updateItem(String item, boolean empty) {
         });
 
         colLabel.setOnEditCommit((CellEditEvent<StringViewModel, String> cell) -> {
-                                     cell.getRowValue().setLabel(cell.getNewValue());
-                                 });
+            cell.getRowValue().setLabel(cell.getNewValue());
+        });
         colContent.setOnEditCommit((CellEditEvent<StringViewModel, String> cell) -> {
-                                       cell.getRowValue().setContent(cell.getNewValue());
-                                   });
+            cell.getRowValue().setContent(cell.getNewValue());
+        });
 
         tblStrings.itemsProperty().bindBidirectional(viewModel.allStringsProperty());
         tblStrings.setEditable(true);
 
+        viewModel.seletedItemProperty().bind(tblStrings.getSelectionModel().selectedItemProperty());
+        viewModel.newStringLabelProperty().bindBidirectional(stringLabel.textProperty());
     }
 
     @FXML
@@ -128,12 +137,7 @@ private void openHelp(ActionEvent event) {
 
     @FXML
     private void removeString(ActionEvent event) {
-        StringViewModel selected = tblStrings.getSelectionModel().getSelectedItem();
-        viewModel.removeString(selected);
+        viewModel.removeString();
     }
 
-    @FXML
-    private void save() {
-        viewModel.save();
-    }
 }
diff --git a/src/main/java/org/jabref/gui/strings/StringDialogViewModel.java b/src/main/java/org/jabref/gui/strings/StringDialogViewModel.java
index 2f30b10aeff..a2d6cf2f4d7 100644
--- a/src/main/java/org/jabref/gui/strings/StringDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/strings/StringDialogViewModel.java
@@ -5,7 +5,11 @@
 import java.util.stream.Collectors;
 
 import javafx.beans.property.ListProperty;
+import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleListProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
 
 import org.jabref.gui.AbstractViewModel;
@@ -16,7 +20,8 @@
 public class StringDialogViewModel extends AbstractViewModel {
 
     private final ListProperty<StringViewModel> allStrings = new SimpleListProperty<>(FXCollections.observableArrayList());
-
+    private final ObjectProperty<StringViewModel> selectedItemProperty = new SimpleObjectProperty<>();
+    private final StringProperty newStringLabelProperty = new SimpleStringProperty("");
     private final BibDatabase db;
 
     public StringDialogViewModel(BibDatabase bibDatabase) {
@@ -27,11 +32,11 @@ public StringDialogViewModel(BibDatabase bibDatabase) {
     private void addAllStringsFromDB() {
 
         Set<StringViewModel> strings = db.getStringKeySet()
-                .stream()
-                .map(string -> db.getString(string))
-                .sorted(new BibtexStringComparator(false))
-                .map(this::convertFromBibTexString)
-                .collect(Collectors.toSet());
+                                         .stream()
+                                         .map(string -> db.getString(string))
+                                         .sorted(new BibtexStringComparator(false))
+                                         .map(this::convertFromBibTexString)
+                                         .collect(Collectors.toSet());
         allStrings.addAll(strings);
     }
 
@@ -40,11 +45,11 @@ public ListProperty<StringViewModel> allStringsProperty() {
     }
 
     public void addNewString() {
-        allStrings.add(new StringViewModel("new Label", "New Content"));
+        allStrings.add(new StringViewModel(newStringLabelProperty.getValue(), "New Content"));
     }
 
-    public void removeString(StringViewModel selected) {
-        allStrings.remove(selected);
+    public void removeString() {
+        allStrings.remove(selectedItemProperty.getValue());
     }
 
     private StringViewModel convertFromBibTexString(BibtexString bibtexString) {
@@ -52,6 +57,14 @@ private StringViewModel convertFromBibTexString(BibtexString bibtexString) {
 
     }
 
+    public ObjectProperty<StringViewModel> seletedItemProperty() {
+        return this.selectedItemProperty;
+    }
+
+    public StringProperty newStringLabelProperty() {
+        return this.newStringLabelProperty;
+    }
+
     public void save() {
         for (StringViewModel model : allStrings) {
             String label = model.getLabel().getValue();
diff --git a/src/main/java/org/jabref/gui/strings/StringViewModel.java b/src/main/java/org/jabref/gui/strings/StringViewModel.java
index 89f18729660..35f73f7c1dc 100644
--- a/src/main/java/org/jabref/gui/strings/StringViewModel.java
+++ b/src/main/java/org/jabref/gui/strings/StringViewModel.java
@@ -23,7 +23,7 @@ public class StringViewModel {
             System.out.println("Null checker");
             return ValidationMessage.error("May not be null2");
         } else if (input.trim().isEmpty()) {
-            System.out.println("Should not empty");
+            System.out.println("Should not be empty");
             return ValidationMessage.error("Should not be empty");
         } else {
             return null; // everything is ok

From db5debd9f500d6b06a811917dee7f585e2c18152 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Sun, 20 Jan 2019 16:37:34 +0100
Subject: [PATCH 12/28] fix l10n

---
 src/main/resources/l10n/JabRef_en.properties | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 7a6a4a740de..baaca4e3b4d 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -2236,3 +2236,5 @@ Main\ layout\ file=Main layout file
 Save\ exporter=Save exporter
 File\ extension\:=File extension\:
 Export\ format\ name\:=Export format name\:
+
+Open\ Help\ page=Open Help page

From 4101f76b0022add42fabfb6c08e96b265c9eae61 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Mon, 21 Jan 2019 17:41:06 +0100
Subject: [PATCH 13/28] fix loading of string dialog

---
 .../jabref/gui/strings/StringDialogView.java    | 17 ++++++++++-------
 .../gui/strings/StringDialogViewModel.java      | 12 ++++++++++--
 .../org/jabref/gui/strings/StringViewModel.java |  8 ++++++++
 3 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/jabref/gui/strings/StringDialogView.java b/src/main/java/org/jabref/gui/strings/StringDialogView.java
index cd2c22c1501..f67e0d855d9 100644
--- a/src/main/java/org/jabref/gui/strings/StringDialogView.java
+++ b/src/main/java/org/jabref/gui/strings/StringDialogView.java
@@ -37,28 +37,31 @@ public class StringDialogView extends BaseDialog<Void> {
 
     private final ControlsFxVisualizer visualizer = new ControlsFxVisualizer();
     private StringDialogViewModel viewModel;
-    private BibDatabase database;
 
     public StringDialogView(BibDatabase database) {
-        this.database = database;
+        viewModel = new StringDialogViewModel(database);
+
+        ViewLoader.view(this)
+                  .load()
+                  .setAsDialogPane(this);
+
+        Button btnSave = (Button) this.getDialogPane().lookupButton(saveButton);
+
+        btnSave.disableProperty().bind(viewModel.formValidation().validProperty().not());
 
         setResultConverter(btn -> {
-            if (btn == ButtonType.OK) {
+            if (saveButton.equals(btn)) {
                 viewModel.save();
 
             }
             return null;
         });
-        ViewLoader.view(this)
-                  .load()
-                  .setAsContent(this.getDialogPane());
 
     }
 
     @FXML
     private void initialize() {
         visualizer.setDecoration(new IconValidationDecorator());
-        viewModel = new StringDialogViewModel(database);
 
         btnHelp.setGraphic(JabRefIcons.HELP.getGraphicNode());
         btnHelp.setTooltip(new Tooltip(Localization.lang("Open Help page")));
diff --git a/src/main/java/org/jabref/gui/strings/StringDialogViewModel.java b/src/main/java/org/jabref/gui/strings/StringDialogViewModel.java
index a2d6cf2f4d7..07ccc758291 100644
--- a/src/main/java/org/jabref/gui/strings/StringDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/strings/StringDialogViewModel.java
@@ -11,22 +11,26 @@
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
-
 import org.jabref.gui.AbstractViewModel;
 import org.jabref.logic.bibtex.comparator.BibtexStringComparator;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibtexString;
 
+import de.saxsys.mvvmfx.utils.validation.CompositeValidator;
+import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
+
 public class StringDialogViewModel extends AbstractViewModel {
 
     private final ListProperty<StringViewModel> allStrings = new SimpleListProperty<>(FXCollections.observableArrayList());
     private final ObjectProperty<StringViewModel> selectedItemProperty = new SimpleObjectProperty<>();
     private final StringProperty newStringLabelProperty = new SimpleStringProperty("");
     private final BibDatabase db;
+    private final CompositeValidator formValidator = new CompositeValidator();
 
     public StringDialogViewModel(BibDatabase bibDatabase) {
         this.db = bibDatabase;
         addAllStringsFromDB();
+
     }
 
     private void addAllStringsFromDB() {
@@ -38,6 +42,7 @@ private void addAllStringsFromDB() {
                                          .map(this::convertFromBibTexString)
                                          .collect(Collectors.toSet());
         allStrings.addAll(strings);
+
     }
 
     public ListProperty<StringViewModel> allStringsProperty() {
@@ -54,7 +59,6 @@ public void removeString() {
 
     private StringViewModel convertFromBibTexString(BibtexString bibtexString) {
         return new StringViewModel(bibtexString.getName(), bibtexString.getContent());
-
     }
 
     public ObjectProperty<StringViewModel> seletedItemProperty() {
@@ -81,4 +85,8 @@ public void save() {
         }
 
     }
+
+    public ValidationStatus formValidation() {
+        return formValidator.getValidationStatus();
+    }
 }
diff --git a/src/main/java/org/jabref/gui/strings/StringViewModel.java b/src/main/java/org/jabref/gui/strings/StringViewModel.java
index 35f73f7c1dc..4e2860567c4 100644
--- a/src/main/java/org/jabref/gui/strings/StringViewModel.java
+++ b/src/main/java/org/jabref/gui/strings/StringViewModel.java
@@ -39,6 +39,14 @@ public StringViewModel(String label, String content) {
         contentValidator = new FunctionBasedValidator<>(this.content, function);
     }
 
+    public Validator getlabelValidator() {
+        return labelValidator;
+    }
+
+    public Validator getContentValidator() {
+        return contentValidator;
+    }
+
     public ValidationStatus labelValidation() {
         return labelValidator.getValidationStatus();
     }

From 014dd126709c0b4aa1531d6273350ef229585f44 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Mon, 21 Jan 2019 17:47:51 +0100
Subject: [PATCH 14/28] fix imports

---
 src/main/java/org/jabref/gui/strings/StringDialogViewModel.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/org/jabref/gui/strings/StringDialogViewModel.java b/src/main/java/org/jabref/gui/strings/StringDialogViewModel.java
index 07ccc758291..2dbded8dd5f 100644
--- a/src/main/java/org/jabref/gui/strings/StringDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/strings/StringDialogViewModel.java
@@ -11,6 +11,7 @@
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
+
 import org.jabref.gui.AbstractViewModel;
 import org.jabref.logic.bibtex.comparator.BibtexStringComparator;
 import org.jabref.model.database.BibDatabase;

From f763eaf216454a8c0c413de8ff5d422eca9be7e3 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Fri, 1 Feb 2019 17:47:36 +0100
Subject: [PATCH 15/28] remove old stuff TODO: fix validation

---
 src/main/java/org/jabref/gui/BasePanel.java   | 107 ++--
 .../java/org/jabref/gui/StringDialog.java     | 455 ------------------
 .../gui/collab/StringAddChangeViewModel.java  |   2 +-
 .../gui/collab/StringChangeViewModel.java     |   4 +-
 .../gui/collab/StringNameChangeViewModel.java |   4 +-
 .../collab/StringRemoveChangeViewModel.java   |   2 +-
 .../actions/AppendDatabaseAction.java         |   4 +-
 .../jabref/gui/strings/StringDialogView.java  |   9 +-
 .../gui/strings/StringDialogViewModel.java    |   8 -
 .../jabref/gui/strings/StringViewModel.java   |   4 +-
 .../jabref/gui/undo/UndoableInsertString.java |  10 +-
 .../jabref/gui/undo/UndoableRemoveString.java |   8 +-
 .../jabref/gui/undo/UndoableStringChange.java |  18 +-
 13 files changed, 62 insertions(+), 573 deletions(-)
 delete mode 100644 src/main/java/org/jabref/gui/StringDialog.java

diff --git a/src/main/java/org/jabref/gui/BasePanel.java b/src/main/java/org/jabref/gui/BasePanel.java
index 777c06eaf6f..ef5e2875994 100644
--- a/src/main/java/org/jabref/gui/BasePanel.java
+++ b/src/main/java/org/jabref/gui/BasePanel.java
@@ -150,7 +150,6 @@ public class BasePanel extends StackPane {
     // Used to track whether the base has changed since last save.
     private BibEntry showing;
 
-    private StringDialog stringDialog;
     private SuggestionProviders suggestionProviders;
 
     @SuppressWarnings({"FieldCanBeLocal", "unused"}) private Subscription dividerPositionSubscription;
@@ -308,17 +307,6 @@ private void setupActions() {
 
         actions.put(Actions.SELECT_ALL, mainTable.getSelectionModel()::selectAll);
 
-        // The action for opening the string editor
-        actions.put(Actions.EDIT_STRINGS, () -> {
-            if (stringDialog == null) {
-                StringDialog form = new StringDialog(frame, BasePanel.this, bibDatabaseContext.getDatabase());
-                form.setVisible(true);
-                stringDialog = form;
-            } else {
-                stringDialog.setVisible(true);
-            }
-        });
-
         // The action for auto-generating keys.
         actions.put(Actions.MAKE_KEY, new GenerateBibtexKeyAction(this, frame.getDialogService()));
 
@@ -374,36 +362,36 @@ private void setupActions() {
 
         actions.put(Actions.MERGE_WITH_FETCHED_ENTRY, new MergeWithFetchedEntryAction(this, frame.getDialogService()));
 
-        actions.put(Actions.REPLACE_ALL, ()-> (new ReplaceStringAction(this)).execute());
+        actions.put(Actions.REPLACE_ALL, () -> (new ReplaceStringAction(this)).execute());
 
         actions.put(new SpecialFieldValueViewModel(SpecialField.RELEVANCE.getValues().get(0)).getCommand(),
-                new SpecialFieldViewModel(SpecialField.RELEVANCE, undoManager).getSpecialFieldAction(SpecialField.RELEVANCE.getValues().get(0), frame));
+                    new SpecialFieldViewModel(SpecialField.RELEVANCE, undoManager).getSpecialFieldAction(SpecialField.RELEVANCE.getValues().get(0), frame));
 
         actions.put(new SpecialFieldValueViewModel(SpecialField.QUALITY.getValues().get(0)).getCommand(),
-                new SpecialFieldViewModel(SpecialField.QUALITY, undoManager).getSpecialFieldAction(SpecialField.QUALITY.getValues().get(0), frame));
+                    new SpecialFieldViewModel(SpecialField.QUALITY, undoManager).getSpecialFieldAction(SpecialField.QUALITY.getValues().get(0), frame));
 
         actions.put(new SpecialFieldValueViewModel(SpecialField.PRINTED.getValues().get(0)).getCommand(),
-                new SpecialFieldViewModel(SpecialField.PRINTED, undoManager).getSpecialFieldAction(SpecialField.PRINTED.getValues().get(0), frame));
+                    new SpecialFieldViewModel(SpecialField.PRINTED, undoManager).getSpecialFieldAction(SpecialField.PRINTED.getValues().get(0), frame));
 
         for (SpecialFieldValue prio : SpecialField.PRIORITY.getValues()) {
             actions.put(new SpecialFieldValueViewModel(prio).getCommand(),
-                    new SpecialFieldViewModel(SpecialField.PRIORITY, undoManager).getSpecialFieldAction(prio, this.frame));
+                        new SpecialFieldViewModel(SpecialField.PRIORITY, undoManager).getSpecialFieldAction(prio, this.frame));
         }
         for (SpecialFieldValue rank : SpecialField.RANKING.getValues()) {
             actions.put(new SpecialFieldValueViewModel(rank).getCommand(),
-                    new SpecialFieldViewModel(SpecialField.RANKING, undoManager).getSpecialFieldAction(rank, this.frame));
+                        new SpecialFieldViewModel(SpecialField.RANKING, undoManager).getSpecialFieldAction(rank, this.frame));
         }
         for (SpecialFieldValue status : SpecialField.READ_STATUS.getValues()) {
             actions.put(new SpecialFieldValueViewModel(status).getCommand(),
-                    new SpecialFieldViewModel(SpecialField.READ_STATUS, undoManager).getSpecialFieldAction(status, this.frame));
+                        new SpecialFieldViewModel(SpecialField.READ_STATUS, undoManager).getSpecialFieldAction(status, this.frame));
         }
 
         actions.put(Actions.TOGGLE_PREVIEW, () -> {
             PreviewPreferences previewPreferences = Globals.prefs.getPreviewPreferences();
             boolean enabled = !previewPreferences.isPreviewPanelEnabled();
             PreviewPreferences newPreviewPreferences = previewPreferences.getBuilder()
-                    .withPreviewPanelEnabled(enabled)
-                    .build();
+                                                                         .withPreviewPanelEnabled(enabled)
+                                                                         .build();
             Globals.prefs.storePreviewPreferences(newPreviewPreferences);
             DefaultTaskExecutor.runInJavaFXThread(() -> setPreviewActiveBasePanels(enabled));
         });
@@ -496,9 +484,9 @@ private void copyTitle() {
         if (!selectedBibEntries.isEmpty()) {
             // Collect all non-null titles.
             List<String> titles = selectedBibEntries.stream()
-                    .filter(bibEntry -> bibEntry.getTitle().isPresent())
-                    .map(bibEntry -> bibEntry.getTitle().get())
-                    .collect(Collectors.toList());
+                                                    .filter(bibEntry -> bibEntry.getTitle().isPresent())
+                                                    .map(bibEntry -> bibEntry.getTitle().get())
+                                                    .collect(Collectors.toList());
 
             if (titles.isEmpty()) {
                 output(Localization.lang("None of the selected entries have titles."));
@@ -530,8 +518,8 @@ private void copyCiteKey() {
 
             String sb = String.join(",", keys);
             String citeCommand = Optional.ofNullable(Globals.prefs.get(JabRefPreferences.CITE_COMMAND))
-                    .filter(cite -> cite.contains("\\")) // must contain \
-                    .orElse("\\cite");
+                                         .filter(cite -> cite.contains("\\")) // must contain \
+                                         .orElse("\\cite");
             Globals.clipboardManager.setContent(citeCommand + "{" + sb + '}');
 
             if (keys.size() == bes.size()) {
@@ -575,7 +563,7 @@ private void copyKeyAndTitle() {
             Layout layout;
             try {
                 layout = new LayoutHelper(sr, Globals.prefs.getLayoutFormatterPreferences(Globals.journalAbbreviationLoader))
-                        .getLayoutFromText();
+                                                                                                                             .getLayoutFromText();
             } catch (IOException e) {
                 LOGGER.info("Could not get layout", e);
                 return;
@@ -719,12 +707,12 @@ private void createMainTable() {
 
         // Update entry editor and preview according to selected entries
         mainTable.addSelectionListener(event -> mainTable.getSelectedEntries()
-                .stream()
-                .findFirst()
-                .ifPresent(entry -> {
-                    preview.setEntry(entry);
-                    entryEditor.setEntry(entry);
-                }));
+                                                         .stream()
+                                                         .findFirst()
+                                                         .ifPresent(entry -> {
+                                                             preview.setEntry(entry);
+                                                             entryEditor.setEntry(entry);
+                                                         }));
 
         // TODO: Register these actions globally
         /*
@@ -814,8 +802,8 @@ public void setupMainPanel() {
         // Saves the divider position as soon as it changes
         // We need to keep a reference to the subscription, otherwise the binding gets garbage collected
         dividerPositionSubscription = EasyBind.monadic(Bindings.valueAt(splitPane.getDividers(), 0))
-                .flatMap(SplitPane.Divider::positionProperty)
-                .subscribe((observable, oldValue, newValue) -> saveDividerLocation(newValue));
+                                              .flatMap(SplitPane.Divider::positionProperty)
+                                              .subscribe((observable, oldValue, newValue) -> saveDividerLocation(newValue));
     }
 
     /**
@@ -846,18 +834,6 @@ private void instantiateSearchAutoCompleter() {
         }
     }
 
-    public void assureStringDialogNotEditing() {
-        if (stringDialog != null) {
-            stringDialog.assureNotEditing();
-        }
-    }
-
-    public void updateStringDialog() {
-        if (stringDialog != null) {
-            stringDialog.refreshTable();
-        }
-    }
-
     private void adjustSplitter() {
         if (mode == BasePanelMode.SHOWING_PREVIEW) {
             splitPane.setDividerPositions(Globals.prefs.getPreviewPreferences().getPreviewPanelDividerPosition().doubleValue());
@@ -945,9 +921,9 @@ public void previousPreviewStyle() {
 
     private void cyclePreview(int newPosition) {
         PreviewPreferences previewPreferences = Globals.prefs.getPreviewPreferences()
-                .getBuilder()
-                .withPreviewCyclePosition(newPosition)
-                .build();
+                                                             .getBuilder()
+                                                             .withPreviewCyclePosition(newPosition)
+                                                             .build();
         Globals.prefs.storePreviewPreferences(previewPreferences);
 
         preview.updateLayout(previewPreferences);
@@ -997,7 +973,7 @@ public void entryEditorClosing(EntryEditor editor) {
      */
     public void ensureNotShowingBottomPanel(BibEntry entry) {
         if (((mode == BasePanelMode.SHOWING_EDITOR) && (entryEditor.getEntry() == entry))
-            || ((mode == BasePanelMode.SHOWING_PREVIEW) && (preview.getEntry() == entry))) {
+        || ((mode == BasePanelMode.SHOWING_PREVIEW) && (preview.getEntry() == entry))) {
             closeBottomPane();
         }
     }
@@ -1054,10 +1030,6 @@ public BibDatabase getDatabase() {
         return bibDatabaseContext.getDatabase();
     }
 
-    public void stringsClosing() {
-        stringDialog = null;
-    }
-
     public void changeTypeOfSelectedEntries(String newType) {
         List<BibEntry> bes = mainTable.getSelectedEntries();
         changeType(bes, newType);
@@ -1105,11 +1077,11 @@ public boolean showDeleteConfirmationDialog(int numberOfEntries) {
             }
 
             return dialogService.showConfirmationDialogWithOptOutAndWait(title,
-                    message,
-                    okButton,
-                    cancelButton,
-                    Localization.lang("Disable this confirmation dialog"),
-                    optOut -> Globals.prefs.putBoolean(JabRefPreferences.CONFIRM_DELETE, !optOut));
+                                                                         message,
+                                                                         okButton,
+                                                                         cancelButton,
+                                                                         Localization.lang("Disable this confirmation dialog"),
+                                                                         optOut -> Globals.prefs.putBoolean(JabRefPreferences.CONFIRM_DELETE, !optOut));
         } else {
             return true;
         }
@@ -1125,16 +1097,15 @@ private void saveDividerLocation(Number position) {
 
         if (mode == BasePanelMode.SHOWING_PREVIEW) {
             PreviewPreferences previewPreferences = Globals.prefs.getPreviewPreferences()
-                    .getBuilder()
-                    .withPreviewPanelDividerPosition(position)
-                    .build();
+                                                                 .getBuilder()
+                                                                 .withPreviewPanelDividerPosition(position)
+                                                                 .build();
             Globals.prefs.storePreviewPreferences(previewPreferences);
         } else if (mode == BasePanelMode.SHOWING_EDITOR) {
             preferences.setEntryEditorDividerPosition(position.doubleValue());
         }
     }
 
-
     /**
      * Perform necessary cleanup when this BasePanel is closed.
      */
@@ -1432,8 +1403,8 @@ public void action() {
 
                     Optional<LinkedFile> linkedFile = files.stream()
                                                            .filter(file -> (FieldName.URL.equalsIgnoreCase(file.getFileType())
-                                                                            || FieldName.PS.equalsIgnoreCase(file.getFileType())
-                                                                            || FieldName.PDF.equalsIgnoreCase(file.getFileType())))
+                                                           || FieldName.PS.equalsIgnoreCase(file.getFileType())
+                                                           || FieldName.PDF.equalsIgnoreCase(file.getFileType())))
                                                            .findFirst();
 
                     if (linkedFile.isPresent()) {
@@ -1441,8 +1412,8 @@ public void action() {
                         try {
 
                             JabRefDesktop.openExternalFileAnyFormat(bibDatabaseContext,
-                                    linkedFile.get().getLink(),
-                                    ExternalFileTypes.getInstance().fromLinkedFile(linkedFile.get(), true));
+                                                                    linkedFile.get().getLink(),
+                                                                    ExternalFileTypes.getInstance().fromLinkedFile(linkedFile.get(), true));
 
                             output(Localization.lang("External viewer called") + '.');
                         } catch (IOException e) {
diff --git a/src/main/java/org/jabref/gui/StringDialog.java b/src/main/java/org/jabref/gui/StringDialog.java
deleted file mode 100644
index 1169b1f7dce..00000000000
--- a/src/main/java/org/jabref/gui/StringDialog.java
+++ /dev/null
@@ -1,455 +0,0 @@
-package org.jabref.gui;
-
-import java.awt.BorderLayout;
-import java.awt.Component;
-import java.awt.Container;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import javax.swing.AbstractAction;
-import javax.swing.Action;
-import javax.swing.ActionMap;
-import javax.swing.DefaultCellEditor;
-import javax.swing.InputMap;
-import javax.swing.JComponent;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTable;
-import javax.swing.JTextField;
-import javax.swing.JToolBar;
-import javax.swing.LayoutFocusTraversalPolicy;
-import javax.swing.table.AbstractTableModel;
-import javax.swing.table.TableColumnModel;
-import javax.swing.undo.CompoundEdit;
-
-import org.jabref.Globals;
-import org.jabref.gui.actions.Actions;
-import org.jabref.gui.help.HelpAction;
-import org.jabref.gui.icon.IconTheme;
-import org.jabref.gui.keyboard.KeyBinding;
-import org.jabref.gui.undo.UndoableInsertString;
-import org.jabref.gui.undo.UndoableRemoveString;
-import org.jabref.gui.undo.UndoableStringChange;
-import org.jabref.gui.util.WindowLocation;
-import org.jabref.logic.bibtex.InvalidFieldValueException;
-import org.jabref.logic.bibtex.LatexFieldFormatter;
-import org.jabref.logic.bibtex.comparator.BibtexStringComparator;
-import org.jabref.logic.help.HelpFile;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.model.database.BibDatabase;
-import org.jabref.model.database.KeyCollisionException;
-import org.jabref.model.entry.BibtexString;
-import org.jabref.preferences.JabRefPreferences;
-
-class StringDialog extends JabRefDialog {
-
-    private static final String STRINGS_TITLE = Localization.lang("Strings for library");
-    // A reference to the entry this object works on.
-    private final BibDatabase base;
-    private final BasePanel panel;
-    private final StringTable table;
-    private final HelpAction helpAction;
-
-    private final SaveDatabaseAction saveAction = new SaveDatabaseAction(this);
-
-    // The action concerned with closing the window.
-    private final CloseAction closeAction = new CloseAction();
-    private List<BibtexString> strings;
-
-
-    public StringDialog(JabRefFrame frame, BasePanel panel, BibDatabase base) {
-        super(StringDialog.class);
-        this.panel = panel;
-        this.base = base;
-
-        sortStrings();
-
-        helpAction = new HelpAction(Localization.lang("Help"), HelpFile.STRING_EDITOR);
-
-        addWindowListener(new WindowAdapter() {
-
-            @Override
-            public void windowClosing(WindowEvent e) {
-                closeAction.actionPerformed(null);
-            }
-        });
-
-        // We replace the default FocusTraversalPolicy with a subclass
-        // that only allows the StringTable to gain keyboard focus.
-        setFocusTraversalPolicy(new LayoutFocusTraversalPolicy() {
-
-            @Override
-            protected boolean accept(Component c) {
-                return super.accept(c) && (c instanceof StringTable);
-            }
-        });
-
-        JPanel pan = new JPanel();
-        GridBagLayout gbl = new GridBagLayout();
-        pan.setLayout(gbl);
-        GridBagConstraints con = new GridBagConstraints();
-        con.fill = GridBagConstraints.BOTH;
-        con.weighty = 1;
-        con.weightx = 1;
-
-        StringTableModel stm = new StringTableModel(this, base);
-        table = new StringTable(stm);
-        if (!base.hasNoStrings()) {
-            table.setRowSelectionInterval(0, 0);
-        }
-
-        gbl.setConstraints(table.getPane(), con);
-        pan.add(table.getPane());
-
-        JToolBar tlb = new OSXCompatibleToolbar();
-        InputMap im = tlb.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
-        ActionMap am = tlb.getActionMap();
-        im.put(Globals.getKeyPrefs().getKey(KeyBinding.STRING_DIALOG_ADD_STRING), "add");
-        NewStringAction newStringAction = new NewStringAction(this);
-        am.put("add", newStringAction);
-        im.put(Globals.getKeyPrefs().getKey(KeyBinding.STRING_DIALOG_REMOVE_STRING), "remove");
-        RemoveStringAction removeStringAction = new RemoveStringAction(this);
-        am.put("remove", removeStringAction);
-        im.put(Globals.getKeyPrefs().getKey(KeyBinding.SAVE_DATABASE), "save");
-        am.put("save", saveAction);
-        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close");
-        am.put("close", closeAction);
-        im.put(Globals.getKeyPrefs().getKey(KeyBinding.HELP), "help");
-        am.put("help", helpAction);
-        im.put(Globals.getKeyPrefs().getKey(KeyBinding.UNDO), "undo");
-        UndoAction undoAction = new UndoAction();
-        am.put("undo", undoAction);
-        im.put(Globals.getKeyPrefs().getKey(KeyBinding.REDO), "redo");
-        RedoAction redoAction = new RedoAction();
-        am.put("redo", redoAction);
-
-        tlb.add(newStringAction);
-        tlb.add(removeStringAction);
-        tlb.addSeparator();
-        tlb.add(helpAction);
-        Container conPane = getContentPane();
-        conPane.add(tlb, BorderLayout.NORTH);
-        conPane.add(pan, BorderLayout.CENTER);
-
-        setTitle(STRINGS_TITLE + ": "
-                + panel.getBibDatabaseContext().getDatabaseFile().map(File::getName).orElse(GUIGlobals.UNTITLED_TITLE));
-        WindowLocation pw = new WindowLocation(this, JabRefPreferences.STRINGS_POS_X, JabRefPreferences.STRINGS_POS_Y,
-                JabRefPreferences.STRINGS_SIZE_X, JabRefPreferences.STRINGS_SIZE_Y);
-        pw.displayWindowAtStoredLocation();
-    }
-
-    private static boolean isNumber(String name) {
-        // A pure integer number cannot be used as a string label,
-        // since Bibtex will read it as a number.
-        try {
-            Integer.parseInt(name);
-            return true;
-        } catch (NumberFormatException ex) {
-            return false;
-        }
-    }
-
-    private void sortStrings() {
-        // Rebuild our sorted set of strings:
-        strings = new ArrayList<>();
-        for (String s : base.getStringKeySet()) {
-            strings.add(base.getString(s));
-        }
-        Collections.sort(strings, new BibtexStringComparator(false));
-    }
-
-    public void refreshTable() {
-        sortStrings();
-        table.revalidate();
-        table.clearSelection();
-        table.repaint();
-    }
-
-    public void saveDatabase() {
-        panel.runCommand(Actions.SAVE);
-    }
-
-    public void assureNotEditing() {
-        if (table.isEditing()) {
-            int col = table.getEditingColumn();
-            int row = table.getEditingRow();
-            table.getCellEditor(row, col).stopCellEditing();
-        }
-    }
-
-    static class SaveDatabaseAction extends AbstractAction {
-
-        private final StringDialog parent;
-
-
-        public SaveDatabaseAction(StringDialog parent) {
-            super("Save library", IconTheme.JabRefIcons.SAVE.getIcon());
-            putValue(Action.SHORT_DESCRIPTION, Localization.lang("Save library"));
-            this.parent = parent;
-        }
-
-        @Override
-        public void actionPerformed(ActionEvent e) {
-            parent.saveDatabase();
-        }
-    }
-
-    class StringTable extends JTable {
-
-        private final JScrollPane sp = new JScrollPane(this);
-
-
-        public StringTable(StringTableModel stm) {
-            super(stm);
-            setShowVerticalLines(true);
-            setShowHorizontalLines(true);
-            setColumnSelectionAllowed(true);
-            DefaultCellEditor dce = new DefaultCellEditor(new JTextField());
-            dce.setClickCountToStart(2);
-            setDefaultEditor(String.class, dce);
-            TableColumnModel cm = getColumnModel();
-            cm.getColumn(0).setPreferredWidth(800);
-            cm.getColumn(1).setPreferredWidth(2000);
-            getInputMap().put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close");
-            getActionMap().put("close", closeAction);
-            getInputMap().put(Globals.getKeyPrefs().getKey(KeyBinding.HELP), "help");
-            getActionMap().put("help", helpAction);
-        }
-
-        public JComponent getPane() {
-            return sp;
-        }
-
-    }
-
-    class StringTableModel extends AbstractTableModel {
-
-        private final BibDatabase tbase;
-        private final StringDialog parent;
-
-
-        public StringTableModel(StringDialog parent, BibDatabase base) {
-            this.parent = parent;
-            this.tbase = base;
-        }
-
-        @Override
-        public Object getValueAt(int row, int col) {
-            return col == 0 ? strings.get(row).getName() : strings.get(row).getContent();
-        }
-
-        @Override
-        public void setValueAt(Object value, int row, int col) {
-            if (col == 0) {
-                // Change name of string.
-                if (!value.equals(strings.get(row).getName())) {
-                    if (tbase.hasStringLabel((String) value)) {
-                        JOptionPane.showMessageDialog(parent, Localization.lang("A string with that label already exists"),
-                                Localization.lang("Label"), JOptionPane.ERROR_MESSAGE);
-                    } else if (((String) value).contains(" ")) {
-                        JOptionPane.showMessageDialog(parent, Localization.lang("The label of the string cannot contain spaces."),
-                                Localization.lang("Label"), JOptionPane.ERROR_MESSAGE);
-                    } else if (((String) value).contains("#")) {
-                        JOptionPane.showMessageDialog(parent, Localization.lang("The label of the string cannot contain the '#' character."),
-                                Localization.lang("Label"), JOptionPane.ERROR_MESSAGE);
-                    } else if (isNumber((String) value)) {
-                        JOptionPane.showMessageDialog(parent, Localization.lang("The label of the string cannot be a number."),
-                                Localization.lang("Label"), JOptionPane.ERROR_MESSAGE);
-                    } else {
-                        // Store undo information.
-                        BibtexString subject = strings.get(row);
-                        panel.getUndoManager().addEdit(
-                                new UndoableStringChange(panel, subject, true, subject.getName(), (String) value));
-                        subject.setName((String) value);
-                        panel.markBaseChanged();
-                        refreshTable();
-                    }
-                }
-            } else {
-                // Change content of string.
-                BibtexString subject = strings.get(row);
-
-                if (!value.equals(subject.getContent())) {
-                    try {
-                        new LatexFieldFormatter(Globals.prefs.getLatexFieldFormatterPreferences())
-                                .format((String) value, "__dummy");
-                    } catch (InvalidFieldValueException ex) {
-                        return;
-                    }
-                    // Store undo information.
-                    panel.getUndoManager().addEdit(
-                            new UndoableStringChange(panel, subject, false, subject.getContent(), (String) value));
-
-                    subject.setContent((String) value);
-                    panel.markBaseChanged();
-                }
-            }
-        }
-
-        @Override
-        public int getColumnCount() {
-            return 2;
-        }
-
-        @Override
-        public int getRowCount() {
-            return strings.size();
-        }
-
-        @Override
-        public String getColumnName(int col) {
-            return col == 0 ? Localization.lang("Label") :
-                Localization.lang("Content");
-        }
-
-        @Override
-        public boolean isCellEditable(int row, int col) {
-            return true;
-        }
-    }
-
-    class CloseAction extends AbstractAction {
-
-        public CloseAction() {
-            super("Close window");
-            putValue(Action.SHORT_DESCRIPTION, Localization.lang("Close dialog"));
-        }
-
-        @Override
-        public void actionPerformed(ActionEvent e) {
-            panel.stringsClosing();
-            dispose();
-        }
-    }
-
-    class NewStringAction extends AbstractAction {
-
-        private final StringDialog parent;
-
-
-        public NewStringAction(StringDialog parent) {
-            super("New string", IconTheme.JabRefIcons.ADD.getIcon());
-            putValue(Action.SHORT_DESCRIPTION, Localization.lang("New string"));
-            this.parent = parent;
-        }
-
-        @Override
-        public void actionPerformed(ActionEvent e) {
-            String name = JOptionPane.showInputDialog(parent, Localization.lang("Please enter the string's label"));
-            if (name == null) {
-                return;
-            }
-            if (isNumber(name)) {
-                JOptionPane.showMessageDialog(parent, Localization.lang("The label of the string cannot be a number."),
-                        Localization.lang("Label"), JOptionPane.ERROR_MESSAGE);
-                return;
-            }
-            if (name.contains("#")) {
-                JOptionPane.showMessageDialog(parent, Localization.lang("The label of the string cannot contain the '#' character."),
-                        Localization.lang("Label"), JOptionPane.ERROR_MESSAGE);
-                return;
-            }
-            if (name.contains(" ")) {
-                JOptionPane.showMessageDialog(parent, Localization.lang("The label of the string cannot contain spaces."),
-                        Localization.lang("Label"), JOptionPane.ERROR_MESSAGE);
-                return;
-            }
-            try {
-                BibtexString bs = new BibtexString(name, "");
-
-                // Store undo information:
-                panel.getUndoManager().addEdit(new UndoableInsertString(panel, panel.getDatabase(), bs));
-
-                base.addString(bs);
-                refreshTable();
-                panel.markBaseChanged();
-            } catch (KeyCollisionException ex) {
-                JOptionPane.showMessageDialog(parent,
-                        Localization.lang("A string with that label already exists"),
-                        Localization.lang("Label"), JOptionPane.ERROR_MESSAGE);
-            }
-        }
-    }
-
-    class RemoveStringAction extends AbstractAction {
-
-        private final StringDialog parent;
-
-
-        public RemoveStringAction(StringDialog parent) {
-            super("Remove selected strings", IconTheme.JabRefIcons.REMOVE.getIcon());
-            putValue(Action.SHORT_DESCRIPTION, Localization.lang("Remove selected strings"));
-            this.parent = parent;
-        }
-
-        @Override
-        public void actionPerformed(ActionEvent e) {
-            int[] sel = table.getSelectedRows();
-            if (sel.length > 0) {
-
-                // Make sure no cell is being edited, as caused by the
-                // keystroke. This makes the content hang on the screen.
-                assureNotEditing();
-
-                String msg = (sel.length > 1 ? Localization.lang("Really delete the %0 selected entries?",
-                        Integer.toString(sel.length)) : Localization.lang("Really delete the selected entry?"));
-                int answer = JOptionPane.showConfirmDialog(parent, msg, Localization.lang("Delete strings"),
-                        JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
-                if (answer == JOptionPane.YES_OPTION) {
-                    CompoundEdit ce = new CompoundEdit();
-                    for (int i = sel.length - 1; i >= 0; i--) {
-                        // Delete the strings backwards to avoid moving indexes.
-
-                        BibtexString subject = strings.get(sel[i]);
-
-                        // Store undo information:
-                        ce.addEdit(new UndoableRemoveString(panel, base, subject));
-
-                        base.removeString(subject.getId());
-                    }
-                    ce.end();
-                    panel.getUndoManager().addEdit(ce);
-
-                    refreshTable();
-                    if (!base.hasNoStrings()) {
-                        table.setRowSelectionInterval(0, 0);
-                    }
-                }
-            }
-        }
-    }
-
-    class UndoAction extends AbstractAction {
-
-        public UndoAction() {
-            super("Undo", IconTheme.JabRefIcons.UNDO.getIcon());
-            putValue(Action.SHORT_DESCRIPTION, Localization.lang("Undo"));
-        }
-
-        @Override
-        public void actionPerformed(ActionEvent e) {
-            panel.runCommand(Actions.UNDO);
-        }
-    }
-
-    class RedoAction extends AbstractAction {
-
-        public RedoAction() {
-            super("Redo", IconTheme.JabRefIcons.REDO.getIcon());
-            putValue(Action.SHORT_DESCRIPTION, Localization.lang("Redo"));
-        }
-
-        @Override
-        public void actionPerformed(ActionEvent e) {
-            panel.runCommand(Actions.REDO);
-        }
-    }
-}
diff --git a/src/main/java/org/jabref/gui/collab/StringAddChangeViewModel.java b/src/main/java/org/jabref/gui/collab/StringAddChangeViewModel.java
index 20bf1099ef6..dafb80b125f 100644
--- a/src/main/java/org/jabref/gui/collab/StringAddChangeViewModel.java
+++ b/src/main/java/org/jabref/gui/collab/StringAddChangeViewModel.java
@@ -43,7 +43,7 @@ public boolean makeChange(BasePanel panel, BibDatabase secondary, NamedCompound
 
         try {
             panel.getDatabase().addString(string);
-            undoEdit.addEdit(new UndoableInsertString(panel, panel.getDatabase(), string));
+            undoEdit.addEdit(new UndoableInsertString(panel.getDatabase(), string));
         } catch (KeyCollisionException ex) {
             LOGGER.info("Error: could not add string '" + string.getName() + "': " + ex.getMessage(), ex);
         }
diff --git a/src/main/java/org/jabref/gui/collab/StringChangeViewModel.java b/src/main/java/org/jabref/gui/collab/StringChangeViewModel.java
index 19e68f3a0b9..d44ac099658 100644
--- a/src/main/java/org/jabref/gui/collab/StringChangeViewModel.java
+++ b/src/main/java/org/jabref/gui/collab/StringChangeViewModel.java
@@ -59,14 +59,14 @@ public boolean makeChange(BasePanel panel, BibDatabase secondary, NamedCompound
             BibtexString bs = new BibtexString(label, disk);
             try {
                 panel.getDatabase().addString(bs);
-                undoEdit.addEdit(new UndoableInsertString(panel, panel.getDatabase(), bs));
+                undoEdit.addEdit(new UndoableInsertString(panel.getDatabase(), bs));
             } catch (KeyCollisionException ex) {
                 LOGGER.info("Error: could not add string '" + bs.getName() + "': " + ex.getMessage(), ex);
             }
         } else {
             String mem = string.getContent();
             string.setContent(disk);
-            undoEdit.addEdit(new UndoableStringChange(panel, string, false, mem, disk));
+            undoEdit.addEdit(new UndoableStringChange(string, false, mem, disk));
         }
 
         // Update tmp database:
diff --git a/src/main/java/org/jabref/gui/collab/StringNameChangeViewModel.java b/src/main/java/org/jabref/gui/collab/StringNameChangeViewModel.java
index e9bda7c9f40..b9cd5bb80fe 100644
--- a/src/main/java/org/jabref/gui/collab/StringNameChangeViewModel.java
+++ b/src/main/java/org/jabref/gui/collab/StringNameChangeViewModel.java
@@ -50,13 +50,13 @@ public boolean makeChange(BasePanel panel, BibDatabase secondary, NamedCompound
             BibtexString bs = new BibtexString(disk, content);
             try {
                 panel.getDatabase().addString(bs);
-                undoEdit.addEdit(new UndoableInsertString(panel, panel.getDatabase(), bs));
+                undoEdit.addEdit(new UndoableInsertString(panel.getDatabase(), bs));
             } catch (KeyCollisionException ex) {
                 LOGGER.info("Error: could not add string '" + bs.getName() + "': " + ex.getMessage(), ex);
             }
         } else {
             string.setName(disk);
-            undoEdit.addEdit(new UndoableStringChange(panel, string, true, mem, disk));
+            undoEdit.addEdit(new UndoableStringChange(string, true, mem, disk));
         }
 
         // Update tmp database:
diff --git a/src/main/java/org/jabref/gui/collab/StringRemoveChangeViewModel.java b/src/main/java/org/jabref/gui/collab/StringRemoveChangeViewModel.java
index 4501888a240..eaf66d47304 100644
--- a/src/main/java/org/jabref/gui/collab/StringRemoveChangeViewModel.java
+++ b/src/main/java/org/jabref/gui/collab/StringRemoveChangeViewModel.java
@@ -36,7 +36,7 @@ public boolean makeChange(BasePanel panel, BibDatabase secondary, NamedCompound
 
         try {
             panel.getDatabase().removeString(inMem.getId());
-            undoEdit.addEdit(new UndoableRemoveString(panel, panel.getDatabase(), string));
+            undoEdit.addEdit(new UndoableRemoveString(panel.getDatabase(), string));
         } catch (Exception ex) {
             LOGGER.info("Error: could not add string '" + string.getName() + "': " + ex.getMessage(), ex);
         }
diff --git a/src/main/java/org/jabref/gui/importer/actions/AppendDatabaseAction.java b/src/main/java/org/jabref/gui/importer/actions/AppendDatabaseAction.java
index fbb5d71222e..5231d0edede 100644
--- a/src/main/java/org/jabref/gui/importer/actions/AppendDatabaseAction.java
+++ b/src/main/java/org/jabref/gui/importer/actions/AppendDatabaseAction.java
@@ -45,14 +45,12 @@ public class AppendDatabaseAction implements BaseAction {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(AppendDatabaseAction.class);
 
-    private final JabRefFrame frame;
     private final BasePanel panel;
 
     private final List<Path> filesToOpen = new ArrayList<>();
     private final DialogService dialogService;
 
     public AppendDatabaseAction(JabRefFrame frame, BasePanel panel) {
-        this.frame = frame;
         this.panel = panel;
         dialogService = frame.getDialogService();
     }
@@ -87,7 +85,7 @@ private static void mergeFromBibtex(BasePanel panel, ParserResult parserResult,
             for (BibtexString bs : fromDatabase.getStringValues()) {
                 if (!database.hasStringLabel(bs.getName())) {
                     database.addString(bs);
-                    ce.addEdit(new UndoableInsertString(panel, database, bs));
+                    ce.addEdit(new UndoableInsertString(database, bs));
                 }
             }
         }
diff --git a/src/main/java/org/jabref/gui/strings/StringDialogView.java b/src/main/java/org/jabref/gui/strings/StringDialogView.java
index f67e0d855d9..82efcd372e6 100644
--- a/src/main/java/org/jabref/gui/strings/StringDialogView.java
+++ b/src/main/java/org/jabref/gui/strings/StringDialogView.java
@@ -1,5 +1,7 @@
 package org.jabref.gui.strings;
 
+import javafx.beans.binding.Bindings;
+import javafx.collections.ObservableList;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
@@ -21,7 +23,9 @@
 import org.jabref.model.database.BibDatabase;
 
 import com.airhacks.afterburner.views.ViewLoader;
+import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
 import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
+import org.fxmisc.easybind.EasyBind;
 
 public class StringDialogView extends BaseDialog<Void> {
 
@@ -47,7 +51,10 @@ public StringDialogView(BibDatabase database) {
 
         Button btnSave = (Button) this.getDialogPane().lookupButton(saveButton);
 
-        btnSave.disableProperty().bind(viewModel.formValidation().validProperty().not());
+        ObservableList<ValidationStatus> labelsValid = EasyBind.map(viewModel.allStringsProperty(), StringViewModel::labelValidation).removeAll((ValidationStatus::isValid);
+        ObservableList<ValidationStatus> contentsValid = EasyBind.map(viewModel.allStringsProperty(), StringViewModel::contentValidation).filtered(ValidationStatus::isValid);
+
+        btnSave.disableProperty().bind(Bindings.isNotEmpty(labelsValid).or(Bindings.isNotEmpty(contentsValid)));
 
         setResultConverter(btn -> {
             if (saveButton.equals(btn)) {
diff --git a/src/main/java/org/jabref/gui/strings/StringDialogViewModel.java b/src/main/java/org/jabref/gui/strings/StringDialogViewModel.java
index 2dbded8dd5f..968a809b6fa 100644
--- a/src/main/java/org/jabref/gui/strings/StringDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/strings/StringDialogViewModel.java
@@ -17,16 +17,12 @@
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibtexString;
 
-import de.saxsys.mvvmfx.utils.validation.CompositeValidator;
-import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
-
 public class StringDialogViewModel extends AbstractViewModel {
 
     private final ListProperty<StringViewModel> allStrings = new SimpleListProperty<>(FXCollections.observableArrayList());
     private final ObjectProperty<StringViewModel> selectedItemProperty = new SimpleObjectProperty<>();
     private final StringProperty newStringLabelProperty = new SimpleStringProperty("");
     private final BibDatabase db;
-    private final CompositeValidator formValidator = new CompositeValidator();
 
     public StringDialogViewModel(BibDatabase bibDatabase) {
         this.db = bibDatabase;
@@ -84,10 +80,6 @@ public void save() {
                 db.addString(new BibtexString(label, content));
             }
         }
-
     }
 
-    public ValidationStatus formValidation() {
-        return formValidator.getValidationStatus();
-    }
 }
diff --git a/src/main/java/org/jabref/gui/strings/StringViewModel.java b/src/main/java/org/jabref/gui/strings/StringViewModel.java
index 4e2860567c4..23f14d75f0b 100644
--- a/src/main/java/org/jabref/gui/strings/StringViewModel.java
+++ b/src/main/java/org/jabref/gui/strings/StringViewModel.java
@@ -20,10 +20,8 @@ public class StringViewModel {
 
     private final Function<String, ValidationMessage> function = input -> {
         if (input == null) {
-            System.out.println("Null checker");
-            return ValidationMessage.error("May not be null2");
+            return ValidationMessage.error("May not be null");
         } else if (input.trim().isEmpty()) {
-            System.out.println("Should not be empty");
             return ValidationMessage.error("Should not be empty");
         } else {
             return null; // everything is ok
diff --git a/src/main/java/org/jabref/gui/undo/UndoableInsertString.java b/src/main/java/org/jabref/gui/undo/UndoableInsertString.java
index afaece225d8..3c2dd9f6eb3 100644
--- a/src/main/java/org/jabref/gui/undo/UndoableInsertString.java
+++ b/src/main/java/org/jabref/gui/undo/UndoableInsertString.java
@@ -1,6 +1,5 @@
 package org.jabref.gui.undo;
 
-import org.jabref.gui.BasePanel;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.KeyCollisionException;
@@ -15,14 +14,10 @@ public class UndoableInsertString extends AbstractUndoableJabRefEdit {
     private static final Logger LOGGER = LoggerFactory.getLogger(UndoableInsertString.class);
 
     private final BibDatabase base;
-    private final BasePanel panel;
     private final BibtexString string;
 
-
-    public UndoableInsertString(BasePanel panel, BibDatabase base,
-            BibtexString string) {
+    public UndoableInsertString(BibDatabase base, BibtexString string) {
         this.base = base;
-        this.panel = panel;
         this.string = string;
     }
 
@@ -37,7 +32,7 @@ public void undo() {
 
         // Revert the change.
         base.removeString(string.getId());
-        panel.updateStringDialog();
+
     }
 
     @Override
@@ -51,7 +46,6 @@ public void redo() {
             LOGGER.warn("Problem to redo `insert entry`", ex);
         }
 
-        panel.updateStringDialog();
     }
 
 }
diff --git a/src/main/java/org/jabref/gui/undo/UndoableRemoveString.java b/src/main/java/org/jabref/gui/undo/UndoableRemoveString.java
index 0f82649f521..4d5479b8458 100644
--- a/src/main/java/org/jabref/gui/undo/UndoableRemoveString.java
+++ b/src/main/java/org/jabref/gui/undo/UndoableRemoveString.java
@@ -1,6 +1,5 @@
 package org.jabref.gui.undo;
 
-import org.jabref.gui.BasePanel;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.KeyCollisionException;
@@ -16,13 +15,10 @@ public class UndoableRemoveString extends AbstractUndoableJabRefEdit {
     private final BibDatabase base;
     private final BibtexString string;
 
-    private final BasePanel panel;
 
-    public UndoableRemoveString(BasePanel panel,
-            BibDatabase base, BibtexString string) {
+    public UndoableRemoveString(BibDatabase base, BibtexString string) {
         this.base = base;
         this.string = string;
-        this.panel = panel;
     }
 
     @Override
@@ -41,7 +37,6 @@ public void undo() {
             LOGGER.warn("Problem to undo `remove string`", ex);
         }
 
-        panel.updateStringDialog();
     }
 
     @Override
@@ -51,7 +46,6 @@ public void redo() {
         // Redo the change.
         base.removeString(string.getId());
 
-        panel.updateStringDialog();
     }
 
 }
diff --git a/src/main/java/org/jabref/gui/undo/UndoableStringChange.java b/src/main/java/org/jabref/gui/undo/UndoableStringChange.java
index edcd986833f..9041cf356e0 100644
--- a/src/main/java/org/jabref/gui/undo/UndoableStringChange.java
+++ b/src/main/java/org/jabref/gui/undo/UndoableStringChange.java
@@ -1,6 +1,5 @@
 package org.jabref.gui.undo;
 
-import org.jabref.gui.BasePanel;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibtexString;
 import org.jabref.model.strings.StringUtil;
@@ -11,24 +10,20 @@ public class UndoableStringChange extends AbstractUndoableJabRefEdit {
     private final String oldValue;
     private final String newValue;
     private final boolean nameChange;
-    private final BasePanel panel;
 
-
-    public UndoableStringChange(BasePanel panel,
-            BibtexString string, boolean nameChange,
-            String oldValue, String newValue) {
+    public UndoableStringChange(BibtexString string, boolean nameChange, String oldValue, String newValue) {
         this.string = string;
         this.oldValue = oldValue;
         this.newValue = newValue;
         this.nameChange = nameChange;
-        this.panel = panel;
     }
 
     @Override
     public String getPresentationName() {
         return (nameChange ? Localization.lang("change string name %0 to %1", StringUtil.boldHTML(oldValue),
-                StringUtil.boldHTML(newValue)) : Localization.lang("change string content %0 to %1",
-                        StringUtil.boldHTML(oldValue), StringUtil.boldHTML(newValue)));
+                                               StringUtil.boldHTML(newValue)) :
+                           Localization.lang("change string content %0 to %1",
+                                             StringUtil.boldHTML(oldValue), StringUtil.boldHTML(newValue)));
     }
 
     @Override
@@ -37,15 +32,12 @@ public void undo() {
 
         // Revert the change.
 
-        panel.assureStringDialogNotEditing();
-
         if (nameChange) {
             string.setName(oldValue);
         } else {
             string.setContent(oldValue);
         }
 
-        panel.updateStringDialog();
     }
 
     @Override
@@ -54,14 +46,12 @@ public void redo() {
 
         // Redo the change.
 
-        panel.assureStringDialogNotEditing();
         if (nameChange) {
             string.setName(newValue);
         } else {
             string.setContent(newValue);
         }
 
-        panel.updateStringDialog();
     }
 
 }

From d973630a8759e4bb332136d9aab4bf79038f925a Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Sat, 2 Feb 2019 16:05:00 +0100
Subject: [PATCH 16/28] fix Validation optimize layout a bit fix l10n

---
 .../org/jabref/gui/strings/StringDialog.fxml  | 17 +++++---
 .../jabref/gui/strings/StringDialogView.java  | 17 ++++----
 .../jabref/gui/strings/StringViewModel.java   | 42 +++++++++++++++++--
 src/main/resources/l10n/JabRef_en.properties  |  5 +--
 4 files changed, 60 insertions(+), 21 deletions(-)

diff --git a/src/main/java/org/jabref/gui/strings/StringDialog.fxml b/src/main/java/org/jabref/gui/strings/StringDialog.fxml
index f742cfb1c34..eea62adbf6a 100644
--- a/src/main/java/org/jabref/gui/strings/StringDialog.fxml
+++ b/src/main/java/org/jabref/gui/strings/StringDialog.fxml
@@ -1,5 +1,6 @@
 <?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?>
@@ -12,9 +13,9 @@
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
 
-<DialogPane prefHeight="340.0" prefWidth="427.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.strings.StringDialogView">
+<DialogPane minWidth="-Infinity" prefHeight="340.0" prefWidth="427.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.strings.StringDialogView">
    <header>
-      <ToolBar prefHeight="40.0" prefWidth="299.0">
+      <ToolBar prefHeight="40.0" prefWidth="300.0">
         <items>
             <Button fx:id="btnRemove" mnemonicParsing="false" onAction="#removeString" />
             <Separator orientation="VERTICAL" prefHeight="200.0" />
@@ -25,7 +26,7 @@
    <content>
       <VBox>
          <children>
-            <TableView fx:id="tblStrings" prefHeight="250.0" prefWidth="0.0">
+            <TableView fx:id="tblStrings" prefHeight="250.0">
               <columns>
                 <TableColumn fx:id="colLabel" prefWidth="75.0" text="%Label" />
                 <TableColumn fx:id="colContent" prefWidth="75.0" text="%Content" />
@@ -34,11 +35,15 @@
                   <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
                </columnResizePolicy>
             </TableView>
-            <HBox prefHeight="100.0" prefWidth="200.0">
+            <HBox minWidth="-Infinity" prefHeight="100.0" prefWidth="300.0" spacing="5.0">
                <children>
-                  <Label text="%Label" />
+                  <Label text="%Label" HBox.hgrow="ALWAYS">
+                     <opaqueInsets>
+                        <Insets />
+                     </opaqueInsets>
+                  </Label>
                   <TextField fx:id="stringLabel" />
-                <Button fx:id="btnNewString" mnemonicParsing="false" onAction="#addString" />
+                <Button fx:id="btnNewString" minWidth="-Infinity" mnemonicParsing="false" onAction="#addString" />
                </children>
             </HBox>
          </children>
diff --git a/src/main/java/org/jabref/gui/strings/StringDialogView.java b/src/main/java/org/jabref/gui/strings/StringDialogView.java
index 82efcd372e6..ba1295b382b 100644
--- a/src/main/java/org/jabref/gui/strings/StringDialogView.java
+++ b/src/main/java/org/jabref/gui/strings/StringDialogView.java
@@ -1,6 +1,6 @@
 package org.jabref.gui.strings;
 
-import javafx.beans.binding.Bindings;
+import javafx.beans.value.ObservableValue;
 import javafx.collections.ObservableList;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
@@ -23,7 +23,6 @@
 import org.jabref.model.database.BibDatabase;
 
 import com.airhacks.afterburner.views.ViewLoader;
-import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
 import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
 import org.fxmisc.easybind.EasyBind;
 
@@ -40,7 +39,7 @@ public class StringDialogView extends BaseDialog<Void> {
     @FXML private TableColumn<StringViewModel, String> colContent;
 
     private final ControlsFxVisualizer visualizer = new ControlsFxVisualizer();
-    private StringDialogViewModel viewModel;
+    private final StringDialogViewModel viewModel;
 
     public StringDialogView(BibDatabase database) {
         viewModel = new StringDialogViewModel(database);
@@ -51,10 +50,11 @@ public StringDialogView(BibDatabase database) {
 
         Button btnSave = (Button) this.getDialogPane().lookupButton(saveButton);
 
-        ObservableList<ValidationStatus> labelsValid = EasyBind.map(viewModel.allStringsProperty(), StringViewModel::labelValidation).removeAll((ValidationStatus::isValid);
-        ObservableList<ValidationStatus> contentsValid = EasyBind.map(viewModel.allStringsProperty(), StringViewModel::contentValidation).filtered(ValidationStatus::isValid);
-
-        btnSave.disableProperty().bind(Bindings.isNotEmpty(labelsValid).or(Bindings.isNotEmpty(contentsValid)));
+        //Adapted from the EasyBind Tutorial: https://github.com/TomasMikula/EasyBind#example-disable-save-all-button-on-no-unsaved-changes
+        //Disable the button, if any of the validators is not valid
+        ObservableList<ObservableValue<Boolean>> allValidProperty = EasyBind.map(viewModel.allStringsProperty(), StringViewModel::combinedValidationValidProperty);
+        ObservableValue<Boolean> anyNotValid = EasyBind.combine(allValidProperty, stream -> stream.anyMatch(valid -> !valid));
+        btnSave.disableProperty().bind(anyNotValid);
 
         setResultConverter(btn -> {
             if (saveButton.equals(btn)) {
@@ -64,6 +64,7 @@ public StringDialogView(BibDatabase database) {
             return null;
         });
 
+        setTitle(Localization.lang("Strings for library"));
     }
 
     @FXML
@@ -77,7 +78,7 @@ private void initialize() {
         btnNewString.setTooltip(new Tooltip(Localization.lang("New string")));
 
         btnRemove.setGraphic(JabRefIcons.REMOVE.getGraphicNode());
-        btnRemove.setTooltip(new Tooltip(Localization.lang("Remove string")));
+        btnRemove.setTooltip(new Tooltip(Localization.lang("Remove selected strings")));
 
         colLabel.setCellValueFactory(cellData -> cellData.getValue().getLabel());
         colLabel.setCellFactory(column -> new TextFieldTableCell<StringViewModel, String>(new DefaultStringConverter()) {
diff --git a/src/main/java/org/jabref/gui/strings/StringViewModel.java b/src/main/java/org/jabref/gui/strings/StringViewModel.java
index 23f14d75f0b..1e71a469884 100644
--- a/src/main/java/org/jabref/gui/strings/StringViewModel.java
+++ b/src/main/java/org/jabref/gui/strings/StringViewModel.java
@@ -1,10 +1,15 @@
 package org.jabref.gui.strings;
 
 import java.util.function.Function;
+import java.util.regex.Pattern;
 
+import javafx.beans.property.ReadOnlyBooleanProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 
+import org.jabref.logic.l10n.Localization;
+
+import de.saxsys.mvvmfx.utils.validation.CompositeValidator;
 import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
 import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
 import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
@@ -12,17 +17,36 @@
 
 public class StringViewModel {
 
+    private final static Pattern IS_NUMBER = Pattern.compile("-?\\d+(\\.\\d+)?");
+
     private final StringProperty label = new SimpleStringProperty();
     private final StringProperty content = new SimpleStringProperty();
 
     private final Validator labelValidator;
     private final Validator contentValidator;
+    private final CompositeValidator combinedValidator;
 
-    private final Function<String, ValidationMessage> function = input -> {
+    private final Function<String, ValidationMessage> labelValidatorFunction = input -> {
         if (input == null) {
             return ValidationMessage.error("May not be null");
         } else if (input.trim().isEmpty()) {
-            return ValidationMessage.error("Should not be empty");
+            return ValidationMessage.error(Localization.lang("Please enter the string's label"));
+        } else if (IS_NUMBER.matcher(input).matches()) {
+            return ValidationMessage.error(Localization.lang("The label of the string cannot be a number."));
+        } else if (input.contains("#")) {
+            return ValidationMessage.error(Localization.lang("The label of the string cannot contain the '#' character."));
+        } else if (input.contains(" ")) {
+            return ValidationMessage.error(Localization.lang("The label of the string cannot contain spaces."));
+        } else {
+            return null; // everything is ok
+        }
+
+    };
+    private final Function<String, ValidationMessage> contentValidatorFunction = input -> {
+        if (input == null) {
+            return ValidationMessage.error("May not be null");
+        } else if (input.trim().isEmpty()) {
+            return ValidationMessage.error(Localization.lang("Must not be empty!"));
         } else {
             return null; // everything is ok
         }
@@ -33,8 +57,9 @@ public StringViewModel(String label, String content) {
         this.label.setValue(label);
         this.content.setValue(content);
 
-        labelValidator = new FunctionBasedValidator<>(this.label, function);
-        contentValidator = new FunctionBasedValidator<>(this.content, function);
+        labelValidator = new FunctionBasedValidator<>(this.label, labelValidatorFunction);
+        contentValidator = new FunctionBasedValidator<>(this.content, contentValidatorFunction);
+        combinedValidator = new CompositeValidator(labelValidator, contentValidator);
     }
 
     public Validator getlabelValidator() {
@@ -53,6 +78,14 @@ public ValidationStatus contentValidation() {
         return contentValidator.getValidationStatus();
     }
 
+    public ValidationStatus combinedValidation() {
+        return combinedValidator.getValidationStatus();
+    }
+
+    public ReadOnlyBooleanProperty combinedValidationValidProperty() {
+        return combinedValidator.getValidationStatus().validProperty();
+    }
+
     public StringProperty getLabel() {
         return label;
     }
@@ -68,4 +101,5 @@ public void setLabel(String label) {
     public void setContent(String content) {
         this.content.setValue(content);
     }
+
 }
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index b16d0af4639..7dc6e83b431 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -255,8 +255,6 @@ Delete\ multiple\ entries=Delete multiple entries
 
 Delete\ rows=Delete rows
 
-Delete\ strings=Delete strings
-
 Deleted=Deleted
 
 Permanently\ delete\ local\ file=Permanently delete local file
@@ -1434,7 +1432,6 @@ Toggle\ print\ status=Toggle print status
 Update\ keywords=Update keywords
 Write\ values\ of\ special\ fields\ as\ separate\ fields\ to\ BibTeX=Write values of special fields as separate fields to BibTeX
 You\ have\ changed\ settings\ for\ special\ fields.=You have changed settings for special fields.
-A\ string\ with\ that\ label\ already\ exists=A string with that label already exists
 Connection\ to\ OpenOffice/LibreOffice\ has\ been\ lost.\ Please\ make\ sure\ OpenOffice/LibreOffice\ is\ running,\ and\ try\ to\ reconnect.=Connection to OpenOffice/LibreOffice has been lost. Please make sure OpenOffice/LibreOffice is running, and try to reconnect.
 JabRef\ will\ send\ at\ least\ one\ request\ per\ entry\ to\ a\ publisher.=JabRef will send at least one request per entry to a publisher.
 Correct\ the\ entry,\ and\ reopen\ editor\ to\ display/edit\ source.=Correct the entry, and reopen editor to display/edit source.
@@ -2221,3 +2218,5 @@ Cleared\ connection\ settings=Cleared connection settings
 
 Error\ adding\ discovered\ CitationStyles=Error adding discovered CitationStyles
 
+Must\ not\ be\ empty\!=Must not be empty\!
+

From 72bd1adc95960cbaa373b3ef32e2e3d478bd12ca Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Sat, 2 Feb 2019 19:11:47 +0100
Subject: [PATCH 17/28] fix codacy, improve layout

---
 .../org/jabref/gui/strings/StringDialog.fxml  |  2 +-
 .../jabref/gui/strings/StringDialogView.java  | 27 ++++++++-----------
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/src/main/java/org/jabref/gui/strings/StringDialog.fxml b/src/main/java/org/jabref/gui/strings/StringDialog.fxml
index eea62adbf6a..2aac98f782b 100644
--- a/src/main/java/org/jabref/gui/strings/StringDialog.fxml
+++ b/src/main/java/org/jabref/gui/strings/StringDialog.fxml
@@ -13,7 +13,7 @@
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
 
-<DialogPane minWidth="-Infinity" prefHeight="340.0" prefWidth="427.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.strings.StringDialogView">
+<DialogPane minHeight="-Infinity" minWidth="-Infinity" prefHeight="340.0" prefWidth="427.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.strings.StringDialogView">
    <header>
       <ToolBar prefHeight="40.0" prefWidth="300.0">
         <items>
diff --git a/src/main/java/org/jabref/gui/strings/StringDialogView.java b/src/main/java/org/jabref/gui/strings/StringDialogView.java
index ba1295b382b..1c3dfcad2af 100644
--- a/src/main/java/org/jabref/gui/strings/StringDialogView.java
+++ b/src/main/java/org/jabref/gui/strings/StringDialogView.java
@@ -87,15 +87,12 @@ private void initialize() {
             public void updateItem(String item, boolean empty) {
                 super.updateItem(item, empty);
 
-                if (!empty) {
-                    if (getTableRow() != null) {
-                        Object rowItem = getTableRow().getItem();
+                if (!empty && (getTableRow() != null)) {
+                    Object rowItem = getTableRow().getItem();
 
-                        if ((rowItem != null) && (rowItem instanceof StringViewModel)) {
-                            StringViewModel vm = (StringViewModel) rowItem;
-
-                            visualizer.initVisualization(vm.labelValidation(), this);
-                        }
+                    if ((rowItem != null) && (rowItem instanceof StringViewModel)) {
+                        StringViewModel vm = (StringViewModel) rowItem;
+                        visualizer.initVisualization(vm.labelValidation(), this);
                     }
                 }
             }
@@ -108,17 +105,15 @@ public void updateItem(String item, boolean empty) {
             public void updateItem(String item, boolean empty) {
                 super.updateItem(item, empty);
 
-                if (!empty) {
-                    if (getTableRow() != null) {
-                        Object rowItem = getTableRow().getItem();
-
-                        if ((rowItem != null) && (rowItem instanceof StringViewModel)) {
-                            StringViewModel vm = (StringViewModel) rowItem;
+                if (!empty && (getTableRow() != null)) {
+                    Object rowItem = getTableRow().getItem();
 
-                            visualizer.initVisualization(vm.contentValidation(), this);
-                        }
+                    if ((rowItem != null) && (rowItem instanceof StringViewModel)) {
+                        StringViewModel vm = (StringViewModel) rowItem;
+                        visualizer.initVisualization(vm.contentValidation(), this);
                     }
                 }
+
             }
         });
 

From 23be3e34fb6443b4d6b8924725b99b958897ab9f Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Sun, 3 Feb 2019 13:07:00 +0100
Subject: [PATCH 18/28] Refactorings and renamings

---
 src/main/java/org/jabref/gui/Base.css         |   18 +
 src/main/java/org/jabref/gui/JabRefFrame.java |   34 +-
 .../java/org/jabref/gui/JabRefFrame.java.orig | 1550 -----------------
 .../AddNewBibtexString.fxml}                  |   28 +-
 .../BibtexStringEditorAction.java}            |    8 +-
 .../BibtexStringEditorDialogView.java}        |   49 +-
 .../BibtexStringEditorDialogViewModel.java    |  103 ++
 .../BibtexStringViewModel.java}               |   63 +-
 .../gui/{ => metadata}/PreambleEditor.java    |    4 +-
 .../org/jabref/gui/strings/StringDialog.css   |   16 -
 .../gui/strings/StringDialogViewModel.java    |   85 -
 .../jabref/gui/undo/UndoableInsertString.java |    3 -
 .../jabref/gui/undo/UndoableRemoveString.java |    6 -
 .../jabref/gui/undo/UndoableStringChange.java |    5 -
 .../jabref/model/database/BibDatabase.java    |   18 +-
 15 files changed, 204 insertions(+), 1786 deletions(-)
 delete mode 100644 src/main/java/org/jabref/gui/JabRefFrame.java.orig
 rename src/main/java/org/jabref/gui/{strings/StringDialog.fxml => metadata/AddNewBibtexString.fxml} (60%)
 rename src/main/java/org/jabref/gui/{strings/StringAction.java => metadata/BibtexStringEditorAction.java} (59%)
 rename src/main/java/org/jabref/gui/{strings/StringDialogView.java => metadata/BibtexStringEditorDialogView.java} (67%)
 create mode 100644 src/main/java/org/jabref/gui/metadata/BibtexStringEditorDialogViewModel.java
 rename src/main/java/org/jabref/gui/{strings/StringViewModel.java => metadata/BibtexStringViewModel.java} (87%)
 rename src/main/java/org/jabref/gui/{ => metadata}/PreambleEditor.java (94%)
 delete mode 100644 src/main/java/org/jabref/gui/strings/StringDialog.css
 delete mode 100644 src/main/java/org/jabref/gui/strings/StringDialogViewModel.java

diff --git a/src/main/java/org/jabref/gui/Base.css b/src/main/java/org/jabref/gui/Base.css
index ec78513a06b..ab4097899cc 100644
--- a/src/main/java/org/jabref/gui/Base.css
+++ b/src/main/java/org/jabref/gui/Base.css
@@ -975,3 +975,21 @@ We want to have a look that matches our icons in the tool-bar */
 .color-palette-region .button {
     -fx-border-width: 0px;
 }
+
+
+.warning-icon {
+    -fx-fill: -jr-warn;
+}
+
+.error-icon {
+    -fx-text-fill: -jr-error;
+    -fx-fill: -jr-error;
+}
+
+.tooltip-warning {
+    -fx-background-color: -jr-warn;
+}
+
+.tooltip-error {
+    -fx-background-color: -jr-error;
+}
diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index 107fb699bb0..7d8d531c8b5 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -98,11 +98,12 @@
 import org.jabref.gui.keyboard.KeyBinding;
 import org.jabref.gui.menus.FileHistoryMenu;
 import org.jabref.gui.mergeentries.MergeEntriesAction;
+import org.jabref.gui.metadata.PreambleEditor;
+import org.jabref.gui.metadata.BibtexStringEditorAction;
 import org.jabref.gui.push.PushToApplicationButton;
 import org.jabref.gui.push.PushToApplications;
 import org.jabref.gui.search.GlobalSearchBar;
 import org.jabref.gui.specialfields.SpecialFieldMenuItemFactory;
-import org.jabref.gui.strings.StringAction;
 import org.jabref.gui.undo.CountingUndoManager;
 import org.jabref.gui.util.DefaultTaskExecutor;
 import org.jabref.logic.autosaveandbackup.AutosaveManager;
@@ -849,7 +850,7 @@ private MenuBar createMenu() {
 
                 factory.createMenuItem(StandardActions.LIBRARY_PROPERTIES, new DatabasePropertiesAction(this)),
                 factory.createMenuItem(StandardActions.EDIT_PREAMBLE, new PreambleEditor(this)),
-                                  factory.createMenuItem(StandardActions.EDIT_STRINGS, new StringAction(this))
+                factory.createMenuItem(StandardActions.EDIT_STRINGS, new BibtexStringEditorAction(this))
 
         );
 
@@ -859,6 +860,7 @@ private MenuBar createMenu() {
             lookupIdentifiers.getItems().add(factory.createMenuItem(identifierAction.getAction(), identifierAction));
         }
 
+        //@formatter:off
         quality.getItems().addAll(
                 factory.createMenuItem(StandardActions.FIND_DUPLICATES, new DuplicateSearch(this, dialogService)),
                 factory.createMenuItem(StandardActions.MERGE_ENTRIES, new MergeEntriesAction(this)),
@@ -925,23 +927,23 @@ private MenuBar createMenu() {
         );
 
         options.getItems().addAll(
-                                  factory.createMenuItem(StandardActions.SHOW_PREFS, new ShowPreferencesAction(this, Globals.TASK_EXECUTOR)),
+                factory.createMenuItem(StandardActions.SHOW_PREFS, new ShowPreferencesAction(this, Globals.TASK_EXECUTOR)),
 
-                                  new SeparatorMenuItem(),
+                new SeparatorMenuItem(),
 
-                                  factory.createMenuItem(StandardActions.SETUP_GENERAL_FIELDS, new SetupGeneralFieldsAction()),
-                                  factory.createMenuItem(StandardActions.MANAGE_CUSTOM_IMPORTS, new ManageCustomImportsAction()),
-                                  factory.createMenuItem(StandardActions.MANAGE_CUSTOM_EXPORTS, new ManageCustomExportsAction()),
-                                  factory.createMenuItem(StandardActions.MANAGE_EXTERNAL_FILETYPES, new EditExternalFileTypesAction()),
-                                  factory.createMenuItem(StandardActions.MANAGE_JOURNALS, new ManageJournalsAction()),
-                                  factory.createMenuItem(StandardActions.CUSTOMIZE_KEYBINDING, new CustomizeKeyBindingAction()),
-                                  factory.createMenuItem(StandardActions.MANAGE_PROTECTED_TERMS, new ManageProtectedTermsAction(this, Globals.protectedTermsLoader)),
+                factory.createMenuItem(StandardActions.SETUP_GENERAL_FIELDS, new SetupGeneralFieldsAction()),
+                factory.createMenuItem(StandardActions.MANAGE_CUSTOM_IMPORTS, new ManageCustomImportsAction()),
+                factory.createMenuItem(StandardActions.MANAGE_CUSTOM_EXPORTS, new ManageCustomExportsAction()),
+                factory.createMenuItem(StandardActions.MANAGE_EXTERNAL_FILETYPES, new EditExternalFileTypesAction()),
+                factory.createMenuItem(StandardActions.MANAGE_JOURNALS, new ManageJournalsAction()),
+                factory.createMenuItem(StandardActions.CUSTOMIZE_KEYBINDING, new CustomizeKeyBindingAction()),
+                factory.createMenuItem(StandardActions.MANAGE_PROTECTED_TERMS, new ManageProtectedTermsAction(this, Globals.protectedTermsLoader)),
 
-                                  new SeparatorMenuItem(),
+                new SeparatorMenuItem(),
 
-                                  factory.createMenuItem(StandardActions.MANAGE_CONTENT_SELECTORS, new OldDatabaseCommandWrapper(Actions.MANAGE_SELECTORS, this, Globals.stateManager)),
-                                  factory.createMenuItem(StandardActions.CUSTOMIZE_ENTRY_TYPES, new CustomizeEntryAction(this)),
-                                  factory.createMenuItem(StandardActions.MANAGE_CITE_KEY_PATTERNS, new BibtexKeyPatternAction(this)));
+                factory.createMenuItem(StandardActions.MANAGE_CONTENT_SELECTORS, new OldDatabaseCommandWrapper(Actions.MANAGE_SELECTORS, this, Globals.stateManager)),
+                factory.createMenuItem(StandardActions.CUSTOMIZE_ENTRY_TYPES, new CustomizeEntryAction(this)),
+                factory.createMenuItem(StandardActions.MANAGE_CITE_KEY_PATTERNS, new BibtexKeyPatternAction(this)));
 
         help.getItems().addAll(
                 factory.createMenuItem(StandardActions.HELP, HelpAction.getMainHelpPageCommand()),
@@ -973,7 +975,7 @@ private MenuBar createMenu() {
                 ),
                 factory.createMenuItem(StandardActions.ABOUT, new AboutAction())
         );
-
+        //@formatter:on
         MenuBar menu = new MenuBar();
         menu.getStyleClass().add("mainMenu");
         menu.getMenus().addAll(
diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java.orig b/src/main/java/org/jabref/gui/JabRefFrame.java.orig
deleted file mode 100644
index 9cd904dd31d..00000000000
--- a/src/main/java/org/jabref/gui/JabRefFrame.java.orig
+++ /dev/null
@@ -1,1550 +0,0 @@
-package org.jabref.gui;
-
-import java.awt.Component;
-import java.awt.Window;
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.TimerTask;
-import java.util.stream.Collectors;
-
-import javax.swing.Action;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.SwingUtilities;
-
-import javafx.application.Platform;
-import javafx.beans.value.ChangeListener;
-import javafx.beans.value.ObservableValue;
-import javafx.collections.ListChangeListener;
-import javafx.scene.Node;
-import javafx.scene.control.Alert;
-import javafx.scene.control.Button;
-import javafx.scene.control.ButtonBar;
-import javafx.scene.control.ButtonType;
-import javafx.scene.control.Menu;
-import javafx.scene.control.MenuBar;
-import javafx.scene.control.ProgressBar;
-import javafx.scene.control.SeparatorMenuItem;
-import javafx.scene.control.SplitPane;
-import javafx.scene.control.Tab;
-import javafx.scene.control.TabPane;
-import javafx.scene.control.TextInputControl;
-import javafx.scene.control.ToolBar;
-import javafx.scene.control.Tooltip;
-import javafx.scene.input.DataFormat;
-import javafx.scene.input.KeyEvent;
-import javafx.scene.input.TransferMode;
-import javafx.scene.layout.BorderPane;
-import javafx.scene.layout.HBox;
-import javafx.scene.layout.Pane;
-import javafx.scene.layout.Priority;
-import javafx.stage.Stage;
-import javafx.util.Duration;
-
-import org.jabref.Globals;
-import org.jabref.JabRefExecutorService;
-import org.jabref.gui.actions.ActionFactory;
-import org.jabref.gui.actions.Actions;
-import org.jabref.gui.actions.AutoLinkFilesAction;
-import org.jabref.gui.actions.BibtexKeyPatternAction;
-import org.jabref.gui.actions.ConnectToSharedDatabaseCommand;
-import org.jabref.gui.actions.CopyFilesAction;
-import org.jabref.gui.actions.CustomizeEntryAction;
-import org.jabref.gui.actions.CustomizeKeyBindingAction;
-import org.jabref.gui.actions.DatabasePropertiesAction;
-import org.jabref.gui.actions.EditExternalFileTypesAction;
-import org.jabref.gui.actions.ErrorConsoleAction;
-import org.jabref.gui.actions.LookupIdentifierAction;
-import org.jabref.gui.actions.ManageCustomExportsAction;
-import org.jabref.gui.actions.ManageCustomImportsAction;
-import org.jabref.gui.actions.ManageJournalsAction;
-import org.jabref.gui.actions.ManageKeywordsAction;
-import org.jabref.gui.actions.ManageProtectedTermsAction;
-import org.jabref.gui.actions.NewDatabaseAction;
-import org.jabref.gui.actions.NewEntryAction;
-import org.jabref.gui.actions.NewEntryFromPlainTextAction;
-import org.jabref.gui.actions.NewSubLibraryAction;
-import org.jabref.gui.actions.OldDatabaseCommandWrapper;
-import org.jabref.gui.actions.OpenBrowserAction;
-import org.jabref.gui.actions.SearchForUpdateAction;
-import org.jabref.gui.actions.SetupGeneralFieldsAction;
-import org.jabref.gui.actions.ShowDocumentViewerAction;
-import org.jabref.gui.actions.ShowPreferencesAction;
-import org.jabref.gui.actions.SimpleCommand;
-import org.jabref.gui.actions.StandardActions;
-import org.jabref.gui.dialogs.AutosaveUIManager;
-import org.jabref.gui.edit.MassSetFieldsAction;
-import org.jabref.gui.exporter.ExportCommand;
-import org.jabref.gui.exporter.ExportToClipboardAction;
-import org.jabref.gui.exporter.SaveAllAction;
-import org.jabref.gui.exporter.SaveDatabaseAction;
-import org.jabref.gui.externalfiles.FindUnlinkedFilesAction;
-import org.jabref.gui.externalfiletype.ExternalFileTypes;
-import org.jabref.gui.help.AboutAction;
-import org.jabref.gui.help.HelpAction;
-import org.jabref.gui.importer.ImportCommand;
-import org.jabref.gui.importer.ImportInspectionDialog;
-import org.jabref.gui.importer.actions.OpenDatabaseAction;
-import org.jabref.gui.integrity.IntegrityCheckAction;
-import org.jabref.gui.keyboard.KeyBinding;
-import org.jabref.gui.menus.FileHistoryMenu;
-import org.jabref.gui.mergeentries.MergeEntriesAction;
-import org.jabref.gui.push.PushToApplicationButton;
-import org.jabref.gui.push.PushToApplications;
-import org.jabref.gui.search.GlobalSearchBar;
-<<<<<<< HEAD
-import org.jabref.gui.specialfields.SpecialFieldValueViewModel;
-import org.jabref.gui.strings.StringAction;
-=======
-import org.jabref.gui.specialfields.SpecialFieldMenuItemFactory;
->>>>>>> upstream/master
-import org.jabref.gui.undo.CountingUndoManager;
-import org.jabref.gui.util.DefaultTaskExecutor;
-import org.jabref.logic.autosaveandbackup.AutosaveManager;
-import org.jabref.logic.autosaveandbackup.BackupManager;
-import org.jabref.logic.importer.IdFetcher;
-import org.jabref.logic.importer.OpenDatabase;
-import org.jabref.logic.importer.OutputPrinter;
-import org.jabref.logic.importer.ParserResult;
-import org.jabref.logic.importer.WebFetchers;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.search.SearchQuery;
-import org.jabref.logic.undo.AddUndoableActionEvent;
-import org.jabref.logic.undo.UndoChangeEvent;
-import org.jabref.logic.undo.UndoRedoEvent;
-import org.jabref.logic.util.OS;
-import org.jabref.logic.util.io.FileUtil;
-import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.model.database.BibDatabaseMode;
-import org.jabref.model.database.shared.DatabaseLocation;
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.BiblatexEntryTypes;
-import org.jabref.model.entry.BibtexEntryTypes;
-import org.jabref.model.entry.FieldName;
-import org.jabref.model.entry.specialfields.SpecialField;
-import org.jabref.preferences.JabRefPreferences;
-import org.jabref.preferences.LastFocusedTabPreferences;
-import org.jabref.preferences.SearchPreferences;
-
-import com.google.common.eventbus.Subscribe;
-import com.jfoenix.controls.JFXSnackbar;
-import com.jfoenix.controls.JFXSnackbar.SnackbarEvent;
-import com.jfoenix.controls.JFXSnackbarLayout;
-import org.eclipse.fx.ui.controls.tabpane.DndTabPane;
-import org.eclipse.fx.ui.controls.tabpane.DndTabPaneFactory;
-import org.fxmisc.easybind.EasyBind;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import osx.macadapter.MacAdapter;
-
-/**
- * The main window of the application.
- */
-public class JabRefFrame extends BorderPane implements OutputPrinter {
-
-    // Frame titles.
-    public static final String FRAME_TITLE = "JabRef";
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(JabRefFrame.class);
-    private static final Duration TOAST_MESSAGE_DISPLAY_TIME = Duration.millis(3000);
-
-    private final SplitPane splitPane = new SplitPane();
-    private final JabRefPreferences prefs = Globals.prefs;
-    private final GlobalSearchBar globalSearchBar = new GlobalSearchBar(this);
-    private final JFXSnackbar statusLine = new JFXSnackbar(this);
-    private final ProgressBar progressBar = new ProgressBar();
-    private final FileHistoryMenu fileHistory = new FileHistoryMenu(prefs, this);
-
-    // Lists containing different subsets of actions for different purposes
-    private final List<Object> specialFieldButtons = new LinkedList<>();
-    private final List<Object> openDatabaseOnlyActions = new LinkedList<>();
-    private final List<Object> severalDatabasesOnlyActions = new LinkedList<>();
-    private final List<Object> openAndSavedDatabasesOnlyActions = new LinkedList<>();
-    private final List<Object> sharedDatabaseOnlyActions = new LinkedList<>();
-    private final List<Object> noSharedDatabaseActions = new LinkedList<>();
-    private final List<Object> oneEntryOnlyActions = new LinkedList<>();
-    private final List<Object> oneEntryWithFileOnlyActions = new LinkedList<>();
-    private final List<Object> oneEntryWithURLorDOIOnlyActions = new LinkedList<>();
-    private final List<Object> twoEntriesOnlyActions = new LinkedList<>();
-    private final List<Object> atLeastOneEntryActions = new LinkedList<>();
-    private final Stage mainStage;
-    // The sidepane manager takes care of populating the sidepane.
-    private SidePaneManager sidePaneManager;
-    private TabPane tabbedPane;
-    private PushToApplications pushApplications;
-    private final CountingUndoManager undoManager = new CountingUndoManager();
-    private final DialogService dialogService;
-    private SidePane sidePane;
-
-    public JabRefFrame(Stage mainStage) {
-        this.mainStage = mainStage;
-        this.dialogService = new FXDialogService(mainStage);
-        init();
-    }
-
-    /**
-     * Takes a list of Object and calls the method setEnabled on them, depending on whether it is an Action or a
-     * Component.
-     *
-     * @param list List that should contain Actions and Components.
-     */
-    private static void setEnabled(List<Object> list, boolean enabled) {
-        for (Object actionOrComponent : list) {
-            if (actionOrComponent instanceof Action) {
-                ((Action) actionOrComponent).setEnabled(enabled);
-            }
-            if (actionOrComponent instanceof Component) {
-                ((Component) actionOrComponent).setEnabled(enabled);
-                if (actionOrComponent instanceof JPanel) {
-                    JPanel root = (JPanel) actionOrComponent;
-                    for (int index = 0; index < root.getComponentCount(); index++) {
-                        root.getComponent(index).setEnabled(enabled);
-                    }
-                }
-            }
-        }
-    }
-
-    private void init() {
-        sidePaneManager = new SidePaneManager(Globals.prefs, this);
-        sidePane = sidePaneManager.getPane();
-
-        Pane containerPane = DndTabPaneFactory.createDefaultDnDPane(DndTabPaneFactory.FeedbackType.MARKER, null);
-        tabbedPane = (DndTabPane) containerPane.getChildren().get(0);
-
-        initLayout();
-
-        initActions();
-
-        initKeyBindings();
-
-        tabbedPane.setOnDragOver(event -> {
-            if (event.getDragboard().hasFiles()) {
-                event.acceptTransferModes(TransferMode.COPY, TransferMode.MOVE, TransferMode.LINK);
-            }
-        });
-
-        tabbedPane.setOnDragDropped(event -> {
-            boolean success = false;
-
-            if (event.getDragboard().hasContent(DataFormat.FILES)) {
-                List<Path> files = event.getDragboard().getFiles().stream().map(File::toPath).filter(FileUtil::isBibFile).collect(Collectors.toList());
-                success = true;
-
-                for (Path file : files) {
-                    ParserResult pr = OpenDatabase.loadDatabase(file.toString(), Globals.prefs.getImportFormatPreferences(), Globals.getFileUpdateMonitor());
-                    addParserResult(pr, true);
-                }
-            }
-
-            event.setDropCompleted(success);
-            event.consume();
-        });
-
-        //setBounds(GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds());
-        //WindowLocation pw = new WindowLocation(this, JabRefPreferences.POS_X, JabRefPreferences.POS_Y, JabRefPreferences.SIZE_X,
-        //        JabRefPreferences.SIZE_Y);
-        //pw.displayWindowAtStoredLocation();
-
-        /*
-         * The following state listener makes sure focus is registered with the
-         * correct database when the user switches tabs. Without this,
-         * cut/paste/copy operations would some times occur in the wrong tab.
-         */
-        EasyBind.subscribe(tabbedPane.getSelectionModel().selectedItemProperty(), e -> {
-            if (e == null) {
-                Globals.stateManager.activeDatabaseProperty().setValue(Optional.empty());
-                return;
-            }
-
-            BasePanel currentBasePanel = getCurrentBasePanel();
-            if (currentBasePanel == null) {
-                return;
-            }
-
-            // Poor-mans binding to global state
-            // We need to invoke this in the JavaFX thread as all the listeners sit there
-            Platform.runLater(() -> Globals.stateManager.activeDatabaseProperty().setValue(Optional.of(currentBasePanel.getBibDatabaseContext())));
-            if (new SearchPreferences(Globals.prefs).isGlobalSearch()) {
-                globalSearchBar.performSearch();
-            } else {
-                String content = "";
-                Optional<SearchQuery> currentSearchQuery = currentBasePanel.getCurrentSearchQuery();
-                if (currentSearchQuery.isPresent()) {
-                    content = currentSearchQuery.get().getQuery();
-                }
-                globalSearchBar.setSearchTerm(content);
-            }
-
-            currentBasePanel.getPreviewPanel().updateLayout(Globals.prefs.getPreviewPreferences());
-
-            // groupSidePane.getToggleCommand().setSelected(sidePaneManager.isComponentVisible(GroupSidePane.class));
-            //previewToggle.setSelected(Globals.prefs.getPreviewPreferences().isPreviewPanelEnabled());
-            //generalFetcher.getToggleCommand().setSelected(sidePaneManager.isComponentVisible(WebSearchPane.class));
-            //openOfficePanel.getToggleCommand().setSelected(sidePaneManager.isComponentVisible(OpenOfficeSidePanel.class));
-
-            setWindowTitle();
-            // Update search autocompleter with information for the correct database:
-            currentBasePanel.updateSearchManager();
-
-            currentBasePanel.getUndoManager().postUndoRedoEvent();
-            currentBasePanel.getMainTable().requestFocus();
-        });
-
-        //Note: The registration of Apple event is at the end of initialization, because
-        //if the events happen too early (ie when the window is not initialized yet), the
-        //opened (double-clicked) documents are not displayed.
-        if (OS.OS_X) {
-            try {
-                new MacAdapter().registerMacEvents(this);
-            } catch (Exception e) {
-                LOGGER.error("Could not interface with Mac OS X methods.", e);
-            }
-        }
-
-        initShowTrackingNotification();
-    }
-
-    private void initKeyBindings() {
-        addEventFilter(KeyEvent.KEY_PRESSED, event -> {
-            Optional<KeyBinding> keyBinding = Globals.getKeyPrefs().mapToKeyBinding(event);
-            if (keyBinding.isPresent()) {
-                switch (keyBinding.get()) {
-                    case FOCUS_ENTRY_TABLE:
-                        getCurrentBasePanel().getMainTable().requestFocus();
-                        event.consume();
-                        break;
-                    case NEXT_LIBRARY:
-                        tabbedPane.getSelectionModel().selectNext();
-                        event.consume();
-                        break;
-                    case PREVIOUS_LIBRARY:
-                        tabbedPane.getSelectionModel().selectPrevious();
-                        event.consume();
-                        break;
-                    case INCREASE_TABLE_FONT_SIZE:
-                        increaseTableFontSize();
-                        event.consume();
-                        break;
-                    case DECREASE_TABLE_FONT_SIZE:
-                        decreaseTableFontSize();
-                        event.consume();
-                        break;
-                    case DEFAULT_TABLE_FONT_SIZE:
-                        setDefaultTableFontSize();
-                        event.consume();
-                        break;
-                    case SEARCH:
-                        getGlobalSearchBar().focus();
-                        break;
-                    default:
-                }
-            }
-        });
-    }
-
-    private void initShowTrackingNotification() {
-        if (!Globals.prefs.shouldAskToCollectTelemetry()) {
-            JabRefExecutorService.INSTANCE.submit(new TimerTask() {
-
-                @Override
-                public void run() {
-                    SwingUtilities.invokeLater(() -> {
-                        DefaultTaskExecutor.runInJavaFXThread(JabRefFrame.this::showTrackingNotification);
-                    });
-                }
-            }, 60000); // run in one minute
-        }
-    }
-
-    private Void showTrackingNotification() {
-        if (!Globals.prefs.shouldCollectTelemetry()) {
-            boolean shouldCollect = dialogService.showConfirmationDialogAndWait(
-                    Localization.lang("Telemetry: Help make JabRef better"),
-                    Localization.lang("To improve the user experience, we would like to collect anonymous statistics on the features you use. We will only record what features you access and how often you do it. We will neither collect any personal data nor the content of bibliographic items. If you choose to allow data collection, you can later disable it via Options -> Preferences -> General."),
-                    Localization.lang("Share anonymous statistics"),
-                    Localization.lang("Don't share"));
-            Globals.prefs.setShouldCollectTelemetry(shouldCollect);
-        }
-
-        Globals.prefs.askedToCollectTelemetry();
-
-        return null;
-    }
-
-    public void refreshTitleAndTabs() {
-        DefaultTaskExecutor.runInJavaFXThread(() -> {
-
-            setWindowTitle();
-            updateAllTabTitles();
-        });
-    }
-
-    /**
-     * Sets the title of the main window.
-     */
-    public void setWindowTitle() {
-        BasePanel panel = getCurrentBasePanel();
-
-        // no database open
-        if (panel == null) {
-            //setTitle(FRAME_TITLE);
-            return;
-        }
-
-        String mode = panel.getBibDatabaseContext().getMode().getFormattedName();
-        String modeInfo = String.format(" (%s)", Localization.lang("%0 mode", mode));
-        boolean isAutosaveEnabled = Globals.prefs.getBoolean(JabRefPreferences.LOCAL_AUTO_SAVE);
-
-        if (panel.getBibDatabaseContext().getLocation() == DatabaseLocation.LOCAL) {
-            String changeFlag = panel.isModified() && !isAutosaveEnabled ? "*" : "";
-            String databaseFile = panel.getBibDatabaseContext()
-                                       .getDatabaseFile()
-                                       .map(File::getPath)
-                                       .orElse(GUIGlobals.UNTITLED_TITLE);
-            //setTitle(FRAME_TITLE + " - " + databaseFile + changeFlag + modeInfo);
-        } else if (panel.getBibDatabaseContext().getLocation() == DatabaseLocation.SHARED) {
-            //setTitle(FRAME_TITLE + " - " + panel.getBibDatabaseContext().getDBMSSynchronizer().getDBName() + " ["
-            //        + Localization.lang("shared") + "]" + modeInfo);
-        }
-    }
-
-    /**
-     * The MacAdapter calls this method when a "BIB" file has been double-clicked from the Finder.
-     */
-    public void openAction(String filePath) {
-        Path file = Paths.get(filePath);
-        // all the logic is done in openIt. Even raising an existing panel
-        getOpenDatabaseAction().openFile(file, true);
-    }
-
-    /**
-     * The MacAdapter calls this method when "About" is selected from the application menu.
-     */
-    public void about() {
-        HelpAction.getMainHelpPageCommand().execute();
-    }
-
-    public JabRefPreferences prefs() {
-        return prefs;
-    }
-
-    /**
-     * Tears down all things started by JabRef
-     * <p>
-     * FIXME: Currently some threads remain and therefore hinder JabRef to be closed properly
-     *
-     * @param filenames the filenames of all currently opened files - used for storing them if prefs openLastEdited is
-     *                  set to true
-     */
-    private void tearDownJabRef(List<String> filenames) {
-        //prefs.putBoolean(JabRefPreferences.WINDOW_MAXIMISED, getExtendedState() == Frame.MAXIMIZED_BOTH);
-
-        if (prefs.getBoolean(JabRefPreferences.OPEN_LAST_EDITED)) {
-            // Here we store the names of all current files. If
-            // there is no current file, we remove any
-            // previously stored filename.
-            if (filenames.isEmpty()) {
-                prefs.remove(JabRefPreferences.LAST_EDITED);
-            } else {
-                prefs.putStringList(JabRefPreferences.LAST_EDITED, filenames);
-                File focusedDatabase = getCurrentBasePanel().getBibDatabaseContext().getDatabaseFile().orElse(null);
-                new LastFocusedTabPreferences(prefs).setLastFocusedTab(focusedDatabase);
-            }
-        }
-
-        fileHistory.storeHistory();
-        prefs.flush();
-
-        // dispose all windows, even if they are not displayed anymore
-        for (Window window : Window.getWindows()) {
-            window.dispose();
-        }
-    }
-
-    /**
-     * General info dialog.  The MacAdapter calls this method when "Quit" is selected from the application menu, Cmd-Q
-     * is pressed, or "Quit" is selected from the Dock. The function returns a boolean indicating if quitting is ok or
-     * not.
-     * <p>
-     * Non-OSX JabRef calls this when choosing "Quit" from the menu
-     * <p>
-     * SIDE EFFECT: tears down JabRef
-     *
-     * @return true if the user chose to quit; false otherwise
-     */
-    public boolean quit() {
-        // First ask if the user really wants to close, if the library has not been saved since last save.
-        List<String> filenames = new ArrayList<>();
-        for (int i = 0; i < tabbedPane.getTabs().size(); i++) {
-            BasePanel panel = getBasePanelAt(i);
-            BibDatabaseContext context = panel.getBibDatabaseContext();
-
-            if (panel.isModified() && (context.getLocation() == DatabaseLocation.LOCAL)) {
-                tabbedPane.getSelectionModel().select(i);
-                if (!confirmClose(panel)) {
-                    return false;
-                }
-            } else if (context.getLocation() == DatabaseLocation.SHARED) {
-                context.convertToLocalDatabase();
-                context.getDBMSSynchronizer().closeSharedDatabase();
-                context.clearDBMSSynchronizer();
-            }
-            AutosaveManager.shutdown(context);
-            BackupManager.shutdown(context);
-            context.getDatabaseFile().map(File::getAbsolutePath).ifPresent(filenames::add);
-        }
-
-        // Wait for save operations to finish
-        for (int i = 0; i < tabbedPane.getTabs().size(); i++) {
-            if (getBasePanelAt(i).isSaving()) {
-                // There is a database still being saved, so we need to wait.
-                WaitForSaveOperation w = new WaitForSaveOperation(this);
-                w.show(); // This method won't return until canceled or the save operation is done.
-                if (w.canceled()) {
-                    return false; // The user clicked cancel.
-                }
-            }
-        }
-
-        // Good bye!
-        tearDownJabRef(filenames);
-        Platform.exit();
-        return true;
-    }
-
-    private void initLayout() {
-        setProgressBarVisible(false);
-
-        pushApplications = new PushToApplications(this.getDialogService());
-
-        BorderPane head = new BorderPane();
-        head.setTop(createMenu());
-        head.setCenter(createToolbar());
-        setTop(head);
-
-        SplitPane.setResizableWithParent(sidePane, Boolean.FALSE);
-        splitPane.getItems().addAll(sidePane, tabbedPane);
-
-        // We need to wait with setting the divider since it gets reset a few times during the initial set-up
-        mainStage.showingProperty().addListener(new ChangeListener<Boolean>() {
-
-            @Override
-            public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean showing) {
-                if (showing) {
-                    setDividerPosition();
-
-                    EasyBind.subscribe(sidePane.visibleProperty(), visible -> {
-                        if (visible) {
-                            if (!splitPane.getItems().contains(sidePane)) {
-                                splitPane.getItems().add(0, sidePane);
-                                setDividerPosition();
-                            }
-                        } else {
-                            splitPane.getItems().remove(sidePane);
-                        }
-                    });
-
-                    mainStage.showingProperty().removeListener(this);
-                    observable.removeListener(this);
-                }
-            }
-        });
-
-        setCenter(splitPane);
-
-        /*
-        GridBagLayout gbl = new GridBagLayout();
-        GridBagConstraints con = new GridBagConstraints();
-        con.fill = GridBagConstraints.BOTH;
-        con.anchor = GridBagConstraints.WEST;
-        JPanel status = new JPanel();
-        status.setLayout(gbl);
-        con.weighty = 0;
-        con.weightx = 0;
-        con.gridwidth = 1;
-        con.insets = new Insets(0, 2, 0, 0);
-        gbl.setConstraints(statusLabel, con);
-        status.add(statusLabel);
-        con.weightx = 1;
-        con.insets = new Insets(0, 4, 0, 0);
-        con.gridwidth = 1;
-        gbl.setConstraints(statusLine, con);
-        status.add(statusLine);
-        con.weightx = 0;
-        con.gridwidth = GridBagConstraints.REMAINDER;
-        con.insets = new Insets(2, 4, 2, 2);
-        gbl.setConstraints(progressBar, con);
-        status.add(progressBar);
-        statusLabel.setForeground(GUIGlobals.ENTRY_EDITOR_LABEL_COLOR.darker());
-        */
-    }
-
-    private void setDividerPosition() {
-        splitPane.setDividerPositions(prefs.getDouble(JabRefPreferences.SIDE_PANE_WIDTH));
-        if (!splitPane.getDividers().isEmpty()) {
-            EasyBind.subscribe(splitPane.getDividers().get(0).positionProperty(),
-                    position -> prefs.putDouble(JabRefPreferences.SIDE_PANE_WIDTH, position.doubleValue()));
-        }
-    }
-
-    private Node createToolbar() {
-        Pane leftSpacer = new Pane();
-        HBox.setHgrow(leftSpacer, Priority.SOMETIMES);
-        Pane rightSpacer = new Pane();
-        HBox.setHgrow(rightSpacer, Priority.SOMETIMES);
-
-        ActionFactory factory = new ActionFactory(Globals.getKeyPrefs());
-
-        Button newLibrary;
-        if (Globals.prefs.getBoolean(JabRefPreferences.BIBLATEX_DEFAULT_MODE)) {
-            newLibrary = factory.createIconButton(StandardActions.NEW_LIBRARY_BIBLATEX, new NewDatabaseAction(this, BibDatabaseMode.BIBLATEX));
-        } else {
-            newLibrary = factory.createIconButton(StandardActions.NEW_LIBRARY_BIBTEX, new NewDatabaseAction(this, BibDatabaseMode.BIBTEX));
-        }
-
-        HBox leftSide = new HBox(
-                newLibrary,
-                factory.createIconButton(StandardActions.OPEN_LIBRARY, new OpenDatabaseAction(this)),
-                factory.createIconButton(StandardActions.SAVE_LIBRARY, new OldDatabaseCommandWrapper(Actions.SAVE, this, Globals.stateManager)),
-                leftSpacer
-        );
-        leftSide.setMinWidth(100);
-        leftSide.prefWidthProperty().bind(sidePane.widthProperty());
-        leftSide.maxWidthProperty().bind(sidePane.widthProperty());
-
-        PushToApplicationButton pushToExternal = new PushToApplicationButton(this, pushApplications.getApplications());
-        HBox rightSide = new HBox(
-                factory.createIconButton(StandardActions.NEW_ARTICLE, new NewEntryAction(this, BiblatexEntryTypes.ARTICLE, dialogService, Globals.prefs)),
-                factory.createIconButton(StandardActions.DELETE_ENTRY, new OldDatabaseCommandWrapper(Actions.DELETE, this, Globals.stateManager)),
-
-                factory.createIconButton(StandardActions.UNDO, new OldDatabaseCommandWrapper(Actions.UNDO, this, Globals.stateManager)),
-                factory.createIconButton(StandardActions.REDO, new OldDatabaseCommandWrapper(Actions.REDO, this, Globals.stateManager)),
-                factory.createIconButton(StandardActions.CUT, new OldDatabaseCommandWrapper(Actions.CUT, this, Globals.stateManager)),
-                factory.createIconButton(StandardActions.COPY, new OldDatabaseCommandWrapper(Actions.COPY, this, Globals.stateManager)),
-                factory.createIconButton(StandardActions.PASTE, new OldDatabaseCommandWrapper(Actions.PASTE, this, Globals.stateManager)),
-
-                factory.createIconButton(StandardActions.CLEANUP_ENTRIES, new OldDatabaseCommandWrapper(Actions.CLEANUP, this, Globals.stateManager)),
-                factory.createIconButton(pushToExternal.getMenuAction(), pushToExternal),
-
-                factory.createIconButton(StandardActions.FORK_ME, new OpenBrowserAction("https://github.com/JabRef/jabref")),
-                factory.createIconButton(StandardActions.OPEN_FACEBOOK, new OpenBrowserAction("https://www.facebook.com/JabRef/")),
-                factory.createIconButton(StandardActions.OPEN_TWITTER, new OpenBrowserAction("https://twitter.com/jabref_org"))
-        );
-
-        HBox.setHgrow(globalSearchBar, Priority.ALWAYS);
-
-        ToolBar toolBar = new ToolBar(
-                leftSide,
-
-                globalSearchBar,
-
-                rightSpacer,
-                rightSide);
-        toolBar.getStyleClass().add("mainToolbar");
-
-        return toolBar;
-    }
-
-    /**
-     * Returns the indexed BasePanel.
-     *
-     * @param i Index of base
-     */
-    public BasePanel getBasePanelAt(int i) {
-        return (BasePanel) tabbedPane.getTabs().get(i).getContent();
-    }
-
-    /**
-     * Returns a list of BasePanel.
-     */
-    public List<BasePanel> getBasePanelList() {
-        List<BasePanel> returnList = new ArrayList<>();
-        for (int i = 0; i < getBasePanelCount(); i++) {
-            returnList.add(getBasePanelAt(i));
-        }
-        return returnList;
-    }
-
-    public void showBasePanelAt(int i) {
-        tabbedPane.getSelectionModel().select(i);
-    }
-
-    public void showBasePanel(BasePanel bp) {
-        tabbedPane.getSelectionModel().select(getTab(bp));
-    }
-
-    /**
-     * Returns the currently viewed BasePanel.
-     */
-    public BasePanel getCurrentBasePanel() {
-        if ((tabbedPane == null) || (tabbedPane.getSelectionModel().getSelectedItem() == null)) {
-            return null;
-        }
-        return (BasePanel) tabbedPane.getSelectionModel().getSelectedItem().getContent();
-    }
-
-    /**
-     * @return the BasePanel count.
-     */
-    public int getBasePanelCount() {
-        return tabbedPane.getTabs().size();
-    }
-
-    private Tab getTab(BasePanel comp) {
-        for (Tab tab : tabbedPane.getTabs()) {
-            if (tab.getContent() == comp) {
-                return tab;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * @deprecated do not operate on tabs but on BibDatabaseContexts
-     */
-    @Deprecated
-    public TabPane getTabbedPane() {
-        return tabbedPane;
-    }
-
-    public void setTabTitle(BasePanel comp, String title, String toolTip) {
-        DefaultTaskExecutor.runInJavaFXThread(() -> {
-            Tab tab = getTab(comp);
-            tab.setText(title);
-            tab.setTooltip(new Tooltip(toolTip));
-        });
-    }
-
-    private MenuBar createMenu() {
-        ActionFactory factory = new ActionFactory(Globals.getKeyPrefs());
-        Menu file = new Menu(Localization.lang("File"));
-        Menu edit = new Menu(Localization.lang("Edit"));
-        Menu library = new Menu(Localization.lang("Library"));
-        Menu quality = new Menu(Localization.lang("Quality"));
-        Menu view = new Menu(Localization.lang("View"));
-        Menu tools = new Menu(Localization.lang("Tools"));
-        Menu options = new Menu(Localization.lang("Options"));
-        Menu help = new Menu(Localization.lang("Help"));
-
-        file.getItems().addAll(
-                factory.createMenuItem(StandardActions.NEW_LIBRARY_BIBTEX, new NewDatabaseAction(this, BibDatabaseMode.BIBTEX)),
-                factory.createMenuItem(StandardActions.NEW_LIBRARY_BIBLATEX, new NewDatabaseAction(this, BibDatabaseMode.BIBLATEX)),
-                factory.createMenuItem(StandardActions.OPEN_LIBRARY, getOpenDatabaseAction()),
-                factory.createMenuItem(StandardActions.SAVE_LIBRARY, new OldDatabaseCommandWrapper(Actions.SAVE, this, Globals.stateManager)),
-                factory.createMenuItem(StandardActions.SAVE_LIBRARY_AS, new OldDatabaseCommandWrapper(Actions.SAVE_AS, this, Globals.stateManager)),
-                factory.createMenuItem(StandardActions.SAVE_ALL, new SaveAllAction(this)),
-
-                factory.createSubMenu(StandardActions.IMPORT_EXPORT,
-                        factory.createMenuItem(StandardActions.MERGE_DATABASE, new OldDatabaseCommandWrapper(Actions.MERGE_DATABASE, this, Globals.stateManager)), // TODO: merge with import
-                        factory.createMenuItem(StandardActions.IMPORT_INTO_CURRENT_LIBRARY, new ImportCommand(this, false)),
-                        factory.createMenuItem(StandardActions.IMPORT_INTO_NEW_LIBRARY, new ImportCommand(this, true)),
-                        factory.createMenuItem(StandardActions.EXPORT_ALL, new ExportCommand(this, false, Globals.prefs)),
-                        factory.createMenuItem(StandardActions.EXPORT_SELECTED, new ExportCommand(this, true, Globals.prefs)),
-                        factory.createMenuItem(StandardActions.SAVE_SELECTED_AS_PLAIN_BIBTEX, new OldDatabaseCommandWrapper(Actions.SAVE_SELECTED_AS_PLAIN, this, Globals.stateManager))),
-
-                new SeparatorMenuItem(),
-
-                factory.createMenuItem(StandardActions.CONNECT_TO_SHARED_DB, new ConnectToSharedDatabaseCommand(this)),
-                factory.createMenuItem(StandardActions.PULL_CHANGES_FROM_SHARED_DB, new OldDatabaseCommandWrapper(Actions.PULL_CHANGES_FROM_SHARED_DATABASE, this, Globals.stateManager)),
-
-                new SeparatorMenuItem(),
-
-                fileHistory,
-
-                new SeparatorMenuItem(),
-
-                factory.createMenuItem(StandardActions.CLOSE_LIBRARY, new CloseDatabaseAction()),
-                factory.createMenuItem(StandardActions.QUIT, new CloseAction())
-
-        );
-
-        edit.getItems().addAll(
-                factory.createMenuItem(StandardActions.UNDO, new OldDatabaseCommandWrapper(Actions.UNDO, this, Globals.stateManager)),
-                factory.createMenuItem(StandardActions.REDO, new OldDatabaseCommandWrapper(Actions.REDO, this, Globals.stateManager)),
-
-                new SeparatorMenuItem(),
-
-                factory.createMenuItem(StandardActions.CUT, new EditAction(Actions.CUT)),
-
-                factory.createMenuItem(StandardActions.COPY, new EditAction(Actions.COPY)),
-                factory.createSubMenu(StandardActions.COPY_MORE,
-                        factory.createMenuItem(StandardActions.COPY_TITLE, new OldDatabaseCommandWrapper(Actions.COPY_TITLE, this, Globals.stateManager)),
-                        factory.createMenuItem(StandardActions.COPY_KEY, new OldDatabaseCommandWrapper(Actions.COPY_KEY, this, Globals.stateManager)),
-                        factory.createMenuItem(StandardActions.COPY_CITE_KEY, new OldDatabaseCommandWrapper(Actions.COPY_CITE_KEY, this, Globals.stateManager)),
-                        factory.createMenuItem(StandardActions.COPY_KEY_AND_TITLE, new OldDatabaseCommandWrapper(Actions.COPY_KEY_AND_TITLE, this, Globals.stateManager)),
-                        factory.createMenuItem(StandardActions.COPY_KEY_AND_LINK, new OldDatabaseCommandWrapper(Actions.COPY_KEY_AND_LINK, this, Globals.stateManager)),
-                        factory.createMenuItem(StandardActions.COPY_CITATION_PREVIEW, new OldDatabaseCommandWrapper(Actions.COPY_CITATION_HTML, this, Globals.stateManager)),
-                        factory.createMenuItem(StandardActions.EXPORT_SELECTED_TO_CLIPBOARD, new ExportToClipboardAction(this, dialogService))),
-
-                factory.createMenuItem(StandardActions.PASTE, new EditAction(Actions.PASTE)),
-
-                new SeparatorMenuItem(),
-
-                factory.createMenuItem(StandardActions.SEND_AS_EMAIL, new OldDatabaseCommandWrapper(Actions.SEND_AS_EMAIL, this, Globals.stateManager)),
-
-                new SeparatorMenuItem()
-
-        );
-
-        if (Globals.prefs.getBoolean(JabRefPreferences.SPECIALFIELDSENABLED)) {
-            boolean menuItemAdded = false;
-            if (Globals.prefs.getBoolean(JabRefPreferences.SHOWCOLUMN_RANKING)) {
-                edit.getItems().add(SpecialFieldMenuItemFactory.createSpecialFieldMenuForActiveDatabase(SpecialField.RANKING, factory, undoManager));
-                menuItemAdded = true;
-            }
-
-            if (Globals.prefs.getBoolean(JabRefPreferences.SHOWCOLUMN_RELEVANCE)) {
-                edit.getItems().add(SpecialFieldMenuItemFactory.getSpecialFieldSingleItemForActiveDatabase(SpecialField.RELEVANCE, factory));
-                menuItemAdded = true;
-            }
-
-            if (Globals.prefs.getBoolean(JabRefPreferences.SHOWCOLUMN_QUALITY)) {
-                edit.getItems().add(SpecialFieldMenuItemFactory.getSpecialFieldSingleItemForActiveDatabase(SpecialField.QUALITY, factory));
-                menuItemAdded = true;
-            }
-
-            if (Globals.prefs.getBoolean(JabRefPreferences.SHOWCOLUMN_PRINTED)) {
-                edit.getItems().add(SpecialFieldMenuItemFactory.getSpecialFieldSingleItemForActiveDatabase(SpecialField.PRINTED, factory));
-                menuItemAdded = true;
-            }
-
-            if (Globals.prefs.getBoolean(JabRefPreferences.SHOWCOLUMN_PRIORITY)) {
-                edit.getItems().add(SpecialFieldMenuItemFactory.createSpecialFieldMenuForActiveDatabase(SpecialField.PRIORITY, factory, undoManager));
-                menuItemAdded = true;
-            }
-
-            if (Globals.prefs.getBoolean(JabRefPreferences.SHOWCOLUMN_READ)) {
-                edit.getItems().add(SpecialFieldMenuItemFactory.createSpecialFieldMenuForActiveDatabase(SpecialField.READ_STATUS, factory, undoManager));
-                menuItemAdded = true;
-            }
-
-            if (menuItemAdded) {
-                edit.getItems().add(new SeparatorMenuItem());
-            }
-        }
-
-        edit.getItems().addAll(
-                factory.createMenuItem(StandardActions.MANAGE_KEYWORDS, new ManageKeywordsAction(this)),
-                factory.createMenuItem(StandardActions.REPLACE_ALL, new OldDatabaseCommandWrapper(Actions.REPLACE_ALL, this, Globals.stateManager)),
-                factory.createMenuItem(StandardActions.MASS_SET_FIELDS, new MassSetFieldsAction(this))
-
-        );
-
-        library.getItems().addAll(
-                factory.createMenuItem(StandardActions.NEW_ARTICLE, new NewEntryAction(this, BibtexEntryTypes.ARTICLE, dialogService, Globals.prefs)),
-                factory.createMenuItem(StandardActions.NEW_ENTRY, new NewEntryAction(this, dialogService, Globals.prefs)),
-                factory.createMenuItem(StandardActions.NEW_ENTRY_FROM_PLAINTEX, new NewEntryFromPlainTextAction(this, Globals.prefs.getUpdateFieldPreferences(), dialogService, Globals.prefs)),
-
-                new SeparatorMenuItem(),
-
-                factory.createMenuItem(StandardActions.DELETE_ENTRY, new OldDatabaseCommandWrapper(Actions.DELETE, this, Globals.stateManager)),
-
-                new SeparatorMenuItem(),
-
-                factory.createMenuItem(StandardActions.LIBRARY_PROPERTIES, new DatabasePropertiesAction(this)),
-                factory.createMenuItem(StandardActions.EDIT_PREAMBLE, new PreambleEditor(this)),
-<<<<<<< HEAD
-                                  factory.createMenuItem(StandardActions.EDIT_STRINGS, new StringAction(this))
-
-=======
-                factory.createMenuItem(StandardActions.EDIT_STRINGS, new OldDatabaseCommandWrapper(Actions.EDIT_STRINGS, this, Globals.stateManager))
->>>>>>> upstream/master
-        );
-
-        Menu lookupIdentifiers = factory.createSubMenu(StandardActions.LOOKUP_DOC_IDENTIFIER);
-        for (IdFetcher<?> fetcher : WebFetchers.getIdFetchers(Globals.prefs.getImportFormatPreferences())) {
-            LookupIdentifierAction<?> identifierAction = new LookupIdentifierAction<>(this, fetcher);
-            lookupIdentifiers.getItems().add(factory.createMenuItem(identifierAction.getAction(), identifierAction));
-        }
-
-        quality.getItems().addAll(
-                factory.createMenuItem(StandardActions.FIND_DUPLICATES, new DuplicateSearch(this)),
-                factory.createMenuItem(StandardActions.MERGE_ENTRIES, new MergeEntriesAction(this)),
-
-                new SeparatorMenuItem(),
-
-                factory.createMenuItem(StandardActions.RESOLVE_DUPLICATE_KEYS, new OldDatabaseCommandWrapper(Actions.RESOLVE_DUPLICATE_KEYS, this, Globals.stateManager)),
-                factory.createMenuItem(StandardActions.CHECK_INTEGRITY, new IntegrityCheckAction(this)),
-                factory.createMenuItem(StandardActions.CLEANUP_ENTRIES, new OldDatabaseCommandWrapper(Actions.CLEANUP, this, Globals.stateManager)),
-                factory.createMenuItem(StandardActions.GENERATE_CITE_KEYS, new OldDatabaseCommandWrapper(Actions.MAKE_KEY, this, Globals.stateManager)),
-
-                new SeparatorMenuItem(),
-
-                factory.createMenuItem(StandardActions.SET_FILE_LINKS, new AutoLinkFilesAction()),
-                factory.createMenuItem(StandardActions.FIND_UNLINKED_FILES, new FindUnlinkedFilesAction(this)),
-                lookupIdentifiers,
-                factory.createMenuItem(StandardActions.DOWNLOAD_FULL_TEXT, new OldDatabaseCommandWrapper(Actions.DOWNLOAD_FULL_TEXT, this, Globals.stateManager))
-        );
-
-        SidePaneComponent webSearch = sidePaneManager.getComponent(SidePaneType.WEB_SEARCH);
-        SidePaneComponent groups = sidePaneManager.getComponent(SidePaneType.GROUPS);
-        SidePaneComponent openOffice = sidePaneManager.getComponent(SidePaneType.OPEN_OFFICE);
-
-        view.getItems().addAll(
-                factory.createMenuItem(webSearch.getToggleAction(), webSearch.getToggleCommand()),
-                factory.createMenuItem(groups.getToggleAction(), groups.getToggleCommand()),
-                factory.createMenuItem(StandardActions.TOGGLE_PREVIEW, new OldDatabaseCommandWrapper(Actions.TOGGLE_PREVIEW, this, Globals.stateManager)),
-                factory.createMenuItem(StandardActions.EDIT_ENTRY, new OldDatabaseCommandWrapper(Actions.EDIT, this, Globals.stateManager)),
-                factory.createMenuItem(StandardActions.SHOW_PDV_VIEWER, new ShowDocumentViewerAction()),
-
-                new SeparatorMenuItem(),
-
-                factory.createMenuItem(StandardActions.SELECT_ALL, new OldDatabaseCommandWrapper(Actions.SELECT_ALL, this, Globals.stateManager)),
-
-                new SeparatorMenuItem(),
-
-                factory.createMenuItem(StandardActions.NEXT_PREVIEW_STYLE, new OldDatabaseCommandWrapper(Actions.NEXT_PREVIEW_STYLE, this, Globals.stateManager)),
-                factory.createMenuItem(StandardActions.PREVIOUS_PREVIEW_STYLE, new OldDatabaseCommandWrapper(Actions.PREVIOUS_PREVIEW_STYLE, this, Globals.stateManager))
-        );
-
-        PushToApplicationButton pushToExternal = new PushToApplicationButton(this, pushApplications.getApplications());
-        tools.getItems().addAll(
-                factory.createMenuItem(StandardActions.NEW_SUB_LIBRARY_FROM_AUX, new NewSubLibraryAction(this)),
-                factory.createMenuItem(StandardActions.WRITE_XMP, new OldDatabaseCommandWrapper(Actions.WRITE_XMP, this, Globals.stateManager)),
-
-                new SeparatorMenuItem(),
-
-                factory.createMenuItem(openOffice.getToggleAction(), openOffice.getToggleCommand()),
-                factory.createMenuItem(pushToExternal.getMenuAction(), pushToExternal),
-
-                new SeparatorMenuItem(),
-
-                factory.createMenuItem(StandardActions.OPEN_FOLDER, new OldDatabaseCommandWrapper(Actions.OPEN_FOLDER, this, Globals.stateManager)),
-                factory.createMenuItem(StandardActions.OPEN_FILE, new OldDatabaseCommandWrapper(Actions.OPEN_EXTERNAL_FILE, this, Globals.stateManager)),
-                factory.createMenuItem(StandardActions.OPEN_URL, new OldDatabaseCommandWrapper(Actions.OPEN_URL, this, Globals.stateManager)),
-                factory.createMenuItem(StandardActions.OPEN_CONSOLE, new OldDatabaseCommandWrapper(Actions.OPEN_CONSOLE, this, Globals.stateManager)),
-                factory.createMenuItem(StandardActions.COPY_LINKED_FILES, new CopyFilesAction(this)),
-
-                new SeparatorMenuItem(),
-
-                factory.createMenuItem(StandardActions.ABBREVIATE_ISO, new OldDatabaseCommandWrapper(Actions.ABBREVIATE_ISO, this, Globals.stateManager)),
-                factory.createMenuItem(StandardActions.ABBREVIATE_MEDLINE, new OldDatabaseCommandWrapper(Actions.ABBREVIATE_MEDLINE, this, Globals.stateManager)),
-                factory.createMenuItem(StandardActions.UNABBREVIATE, new OldDatabaseCommandWrapper(Actions.UNABBREVIATE, this, Globals.stateManager))
-        );
-
-        options.getItems().addAll(
-                factory.createMenuItem(StandardActions.SHOW_PREFS, new ShowPreferencesAction(this)),
-
-                new SeparatorMenuItem(),
-
-                factory.createMenuItem(StandardActions.SETUP_GENERAL_FIELDS, new SetupGeneralFieldsAction()),
-                factory.createMenuItem(StandardActions.MANAGE_CUSTOM_IMPORTS, new ManageCustomImportsAction(this)),
-                factory.createMenuItem(StandardActions.MANAGE_CUSTOM_EXPORTS, new ManageCustomExportsAction()),
-                factory.createMenuItem(StandardActions.MANAGE_EXTERNAL_FILETYPES, new EditExternalFileTypesAction()),
-                factory.createMenuItem(StandardActions.MANAGE_JOURNALS, new ManageJournalsAction()),
-                factory.createMenuItem(StandardActions.CUSTOMIZE_KEYBINDING, new CustomizeKeyBindingAction()),
-                factory.createMenuItem(StandardActions.MANAGE_PROTECTED_TERMS, new ManageProtectedTermsAction(this, Globals.protectedTermsLoader)),
-
-                new SeparatorMenuItem(),
-
-                factory.createMenuItem(StandardActions.MANAGE_CONTENT_SELECTORS, new OldDatabaseCommandWrapper(Actions.MANAGE_SELECTORS, this, Globals.stateManager)),
-                factory.createMenuItem(StandardActions.CUSTOMIZE_ENTRY_TYPES, new CustomizeEntryAction(this)),
-                factory.createMenuItem(StandardActions.MANAGE_CITE_KEY_PATTERNS, new BibtexKeyPatternAction(this))
-        );
-
-        help.getItems().addAll(
-                factory.createMenuItem(StandardActions.HELP, HelpAction.getMainHelpPageCommand()),
-                factory.createMenuItem(StandardActions.OPEN_FORUM, new OpenBrowserAction("http://discourse.jabref.org/")),
-
-                new SeparatorMenuItem(),
-
-                factory.createMenuItem(StandardActions.ERROR_CONSOLE, new ErrorConsoleAction()),
-
-                new SeparatorMenuItem(),
-
-                factory.createMenuItem(StandardActions.SEARCH_FOR_UPDATES, new SearchForUpdateAction(Globals.BUILD_INFO, prefs.getVersionPreferences(), dialogService, Globals.TASK_EXECUTOR)),
-                factory.createSubMenu(StandardActions.WEB_MENU,
-                        factory.createMenuItem(StandardActions.OPEN_WEBPAGE, new OpenBrowserAction("https://jabref.org/")),
-                        factory.createMenuItem(StandardActions.OPEN_BLOG, new OpenBrowserAction("https://blog.jabref.org/")),
-                        factory.createMenuItem(StandardActions.OPEN_FACEBOOK, new OpenBrowserAction("https://www.facebook.com/JabRef/")),
-                        factory.createMenuItem(StandardActions.OPEN_TWITTER, new OpenBrowserAction("https://twitter.com/jabref_org")),
-
-                        new SeparatorMenuItem(),
-
-                        factory.createMenuItem(StandardActions.FORK_ME, new OpenBrowserAction("https://github.com/JabRef/jabref")),
-                        factory.createMenuItem(StandardActions.OPEN_DEV_VERSION_LINK, new OpenBrowserAction("https://builds.jabref.org/master/")),
-                        factory.createMenuItem(StandardActions.OPEN_CHANGELOG, new OpenBrowserAction("https://github.com/JabRef/jabref/blob/master/CHANGELOG.md")),
-
-                        new SeparatorMenuItem(),
-
-                        factory.createMenuItem(StandardActions.DONATE, new OpenBrowserAction("https://donations.jabref.org"))
-
-                ),
-                factory.createMenuItem(StandardActions.ABOUT, new AboutAction())
-        );
-
-        MenuBar menu = new MenuBar();
-        menu.getStyleClass().add("mainMenu");
-        menu.getMenus().addAll(
-                file,
-                edit,
-                library,
-                quality,
-                tools,
-                view,
-                options,
-                help);
-        menu.setUseSystemMenuBar(true);
-        return menu;
-    }
-
-    public void addParserResult(ParserResult pr, boolean focusPanel) {
-        if (pr.toOpenTab()) {
-            // Add the entries to the open tab.
-            BasePanel panel = getCurrentBasePanel();
-            if (panel == null) {
-                // There is no open tab to add to, so we create a new tab:
-                addTab(pr.getDatabaseContext(), focusPanel);
-            } else {
-                List<BibEntry> entries = new ArrayList<>(pr.getDatabase().getEntries());
-                addImportedEntries(panel, entries);
-            }
-        } else {
-            // only add tab if DB is not already open
-            Optional<BasePanel> panel = getBasePanelList().stream()
-                                                          .filter(p -> p.getBibDatabaseContext().getDatabasePath().equals(pr.getFile()))
-                                                          .findFirst();
-
-            if (panel.isPresent()) {
-                tabbedPane.getSelectionModel().select(getTab(panel.get()));
-            } else {
-                addTab(pr.getDatabaseContext(), focusPanel);
-            }
-        }
-    }
-
-    /**
-     * Displays the given message at the bottom of the main frame
-     *
-     * @deprecated use {@link DialogService#notify(String)} instead. However, do not remove this method, it's called from the dialogService
-     */
-    @Deprecated
-    public void output(final String message) {
-        DefaultTaskExecutor.runInJavaFXThread(() -> statusLine.fireEvent(new SnackbarEvent(new JFXSnackbarLayout(message), TOAST_MESSAGE_DISPLAY_TIME, null)));
-    }
-
-    private void initActions() {
-        /*
-        openDatabaseOnlyActions.clear();
-        openDatabaseOnlyActions.addAll(Arrays.asList(manageSelectors, mergeDatabaseAction, newSubDatabaseAction, save, copyPreview,
-                saveAs, saveSelectedAs, saveSelectedAsPlain, undo, redo, cut, deleteEntry, copy, paste, mark, markSpecific, unmark,
-                unmarkAll, rankSubMenu, editEntry, selectAll, copyKey, copyCiteKey, copyKeyAndTitle, copyKeyAndLink, editPreamble, editStrings,
-                groupSidePane.getToggleCommand(), makeKeyAction, normalSearch, generalFetcher.getToggleCommand(), mergeEntries, cleanupEntries, exportToClipboard, replaceAll,
-                sendAsEmail, downloadFullText, lookupIdentifiers, writeXmpAction, openOfficePanel.getToggleCommand(), findUnlinkedFiles, addToGroup, removeFromGroup,
-                moveToGroup, autoLinkFile, resolveDuplicateKeys, openUrl, openFolder, openFile, togglePreview,
-                dupliCheck, autoSetFile, newEntryAction, newSpec, customizeAction, plainTextImport, getMassSetField(), getManageKeywords(),
-                pushExternalButton.getMenuAction(), closeDatabaseAction, getNextPreviewStyleAction(), getPreviousPreviewStyleAction(), checkIntegrity,
-                databaseProperties, abbreviateIso, abbreviateMedline,
-                unabbreviate, exportAll, exportSelected, importCurrent, saveAll, focusTable, increaseFontSize, decreseFontSize, defaultFontSize,
-                toggleRelevance, toggleQualityAssured, togglePrinted, pushExternalButton.getComponent()));
-        openDatabaseOnlyActions.addAll(newSpecificEntryAction);
-        openDatabaseOnlyActions.addAll(specialFieldButtons);
-        severalDatabasesOnlyActions.clear();
-        severalDatabasesOnlyActions.addAll(Arrays
-                .asList(nextTab, prevTab, sortTabs));
-        openAndSavedDatabasesOnlyActions.addAll(Collections.singletonList(openConsole));
-        sharedDatabaseOnlyActions.addAll(Collections.singletonList(pullChangesFromSharedDatabase));
-        noSharedDatabaseActions.addAll(Arrays.asList(save, saveAll));
-        oneEntryOnlyActions.clear();
-        oneEntryOnlyActions.addAll(Arrays.asList(editEntry));
-        oneEntryWithFileOnlyActions.clear();
-        oneEntryWithFileOnlyActions.addAll(Arrays.asList(openFolder, openFile));
-        oneEntryWithURLorDOIOnlyActions.clear();
-        oneEntryWithURLorDOIOnlyActions.addAll(Arrays.asList(openUrl));
-        twoEntriesOnlyActions.clear();
-        twoEntriesOnlyActions.addAll(Arrays.asList(mergeEntries));
-        atLeastOneEntryActions.clear();
-        atLeastOneEntryActions.addAll(Arrays.asList(downloadFullText, lookupIdentifiers, exportLinkedFiles));
-        tabbedPane.getTabs().addListener(this::updateEnabledState);
-        */
-    }
-
-    /**
-     * Enable or Disable all actions based on the number of open tabs.
-     * <p>
-     * The action that are affected are set in initActions.
-     */
-    public void updateEnabledState(ListChangeListener.Change<? extends Tab> change) {
-        int tabCount = tabbedPane.getTabs().size();
-        if (!change.next()) {
-            return;
-        }
-        if (change.wasAdded() || change.wasRemoved()) {
-            setEnabled(openDatabaseOnlyActions, tabCount > 0);
-            setEnabled(severalDatabasesOnlyActions, tabCount > 1);
-        }
-        if (tabCount == 0) {
-            setEnabled(openAndSavedDatabasesOnlyActions, false);
-            setEnabled(sharedDatabaseOnlyActions, false);
-            setEnabled(oneEntryOnlyActions, false);
-        }
-
-        if (tabCount > 0) {
-            BasePanel current = getCurrentBasePanel();
-            boolean saved = current.getBibDatabaseContext().getDatabasePath().isPresent();
-            setEnabled(openAndSavedDatabasesOnlyActions, saved);
-
-            boolean isShared = current.getBibDatabaseContext().getLocation() == DatabaseLocation.SHARED;
-            setEnabled(sharedDatabaseOnlyActions, isShared);
-            setEnabled(noSharedDatabaseActions, !isShared);
-
-            boolean oneEntrySelected = current.getSelectedEntries().size() == 1;
-            setEnabled(oneEntryOnlyActions, oneEntrySelected);
-            setEnabled(oneEntryWithFileOnlyActions, isExistFile(current.getSelectedEntries()));
-            setEnabled(oneEntryWithURLorDOIOnlyActions, isExistURLorDOI(current.getSelectedEntries()));
-
-            boolean twoEntriesSelected = current.getSelectedEntries().size() == 2;
-            setEnabled(twoEntriesOnlyActions, twoEntriesSelected);
-
-            boolean atLeastOneEntrySelected = !current.getSelectedEntries().isEmpty();
-            setEnabled(atLeastOneEntryActions, atLeastOneEntrySelected);
-        }
-    }
-
-    /**
-     * This method causes all open BasePanels to set up their tables anew. When called from PrefsDialog3, this updates
-     * to the new settings.
-     */
-    public void setupAllTables() {
-        // This action can be invoked without an open database, so
-        // we have to check if we have one before trying to invoke
-        // methods to execute changes in the preferences.
-
-        // We want to notify all tabs about the changes to
-        // avoid problems when changing the column set.
-        for (int i = 0; i < tabbedPane.getTabs().size(); i++) {
-            BasePanel bf = getBasePanelAt(i);
-
-            // Update tables:
-            if (bf.getDatabase() != null) {
-                DefaultTaskExecutor.runInJavaFXThread(bf::setupMainPanel);
-            }
-        }
-    }
-
-    private List<String> collectDatabaseFilePaths() {
-        List<String> dbPaths = new ArrayList<>(getBasePanelCount());
-
-        for (BasePanel basePanel : getBasePanelList()) {
-            try {
-                // db file exists
-                if (basePanel.getBibDatabaseContext().getDatabaseFile().isPresent()) {
-                    dbPaths.add(basePanel.getBibDatabaseContext().getDatabaseFile().get().getCanonicalPath());
-                } else {
-                    dbPaths.add("");
-                }
-            } catch (IOException ex) {
-                LOGGER.error("Invalid database file path: " + ex.getMessage());
-            }
-        }
-        return dbPaths;
-    }
-
-    private List<String> getUniquePathParts() {
-        List<String> dbPaths = collectDatabaseFilePaths();
-
-        return FileUtil.uniquePathSubstrings(dbPaths);
-    }
-
-    public void updateAllTabTitles() {
-        List<String> paths = getUniquePathParts();
-        for (int i = 0; i < getBasePanelCount(); i++) {
-            String uniqPath = paths.get(i);
-            Optional<File> file = getBasePanelAt(i).getBibDatabaseContext().getDatabaseFile();
-
-            if (file.isPresent()) {
-                if (!uniqPath.equals(file.get().getName()) && uniqPath.contains(File.separator)) {
-                    // remove filename
-                    uniqPath = uniqPath.substring(0, uniqPath.lastIndexOf(File.separator));
-                    tabbedPane.getTabs().get(i).setText(getBasePanelAt(i).getTabTitle() + " \u2014 " + uniqPath);
-                } else {
-                    // set original filename (again)
-                    tabbedPane.getTabs().get(i).setText(getBasePanelAt(i).getTabTitle());
-                }
-            } else {
-                tabbedPane.getTabs().get(i).setText(getBasePanelAt(i).getTabTitle());
-            }
-            tabbedPane.getTabs().get(i).setTooltip(new Tooltip(file.map(File::getAbsolutePath).orElse(null)));
-        }
-    }
-
-    public void addTab(BasePanel basePanel, boolean raisePanel) {
-        DefaultTaskExecutor.runInJavaFXThread(() -> {
-            // add tab
-            Tab newTab = new Tab(basePanel.getTabTitle(), basePanel);
-            tabbedPane.getTabs().add(newTab);
-
-            // update all tab titles
-            updateAllTabTitles();
-
-            if (raisePanel) {
-                tabbedPane.getSelectionModel().select(newTab);
-            }
-
-            // Register undo/redo listener
-            basePanel.getUndoManager().registerListener(new UndoRedoEventManager());
-
-            BibDatabaseContext context = basePanel.getBibDatabaseContext();
-
-            if (readyForAutosave(context)) {
-                AutosaveManager autosaver = AutosaveManager.start(context);
-                autosaver.registerListener(new AutosaveUIManager(basePanel));
-            }
-
-            BackupManager.start(context);
-
-            // Track opening
-            trackOpenNewDatabase(basePanel);
-        });
-    }
-
-    private void trackOpenNewDatabase(BasePanel basePanel) {
-        Map<String, String> properties = new HashMap<>();
-        Map<String, Double> measurements = new HashMap<>();
-        measurements.put("NumberOfEntries", (double) basePanel.getBibDatabaseContext().getDatabase().getEntryCount());
-
-        Globals.getTelemetryClient().ifPresent(client -> client.trackEvent("OpenNewDatabase", properties, measurements));
-    }
-
-    public BasePanel addTab(BibDatabaseContext databaseContext, boolean raisePanel) {
-        Objects.requireNonNull(databaseContext);
-
-        BasePanel bp = new BasePanel(this, BasePanelPreferences.from(Globals.prefs), databaseContext, ExternalFileTypes.getInstance());
-        addTab(bp, raisePanel);
-        return bp;
-    }
-
-    private boolean readyForAutosave(BibDatabaseContext context) {
-        return ((context.getLocation() == DatabaseLocation.SHARED) ||
-                ((context.getLocation() == DatabaseLocation.LOCAL) && Globals.prefs.getBoolean(JabRefPreferences.LOCAL_AUTO_SAVE)))
-                &&
-                context.getDatabaseFile().isPresent();
-    }
-
-    /**
-     * This method does the job of adding imported entries into the active database, or into a new one. It shows the
-     * ImportInspectionDialog if preferences indicate it should be used. Otherwise it imports directly.
-     *
-     * @param panel   The BasePanel to add to.
-     * @param entries The entries to add.
-     */
-    private void addImportedEntries(final BasePanel panel, final List<BibEntry> entries) {
-        SwingUtilities.invokeLater(() -> {
-            ImportInspectionDialog diag = new ImportInspectionDialog(JabRefFrame.this, panel,
-                    Localization.lang("Import"), false);
-            diag.addEntries(entries);
-            diag.entryListComplete();
-            diag.setVisible(true);
-            diag.toFront();
-        });
-    }
-
-    public FileHistoryMenu getFileHistory() {
-        return fileHistory;
-    }
-
-    /**
-     * Set the visibility of the progress bar in the right end of the status line at the bottom of the frame.
-     */
-    public void setProgressBarVisible(final boolean visible) {
-        progressBar.setVisible(visible);
-    }
-
-    /**
-     * Sets the indeterminate status of the progress bar.
-     * <p>
-     * If not called on the event dispatch thread, this method uses SwingUtilities.invokeLater() to do the actual
-     * operation on the EDT.
-     */
-    public void setProgressBarIndeterminate(final boolean value) {
-        // TODO: Reimplement
-        /*
-        if (SwingUtilities.isEventDispatchThread()) {
-            progressBar.setIndeterminate(value);
-        } else {
-            SwingUtilities.invokeLater(() -> progressBar.setIndeterminate(value));
-        }
-        */
-    }
-
-    /**
-     * Return a boolean, if the selected entry have file
-     *
-     * @param selectEntryList A selected entries list of the current base pane
-     * @return true, if the selected entry contains file. false, if multiple entries are selected or the selected entry
-     * doesn't contains file
-     */
-    private boolean isExistFile(List<BibEntry> selectEntryList) {
-        if (selectEntryList.size() == 1) {
-            BibEntry selectedEntry = selectEntryList.get(0);
-            return selectedEntry.getField(FieldName.FILE).isPresent();
-        }
-        return false;
-    }
-
-    /**
-     * Return a boolean, if the selected entry have url or doi
-     *
-     * @param selectEntryList A selected entries list of the current base pane
-     * @return true, if the selected entry contains url or doi. false, if multiple entries are selected or the selected
-     * entry doesn't contains url or doi
-     */
-    private boolean isExistURLorDOI(List<BibEntry> selectEntryList) {
-        if (selectEntryList.size() == 1) {
-            BibEntry selectedEntry = selectEntryList.get(0);
-            return (selectedEntry.getField(FieldName.URL).isPresent() || selectedEntry.getField(FieldName.DOI).isPresent());
-        }
-        return false;
-    }
-
-    @Override
-    public void showMessage(String message, String title, int msgType) {
-        JOptionPane.showMessageDialog(null, message, title, msgType);
-    }
-
-    @Override
-    public void setStatus(String s) {
-        output(s);
-    }
-
-    @Override
-    public void showMessage(String message) {
-        JOptionPane.showMessageDialog(null, message);
-    }
-
-    /**
-     * Ask if the user really wants to close the given database
-     *
-     * @return true if the user choose to close the database
-     */
-    private boolean confirmClose(BasePanel panel) {
-        String filename = panel.getBibDatabaseContext()
-                               .getDatabasePath()
-                               .map(Path::toAbsolutePath)
-                               .map(Path::toString)
-                               .orElse(GUIGlobals.UNTITLED_TITLE);
-
-        ButtonType saveChanges = new ButtonType(Localization.lang("Save changes"), ButtonBar.ButtonData.YES);
-        ButtonType discardChanges = new ButtonType(Localization.lang("Discard changes"), ButtonBar.ButtonData.NO);
-        ButtonType cancel = new ButtonType(Localization.lang("Return to JabRef"), ButtonBar.ButtonData.CANCEL_CLOSE);
-
-        Optional<ButtonType> response = dialogService.showCustomButtonDialogAndWait(Alert.AlertType.CONFIRMATION,
-                Localization.lang("Save before closing"),
-                Localization.lang("Library '%0' has changed.", filename),
-                saveChanges, discardChanges, cancel);
-
-        if (response.isPresent() && response.get().equals(saveChanges)) {
-            // The user wants to save.
-            try {
-                SaveDatabaseAction saveAction = new SaveDatabaseAction(panel, Globals.prefs);
-                if (!saveAction.save()) {
-                    // The action was either canceled or unsuccessful.
-                    output(Localization.lang("Unable to save library"));
-                    return false;
-                }
-            } catch (Throwable ex) {
-                return false;
-            }
-        } else {
-            return !response.isPresent() || !response.get().equals(cancel);
-        }
-        return false;
-    }
-
-    private void closeTab(BasePanel panel) {
-        // empty tab without database
-        if (panel == null) {
-            return;
-        }
-
-        BibDatabaseContext context = panel.getBibDatabaseContext();
-
-        if (panel.isModified() && (context.getLocation() == DatabaseLocation.LOCAL)) {
-            if (confirmClose(panel)) {
-                removeTab(panel);
-            }
-        } else if (context.getLocation() == DatabaseLocation.SHARED) {
-            context.convertToLocalDatabase();
-            context.getDBMSSynchronizer().closeSharedDatabase();
-            context.clearDBMSSynchronizer();
-            removeTab(panel);
-        } else {
-            removeTab(panel);
-        }
-        AutosaveManager.shutdown(context);
-        BackupManager.shutdown(context);
-    }
-
-    private void removeTab(BasePanel panel) {
-        DefaultTaskExecutor.runInJavaFXThread(() -> {
-            panel.cleanUp();
-            tabbedPane.getTabs().remove(getTab(panel));
-            setWindowTitle();
-            output(Localization.lang("Closed library") + '.');
-            // update tab titles
-            updateAllTabTitles();
-        });
-    }
-
-    public void closeCurrentTab() {
-        removeTab(getCurrentBasePanel());
-    }
-
-    public OpenDatabaseAction getOpenDatabaseAction() {
-        return new OpenDatabaseAction(this);
-    }
-
-    public SidePaneManager getSidePaneManager() {
-        return sidePaneManager;
-    }
-
-    public PushToApplications getPushApplications() {
-        return pushApplications;
-    }
-
-    public GlobalSearchBar getGlobalSearchBar() {
-        return globalSearchBar;
-    }
-
-    public CountingUndoManager getUndoManager() {
-        return undoManager;
-    }
-
-    public DialogService getDialogService() {
-        return dialogService;
-    }
-
-    /**
-     * The action concerned with closing the window.
-     */
-    private class CloseAction extends SimpleCommand {
-
-        @Override
-        public void execute() {
-            quit();
-        }
-    }
-
-    /**
-     * Class for handling general actions; cut, copy and paste. The focused component is kept track of by
-     * Globals.focusListener, and we call the action stored under the relevant name in its action map.
-     */
-    private class EditAction extends SimpleCommand {
-
-        private final Actions command;
-
-        public EditAction(Actions command) {
-            this.command = command;
-        }
-
-        @Override
-        public void execute() {
-            Node focusOwner = mainStage.getScene().getFocusOwner();
-            if (focusOwner != null) {
-                if (focusOwner instanceof TextInputControl) {
-                    // Focus is on text field -> copy/paste/cut selected text
-                    TextInputControl textInput = (TextInputControl) focusOwner;
-                    switch (command) {
-                        case COPY:
-                            textInput.copy();
-                            break;
-                        case CUT:
-                            textInput.cut();
-                            break;
-                        case PASTE:
-                            textInput.paste();
-                            break;
-                        default:
-                            throw new IllegalStateException("Only cut/copy/paste supported but got " + command);
-                    }
-                } else {
-                    // Not sure what is selected -> copy/paste/cut selected entries
-                    switch (command) {
-                        case COPY:
-                            getCurrentBasePanel().copy();
-                            break;
-                        case CUT:
-                            getCurrentBasePanel().cut();
-                            break;
-                        case PASTE:
-                            getCurrentBasePanel().paste();
-                            break;
-                        default:
-                            throw new IllegalStateException("Only cut/copy/paste supported but got " + command);
-                    }
-                }
-            }
-        }
-    }
-
-    private void setDefaultTableFontSize() {
-        GUIGlobals.setFont(Globals.prefs.getIntDefault(JabRefPreferences.FONT_SIZE));
-        for (BasePanel basePanel : getBasePanelList()) {
-            basePanel.updateTableFont();
-        }
-        setStatus(Localization.lang("Table font size is %0", String.valueOf(GUIGlobals.currentFont.getSize())));
-    }
-
-    private void increaseTableFontSize() {
-        GUIGlobals.setFont(GUIGlobals.currentFont.getSize() + 1);
-        for (BasePanel basePanel : getBasePanelList()) {
-            basePanel.updateTableFont();
-        }
-        setStatus(Localization.lang("Table font size is %0", String.valueOf(GUIGlobals.currentFont.getSize())));
-    }
-
-    private void decreaseTableFontSize() {
-        int currentSize = GUIGlobals.currentFont.getSize();
-        if (currentSize < 2) {
-            return;
-        }
-        GUIGlobals.setFont(currentSize - 1);
-        for (BasePanel basePanel : getBasePanelList()) {
-            basePanel.updateTableFont();
-        }
-        setStatus(Localization.lang("Table font size is %0", String.valueOf(GUIGlobals.currentFont.getSize())));
-    }
-
-    private class CloseDatabaseAction extends SimpleCommand {
-
-        @Override
-        public void execute() {
-            closeTab(getCurrentBasePanel());
-        }
-    }
-
-    private class UndoRedoEventManager {
-
-        @Subscribe
-        public void listen(UndoRedoEvent event) {
-            updateTexts(event);
-            JabRefFrame.this.getCurrentBasePanel().updateEntryEditorIfShowing();
-        }
-
-        @Subscribe
-        public void listen(AddUndoableActionEvent event) {
-            updateTexts(event);
-        }
-
-        private void updateTexts(UndoChangeEvent event) {
-            /* TODO
-            SwingUtilities.invokeLater(() -> {
-                undo.putValue(Action.SHORT_DESCRIPTION, event.getUndoDescription());
-                undo.setEnabled(event.isCanUndo());
-                redo.putValue(Action.SHORT_DESCRIPTION, event.getRedoDescription());
-                redo.setEnabled(event.isCanRedo());
-            });
-            */
-        }
-    }
-}
diff --git a/src/main/java/org/jabref/gui/strings/StringDialog.fxml b/src/main/java/org/jabref/gui/metadata/AddNewBibtexString.fxml
similarity index 60%
rename from src/main/java/org/jabref/gui/strings/StringDialog.fxml
rename to src/main/java/org/jabref/gui/metadata/AddNewBibtexString.fxml
index 2aac98f782b..a9ceca60cd6 100644
--- a/src/main/java/org/jabref/gui/strings/StringDialog.fxml
+++ b/src/main/java/org/jabref/gui/metadata/AddNewBibtexString.fxml
@@ -1,28 +1,14 @@
 <?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.Separator?>
 <?import javafx.scene.control.TableColumn?>
 <?import javafx.scene.control.TableView?>
-<?import javafx.scene.control.TextField?>
-<?import javafx.scene.control.ToolBar?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
 
-<DialogPane minHeight="-Infinity" minWidth="-Infinity" prefHeight="340.0" prefWidth="427.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.strings.StringDialogView">
-   <header>
-      <ToolBar prefHeight="40.0" prefWidth="300.0">
-        <items>
-            <Button fx:id="btnRemove" mnemonicParsing="false" onAction="#removeString" />
-            <Separator orientation="VERTICAL" prefHeight="200.0" />
-            <Button fx:id="btnHelp" mnemonicParsing="false" onAction="#openHelp" />
-        </items>
-      </ToolBar>
-   </header>
+<DialogPane minHeight="-Infinity" minWidth="-Infinity" prefHeight="340.0" prefWidth="427.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.metadata.BibtexStringEditorDialogView">
    <content>
       <VBox>
          <children>
@@ -35,15 +21,11 @@
                   <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
                </columnResizePolicy>
             </TableView>
-            <HBox minWidth="-Infinity" prefHeight="100.0" prefWidth="300.0" spacing="5.0">
+            <HBox minWidth="-Infinity" prefHeight="100.0" prefWidth="300.0">
                <children>
-                  <Label text="%Label" HBox.hgrow="ALWAYS">
-                     <opaqueInsets>
-                        <Insets />
-                     </opaqueInsets>
-                  </Label>
-                  <TextField fx:id="stringLabel" />
-                <Button fx:id="btnNewString" minWidth="-Infinity" mnemonicParsing="false" onAction="#addString" />
+                <Button fx:id="btnNewString" minWidth="-Infinity" mnemonicParsing="false" onAction="#addString" text="%Add new String" HBox.hgrow="ALWAYS" />
+                  <Button fx:id="btnRemove" mnemonicParsing="false" onAction="#removeString" text="%Remove selected Strings" HBox.hgrow="ALWAYS" />
+                  <Button fx:id="btnHelp" mnemonicParsing="false" onAction="#openHelp" HBox.hgrow="ALWAYS" />
                </children>
             </HBox>
          </children>
diff --git a/src/main/java/org/jabref/gui/strings/StringAction.java b/src/main/java/org/jabref/gui/metadata/BibtexStringEditorAction.java
similarity index 59%
rename from src/main/java/org/jabref/gui/strings/StringAction.java
rename to src/main/java/org/jabref/gui/metadata/BibtexStringEditorAction.java
index 2cc26f29cce..050756b437f 100644
--- a/src/main/java/org/jabref/gui/strings/StringAction.java
+++ b/src/main/java/org/jabref/gui/metadata/BibtexStringEditorAction.java
@@ -1,21 +1,21 @@
-package org.jabref.gui.strings;
+package org.jabref.gui.metadata;
 
 import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.model.database.BibDatabase;
 
-public class StringAction extends SimpleCommand {
+public class BibtexStringEditorAction extends SimpleCommand {
 
     private final JabRefFrame frame;
 
-    public StringAction(JabRefFrame jabRefFrame) {
+    public BibtexStringEditorAction(JabRefFrame jabRefFrame) {
         this.frame = jabRefFrame;
     }
 
     @Override
     public void execute() {
         BibDatabase database = frame.getCurrentBasePanel().getDatabase();
-        new StringDialogView(database).showAndWait();
+        new BibtexStringEditorDialogView(database).showAndWait();
     }
 
 }
diff --git a/src/main/java/org/jabref/gui/strings/StringDialogView.java b/src/main/java/org/jabref/gui/metadata/BibtexStringEditorDialogView.java
similarity index 67%
rename from src/main/java/org/jabref/gui/strings/StringDialogView.java
rename to src/main/java/org/jabref/gui/metadata/BibtexStringEditorDialogView.java
index 1c3dfcad2af..5f75f9b43ee 100644
--- a/src/main/java/org/jabref/gui/strings/StringDialogView.java
+++ b/src/main/java/org/jabref/gui/metadata/BibtexStringEditorDialogView.java
@@ -1,7 +1,5 @@
-package org.jabref.gui.strings;
+package org.jabref.gui.metadata;
 
-import javafx.beans.value.ObservableValue;
-import javafx.collections.ObservableList;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
@@ -14,19 +12,16 @@
 import javafx.scene.control.cell.TextFieldTableCell;
 import javafx.util.converter.DefaultStringConverter;
 
-import org.jabref.gui.help.HelpAction;
 import org.jabref.gui.icon.IconTheme.JabRefIcons;
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.gui.util.IconValidationDecorator;
-import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabase;
 
 import com.airhacks.afterburner.views.ViewLoader;
 import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
-import org.fxmisc.easybind.EasyBind;
 
-public class StringDialogView extends BaseDialog<Void> {
+public class BibtexStringEditorDialogView extends BaseDialog<Void> {
 
     @FXML private Button btnNewString;
     @FXML private Button btnRemove;
@@ -34,15 +29,15 @@ public class StringDialogView extends BaseDialog<Void> {
     @FXML private ButtonType saveButton;
 
     @FXML private TextField stringLabel;
-    @FXML private TableView<StringViewModel> tblStrings;
-    @FXML private TableColumn<StringViewModel, String> colLabel;
-    @FXML private TableColumn<StringViewModel, String> colContent;
+    @FXML private TableView<BibtexStringViewModel> tblStrings;
+    @FXML private TableColumn<BibtexStringViewModel, String> colLabel;
+    @FXML private TableColumn<BibtexStringViewModel, String> colContent;
 
     private final ControlsFxVisualizer visualizer = new ControlsFxVisualizer();
-    private final StringDialogViewModel viewModel;
+    private final BibtexStringEditorDialogViewModel viewModel;
 
-    public StringDialogView(BibDatabase database) {
-        viewModel = new StringDialogViewModel(database);
+    public BibtexStringEditorDialogView(BibDatabase database) {
+        viewModel = new BibtexStringEditorDialogViewModel(database);
 
         ViewLoader.view(this)
                   .load()
@@ -50,16 +45,11 @@ public StringDialogView(BibDatabase database) {
 
         Button btnSave = (Button) this.getDialogPane().lookupButton(saveButton);
 
-        //Adapted from the EasyBind Tutorial: https://github.com/TomasMikula/EasyBind#example-disable-save-all-button-on-no-unsaved-changes
-        //Disable the button, if any of the validators is not valid
-        ObservableList<ObservableValue<Boolean>> allValidProperty = EasyBind.map(viewModel.allStringsProperty(), StringViewModel::combinedValidationValidProperty);
-        ObservableValue<Boolean> anyNotValid = EasyBind.combine(allValidProperty, stream -> stream.anyMatch(valid -> !valid));
-        btnSave.disableProperty().bind(anyNotValid);
+        btnSave.disableProperty().bind(viewModel.validProperty().not());
 
         setResultConverter(btn -> {
             if (saveButton.equals(btn)) {
                 viewModel.save();
-
             }
             return null;
         });
@@ -74,14 +64,11 @@ private void initialize() {
         btnHelp.setGraphic(JabRefIcons.HELP.getGraphicNode());
         btnHelp.setTooltip(new Tooltip(Localization.lang("Open Help page")));
 
-        btnNewString.setGraphic(JabRefIcons.ADD.getGraphicNode());
         btnNewString.setTooltip(new Tooltip(Localization.lang("New string")));
-
-        btnRemove.setGraphic(JabRefIcons.REMOVE.getGraphicNode());
         btnRemove.setTooltip(new Tooltip(Localization.lang("Remove selected strings")));
 
         colLabel.setCellValueFactory(cellData -> cellData.getValue().getLabel());
-        colLabel.setCellFactory(column -> new TextFieldTableCell<StringViewModel, String>(new DefaultStringConverter()) {
+        colLabel.setCellFactory(column -> new TextFieldTableCell<BibtexStringViewModel, String>(new DefaultStringConverter()) {
 
             @Override
             public void updateItem(String item, boolean empty) {
@@ -90,8 +77,8 @@ public void updateItem(String item, boolean empty) {
                 if (!empty && (getTableRow() != null)) {
                     Object rowItem = getTableRow().getItem();
 
-                    if ((rowItem != null) && (rowItem instanceof StringViewModel)) {
-                        StringViewModel vm = (StringViewModel) rowItem;
+                    if ((rowItem != null) && (rowItem instanceof BibtexStringViewModel)) {
+                        BibtexStringViewModel vm = (BibtexStringViewModel) rowItem;
                         visualizer.initVisualization(vm.labelValidation(), this);
                     }
                 }
@@ -99,7 +86,7 @@ public void updateItem(String item, boolean empty) {
         });
 
         colContent.setCellValueFactory(cellData -> cellData.getValue().getContent());
-        colContent.setCellFactory(column -> new TextFieldTableCell<StringViewModel, String>(new DefaultStringConverter()) {
+        colContent.setCellFactory(column -> new TextFieldTableCell<BibtexStringViewModel, String>(new DefaultStringConverter()) {
 
             @Override
             public void updateItem(String item, boolean empty) {
@@ -108,8 +95,8 @@ public void updateItem(String item, boolean empty) {
                 if (!empty && (getTableRow() != null)) {
                     Object rowItem = getTableRow().getItem();
 
-                    if ((rowItem != null) && (rowItem instanceof StringViewModel)) {
-                        StringViewModel vm = (StringViewModel) rowItem;
+                    if ((rowItem != null) && (rowItem instanceof BibtexStringViewModel)) {
+                        BibtexStringViewModel vm = (BibtexStringViewModel) rowItem;
                         visualizer.initVisualization(vm.contentValidation(), this);
                     }
                 }
@@ -117,10 +104,10 @@ public void updateItem(String item, boolean empty) {
             }
         });
 
-        colLabel.setOnEditCommit((CellEditEvent<StringViewModel, String> cell) -> {
+        colLabel.setOnEditCommit((CellEditEvent<BibtexStringViewModel, String> cell) -> {
             cell.getRowValue().setLabel(cell.getNewValue());
         });
-        colContent.setOnEditCommit((CellEditEvent<StringViewModel, String> cell) -> {
+        colContent.setOnEditCommit((CellEditEvent<BibtexStringViewModel, String> cell) -> {
             cell.getRowValue().setContent(cell.getNewValue());
         });
 
@@ -138,7 +125,7 @@ private void addString(ActionEvent event) {
 
     @FXML
     private void openHelp(ActionEvent event) {
-        HelpAction.openHelpPage(HelpFile.STRING_EDITOR);
+        viewModel.openHelpPage();
     }
 
     @FXML
diff --git a/src/main/java/org/jabref/gui/metadata/BibtexStringEditorDialogViewModel.java b/src/main/java/org/jabref/gui/metadata/BibtexStringEditorDialogViewModel.java
new file mode 100644
index 00000000000..b40b01484ad
--- /dev/null
+++ b/src/main/java/org/jabref/gui/metadata/BibtexStringEditorDialogViewModel.java
@@ -0,0 +1,103 @@
+package org.jabref.gui.metadata;
+
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.ListProperty;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleListProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+import javafx.beans.value.ObservableValue;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+
+import org.jabref.gui.AbstractViewModel;
+import org.jabref.gui.help.HelpAction;
+import org.jabref.logic.bibtex.comparator.BibtexStringComparator;
+import org.jabref.logic.help.HelpFile;
+import org.jabref.model.database.BibDatabase;
+import org.jabref.model.entry.BibtexString;
+
+import org.fxmisc.easybind.EasyBind;
+
+public class BibtexStringEditorDialogViewModel extends AbstractViewModel {
+
+    private final ListProperty<BibtexStringViewModel> allStrings = new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ObjectProperty<BibtexStringViewModel> selectedItemProperty = new SimpleObjectProperty<>();
+    private final StringProperty newStringLabelProperty = new SimpleStringProperty("");
+    private final BibDatabase bibDatabase;
+    private final BooleanProperty validProperty = new SimpleBooleanProperty();
+
+    public BibtexStringEditorDialogViewModel(BibDatabase bibDatabase) {
+        this.bibDatabase = bibDatabase;
+        addAllStringsFromDB();
+
+        ObservableList<ObservableValue<Boolean>> allValidProperty = EasyBind.map(allStringsProperty(), BibtexStringViewModel::combinedValidationValidProperty);
+
+        validProperty.bind(EasyBind.combine(allValidProperty, stream -> stream.allMatch(valid -> valid)));
+
+    }
+
+    private void addAllStringsFromDB() {
+
+        Set<BibtexStringViewModel> strings = bibDatabase.getStringValues()
+                                                        .stream()
+                                                        .sorted(new BibtexStringComparator(false))
+                                                        .map(this::convertFromBibTexString)
+                                                        .collect(Collectors.toSet());
+        allStrings.addAll(strings);
+    }
+
+    public ListProperty<BibtexStringViewModel> allStringsProperty() {
+        return this.allStrings;
+    }
+
+    public void addNewString() {
+        allStrings.add(new BibtexStringViewModel("", ""));
+    }
+
+    public void removeString() {
+        allStrings.remove(selectedItemProperty.getValue());
+    }
+
+    private BibtexStringViewModel convertFromBibTexString(BibtexString bibtexString) {
+        return new BibtexStringViewModel(bibtexString.getName(), bibtexString.getContent());
+    }
+
+    public ObjectProperty<BibtexStringViewModel> seletedItemProperty() {
+        return this.selectedItemProperty;
+    }
+
+    public StringProperty newStringLabelProperty() {
+        return this.newStringLabelProperty;
+    }
+
+    public void save() {
+        for (BibtexStringViewModel model : allStrings) {
+            String label = model.getLabel().getValue();
+            String content = model.getContent().getValue();
+
+            Optional<BibtexString> bibtexString = bibDatabase.getStringByName(label);
+            if (bibtexString.isPresent()) {
+                if (!(bibtexString.get().getContent().equals(content))) {
+                    bibtexString.get().setContent(content);
+                }
+            } else {
+                bibDatabase.addString(new BibtexString(label, content));
+            }
+        }
+    }
+
+    public BooleanProperty validProperty() {
+        return validProperty;
+    }
+
+    public void openHelpPage() {
+        HelpAction.openHelpPage(HelpFile.STRING_EDITOR);
+    }
+}
diff --git a/src/main/java/org/jabref/gui/strings/StringViewModel.java b/src/main/java/org/jabref/gui/metadata/BibtexStringViewModel.java
similarity index 87%
rename from src/main/java/org/jabref/gui/strings/StringViewModel.java
rename to src/main/java/org/jabref/gui/metadata/BibtexStringViewModel.java
index 1e71a469884..b62375a02db 100644
--- a/src/main/java/org/jabref/gui/strings/StringViewModel.java
+++ b/src/main/java/org/jabref/gui/metadata/BibtexStringViewModel.java
@@ -1,6 +1,5 @@
-package org.jabref.gui.strings;
+package org.jabref.gui.metadata;
 
-import java.util.function.Function;
 import java.util.regex.Pattern;
 
 import javafx.beans.property.ReadOnlyBooleanProperty;
@@ -15,7 +14,7 @@
 import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
 import de.saxsys.mvvmfx.utils.validation.Validator;
 
-public class StringViewModel {
+public class BibtexStringViewModel {
 
     private final static Pattern IS_NUMBER = Pattern.compile("-?\\d+(\\.\\d+)?");
 
@@ -26,39 +25,13 @@ public class StringViewModel {
     private final Validator contentValidator;
     private final CompositeValidator combinedValidator;
 
-    private final Function<String, ValidationMessage> labelValidatorFunction = input -> {
-        if (input == null) {
-            return ValidationMessage.error("May not be null");
-        } else if (input.trim().isEmpty()) {
-            return ValidationMessage.error(Localization.lang("Please enter the string's label"));
-        } else if (IS_NUMBER.matcher(input).matches()) {
-            return ValidationMessage.error(Localization.lang("The label of the string cannot be a number."));
-        } else if (input.contains("#")) {
-            return ValidationMessage.error(Localization.lang("The label of the string cannot contain the '#' character."));
-        } else if (input.contains(" ")) {
-            return ValidationMessage.error(Localization.lang("The label of the string cannot contain spaces."));
-        } else {
-            return null; // everything is ok
-        }
-
-    };
-    private final Function<String, ValidationMessage> contentValidatorFunction = input -> {
-        if (input == null) {
-            return ValidationMessage.error("May not be null");
-        } else if (input.trim().isEmpty()) {
-            return ValidationMessage.error(Localization.lang("Must not be empty!"));
-        } else {
-            return null; // everything is ok
-        }
-    };
-
-    public StringViewModel(String label, String content) {
+    public BibtexStringViewModel(String label, String content) {
 
         this.label.setValue(label);
         this.content.setValue(content);
 
-        labelValidator = new FunctionBasedValidator<>(this.label, labelValidatorFunction);
-        contentValidator = new FunctionBasedValidator<>(this.content, contentValidatorFunction);
+        labelValidator = new FunctionBasedValidator<>(this.label, BibtexStringViewModel::validateLabel);
+        contentValidator = new FunctionBasedValidator<>(this.content, BibtexStringViewModel::validateContent);
         combinedValidator = new CompositeValidator(labelValidator, contentValidator);
     }
 
@@ -102,4 +75,30 @@ public void setContent(String content) {
         this.content.setValue(content);
     }
 
+    private static ValidationMessage validateLabel(String input) {
+        if (input == null) {
+            return ValidationMessage.error("May not be null");
+        } else if (input.trim().isEmpty()) {
+            return ValidationMessage.error(Localization.lang("Please enter the string's label"));
+        } else if (IS_NUMBER.matcher(input).matches()) {
+            return ValidationMessage.error(Localization.lang("The label of the string cannot be a number."));
+        } else if (input.contains("#")) {
+            return ValidationMessage.error(Localization.lang("The label of the string cannot contain the '#' character."));
+        } else if (input.contains(" ")) {
+            return ValidationMessage.error(Localization.lang("The label of the string cannot contain spaces."));
+        } else {
+            return null; // everything is ok
+        }
+    }
+
+    private static ValidationMessage validateContent(String input) {
+
+        if (input == null) {
+            return ValidationMessage.error(Localization.lang("Must not be empty!"));
+        } else if (input.trim().isEmpty()) {
+            return ValidationMessage.error(Localization.lang("Must not be empty!"));
+        } else {
+            return null; // everything is ok
+        }
+    }
 }
diff --git a/src/main/java/org/jabref/gui/PreambleEditor.java b/src/main/java/org/jabref/gui/metadata/PreambleEditor.java
similarity index 94%
rename from src/main/java/org/jabref/gui/PreambleEditor.java
rename to src/main/java/org/jabref/gui/metadata/PreambleEditor.java
index d28cb2c69c7..70d8e126873 100644
--- a/src/main/java/org/jabref/gui/PreambleEditor.java
+++ b/src/main/java/org/jabref/gui/metadata/PreambleEditor.java
@@ -1,4 +1,4 @@
-package org.jabref.gui;
+package org.jabref.gui.metadata;
 
 import java.util.Optional;
 
@@ -6,6 +6,8 @@
 import javafx.scene.control.DialogPane;
 import javafx.scene.control.TextArea;
 
+import org.jabref.gui.BasePanel;
+import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.undo.UndoablePreambleChange;
 import org.jabref.logic.l10n.Localization;
diff --git a/src/main/java/org/jabref/gui/strings/StringDialog.css b/src/main/java/org/jabref/gui/strings/StringDialog.css
deleted file mode 100644
index 124851fe00f..00000000000
--- a/src/main/java/org/jabref/gui/strings/StringDialog.css
+++ /dev/null
@@ -1,16 +0,0 @@
-.warning-icon {
-    -fx-fill: #ffb500;
-}
-
-.error-icon {
-    -fx-text-fill: #bb0613;
-    -fx-fill: #bb0613;
-}
-
-.tooltip-warning {
-    -fx-background-color: #d69600;
-}
-
-.tooltip-error {
-    -fx-background-color: #a80511;
-}
diff --git a/src/main/java/org/jabref/gui/strings/StringDialogViewModel.java b/src/main/java/org/jabref/gui/strings/StringDialogViewModel.java
deleted file mode 100644
index 968a809b6fa..00000000000
--- a/src/main/java/org/jabref/gui/strings/StringDialogViewModel.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package org.jabref.gui.strings;
-
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import javafx.beans.property.ListProperty;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleListProperty;
-import javafx.beans.property.SimpleObjectProperty;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
-import javafx.collections.FXCollections;
-
-import org.jabref.gui.AbstractViewModel;
-import org.jabref.logic.bibtex.comparator.BibtexStringComparator;
-import org.jabref.model.database.BibDatabase;
-import org.jabref.model.entry.BibtexString;
-
-public class StringDialogViewModel extends AbstractViewModel {
-
-    private final ListProperty<StringViewModel> allStrings = new SimpleListProperty<>(FXCollections.observableArrayList());
-    private final ObjectProperty<StringViewModel> selectedItemProperty = new SimpleObjectProperty<>();
-    private final StringProperty newStringLabelProperty = new SimpleStringProperty("");
-    private final BibDatabase db;
-
-    public StringDialogViewModel(BibDatabase bibDatabase) {
-        this.db = bibDatabase;
-        addAllStringsFromDB();
-
-    }
-
-    private void addAllStringsFromDB() {
-
-        Set<StringViewModel> strings = db.getStringKeySet()
-                                         .stream()
-                                         .map(string -> db.getString(string))
-                                         .sorted(new BibtexStringComparator(false))
-                                         .map(this::convertFromBibTexString)
-                                         .collect(Collectors.toSet());
-        allStrings.addAll(strings);
-
-    }
-
-    public ListProperty<StringViewModel> allStringsProperty() {
-        return this.allStrings;
-    }
-
-    public void addNewString() {
-        allStrings.add(new StringViewModel(newStringLabelProperty.getValue(), "New Content"));
-    }
-
-    public void removeString() {
-        allStrings.remove(selectedItemProperty.getValue());
-    }
-
-    private StringViewModel convertFromBibTexString(BibtexString bibtexString) {
-        return new StringViewModel(bibtexString.getName(), bibtexString.getContent());
-    }
-
-    public ObjectProperty<StringViewModel> seletedItemProperty() {
-        return this.selectedItemProperty;
-    }
-
-    public StringProperty newStringLabelProperty() {
-        return this.newStringLabelProperty;
-    }
-
-    public void save() {
-        for (StringViewModel model : allStrings) {
-            String label = model.getLabel().getValue();
-            String content = model.getContent().getValue();
-
-            Optional<BibtexString> bibtexString = db.getStringByName(label);
-            if (bibtexString.isPresent()) {
-                if (!(bibtexString.get().getContent().equals(content))) {
-                    bibtexString.get().setContent(content);
-                }
-            } else {
-                db.addString(new BibtexString(label, content));
-            }
-        }
-    }
-
-}
diff --git a/src/main/java/org/jabref/gui/undo/UndoableInsertString.java b/src/main/java/org/jabref/gui/undo/UndoableInsertString.java
index 3c2dd9f6eb3..6485861abbe 100644
--- a/src/main/java/org/jabref/gui/undo/UndoableInsertString.java
+++ b/src/main/java/org/jabref/gui/undo/UndoableInsertString.java
@@ -32,7 +32,6 @@ public void undo() {
 
         // Revert the change.
         base.removeString(string.getId());
-
     }
 
     @Override
@@ -45,7 +44,5 @@ public void redo() {
         } catch (KeyCollisionException ex) {
             LOGGER.warn("Problem to redo `insert entry`", ex);
         }
-
     }
-
 }
diff --git a/src/main/java/org/jabref/gui/undo/UndoableRemoveString.java b/src/main/java/org/jabref/gui/undo/UndoableRemoveString.java
index 4d5479b8458..2c086ed3cf0 100644
--- a/src/main/java/org/jabref/gui/undo/UndoableRemoveString.java
+++ b/src/main/java/org/jabref/gui/undo/UndoableRemoveString.java
@@ -15,7 +15,6 @@ public class UndoableRemoveString extends AbstractUndoableJabRefEdit {
     private final BibDatabase base;
     private final BibtexString string;
 
-
     public UndoableRemoveString(BibDatabase base, BibtexString string) {
         this.base = base;
         this.string = string;
@@ -29,23 +28,18 @@ public String getPresentationName() {
     @Override
     public void undo() {
         super.undo();
-
         // Revert the change.
         try {
             base.addString(string);
         } catch (KeyCollisionException ex) {
             LOGGER.warn("Problem to undo `remove string`", ex);
         }
-
     }
 
     @Override
     public void redo() {
         super.redo();
-
         // Redo the change.
         base.removeString(string.getId());
-
     }
-
 }
diff --git a/src/main/java/org/jabref/gui/undo/UndoableStringChange.java b/src/main/java/org/jabref/gui/undo/UndoableStringChange.java
index 9041cf356e0..9e2c3f0aa49 100644
--- a/src/main/java/org/jabref/gui/undo/UndoableStringChange.java
+++ b/src/main/java/org/jabref/gui/undo/UndoableStringChange.java
@@ -31,13 +31,11 @@ public void undo() {
         super.undo();
 
         // Revert the change.
-
         if (nameChange) {
             string.setName(oldValue);
         } else {
             string.setContent(oldValue);
         }
-
     }
 
     @Override
@@ -45,13 +43,10 @@ public void redo() {
         super.redo();
 
         // Redo the change.
-
         if (nameChange) {
             string.setName(newValue);
         } else {
             string.setContent(newValue);
         }
-
     }
-
 }
diff --git a/src/main/java/org/jabref/model/database/BibDatabase.java b/src/main/java/org/jabref/model/database/BibDatabase.java
index fe23614e5ca..2f4c3cc0ed9 100644
--- a/src/main/java/org/jabref/model/database/BibDatabase.java
+++ b/src/main/java/org/jabref/model/database/BibDatabase.java
@@ -42,6 +42,7 @@
  * A bibliography database.
  */
 public class BibDatabase {
+
     private static final Logger LOGGER = LoggerFactory.getLogger(BibDatabase.class);
     private static final Pattern RESOLVE_CONTENT_PATTERN = Pattern.compile(".*#[^#]+#.*");
     /**
@@ -131,7 +132,7 @@ public Set<String> getAllVisibleFields() {
             allFields.addAll(e.getFieldNames());
         }
         return allFields.stream().filter(field -> !InternalBibtexFields.isInternalField(field))
-                .collect(Collectors.toSet());
+                        .collect(Collectors.toSet());
     }
 
     /**
@@ -226,7 +227,6 @@ private synchronized void insertEntries(List<BibEntry> newEntries, EntryEventSou
         entries.addAll(newEntries);
     }
 
-
     /**
      * Removes the given entry.
      * The Entry is removed based on the id {@link BibEntry#id}
@@ -321,12 +321,7 @@ public BibtexString getString(String id) {
      * Returns the string with the given name/label
      */
     public Optional<BibtexString> getStringByName(String name) {
-        for (BibtexString string : getStringValues()) {
-            if (string.getName().equals(name)) {
-                return Optional.of(string);
-            }
-        }
-        return Optional.empty();
+        return getStringValues().stream().filter(string -> string.getName().equals(name)).findFirst();
     }
 
     /**
@@ -356,12 +351,7 @@ public void copyPreamble(BibDatabase database) {
      * Returns true if a string with the given label already exists.
      */
     public synchronized boolean hasStringLabel(String label) {
-        for (BibtexString value : bibtexStrings.values()) {
-            if (value.getName().equals(label)) {
-                return true;
-            }
-        }
-        return false;
+        return bibtexStrings.values().stream().anyMatch(value -> value.getName().equals(label));
     }
 
     /**

From 74db19aa632814aed8ac3cfc6410bbb7b9279dbc Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Sun, 3 Feb 2019 13:33:18 +0100
Subject: [PATCH 19/28] first part for factory

---
 .../metadata/BibtexStringEditorAction.java    |  1 -
 ...extFieldTableCellVisualizationFactory.java | 38 +++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/org/jabref/gui/util/ViewModelTextFieldTableCellVisualizationFactory.java

diff --git a/src/main/java/org/jabref/gui/metadata/BibtexStringEditorAction.java b/src/main/java/org/jabref/gui/metadata/BibtexStringEditorAction.java
index 050756b437f..7e37e175319 100644
--- a/src/main/java/org/jabref/gui/metadata/BibtexStringEditorAction.java
+++ b/src/main/java/org/jabref/gui/metadata/BibtexStringEditorAction.java
@@ -17,5 +17,4 @@ public void execute() {
         BibDatabase database = frame.getCurrentBasePanel().getDatabase();
         new BibtexStringEditorDialogView(database).showAndWait();
     }
-
 }
diff --git a/src/main/java/org/jabref/gui/util/ViewModelTextFieldTableCellVisualizationFactory.java b/src/main/java/org/jabref/gui/util/ViewModelTextFieldTableCellVisualizationFactory.java
new file mode 100644
index 00000000000..fe81e9270a9
--- /dev/null
+++ b/src/main/java/org/jabref/gui/util/ViewModelTextFieldTableCellVisualizationFactory.java
@@ -0,0 +1,38 @@
+package org.jabref.gui.util;
+
+import java.util.function.Function;
+
+import javafx.scene.control.TableColumn;
+import javafx.scene.control.cell.TextFieldTableCell;
+import javafx.util.Callback;
+
+import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
+import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
+
+public class ViewModelTextFieldTableCellVisualizationFactory<S, T> implements Callback<TableColumn<S, T>, TextFieldTableCell<S, T>> {
+
+    private ControlsFxVisualizer visualizer;
+    private Function<S, ValidationStatus> val;
+
+    @Override
+    public TextFieldTableCell<S, T> call(TableColumn<S, T> param) {
+        return new TextFieldTableCell<S, T>() {
+
+            @Override
+            public void updateItem(T item, boolean empty) {
+                super.updateItem(item, empty);
+
+                if (!empty && (getTableRow() != null)) {
+                    Object rowItem = getTableRow().getItem();
+
+                    if (rowItem != null) {
+                        S vm = (S) rowItem;
+                        visualizer.initVisualization(val.apply(vm), this);
+                    }
+                }
+            }
+        };
+
+    }
+
+}

From 30d5bf15b6b79adbac509c91df112465777fba09 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Mon, 4 Feb 2019 14:45:01 +0100
Subject: [PATCH 20/28] fix visibilty error

---
 src/main/java/org/jabref/gui/metadata/PreambleEditor.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/jabref/gui/metadata/PreambleEditor.java b/src/main/java/org/jabref/gui/metadata/PreambleEditor.java
index 70d8e126873..757c12aa732 100644
--- a/src/main/java/org/jabref/gui/metadata/PreambleEditor.java
+++ b/src/main/java/org/jabref/gui/metadata/PreambleEditor.java
@@ -13,7 +13,7 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabase;
 
-class PreambleEditor extends SimpleCommand {
+public class PreambleEditor extends SimpleCommand {
 
     private final TextArea editor = new TextArea();
 

From 2363c159211494926ae2c533e6973f32b023f98b Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Fri, 15 Feb 2019 14:35:30 +0100
Subject: [PATCH 21/28] move validation textfieldtablecell to factory

---
 ...ing.fxml => BibtexStringEditorDialog.fxml} |  0
 .../BibtexStringEditorDialogView.java         | 39 ++-----------------
 .../BibtexStringEditorDialogViewModel.java    |  7 ----
 .../gui/metadata/BibtexStringViewModel.java   |  1 -
 ...extFieldTableCellVisualizationFactory.java | 24 ++++++++++--
 5 files changed, 23 insertions(+), 48 deletions(-)
 rename src/main/java/org/jabref/gui/metadata/{AddNewBibtexString.fxml => BibtexStringEditorDialog.fxml} (100%)

diff --git a/src/main/java/org/jabref/gui/metadata/AddNewBibtexString.fxml b/src/main/java/org/jabref/gui/metadata/BibtexStringEditorDialog.fxml
similarity index 100%
rename from src/main/java/org/jabref/gui/metadata/AddNewBibtexString.fxml
rename to src/main/java/org/jabref/gui/metadata/BibtexStringEditorDialog.fxml
diff --git a/src/main/java/org/jabref/gui/metadata/BibtexStringEditorDialogView.java b/src/main/java/org/jabref/gui/metadata/BibtexStringEditorDialogView.java
index 5f75f9b43ee..4abcf16c9a0 100644
--- a/src/main/java/org/jabref/gui/metadata/BibtexStringEditorDialogView.java
+++ b/src/main/java/org/jabref/gui/metadata/BibtexStringEditorDialogView.java
@@ -9,12 +9,12 @@
 import javafx.scene.control.TableView;
 import javafx.scene.control.TextField;
 import javafx.scene.control.Tooltip;
-import javafx.scene.control.cell.TextFieldTableCell;
 import javafx.util.converter.DefaultStringConverter;
 
 import org.jabref.gui.icon.IconTheme.JabRefIcons;
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.gui.util.IconValidationDecorator;
+import org.jabref.gui.util.ViewModelTextFieldTableCellVisualizationFactory;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabase;
 
@@ -68,41 +68,10 @@ private void initialize() {
         btnRemove.setTooltip(new Tooltip(Localization.lang("Remove selected strings")));
 
         colLabel.setCellValueFactory(cellData -> cellData.getValue().getLabel());
-        colLabel.setCellFactory(column -> new TextFieldTableCell<BibtexStringViewModel, String>(new DefaultStringConverter()) {
-
-            @Override
-            public void updateItem(String item, boolean empty) {
-                super.updateItem(item, empty);
-
-                if (!empty && (getTableRow() != null)) {
-                    Object rowItem = getTableRow().getItem();
-
-                    if ((rowItem != null) && (rowItem instanceof BibtexStringViewModel)) {
-                        BibtexStringViewModel vm = (BibtexStringViewModel) rowItem;
-                        visualizer.initVisualization(vm.labelValidation(), this);
-                    }
-                }
-            }
-        });
+        new ViewModelTextFieldTableCellVisualizationFactory<BibtexStringViewModel, String>().withValidation(BibtexStringViewModel::labelValidation, visualizer).install(colLabel, new DefaultStringConverter());
 
         colContent.setCellValueFactory(cellData -> cellData.getValue().getContent());
-        colContent.setCellFactory(column -> new TextFieldTableCell<BibtexStringViewModel, String>(new DefaultStringConverter()) {
-
-            @Override
-            public void updateItem(String item, boolean empty) {
-                super.updateItem(item, empty);
-
-                if (!empty && (getTableRow() != null)) {
-                    Object rowItem = getTableRow().getItem();
-
-                    if ((rowItem != null) && (rowItem instanceof BibtexStringViewModel)) {
-                        BibtexStringViewModel vm = (BibtexStringViewModel) rowItem;
-                        visualizer.initVisualization(vm.contentValidation(), this);
-                    }
-                }
-
-            }
-        });
+        new ViewModelTextFieldTableCellVisualizationFactory<BibtexStringViewModel, String>().withValidation(BibtexStringViewModel::labelValidation, visualizer).install(colContent, new DefaultStringConverter());
 
         colLabel.setOnEditCommit((CellEditEvent<BibtexStringViewModel, String> cell) -> {
             cell.getRowValue().setLabel(cell.getNewValue());
@@ -115,7 +84,6 @@ public void updateItem(String item, boolean empty) {
         tblStrings.setEditable(true);
 
         viewModel.seletedItemProperty().bind(tblStrings.getSelectionModel().selectedItemProperty());
-        viewModel.newStringLabelProperty().bindBidirectional(stringLabel.textProperty());
     }
 
     @FXML
@@ -132,5 +100,4 @@ private void openHelp(ActionEvent event) {
     private void removeString(ActionEvent event) {
         viewModel.removeString();
     }
-
 }
diff --git a/src/main/java/org/jabref/gui/metadata/BibtexStringEditorDialogViewModel.java b/src/main/java/org/jabref/gui/metadata/BibtexStringEditorDialogViewModel.java
index b40b01484ad..b2f7da22eb7 100644
--- a/src/main/java/org/jabref/gui/metadata/BibtexStringEditorDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/metadata/BibtexStringEditorDialogViewModel.java
@@ -10,8 +10,6 @@
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleListProperty;
 import javafx.beans.property.SimpleObjectProperty;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
 import javafx.beans.value.ObservableValue;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
@@ -29,7 +27,6 @@ public class BibtexStringEditorDialogViewModel extends AbstractViewModel {
 
     private final ListProperty<BibtexStringViewModel> allStrings = new SimpleListProperty<>(FXCollections.observableArrayList());
     private final ObjectProperty<BibtexStringViewModel> selectedItemProperty = new SimpleObjectProperty<>();
-    private final StringProperty newStringLabelProperty = new SimpleStringProperty("");
     private final BibDatabase bibDatabase;
     private final BooleanProperty validProperty = new SimpleBooleanProperty();
 
@@ -73,10 +70,6 @@ public ObjectProperty<BibtexStringViewModel> seletedItemProperty() {
         return this.selectedItemProperty;
     }
 
-    public StringProperty newStringLabelProperty() {
-        return this.newStringLabelProperty;
-    }
-
     public void save() {
         for (BibtexStringViewModel model : allStrings) {
             String label = model.getLabel().getValue();
diff --git a/src/main/java/org/jabref/gui/metadata/BibtexStringViewModel.java b/src/main/java/org/jabref/gui/metadata/BibtexStringViewModel.java
index b62375a02db..9e8f5956384 100644
--- a/src/main/java/org/jabref/gui/metadata/BibtexStringViewModel.java
+++ b/src/main/java/org/jabref/gui/metadata/BibtexStringViewModel.java
@@ -26,7 +26,6 @@ public class BibtexStringViewModel {
     private final CompositeValidator combinedValidator;
 
     public BibtexStringViewModel(String label, String content) {
-
         this.label.setValue(label);
         this.content.setValue(content);
 
diff --git a/src/main/java/org/jabref/gui/util/ViewModelTextFieldTableCellVisualizationFactory.java b/src/main/java/org/jabref/gui/util/ViewModelTextFieldTableCellVisualizationFactory.java
index fe81e9270a9..fcf93a067b0 100644
--- a/src/main/java/org/jabref/gui/util/ViewModelTextFieldTableCellVisualizationFactory.java
+++ b/src/main/java/org/jabref/gui/util/ViewModelTextFieldTableCellVisualizationFactory.java
@@ -2,21 +2,35 @@
 
 import java.util.function.Function;
 
+import javafx.scene.control.TableCell;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.cell.TextFieldTableCell;
 import javafx.util.Callback;
+import javafx.util.StringConverter;
 
 import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
 import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
 
-public class ViewModelTextFieldTableCellVisualizationFactory<S, T> implements Callback<TableColumn<S, T>, TextFieldTableCell<S, T>> {
+public class ViewModelTextFieldTableCellVisualizationFactory<S, T> implements Callback<TableColumn<S, T>, TableCell<S, T>> {
 
     private ControlsFxVisualizer visualizer;
-    private Function<S, ValidationStatus> val;
+    private Function<S, ValidationStatus> validationStatusProperty;
+    private StringConverter<T> stringConverter;
+
+    public ViewModelTextFieldTableCellVisualizationFactory<S, T> withValidation(Function<S, ValidationStatus> validationStatusProperty, ControlsFxVisualizer visualizer) {
+        this.validationStatusProperty = validationStatusProperty;
+        this.visualizer = visualizer;
+        return this;
+    }
+
+    public void install(TableColumn<S, T> column, StringConverter<T> stringConverter) {
+        column.setCellFactory(this);
+        this.stringConverter = stringConverter;
+    }
 
     @Override
     public TextFieldTableCell<S, T> call(TableColumn<S, T> param) {
-        return new TextFieldTableCell<S, T>() {
+        return new TextFieldTableCell<S, T>(stringConverter) {
 
             @Override
             public void updateItem(T item, boolean empty) {
@@ -27,7 +41,9 @@ public void updateItem(T item, boolean empty) {
 
                     if (rowItem != null) {
                         S vm = (S) rowItem;
-                        visualizer.initVisualization(val.apply(vm), this);
+                        if ((visualizer != null) && (validationStatusProperty != null)) {
+                            visualizer.initVisualization(validationStatusProperty.apply(vm), this);
+                        }
                     }
                 }
             }

From 1c2ffa3eb10ef6b8de040f674675c984d256b76c Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Fri, 15 Feb 2019 14:50:08 +0100
Subject: [PATCH 22/28] fix import order fix l10n

---
 src/main/java/org/jabref/gui/JabRefFrame.java |  2 +-
 src/main/resources/l10n/JabRef_en.properties  | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index 7d8d531c8b5..b657ee1e1db 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -98,8 +98,8 @@
 import org.jabref.gui.keyboard.KeyBinding;
 import org.jabref.gui.menus.FileHistoryMenu;
 import org.jabref.gui.mergeentries.MergeEntriesAction;
-import org.jabref.gui.metadata.PreambleEditor;
 import org.jabref.gui.metadata.BibtexStringEditorAction;
+import org.jabref.gui.metadata.PreambleEditor;
 import org.jabref.gui.push.PushToApplicationButton;
 import org.jabref.gui.push.PushToApplications;
 import org.jabref.gui.search.GlobalSearchBar;
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 52718e31a1f..fcb2ed395ad 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -253,6 +253,8 @@ Delete\ multiple\ entries=Delete multiple entries
 
 Delete\ rows=Delete rows
 
+Delete\ strings=Delete strings
+
 Deleted=Deleted
 
 Permanently\ delete\ local\ file=Permanently delete local file
@@ -1398,6 +1400,7 @@ Toggle\ print\ status=Toggle print status
 Update\ keywords=Update keywords
 Write\ values\ of\ special\ fields\ as\ separate\ fields\ to\ BibTeX=Write values of special fields as separate fields to BibTeX
 You\ have\ changed\ settings\ for\ special\ fields.=You have changed settings for special fields.
+A\ string\ with\ that\ label\ already\ exists=A string with that label already exists
 Connection\ to\ OpenOffice/LibreOffice\ has\ been\ lost.\ Please\ make\ sure\ OpenOffice/LibreOffice\ is\ running,\ and\ try\ to\ reconnect.=Connection to OpenOffice/LibreOffice has been lost. Please make sure OpenOffice/LibreOffice is running, and try to reconnect.
 JabRef\ will\ send\ at\ least\ one\ request\ per\ entry\ to\ a\ publisher.=JabRef will send at least one request per entry to a publisher.
 Correct\ the\ entry,\ and\ reopen\ editor\ to\ display/edit\ source.=Correct the entry, and reopen editor to display/edit source.
@@ -2169,11 +2172,8 @@ Main\ layout\ file=Main layout file
 Save\ exporter=Save exporter
 File\ extension\:=File extension\:
 Export\ format\ name\:=Export format name\:
-
-Open\ Help\ page=Open Help page
-
 Cleared\ connection\ settings=Cleared connection settings
 Error\ adding\ discovered\ CitationStyles=Error adding discovered CitationStyles
 
-Must\ not\ be\ empty\!=Must not be empty\!
-
+Add\ new\ String=Add new String
+Remove\ selected\ Strings=Remove selected Strings

From 49dfd2f41664348f696644c16d8857bed6730cca Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Fri, 15 Feb 2019 15:02:32 +0100
Subject: [PATCH 23/28] fix merge erros in l10n

---
 src/main/resources/l10n/JabRef_en.properties | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index fcb2ed395ad..f751c2d1da1 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -1400,7 +1400,6 @@ Toggle\ print\ status=Toggle print status
 Update\ keywords=Update keywords
 Write\ values\ of\ special\ fields\ as\ separate\ fields\ to\ BibTeX=Write values of special fields as separate fields to BibTeX
 You\ have\ changed\ settings\ for\ special\ fields.=You have changed settings for special fields.
-A\ string\ with\ that\ label\ already\ exists=A string with that label already exists
 Connection\ to\ OpenOffice/LibreOffice\ has\ been\ lost.\ Please\ make\ sure\ OpenOffice/LibreOffice\ is\ running,\ and\ try\ to\ reconnect.=Connection to OpenOffice/LibreOffice has been lost. Please make sure OpenOffice/LibreOffice is running, and try to reconnect.
 JabRef\ will\ send\ at\ least\ one\ request\ per\ entry\ to\ a\ publisher.=JabRef will send at least one request per entry to a publisher.
 Correct\ the\ entry,\ and\ reopen\ editor\ to\ display/edit\ source.=Correct the entry, and reopen editor to display/edit source.
@@ -2177,3 +2176,5 @@ 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

From 8ed811b483ea09cb9d4165855bc41abd2c6231eb Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Fri, 15 Feb 2019 15:13:15 +0100
Subject: [PATCH 24/28] remove obsolete key from l10n

---
 src/main/resources/l10n/JabRef_en.properties | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index f751c2d1da1..634a80d312c 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -253,8 +253,6 @@ Delete\ multiple\ entries=Delete multiple entries
 
 Delete\ rows=Delete rows
 
-Delete\ strings=Delete strings
-
 Deleted=Deleted
 
 Permanently\ delete\ local\ file=Permanently delete local file

From 018a432828888f9b5bea70f7d8105810ad393092 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Sat, 16 Feb 2019 17:14:50 +0100
Subject: [PATCH 25/28] remove unused TextField

---
 .../org/jabref/gui/metadata/BibtexStringEditorDialogView.java   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/main/java/org/jabref/gui/metadata/BibtexStringEditorDialogView.java b/src/main/java/org/jabref/gui/metadata/BibtexStringEditorDialogView.java
index 4abcf16c9a0..742887c7988 100644
--- a/src/main/java/org/jabref/gui/metadata/BibtexStringEditorDialogView.java
+++ b/src/main/java/org/jabref/gui/metadata/BibtexStringEditorDialogView.java
@@ -7,7 +7,6 @@
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableColumn.CellEditEvent;
 import javafx.scene.control.TableView;
-import javafx.scene.control.TextField;
 import javafx.scene.control.Tooltip;
 import javafx.util.converter.DefaultStringConverter;
 
@@ -28,7 +27,6 @@ public class BibtexStringEditorDialogView extends BaseDialog<Void> {
     @FXML private Button btnHelp;
     @FXML private ButtonType saveButton;
 
-    @FXML private TextField stringLabel;
     @FXML private TableView<BibtexStringViewModel> tblStrings;
     @FXML private TableColumn<BibtexStringViewModel, String> colLabel;
     @FXML private TableColumn<BibtexStringViewModel, String> colContent;

From f5a399f3da589b12447d982ff8bc8051c9509b5d Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Sat, 16 Feb 2019 18:00:33 +0100
Subject: [PATCH 26/28] renamings and remove uncessary methods

---
 .../BibtexStringEditorDialogView.java         |  4 +-
 .../BibtexStringEditorDialogViewModel.java    |  4 +-
 .../gui/metadata/BibtexStringViewModel.java   | 37 ++++++-------------
 3 files changed, 16 insertions(+), 29 deletions(-)

diff --git a/src/main/java/org/jabref/gui/metadata/BibtexStringEditorDialogView.java b/src/main/java/org/jabref/gui/metadata/BibtexStringEditorDialogView.java
index 742887c7988..bdb3f169c00 100644
--- a/src/main/java/org/jabref/gui/metadata/BibtexStringEditorDialogView.java
+++ b/src/main/java/org/jabref/gui/metadata/BibtexStringEditorDialogView.java
@@ -65,10 +65,10 @@ private void initialize() {
         btnNewString.setTooltip(new Tooltip(Localization.lang("New string")));
         btnRemove.setTooltip(new Tooltip(Localization.lang("Remove selected strings")));
 
-        colLabel.setCellValueFactory(cellData -> cellData.getValue().getLabel());
+        colLabel.setCellValueFactory(cellData -> cellData.getValue().labelProperty());
         new ViewModelTextFieldTableCellVisualizationFactory<BibtexStringViewModel, String>().withValidation(BibtexStringViewModel::labelValidation, visualizer).install(colLabel, new DefaultStringConverter());
 
-        colContent.setCellValueFactory(cellData -> cellData.getValue().getContent());
+        colContent.setCellValueFactory(cellData -> cellData.getValue().contentProperty());
         new ViewModelTextFieldTableCellVisualizationFactory<BibtexStringViewModel, String>().withValidation(BibtexStringViewModel::labelValidation, visualizer).install(colContent, new DefaultStringConverter());
 
         colLabel.setOnEditCommit((CellEditEvent<BibtexStringViewModel, String> cell) -> {
diff --git a/src/main/java/org/jabref/gui/metadata/BibtexStringEditorDialogViewModel.java b/src/main/java/org/jabref/gui/metadata/BibtexStringEditorDialogViewModel.java
index b2f7da22eb7..eb18099546a 100644
--- a/src/main/java/org/jabref/gui/metadata/BibtexStringEditorDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/metadata/BibtexStringEditorDialogViewModel.java
@@ -72,8 +72,8 @@ public ObjectProperty<BibtexStringViewModel> seletedItemProperty() {
 
     public void save() {
         for (BibtexStringViewModel model : allStrings) {
-            String label = model.getLabel().getValue();
-            String content = model.getContent().getValue();
+            String label = model.labelProperty().getValue();
+            String content = model.contentProperty().getValue();
 
             Optional<BibtexString> bibtexString = bibDatabase.getStringByName(label);
             if (bibtexString.isPresent()) {
diff --git a/src/main/java/org/jabref/gui/metadata/BibtexStringViewModel.java b/src/main/java/org/jabref/gui/metadata/BibtexStringViewModel.java
index 9e8f5956384..c8dd02e52a6 100644
--- a/src/main/java/org/jabref/gui/metadata/BibtexStringViewModel.java
+++ b/src/main/java/org/jabref/gui/metadata/BibtexStringViewModel.java
@@ -18,30 +18,22 @@ public class BibtexStringViewModel {
 
     private final static Pattern IS_NUMBER = Pattern.compile("-?\\d+(\\.\\d+)?");
 
-    private final StringProperty label = new SimpleStringProperty();
-    private final StringProperty content = new SimpleStringProperty();
+    private final StringProperty labelProperty = new SimpleStringProperty();
+    private final StringProperty contentProperty = new SimpleStringProperty();
 
     private final Validator labelValidator;
     private final Validator contentValidator;
     private final CompositeValidator combinedValidator;
 
     public BibtexStringViewModel(String label, String content) {
-        this.label.setValue(label);
-        this.content.setValue(content);
+        this.labelProperty.setValue(label);
+        this.contentProperty.setValue(content);
 
-        labelValidator = new FunctionBasedValidator<>(this.label, BibtexStringViewModel::validateLabel);
-        contentValidator = new FunctionBasedValidator<>(this.content, BibtexStringViewModel::validateContent);
+        labelValidator = new FunctionBasedValidator<>(this.labelProperty, BibtexStringViewModel::validateLabel);
+        contentValidator = new FunctionBasedValidator<>(this.contentProperty, BibtexStringViewModel::validateContent);
         combinedValidator = new CompositeValidator(labelValidator, contentValidator);
     }
 
-    public Validator getlabelValidator() {
-        return labelValidator;
-    }
-
-    public Validator getContentValidator() {
-        return contentValidator;
-    }
-
     public ValidationStatus labelValidation() {
         return labelValidator.getValidationStatus();
     }
@@ -50,28 +42,24 @@ public ValidationStatus contentValidation() {
         return contentValidator.getValidationStatus();
     }
 
-    public ValidationStatus combinedValidation() {
-        return combinedValidator.getValidationStatus();
-    }
-
     public ReadOnlyBooleanProperty combinedValidationValidProperty() {
         return combinedValidator.getValidationStatus().validProperty();
     }
 
-    public StringProperty getLabel() {
-        return label;
+    public StringProperty labelProperty() {
+        return this.labelProperty;
     }
 
-    public StringProperty getContent() {
-        return content;
+    public StringProperty contentProperty() {
+        return this.contentProperty;
     }
 
     public void setLabel(String label) {
-        this.label.setValue(label);
+        this.labelProperty.setValue(label);
     }
 
     public void setContent(String content) {
-        this.content.setValue(content);
+        this.contentProperty.setValue(content);
     }
 
     private static ValidationMessage validateLabel(String input) {
@@ -91,7 +79,6 @@ private static ValidationMessage validateLabel(String input) {
     }
 
     private static ValidationMessage validateContent(String input) {
-
         if (input == null) {
             return ValidationMessage.error(Localization.lang("Must not be empty!"));
         } else if (input.trim().isEmpty()) {

From 616cbeb7351aaf27801b893c284cc33438747937 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Sun, 17 Feb 2019 15:18:10 +0100
Subject: [PATCH 27/28] extract string adding to bibdatabase add tests

---
 .../BibtexStringEditorDialogViewModel.java    | 24 +++++++----------
 .../jabref/model/database/BibDatabase.java    | 11 +++++++-
 .../model/database/BibDatabaseTest.java       | 26 +++++++++++++++++++
 3 files changed, 46 insertions(+), 15 deletions(-)

diff --git a/src/main/java/org/jabref/gui/metadata/BibtexStringEditorDialogViewModel.java b/src/main/java/org/jabref/gui/metadata/BibtexStringEditorDialogViewModel.java
index eb18099546a..3d4a2789ffa 100644
--- a/src/main/java/org/jabref/gui/metadata/BibtexStringEditorDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/metadata/BibtexStringEditorDialogViewModel.java
@@ -1,6 +1,6 @@
 package org.jabref.gui.metadata;
 
-import java.util.Optional;
+import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -71,19 +71,15 @@ public ObjectProperty<BibtexStringViewModel> seletedItemProperty() {
     }
 
     public void save() {
-        for (BibtexStringViewModel model : allStrings) {
-            String label = model.labelProperty().getValue();
-            String content = model.contentProperty().getValue();
-
-            Optional<BibtexString> bibtexString = bibDatabase.getStringByName(label);
-            if (bibtexString.isPresent()) {
-                if (!(bibtexString.get().getContent().equals(content))) {
-                    bibtexString.get().setContent(content);
-                }
-            } else {
-                bibDatabase.addString(new BibtexString(label, content));
-            }
-        }
+        List<BibtexString> stringsToAdd = allStrings.stream().map(this::fromBibtexStringViewModel).collect(Collectors.toList());
+        bibDatabase.addStrings(stringsToAdd);
+    }
+
+    private BibtexString fromBibtexStringViewModel(BibtexStringViewModel viewModel) {
+        String label = viewModel.labelProperty().getValue();
+        String content = viewModel.contentProperty().getValue();
+        return new BibtexString(label, content);
+
     }
 
     public BooleanProperty validProperty() {
diff --git a/src/main/java/org/jabref/model/database/BibDatabase.java b/src/main/java/org/jabref/model/database/BibDatabase.java
index 2f4c3cc0ed9..bd82cc96ffa 100644
--- a/src/main/java/org/jabref/model/database/BibDatabase.java
+++ b/src/main/java/org/jabref/model/database/BibDatabase.java
@@ -287,6 +287,16 @@ public synchronized void addString(BibtexString string) throws KeyCollisionExcep
         bibtexStrings.put(string.getId(), string);
     }
 
+    public void addStrings(Collection<BibtexString> stringsToAdd) {
+        for (BibtexString str : stringsToAdd) {
+            Optional<BibtexString> bibtexString = getStringByName(str.getName());
+            if (bibtexString.isPresent() && !(bibtexString.get().getContent().equals(str.getContent()))) {
+                bibtexString.get().setContent(str.getContent());
+            } else {
+                addString(str);
+            }
+        }
+    }
     /**
      * Removes the string with the given id.
      */
@@ -605,5 +615,4 @@ public String generateSharedDatabaseID() {
     public DuplicationChecker getDuplicationChecker() {
         return duplicationChecker;
     }
-
 }
diff --git a/src/test/java/org/jabref/model/database/BibDatabaseTest.java b/src/test/java/org/jabref/model/database/BibDatabaseTest.java
index 364c42c54b3..d5632433ff1 100644
--- a/src/test/java/org/jabref/model/database/BibDatabaseTest.java
+++ b/src/test/java/org/jabref/model/database/BibDatabaseTest.java
@@ -122,6 +122,32 @@ public void hasStringLabelFindsString() {
         assertFalse(database.hasStringLabel("VLSI"));
     }
 
+    @Test
+    public void addStringAsCollection() {
+        BibtexString string = new BibtexString("DSP", "Digital Signal Processing");
+        List<BibtexString> strings = Arrays.asList(string);
+        database.addStrings(strings);
+        assertEquals(Optional.of(string), database.getStringByName("DSP"));
+    }
+
+    @Test
+    public void addStringAsCollectionWithUpdatedContent() {
+        BibtexString string = new BibtexString("DSP", "Digital Signal Processing");
+        List<BibtexString> strings = Arrays.asList(string, new BibtexString("DSP", "ABCD"));
+        database.addStrings(strings);
+        assertEquals(Optional.of(string), database.getStringByName("DSP"));
+    }
+
+    @Test
+    public void addStringAsCollectionWithNewContent() {
+        BibtexString string = new BibtexString("DSP", "Digital Signal Processing");
+        BibtexString vlsi = new BibtexString("VLSI", "Very Large Scale Integration");
+        List<BibtexString> strings = Arrays.asList(string, vlsi);
+        database.addStrings(strings);
+        assertEquals(Optional.of(string), database.getStringByName("DSP"));
+        assertEquals(Optional.of(vlsi), database.getStringByName("VLSI"));
+    }
+
     @Test
     public void addSameStringLabelTwiceThrowsKeyCollisionException() {
         BibtexString string = new BibtexString("DSP", "Digital Signal Processing");

From 0082b139a83ab95e8e6f5ac75376b50d5ee7e0b4 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Sun, 17 Feb 2019 15:31:26 +0100
Subject: [PATCH 28/28] fix checkstyle

---
 src/main/java/org/jabref/model/database/BibDatabase.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/org/jabref/model/database/BibDatabase.java b/src/main/java/org/jabref/model/database/BibDatabase.java
index bd82cc96ffa..e986136fad2 100644
--- a/src/main/java/org/jabref/model/database/BibDatabase.java
+++ b/src/main/java/org/jabref/model/database/BibDatabase.java
@@ -297,6 +297,7 @@ public void addStrings(Collection<BibtexString> stringsToAdd) {
             }
         }
     }
+
     /**
      * Removes the string with the given id.
      */